From 81c6ff16dda0f3a959842a9b495cb0badda01983 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 13 Jan 2014 20:08:20 +0800
Subject: [PATCH 0001/2033] tk: update to 8.5.15, enable xft support

---
 pkgs/development/libraries/tk/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix           |  4 +---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index a45c4217c7b..7d55dd4c7d0 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, tcl, x11, libX11 }:
+{ stdenv, fetchurl, pkgconfig, tcl, libXft }:
 
 stdenv.mkDerivation {
-  name = "tk-8.5.7";
+  name = "tk-8.5.15";
   
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.5.7-src.tar.gz";
-    sha256 = "0c5gsy3nlwl0wn9swz4k4v7phy7nzjl317gca1jykgf4jz9nwdnr";
+    url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
+    sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
   };
   
   postInstall = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   
   preConfigure = "cd unix";
 
-  buildInputs = [ tcl x11 libX11 ];
+  buildInputs = [ pkgconfig tcl libXft ];
   
   inherit tcl;
 
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
+    license = stdenv.lib.licenses.tcltk;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ee74ee90e1..32cd77a4c36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5621,9 +5621,7 @@ let
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };
 
-  tk = callPackage ../development/libraries/tk {
-    libX11 = xlibs.libX11;
-  };
+  tk = callPackage ../development/libraries/tk { };
 
   tnt = callPackage ../development/libraries/tnt { };
 

From a2dddb90dc056ddd8b8fd56ef3272c301580307b Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 13 Jan 2014 21:05:58 +0800
Subject: [PATCH 0002/2033] puredata: update to 0.45-4

---
 pkgs/applications/audio/puredata/default.nix | 25 ++++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index b1df008398d..d0394b72edd 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,23 +1,28 @@
-{ stdenv, fetchurl, alsaLib, autoconf, automake, fftw, gettext, glib
-, jackaudio, libX11, libtool, makeWrapper, pkgconfig, tcl, tk
+{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
+, alsaLib, jackaudio, tk
 }:
 
 stdenv.mkDerivation  rec {
   name = "puredata-${version}";
-  version = "0.44-0";
+  version = "0.45-4";
 
   src = fetchurl {
     url = "mirror://sourceforge/pure-data/pd-${version}.src.tar.gz";
-    sha256 = "031bvqfnlpfx0y5n0l5rmslziqc6jgmk99x1prgh1rmhjhjdnijw";
+    sha256 = "1ls2ap5yi2zxvmr247621g4jx0hhfds4j5704a050bn2n3l0va2p";
   };
 
-  buildInputs = [
-    alsaLib autoconf automake fftw gettext glib jackaudio libX11
-    libtool makeWrapper pkgconfig tcl tk
-  ];
+  patchPhase = ''
+    rm portaudio/configure.in
+  '';
 
-  preConfigure = ''
-    ./autogen.sh
+  nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
+
+  buildInputs = [ alsaLib jackaudio ];
+
+  configureFlags = ''
+    --enable-alsa
+    --enable-jack
+    --disable-portaudio
   '';
 
   postInstall = ''

From b6cc977580526918f8c1abe74985efec14dccbbf Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Tue, 14 Jan 2014 20:23:44 +0800
Subject: [PATCH 0003/2033] tcl: update to 8.5.15

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

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 48755065b99..c9a0fd7546f 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "tcl-8.5.7";
+  name = "tcl-8.5.15";
 
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.5.7-src.tar.gz;
-    sha256 = "1wk67qq12bdbaqsi6cxwj6ra8nc8ph1na9rh808kfk6hm18qvlk7";
+    url = mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz;
+    sha256 = "0kl8lbfwy4v4q4461wjmva95h0pgiprykislpw4nnpkrc7jalkpj";
   };
 
   preConfigure = "cd unix";

From 299af2ff45f0202067f8925913b203e4c0432f07 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sat, 25 Jan 2014 10:36:20 +0800
Subject: [PATCH 0004/2033] tk: fix issue #1479

---
 pkgs/development/libraries/tk/default.nix     |  2 ++
 .../tk/different-prefix-with-tcl.patch        | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/tk/different-prefix-with-tcl.patch

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 7d55dd4c7d0..c7fe3e105d8 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
     sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
   };
+
+  patches = [ ./different-prefix-with-tcl.patch ];
   
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
diff --git a/pkgs/development/libraries/tk/different-prefix-with-tcl.patch b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
new file mode 100644
index 00000000000..bf331b75cae
--- /dev/null
+++ b/pkgs/development/libraries/tk/different-prefix-with-tcl.patch
@@ -0,0 +1,22 @@
+--- tk8.5.15-orig/unix/Makefile.in	2014-01-25 08:57:45.626713122 +0800
++++ tk8.5.15/unix/Makefile.in	2014-01-25 08:59:35.315341825 +0800
+@@ -995,7 +995,8 @@
+ 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
+ 
+ tkWindow.o: $(GENERIC_DIR)/tkWindow.c
+-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
++	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
++	    $(GENERIC_DIR)/tkWindow.c
+ 
+ tkButton.o: $(GENERIC_DIR)/tkButton.c
+ 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
+--- tk8.5.15-orig/generic/tkWindow.c	2014-01-25 10:10:03.964476436 +0800
++++ tk8.5.15/generic/tkWindow.c	2014-01-25 10:08:06.020950933 +0800
+@@ -983,6 +983,7 @@
+ 
+     Tcl_SetVar(interp, "tk_patchLevel", TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
+     Tcl_SetVar(interp, "tk_version",    TK_VERSION,     TCL_GLOBAL_ONLY);
++    Tcl_SetVar(interp, "tk_library",    TK_LIBRARY,     TCL_GLOBAL_ONLY);
+ 
+     tsdPtr->numMainWindows++;
+     return tkwin;

From 41775167ac69a001f40c11e2ee9576887e17b8b4 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 2 Feb 2014 14:41:26 +0000
Subject: [PATCH 0005/2033] switch-to-configuration.pl: Interact via DBus

Currently switch-to-configuration.pl uses system() calls to interact
with DBus. This can be error prone, especially when we are parsing
output that could change. In this commit, almost all calls to the
systemctl binary have been replaced with equivalent operations via DBus.
---
 .../activation/switch-to-configuration.pl     | 55 ++++++++++++-------
 nixos/modules/system/activation/top-level.nix |  2 +-
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 33ae3aef9fc..91beed1130e 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
+use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -59,17 +60,18 @@ syslog(LOG_NOTICE, "switching to system configuration $out");
 # virtual console 1 and we restart the "tty1" unit.
 $SIG{PIPE} = "IGNORE";
 
+my $dbus = Net::DBus->find;
+my $systemdService = $dbus->get_service('org.freedesktop.systemd1');
+my $systemdManager = $systemdService->get_object('/org/freedesktop/systemd1');
+
 sub getActiveUnits {
-    # FIXME: use D-Bus or whatever to query this, since parsing the
-    # output of list-units is likely to break.
-    my $lines = `@systemd@/bin/systemctl list-units --full`;
     my $res = {};
-    foreach my $line (split '\n', $lines) {
-        chomp $line;
-        last if $line eq "";
-        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
-        next if $1 eq "UNIT";
-        $res->{$1} = { load => $2, state => $3, substate => $4 };
+    foreach my $unit (@{ $systemdManager->ListUnits() }) {
+        $res->{$unit->[0]} = {
+            load => $unit->[2],
+            state => $unit->[3],
+            substate => $unit->[4]
+        };
     }
     return $res;
 }
@@ -277,7 +279,7 @@ foreach my $device (keys %$prevSwaps) {
 if (scalar @unitsToStop > 0) {
     @unitsToStop = unique(@unitsToStop);
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-    system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
+    $systemdManager->StopUnit($_, "replace") for @unitsToStop;
 }
 
 print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n"
@@ -292,21 +294,22 @@ system("$out/activate", "$out") == 0 or $res = 2;
 # Restart systemd if necessary.
 if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
     print STDERR "restarting systemd...\n";
-    system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
+
+    $systemdManager->Reexecute();
 }
 
 # Forget about previously failed services.
-system("@systemd@/bin/systemctl", "reset-failed");
+$systemdManager->ResetFailed();
 
-# Make systemd reload its units.
-system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
+# Make systemd reload its units
+$systemdManager->Reload();
 
 # Restart changed services (those that have to be restarted rather
 # than stopped and started).
 my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
 if (scalar @restart > 0) {
     print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n";
-    system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4;
+    $systemdManager->Restart($_, "replace") for @restart;
     unlink($restartListFile);
 }
 
@@ -318,7 +321,7 @@ if (scalar @restart > 0) {
 # systemd.
 my @start = unique("default.target", "timers.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
-system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
+$systemdManager->StartUnit($_, "replace") for @start;
 unlink($startListFile);
 
 # Reload units that need it.  This includes remounting changed mount
@@ -326,19 +329,31 @@ unlink($startListFile);
 my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // "");
 if (scalar @reload > 0) {
     print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n";
-    system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4;
+    $systemdManager->ReloadUnit($_, "replace") for @reload;
     unlink($reloadListFile);
 }
 
 # Signal dbus to reload its configuration.
-system("@systemd@/bin/systemctl", "reload", "dbus.service");
+$systemdManager->ReloadUnit("dbus.service", "replace");
 
 # Print failed and new units.
 my (@failed, @new, @restarting);
 my $activeNew = getActiveUnits;
 while (my ($unit, $state) = each %{$activeNew}) {
-    push @failed, $unit if $state->{state} eq "failed" || $state->{substate} eq "auto-restart";
-    push @new, $unit if $state->{state} ne "failed" && !defined $activePrev->{$unit};
+    if ($state->{state} eq "failed") {
+        push @failed, $unit;
+    }
+    elsif ($state->{state} eq "auto-restart") {
+        # A unit in auto-restart state is a failure *if* it previously failed to start
+        my $unit = $systemdManager->GetUnit($unit);
+
+        if ($unit->ExecMainStatus ne '0') {
+            push @failed, $unit;
+        }
+    }
+    elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) {
+        push @new, $unit;
+    }
 }
 
 print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n"
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d9891f434cc..30a529988a9 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -108,7 +108,7 @@ let
     configurationName = config.boot.loader.grub.configurationName;
 
     # Needed by switch-to-configuration.
-    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.XMLTwig}/lib/perl5/site_perl -I${pkgs.perlPackages.XMLParser}/lib/perl5/site_perl -I${pkgs.perlPackages.NetDBus}/lib/perl5/site_perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 
 

From a78c6490d70d7b7ebb0b2ba593dcbba2af7ab631 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Feb 2014 23:44:11 +0100
Subject: [PATCH 0006/2033] mingw-w64: Update to new upstream version 3.1.0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/windows/mingw-w64/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index c358565c455..0d7beb532fe 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,23 +1,15 @@
 {stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
 
 let
-  name = "mingw-w64-2.0.3";
+  name = "mingw-w64-3.1.0";
 in
 stdenv.mkDerivation (rec {
   inherit name;
 
   src = fetchurl {
-    url = "mirror://sourceforge/mingw-w64/mingw-w64-v2.0.3.tar.gz";
-    sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5";
+    url = "mirror://sourceforge/mingw-w64/mingw-w64-v3.1.0.tar.bz2";
+    sha256 = "1lhpw381gc59w8b1r9zzdwa9cdi2wx6qx7s6rvajapmbw7ksgrzc";
   };
-
-  # I don't know what's that $host directory about, I put the
-  # files inside include as usual.
-  postInstall = ''
-    rmdir $out/include
-    mv $out/x86_64-w64-mingw32/* $out
-    rm -R $out/x86_64-w64-mingw32
-  '';
 } //
 (if onlyHeaders then {
   name = name + "-headers";

From ba8b0e8af9e0ced255cd974101c349ca9d787b89 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 00:28:46 +0100
Subject: [PATCH 0007/2033] binutils-cross: Remove unreferenced package.

This package wasn't imported by anything in the package tree and also
isn't used for cross-builds. So in order to avoid confusion, it's better
to remove it as it is outdated as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../tools/misc/binutils-cross/builder.sh      | 26 -------------------
 .../tools/misc/binutils-cross/default.nix     | 13 ----------
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils-cross/builder.sh
 delete mode 100644 pkgs/development/tools/misc/binutils-cross/default.nix

diff --git a/pkgs/development/tools/misc/binutils-cross/builder.sh b/pkgs/development/tools/misc/binutils-cross/builder.sh
deleted file mode 100644
index 29d3b3779b6..00000000000
--- a/pkgs/development/tools/misc/binutils-cross/builder.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-source $stdenv/setup
-
-if test $cross = "arm-linux" ; then
-  configureFlags="--target=arm-linux"
-elif test $cross = "mips-linux" ; then
-  configureFlags="--target=mips-linux"
-elif test $cross = "mipsel-linux" ; then
-  configureFlags="--target=mipsel-linux"
-elif test $cross = "sparc-linux" ; then
-  configureFlags="--target=sparc-linux"
-elif test $cross = "powerpc-linux" ; then
-  configureFlags="--target=powerpc-linux"
-elif test $cross = "ppc-linux" ; then
-  configureFlags="--target=powerpc-linux"
-fi
-
-patchConfigure() {
-    # Clear the default library search path.
-    if test "$noSysDirs" = "1"; then
-        echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
-    fi
-}
-
-preConfigure=patchConfigure
-
-genericBuild
diff --git a/pkgs/development/tools/misc/binutils-cross/default.nix b/pkgs/development/tools/misc/binutils-cross/default.nix
deleted file mode 100644
index 7d77baced37..00000000000
--- a/pkgs/development/tools/misc/binutils-cross/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, noSysDirs, cross}:
-
-stdenv.mkDerivation {
-  name = "binutils-2.16.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
-    md5 = "6a9d529efb285071dad10e1f3d2b2967";
-  };
-  inherit noSysDirs;
-  #configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else if cross=="sparc-linux" then "--target=sparc-linux"; 
-  inherit cross;
-}

From 60a2fc1fec78f2653b3ef71b24ec8ae72b99d38b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 01:07:57 +0100
Subject: [PATCH 0008/2033] openssl: Fix Windows compat in cert-file.patch.

In Windows there is no get(e)uid() call available, so the build fails.

The patch now checks whether OPENSSL_SYS_WINDOWS is defined and only
uses those calls if _not_ on Windows.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/openssl/cert-file.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openssl/cert-file.patch b/pkgs/development/libraries/openssl/cert-file.patch
index 6b7a60e9026..26b51c0295e 100644
--- a/pkgs/development/libraries/openssl/cert-file.patch
+++ b/pkgs/development/libraries/openssl/cert-file.patch
@@ -12,7 +12,7 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt
  #include "cryptlib.h"
  #include <openssl/crypto.h>
  #include <openssl/x509.h>
-@@ -71,7 +75,19 @@
+@@ -71,7 +75,25 @@
  	{ return(X509_CERT_DIR); }
  
  const char *X509_get_default_cert_file(void)
@@ -23,9 +23,15 @@ diff -ru -x '*~' openssl-1.0.0e-orig/crypto/x509/x509_def.c openssl-1.0.0e/crypt
 +	if (!init) {
 +	    init = 1;
 +	    char * s = getenv("OPENSSL_X509_CERT_FILE");
-+	    if (s && getuid() == geteuid()) {
-+		strncpy(buf, s, sizeof(buf));
-+		buf[sizeof(buf) - 1] = 0;
++	    if (s) {
++#ifndef OPENSSL_SYS_WINDOWS
++	        if (getuid() == geteuid()) {
++#endif
++		        strncpy(buf, s, sizeof(buf));
++		        buf[sizeof(buf) - 1] = 0;
++#ifndef OPENSSL_SYS_WINDOWS
++	        }
++#endif
 +	    }
 +	}
 +	return buf;

From 92c59d37a7e7567567e5e84c7747818850e69d0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 02:22:57 +0100
Subject: [PATCH 0009/2033] gcc-cross-wrapper: Enable dontStrip in setup hook.

At least for x86_64-w64-mingw32, it doesn't make sense to use the native
strip tool for stripping of symbols. To the contrary it results in
unusable archive files.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
index a7be09283ee..433d36ced43 100644
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@@ -75,6 +75,9 @@ fi
 # native compilations.
 doCheck=""
 
+# Don't strip foreign binaries with native "strip" tool.
+dontStrip=1
+
 # Add the output as an rpath.
 if test "$NIX_NO_SELF_RPATH" != "1"; then
     export NIX_CROSS_LDFLAGS="-rpath $out/lib -rpath-link $out/lib $NIX_CROSS_LDFLAGS"

From 423be7712bb710f10f2eb8198bae97e5aeb5f1fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 02:25:46 +0100
Subject: [PATCH 0010/2033] bzip2/cross: Patch out erroneous path separator.

Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/compression/bzip2/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a431cd30a21..55fca6ca3cb 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation {
 
   crossAttrs = {
     patchPhase = ''
+      sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
       sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \
         -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \
         -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \

From 4fde72c7d64c78de2e41ba91153cebb907e63100 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 04:43:00 +0100
Subject: [PATCH 0011/2033] mingw-w64: Fix typo in preConfigure hook.

D'oh, no wonder the headers are of almost the same size as the main
package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/windows/mingw-w64/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 0d7beb532fe..f1c509a5098 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
 } //
 (if onlyHeaders then {
   name = name + "-headers";
-  preConfingure = ''
+  preConfigure = ''
     cd mingw-w64-headers
   '';
   configureFlags = "--without-crt --host=x86_64-w64-mingw32";

From 44cfba79509f6dd98ae306f62f2cc3183bbd1ab1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 04:44:43 +0100
Subject: [PATCH 0012/2033] mingw-w64-pthreads: Create based on mingw-w64.

The winpthreads library is part of the same source package, so let's
just override the name and the source directory.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/windows/mingw-w64/default.nix | 10 +++++++++-
 pkgs/top-level/all-packages.nix                |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index f1c509a5098..c5b6017aae4 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}:
+{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null
+, onlyHeaders ? false
+, onlyPthreads ? false
+}:
 
 let
   name = "mingw-w64-3.1.0";
@@ -17,6 +20,11 @@ stdenv.mkDerivation (rec {
     cd mingw-w64-headers
   '';
   configureFlags = "--without-crt --host=x86_64-w64-mingw32";
+} else if onlyPthreads then {
+  name = name + "-pthreads";
+  preConfigure = ''
+    cd mingw-w64-libraries/winpthreads
+  '';
 } else {
   buildInputs = [ gccCross binutilsCross ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64f2bb688c4..133ef21060c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7191,6 +7191,10 @@ let
       onlyHeaders = true;
     };
 
+    mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 {
+      onlyPthreads = true;
+    };
+
     pthreads = callPackage ../os-specific/windows/pthread-w32 {
       mingw_headers = mingw_headers3;
     };

From d0142e9b09ef8a30a26d4aad922c78bf8c83a7b7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 05:01:29 +0100
Subject: [PATCH 0013/2033] pcre/cross: Enable support for winpthreads.

That way we're able to build with the JIT compiler enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/pcre/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 51279701d4a..067c3af4387 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }:
+{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true
+, windows ? null
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pcre-8.34";
@@ -16,12 +20,16 @@ stdenv.mkDerivation rec {
     --enable-jit
     ${if unicodeSupport then "--enable-unicode-properties" else ""}
     ${if !cplusplusSupport then "--disable-cpp" else ""}
-  '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0";
+  '' + optionalString stdenv.isDarwin "CXXFLAGS=-O0";
 
   doCheck = with stdenv; !(isCygwin || isFreeBSD);
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra
 
+  crossAttrs = optionalAttrs (stdenv.cross.config == "x86_64-w64-mingw32") {
+    buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
+  };
+
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
       PCRE library is free, even for building proprietary software.
     '';
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }

From b9bc42d0f33e5490e8e1fbbf6048f2fc641bc546 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 05:46:04 +0100
Subject: [PATCH 0014/2033] glew/cross: Fix building with mingw-w64.

This also cleans up the package expression a bit and we no longer
directly override the phases (except patchPhase).

Also for cross-builds we're using the stock mingw target and pass CC, LD
and STRIP to make, because the mingw-w64 targets of the upstream package
are outdated.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/glew/default.nix | 24 +++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ef81f210d39..b79fa97047b 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "glew-1.10.0";
 
@@ -8,23 +10,33 @@ stdenv.mkDerivation rec {
     sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r";
   };
 
-
-  buildInputs = [ x11 libXmu libXi ];
-  propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
+  nativeBuildInputs = [ x11 libXmu libXi ];
+  propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
 
   patchPhase = ''
     sed -i 's|lib64|lib|' config/Makefile.linux
   '';
 
-buildPhase = "make all";
-  installPhase = ''
-    GLEW_DEST=$out make install.all
+  buildFlags = [ "all" ];
+  installFlags = [ "install.all" ];
+
+  preInstall = ''
+    export GLEW_DEST="$out"
+  '';
+
+  postInstall = ''
     mkdir -pv $out/share/doc/glew
     mkdir -p $out/lib/pkgconfig
     cp glew*.pc $out/lib/pkgconfig
     cp -r README.txt LICENSE.txt doc $out/share/doc/glew
   '';
 
+  crossAttrs.makeFlags = [
+    "CC=${stdenv.cross.config}-gcc"
+    "LD=${stdenv.cross.config}-gcc"
+    "STRIP="
+  ] ++ optional (stdenv.cross.config == "x86_64-w64-mingw32") "SYSTEM=mingw";
+
   meta = {
     description = "An OpenGL extension loading library for C(++)";
     homepage = http://glew.sourceforge.net/;

From fbc307a18322c42db500aaebeaa21e0e93e82162 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 05:55:29 +0100
Subject: [PATCH 0015/2033] SDL/cross: Fix building with mingw-w64.

This is to make sure that we don't get Xlibs or alsa in cross builds,
because those aren't available on non-Linux/Unix platforms.

Also, until we don't have the DirectX SDK packaged, let's disable it
during cross builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/SDL/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index e58397fa9a5..0df130b11fb 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -19,7 +19,7 @@ let
         --disable-oss --disable-video-x11-xme
         --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared
         --disable-osmesa-shared
-        ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
+        ${if attrs.alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
       '';
 in
 stdenv.mkDerivation rec {
@@ -32,20 +32,24 @@ stdenv.mkDerivation rec {
   };
 
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
-  propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
+  propagatedNativeBuildInputs =
+    stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
     stdenv.lib.optional pulseaudioSupport pulseaudio;
 
-  buildInputs = [ pkgconfig audiofile ] ++
+  nativeBuildInputs = [ pkgconfig audiofile ] ++
     stdenv.lib.optional openglSupport [ mesa ] ++
     stdenv.lib.optional alsaSupport alsaLib;
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
   # to fail at doing this, hence `--disable-pulseaudio-shared'.
-  configureFlags = configureFlagsFun { inherit alsaLib; };
+  configureFlags = configureFlagsFun { inherit alsaLib alsaSupport; };
 
   crossAttrs = {
-      configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
+    configureFlags = configureFlagsFun {
+      alsaSupport = stdenv.cross.config != "x86_64-w64-mingw32";
+      alsaLib = alsaLib.crossDrv;
+    } + "--disable-directx";
   };
 
   passthru = {inherit openglSupport;};

From 4f69722ee55cd1a685da069e6683f1af9eae645b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Feb 2014 06:46:07 +0100
Subject: [PATCH 0016/2033] lua52/cross: Allow to cross-compile to mingw-w64.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/interpreters/lua-5/5.2.nix | 25 ++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 70ab0c3bdf8..609c6b3e404 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "004zyh9p3lpvbwhyhlmrw6wwcia5abx84q4h2brkn4zdypipvmiz";
   };
 
-  buildInputs = [ readline ];
+  nativeBuildInputs = [ readline ];
 
   patches = [ dsoPatch ];
 
@@ -49,6 +49,29 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  crossAttrs = let
+    isMingwW64 = stdenv.cross.config == "x86_64-w64-mingw32";
+  in {
+    configurePhase = ''
+      makeFlagsArray=(
+        INSTALL_TOP=$out
+        INSTALL_MAN=$out/share/man/man1
+        CC=${stdenv.cross.config}-gcc
+        STRIP=:
+        RANLIB=${stdenv.cross.config}-ranlib
+        V=${majorVersion}
+        R=${version}
+        ${stdenv.lib.optionals isMingwW64 "mingw"}
+      )
+    '' + stdenv.lib.optionalString isMingwW64 ''
+      installFlagsArray=(
+        TO_BIN="lua.exe luac.exe"
+        TO_LIB="liblua.a lua52.dll"
+        INSTALL_DATA="cp -d"
+      )
+    '';
+  };
+
   meta = {
     homepage = "http://www.lua.org";
     description = "Powerful, fast, lightweight, embeddable scripting language";

From c5ab2bfd258501cbe5f440089039aff8e7595e3c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Feb 2014 18:28:32 +0100
Subject: [PATCH 0017/2033] gcc-cross-wrapper: Explicitly add LD program name.

This is because autoconf is passing -print-prog-name=ld to the
cross-gcc, which in turn assumes a FHS compliant filesystem hierarchy
and searches ../../../../$crossConfig/bin/ld for the correct ld.

Of course, this won't work on Nix, hence we're explicitly passing the
correct LD program name.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
index 433d36ced43..497047a73b1 100644
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@@ -70,6 +70,8 @@ fi
 
 if test "$dontSetConfigureCross" != "1"; then
     configureFlags="$configureFlags --build=$system --host=$crossConfig"
+    # This is because -print-prog-name tries to search FHS paths.
+    configureFlags="$configureFlags LD=$crossConfig-ld"
 fi
 # Disabling the tests when cross compiling, as usually the tests are meant for
 # native compilations.

From ae0b5d6813362492e744b1ac10e21309bb4e238b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:22:12 +0100
Subject: [PATCH 0018/2033] libgcrypt/cross: Fix build for mingw-w64.

Especially for the 64bit mingw target, because libgcrypt contains
protected mode assembly.

Also, this adds gettext to the crossAttrs of libgpg-error, because it
tries to regenerate the MO files.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libgcrypt/1.6.nix        | 6 ++++++
 pkgs/development/libraries/libgpg-error/default.nix | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
index ea981f7ed12..9dc8b8a2317 100644
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
     make check
   '';
 
+  crossAttrs = let
+    isCross64 = stdenv.cross.config == "x86_64-w64-mingw32";
+  in stdenv.lib.optionalAttrs isCross64 {
+    configureFlags = [ "--disable-asm" "--disable-padlock-support" ];
+  };
+
   meta = {
     description = "GNU Libgcrypt, a general-pupose cryptographic library";
 
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index da142a957ad..8ce9a10701e 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash }:
+{ stdenv, fetchurl, bash, gettext }:
 
 stdenv.mkDerivation (rec {
   name = "libgpg-error-1.12";
@@ -8,6 +8,10 @@ stdenv.mkDerivation (rec {
     sha256 = "0pz58vr12qihq2f0bypjxsb6cf6ajq5258fmfm8s6lvwm3b9xz6a";
   };
 
+  # If architecture-dependant MO files aren't available, they're generated
+  # during build, so we need gettext for cross-builds.
+  crossAttrs.buildInputs = [ gettext ];
+
   doCheck = true;
 
   meta = {

From e64b342fa8fda783a7247e0469943ce728498004 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:31:18 +0100
Subject: [PATCH 0019/2033] Use mingw-w64 for 32bit Windows builds as well.

Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/gcc/4.6/default.nix    |  6 ++----
 pkgs/development/compilers/gcc/4.8/default.nix    |  6 ++----
 pkgs/development/interpreters/lua-5/5.2.nix       |  6 +++---
 pkgs/development/libraries/SDL/default.nix        |  2 +-
 pkgs/development/libraries/glew/default.nix       |  2 +-
 pkgs/development/libraries/pcre/default.nix       |  2 +-
 pkgs/development/libraries/qt-4.x/4.8/default.nix |  3 +--
 pkgs/os-specific/windows/mingw-w64/default.nix    |  2 +-
 pkgs/top-level/all-packages.nix                   |  8 ++------
 pkgs/top-level/release-cross.nix                  | 11 +++++------
 10 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 3ed0f7ad0e6..af111322698 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -159,10 +159,8 @@ let version = "4.6.3";
             # In any case, mingw32 g++ linking is broken by default with shared libs,
             # unless adding "-lsupc++" to any linking command. I don't know why.
             " --disable-shared" +
-            (if cross.config == "x86_64-w64-mingw32" then
-              # To keep ABI compatibility with upstream mingw-w64
-              " --enable-fully-dynamic-string"
-              else "")
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index aea52593323..e2c887c368f 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -175,10 +175,8 @@ let version = "4.8.2";
             # In any case, mingw32 g++ linking is broken by default with shared libs,
             # unless adding "-lsupc++" to any linking command. I don't know why.
             " --disable-shared" +
-            (if cross.config == "x86_64-w64-mingw32" then
-              # To keep ABI compatibility with upstream mingw-w64
-              " --enable-fully-dynamic-string"
-              else "")
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
             else (if cross.libc == "uclibc" then
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 609c6b3e404..b8fcbe5f242 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingwW64 = stdenv.cross.config == "x86_64-w64-mingw32";
+    isMingw = stdenv.cross.libc == "msvcrt";
   in {
     configurePhase = ''
       makeFlagsArray=(
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
         RANLIB=${stdenv.cross.config}-ranlib
         V=${majorVersion}
         R=${version}
-        ${stdenv.lib.optionals isMingwW64 "mingw"}
+        ${stdenv.lib.optionals isMingw "mingw"}
       )
-    '' + stdenv.lib.optionalString isMingwW64 ''
+    '' + stdenv.lib.optionalString isMingw ''
       installFlagsArray=(
         TO_BIN="lua.exe luac.exe"
         TO_LIB="liblua.a lua52.dll"
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 0df130b11fb..56ac04bebe6 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     configureFlags = configureFlagsFun {
-      alsaSupport = stdenv.cross.config != "x86_64-w64-mingw32";
+      alsaSupport = stdenv.cross.libc != "msvcrt";
       alsaLib = alsaLib.crossDrv;
     } + "--disable-directx";
   };
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index b79fa97047b..32083f96dfd 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     "CC=${stdenv.cross.config}-gcc"
     "LD=${stdenv.cross.config}-gcc"
     "STRIP="
-  ] ++ optional (stdenv.cross.config == "x86_64-w64-mingw32") "SYSTEM=mingw";
+  ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw";
 
   meta = {
     description = "An OpenGL extension loading library for C(++)";
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 067c3af4387..7138c44da64 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra
 
-  crossAttrs = optionalAttrs (stdenv.cross.config == "x86_64-w64-mingw32") {
+  crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") {
     buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
   };
 
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 16bd1ee65d2..1bd027f5298 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -148,8 +148,7 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingw = stdenv.cross.config == "i686-pc-mingw32" ||
-      stdenv.cross.config == "x86_64-w64-mingw32";
+    isMingw = stdenv.cross.libc == "msvcrt";
   in {
     # I've not tried any case other than i686-pc-mingw32.
     # -nomake tools:   it fails linking some asian language symbols
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index c5b6017aae4..bf15b208e1a 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
   preConfigure = ''
     cd mingw-w64-headers
   '';
-  configureFlags = "--without-crt --host=x86_64-w64-mingw32";
+  configureFlags = "--without-crt";
 } else if onlyPthreads then {
   name = name + "-pthreads";
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 133ef21060c..952fe59734d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2419,9 +2419,7 @@ let
 
   gccCrossStageStatic = let
       isMingw = (stdenv.cross.libc == "msvcrt");
-      isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32";
-      libcCross1 = if isMingw64 then windows.mingw_w64_headers else
-                   if isMingw then windows.mingw_headers1 else null;
+      libcCross1 = if isMingw then windows.mingw_w64_headers else null;
     in
       wrapGCCCross {
       gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
@@ -4235,9 +4233,7 @@ let
   # We can choose:
   libcCrossChooser = name : if name == "glibc" then glibcCross
     else if name == "uclibc" then uclibcCross
-    else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then
-      windows.mingw_w64
-    else if name == "msvcrt" then windows.mingw_headers3
+    else if name == "msvcrt" then windows.mingw_w64
     else throw "Unknown libc";
 
   libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index 6871567ca8d..cef3d2dffbd 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -140,11 +140,11 @@ in {
   crossUltraSparcLinux = mapTestOnCross crossSystem basic;
 }) // (
 
-/* Test some cross builds on mingw32 */
+/* Test some cross builds on 32 bit mingw-w64 */
 let
   crossSystem = {
-      config = "i686-pc-mingw32";
-      arch = "x86";
+      config = "i686-w64-mingw32";
+      arch = "x86"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
       platform = {};
   };
@@ -161,11 +161,10 @@ in {
   };
 }) // (
 
-/* Test some cross builds on mingw-w64 */
+/* Test some cross builds on 64 bit mingw-w64 */
 let
   crossSystem = {
-      # That's the triplet they use in the mingw-w64 docs,
-      # and it's relevant for nixpkgs conditions.
+      # That's the triplet they use in the mingw-w64 docs.
       config = "x86_64-w64-mingw32";
       arch = "x86_64"; # Irrelevant
       libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain

From a3cf381435345d25d9deeab8f5684d937cfc83e1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Mar 2014 22:36:43 +0100
Subject: [PATCH 0020/2033] SDL/cross: Drop --disable-directx.

This is no longer needed, because we've already fixed the dynamic
cross-linker.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/SDL/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 56ac04bebe6..89646f2e3e3 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     configureFlags = configureFlagsFun {
       alsaSupport = stdenv.cross.libc != "msvcrt";
       alsaLib = alsaLib.crossDrv;
-    } + "--disable-directx";
+    };
   };
 
   passthru = {inherit openglSupport;};

From 5e565754abcfcb726510e2f6c205b5b6bd0e091f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 02:57:48 +0100
Subject: [PATCH 0021/2033] Add new package "xpwn" from @dborca's fork.

This really hase some nice utilities for coping with HFS+ and DMG
format. We're going to use it for extracting the xcode DMG, but it could
be used for more, even generating DMGs.

The reason I'm using the fork instead of the repository from
@planetbeing is thet the fork contains a few fixes, especially for
dealing with symlinks in HFS+ images.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/mobile/xpwn/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/mobile/xpwn/default.nix

diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix
new file mode 100644
index 00000000000..b248107141f
--- /dev/null
+++ b/pkgs/development/mobile/xpwn/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake, zlib, libpng, bzip2, libusb, openssl }:
+
+stdenv.mkDerivation {
+  name = "xpwn-0.5.8git";
+
+  src = fetchgit {
+    url = "git://github.com/dborca/xpwn.git";
+    rev = "4534da88d4e8a32cdc9da9b5326e2cc482c95ef0";
+    sha256 =
+      "1h1ak40fg5bym0hifpii9q2hqdp2m387cwfzb4bl6qq36xpkd6wv";
+  };
+
+  preConfigure = ''
+    sed -r -i \
+      -e 's/(install.*TARGET.*DESTINATION )\.\)/\1bin)/' \
+      -e 's!(install.*(FILE|DIR).*DESTINATION )([^)]*)!\1share/xpwn/\3!' \
+      */CMakeLists.txt
+    sed -i -e '/install/d' CMakeLists.txt
+  '';
+
+  buildInputs = [ cmake zlib libpng bzip2 libusb openssl ];
+
+  meta = {
+    homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
+    description = "Custom NOR firmware loader/IPSW generator for the iPhone";
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cd584e6f1f..9ab8331bce9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3825,6 +3825,8 @@ let
 
   xmlindent = callPackage ../development/web/xmlindent {};
 
+  xpwn = callPackage ../development/mobile/xpwn {};
+
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };

From 83dd414ca221a8aff18a03b3ef9716fe0ca7d06d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 03:39:33 +0100
Subject: [PATCH 0022/2033] Add new package for Apple's XCode.

This package provides the SDK and standard library needed for
cross-compiling to Mac US X. We're using xpwn here to extract the DMG.

Also, this version (XCode 5.0.2) only contains the SDKs for version 10.9
and 10.8, so we might need to add requireFile directives for older
versions as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/xcode/default.nix | 37 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/xcode/default.nix

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
new file mode 100644
index 00000000000..671e73a0fa5
--- /dev/null
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, requireFile, xpwn }:
+
+stdenv.mkDerivation rec {
+  name = "xcode-${version}";
+  version = "5.0.2";
+
+  src = requireFile {
+    name = "xcode_${version}.dmg";
+    url = meta.homepage;
+    sha256 = "0mrligqkfqwx8cy883pxm4w5w7a17nfh227zdspfll23r9agf32k";
+  };
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  unpackCmd = let
+    basePath = "Xcode.app/Contents/Developer/Platforms/MacOSX.platform";
+    sdkPath = "${basePath}/Developer/SDKs";
+  in ''
+    ${xpwn}/bin/dmg extract "$curSrc" main.hfs > /dev/null
+    ${xpwn}/bin/hfsplus main.hfs extractall "${sdkPath}" > /dev/null
+  '';
+
+  setSourceRoot = "sourceRoot=MacOSX10.9.sdk";
+
+  installPhase = ''
+    ensureDir "$out/share/sysroot"
+    cp -a * "$out/share/sysroot/"
+    ln -s "$out/usr/lib" "$out/lib"
+    ln -s "$out/usr/include" "$out/include"
+  '';
+
+  meta = {
+    homepage = "https://developer.apple.com/downloads/";
+    description = "Apple's XCode SDK";
+    license = stdenv.lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ab8331bce9..93caa5c7796 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6546,6 +6546,8 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
+  darwin.xcode = callPackage ../os-specific/darwin/xcode { };
+
   devicemapper = lvm2;
 
   dmidecode = callPackage ../os-specific/linux/dmidecode { };

From dd10bb3181928bac42e5213125887d62555d6a3a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 03:57:48 +0100
Subject: [PATCH 0023/2033] Add a cross-platform port of cctools.

This basically is binutils for Mac OS X, but ported to work on
(GNU/)Linux and FreeBSD.

And it's up-to-date as well! I'm mentioning this, because it was quite
hard to find a recent port of it and I just accidentally stumbled on it
while trying to do the port by myself.

So thanks to @tpoechtrager for doing this.

Also, I've added two more patches, which essentially are:

 * ld-rpath-nonfinal:
     This allows -rpath to be used for linking non-final builds, which
     was allowed for earlier versions of cctools and got a check for
     that in more recent versions.

 * ld-ignore-rpath-link:
     Ignores the -rpath-link option, because the cross-wrapper uses it
     in different places. Unfortunately, the cctools linker doesn't
     support it, so we might need to implement this later if it's
     possible (I'm not a Mach-O man^H^H^Hexpert).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../darwin/cctools-port/default.nix           | 55 +++++++++++++++++++
 .../cctools-port/ld-ignore-rpath-link.patch   | 16 ++++++
 .../cctools-port/ld-rpath-nonfinal.patch      | 31 +++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++-
 4 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/cctools-port/default.nix
 create mode 100644 pkgs/os-specific/darwin/cctools-port/ld-ignore-rpath-link.patch
 create mode 100644 pkgs/os-specific/darwin/cctools-port/ld-rpath-nonfinal.patch

diff --git a/pkgs/os-specific/darwin/cctools-port/default.nix b/pkgs/os-specific/darwin/cctools-port/default.nix
new file mode 100644
index 00000000000..0d40409a994
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools-port/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, cross, fetchurl, autoconf, automake, libtool
+, libcxx, llvm, clang, openssl, libuuid
+}:
+
+stdenv.mkDerivation rec {
+  name = "cctools-port-${version}";
+  version = "845";
+
+  src = fetchurl {
+    url = "https://github.com/tpoechtrager/cctools-port/archive/"
+        + "cctools-${version}-ld64-136-1.tar.gz";
+    sha256 = "06pg6h1g8avgx4j6cfykdpggf490li796gzhhyqn27jsagli307i";
+  };
+
+  buildInputs = [
+    autoconf automake libtool libcxx llvm clang openssl libuuid
+  ];
+
+  patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    patchShebangs tools
+    sed -i -e 's/which/type -P/' tools/*.sh
+    sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
+
+    # Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157
+    cat > cctools/include/unistd.h <<EOF
+    #ifdef __block
+    #  undef __block
+    #  include_next "unistd.h"
+    #  define __block __attribute__((__blocks__(byref)))
+    #else
+    #  include_next "unistd.h"
+    #endif
+    EOF
+  '';
+
+  preConfigure = ''
+    cd cctools
+    sh autogen.sh
+  '';
+
+  configureFlags = [
+    "CXXFLAGS=-I${libcxx}/include/c++/v1"
+    "--target=${cross.config}"
+  ];
+
+  meta = {
+    homepage = "http://www.opensource.apple.com/source/cctools/";
+    description = "Mac OS X Compiler Tools (cross-platform port)";
+    license = stdenv.lib.licenses.apsl20;
+  };
+}
diff --git a/pkgs/os-specific/darwin/cctools-port/ld-ignore-rpath-link.patch b/pkgs/os-specific/darwin/cctools-port/ld-ignore-rpath-link.patch
new file mode 100644
index 00000000000..fc87f69ac32
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools-port/ld-ignore-rpath-link.patch
@@ -0,0 +1,16 @@
+diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
+index 2565518..9250016 100644
+--- a/cctools/ld64/src/ld/Options.cpp
++++ b/cctools/ld64/src/ld/Options.cpp
+@@ -2522,6 +2522,11 @@ void Options::parse(int argc, const char* argv[])
+ 					throw "missing argument to -rpath";
+ 				fRPaths.push_back(path);
+ 			}
++			else if ( strcmp(arg, "-rpath-link") == 0 ) {
++				const char* path = argv[++i];
++				if ( path == NULL )
++					throw "missing argument to -rpath-link";
++			}
+ 			else if ( strcmp(arg, "-read_only_stubs") == 0 ) {
+ 				fReadOnlyx86Stubs = true;
+ 			}
diff --git a/pkgs/os-specific/darwin/cctools-port/ld-rpath-nonfinal.patch b/pkgs/os-specific/darwin/cctools-port/ld-rpath-nonfinal.patch
new file mode 100644
index 00000000000..265d0d30477
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools-port/ld-rpath-nonfinal.patch
@@ -0,0 +1,31 @@
+diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
+index 9250016..91d54ec 100644
+--- a/cctools/ld64/src/ld/Options.cpp
++++ b/cctools/ld64/src/ld/Options.cpp
+@@ -4175,23 +4175,9 @@ void Options::checkIllegalOptionCombinations()
+ 		throw "-r and -dead_strip cannot be used together";
+ 
+ 	// can't use -rpath unless targeting 10.5 or later
+-	if ( fRPaths.size() > 0 ) {
+-		if ( !minOS(ld::mac10_5, ld::iOS_2_0) )
+-			throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
+-		switch ( fOutputKind ) {
+-			case Options::kDynamicExecutable:
+-			case Options::kDynamicLibrary:
+-			case Options::kDynamicBundle:
+-				break;
+-			case Options::kStaticExecutable:
+-			case Options::kObjectFile:
+-			case Options::kDyld:
+-			case Options::kPreload:
+-			case Options::kKextBundle:
+-				throw "-rpath can only be used when creating a dynamic final linked image";
+-		}
+-	}
+-	
++	if ( fRPaths.size() > 0 && !minOS(ld::mac10_5, ld::iOS_2_0) )
++		throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
++
+ 	if ( fPositionIndependentExecutable ) {
+ 		switch ( fOutputKind ) {
+ 			case Options::kDynamicExecutable:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93caa5c7796..dfe977678ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6546,7 +6546,13 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
-  darwin.xcode = callPackage ../os-specific/darwin/xcode { };
+  darwin = {
+    cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
+      cross = assert crossSystem != null; crossSystem;
+    });
+
+    xcode = callPackage ../os-specific/darwin/xcode {};
+  };
 
   devicemapper = lvm2;
 

From 9a0a85827c3bc903d7c82f251fa129e91f457e85 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 04:10:34 +0100
Subject: [PATCH 0024/2033] gcc-4.8: Hook in cross-darwin libc and binutils.

Let's finally hook everything into the existing cross-building
infrastructure. We're using --with-sysroot instead of --with-headers
here, because the XCode SDK contains references to /usr/lib.

I've tried to patch those references, but unfortunately (at least with
install_name_tool) it isn't possible to change those refernces in stub
dylibs.

So after bugging @tpoechtrager with annoying questions (thanks again), I
think my initial approach (patching the SDK itself and/or regenerating
the dylib stubs) was way to complicated so I ended up with this
implementation.

Also, I've added a condition to binutilsCross to use cctools if the libc
is set to libSystem. This might need some cleanups someday, mainly to
figure out how to properly bridge cctools and binutils.

So, as an example on how to cross-compile GNU Hello to Darwin, you can
use something like this:

(import <nixpkgs> {
  crossSystem = {
    config = "x86_64-apple-darwin13";
    arch = "x86_64";
    libc = "libSystem";
    platform = {};
  };
}).hello.crossDrv

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/gcc/4.8/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix                | 17 +++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index aea52593323..8a8a80c090a 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -117,7 +117,8 @@ let version = "4.8.2";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = (cross != null && cross.libc == "msvcrt");
+    crossMingw = cross != null && cross.libc == "msvcrt";
+    crossDarwin = cross != null && cross.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = stdenv.cross.gcc.arch or null;
         gccCpu = stdenv.cross.gcc.cpu or null;
@@ -161,7 +162,12 @@ let version = "4.8.2";
           " --disable-shared" +
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          " --with-headers=${libcCross}/include" +
+          (if crossDarwin then
+            " --with-sysroot=${libcCross}/share/sysroot" +
+            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
+            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+            else
+            " --with-headers=${libcCross}/include") +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfe977678ff..f65d493b9d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2430,8 +2430,10 @@ let
   gccCrossStageStatic = let
       isMingw = (stdenv.cross.libc == "msvcrt");
       isMingw64 = isMingw && stdenv.cross.config == "x86_64-w64-mingw32";
+      isDarwin = stdenv.cross.libc == "libSystem";
       libcCross1 = if isMingw64 then windows.mingw_w64_headers else
-                   if isMingw then windows.mingw_headers1 else null;
+                   if isMingw then windows.mingw_headers1 else
+                   if isDarwin then darwin.xcode else null;
     in
       wrapGCCCross {
       gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
@@ -3452,11 +3454,13 @@ let
     gold = false;
   });
 
-  binutilsCross = lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
-    inherit stdenv fetchurl zlib;
-    noSysDirs = true;
-    cross = assert crossSystem != null; crossSystem;
-  }));
+  binutilsCross =
+    if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools
+    else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
+      inherit stdenv fetchurl zlib;
+      noSysDirs = true;
+      cross = assert crossSystem != null; crossSystem;
+    }));
 
   bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { };
   bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { };
@@ -4249,6 +4253,7 @@ let
     else if name == "msvcrt" && stdenv.cross.config == "x86_64-w64-mingw32" then
       windows.mingw_w64
     else if name == "msvcrt" then windows.mingw_headers3
+    else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
   libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;

From 46e90f76c6d73a8ecd33cb8e3bfaff50b20f32e0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 21:36:43 +0100
Subject: [PATCH 0025/2033] tzdata: Provide lib as an additional output.

We're already using tzcode inside tzdata, so let's make it available as
an output here. The reason we need it is in order to compile OpenCFLite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/data/misc/tzdata/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index da043da0967..57b1dddbda5 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -17,13 +17,17 @@ stdenv.mkDerivation rec {
     ];
 
   sourceRoot = ".";
+  outputs = [ "out" "lib" ];
 
-  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(TMPDIR)/lib MANDIR=$(TMPDIR)/man AWK=awk";
+  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk";
 
   postInstall =
     ''
       mv $out/share/zoneinfo-posix $out/share/zoneinfo/posix
       mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
+
+      ensureDir "$lib/include"
+      cp tzfile.h "$lib/include/tzfile.h"
     '';
 
   meta = {

From a9ef42f33ca4ea209c810ee42bf801eb485c68ad Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 21:41:56 +0100
Subject: [PATCH 0026/2033] gcc-4.8: Add ObjC and ObjC++ support for Darwin.

Cross-compiling stuff against Mac OS X's CoreFoundation won't work
without ObjC support, and we don't want to compile commandline utilities
only, right?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/gcc/4.8/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 8a8a80c090a..92bfdb683bb 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -352,6 +352,7 @@ stdenv.mkDerivation ({
         ++ optional langAda      "ada"
         ++ optional langVhdl     "vhdl"
         ++ optional langGo       "go"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
         )
       )
     }

From c0d55fcc6ab1ac2c634e2b518440b26378b7abd7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 21:46:09 +0100
Subject: [PATCH 0027/2033] xcode: Provide the commandline toolchain as well.

This toolchain contains Mach-O binaries and might not be useful in the
first place, but there are programs like dsymutil, where Apple didn't
release the source code, so we need a Mach-O loader...

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/xcode/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 671e73a0fa5..5c8e7a3ef6c 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  outputs = [ "out" "toolchain" ];
 
   unpackCmd = let
     basePath = "Xcode.app/Contents/Developer/Platforms/MacOSX.platform";
@@ -25,8 +26,15 @@ stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir "$out/share/sysroot"
     cp -a * "$out/share/sysroot/"
-    ln -s "$out/usr/lib" "$out/lib"
-    ln -s "$out/usr/include" "$out/include"
+    ln -s "$out/share/sysroot/usr/lib" "$out/lib"
+    ln -s "$out/share/sysroot/usr/include" "$out/include"
+
+    ensureDir "$toolchain"
+    pushd "$toolchain"
+    ${xpwn}/bin/hfsplus "$(dirs +1)/../main.hfs" extractall \
+      Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr \
+      > /dev/null
+    popd
   '';
 
   meta = {

From 53a267e535381e33e7c6f0eabda56a8b04027e36 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 21:59:26 +0100
Subject: [PATCH 0028/2033] darwin: Add new package opencflite.

This provides a port of Mac OS X's CoreFoundation and is needed if we
want to be able to run dsymutil using maloader.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../os-specific/darwin/opencflite/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/opencflite/default.nix

diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
new file mode 100644
index 00000000000..a2408bfc5c8
--- /dev/null
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, icu, libuuid, tzdata }:
+
+stdenv.mkDerivation rec {
+  name = "opencflite-${version}";
+  version = "476.19.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opencflite/${name}.tar.gz";
+    sha256 = "0jgmzs0ycl930hmzcvx0ykryik56704yw62w394q1q3xw5kkjn9v";
+  };
+
+  configureFlags = [ "--with-uuid=${libuuid}" ];
+  buildInputs = [ icu tzdata.lib ];
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Cross platform port of the OS X CoreFoundation";
+    homepage = "http://sourceforge.net/projects/opencflite/";
+    license = stdenv.lib.licenses.apsl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f65d493b9d6..514f5c24b32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6556,6 +6556,8 @@ let
       cross = assert crossSystem != null; crossSystem;
     });
 
+    opencflite = callPackage ../os-specific/darwin/opencflite {};
+
     xcode = callPackage ../os-specific/darwin/xcode {};
   };
 

From 45cd9994bc01641d0ed9ed9691cfdfa15fb87a54 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:02:46 +0100
Subject: [PATCH 0029/2033] darwin: Add new package maloader.

This is the mentioned Mach-O loader that we're yoing to use to execute
Apple's proprietary binaries.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/maloader/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  6 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/maloader/default.nix

diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix
new file mode 100644
index 00000000000..f5bfe890735
--- /dev/null
+++ b/pkgs/os-specific/darwin/maloader/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, opencflite, clang, libcxx }:
+
+stdenv.mkDerivation {
+  name = "maloader-0git";
+
+  src = fetchgit {
+    url = "git://github.com/shinh/maloader.git";
+    rev = "5f220393e0b7b9ad0cf1aba0e89df2b42a1f0442";
+    sha256 = "07j9b7n0grrbxxyn2h8pnk6pa8b370wq5z5zwbds8dlhi7q37rhn";
+  };
+
+  postPatch = ''
+    sed -i \
+      -e '/if.*loadLibMac.*mypath/s|mypath|"'"$out/lib/"'"|' \
+      -e 's|libCoreFoundation\.so|${opencflite}/lib/&|' \
+      ld-mac.cc
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${libcxx}/include/c++/v1";
+  buildInputs = [ clang libcxx ];
+  buildFlags = [ "USE_LIBCXX=1" "release" ];
+
+  installPhase = ''
+    install -vD libmac.so "$out/lib/libmac.so"
+
+    for bin in extract macho2elf ld-mac; do
+      install -vD "$bin" "$out/bin/$bin"
+    done
+  '';
+
+  meta = {
+    description = "Mach-O loader for Linux";
+    homepage = "https://github.com/shinh/maloader";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 514f5c24b32..c6ea2cbc3fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6551,11 +6551,15 @@ let
 
   cramfsswap = callPackage ../os-specific/linux/cramfsswap { };
 
-  darwin = {
+  darwin = rec {
     cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
       cross = assert crossSystem != null; crossSystem;
     });
 
+    maloader = callPackage ../os-specific/darwin/maloader {
+      inherit opencflite;
+    };
+
     opencflite = callPackage ../os-specific/darwin/opencflite {};
 
     xcode = callPackage ../os-specific/darwin/xcode {};

From 3940b219882f873314cd36c261cf807e94fa5f3b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:08:51 +0100
Subject: [PATCH 0030/2033] cctools-port: Pass through wrapped XCToolchain.

At the moment, this includes only dyldinfo, dwarfdump and dsymutil, but
we'll see whether we need more of these utilities later.

Tho reason those are wrapped in cctools-port is because it is the
binutils used to cross-compile for Mac OS X.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/cctools-port/default.nix | 11 ++++++++++-
 pkgs/top-level/all-packages.nix                  |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/cctools-port/default.nix b/pkgs/os-specific/darwin/cctools-port/default.nix
index 0d40409a994..cdc259c1e2a 100644
--- a/pkgs/os-specific/darwin/cctools-port/default.nix
+++ b/pkgs/os-specific/darwin/cctools-port/default.nix
@@ -1,5 +1,6 @@
 { stdenv, cross, fetchurl, autoconf, automake, libtool
 , libcxx, llvm, clang, openssl, libuuid
+, maloader, makeWrapper, xctoolchain
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool libcxx llvm clang openssl libuuid
+    autoconf automake libtool libcxx llvm clang openssl libuuid makeWrapper
   ];
 
   patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ];
@@ -47,6 +48,14 @@ stdenv.mkDerivation rec {
     "--target=${cross.config}"
   ];
 
+  postInstall = ''
+    for tool in dyldinfo dwarfdump dsymutil; do
+      makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${cross.config}-$tool" \
+        --add-flags "${xctoolchain}/bin/$tool"
+      ln -s "$out/bin/${cross.config}-$tool" "$out/bin/$tool"
+    done
+  '';
+
   meta = {
     homepage = "http://www.opensource.apple.com/source/cctools/";
     description = "Mac OS X Compiler Tools (cross-platform port)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6ea2cbc3fe..9109e1e5952 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6554,6 +6554,8 @@ let
   darwin = rec {
     cctools = forceNativeDrv (callPackage ../os-specific/darwin/cctools-port {
       cross = assert crossSystem != null; crossSystem;
+      inherit maloader;
+      xctoolchain = xcode.toolchain;
     });
 
     maloader = callPackage ../os-specific/darwin/maloader {

From 745c4779305490816682bb95b319923d27c4a8fe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:17:04 +0100
Subject: [PATCH 0031/2033] lua5.2/cross: Fix build for Darwin.

The ld from cctools doesn't like the -soname argument, so let's strip it
off for now until we have a binutils <-> cctools bridge.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/interpreters/lua-5/5.2.nix | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 70ab0c3bdf8..c496d14083e 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -49,6 +49,30 @@ stdenv.mkDerivation rec {
     EOF
   '';
 
+  crossAttrs = let
+    isDarwin = stdenv.cross.libc == "libSystem";
+  in {
+    configurePhase = ''
+      makeFlagsArray=(
+        INSTALL_TOP=$out
+        INSTALL_MAN=$out/share/man/man1
+        CC=${stdenv.cross.config}-gcc
+        STRIP=:
+        RANLIB=${stdenv.cross.config}-ranlib
+        V=${majorVersion}
+        R=${version}
+        ${stdenv.lib.optionalString isDarwin ''
+        AR="${stdenv.cross.config}-ar rcu"
+        macosx
+        ''}
+      )
+    '';
+  } // stdenv.lib.optionalAttrs isDarwin {
+    postPatch = ''
+      sed -i -e 's/-Wl,-soname[^ ]* *//' src/Makefile
+    '';
+  };
+
   meta = {
     homepage = "http://www.lua.org";
     description = "Powerful, fast, lightweight, embeddable scripting language";

From 3d73bf6c57d9406accfdbe89a46f38c492364ec3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:22:21 +0100
Subject: [PATCH 0032/2033] glew/cross: Fix build for Darwin.

The Makefile still contained calls to install with the -s (strip)
option, which we don't want because it uses the native strip utility and
we're going to crossStrip in fixupPhase later anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/glew/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index ef81f210d39..1106a013949 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "glew-1.10.0";
 
@@ -14,6 +16,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i 's|lib64|lib|' config/Makefile.linux
+    ${optionalString (stdenv ? cross) ''
+    sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
+    ''}
   '';
 
 buildPhase = "make all";
@@ -25,6 +30,13 @@ buildPhase = "make all";
     cp -r README.txt LICENSE.txt doc $out/share/doc/glew
   '';
 
+  crossAttrs.makeFlags = [
+    "CC=${stdenv.cross.config}-gcc"
+    "LD=${stdenv.cross.config}-gcc"
+    "AR=${stdenv.cross.config}-ar"
+    "STRIP="
+  ] ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
+
   meta = {
     description = "An OpenGL extension loading library for C(++)";
     homepage = http://glew.sourceforge.net/;

From 30962765e07336eecfe959d5834f8d4eecc56df4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:27:54 +0100
Subject: [PATCH 0033/2033] openssl/cross: Fix build for Darwin.

This is just a minor fix, because when using "darwin64-x86_64-cc" for
config.openssl.system, the OpenSSL build scripts try to compile with
$prefix-cc, which is not available with the gcc-cross-wrapper.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/openssl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7d7ccacd14a..4dd63078d66 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -91,6 +91,8 @@ stdenv.mkDerivation {
       rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
     '';
     configureScript = "./Configure";
+  } // stdenv.lib.optionalAttrs (opensslCrossSystem == "darwin64-x86_64-cc") {
+    CC = "gcc";
   };
 
   meta = {

From 8c053312b5633c0e180edff68335b3652cc5c6df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Mar 2014 22:30:13 +0100
Subject: [PATCH 0034/2033] zlib/cross: Fix build for Darwin.

Provide the correct cross ranlib, because native ranlib will fail.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/zlib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 0d4abaf25e0..37675e4a5bc 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
       "-f" "win32/Makefile.gcc"
       "PREFIX=${stdenv.cross.config}-"
     ] ++ (if static then [] else [ "SHARED_MODE=1" ]);
+  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
+    makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };
 
   # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.

From 2d17335f6869f88e5bbcef4f1c7a3329e5860ccb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:21:17 +0100
Subject: [PATCH 0035/2033] gcc-cross-wrapper: Allow to pass US X min version.

This allows to pass a new attribute osxMinVersion to crossSystem, which
specifies the minimum Mac OS X version you want to be compatible to.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/gcc-cross-wrapper/builder.sh  | 4 ++++
 pkgs/build-support/gcc-cross-wrapper/default.nix | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 5a5bd45a8f8..18d26b3e945 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -26,6 +26,10 @@ if test -z "$nativeLibc"; then
       fi
     fi
 
+    if [ -n "$osxMinVersion" ]; then
+        cflagsCompile="$cflagsCompile -mmacosx-version-min=$osxMinVersion"
+    fi
+
     echo "$cflagsCompile -B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
 
     echo "-L$libc/lib -rpath $libc/lib -rpath-link $libc/lib" > $out/nix-support/libc-ldflags
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix
index b2e30be10ef..d3494b83a87 100644
--- a/pkgs/build-support/gcc-cross-wrapper/default.nix
+++ b/pkgs/build-support/gcc-cross-wrapper/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation {
   addFlags = ./add-flags;
   inherit nativeTools nativeLibc nativePrefix gcc libc binutils;
   crossConfig = if cross != null then cross.config else null;
+  osxMinVersion = cross.osxMinVersion or null;
   gccLibs = if gcc != null then gccLibs else null;
   name = chosenName;
   langC = if nativeTools then true else gcc.langC;

From 5e95800f267a848e4a75591363872c5eb10f3ee5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:25:54 +0100
Subject: [PATCH 0036/2033] openssl: Use Darwin patch for cross-builds too.

Might be better to have something like stdenv.isDarwinTarget, which can
be used to test for native Darwin _and_ cross-built Darwin as a target.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/openssl/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4dd63078d66..39e6cb3692d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,7 +8,9 @@ let
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
 
-  patchesCross = isCross:
+  patchesCross = isCross: let
+    isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
+  in
     [ # Allow the location of the X509 certificate file (the CA
       # bundle) to be set through the environment variable
       # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
@@ -29,7 +31,7 @@ let
           ./kfreebsd-gnu.patch
         ]
 
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
 
 in
 

From f73851710ebe3d951fb98ee286f42e4398243333 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:28:21 +0100
Subject: [PATCH 0037/2033] audiofile: Use alsaLib for native Linux only.

Using ALSA for non-Linux systems really doesn't make much sense, so
using buildNativeInputs to ensure it won't be used for cross-builds.

Of course, if you're cross-building to Linux, the dependency won't be
used, but right now we don't have a good way to easily check whether the
cross target is Linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/audiofile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index a5fd80dc0db..c8fb8c53dc0 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "audiofile-0.3.6";
 
-  buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
+  nativeBuildInputs = stdenv.lib.optional stdenv.isLinux alsaLib;
 
   src = fetchurl {
     url = "http://audiofile.68k.org/${name}.tar.gz";

From cdaced58aec376965e3e5ee422e098df526e4726 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:34:42 +0100
Subject: [PATCH 0038/2033] libpng12/cross: Don't add zlib for Darwin builds.

Cross builds for Darwin already include the CoreFoundation and the
libraries from XCode, so zlib already exists on that platform.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libpng/12.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 031e2aa1a91..b7fad76acaa 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib, xz }:
 
-assert zlib != null;
+assert !(stdenv ? cross) -> zlib != null;
 
 stdenv.mkDerivation rec {
   name = "libpng-1.2.50";
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
+  crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
+    propagatedBuildInputs = [];
+    passthru = {};
+  };
+
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;

From 6998a866a86e934d13c29078963ebfa59fe0f438 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:36:34 +0100
Subject: [PATCH 0039/2033] SDL: Refactor package and fix Darwin cross-builds.

First of all, this needs two upstream patches for supporting OS X 10.9,
also the cross-gcc doesn't accept -fpascal-strings, so drop the flag.

And except putting all configure flags into a multiline string, we're
now using a list, which is easier when it comes to handling optional
components.

As X isn't used on recent Mac OS X versions and Windows, I'm temporarily
using --without-x for cross-builds until we have a better way to check
for those things.

Also, don't add audiofile to buildInputs if we're cross-compiling for
MinGW.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/SDL/default.nix | 43 +++++++++++++++-------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index e58397fa9a5..476ec73ba18 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -7,21 +7,13 @@
 
 # OSS is no longer supported, for it's much crappier than ALSA and
 # PulseAudio.
-assert alsaSupport || pulseaudioSupport;
+assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport;
 
 assert openglSupport -> (mesa != null && x11Support);
 assert x11Support -> (x11 != null && libXrandr != null);
 assert alsaSupport -> alsaLib != null;
 assert pulseaudioSupport -> pulseaudio != null;
 
-let
-  configureFlagsFun = attrs: ''
-        --disable-oss --disable-video-x11-xme
-        --disable-x11-shared --disable-alsa-shared --enable-rpath --disable-pulseaudio-shared
-        --disable-osmesa-shared
-        ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib}/lib" else ""}
-      '';
-in
 stdenv.mkDerivation rec {
   version = "1.2.15";
   name    = "SDL-${version}";
@@ -35,17 +27,42 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
     stdenv.lib.optional pulseaudioSupport pulseaudio;
 
-  buildInputs = [ pkgconfig audiofile ] ++
+  buildInputs = let
+    notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
+  in stdenv.lib.optional notMingw audiofile;
+
+  nativeBuildInputs = [ pkgconfig ] ++
     stdenv.lib.optional openglSupport [ mesa ] ++
     stdenv.lib.optional alsaSupport alsaLib;
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
   # to fail at doing this, hence `--disable-pulseaudio-shared'.
-  configureFlags = configureFlagsFun { inherit alsaLib; };
+  configureFlags = [
+    "--disable-oss"
+    "--disable-video-x11-xme"
+    "--disable-x11-shared"
+    "--disable-alsa-shared"
+    "--enable-rpath"
+    "--disable-pulseaudio-shared"
+    "--disable-osmesa-shared"
+  ] ++ stdenv.lib.optionals (stdenv ? cross) ([
+    "--without-x"
+  ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
 
-  crossAttrs = {
-      configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
+  crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
+    patches = let
+      f = rev: sha256: fetchurl {
+        url = "http://hg.libsdl.org/SDL/raw-rev/${rev}";
+        inherit sha256;
+      };
+    in [
+      (f "e9466ead70e5" "0ygir3k83d0vxp7s3k48jn3j8n2bnv9wm6613wpx3ybnjrxabrip")
+      (f "bbfb41c13a87" "17v29ybjifvka19m8qf14rjc43nfdwk9v9inaizznarhb17amlnv")
+    ];
+    postPatch = ''
+      sed -i -e 's/ *-fpascal-strings//' configure
+    '';
   };
 
   passthru = {inherit openglSupport;};

From 5eb3dd8a1b952aba821aa55557232ee443dc19bb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:42:05 +0100
Subject: [PATCH 0040/2033] cmake: Add patch for fixing Darwin cross-builds.

This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/tools/build-managers/cmake/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9ce69374cd8..42277b22036 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path.patch;
+    optional (stdenv ? glibc) ./search-path.patch ++
+    optional (stdenv ? cross) (fetchurl {
+      name = "fix-darwin-cross-compile.patch";
+      url = "http://public.kitware.com/Bug/file_download.php?"
+          + "file_id=4981&type=bug";
+      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
+    });
 
   buildInputs = [ curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses

From a6621202af47c826bd731ebefcbe5f573dc16ddd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 06:43:57 +0100
Subject: [PATCH 0041/2033] xcode: Drop use of weak_import on enumerators.

GCC doesn't support attributes on enumerators, which could pose a
problem but fortunately not in this case. Here a
__attribute__((weak_import)) is used, which doesn't make much sense for
enumerators anyway (noone will die because the corresponding enumerator
won't be referenced either in older OS X versions).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/xcode/default.nix           | 13 ++++++++++---
 .../darwin/xcode/gcc-fix-enum-attributes.patch      | 13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 5c8e7a3ef6c..5d4546d63bf 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,6 +1,10 @@
 { stdenv, requireFile, xpwn }:
 
-stdenv.mkDerivation rec {
+with stdenv.lib;
+
+let
+  osxVersion = "10.9";
+in stdenv.mkDerivation rec {
   name = "xcode-${version}";
   version = "5.0.2";
 
@@ -10,9 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "0mrligqkfqwx8cy883pxm4w5w7a17nfh227zdspfll23r9agf32k";
   };
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
   outputs = [ "out" "toolchain" ];
 
+
   unpackCmd = let
     basePath = "Xcode.app/Contents/Developer/Platforms/MacOSX.platform";
     sdkPath = "${basePath}/Developer/SDKs";
@@ -21,7 +26,9 @@ stdenv.mkDerivation rec {
     ${xpwn}/bin/hfsplus main.hfs extractall "${sdkPath}" > /dev/null
   '';
 
-  setSourceRoot = "sourceRoot=MacOSX10.9.sdk";
+  setSourceRoot = "sourceRoot=MacOSX${osxVersion}.sdk";
+
+  patches = optional (osxVersion == "10.9") ./gcc-fix-enum-attributes.patch;
 
   installPhase = ''
     ensureDir "$out/share/sysroot"
diff --git a/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch b/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch
new file mode 100644
index 00000000000..1e1895c2894
--- /dev/null
+++ b/pkgs/os-specific/darwin/xcode/gcc-fix-enum-attributes.patch
@@ -0,0 +1,13 @@
+diff --git a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
+index fa0c290..7da7e0c 100644
+--- a/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
++++ b/System/Library/Frameworks/Foundation.framework/Headers/NSUserNotification.h
+@@ -13,7 +13,7 @@ typedef NS_ENUM(NSInteger, NSUserNotificationActivationType) {
+     NSUserNotificationActivationTypeNone = 0,
+     NSUserNotificationActivationTypeContentsClicked = 1,
+     NSUserNotificationActivationTypeActionButtonClicked = 2,
+-    NSUserNotificationActivationTypeReplied NS_AVAILABLE(10_9, NA) = 3
++    NSUserNotificationActivationTypeReplied = 3
+ } NS_ENUM_AVAILABLE(10_8, NA);
+ 
+ NS_CLASS_AVAILABLE(10_8, NA)

From a445199db42a99560ae15838444a67bc19498cc1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 09:12:10 +0100
Subject: [PATCH 0042/2033] xcode: Update to new version 5.1.

This version just got released two days ago, while we were working for
cross-builds on 5.0.2. From the release notes it shouldn't introduce any
incompatibilities.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/darwin/xcode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 5d4546d63bf..b80682b7550 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -6,12 +6,12 @@ let
   osxVersion = "10.9";
 in stdenv.mkDerivation rec {
   name = "xcode-${version}";
-  version = "5.0.2";
+  version = "5.1";
 
   src = requireFile {
     name = "xcode_${version}.dmg";
     url = meta.homepage;
-    sha256 = "0mrligqkfqwx8cy883pxm4w5w7a17nfh227zdspfll23r9agf32k";
+    sha256 = "0zkggbmsfc5w53j1ncbpayvnn1vzpyzyjjjzhawq1jjfq465bfvh";
   };
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

From 23b43c6a9bc58a81fb5273409381e36d7a8679fd Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 10:55:51 +0100
Subject: [PATCH 0043/2033] gcc-4.8: Use --with-as/ld for MinGW-w64 as well.

On MinGW, we're passing these programs to the configure script, but this
obviously won't work for non-autoconf-based projects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/compilers/gcc/4.8/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 96207b6ca42..a7443209038 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -162,12 +162,13 @@ let version = "4.8.2";
           " --disable-shared" +
           " --disable-decimal-float" # libdecnumber requires libc
           else
-          (if crossDarwin then
-            " --with-sysroot=${libcCross}/share/sysroot" +
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
+          # Ensure that -print-prog-name is able to find the correct programs.
+          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
             " --with-as=${binutilsCross}/bin/${cross.config}-as" +
             " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
-            else
-            " --with-headers=${libcCross}/include") +
+          )) +
           " --enable-__cxa_atexit" +
           " --enable-long-long" +
           (if crossMingw then

From b25ac9ea5567ea64c687c89111c26e1f5f1035b8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 12 Mar 2014 10:58:55 +0100
Subject: [PATCH 0044/2033] gcc-cross-wrapper: Revert adding LD program name.

This reverts commit c5ab2bfd258501cbe5f440089039aff8e7595e3c.

As mentioned in the previous commit, this is now no longer needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
index 497047a73b1..433d36ced43 100644
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
@@ -70,8 +70,6 @@ fi
 
 if test "$dontSetConfigureCross" != "1"; then
     configureFlags="$configureFlags --build=$system --host=$crossConfig"
-    # This is because -print-prog-name tries to search FHS paths.
-    configureFlags="$configureFlags LD=$crossConfig-ld"
 fi
 # Disabling the tests when cross compiling, as usually the tests are meant for
 # native compilations.

From 5cc4f3a260fa5a1c11bd23772fbffd0c1430a29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 12 Mar 2014 13:35:24 +0100
Subject: [PATCH 0045/2033] Unbreak channel (fix license attribute in
 python-packages.nix)

(cherry picked from commit 844d246d2dd0b148d5a6c6fc8cb6a0b77b190a62)
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fae34f3747a..f408b317091 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8628,7 +8628,7 @@ rec {
     meta = {
       homepage = http://www.libvirt.org/;
       description = "libvirt Python bindings";
-      license = pkgs.lib.license.lgpl2;
+      license = pkgs.lib.licenses.lgpl2;
     };
   };
 

From 58e0383d93a68ab8c347be401b6029d1fa470f6e Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 12 Jan 2014 23:39:14 +0100
Subject: [PATCH 0046/2033] Add node-webkit, app runtime based on Chromium and
 node.js

---
 .../development/tools/node-webkit/default.nix | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/node-webkit/default.nix

diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix
new file mode 100644
index 00000000000..326e5322846
--- /dev/null
+++ b/pkgs/development/tools/node-webkit/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, buildEnv, makeWrapper
+, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}:
+let
+  bits = if stdenv.system == "x86_64-linux" then "x64"
+         else "ia32";
+
+  nwEnv = buildEnv {
+    name = "node-webkit-env";
+    paths = [
+      xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf
+      freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage xlibs.libXext
+      xlibs.libXfixes nss nspr gconf expat dbus udev stdenv.gcc.gcc
+    ];
+  };
+
+in stdenv.mkDerivation rec {
+  name = "node-webkit-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
+    sha256 = if bits == "x64" then
+      "91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else
+      "b0b29b4e75cd4b1aaecf7f4716216edcfc5947516744e2eaeae38bec1d03cea1";
+  };
+
+  patchPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nw
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nwsnapshot
+  '';
+
+  installPhase = let
+    LD_LIBRARY_PATH = "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit";
+  in ''
+    ensureDir $out/bin
+    ensureDir $out/share/node-webkit
+    cp -R * $out/share/node-webkit
+
+    ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+
+    makeWrapper $out/share/node-webkit/nw $out/bin/nw --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
+    makeWrapper $out/share/node-webkit/nwsnapshot $out/bin/nwsnapshot --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
+  '';
+
+  buildInputs = [ makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = https://github.com/rogerwang/node-webkit;
+    platforms = ["i686-linux" "x86_64-linux"];
+    maintainers = [ maintainers.offline ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46a41ed4545..ad210052659 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3799,6 +3799,10 @@ let
 
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
+  node_webkit = callPackage ../development/tools/node-webkit {
+    gconf = pkgs.gnome.GConf;
+  };
+
   noweb = callPackage ../development/tools/literate-programming/noweb { };
 
   omake = callPackage ../development/tools/ocaml/omake { };

From 5533e05ca151a1763b57b86e212968b7f6bddf17 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sun, 16 Mar 2014 13:32:39 +0100
Subject: [PATCH 0047/2033] Chromium: Add desktop entry.

---
 .../networking/browsers/chromium/default.nix     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index baf67371769..6b57acc2d35 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, ninja, which
+{ stdenv, fetchurl, makeWrapper, ninja, which, makeDesktopItem
 
 # default dependencies
 , bzip2, flac, speex
@@ -155,6 +155,17 @@ let
   libExecPath = "$out/libexec/${packageName}";
   sandboxPath = "${sandbox}/bin/${packageName}_sandbox";
 
+  desktopItem = makeDesktopItem {
+    name = "Chromium";
+    exec = "chromium";
+    icon = "chromium";
+    comment = "An open source web browser from Google";
+    desktopName = "Chromium";
+    genericName = "Web browser";
+    mimeType = "text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/mailto;x-scheme-handler/webcal";
+    categories = "Network;WebBrowser";
+  };
+
 in stdenv.mkDerivation rec {
   name = "${packageName}-${src.version}";
   inherit packageName src;
@@ -266,6 +277,9 @@ in stdenv.mkDerivation rec {
       mkdir -vp "$logo_output_path"
       cp -v "$icon_file" "$logo_output_path/${packageName}.png"
     done
+
+    mkdir -vp "$out/share/applications"
+    cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
   '';
 
   passthru = {

From 59124ddf95488c5de645c2e95f29c3c2349e85ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 30 Mar 2014 07:59:32 +0800
Subject: [PATCH 0048/2033] vimprobable2: update to 1.4.2

---
 .../applications/networking/browsers/vimprobable2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 2a44449c750..f315f9ffa1a 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -2,11 +2,11 @@
   pkgconfig, webkit, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.4.2";
   name = "vimprobable2-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
-    sha256 = "19zx1k3s2gnhzzd2wpyqsk151w9p52ifl64xaz9a6qkgvrxlli8p";
+    sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
   };
 
   # Nixos default ca bundle

From d14b9e9850b300208a0ab2d4387addf555273012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 30 Mar 2014 09:02:07 +0800
Subject: [PATCH 0049/2033] get rid of old webkit and webkit_gtk2 packages

---
 .../libraries/webkit/bison26.patch            | 515 ------------------
 pkgs/development/libraries/webkit/default.nix | 106 ----
 pkgs/development/libraries/webkit/gtk2.nix    | 109 ----
 .../libraries/webkit/src-for-default.nix      |  10 -
 .../libraries/webkit/src-for-gtk2.nix         |  10 -
 .../libraries/webkit/src-for-svn.nix          |   9 -
 .../libraries/webkit/src-info-for-default.nix |   6 -
 .../libraries/webkit/src-info-for-svn.nix     |   6 -
 pkgs/top-level/all-packages.nix               |  32 +-
 pkgs/top-level/python-packages.nix            |   2 +-
 pkgs/top-level/release-python.nix             |   1 -
 11 files changed, 5 insertions(+), 801 deletions(-)
 delete mode 100644 pkgs/development/libraries/webkit/bison26.patch
 delete mode 100644 pkgs/development/libraries/webkit/default.nix
 delete mode 100644 pkgs/development/libraries/webkit/gtk2.nix
 delete mode 100644 pkgs/development/libraries/webkit/src-for-default.nix
 delete mode 100644 pkgs/development/libraries/webkit/src-for-gtk2.nix
 delete mode 100644 pkgs/development/libraries/webkit/src-for-svn.nix
 delete mode 100644 pkgs/development/libraries/webkit/src-info-for-default.nix
 delete mode 100644 pkgs/development/libraries/webkit/src-info-for-svn.nix

diff --git a/pkgs/development/libraries/webkit/bison26.patch b/pkgs/development/libraries/webkit/bison26.patch
deleted file mode 100644
index 95898adeb8a..00000000000
--- a/pkgs/development/libraries/webkit/bison26.patch
+++ /dev/null
@@ -1,515 +0,0 @@
-Index: /trunk/Source/WebCore/ChangeLog
-===================================================================
---- /trunk/Source/WebCore/ChangeLog	(revision 124098)
-+++ /trunk/Source/WebCore/ChangeLog	(revision 124099)
-@@ -1,2 +1,27 @@
-+2012-07-30  Alexis Menard  <alexis.menard@openbossa.org>
-+
-+        Build fix with newer bison 2.6.
-+        https://bugs.webkit.org/show_bug.cgi?id=92264
-+
-+        Reviewed by Adam Barth.
-+
-+        As stated in http://www.gnu.org/software/bison/manual/html_node/Table-of-Symbols.html
-+        YYLEX_PARAM and YYPARSE_PARAM are depecreated since version 1.875. So far all Mac OS
-+        version I had access to as well as recent Linux runs at least version 2.3 so it's safe
-+        to use the replacement of these deprecated macros in favor of %lex-param and %parse-param.
-+        As announced http://lists.gnu.org/archive/html/info-gnu/2012-07/msg00011.html with the release
-+        of version 2.6 YYLEX_PARAM and YYPARSE_PARAM are not supported anymore.
-+
-+        No new tests : build fix and the patch should not trigger any regressions
-+
-+        * css/CSSGrammar.y:
-+        * css/CSSParser.cpp:
-+        * xml/XPathGrammar.y: Refactored a bit to not use an intermediate PARSER define.
-+        * xml/XPathParser.cpp: bison 2.6 declare xpathyyparse in the .h file now, i.e. XPathGrammar.h
-+        therefore including this file within the namespace {} declarations leads to xpathyyparse being
-+        defined part of WebCore::XPath namespaces but the actual implementation of xpathyyparse is in XPathGrammar.cpp
-+        (generated) and not implemented within the WebCore::XPath so it lead to linking issues. Last, XPathGrammar.h needs 
-+        to be included after the other includes as it uses some XPath types. It breaks the style but CSSParser.cpp is doing the same.
-+
- 2012-07-30  Sadrul Habib Chowdhury  <sadrul@chromium.org>
- 
-Index: /trunk/Source/WebCore/css/CSSParser.cpp
-===================================================================
---- /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSParser.cpp	(revision 124099)
-@@ -115,5 +115,5 @@
- #endif
- 
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
- 
- using namespace std;
-Index: /trunk/Source/WebCore/css/CSSGrammar.y
-===================================================================
---- /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/css/CSSGrammar.y	(revision 124099)
-@@ -54,11 +54,10 @@
- #define YYDEBUG 0
- 
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
- 
- %pure_parser
-+
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
- 
- %union {
-@@ -90,5 +89,5 @@
- %{
- 
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
-     return 1;
-Index: /trunk/Source/WebCore/xml/XPathParser.cpp
-===================================================================
---- /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124099)
-@@ -33,22 +33,19 @@
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
- 
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
--
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"    
-+using namespace XPath;
-+
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
- 
- Parser* Parser::currentParser = 0;
--    
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
- 
-@@ -631,4 +628,2 @@
- }
- 
--}
--}
-Index: /trunk/Source/WebCore/xml/XPathGrammar.y
-===================================================================
---- /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124098)
-+++ /trunk/Source/WebCore/xml/XPathGrammar.y	(revision 124099)
-@@ -35,4 +35,5 @@
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-@@ -45,6 +46,4 @@
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
- 
- using namespace WebCore;
-@@ -54,4 +53,5 @@
- 
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
- 
- %union
-@@ -72,5 +72,5 @@
- 
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-     
- %}
-@@ -119,5 +119,5 @@
-     OrExpr
-     {
--        PARSER->m_topExpr = $1;
-+        parser->m_topExpr = $1;
-     }
-     ;
-@@ -139,5 +139,5 @@
-     {
-         $$ = new LocationPath;
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -151,5 +151,5 @@
-         $$ = $2;
-         $$->insertFirstStep($1);
--        PARSER->unregisterParseNode($1);
-+        parser->unregisterParseNode($1);
-     }
-     ;
-@@ -160,6 +160,6 @@
-         $$ = new LocationPath;
-         $$->appendStep($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -167,5 +167,5 @@
-     {
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     |
-@@ -174,6 +174,6 @@
-         $$->appendStep($2);
-         $$->appendStep($3);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -184,9 +184,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, *$1, *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, *$1);
--        PARSER->deleteNodeTest($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -195,6 +195,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -202,9 +202,9 @@
-         if ($2) {
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
--            PARSER->deletePredicateVector($2);
-+            parser->deletePredicateVector($2);
-         } else
-             $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -213,9 +213,9 @@
-         if ($3) {
-             $$ = new Step($1, *$2, *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, *$2);
--        PARSER->deleteNodeTest($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteNodeTest($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -224,6 +224,6 @@
-         String localName;
-         String namespaceURI;
--        if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
--            PARSER->m_gotNamespaceError = true;
-+        if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+            parser->m_gotNamespaceError = true;
-             YYABORT;
-         }
-@@ -231,9 +231,9 @@
-         if ($3) {
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
--            PARSER->deletePredicateVector($3);
-+            parser->deletePredicateVector($3);
-         } else
-             $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
--        PARSER->deleteString($2);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($2);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -260,6 +260,6 @@
-             $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
- 
--        PARSER->deleteString($1);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -267,6 +267,6 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
--        PARSER->deleteString($1);        
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->registerNodeTest($$);
-     }
-     |
-@@ -274,7 +274,7 @@
-     {
-         $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
--        PARSER->deleteString($1);        
--        PARSER->deleteString($3);
--        PARSER->registerNodeTest($$);
-+        parser->deleteString($1);
-+        parser->deleteString($3);
-+        parser->registerNodeTest($$);
-     }
-     ;
-@@ -294,6 +294,6 @@
-         $$ = new Vector<Predicate*>;
-         $$->append(new Predicate($1));
--        PARSER->unregisterParseNode($1);
--        PARSER->registerPredicateVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerPredicateVector($$);
-     }
-     |
-@@ -301,5 +301,5 @@
-     {
-         $$->append(new Predicate($2));
--        PARSER->unregisterParseNode($2);
-+        parser->unregisterParseNode($2);
-     }
-     ;
-@@ -316,5 +316,5 @@
-     {
-         $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -324,5 +324,5 @@
-     {
-         $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -330,5 +330,5 @@
-     {
-         $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
--        PARSER->registerParseNode($$);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -338,6 +338,6 @@
-     {
-         $$ = new VariableReference(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -350,6 +350,6 @@
-     {
-         $$ = new StringExpression(*$1);
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -357,6 +357,6 @@
-     {
-         $$ = new Number($1->toDouble());
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -370,6 +370,6 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -379,7 +379,7 @@
-         if (!$$)
-             YYABORT;
--        PARSER->deleteString($1);
--        PARSER->deleteExpressionVector($3);
--        PARSER->registerParseNode($$);
-+        parser->deleteString($1);
-+        parser->deleteExpressionVector($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -390,6 +390,6 @@
-         $$ = new Vector<Expression*>;
-         $$->append($1);
--        PARSER->unregisterParseNode($1);
--        PARSER->registerExpressionVector($$);
-+        parser->unregisterParseNode($1);
-+        parser->registerExpressionVector($$);
-     }
-     |
-@@ -397,5 +397,5 @@
-     {
-         $$->append($3);
--        PARSER->unregisterParseNode($3);
-+        parser->unregisterParseNode($3);
-     }
-     ;
-@@ -413,7 +413,7 @@
-         $$->addSubExpression($1);
-         $$->addSubExpression($3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -431,7 +431,7 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -441,8 +441,8 @@
-         $3->setAbsolute(true);
-         $$ = new Path(static_cast<Filter*>($1), $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($2);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($2);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -454,7 +454,7 @@
-     {
-         $$ = new Filter($1, *$2);
--        PARSER->unregisterParseNode($1);
--        PARSER->deletePredicateVector($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->deletePredicateVector($2);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -466,7 +466,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -478,7 +478,7 @@
-     {
-         $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -490,7 +490,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -502,7 +502,7 @@
-     {
-         $$ = new EqTestOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -514,7 +514,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     |
-@@ -522,7 +522,7 @@
-     {
-         $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -534,7 +534,7 @@
-     {
-         $$ = new NumericOp($2, $1, $3);
--        PARSER->unregisterParseNode($1);
--        PARSER->unregisterParseNode($3);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($1);
-+        parser->unregisterParseNode($3);
-+        parser->registerParseNode($$);
-     }
-     ;
-@@ -547,6 +547,6 @@
-         $$ = new Negative;
-         $$->addSubExpression($2);
--        PARSER->unregisterParseNode($2);
--        PARSER->registerParseNode($$);
-+        parser->unregisterParseNode($2);
-+        parser->registerParseNode($$);
-     }
-     ;
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
deleted file mode 100644
index ef4d259cb02..00000000000
--- a/pkgs/development/libraries/webkit/default.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-args : with args; 
-let 
-  s = import ./src-for-default.nix; # 1.8.3 needs newer gtk3, wait for x-updates
-  version = lib.attrByPath ["version"] s.version args;
-in
-rec {
-  src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
-  };
-
-  buildInputs = with xlibs; [
-    pkgconfig libtool intltool autoconf automake gperf bison flex
-    gtk3 gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc
-    libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
-    which libproxy geoclue enchant python ruby perl
-    mesa libXt libXrender renderproto libXcomposite compositeproto
-    libXdamage damageproto kbproto
-    ];
-
-  propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
-    ];
-
-  configureFlags = [
-    # "--enable-3D-transforms" # no longer recognized
-    "--enable-web-sockets"
-    "--enable-web-timing"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=55294
-    "--enable-image-resizer"
-
-    "--enable-geolocation"
-
-    # Not implemented?
-    # "--enable-web-audio"
-
-    "--enable-mathml"
-
-    #"--enable-wml"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=45110
-    #"--enable-indexed-database"
-
-    # Doesn't work in release...
-    #"--enable-xhtmlmp"
-
-    # "--enable-input-speech"
-
-    #"--enable-file-writer" # no longer recognized
-    "--enable-blob"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=59430
-    # "--enable-directory-upload"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=58443
-    # "--enable-file-system"
-
-    "--enable-dependency-tracking" # to fix parallel building
-    ];
-
-  # instead of enableParallelBuilding = true;
-  makeFlags = "-j$NIX_BUILD_CORES";
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
-    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
-
-  patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099
-  patchFlags = "-p2";
-
-  #doCheck = true; # tests still have problems
-
-  doReplaceUsrBin = fullDepEntry (''
-    for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
-        sed -e 's@/usr/bin/gcc@gcc@' -i $i
-    done
-  '') ["minInit" "doUnpack"];
-
-  doAddPrograms = fullDepEntry (''
-    mkdir -p $out/bin
-    for i in Programs/.libs/* Programs/*; do 
-        cp $i $out/bin/webkit-program-$(basename $i) || true
-    done
-  '') ["minInit" "doMake" "defEnsureDir"];
-      
-  paranoidFixComments = fullDepEntry (''
-    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
-  '') ["minInit" "doUnpack"];
-
-  # See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
-  fixConfigure = fullDepEntry (''
-    sed   -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-      -e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
-      configure{,.ac}
-  '') ["minInit" "doUnpack"];
-
-  name = s.name;
-  meta = {
-    description = "WebKit - a fast and correct HTML renderer";
-    maintainers = [stdenv.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup;
-  };
-}
diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix
deleted file mode 100644
index c2e3b9b06dd..00000000000
--- a/pkgs/development/libraries/webkit/gtk2.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-
-args : with args; 
-let 
-  s = import ./src-for-gtk2.nix;
-  version = lib.attrByPath ["version"] s.version args;
-in
-rec {
-  src = fetchurl {
-    url = s.url;
-    sha256 = s.hash;
-  };
-
-  buildInputs = with xlibs; [
-    pkgconfig libtool intltool autoconf automake gperf bison flex
-    gtk2 glib atk cairo pango fontconfig freetype libsoup gtkdoc
-    libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
-    which libproxy geoclue enchant python ruby perl
-    mesa libXt libXrender renderproto libXcomposite compositeproto
-    libXdamage damageproto kbproto
-    ];
-
-  propagatedBuildInputs = [
-    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
-    ];
-
-  configureFlags = [
-    "--with-gtk=2.0"
-
-    # "--enable-3D-transforms" # no longer recognized
-    "--enable-web-sockets"
-    "--enable-web-timing"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=55294
-    "--enable-image-resizer"
-
-    "--enable-geolocation"
-
-    # Not implemented?
-    # "--enable-web-audio"
-
-    "--enable-mathml"
-
-    #"--enable-wml"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=45110
-    #"--enable-indexed-database"
-
-    # Doesn't work in release...
-    #"--enable-xhtmlmp"
-
-    # "--enable-input-speech"
-
-    #"--enable-file-writer" # no longer recognized
-    "--enable-blob"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=59430
-    # "--enable-directory-upload"
-
-    # https://bugs.webkit.org/show_bug.cgi?id=58443
-    # "--enable-file-system"
-
-    "--enable-dependency-tracking" # to fix parallel building
-    ];
-
-  # instead of enableParallelBuilding = true;
-  makeFlags = "-j$NIX_BUILD_CORES";
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
-    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
-
-  patches = [ ./bison26.patch ]; # http://trac.webkit.org/changeset/124099
-  patchFlags = "-p2";
-
-  #doCheck = true; # tests still have problems
-
-  doReplaceUsrBin = fullDepEntry (''
-    for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
-        sed -e 's@/usr/bin/gcc@gcc@' -i $i
-    done
-  '') ["minInit" "doUnpack"];
-
-  doAddPrograms = fullDepEntry (''
-    mkdir -p $out/bin
-    for i in Programs/.libs/* Programs/*; do 
-        cp $i $out/bin/webkit-program-$(basename $i) || true
-    done
-  '') ["minInit" "doMake" "defEnsureDir"];
-      
-  paranoidFixComments = fullDepEntry (''
-    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
-  '') ["minInit" "doUnpack"];
-
-  # See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html
-  fixConfigure = fullDepEntry (''
-    sed   -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \
-      -e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \
-      configure{,.ac}
-  '') ["minInit" "doUnpack"];
-
-  name = s.name;
-  meta = {
-    description = "WebKit - a fast and correct HTML renderer";
-    maintainers = [stdenv.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg libsoup;
-  };
-}
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
deleted file mode 100644
index 65bcd435096..00000000000
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-rec {
-   version="1.8.1";
-   name="webkit-1.8.1";
-   hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
-   url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
-   advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
-  
-  
-}
-
diff --git a/pkgs/development/libraries/webkit/src-for-gtk2.nix b/pkgs/development/libraries/webkit/src-for-gtk2.nix
deleted file mode 100644
index 65bcd435096..00000000000
--- a/pkgs/development/libraries/webkit/src-for-gtk2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-rec {
-   version="1.8.1";
-   name="webkit-1.8.1";
-   hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls";
-   url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
-   advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz";
-  
-  
-}
-
diff --git a/pkgs/development/libraries/webkit/src-for-svn.nix b/pkgs/development/libraries/webkit/src-for-svn.nix
deleted file mode 100644
index f90bafbf6dc..00000000000
--- a/pkgs/development/libraries/webkit/src-for-svn.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="r86499";
-   name="webkit-r86499";
-   hash="04sfwri81x2d9y3z0v7rhrr40vn0bxcbnhb8a0gymqkwa1ngpzmp";
-   url="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
-   advertisedUrl="http://builds.nightly.webkit.org/files/trunk/src/WebKit-r86499.tar.bz2";
-  
-  
-}
diff --git a/pkgs/development/libraries/webkit/src-info-for-default.nix b/pkgs/development/libraries/webkit/src-info-for-default.nix
deleted file mode 100644
index c4e5b8a6fd6..00000000000
--- a/pkgs/development/libraries/webkit/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://webkitgtk.org/?page=download";
-  versionExtractorSedScript = "s/.*-([.0-9]+)[.].*/\\1/";
-  versionReferenceCreator = "s/-([.0-9.]+)[.]/-\${version}./";
-  baseName = "webkit";
-}
diff --git a/pkgs/development/libraries/webkit/src-info-for-svn.nix b/pkgs/development/libraries/webkit/src-info-for-svn.nix
deleted file mode 100644
index 994cae544cb..00000000000
--- a/pkgs/development/libraries/webkit/src-info-for-svn.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://nightly.webkit.org/";
-  versionExtractorSedScript = "s/.*-(r[0-9]+)[.].*/\\1/";
-  versionReferenceCreator = "s/-(r[0-9.]+)[.]/-\${version}./";
-  baseName = "webkit";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3b34243d4d..31456b94cbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5909,28 +5909,7 @@ let
 
   wayland = callPackage ../development/libraries/wayland { };
 
-  webkit =
-    builderDefsPackage ../development/libraries/webkit {
-      inherit gtk2; # for plugins etc. even with gtk3, see Gentoo ebuild
-      inherit gtk3 glib atk cairo pango fontconfig freetype;
-      inherit (gnome) gtkdoc libsoup;
-      inherit pkgconfig libtool intltool autoconf automake gperf flex
-        libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
-        which libproxy geoclue enchant python ruby perl mesa xlibs;
-      inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
-      bison = bison2;
-    };
-
-  webkit_gtk2 =
-    builderDefsPackage ../development/libraries/webkit/gtk2.nix {
-      inherit gtk2 glib atk cairo pango fontconfig freetype;
-      inherit (gnome) gtkdoc libsoup;
-      inherit pkgconfig libtool intltool autoconf automake gperf flex
-        libjpeg libpng libtiff libxml2 libxslt sqlite icu curl
-        which libproxy geoclue enchant python ruby perl mesa xlibs;
-      inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good;
-      bison = bison2;
-    };
+  webkit = webkitgtk;
 
   webkitgtk = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzz.override {
@@ -9064,8 +9043,7 @@ let
   });
 
   surf = callPackage ../applications/misc/surf {
-    libsoup = gnome.libsoup;
-    webkit = webkit_gtk2;
+    webkit = webkitgtk2;
   };
 
   svk = perlPackages.SVK;
@@ -10612,8 +10590,7 @@ let
   vimPlugins = callPackage ../misc/vim-plugins { };
 
   vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
-    inherit (gnome) libsoup;
-    webkit = webkit_gtk2;
+    webkit = webkitgtk2;
   };
 
   vimprobable2Wrapper = wrapFirefox
@@ -10621,8 +10598,7 @@ let
     };
 
   vimb = callPackage ../applications/networking/browsers/vimb {
-    inherit (gnome) libsoup;
-    webkit = webkit_gtk2;
+    webkit = webkitgtk2;
   };
 
   vimbWrapper = wrapFirefox {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a4be8d1704..4605a2dadd7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5848,7 +5848,7 @@ rec {
     };
 
     buildInputs = with pkgs; [
-      pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkit_gtk2 icu
+      pkgconfig python gtk2 pygtk libxml2 libxslt libsoup webkitgtk2 icu
     ];
 
     meta = {
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 8eb08d25983..dfdbb1db8bd 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1724,7 +1724,6 @@ let
   wavesurfer = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   wdfs = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   webkit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  webkit_gtk2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   weechat = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   welkin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   wesnoth = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

From 6e7fe59bb13a2e3bf05516c559fbf4272a0331d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 30 Mar 2014 09:52:36 +0800
Subject: [PATCH 0050/2033] uzbl: build with webkitgtk2, cleanup

---
 .../networking/browsers/uzbl/default.nix      | 71 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  8 +--
 2 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 4c6458d909f..ba9c8bde37a 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,45 +1,36 @@
-a :  
-let 
-  fetchgit = a.fetchgit;
+{ stdenv, fetchurl, pkgconfig, python, makeWrapper
+, webkit, glib_networking, gsettings_desktop_schemas
+}:
 
-  buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
-    kbproto glib pango cairo gdk_pixbuf atk
-    python3
-  ];
-in
-rec {
-  src = fetchgit {
-    url = "https://github.com/Dieterbe/uzbl.git";
-    rev = "refs/tags/2012.05.14";
-    sha256 = "1crvikb0qqsx5qb003i4w7ywh72psl37gjslrj5hx2fd2f215l0l";
-  };
+stdenv.mkDerivation rec {
+  name = "uzbl-20120514";
 
-  name = "uzbl-git";
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["addInputs" "setVars" "doMakeInstall" "doWrap"];
-
-  setVars = a.noDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -L${a.libX11}/lib -lX11"
-  '');
-
-  doWrap = a.makeManyWrappers "$out/bin/uzbl-core" 
-    ''
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gstreamer}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_base}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_plugins_good}/lib/gstreamer-* \
-      --prefix GST_PLUGIN_PATH : ${a.webkit.gst_ffmpeg}/lib/gstreamer-* \
-      --prefix GIO_EXTRA_MODULES : ${a.glib_networking}/lib/gio/modules
-    '';
-
-  installFlags = "PREFIX=$out PYINSTALL_EXTRA=\"--prefix=$out\"";
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tiny externally controllable webkit browser";
-    maintainers = [a.lib.maintainers.raskin];
+    homepage    = "http://uzbl.org/";
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
   };
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
+    sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
+  };
+
+  preConfigure = ''
+    makeFlags="$makeFlags PREFIX=$out"
+    makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/uzbl-core \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share"
+  '';
+
+  nativeBuildInputs = [ pkgconfig python makeWrapper ];
+
+  buildInputs = [ webkit ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31456b94cbd..6aec2cf19a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9162,12 +9162,8 @@ let
 
   uwimap = callPackage ../tools/networking/uwimap { };
 
-  uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
-    inherit pkgconfig webkit makeWrapper glib_networking python3;
-    inherit glib pango cairo gdk_pixbuf atk;
-    inherit (xlibs) libX11 kbproto;
-    inherit (gnome) libsoup;
-    gtk = gtk3;
+  uzbl = callPackage ../applications/networking/browsers/uzbl {
+    webkit = webkitgtk2;
   };
 
   vanitygen = callPackage ../applications/misc/vanitygen { };

From 42ef963cd221a5fb294a844c7af40e1a00738815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 15 Mar 2014 17:00:10 +0100
Subject: [PATCH 0051/2033] libarchive: *permanently* fix patch source and hash

Unfortunately github's *.patch URIs contain version of git generating them,
which changes from time to time. It seems that *.diff doesn't suffer from that.

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index b7b001e44eb..5e728d9b3dd 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = [(fetchurl {
-    url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch";
-    sha256 = "0c1a0prlpq5nn7zgs7cqvw9xnmhkkc8l0mpsip86k1lafircqhzh";
+    url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.diff";
+    sha256 = "1466ddrkdh2r8idmj3v7fk2gwnhc1kdxvyczdpnqms0qlmas6fj5";
     name = "CVE-2013-0211.patch";
   })];
 

From 4eefc983a2d4e2d7ac2bbe7cf8bc393fa8da3aaa Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 1 Apr 2014 01:34:07 +0200
Subject: [PATCH 0052/2033] xcode: fix hash

---
 pkgs/os-specific/darwin/xcode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index b80682b7550..73585d59c0b 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = requireFile {
     name = "xcode_${version}.dmg";
     url = meta.homepage;
-    sha256 = "0zkggbmsfc5w53j1ncbpayvnn1vzpyzyjjjzhawq1jjfq465bfvh";
+    sha256 = "70bb550cc14eca80b9825f4ae9bfbf7f076bb75777311be428bc30a7eb7a6f7e";
   };
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

From c3524a8dd6cb3cc03a65a486290b29f97ba469d0 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 1 Apr 2014 01:37:10 +0200
Subject: [PATCH 0053/2033] optipng: use system libpng & zlib, fix cross builds
 and add support for static builds

---
 pkgs/development/libraries/libpng/12.nix |  2 ++
 pkgs/tools/graphics/optipng/default.nix  | 22 +++++++++++++++++++++-
 pkgs/top-level/all-packages.nix          |  4 +++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index b7fad76acaa..7c9ef3d20b1 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     passthru = {};
   };
 
+  configureFlags = "--enable-static";
+
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;
diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index 1b2fc6dbb90..1984ab7b1de 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libpng, static ? false }:
 
 # This package comes with its own copy of zlib, libpng and pngxtern
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "optipng-0.7.4";
 
@@ -10,6 +12,24 @@ stdenv.mkDerivation rec {
     sha256 = "1zrphbz17rhhfl1l95q5s979rrhifbwczl2xj1fdrnq5jid5s2sj";
   };
 
+  buildInputs = [ libpng ];
+
+  LDFLAGS = optional static "-static";
+  configureFlags = "--with-system-zlib --with-system-libpng";
+
+  crossAttrs = {
+    CC="${stdenv.cross.config}-gcc";
+    LD="${stdenv.cross.config}-gcc";
+    AR="${stdenv.cross.config}-ar";
+    RANLIB="${stdenv.cross.config}-ranlib";
+    configurePhase = ''
+      ./configure -prefix="$out" --with-system-zlib --with-system-libpng
+    '';
+    postInstall = optional (stdenv.cross.libc == "msvcrt") ''
+      mv "$out"/bin/optipng "$out"/bin/optipng.exe
+    '';
+  };
+
   meta = {
     homepage = http://optipng.sourceforge.net/;
     description = "A PNG optimizer";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c959f2c6b65..3dad42210bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1596,7 +1596,9 @@ let
 
   openvpn = callPackage ../tools/networking/openvpn { };
 
-  optipng = callPackage ../tools/graphics/optipng { };
+  optipng = callPackage ../tools/graphics/optipng {
+    libpng = libpng12;
+  };
 
   oslrd = callPackage ../tools/networking/oslrd { };
 

From 65cc76c44ac81191cc0b82cef58d1ad698a24412 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 1 Apr 2014 01:55:32 +0200
Subject: [PATCH 0054/2033] libjpeg_original: add optional static builds

---
 pkgs/development/libraries/libjpeg/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 63d698dda18..d7a1bcb4638 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl }: 
+{ stdenv, fetchurl, static ? false }: 
+
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "libjpeg-8d";
@@ -7,6 +9,8 @@ stdenv.mkDerivation {
     url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
     sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
   };
+
+  configureFlags = optional static "--enable-static --disable-shared";
   
   meta = {
     homepage = http://www.ijg.org/;

From 776203453f8b338db35b2cf23eeff3b4be8af51c Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 1 Apr 2014 01:56:05 +0200
Subject: [PATCH 0055/2033] gifsicle: add optional static builds, make gifview
 optional

---
 pkgs/tools/graphics/gifsicle/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix
index f3f17692df8..debc340ee4c 100644
--- a/pkgs/tools/graphics/gifsicle/default.nix
+++ b/pkgs/tools/graphics/gifsicle/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, xproto, libXt, libX11 }:
+{ stdenv, fetchurl, xproto, libXt, libX11, gifview ? false, static ? false }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation {
   name = "gifsicle-1.78";
@@ -8,7 +10,9 @@ stdenv.mkDerivation {
     sha256 = "0dzp5sg82klji4lbj1m4cyg9fb3l837gkipdx657clib97klyv53";
   };
 
-  buildInputs = [ xproto libXt libX11 ];
+  buildInputs = optional gifview [ xproto libXt libX11 ];
+
+  LDFLAGS = optional static "-static";
 
   meta = { 
     description = "Command-line tool for creating, editing, and getting information about GIF images and animations";

From ede097adcb7716e45b277cd2be14c8e3bd361939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 1 Apr 2014 11:11:46 +0800
Subject: [PATCH 0056/2033] miro: build with webkitgtk2

---
 pkgs/applications/video/miro/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 14aeca62a71..528eeff7e23 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig
-, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkit_gtk2, libsoup, pygtk
+, pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk
 , taglib, pysqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk
-, libtorrentRasterbar
+, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
 , gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
 }:
 
@@ -22,9 +22,6 @@ buildPythonPackage rec {
   patches = [ ./gconf.patch ];
 
   postPatch = ''
-    sed -i -e '2i import os; os.environ["GST_PLUGIN_PATH"] = \\\
-      '"'$GST_PLUGIN_PATH'" miro.real
-
     sed -i -e 's/\$(shell which python)/python/' Makefile
     sed -i -e 's|/usr/bin/||' -e 's|/usr||' \
            -e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py
@@ -55,10 +52,14 @@ buildPythonPackage rec {
 
   postInstall = ''
     mv "$out/bin/miro.real" "$out/bin/miro"
+    wrapProgram "$out/bin/miro" \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share"
   '';
 
   buildInputs = [
-    pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkit_gtk2 libsoup
+    pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup
     pygtk taglib
   ];
 

From 0feb117c209baf1a77e90f922c7d1d98c708b2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 12 Apr 2014 10:44:17 +0200
Subject: [PATCH 0057/2033] tk: attempt to fix build on darwin

It complained about missing fontconfig symbols.
Also fix some white-space.
---
 pkgs/development/libraries/tk/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index c7fe3e105d8..2757a254385 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, tcl, libXft }:
+{ stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
 
 stdenv.mkDerivation {
   name = "tk-8.5.15";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/tcl/tk8.5.15-src.tar.gz";
     sha256 = "0grj0k0hljvwiz913pafqibz18fzk9xjxf0nzqrd9zdls036fp41";
   };
 
   patches = [ ./different-prefix-with-tcl.patch ];
-  
+
   postInstall = ''
     ln -s $out/bin/wish* $out/bin/wish
   '';
-  
+
   configureFlags = "--with-tcl=${tcl}/lib";
-  
+
   preConfigure = "cd unix";
 
-  buildInputs = [ pkgconfig tcl libXft ];
-  
+  buildInputs = [ pkgconfig tcl libXft ]
+    ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
+
   inherit tcl;
 
   passthru = {

From c4eadfbac59c0ed4646c6da0a6305424a010d92e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 13 Apr 2014 00:29:14 +0900
Subject: [PATCH 0058/2033] add thunderbird-bin: the binary package for
 Thunderbird mail client

---
 .../mailreaders/thunderbird-bin/default.nix   | 264 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   8 +
 2 files changed, 272 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
new file mode 100644
index 00000000000..1e8a7e301ed
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -0,0 +1,264 @@
+{ stdenv, fetchurl, config
+, gconf
+, alsaLib
+, at_spi2_atk
+, atk
+, cairo
+, cups
+, curl
+, dbus_glib
+, dbus_libs
+, fontconfig
+, freetype
+, gdk_pixbuf
+, glib
+, glibc
+, gst_plugins_base
+, gstreamer
+, gtk
+, kerberos
+, libX11
+, libXScrnSaver
+, libXext
+, libXinerama
+, libXrender
+, libXt
+, libcanberra
+, libgnome
+, libgnomeui
+, mesa
+, nspr
+, nss
+, pango
+}:
+
+let
+  version = "24.4.0";
+
+  sources = [
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "dd570da273c047e0b4bf29a7ed4bb4356dcbdd8de62ecb65fcddfecaf156966f"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "f96c30ad874adf10608f818e0d986070b2a577de4d9aeb6c8dc7ea1ccd6e72f1"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "8a50ff6a4f0d2bf68f989c2d3e0bca75c9fbcfc73c37b6cc16d935c1e3c1a9cf"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "ace08104be64c038f5337e5178a79cb3f909c233f8722f7d54db04aef87935f9"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "793c07b33e861a5e29ce906a9764d980a82238b7c078391b96480592f526f323"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "98f2a5390572df625e0600ab224d5171d0357e187a3743ad72ec94d31533d993"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "7d2fbb1ecad6e7a81c481a6697429809dc76809bba537ab8bc576b19ba5938f5"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "a0a551d1790969b11ad2dcfc277f487645abff2497f2e9104235e77c45e5120c"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "cb2a5549c3cdc9e159181cb9417c7f53158820f722e48d3ce2e4dcf10dea32d2"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "e395d07fb7b13443ccc97433d38a8845969cf854ace807950a364319c17861d6"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "8637d47dfb9b685a1034f5449d3481a5c62f74158f1a6318fe94504ad779dbb2"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "f36f6d2041a110ffc621249e6d92ec09f3b2bb7a1cf08b7892a0eb998b8a2bb3"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "427a09458fe0d631a360b871db637d33bc0ad443ec443b7193db409321ab72da"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "8531078cb31cb3035fdfd7397159cd42a6439868e954e1c9bd6eb7f9cd564bdb"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "6fea39c9416357ec2902ed3dff84650a683dbe136790fa83cbca5d8bf869dc48"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "c9e8d50e04dccd647ef7a566e68a3fe8374f86e9c1b7fe2001e3690270c5e7b9"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "41debf8c221063c4a5eafc3b769aabada6f3cebf35a354b7837c2ad737fa9b0f"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "77aa022e8c58dc60595f4600849da795faea4c20da6d5514f57e1b0033cda27c"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "05ec3d776de6060a82eea595b022b73c05ab7016419be5989929bd10ae282d27"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "471288d8660536508fe04b236eb72a7c245d27cadd59841a9bab0e73db271005"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "901c0097fb8072a37787a77758a0d6a2ced66acdf5a3588a0a6df3584034c309"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "da658a5f18a7162d513f8e0aac8d1648b18404bac7888a2f66c850f2084a54c5"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "61c637e3b63a10d3c3eff91e9dcbd8558887a41d8e359aa637541bc4424a328a"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dcf399192062a7e3075125f550b0889fb4943c595814b8f6e755e9aa7e4656b1"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "376ab51e3c424db7e235b2e94494d48ce2fa9a8f1fbf5ef5cf9e367bbaf7422d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "57917aa608131da4d569e791fc8167f4df54975b74c64d6df641858400dd4c1b"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "47ecdb633bf1b246df84e796395a668fd98ac52a82177507da010b0174aa74d8"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "9155d96fb14795bc5a22e10105ba0226a7b9c87a4d6ffa5cf7835dc77d69fa30"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "3c41656512f1859b28abdf81d356dd90b720efd489d7021270114a9d28c54b38"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "bad476b65d71744b9562a8548ca6cd608da92e62f45057688fef29ac77eb060e"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "06fdb2df4bcca189736fc6ae2fee6ba87f6b19d0b64f21bdb2b07e478fe6a0ba"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "f110d0940905e2cbe4ab14c1370ff88e533e030fb5a408bf4f06f517351d5979"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "02bbb72fea711772d0dba0137641acb9f0293313a552e554443118324737fba4"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "3a94fc161e98282691d668b68b3a8e7bf035dc87ec0d07be6eb1844b2a79cd39"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "3f9c44306991554cf48fee4da86dec6ab06cb863baa8157d7adf29f6f8b0119f"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "9883bfa54e331c17338bdf7e835a0a0f71a9366ad99ddc0fda12fd9d062f071b"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "60e59c9b9ac78cba5604a051784a8721f84bfd10899d9575a4591ae4e5c48afc"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "d16908d799fe667032d317b01db91cdfcd0b23654061203df84f5cb67d6ae837"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "21e209179135fd97207e878c415d112e6c01bd7686f45eef2891cd8508dd8f9c"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "c8463a38d5fc454ad80a519a9828c1c8808688aa140b5d5276b53a659ae7bf7d"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "22d6d90cd7490e36ef5df2106ba84bcd49038cecf70a60cebd4bf552a01bfdd7"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "5a7fcc013bcd09d327e40e5b0001057067f9e509e52f38681893f1a16cf8520a"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "14c7d9a846a5d2a409089a16afdc97309d6818f97097d73757245b29cdeb73ae"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "e4d3b093da2d80e2a2c02be8d03831c6a89e8969d3261a39f153a6d96f20c7eb"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "73515b65314f8aa28fdb8708e821c01ba6edab5474e5140266b8ee8c0206807f"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7dd646cde4969243178237ea7fdf7b3c7c369e735a42f21292e8fcc3bce2c6ac"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "3fdf3750727f47628ffe4e7b28e8b7f180194be5985f4a10c703d3322a563e55"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "e4385cded8a13776890320780c6aa265c9562a6301f8f5ee7f4fbeb4aa54acf8"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "ada94d6612f20642e6294a17334afb8d31b419132e725618a376728a6028454e"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "bcbb85910f983145ff8df79574087cebaac6537600aa9a479f55298a7d6bc1c2"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "0f41a925ee5c3ad59f24a6b59eed066d1fb37ea8ec81ab4bac70280437be2589"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "9038e0358bb63a147835cacf91a7e7db888fc7b93662cca4919110e2a5daed76"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "24af2ffa71d5810f8e947de27e77a70310c22dc1cc89640b67416fe74a4a14b3"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "62cfce68247f5afd2c68a97ed230b515c1515ecd279a753bf9c728c552683f6c"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "a5e2d72cb0841848cd5a947d4cda2e84db1eae97a0735974690176ccd966eeea"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "f1d539fe69b8121205c5411096554cab41ae4f42a2018af6ba020a2d8fe660dc"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "6eacbd0b4b9f47f67818d6021600b5dddc79d2a38edac5c47f61ac039ed5cdb6"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "fcc86ac738b190012d38d32c6cee3c35d57f6a3b80867c0107f4b8a2717961bb"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "9b668a501c7da55c630761dbf89ae8fe2e32038af8ce4c10fc646eae7c2d08e2"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "f610b7d4a34635e7c3b5c355873b65558537224d5a241b92605a49499ba4d5e6"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "185ee26eb9a33ba534805b5b3547b3524bf11c94614adc252f7d17b41279d312"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "1be85c39fa8b09a6bc2b11a47d04f0447628c3ed8a775d27c8e04577627ed63e"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "e868d431d77b419bae6fcc7e1e137815ca8cbad6673074469005c606023d7983"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "fa4db6ff8047a5e11411e507df4f84baac5511a1709d5685a2a6e8da0d2e1f25"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "40c1eeabbd9d877750bee7f5f4a6b6f2108aa364ace8eefff26806a5bafca5eb"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "4bdff4418bc0c9acc7d3b00ccc6500d51e65a501c2438e99e22c03bbeb36dfff"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "541b5f434e6354bb6a4c50abb828a49383b1d1a9fb31d6b99c1f052ef73bc2f2"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "9e954408406762e55fd40487cad589c876285145931f8a12ff6ced29d9583cde"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "06a57772563456d5283b9a36b9e6cbb5efb4f33e4ea29ac2446055e0a965b8c9"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "42a8d995ac906c7fb4a1952db62d1717aa7c4660a2e7e794da3aae6aaac6f9c9"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6fed1e74c6323d2909caf471ca733df46224afcb0c632d5fa0f0d80d6157efd3"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "c29d8ff69ec2a8b5f508b7c56cd8679fe3b322f7e2e87f10303fd8bca1b93230"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "a69a7ceb4fa85cc43c367f1ddebafa76808e83d3044c158287a5923b82fc3093"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "e38e75976891204fde647d389b6c89c807d378a534d6e04582024755a3cb6139"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "39a0d3f865c462b5d3ae569825befd61dbf3ee5a6b2b81d3b9d31f4c98cf7b72"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "3ccedf1ad79135d825f762dd09da88be23901591b27ea7e61a887d5398284a46"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "ea29e40d41442ab373855acd7b40927fc5a0408f9d3bb4a0c6a2021cd8b0fca2"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "f6170909b6527e935584673a17d1245c33142a755a9db45dda2de240871fc6c0"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "15531f4e4652d533fd8cb8d3be8b5e24717240160d885629eecc7f08d8cd0701"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "9100cdf6ba87959dfbdf756c925f6a2f35fc0c6ed453625a23eccc48f0bdf331"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "9bd00e4e2634e9f922d6c1d4ef82dcba53f88fa6d7d1986037665a42109d39d2"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "e2ca3832625efa908c6d88627960e1d98255d14095a36033cddaa50065172da0"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "676120061a33c1bbbd381ea1d84b271c6e21d4a531ba776f67f7a02fd91fb99e"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "c69d6b8a8de474e460c89ba442e25aa39fe761225f7c4b12eb1df88021a6b6c3"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5a6af10060b8ea8acd3955a4056765574873e9341e4627ddcbf9811724f5eac0"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "92ce7cb5db9d94e291d7275b8817640c68dc061a3947317cba76ceb263a4b614"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "39849a4d38a96ebca9727b65093c36d8d50cadddcdea7ea404ee4aeff10fec0d"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "fa42ef419e173181166c6797e37571df6b7c25797a5caf8ca44c34b4f2faacdb"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "2c9c81db8c15116e6061de0b44dcb34579ce305ca30af284cf9eac52630fef55"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "b253607b29565169d74c491772ba2887c3e2c0dfcc3a7cedf91afa0bb073ff72"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "03e7781cd0c3fef0596e55ba8a711ef8b8f300e48297ef3cad7885b2b118864f"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "18fe799b1b675e5513ddf9edbe845bfaaafd67162e9d34250a31d0ee05bc9bba"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "4fd1be2d2c6a703544b82bf977ea63df3e295c16c9ea97573ee57945e07639ee"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "e96f7302d47897c3fc58a2777aed666aca29641500e912cee1bc59406df8e500"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ede709c9e6014edbc543511d99a61acfb0d40b796ed5ab42267ae7f8efb6583c"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "fbfc0d476817c7076a72fd6fe2519c6a347fb062f696a8fe0c969182750d1d11"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "d30dda991111ae5bbf7252d889cef53258317d3570e56360db3d7676a8fc7602"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "eba61a1417ba4cb4885732d2eb621f5a385b4b433f706d52bd1b401d2298985e"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "92dc3a2aaf30c5bb16462ee7d73a5df6f8b5d2d1530f5d1fb4b90460e84dc77f"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "e5db15f32c819d3b0e670ac975d7afc118915abeaf4a9f0a02a5b67c490605d7"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "0c689f622a0770a0b0d8f87d35513f9fbc110ca507d0b8b3bd426f763a0f77c4"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "f49e5f3bf1b4616f52e82c480f9a4752269f393d79de2274fc0562cfe9fef1ea"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "06100c2a82b3c31ea85f1f1d8856db62f2a73142fd1263e3db5df679f8843d8f"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "8358a935935215fea5eb75c69cf63bb5fc5c22bcce76939cfb804f3ee9f89e54"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "16a0f71efcf71640234501e3c8a3bd1befe15e1bb0bacc83ff590d6c780a0e5b"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "d5d0371ade5603cb725d6677983df037da06acb13207550b8a1a88c2948e992b"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "287b1fda3bb2d8d27ea22ea4c8c21d7ee0b3a5d439ea32e72dfc882fd64c5765"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3bddd9f4e742ad80bb6d35f3db8ea50cd496ad1be06003e67b4fcc290945bab8"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "5a5cb16f45d1c3ccd9e0fd0b21a7b55e90b49f0b37cd550bd89cb6c00d92046c"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "aea52fd5f8d8d5b720e1fde907b9a7b7638b384b71d01295b08749df06c578bc"; }
+  ];
+
+  arch = if stdenv.system == "i686-linux"
+    then "linux-i686"
+    else "linux-x86_64";
+
+  isPrefixOf = prefix: string:
+    builtins.substring 0 (builtins.stringLength prefix) string == prefix;
+
+  sourceMatches = locale: source:
+      (isPrefixOf source.locale locale) && source.arch == arch;
+
+  systemLocale = config.i18n.defaultLocale or "en-US";
+
+  defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
+
+  source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
+
+in
+
+stdenv.mkDerivation {
+  name = "thunderbird-bin-${version}";
+
+  src = fetchurl {
+    url = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2";
+    inherit (source) sha256;
+  };
+
+  phases = "unpackPhase installPhase";
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.gcc
+      gconf
+      alsaLib
+      at_spi2_atk
+      atk
+      cairo
+      cups
+      curl
+      dbus_glib
+      dbus_libs
+      fontconfig
+      freetype
+      gdk_pixbuf
+      glib
+      glibc
+      gst_plugins_base
+      gstreamer
+      gtk
+      kerberos
+      libX11
+      libXScrnSaver
+      libXext
+      libXinerama
+      libXrender
+      libXt
+      libcanberra
+      libgnome
+      libgnomeui
+      mesa
+      nspr
+      nss
+      pango
+    ] + ":" + stdenv.lib.makeSearchPath "lib64" [
+      stdenv.gcc.gcc
+    ];
+
+  installPhase =
+    ''
+      mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
+      cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
+
+      mkdir -p "$out/bin"
+      ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
+
+      for executable in \
+        thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
+        updater
+      do
+        patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+          "$out/usr/lib/thunderbird-bin-${version}/$executable"
+      done
+
+      for executable in \
+        thunderbird mozilla-xremote-client thunderbird-bin plugin-container \
+        updater libxul.so
+      do
+        patchelf --set-rpath "$libPath" \
+          "$out/usr/lib/thunderbird-bin-${version}/$executable"
+      done
+
+      # Create a desktop item.
+      mkdir -p $out/share/applications
+      cat > $out/share/applications/thunderbird.desktop <<EOF
+      [Desktop Entry]
+      Type=Application
+      Exec=$out/bin/thunderbird
+      Icon=$out/lib/thunderbird-bin-${version}/chrome/icons/default/default256.png
+      Name=Thunderbird
+      GenericName=Mail Reader
+      Categories=Application;Network;
+      EOF
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Mozilla Thunderbird, a full-featured email client";
+    homepage = http://www.mozilla.org/thunderbird/;
+    license = {
+      shortName = "unfree"; # not sure
+      fullName = "unfree";
+      url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
+    };
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc4b1e14313..4a3892f2705 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9183,6 +9183,14 @@ let
     inherit (gnome) libIDL;
   };
 
+  thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
+    gconf = pkgs.gnome.GConf;
+    inherit (pkgs.gnome3) at_spi2_atk;
+    inherit (pkgs.gnome) libgnome libgnomeui;
+    inherit (pkgs.xlibs) libX11 libXScrnSaver libXext
+      libXinerama libXrender libXt;
+  };
+
   tig = gitAndTools.tig;
 
   timidity = callPackage ../tools/misc/timidity { };

From a0886ae0243229e71e147c759efabb61c056ac5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <ertesx@gmx.de>
Date: Sun, 13 Apr 2014 03:28:20 +0200
Subject: [PATCH 0059/2033] keepassx: Renamed KeePassX 2.0 to keepassx2.

---
 pkgs/applications/misc/keepassx/2.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 6d54032bb38..1a79af7cb57 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
 
 stdenv.mkDerivation {
-  name = "keepassx-2.0alpha5";
+  name = "keepassx2-2.0alpha5";
   src = fetchurl {
     url = "https://github.com/keepassx/keepassx/archive/2.0-alpha5.tar.gz";
     sha256 = "1vxj306zhrr38mvsy3vpjlg6d0xwlcvsi3l69nhhwzkccsc4smfm";

From a3155a0e2ac7bc875e6bdbcbd44c336714cfc0da Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 12 Apr 2014 21:20:16 -0500
Subject: [PATCH 0060/2033] nixos: add a UID for Hydra

Otherwise the Hydra module can't be used when mutableUsers = false;

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c6581fee551..664aed7fbc9 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -129,6 +129,7 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
+      hydra     = 121;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 

From 324ade465805466be9bcfa5b29dcfa7af60505c9 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Fri, 11 Apr 2014 11:31:50 -0700
Subject: [PATCH 0061/2033] Patch python27 for CVE-2014-1912.

---
 .../python/2.7/CVE-2014-1912.patch            | 57 +++++++++++++++++++
 .../interpreters/python/2.7/default.nix       |  4 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch

diff --git a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch b/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch
new file mode 100644
index 00000000000..95399bf7607
--- /dev/null
+++ b/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch
@@ -0,0 +1,57 @@
+# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly.
+# It added the following line to NEWS:
+# - Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
+# HG changeset patch
+# User Benjamin Peterson <benjamin@python.org>
+# Date 1389671978 18000
+# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
+# Parent  2631d33ee7fbd5f0288931ef37872218d511d2e8
+complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
+
+diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
+--- a/Lib/test/test_socket.py
++++ b/Lib/test/test_socket.py
+@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest):
+ 
+     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
+ 
++    def testRecvFromIntoSmallBuffer(self):
++        # See issue #20246.
++        buf = bytearray(8)
++        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
++
++    def _testRecvFromIntoSmallBuffer(self):
++        with test_support.check_py3k_warnings():
++            buf = buffer(MSG*2048)
++        self.serv_conn.send(buf)
++
+ 
+ TIPC_STYPE = 2000
+ TIPC_LOWER = 200
+diff --git a/Misc/ACKS b/Misc/ACKS
+--- a/Misc/ACKS
++++ b/Misc/ACKS
+@@ -979,6 +979,7 @@ Eric V. Smith
+ Christopher Smith
+ Gregory P. Smith
+ Roy Smith
++Ryan Smith-Roberts
+ Rafal Smotrzyk
+ Dirk Soede
+ Paul Sokolovsky
+diff --git a/Misc/NEWS b/Misc/NEWS
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
+     if (recvlen == 0) {
+         /* If nbytes was not specified, use the buffer's length */
+         recvlen = buflen;
++    } else if (recvlen > buflen) {
++        PyErr_SetString(PyExc_ValueError,
++                        "nbytes is greater than the length of the buffer");
++        goto error;
+     }
+ 
+     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
+
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index e9277ce2daf..eeadc3c8cc7 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -28,6 +28,10 @@ let
       # patch python to put zero timestamp into pyc
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
+
+      # See http://bugs.python.org/issue20246
+      # This will be fixed in 2.7.7.
+      ./CVE-2014-1912.patch
     ];
 
   postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''

From 21cb9c24f00f78862920a58e1936a4ee1e1eeba5 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sat, 12 Apr 2014 15:49:02 -0700
Subject: [PATCH 0062/2033] Patch python32 for CVE-2014-1912.

---
 .../python/3.2/CVE-2014-1912.patch            | 57 +++++++++++++++++++
 .../interpreters/python/3.2/default.nix       |  6 ++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch

diff --git a/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch b/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch
new file mode 100644
index 00000000000..c69efd17f96
--- /dev/null
+++ b/pkgs/development/interpreters/python/3.2/CVE-2014-1912.patch
@@ -0,0 +1,57 @@
+# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly.
+# It added the following line to NEWS:
+# - Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
+
+# HG changeset patch
+# User Benjamin Peterson <benjamin@python.org>
+# Date 1389671978 18000
+# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c
+# Parent  2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6
+complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
+
+diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
+--- a/Lib/test/test_socket.py
++++ b/Lib/test/test_socket.py
+@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest):
+ 
+     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
+ 
++    def testRecvFromIntoSmallBuffer(self):
++        # See issue #20246.
++        buf = bytearray(8)
++        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
++
++    def _testRecvFromIntoSmallBuffer(self):
++        self.serv_conn.send(MSG*2048)
++
+ 
+ TIPC_STYPE = 2000
+ TIPC_LOWER = 200
+diff --git a/Misc/ACKS b/Misc/ACKS
+--- a/Misc/ACKS
++++ b/Misc/ACKS
+@@ -1020,6 +1020,7 @@ Eric V. Smith
+ Christopher Smith
+ Gregory P. Smith
+ Roy Smith
++Ryan Smith-Roberts
+ Rafal Smotrzyk
+ Dirk Soede
+ Paul Sokolovsky
+diff --git a/Misc/NEWS b/Misc/NEWS
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s
+     if (recvlen == 0) {
+         /* If nbytes was not specified, use the buffer's length */
+         recvlen = buflen;
++    } else if (recvlen > buflen) {
++        PyBuffer_Release(&pbuf);
++        PyErr_SetString(PyExc_ValueError,
++                        "nbytes is greater than the length of the buffer");
++        return NULL;
+     }
+ 
+     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
+
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 03f2d392bd1..c103b0f59cd 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -32,6 +32,12 @@ stdenv.mkDerivation {
     sha256 = "0pxs234g08v3lar09lvzxw4vqdpwkbqmvkv894j2w7aklskcjd6v";
   };
 
+  patches =
+    [
+      # See http://bugs.python.org/issue20246
+      ./CVE-2014-1912.patch
+    ];
+
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   preConfigure = ''

From 2661400d2a404581556d09f06e988fcfe5e0805d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 13 Apr 2014 00:47:14 -0500
Subject: [PATCH 0063/2033] cgit: bump git version to 1.9.2

This also updates the download URL to use kernel.org

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../version-management/git-and-tools/cgit/default.nix    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 8a1201815ae..47fa80cb901 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -4,7 +4,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "cgit-0.10.1";
+  name = "cgit-${version}";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
@@ -15,9 +16,11 @@ stdenv.mkDerivation rec {
   # The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version.
   # IMPORTANT: Remember to check which git version cgit needs on every version
   # bump.
+  # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
+  # 1.9.2 (see the repository history)
   gitSrc = fetchurl {
-    url = https://git-core.googlecode.com/files/git-1.8.5.tar.gz;
-    sha256 = "08vbq8y3jx1da417hkqmrkdkysac1sqjvrjmaj1v56dmkghm43w7";
+    url    = "https://www.kernel.org/pub/software/scm/git/git-1.9.2.tar.xz";
+    sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13";
   };
 
   buildInputs = [

From 7fed418b249a33d96cd4d657099e7438515408ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 13 Apr 2014 10:19:30 +0200
Subject: [PATCH 0064/2033] haskell: add monad-extras

---
 .../libraries/haskell/monad-extras/default.nix  | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix             |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monad-extras/default.nix

diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
new file mode 100644
index 00000000000..9a66c5ab983
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-extras/default.nix
@@ -0,0 +1,17 @@
+{ cabal, mmorph, monadControl, stm, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "monad-extras";
+  version = "0.5.7";
+  sha256 = "0dqj3n3ki679b6z5y7qw084chbahlqmj2vgj7yx0v552bl0ylzyj";
+  buildDepends = [
+    mmorph monadControl stm transformers transformersBase
+  ];
+  meta = {
+    homepage = "http://github.com/jwiegley/monad-extras";
+    description = "Extra utility functions for working with monads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7f708438fc7..22b9be810be 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1745,6 +1745,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
+  monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
+
   monadloc = callPackage ../development/libraries/haskell/monadloc {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};

From d1f875c6af7240e63a6ad765b323e8a1c92d31af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 10:46:10 +0200
Subject: [PATCH 0065/2033] lttng project: update from 2.3.0 to 2.4.1

(And update liburcu to 0.8.4 according to release notes for lttng 2.4.x.)

In addition to new features and bug fixes, version 2.4.x is needed to build
against Linux 3.12 (our new stable kernel).
---
 pkgs/development/libraries/liburcu/default.nix      | 4 ++--
 pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++--
 pkgs/development/tools/misc/lttng-ust/default.nix   | 4 ++--
 pkgs/os-specific/linux/lttng-modules/default.nix    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
index 44daabe6a73..e7f627f62f7 100644
--- a/pkgs/development/libraries/liburcu/default.nix
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.8.4";
   name = "liburcu-${version}";
 
   src = fetchurl {
     url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    sha256 = "07p0lh43j7i1606m4l1dxm195z6fcfz74fmx7q2d7mrhn2bzc240";
+    sha256 = "04py48xphylb246mpkzvld0yprj5h7cyv6pydr8b25aax5bs3h4n";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 1d223d83a65..541385d8bec 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, popt, libuuid, liburcu, lttngUst, kmod }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-2.3.0";
+  name = "lttng-tools-2.4.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "16j55xqrh00mjbcvdmdkfxchavi7jsxlpnfjqc1g1d3x65ss9wri";
+    sha256 = "1v9f7a3c2shwgn4g759bblgr27h9ql9sfq71r1mbkf8rd235g2jr";
   };
 
   buildInputs = [ popt libuuid liburcu lttngUst ];
diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 014a97a9158..0cba211f28b 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,11 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-2.3.0";
+  name = "lttng-ust-2.4.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "1hazjybrppyaakvfp1bs92vx0n2sgcsw0m6i5hwq7xq8vij7cj4q";
+    sha256 = "1nx9b1haiylajzjy03wgfcy85nwg578c6gy8ip55y8cabjrw0hp1";
   };
 
   buildInputs = [ liburcu ];
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 1673472036f..8e20bf1e3d3 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
-  pname = "lttng-modules-2.3.0";
+  pname = "lttng-modules-2.4.1";
   name = "${pname}-${kernel.version}";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
-    sha256 = "0l9fbmpsjvm5pbrc6axy8chdp21j4b8fm0hmjhpk658ll0iixmpb";
+    sha256 = "1qn1qm8lwqw9ri9wfkf6k3d58gl9rwffmpbpkwx21v1fw95zi92k";
   };
 
   patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];

From 6989b9a3f90949f5e14bd946b7aa4e1ea658bb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 10:46:14 +0200
Subject: [PATCH 0066/2033] babeltrace: update from 1.1.1 to 1.2.1

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

diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
index d19bb24eb37..aa8e70b5edc 100644
--- a/pkgs/development/tools/misc/babeltrace/default.nix
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
 
 stdenv.mkDerivation rec {
-  name = "babeltrace-1.1.1";
+  name = "babeltrace-1.2.1";
 
   src = fetchurl {
     url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
-    sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz";
+    sha256 = "1pwg0y57iy4c8wynb6bj7f6bxaiclmxcm4f3nllpw9brhbdzygc1";
   };
 
   buildInputs = [ pkgconfig glib libuuid popt ];

From 0096bb677a391151c3864c927fc26f37c397d30f Mon Sep 17 00:00:00 2001
From: Roelof Wobben <r.wobben@home.nl>
Date: Sun, 13 Apr 2014 11:19:02 +0200
Subject: [PATCH 0067/2033] new package: cinnamon-settings-daemon (close #2205)

With tiny changes from @vcunat.
---
 pkgs/desktops/cinnamon/automount-plugin.patch |  448 ++
 .../cinnamon/cinnamon-settings-daemon.nix     |   52 +
 pkgs/desktops/cinnamon/dpms.patch             |   30 +
 pkgs/desktops/cinnamon/keyboard.patch         | 4729 +++++++++++++++++
 pkgs/desktops/cinnamon/systemd-support.patch  |  536 ++
 pkgs/top-level/all-packages.nix               |    4 +-
 6 files changed, 5798 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/cinnamon/automount-plugin.patch
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
 create mode 100644 pkgs/desktops/cinnamon/dpms.patch
 create mode 100644 pkgs/desktops/cinnamon/keyboard.patch
 create mode 100644 pkgs/desktops/cinnamon/systemd-support.patch

diff --git a/pkgs/desktops/cinnamon/automount-plugin.patch b/pkgs/desktops/cinnamon/automount-plugin.patch
new file mode 100644
index 00000000000..3d90da99f08
--- /dev/null
+++ b/pkgs/desktops/cinnamon/automount-plugin.patch
@@ -0,0 +1,448 @@
+ 
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
+--- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500
++++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in  2013-11-05 15:33:21.112912392 -0500
+@@ -2,6 +2,7 @@
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/">
+     <child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/>
+     <child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/>
++    <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/>
+     <child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/>
+     <child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/>
+     <child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/>
+@@ -42,6 +43,18 @@
+       <_summary>Priority to use for this plugin</_summary>
+       <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
+     </key>
++  </schema>
++  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.automount" path="/org/cinnamon/settings-daemon/plugins/automount/">
++    <key name="active" type="b">
++      <default>true</default>
++      <_summary>Activation of this plugin</_summary>
++      <_description>Whether this plugin would be activated by cinnamon-settings-daemon or not</_description>
++    </key>
++    <key name="priority" type="i">
++      <default>97</default>
++      <_summary>Priority to use for this plugin</_summary>
++      <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
++    </key>
+   </schema>
+   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.clipboard" path="/org/cinnamon/settings-daemon/plugins/clipboard/">
+     <key name="active" type="b">
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in	2013-10-08 22:35:10.771472456 +0200
+@@ -0,0 +1,8 @@
++[Cinnamon Settings Plugin]
++Module=automount
++IAge=0
++_Name=Automount
++_Description=Automounter plugin
++Authors=Tomas Bzatek
++Copyright=Copyright © 2010 Red Hat, Inc.
++Website=
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c	2013-10-02 16:13:56.000000000 +0200
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2010 Red Hat, Inc.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
+- *
+- * Author: Tomas Bzatek <tbzatek@redhat.com>
+- */
+-
+-#include "config.h"
+-
+-#include <glib.h>
+-#include <glib/gi18n.h>
+-#include <unistd.h>
+-#include <gtk/gtk.h>
+-
+-#include "csd-automount-manager.h"
+-
+-int
+-main (int argc,
+-      char **argv)
+-{
+-        GMainLoop *loop;
+-        CsdAutomountManager *manager;
+-        GError *error = NULL;
+-
+-        g_type_init ();
+-        gtk_init (&argc, &argv);
+-
+-        bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
+-        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+-        textdomain (GETTEXT_PACKAGE);
+-
+-        loop = g_main_loop_new (NULL, FALSE);
+-        manager = csd_automount_manager_new ();
+-
+-        csd_automount_manager_start (manager, &error);
+-
+-        if (error != NULL) {
+-                g_printerr ("Unable to start the mount manager: %s",
+-                            error->message);
+-
+-                g_error_free (error);
+-                _exit (1);
+-        }
+-
+-        g_main_loop_run (loop);
+-
+-        csd_automount_manager_stop (manager);
+-        g_main_loop_unref (loop);
+-
+-        return 0;
+-}
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in	2013-10-02 16:13:56.000000000 +0200
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,12 +0,0 @@
+-[Desktop Entry]
+-_Name=Mount Helper
+-_Comment=Automount and autorun plugged devices
+-Exec=@LIBEXECDIR@/cinnamon-fallback-mount-helper
+-Icon=drive-optical
+-Terminal=false
+-Type=Application
+-Categories=
+-NoDisplay=true
+-OnlyShowIn=GNOME;
+-X-GNOME-Autostart-Notify=true
+-
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c	2013-10-08 22:35:10.771472456 +0200
+@@ -0,0 +1,106 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2010 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Author: Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#include "config.h"
++
++#include <glib/gi18n-lib.h>
++#include <gmodule.h>
++
++#include "cinnamon-settings-plugin.h"
++#include "csd-automount-plugin.h"
++#include "csd-automount-manager.h"
++
++struct CsdAutomountPluginPrivate {
++        CsdAutomountManager *manager;
++};
++
++#define CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginPrivate))
++
++CINNAMON_SETTINGS_PLUGIN_REGISTER (CsdAutomountPlugin, csd_automount_plugin)
++
++static void
++csd_automount_plugin_init (CsdAutomountPlugin *plugin)
++{
++        plugin->priv = CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE (plugin);
++
++        g_debug ("Automount plugin initializing");
++
++        plugin->priv->manager = csd_automount_manager_new ();
++}
++
++static void
++csd_automount_plugin_finalize (GObject *object)
++{
++        CsdAutomountPlugin *plugin;
++
++        g_return_if_fail (object != NULL);
++        g_return_if_fail (CSD_IS_AUTOMOUNT_PLUGIN (object));
++
++        g_debug ("Automount plugin finalizing");
++
++        plugin = CSD_AUTOMOUNT_PLUGIN (object);
++
++        g_return_if_fail (plugin->priv != NULL);
++
++        if (plugin->priv->manager != NULL) {
++                g_object_unref (plugin->priv->manager);
++        }
++
++        G_OBJECT_CLASS (csd_automount_plugin_parent_class)->finalize (object);
++}
++
++static void
++impl_activate (CinnamonSettingsPlugin *plugin)
++{
++        gboolean res;
++        GError  *error;
++
++        g_debug ("Activating automount plugin");
++
++        error = NULL;
++        res = csd_automount_manager_start (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager, &error);
++        if (! res) {
++                g_warning ("Unable to start automount manager: %s", error->message);
++                g_error_free (error);
++        }
++}
++
++static void
++impl_deactivate (CinnamonSettingsPlugin *plugin)
++{
++        g_debug ("Deactivating automount plugin");
++        csd_automount_manager_stop (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager);
++}
++
++static void
++csd_automount_plugin_class_init (CsdAutomountPluginClass *klass)
++{
++        GObjectClass             *object_class = G_OBJECT_CLASS (klass);
++        CinnamonSettingsPluginClass *plugin_class = CINNAMON_SETTINGS_PLUGIN_CLASS (klass);
++
++        object_class->finalize = csd_automount_plugin_finalize;
++
++        plugin_class->activate = impl_activate;
++        plugin_class->deactivate = impl_deactivate;
++
++        g_type_class_add_private (klass, sizeof (CsdAutomountPluginPrivate));
++}
++
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h	2013-10-08 22:35:10.771472456 +0200
+@@ -0,0 +1,60 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2010 Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Author: Tomas Bzatek <tbzatek@redhat.com>
++ */
++
++#ifndef __CSD_AUTOMOUNT_PLUGIN_H__
++#define __CSD_AUTOMOUNT_PLUGIN_H__
++
++#include <glib.h>
++#include <glib-object.h>
++#include <gmodule.h>
++
++#include "cinnamon-settings-plugin.h"
++
++G_BEGIN_DECLS
++
++#define CSD_TYPE_AUTOMOUNT_PLUGIN                (csd_automount_plugin_get_type ())
++#define CSD_AUTOMOUNT_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPlugin))
++#define CSD_AUTOMOUNT_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
++#define CSD_IS_AUTOMOUNT_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), CSD_TYPE_AUTOMOUNT_PLUGIN))
++#define CSD_IS_AUTOMOUNT_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), CSD_TYPE_AUTOMOUNT_PLUGIN))
++#define CSD_AUTOMOUNT_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
++
++typedef struct CsdAutomountPluginPrivate CsdAutomountPluginPrivate;
++
++typedef struct
++{
++        CinnamonSettingsPlugin           parent;
++        CsdAutomountPluginPrivate    *priv;
++} CsdAutomountPlugin;
++
++typedef struct
++{
++        CinnamonSettingsPluginClass parent_class;
++} CsdAutomountPluginClass;
++
++GType   csd_automount_plugin_get_type             (void) G_GNUC_CONST;
++
++/* All the plugins must implement this function */
++G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
++
++G_END_DECLS
++
++#endif /* __CSD_AUTOMOUNT_PLUGIN_H__ */
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am	2013-10-02 16:13:56.000000000 +0200
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am	2013-10-08 22:48:19.240865461 +0200
+@@ -1,38 +1,87 @@
+-libexec_PROGRAMS = cinnamon-fallback-mount-helper
++NULL =
+ 
+-cinnamon_fallback_mount_helper_SOURCES = \
+-	cinnamon-fallback-mount-helper.c \
+-	csd-automount-manager.c \
+-	csd-automount-manager.h \
+-	csd-autorun.c \
+-	csd-autorun.h
++plugin_name = automount
+ 
+-cinnamon_fallback_mount_helper_CPPFLAGS = \
++libexec_PROGRAMS = csd-test-automount
++
++csd_test_automount_SOURCES = 		\
++	test-automount.c		\
++	csd-automount-manager.h		\
++	csd-automount-manager.c		\
++	csd-autorun.c		\
++	csd-autorun.h		\
++	$(NULL)
++
++csd_test_automount_CPPFLAGS = \
+ 	-I$(top_srcdir)/cinnamon-settings-daemon		\
++	-I$(top_srcdir)/plugins/common			\
+ 	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+-cinnamon_fallback_mount_helper_CFLAGS =	\
++csd_test_automount_CFLAGS = \
++	$(PLUGIN_CFLAGS)		\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+ 	$(SYSTEMD_CFLAGS)		\
+ 	$(AUTOMOUNT_CFLAGS)
++	$(AM_CFLAGS)
++
++csd_test_automount_LDADD =			\
++	$(top_builddir)/cinnamon-settings-daemon/libcsd.la	\
++	$(SETTINGS_PLUGIN_LIBS)		\
++	$(SYSTEMD_LIBS)			\
++	$(AUTOMOUNT_LIBS)		\
++	$(NULL)
++
++plugin_LTLIBRARIES = \
++	libautomount.la		\
++	$(NULL)
++
++libautomount_la_SOURCES =		\
++	csd-automount-plugin.h		\
++	csd-automount-plugin.c		\
++	csd-automount-manager.h		\
++	csd-automount-manager.c		\
++	csd-autorun.c		\
++	csd-autorun.h		\
++	$(NULL)
++
++libautomount_la_CPPFLAGS = \
++	-I$(top_srcdir)/cinnamon-settings-daemon		\
++	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
++	$(AM_CPPFLAGS)
++
++libautomount_la_CFLAGS = \
++	$(SETTINGS_PLUGIN_CFLAGS)	\
++	$(SYSTEMD_CFLAGS)		\
++	$(AUTOMOUNT_CFLAGS)		\
++	$(AM_CFLAGS)
++
++libautomount_la_LDFLAGS =		\
++	$(CSD_PLUGIN_LDFLAGS)		\
++	$(NULL)
+ 
+-cinnamon_fallback_mount_helper_LDADD =	\
++libautomount_la_LIBADD  =		\
+ 	$(SETTINGS_PLUGIN_LIBS)		\
+ 	$(SYSTEMD_LIBS)			\
+ 	$(AUTOMOUNT_LIBS)		\
+-	$(top_builddir)/cinnamon-settings-daemon/libcsd.la
++	$(NULL)
+ 
+-autostartdir = $(datadir)/applications
+-autostart_in_files = cinnamon-fallback-mount-helper.desktop.in
+-autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in
+-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
++plugin_in_files =		\
++	automount.cinnamon-settings-plugin.in	\
++	$(NULL)
+ 
+-$(autostart_in_files): $(autostart_in_in_files)
+-	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
++plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
+ 
+-@INTLTOOL_DESKTOP_RULE@
++EXTRA_DIST = 			\
++	$(plugin_in_files)	\
++	$(NULL)
+ 
+-EXTRA_DIST = $(autostart_in_in_files)
++CLEANFILES = 			\
++	$(plugin_DATA)		\
++	$(NULL)
+ 
+-CLEANFILES = $(autostart_DATA) $(autostart_in_files)
++DISTCLEANFILES =		\
++	$(plugin_DATA)		\
++	$(NULL)
++
++@CSD_INTLTOOL_PLUGIN_RULE@
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c
+--- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c	1970-01-01 01:00:00.000000000 +0100
++++ cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c	2013-10-08 22:42:53.759486525 +0200
+@@ -0,0 +1,7 @@
++#define NEW csd_automount_manager_new
++#define START csd_automount_manager_start
++#define STOP csd_automount_manager_stop
++#define MANAGER CsdAutomountManager
++#include "csd-automount-manager.h"
++
++#include "test-plugin.h"
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in cinnamon-settings-daemon-2.0.1/po/POTFILES.in
+--- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in	2013-10-02 16:13:56.000000000 +0200
++++ cinnamon-settings-daemon-2.0.1/po/POTFILES.in	2013-10-08 22:35:10.771472456 +0200
+@@ -18,8 +18,9 @@
+ plugins/a11y-keyboard/csd-a11y-preferences-dialog.c
+ [type: gettext/glade]plugins/a11y-keyboard/csd-a11y-preferences-dialog.ui
+ [type: gettext/ini]plugins/a11y-settings/a11y-settings.cinnamon-settings-plugin.in
+-plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
++[type: gettext/ini]plugins/automount/automount.cinnamon-settings-plugin.in
+ plugins/automount/csd-automount-manager.c
++plugins/automount/csd-automount-plugin.c
+ plugins/automount/csd-autorun.c
+ [type: gettext/ini]plugins/background/background.cinnamon-settings-plugin.in
+ [type: gettext/ini]plugins/clipboard/clipboard.cinnamon-settings-plugin.in
+diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip cinnamon-settings-daemon-2.0.1/po/POTFILES.skip
+--- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip	2013-10-02 16:13:56.000000000 +0200
++++ cinnamon-settings-daemon-2.0.1/po/POTFILES.skip	2013-10-08 22:37:20.224645009 +0200
+@@ -20,6 +20,5 @@
+ data/org.cinnamon.settings-daemon.plugins.updates.gschema.xml.in
+ data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in
+ data/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml.in
+-plugins/automount/gnome-fallback-mount-helper.desktop.in
+ plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
+ plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
new file mode 100644
index 00000000000..c397a9758e2
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
@@ -0,0 +1,52 @@
+
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3, 
+libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord,
+systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
+
+let
+  version = "2.0.10";
+in
+stdenv.mkDerivation {
+  name = "cinnamon-settings-daemon-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz";
+    sha256 = "10r75xsngb7ipv9fy07dyfb256bqybzcxbwny60sgjhrksk3v9mg";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  configureFlags = "--enable-systemd" ;
+
+  patches = [ ./systemd-support.patch ./automount-plugin.patch ./dpms.patch];
+
+  buildInputs = [
+    pkgconfig autoreconfHook
+    glib gettext gnome_common
+    intltool gtk3 libnotify lcms2
+    libgnomekbd libxklavier colord
+    libcanberra pulseaudio upower
+    libcanberra_gtk3 cinnamon-desktop
+    systemd libxslt docbook_xsl makeWrapper
+    gsettings_desktop_schemas
+   ];
+
+  preBuild = "patchShebangs ./scripts";
+
+  #ToDo: missing org.cinnamon.gschema.xml, probably not packaged yet
+  postFixup  = ''
+    for f in "$out"/libexec/*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+
+  meta = {
+    homepage = "http://cinnamon.linuxmint.com";
+    description = "The cinnamon session files" ;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.roelof ];
+  };
+}
+
diff --git a/pkgs/desktops/cinnamon/dpms.patch b/pkgs/desktops/cinnamon/dpms.patch
new file mode 100644
index 00000000000..a73f33dc618
--- /dev/null
+++ b/pkgs/desktops/cinnamon/dpms.patch
@@ -0,0 +1,30 @@
+ 
+-- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -33,6 +33,8 @@
+ #include <libnotify/notify.h>
+ #include <canberra-gtk.h>
+ 
++#include <X11/extensions/dpms.h>
++
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libcinnamon-desktop/gnome-rr.h>
+ 
+@@ -3967,6 +3790,17 @@ csd_power_manager_start (CsdPowerManager
+         /* set the initial dim time that can adapt for the user */
+         refresh_idle_dim_settings (manager);
+ 
++        /* Make sure that Xorg's DPMS extension never gets in our way. The defaults seem to have changed in Xorg 1.14
++         * being "0" by default to being "600" by default 
++         * https://bugzilla.gnome.org/show_bug.cgi?id=709114
++         */
++        gdk_error_trap_push ();
++        int dummy;
++        if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) {
++            DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0);
++        }
++        gdk_error_trap_pop_ignored ();
++
+         manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
+                                                                                disable_builtin_screensaver,
+                                                                                NULL);
diff --git a/pkgs/desktops/cinnamon/keyboard.patch b/pkgs/desktops/cinnamon/keyboard.patch
new file mode 100644
index 00000000000..f67d961ff58
--- /dev/null
+++ b/pkgs/desktops/cinnamon/keyboard.patch
@@ -0,0 +1,4729 @@
+ 
+diff -uNrp a/cinnamon-settings-daemon/main.c b/cinnamon-settings-daemon/main.c
+--- a/cinnamon-settings-daemon/main.c	2013-08-24 18:04:31.000000000 +0100
++++ b/cinnamon-settings-daemon/main.c	2013-08-25 16:36:02.000000000 +0100
+@@ -319,6 +319,29 @@ set_legacy_ibus_env_vars (GDBusProxy *pr
+ }
+ #endif
+ 
++static void
++got_session_proxy (GObject      *source_object,
++                   GAsyncResult *res,
++                   gpointer      user_data)
++{
++        GDBusProxy *proxy;
++        GError *error = NULL;
++
++        proxy = g_dbus_proxy_new_finish (res, &error);
++        if (proxy == NULL) {
++                g_debug ("Could not connect to the Session manager: %s", error->message);
++                g_error_free (error);
++        } else {
++                set_locale (proxy);
++#ifdef HAVE_IBUS
++                /* This will register with cinnamon-session after calling Setenv. */
++                set_legacy_ibus_env_vars (proxy);
++#else
++                register_with_gnome_session (proxy);
++#endif
++        }
++}
++
+ static gboolean
+ on_term_signal_pipe_closed (GIOChannel *source,
+                             GIOCondition condition,
+@@ -368,6 +391,16 @@ set_session_over_handler (GDBusConnectio
+ {
+         g_assert (bus != NULL);
+ 
++        g_dbus_proxy_new (bus,
++                          G_DBUS_PROXY_FLAGS_NONE,
++                          NULL,
++                          GNOME_SESSION_DBUS_NAME,
++                          GNOME_SESSION_DBUS_OBJECT,
++                          GNOME_SESSION_DBUS_INTERFACE,
++                          NULL,
++                          (GAsyncReadyCallback) got_session_proxy,
++                          NULL);
++
+         watch_for_term_signal (manager);
+ }
+ 
+@@ -390,56 +423,6 @@ name_lost_handler (GDBusConnection *conn
+         gtk_main_quit ();
+ }
+ 
+-static gboolean
+-do_register_client (gpointer user_data)
+-{
+-        GDBusProxy *proxy = (GDBusProxy *) user_data;
+-        g_assert (proxy != NULL);
+-
+-        const char *startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+-        g_dbus_proxy_call (proxy,
+-                           "RegisterClient",
+-                           g_variant_new ("(ss)", "cinnamon-settings-daemon", startup_id ? startup_id : ""),
+-                           G_DBUS_CALL_FLAGS_NONE,
+-                           -1,
+-                           NULL,
+-                           (GAsyncReadyCallback) on_client_registered,
+-                           manager);
+-
+-        return FALSE;
+-}
+-
+-static void
+-queue_register_client (void)
+-{
+-        GDBusConnection *bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+-        if (!bus)
+-                return;
+-
+-        GError *error = NULL;
+-        GDBusProxy *proxy = g_dbus_proxy_new_sync (bus,
+-                                                   G_DBUS_PROXY_FLAGS_NONE,
+-                                                   NULL,
+-                                                   GNOME_SESSION_DBUS_NAME,
+-                                                   GNOME_SESSION_DBUS_OBJECT,
+-                                                   GNOME_SESSION_DBUS_INTERFACE,
+-                                                   NULL,
+-                                                   &error);
+-        g_object_unref (bus);
+-
+-        if (proxy == NULL) {
+-                g_debug ("Could not connect to the Session manager: %s", error->message);
+-                g_error_free (error);
+-                return;
+-        }
+-
+-        /* Register the daemon with cinnamon-session */
+-        g_signal_connect (G_OBJECT (proxy), "g-signal",
+-                          G_CALLBACK (on_session_over), NULL);
+-
+-        g_idle_add_full (G_PRIORITY_DEFAULT, do_register_client, proxy, NULL);
+-}
+-
+ static void
+ bus_register (void)
+ {
+@@ -541,8 +524,6 @@ main (int argc, char *argv[])
+ 
+         notify_init ("cinnamon-settings-daemon");
+ 
+-        queue_register_client ();
+-
+         bus_register ();
+ 
+         cinnamon_settings_profile_start ("cinnamon_settings_manager_new");
+diff -uNrp a/configure.ac b/configure.ac
+--- a/configure.ac	2013-08-24 18:04:31.000000000 +0100
++++ b/configure.ac	2013-08-25 16:36:02.000000000 +0100
+@@ -53,6 +53,7 @@ UPOWER_GLIB_REQUIRED_VERSION=0.9.1
+ PA_REQUIRED_VERSION=0.9.16
+ UPOWER_REQUIRED_VERSION=0.9.11
+ GTK_XINPUT_2_3_VERSION=3.7.8
++IBUS_REQUIRED_VERSION=1.4.2
+ 
+ #EXTRA_COMPILE_WARNINGS(yes)
+ 
+@@ -199,8 +200,21 @@ dnl ------------------------------------
+ dnl - Keyboard plugin stuff
+ dnl ---------------------------------------------------------------------------
+ 
+-LIBGNOMEKBD_REQUIRED=2.91.1
+-PKG_CHECK_MODULES(KEYBOARD, [libgnomekbdui >= $LIBGNOMEKBD_REQUIRED libgnomekbd >= $LIBGNOMEKBD_REQUIRED libxklavier >= 5.0 kbproto])
++AC_ARG_ENABLE(ibus,
++        AS_HELP_STRING([--disable-ibus],
++                       [Disable IBus support]),
++        enable_ibus=$enableval,
++        enable_ibus=yes)
++
++if test "x$enable_ibus" = "xyes" ; then
++        IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
++        AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
++else
++        IBUS_MODULE=
++fi
++AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
++
++PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - Housekeeping plugin stuff
+diff -uNrp a/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in
+--- a/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-24 18:04:31.000000000 +0100
++++ b/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-25 16:36:02.000000000 +0100
+@@ -175,6 +175,15 @@
+       <_summary>Magnifier zoom out</_summary>
+       <_description>Binding for the magnifier to zoom out</_description>
+     </key>
++    <key name="switch-input-source" type="s">
++      <default>''</default>
++      <_summary>Switch input source</_summary>
++      <_description>Binding to select the next input source</_description>
++    </key>
++    <key name="switch-input-source-backward" type="s">
++      <default>''</default>
++      <_summary>Switch input source backward</_summary>
++      <_description>Binding to select the previous input source</_description>
++    </key>
+   </schema>
+-
+-</schemalist>
++</schemalist>
+\ No newline at end of file
+diff -uNrp a/plugins/keyboard/csd-keyboard-manager.c b/plugins/keyboard/csd-keyboard-manager.c
+--- a/plugins/keyboard/csd-keyboard-manager.c	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/csd-keyboard-manager.c	2013-08-25 16:36:02.000000000 +0100
+@@ -40,19 +40,22 @@
+ 
+ #include <X11/XKBlib.h>
+ #include <X11/keysym.h>
++#include <X11/extensions/XKBrules.h>
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libcinnamon-desktop/gnome-xkb-info.h>
++
++#ifdef HAVE_IBUS
++#include <ibus.h>
++#endif
+ 
+ #include "cinnamon-settings-profile.h"
+ #include "csd-keyboard-manager.h"
++#include "csd-input-helper.h"
+ #include "csd-enums.h"
+ 
+-#include "csd-keyboard-xkb.h"
+-
+ #define CSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_KEYBOARD_MANAGER, CsdKeyboardManagerPrivate))
+ 
+-#ifndef HOST_NAME_MAX
+-#  define HOST_NAME_MAX 255
+-#endif
+-
+ #define CSD_KEYBOARD_DIR "org.cinnamon.settings-daemon.peripherals.keyboard"
+ 
+ #define KEY_REPEAT         "repeat"
+@@ -60,6 +63,7 @@
+ #define KEY_INTERVAL       "repeat-interval"
+ #define KEY_DELAY          "delay"
+ #define KEY_CLICK_VOLUME   "click-volume"
++#define KEY_REMEMBER_NUMLOCK_STATE "remember-numlock-state"
+ #define KEY_NUMLOCK_STATE  "numlock-state"
+ 
+ #define KEY_BELL_VOLUME    "bell-volume"
+@@ -67,27 +71,560 @@
+ #define KEY_BELL_DURATION  "bell-duration"
+ #define KEY_BELL_MODE      "bell-mode"
+ 
+-#define LIBGNOMEKBD_KEYBOARD_DIR "org.gnome.libgnomekbd.keyboard"
+-#define LIBGNOMEKBD_KEY_LAYOUTS  "layouts"
++#define KEY_SWITCHER "input-sources-switcher"
++
++#define GNOME_DESKTOP_INTERFACE_DIR "org.cinnamon.desktop.interface"
++
++#define KEY_GTK_IM_MODULE    "gtk-im-module"
++#define GTK_IM_MODULE_SIMPLE "gtk-im-context-simple"
++#define GTK_IM_MODULE_IBUS   "ibus"
++
++#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
++
++#define KEY_CURRENT_INPUT_SOURCE "current"
++#define KEY_INPUT_SOURCES        "sources"
++#define KEY_KEYBOARD_OPTIONS     "xkb-options"
++
++#define INPUT_SOURCE_TYPE_XKB  "xkb"
++#define INPUT_SOURCE_TYPE_IBUS "ibus"
++
++#define DEFAULT_LANGUAGE "en_US"
+ 
+ struct CsdKeyboardManagerPrivate
+ {
+ 	guint      start_idle_id;
+         GSettings *settings;
+-        GSettings *libgnomekbd_settings;
+-        gboolean   have_xkb;
++        GSettings *input_sources_settings;
++        GSettings *interface_settings;
++        GnomeXkbInfo *xkb_info;
++#ifdef HAVE_IBUS
++        IBusBus   *ibus;
++        GHashTable *ibus_engines;
++        GHashTable *ibus_xkb_engines;
++        GCancellable *ibus_cancellable;
++        gboolean session_is_fallback;
++#endif
+         gint       xkb_event_base;
+         CsdNumLockState old_state;
++        GdkDeviceManager *device_manager;
++        guint device_added_id;
++        guint device_removed_id;
++
++        gboolean input_sources_switcher_spawned;
++        GPid input_sources_switcher_pid;
+ };
+ 
+ static void     csd_keyboard_manager_class_init  (CsdKeyboardManagerClass *klass);
+ static void     csd_keyboard_manager_init        (CsdKeyboardManager      *keyboard_manager);
+ static void     csd_keyboard_manager_finalize    (GObject                 *object);
++static gboolean apply_input_sources_settings     (GSettings               *settings,
++                                                  gpointer                 keys,
++                                                  gint                     n_keys,
++                                                  CsdKeyboardManager      *manager);
++static void     set_gtk_im_module                (CsdKeyboardManager      *manager,
++                                                  const gchar             *new_module);
+ 
+ G_DEFINE_TYPE (CsdKeyboardManager, csd_keyboard_manager, G_TYPE_OBJECT)
+ 
+ static gpointer manager_object = NULL;
+ 
++static void
++init_builder_with_sources (GVariantBuilder *builder,
++                           GSettings       *settings)
++{
++        const gchar *type;
++        const gchar *id;
++        GVariantIter iter;
++        GVariant *sources;
++
++        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++
++        g_variant_builder_init (builder, G_VARIANT_TYPE ("a(ss)"));
++
++        g_variant_iter_init (&iter, sources);
++        while (g_variant_iter_next (&iter, "(&s&s)", &type, &id))
++                g_variant_builder_add (builder, "(ss)", type, id);
++
++        g_variant_unref (sources);
++}
++
++static gboolean
++schema_is_installed (const gchar *name)
++{
++        const gchar * const *schemas;
++        const gchar * const *s;
++
++        schemas = g_settings_list_schemas ();
++        for (s = schemas; *s; ++s)
++                if (g_str_equal (*s, name))
++                        return TRUE;
++
++        return FALSE;
++}
++
++#ifdef HAVE_IBUS
++static void
++clear_ibus (CsdKeyboardManager *manager)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++
++        g_cancellable_cancel (priv->ibus_cancellable);
++        g_clear_object (&priv->ibus_cancellable);
++        g_clear_pointer (&priv->ibus_engines, g_hash_table_destroy);
++        g_clear_pointer (&priv->ibus_xkb_engines, g_hash_table_destroy);
++        g_clear_object (&priv->ibus);
++}
++
++static gchar *
++make_xkb_source_id (const gchar *engine_id)
++{
++        gchar *id;
++        gchar *p;
++        gint n_colons = 0;
++
++        /* engine_id is like "xkb:layout:variant:lang" where
++         * 'variant' and 'lang' might be empty */
++
++        engine_id += 4;
++
++        for (p = (gchar *)engine_id; *p; ++p)
++                if (*p == ':')
++                        if (++n_colons == 2)
++                                break;
++        if (!*p)
++                return NULL;
++
++        id = g_strndup (engine_id, p - engine_id + 1);
++
++        id[p - engine_id] = '\0';
++
++        /* id is "layout:variant" where 'variant' might be empty */
++
++        for (p = id; *p; ++p)
++                if (*p == ':') {
++                        if (*(p + 1) == '\0')
++                                *p = '\0';
++                        else
++                                *p = '+';
++                        break;
++                }
++
++        /* id is "layout+variant" or "layout" */
++
++        return id;
++}
++
++static void
++fetch_ibus_engines_result (GObject            *object,
++                           GAsyncResult       *result,
++                           CsdKeyboardManager *manager)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        GList *list, *l;
++        GError *error = NULL;
++
++        /* engines shouldn't be there yet */
++        g_return_if_fail (priv->ibus_engines == NULL);
++
++        g_clear_object (&priv->ibus_cancellable);
++
++        list = ibus_bus_list_engines_async_finish (priv->ibus,
++                                                   result,
++                                                   &error);
++        if (!list && error) {
++                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++                        g_warning ("Couldn't finish IBus request: %s", error->message);
++                g_error_free (error);
++
++                clear_ibus (manager);
++                return;
++        }
++
++        /* Maps IBus engine ids to engine description objects */
++        priv->ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
++        /* Maps XKB source id strings to engine description objects */
++        priv->ibus_xkb_engines = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
++
++        for (l = list; l; l = l->next) {
++                IBusEngineDesc *engine = l->data;
++                const gchar *engine_id = ibus_engine_desc_get_name (engine);
++
++                g_hash_table_replace (priv->ibus_engines, (gpointer)engine_id, engine);
++
++                if (strncmp ("xkb:", engine_id, 4) == 0) {
++                        gchar *xkb_source_id = make_xkb_source_id (engine_id);
++                        if (xkb_source_id)
++                                g_hash_table_replace (priv->ibus_xkb_engines,
++                                                      xkb_source_id,
++                                                      engine);
++                }
++        }
++        g_list_free (list);
++
++        apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
++}
++
++static void
++fetch_ibus_engines (CsdKeyboardManager *manager)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++
++        /* engines shouldn't be there yet */
++        g_return_if_fail (priv->ibus_engines == NULL);
++        g_return_if_fail (priv->ibus_cancellable == NULL);
++
++        priv->ibus_cancellable = g_cancellable_new ();
++
++        ibus_bus_list_engines_async (priv->ibus,
++                                     -1,
++                                     priv->ibus_cancellable,
++                                     (GAsyncReadyCallback)fetch_ibus_engines_result,
++                                     manager);
++}
++
++static void
++maybe_start_ibus (CsdKeyboardManager *manager,
++                  GVariant           *sources)
++{
++        gboolean need_ibus = FALSE;
++        GVariantIter iter;
++        const gchar *type;
++
++        if (manager->priv->session_is_fallback)
++                return;
++
++        g_variant_iter_init (&iter, sources);
++        while (g_variant_iter_next (&iter, "(&s&s)", &type, NULL))
++                if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
++                        need_ibus = TRUE;
++                        break;
++                }
++
++        if (!need_ibus)
++                return;
++
++        if (!manager->priv->ibus) {
++                ibus_init ();
++                manager->priv->ibus = ibus_bus_new ();
++                g_signal_connect_swapped (manager->priv->ibus, "connected",
++                                          G_CALLBACK (fetch_ibus_engines), manager);
++                g_signal_connect_swapped (manager->priv->ibus, "disconnected",
++                                          G_CALLBACK (clear_ibus), manager);
++        }
++        /* IBus doesn't export API in the session bus. The only thing
++         * we have there is a well known name which we can use as a
++         * sure-fire way to activate it. */
++        g_bus_unwatch_name (g_bus_watch_name (G_BUS_TYPE_SESSION,
++                                              IBUS_SERVICE_IBUS,
++                                              G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
++                                              NULL,
++                                              NULL,
++                                              NULL,
++                                              NULL));
++}
++
++static void
++got_session_name (GObject            *object,
++                  GAsyncResult       *res,
++                  CsdKeyboardManager *manager)
++{
++        GVariant *result, *variant;
++        GDBusConnection *connection = G_DBUS_CONNECTION (object);
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        const gchar *session_name = NULL;
++        GError *error = NULL;
++
++        /* IBus shouldn't have been touched yet */
++        g_return_if_fail (priv->ibus == NULL);
++
++        g_clear_object (&priv->ibus_cancellable);
++
++        result = g_dbus_connection_call_finish (connection, res, &error);
++        if (!result) {
++                g_warning ("Couldn't get session name: %s", error->message);
++                g_error_free (error);
++                goto out;
++        }
++
++        g_variant_get (result, "(v)", &variant);
++        g_variant_unref (result);
++
++        g_variant_get (variant, "&s", &session_name);
++
++        if (g_strcmp0 (session_name, "gnome") == 0)
++                manager->priv->session_is_fallback = FALSE;
++
++        g_variant_unref (variant);
++ out:
++        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
++        g_object_unref (connection);
++}
++
++static void
++got_bus (GObject            *object,
++         GAsyncResult       *res,
++         CsdKeyboardManager *manager)
++{
++        GDBusConnection *connection;
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        GError *error = NULL;
++
++        /* IBus shouldn't have been touched yet */
++        g_return_if_fail (priv->ibus == NULL);
++
++        g_clear_object (&priv->ibus_cancellable);
++
++        connection = g_bus_get_finish (res, &error);
++        if (!connection) {
++                g_warning ("Couldn't get session bus: %s", error->message);
++                g_error_free (error);
++                apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
++                return;
++        }
++
++        priv->ibus_cancellable = g_cancellable_new ();
++
++        g_dbus_connection_call (connection,
++                                "org.gnome.SessionManager",
++                                "/org/gnome/SessionManager",
++                                "org.freedesktop.DBus.Properties",
++                                "Get",
++                                g_variant_new ("(ss)",
++                                               "org.gnome.SessionManager",
++                                               "SessionName"),
++                                NULL,
++                                G_DBUS_CALL_FLAGS_NONE,
++                                -1,
++                                priv->ibus_cancellable,
++                                (GAsyncReadyCallback)got_session_name,
++                                manager);
++}
++
++static void
++set_ibus_engine_finish (GObject            *object,
++                        GAsyncResult       *res,
++                        CsdKeyboardManager *manager)
++{
++        gboolean result;
++        IBusBus *ibus = IBUS_BUS (object);
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        GError *error = NULL;
++
++        g_clear_object (&priv->ibus_cancellable);
++
++        result = ibus_bus_set_global_engine_async_finish (ibus, res, &error);
++        if (!result) {
++                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++                        g_warning ("Couldn't set IBus engine: %s", error->message);
++                g_error_free (error);
++        }
++}
++
++static void
++set_ibus_engine (CsdKeyboardManager *manager,
++                 const gchar        *engine_id)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++
++        g_return_if_fail (priv->ibus != NULL);
++        g_return_if_fail (priv->ibus_engines != NULL);
++
++        g_cancellable_cancel (priv->ibus_cancellable);
++        g_clear_object (&priv->ibus_cancellable);
++        priv->ibus_cancellable = g_cancellable_new ();
++
++        ibus_bus_set_global_engine_async (priv->ibus,
++                                          engine_id,
++                                          -1,
++                                          priv->ibus_cancellable,
++                                          (GAsyncReadyCallback)set_ibus_engine_finish,
++                                          manager);
++}
++
++static void
++set_ibus_xkb_engine (CsdKeyboardManager *manager,
++                     const gchar        *xkb_id)
++{
++        IBusEngineDesc *engine;
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++
++        if (!priv->ibus_xkb_engines)
++                return;
++
++        engine = g_hash_table_lookup (priv->ibus_xkb_engines, xkb_id);
++        if (!engine)
++                return;
++
++        set_ibus_engine (manager, ibus_engine_desc_get_name (engine));
++}
++
++/* XXX: See upstream bug:
++ * https://codereview.appspot.com/6586075/ */
++static gchar *
++layout_from_ibus_layout (const gchar *ibus_layout)
++{
++        const gchar *p;
++
++        /* we get something like "layout(variant)[option1,option2]" */
++
++        p = ibus_layout;
++        while (*p) {
++                if (*p == '(' || *p == '[')
++                        break;
++                p += 1;
++        }
++
++        return g_strndup (ibus_layout, p - ibus_layout);
++}
++
++static gchar *
++variant_from_ibus_layout (const gchar *ibus_layout)
++{
++        const gchar *a, *b;
++
++        /* we get something like "layout(variant)[option1,option2]" */
++
++        a = ibus_layout;
++        while (*a) {
++                if (*a == '(')
++                        break;
++                a += 1;
++        }
++        if (!*a)
++                return NULL;
++
++        a += 1;
++        b = a;
++        while (*b) {
++                if (*b == ')')
++                        break;
++                b += 1;
++        }
++        if (!*b)
++                return NULL;
++
++        return g_strndup (a, b - a);
++}
++
++static gchar **
++options_from_ibus_layout (const gchar *ibus_layout)
++{
++        const gchar *a, *b;
++        GPtrArray *opt_array;
++
++        /* we get something like "layout(variant)[option1,option2]" */
++
++        a = ibus_layout;
++        while (*a) {
++                if (*a == '[')
++                        break;
++                a += 1;
++        }
++        if (!*a)
++                return NULL;
++
++        opt_array = g_ptr_array_new ();
++
++        do {
++                a += 1;
++                b = a;
++                while (*b) {
++                        if (*b == ',' || *b == ']')
++                                break;
++                        b += 1;
++                }
++                if (!*b)
++                        goto out;
++
++                g_ptr_array_add (opt_array, g_strndup (a, b - a));
++
++                a = b;
++        } while (*a && *a == ',');
++
++out:
++        g_ptr_array_add (opt_array, NULL);
++        return (gchar **) g_ptr_array_free (opt_array, FALSE);
++}
++
++static const gchar *
++engine_from_locale (void)
++{
++        const gchar *locale;
++        const gchar *locale_engine[][2] = {
++                { "as_IN", "m17n:as:phonetic" },
++                { "bn_IN", "m17n:bn:inscript" },
++                { "gu_IN", "m17n:gu:inscript" },
++                { "hi_IN", "m17n:hi:inscript" },
++                { "ja_JP", "anthy" },
++                { "kn_IN", "m17n:kn:kgp" },
++                { "ko_KR", "hangul" },
++                { "mai_IN", "m17n:mai:inscript" },
++                { "ml_IN", "m17n:ml:inscript" },
++                { "mr_IN", "m17n:mr:inscript" },
++                { "or_IN", "m17n:or:inscript" },
++                { "pa_IN", "m17n:pa:inscript" },
++                { "sd_IN", "m17n:sd:inscript" },
++                { "ta_IN", "m17n:ta:tamil99" },
++                { "te_IN", "m17n:te:inscript" },
++                { "zh_CN", "pinyin" },
++                { "zh_HK", "cangjie3" },
++                { "zh_TW", "chewing" },
++        };
++        gint i;
++
++        locale = setlocale (LC_CTYPE, NULL);
++        if (!locale)
++                return NULL;
++
++        for (i = 0; i < G_N_ELEMENTS (locale_engine); ++i)
++                if (g_str_has_prefix (locale, locale_engine[i][0]))
++                        return locale_engine[i][1];
++
++        return NULL;
++}
++
++static void
++add_ibus_sources_from_locale (GSettings *settings)
++{
++        const gchar *locale_engine;
++        GVariantBuilder builder;
++
++        locale_engine = engine_from_locale ();
++        if (!locale_engine)
++                return;
++
++        init_builder_with_sources (&builder, settings);
++        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
++        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++}
++
++static void
++convert_ibus (GSettings *settings)
++{
++        GVariantBuilder builder;
++        GSettings *ibus_settings;
++        gchar **engines, **e;
++
++        if (!schema_is_installed ("org.freedesktop.ibus.general"))
++                return;
++
++        init_builder_with_sources (&builder, settings);
++
++        ibus_settings = g_settings_new ("org.freedesktop.ibus.general");
++        engines = g_settings_get_strv (ibus_settings, "preload-engines");
++        for (e = engines; *e; ++e) {
++                if (g_str_has_prefix (*e, "xkb:"))
++                        continue;
++                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, *e);
++        }
++
++        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++
++        g_strfreev (engines);
++        g_object_unref (ibus_settings);
++}
++#endif  /* HAVE_IBUS */
++
+ static gboolean
+ xkb_set_keyboard_autorepeat_rate (guint delay, guint interval)
+ {
+@@ -97,32 +634,33 @@ xkb_set_keyboard_autorepeat_rate (guint
+                                      interval);
+ }
+ 
+-static void
+-numlock_xkb_init (CsdKeyboardManager *manager)
++static gboolean
++check_xkb_extension (CsdKeyboardManager *manager)
+ {
+         Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+-        gboolean have_xkb;
+         int opcode, error_base, major, minor;
++        gboolean have_xkb;
+ 
+         have_xkb = XkbQueryExtension (dpy,
+                                       &opcode,
+                                       &manager->priv->xkb_event_base,
+                                       &error_base,
+                                       &major,
+-                                      &minor)
+-                && XkbUseExtension (dpy, &major, &minor);
++                                      &minor);
++        return have_xkb;
++}
+ 
+-        if (have_xkb) {
+-                XkbSelectEventDetails (dpy,
+-                                       XkbUseCoreKbd,
+-                                       XkbStateNotifyMask,
+-                                       XkbModifierLockMask,
+-                                       XkbModifierLockMask);
+-        } else {
+-                g_warning ("XKB extension not available");
+-        }
++static void
++xkb_init (CsdKeyboardManager *manager)
++{
++        Display *dpy;
+ 
+-        manager->priv->have_xkb = have_xkb;
++        dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
++        XkbSelectEventDetails (dpy,
++                               XkbUseCoreKbd,
++                               XkbStateNotify,
++                               XkbModifierLockMask,
++                               XkbModifierLockMask);
+ }
+ 
+ static unsigned
+@@ -143,19 +681,32 @@ numlock_set_xkb_state (CsdNumLockState n
+         XkbLockModifiers (dpy, XkbUseCoreKbd, num_mask, new_state == CSD_NUM_LOCK_STATE_ON ? num_mask : 0);
+ }
+ 
++static const char *
++num_lock_state_to_string (CsdNumLockState numlock_state)
++{
++	switch (numlock_state) {
++	case CSD_NUM_LOCK_STATE_UNKNOWN:
++		return "CSD_NUM_LOCK_STATE_UNKNOWN";
++	case CSD_NUM_LOCK_STATE_ON:
++		return "CSD_NUM_LOCK_STATE_ON";
++	case CSD_NUM_LOCK_STATE_OFF:
++		return "CSD_NUM_LOCK_STATE_OFF";
++	default:
++		return "UNKNOWN";
++	}
++}
++
+ static GdkFilterReturn
+-numlock_xkb_callback (GdkXEvent *xev_,
+-                      GdkEvent  *gdkev_,
+-                      gpointer   user_data)
++xkb_events_filter (GdkXEvent *xev_,
++		   GdkEvent  *gdkev_,
++		   gpointer   user_data)
+ {
+         XEvent *xev = (XEvent *) xev_;
+ 	XkbEvent *xkbev = (XkbEvent *) xev;
+         CsdKeyboardManager *manager = (CsdKeyboardManager *) user_data;
+ 
+-        if (xev->type != manager->priv->xkb_event_base)
+-		return GDK_FILTER_CONTINUE;
+-
+-	if (xkbev->any.xkb_type != XkbStateNotify)
++        if (xev->type != manager->priv->xkb_event_base ||
++            xkbev->any.xkb_type != XkbStateNotify)
+ 		return GDK_FILTER_CONTINUE;
+ 
+ 	if (xkbev->state.changed & XkbModifierLockMask) {
+@@ -166,6 +717,9 @@ numlock_xkb_callback (GdkXEvent *xev_,
+ 		numlock_state = (num_mask & locked_mods) ? CSD_NUM_LOCK_STATE_ON : CSD_NUM_LOCK_STATE_OFF;
+ 
+ 		if (numlock_state != manager->priv->old_state) {
++			g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
++				 num_lock_state_to_string (numlock_state),
++				 num_lock_state_to_string (manager->priv->old_state));
+ 			g_settings_set_enum (manager->priv->settings,
+ 					     KEY_NUMLOCK_STATE,
+ 					     numlock_state);
+@@ -177,57 +731,509 @@ numlock_xkb_callback (GdkXEvent *xev_,
+ }
+ 
+ static void
+-numlock_install_xkb_callback (CsdKeyboardManager *manager)
++install_xkb_filter (CsdKeyboardManager *manager)
+ {
+-        if (!manager->priv->have_xkb)
+-                return;
+-
+         gdk_window_add_filter (NULL,
+-                               numlock_xkb_callback,
++                               xkb_events_filter,
+                                manager);
+ }
+ 
+-static guint
+-_csd_settings_get_uint (GSettings  *settings,
+-			const char *key)
++static void
++remove_xkb_filter (CsdKeyboardManager *manager)
+ {
+-	guint value;
++        gdk_window_remove_filter (NULL,
++                                  xkb_events_filter,
++                                  manager);
++}
+ 
+-	g_settings_get (settings, key, "u", &value);
+-	return value;
++static void
++free_xkb_component_names (XkbComponentNamesRec *p)
++{
++        g_return_if_fail (p != NULL);
++
++        free (p->keymap);
++        free (p->keycodes);
++        free (p->types);
++        free (p->compat);
++        free (p->symbols);
++        free (p->geometry);
++
++        g_free (p);
++}
++
++static void
++upload_xkb_description (const gchar          *rules_file_path,
++                        XkbRF_VarDefsRec     *var_defs,
++                        XkbComponentNamesRec *comp_names)
++{
++        Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
++        XkbDescRec *xkb_desc;
++        gchar *rules_file;
++
++        /* Upload it to the X server using the same method as setxkbmap */
++        xkb_desc = XkbGetKeyboardByName (display,
++                                         XkbUseCoreKbd,
++                                         comp_names,
++                                         XkbGBN_AllComponentsMask,
++                                         XkbGBN_AllComponentsMask &
++                                         (~XkbGBN_GeometryMask), True);
++        if (!xkb_desc) {
++                g_warning ("Couldn't upload new XKB keyboard description");
++                return;
++        }
++
++        XkbFreeKeyboard (xkb_desc, 0, True);
++
++        rules_file = g_path_get_basename (rules_file_path);
++
++        if (!XkbRF_SetNamesProp (display, rules_file, var_defs))
++                g_warning ("Couldn't update the XKB root window property");
++
++        g_free (rules_file);
++}
++
++static gchar *
++language_code_from_locale (const gchar *locale)
++{
++        if (!locale || !locale[0] || !locale[1])
++                return NULL;
++
++        if (!locale[2] || locale[2] == '_' || locale[2] == '.')
++                return g_strndup (locale, 2);
++
++        if (!locale[3] || locale[3] == '_' || locale[3] == '.')
++                return g_strndup (locale, 3);
++
++        return NULL;
++}
++
++static gchar *
++build_xkb_group_string (const gchar *user,
++                        const gchar *locale,
++                        const gchar *latin)
++{
++        gchar *string;
++        gsize length = 0;
++        guint commas = 2;
++
++        if (latin)
++                length += strlen (latin);
++        else
++                commas -= 1;
++
++        if (locale)
++                length += strlen (locale);
++        else
++                commas -= 1;
++
++        length += strlen (user) + commas + 1;
++
++        string = malloc (length);
++
++        if (locale && latin)
++                sprintf (string, "%s,%s,%s", user, locale, latin);
++        else if (locale)
++                sprintf (string, "%s,%s", user, locale);
++        else if (latin)
++                sprintf (string, "%s,%s", user, latin);
++        else
++                sprintf (string, "%s", user);
++
++        return string;
++}
++
++static gboolean
++layout_equal (const gchar *layout_a,
++              const gchar *variant_a,
++              const gchar *layout_b,
++              const gchar *variant_b)
++{
++        return !g_strcmp0 (layout_a, layout_b) && !g_strcmp0 (variant_a, variant_b);
+ }
+ 
+ static void
+-apply_settings (GSettings          *settings,
+-                const char         *key,
+-                CsdKeyboardManager *manager)
++replace_layout_and_variant (CsdKeyboardManager *manager,
++                            XkbRF_VarDefsRec   *xkb_var_defs,
++                            const gchar        *layout,
++                            const gchar        *variant)
+ {
++        /* Toolkits need to know about both a latin layout to handle
++         * accelerators which are usually defined like Ctrl+C and a
++         * layout with the symbols for the language used in UI strings
++         * to handle mnemonics like Alt+Ф, so we try to find and add
++         * them in XKB group slots after the layout which the user
++         * actually intends to type with. */
++        const gchar *latin_layout = "us";
++        const gchar *latin_variant = "";
++        const gchar *locale_layout = NULL;
++        const gchar *locale_variant = NULL;
++        const gchar *locale;
++        gchar *language;
++
++        if (!layout)
++                return;
++
++        if (!variant)
++                variant = "";
++
++        locale = setlocale (LC_MESSAGES, NULL);
++        /* If LANG is empty, default to en_US */
++        if (!locale)
++                language = g_strdup (DEFAULT_LANGUAGE);
++        else
++                language = language_code_from_locale (locale);
++
++        if (!language)
++                language = language_code_from_locale (DEFAULT_LANGUAGE);
++
++        gnome_xkb_info_get_layout_info_for_language (manager->priv->xkb_info,
++                                                     language,
++                                                     NULL,
++                                                     NULL,
++                                                     NULL,
++                                                     &locale_layout,
++                                                     &locale_variant);
++        g_free (language);
++
++        /* We want to minimize the number of XKB groups if we have
++         * duplicated layout+variant pairs.
++         *
++         * Also, if a layout doesn't have a variant we still have to
++         * include it in the variants string because the number of
++         * variants must agree with the number of layouts. For
++         * instance:
++         *
++         * layouts:  "us,ru,us"
++         * variants: "dvorak,,"
++         */
++        if (layout_equal (latin_layout, latin_variant, locale_layout, locale_variant) ||
++            layout_equal (latin_layout, latin_variant, layout, variant)) {
++                latin_layout = NULL;
++                latin_variant = NULL;
++        }
++
++        if (layout_equal (locale_layout, locale_variant, layout, variant)) {
++                locale_layout = NULL;
++                locale_variant = NULL;
++        }
++
++        free (xkb_var_defs->layout);
++        xkb_var_defs->layout = build_xkb_group_string (layout, locale_layout, latin_layout);
++
++        free (xkb_var_defs->variant);
++        xkb_var_defs->variant = build_xkb_group_string (variant, locale_variant, latin_variant);
++}
++
++static gchar *
++build_xkb_options_string (gchar **options)
++{
++        gchar *string;
++
++        if (*options) {
++                gint i;
++                gsize len;
++                gchar *ptr;
++
++                /* First part, getting length */
++                len = 1 + strlen (options[0]);
++                for (i = 1; options[i] != NULL; i++)
++                        len += strlen (options[i]);
++                len += (i - 1); /* commas */
++
++                /* Second part, building string */
++                string = malloc (len);
++                ptr = g_stpcpy (string, *options);
++                for (i = 1; options[i] != NULL; i++) {
++                        ptr = g_stpcpy (ptr, ",");
++                        ptr = g_stpcpy (ptr, options[i]);
++                }
++        } else {
++                string = malloc (1);
++                *string = '\0';
++        }
++
++        return string;
++}
++
++static gchar **
++append_options (gchar **a,
++                gchar **b)
++{
++        gchar **c, **p;
++
++        if (!a && !b)
++                return NULL;
++        else if (!a)
++                return g_strdupv (b);
++        else if (!b)
++                return g_strdupv (a);
++
++        c = g_new0 (gchar *, g_strv_length (a) + g_strv_length (b) + 1);
++        p = c;
++
++        while (*a) {
++                *p = g_strdup (*a);
++                p += 1;
++                a += 1;
++        }
++        while (*b) {
++                *p = g_strdup (*b);
++                p += 1;
++                b += 1;
++        }
++
++        return c;
++}
++
++static void
++add_xkb_options (CsdKeyboardManager *manager,
++                 XkbRF_VarDefsRec   *xkb_var_defs,
++                 gchar             **extra_options)
++{
++        gchar **options;
++        gchar **settings_options;
++
++        settings_options = g_settings_get_strv (manager->priv->input_sources_settings,
++                                                KEY_KEYBOARD_OPTIONS);
++        options = append_options (settings_options, extra_options);
++        g_strfreev (settings_options);
++
++        free (xkb_var_defs->options);
++        xkb_var_defs->options = build_xkb_options_string (options);
++
++        g_strfreev (options);
++}
++
++static void
++apply_xkb_settings (CsdKeyboardManager *manager,
++                    const gchar        *layout,
++                    const gchar        *variant,
++                    gchar             **options)
++{
++        XkbRF_RulesRec *xkb_rules;
++        XkbRF_VarDefsRec *xkb_var_defs;
++        gchar *rules_file_path;
++
++        gnome_xkb_info_get_var_defs (&rules_file_path, &xkb_var_defs);
++
++        add_xkb_options (manager, xkb_var_defs, options);
++        replace_layout_and_variant (manager, xkb_var_defs, layout, variant);
++
++        gdk_error_trap_push ();
++
++        xkb_rules = XkbRF_Load (rules_file_path, NULL, True, True);
++        if (xkb_rules) {
++                XkbComponentNamesRec *xkb_comp_names;
++                xkb_comp_names = g_new0 (XkbComponentNamesRec, 1);
++
++                XkbRF_GetComponents (xkb_rules, xkb_var_defs, xkb_comp_names);
++                upload_xkb_description (rules_file_path, xkb_var_defs, xkb_comp_names);
++
++                free_xkb_component_names (xkb_comp_names);
++                XkbRF_Free (xkb_rules, True);
++        } else {
++                g_warning ("Couldn't load XKB rules");
++        }
++
++        if (gdk_error_trap_pop ())
++                g_warning ("Error loading XKB rules");
++
++        gnome_xkb_info_free_var_defs (xkb_var_defs);
++        g_free (rules_file_path);
++}
++
++static void
++set_gtk_im_module (CsdKeyboardManager *manager,
++                   const gchar        *new_module)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        gchar *current_module;
++
++        current_module = g_settings_get_string (priv->interface_settings,
++                                                KEY_GTK_IM_MODULE);
++        if (!g_str_equal (current_module, new_module))
++                g_settings_set_string (priv->interface_settings,
++                                       KEY_GTK_IM_MODULE,
++                                       new_module);
++        g_free (current_module);
++}
++
++static gboolean
++apply_input_sources_settings (GSettings          *settings,
++                              gpointer            keys,
++                              gint                n_keys,
++                              CsdKeyboardManager *manager)
++{
++        CsdKeyboardManagerPrivate *priv = manager->priv;
++        GVariant *sources;
++        guint current;
++        guint n_sources;
++        const gchar *type = NULL;
++        const gchar *id = NULL;
++        gchar *layout = NULL;
++        gchar *variant = NULL;
++        gchar **options = NULL;
++
++        sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
++        current = g_settings_get_uint (priv->input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
++        n_sources = g_variant_n_children (sources);
++
++        if (n_sources < 1)
++                goto exit;
++
++        if (current >= n_sources) {
++                g_settings_set_uint (priv->input_sources_settings,
++                                     KEY_CURRENT_INPUT_SOURCE,
++                                     n_sources - 1);
++                goto exit;
++        }
++
++#ifdef HAVE_IBUS
++        maybe_start_ibus (manager, sources);
++#endif
++
++        g_variant_get_child (sources, current, "(&s&s)", &type, &id);
++
++        if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
++                const gchar *l, *v;
++                gnome_xkb_info_get_layout_info (priv->xkb_info, id, NULL, NULL, &l, &v);
++
++                layout = g_strdup (l);
++                variant = g_strdup (v);
++
++                if (!layout || !layout[0]) {
++                        g_warning ("Couldn't find XKB input source '%s'", id);
++                        goto exit;
++                }
++                set_gtk_im_module (manager, GTK_IM_MODULE_SIMPLE);
++#ifdef HAVE_IBUS
++                set_ibus_xkb_engine (manager, id);
++#endif
++        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
++#ifdef HAVE_IBUS
++                IBusEngineDesc *engine_desc = NULL;
++
++                if (priv->session_is_fallback)
++                        goto exit;
++
++                if (priv->ibus_engines)
++                        engine_desc = g_hash_table_lookup (priv->ibus_engines, id);
++                else
++                        goto exit; /* we'll be called again when ibus is up and running */
++
++                if (engine_desc) {
++                        const gchar *ibus_layout;
++                        ibus_layout = ibus_engine_desc_get_layout (engine_desc);
++
++                        if (ibus_layout) {
++                                layout = layout_from_ibus_layout (ibus_layout);
++                                variant = variant_from_ibus_layout (ibus_layout);
++                                options = options_from_ibus_layout (ibus_layout);
++                        }
++                } else {
++                        g_warning ("Couldn't find IBus input source '%s'", id);
++                        goto exit;
++                }
++
++                set_gtk_im_module (manager, GTK_IM_MODULE_IBUS);
++                set_ibus_engine (manager, id);
++#else
++                g_warning ("IBus input source type specified but IBus support was not compiled");
++#endif
++        } else {
++                g_warning ("Unknown input source type '%s'", type);
++        }
++
++ exit:
++        apply_xkb_settings (manager, layout, variant, options);
++        g_variant_unref (sources);
++        g_free (layout);
++        g_free (variant);
++        g_strfreev (options);
++        /* Prevent individual "changed" signal invocations since we
++           don't need them. */
++        return TRUE;
++}
++
++static void
++apply_bell (CsdKeyboardManager *manager)
++{
++	GSettings       *settings;
+         XKeyboardControl kbdcontrol;
+-        gboolean         repeat;
+         gboolean         click;
+-        guint            interval;
+-        guint            delay;
+-        int              click_volume;
+         int              bell_volume;
+         int              bell_pitch;
+         int              bell_duration;
+         CsdBellMode      bell_mode;
+-        gboolean         rnumlock;
+-
+-        if (g_strcmp0 (key, KEY_NUMLOCK_STATE) == 0)
+-                return;
++        int              click_volume;
+ 
+-        repeat        = g_settings_get_boolean  (settings, KEY_REPEAT);
++        g_debug ("Applying the bell settings");
++        settings      = manager->priv->settings;
+         click         = g_settings_get_boolean  (settings, KEY_CLICK);
+-        interval      = _csd_settings_get_uint  (settings, KEY_INTERVAL);
+-        delay         = _csd_settings_get_uint  (settings, KEY_DELAY);
+         click_volume  = g_settings_get_int   (settings, KEY_CLICK_VOLUME);
++
+         bell_pitch    = g_settings_get_int   (settings, KEY_BELL_PITCH);
+         bell_duration = g_settings_get_int   (settings, KEY_BELL_DURATION);
+ 
+         bell_mode = g_settings_get_enum (settings, KEY_BELL_MODE);
+         bell_volume   = (bell_mode == CSD_BELL_MODE_ON) ? 50 : 0;
+ 
++        /* as percentage from 0..100 inclusive */
++        if (click_volume < 0) {
++                click_volume = 0;
++        } else if (click_volume > 100) {
++                click_volume = 100;
++        }
++        kbdcontrol.key_click_percent = click ? click_volume : 0;
++        kbdcontrol.bell_percent = bell_volume;
++        kbdcontrol.bell_pitch = bell_pitch;
++        kbdcontrol.bell_duration = bell_duration;
++
++        gdk_error_trap_push ();
++        XChangeKeyboardControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
++                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
++                                &kbdcontrol);
++
++        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
++        gdk_error_trap_pop_ignored ();
++}
++
++static void
++apply_numlock (CsdKeyboardManager *manager)
++{
++	GSettings *settings;
++        gboolean rnumlock;
++
++        g_debug ("Applying the num-lock settings");
++        settings = manager->priv->settings;
++        rnumlock = g_settings_get_boolean  (settings, KEY_REMEMBER_NUMLOCK_STATE);
++        manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
++
++        gdk_error_trap_push ();
++        if (rnumlock) {
++                g_debug ("Remember num-lock is set, so applying setting '%s'",
++                         num_lock_state_to_string (manager->priv->old_state));
++                numlock_set_xkb_state (manager->priv->old_state);
++        }
++
++        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
++        gdk_error_trap_pop_ignored ();
++}
++
++static void
++apply_repeat (CsdKeyboardManager *manager)
++{
++	GSettings       *settings;
++        gboolean         repeat;
++        guint            interval;
++        guint            delay;
++
++        g_debug ("Applying the repeat settings");
++        settings      = manager->priv->settings;
++        repeat        = g_settings_get_boolean  (settings, KEY_REPEAT);
++        interval      = g_settings_get_uint  (settings, KEY_INTERVAL);
++        delay         = g_settings_get_uint  (settings, KEY_DELAY);
++
+         gdk_error_trap_push ();
+         if (repeat) {
+                 gboolean rate_set = FALSE;
+@@ -243,124 +1249,319 @@ apply_settings (GSettings          *sett
+                 XAutoRepeatOff (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+         }
+ 
+-        /* as percentage from 0..100 inclusive */
+-        if (click_volume < 0) {
+-                click_volume = 0;
+-        } else if (click_volume > 100) {
+-                click_volume = 100;
++        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
++        gdk_error_trap_pop_ignored ();
++}
++
++static void
++apply_all_settings (CsdKeyboardManager *manager)
++{
++	apply_repeat (manager);
++	apply_bell (manager);
++	apply_numlock (manager);
++}
++
++static void
++set_input_sources_switcher (CsdKeyboardManager *manager,
++                            gboolean            state)
++{
++        if (state) {
++                GError *error = NULL;
++                char *args[2];
++
++                if (manager->priv->input_sources_switcher_spawned)
++                        set_input_sources_switcher (manager, FALSE);
++
++                args[0] = LIBEXECDIR "/csd-input-sources-switcher";
++                args[1] = NULL;
++
++                g_spawn_async (NULL, args, NULL,
++                               0, NULL, NULL,
++                               &manager->priv->input_sources_switcher_pid, &error);
++
++                manager->priv->input_sources_switcher_spawned = (error == NULL);
++
++                if (error) {
++                        g_warning ("Couldn't spawn %s: %s", args[0], error->message);
++                        g_error_free (error);
++                }
++        } else if (manager->priv->input_sources_switcher_spawned) {
++                kill (manager->priv->input_sources_switcher_pid, SIGHUP);
++                g_spawn_close_pid (manager->priv->input_sources_switcher_pid);
++                manager->priv->input_sources_switcher_spawned = FALSE;
+         }
+-        kbdcontrol.key_click_percent = click ? click_volume : 0;
+-        kbdcontrol.bell_percent = bell_volume;
+-        kbdcontrol.bell_pitch = bell_pitch;
+-        kbdcontrol.bell_duration = bell_duration;
+-        XChangeKeyboardControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+-                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
+-                                &kbdcontrol);
++}
+ 
+-	if (g_strcmp0 (key, "remember-numlock-state") == 0 || key == NULL) {
+-		rnumlock      = g_settings_get_boolean  (settings, "remember-numlock-state");
++static gboolean
++enable_switcher (CsdKeyboardManager *manager)
++{
++        CsdInputSourcesSwitcher switcher;
+ 
+-		manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
++        switcher = g_settings_get_enum (manager->priv->settings, KEY_SWITCHER);
+ 
+-		if (manager->priv->have_xkb && rnumlock)
+-			numlock_set_xkb_state (manager->priv->old_state);
++        return switcher != CSD_INPUT_SOURCES_SWITCHER_OFF;
++}
++
++static void
++settings_changed (GSettings          *settings,
++                  const char         *key,
++                  CsdKeyboardManager *manager)
++{
++	if (g_strcmp0 (key, KEY_CLICK) == 0||
++	    g_strcmp0 (key, KEY_CLICK_VOLUME) == 0 ||
++	    g_strcmp0 (key, KEY_BELL_PITCH) == 0 ||
++	    g_strcmp0 (key, KEY_BELL_DURATION) == 0 ||
++	    g_strcmp0 (key, KEY_BELL_MODE) == 0) {
++		g_debug ("Bell setting '%s' changed, applying bell settings", key);
++		apply_bell (manager);
++	} else if (g_strcmp0 (key, KEY_REMEMBER_NUMLOCK_STATE) == 0) {
++		g_debug ("Remember Num-Lock state '%s' changed, applying num-lock settings", key);
++		apply_numlock (manager);
++	} else if (g_strcmp0 (key, KEY_NUMLOCK_STATE) == 0) {
++		g_debug ("Num-Lock state '%s' changed, will apply at next startup", key);
++	} else if (g_strcmp0 (key, KEY_REPEAT) == 0 ||
++		 g_strcmp0 (key, KEY_INTERVAL) == 0 ||
++		 g_strcmp0 (key, KEY_DELAY) == 0) {
++		g_debug ("Key repeat setting '%s' changed, applying key repeat settings", key);
++		apply_repeat (manager);
++        } else if (g_strcmp0 (key, KEY_SWITCHER) == 0) {
++                set_input_sources_switcher (manager, enable_switcher (manager));
++	} else {
++		g_warning ("Unhandled settings change, key '%s'", key);
+ 	}
+ 
+-        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
+-        gdk_error_trap_pop_ignored ();
+ }
+ 
+-void
+-csd_keyboard_manager_apply_settings (CsdKeyboardManager *manager)
++static void
++device_added_cb (GdkDeviceManager   *device_manager,
++                 GdkDevice          *device,
++                 CsdKeyboardManager *manager)
+ {
+-        apply_settings (manager->priv->settings, NULL, manager);
++        GdkInputSource source;
++
++        source = gdk_device_get_source (device);
++        if (source == GDK_SOURCE_KEYBOARD) {
++                g_debug ("New keyboard plugged in, applying all settings");
++                apply_all_settings (manager);
++                apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
++                run_custom_command (device, COMMAND_DEVICE_ADDED);
++        }
+ }
+ 
+ static void
+-apply_libgnomekbd_settings (GSettings          *settings,
+-                            const char         *key,
+-                            CsdKeyboardManager *manager)
++device_removed_cb (GdkDeviceManager   *device_manager,
++                   GdkDevice          *device,
++                   CsdKeyboardManager *manager)
+ {
+-        gchar **layouts;
++        GdkInputSource source;
+ 
+-        layouts = g_settings_get_strv  (settings, LIBGNOMEKBD_KEY_LAYOUTS);
++        source = gdk_device_get_source (device);
++        if (source == GDK_SOURCE_KEYBOARD) {
++                run_custom_command (device, COMMAND_DEVICE_REMOVED);
++        }
++}
+ 
+-        /* Get accounts daemon */
+-        GDBusProxy *proxy = NULL;
+-        GDBusProxy *user = NULL;
+-        GVariant *variant = NULL;
+-        GError *error = NULL;
+-        gchar *object_path = NULL;
++static void
++set_devicepresence_handler (CsdKeyboardManager *manager)
++{
++        GdkDeviceManager *device_manager;
+ 
+-        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                               G_DBUS_PROXY_FLAGS_NONE,
+-                                               NULL,
+-                                               "org.freedesktop.Accounts",
+-                                               "/org/freedesktop/Accounts",
+-                                               "org.freedesktop.Accounts",
+-                                               NULL,
+-                                               &error);
++        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+ 
+-        if (proxy == NULL) {
+-                g_warning ("Failed to contact accounts service: %s", error->message);
+-                g_error_free (error);
+-                goto bail;
++        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
++                                                           G_CALLBACK (device_added_cb), manager);
++        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
++                                                             G_CALLBACK (device_removed_cb), manager);
++        manager->priv->device_manager = device_manager;
++}
++
++static void
++create_sources_from_current_xkb_config (GSettings *settings)
++{
++        GVariantBuilder builder;
++        XkbRF_VarDefsRec *xkb_var_defs;
++        gchar *tmp;
++        gchar **layouts = NULL;
++        gchar **variants = NULL;
++        guint i, n;
++
++        gnome_xkb_info_get_var_defs (&tmp, &xkb_var_defs);
++        g_free (tmp);
++
++        if (xkb_var_defs->layout)
++                layouts = g_strsplit (xkb_var_defs->layout, ",", 0);
++        if (xkb_var_defs->variant)
++                variants = g_strsplit (xkb_var_defs->variant, ",", 0);
++
++        gnome_xkb_info_free_var_defs (xkb_var_defs);
++
++        if (!layouts)
++                goto out;
++
++        if (variants && variants[0])
++                n = MIN (g_strv_length (layouts), g_strv_length (variants));
++        else
++                n = g_strv_length (layouts);
++
++        g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
++        for (i = 0; i < n && layouts[i][0]; ++i) {
++                if (variants && variants[i] && variants[i][0])
++                        tmp = g_strdup_printf ("%s+%s", layouts[i], variants[i]);
++                else
++                        tmp = g_strdup (layouts[i]);
++
++                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, tmp);
++                g_free (tmp);
+         }
++        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++out:
++        g_strfreev (layouts);
++        g_strfreev (variants);
++}
+ 
+-        variant = g_dbus_proxy_call_sync (proxy,
+-                                          "FindUserByName",
+-                                          g_variant_new ("(s)", g_get_user_name ()),
+-                                          G_DBUS_CALL_FLAGS_NONE,
+-                                          -1,
+-                                          NULL,
+-                                          &error);
++static void
++convert_libgnomekbd_options (GSettings *settings)
++{
++        GPtrArray *opt_array;
++        GSettings *libgnomekbd_settings;
++        gchar **options, **o;
+ 
+-        if (variant == NULL) {
+-                g_warning ("Could not contact accounts service to look up '%s': %s",
+-                           g_get_user_name (), error->message);
+-                g_error_free (error);
+-                goto bail;
++        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
++                return;
++
++        opt_array = g_ptr_array_new_with_free_func (g_free);
++
++        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
++        options = g_settings_get_strv (libgnomekbd_settings, "options");
++
++        for (o = options; *o; ++o) {
++                gchar **strv;
++
++                strv = g_strsplit (*o, "\t", 2);
++                if (strv[0] && strv[1]) {
++                        /* We don't want the group switcher because
++                         * it's incompatible with the way we use XKB
++                         * groups. */
++                        if (!g_str_has_prefix (strv[1], "grp:"))
++                                g_ptr_array_add (opt_array, g_strdup (strv[1]));
++                }
++                g_strfreev (strv);
+         }
++        g_ptr_array_add (opt_array, NULL);
+ 
+-        g_variant_get (variant, "(o)", &object_path);
+-        user = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                              G_DBUS_PROXY_FLAGS_NONE,
+-                                              NULL,
+-                                              "org.freedesktop.Accounts",
+-                                              object_path,
+-                                              "org.freedesktop.Accounts.User",
+-                                              NULL,
+-                                              &error);
+-        g_free (object_path);
++        g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, (const gchar * const*) opt_array->pdata);
+ 
+-        if (user == NULL) {
+-                g_warning ("Could not create proxy for user '%s': %s",
+-                           g_variant_get_string (variant, NULL), error->message);
+-                g_error_free (error);
+-                goto bail;
++        g_strfreev (options);
++        g_object_unref (libgnomekbd_settings);
++        g_ptr_array_free (opt_array, TRUE);
++}
++
++static void
++convert_libgnomekbd_layouts (GSettings *settings)
++{
++        GVariantBuilder builder;
++        GSettings *libgnomekbd_settings;
++        gchar **layouts, **l;
++
++        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
++                return;
++
++        init_builder_with_sources (&builder, settings);
++
++        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
++        layouts = g_settings_get_strv (libgnomekbd_settings, "layouts");
++
++        for (l = layouts; *l; ++l) {
++                gchar *id;
++                gchar **strv;
++
++                strv = g_strsplit (*l, "\t", 2);
++                if (strv[0] && !strv[1])
++                        id = g_strdup (strv[0]);
++                else if (strv[0] && strv[1])
++                        id = g_strdup_printf ("%s+%s", strv[0], strv[1]);
++                else
++                        id = NULL;
++
++                if (id)
++                        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);
++
++                g_free (id);
++                g_strfreev (strv);
+         }
+-        g_variant_unref (variant);
+ 
+-        variant = g_dbus_proxy_call_sync (user,
+-                                          "SetXKeyboardLayouts",
+-                                          g_variant_new ("(^as)", layouts),
+-                                          G_DBUS_CALL_FLAGS_NONE,
+-                                          -1,
+-                                          NULL,
+-                                          &error);
++        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++
++        g_strfreev (layouts);
++        g_object_unref (libgnomekbd_settings);
++}
+ 
+-        if (variant == NULL) {
+-                g_warning ("Failed to set the keyboard layouts: %s", error->message);
++static void
++maybe_convert_old_settings (GSettings *settings)
++{
++        GVariant *sources;
++        gchar **options;
++        gchar *stamp_dir_path = NULL;
++        gchar *stamp_file_path = NULL;
++        GError *error = NULL;
++
++        stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL);
++        if (g_mkdir_with_parents (stamp_dir_path, 0755)) {
++                g_warning ("Failed to create directory %s: %s", stamp_dir_path, g_strerror (errno));
++                goto out;
++        }
++
++        stamp_file_path = g_build_filename (stamp_dir_path, "input-sources-converted", NULL);
++        if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
++                goto out;
++
++        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++        if (g_variant_n_children (sources) < 1) {
++                convert_libgnomekbd_layouts (settings);
++#ifdef HAVE_IBUS
++                convert_ibus (settings);
++#endif
++        }
++        g_variant_unref (sources);
++
++        options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
++        if (g_strv_length (options) < 1)
++                convert_libgnomekbd_options (settings);
++        g_strfreev (options);
++
++        if (!g_file_set_contents (stamp_file_path, "", 0, &error)) {
++                g_warning ("%s", error->message);
+                 g_error_free (error);
+-                goto bail;
+         }
++out:
++        g_free (stamp_file_path);
++        g_free (stamp_dir_path);
++}
+ 
+-bail:
+-        if (proxy != NULL)
+-                g_object_unref (proxy);
+-        if (variant != NULL)
+-                g_variant_unref (variant);
+-        g_strfreev (layouts);
++static void
++maybe_create_input_sources (CsdKeyboardManager *manager)
++{
++        GSettings *settings;
++        GVariant *sources;
++
++        settings = manager->priv->input_sources_settings;
++
++        if (g_getenv ("RUNNING_UNDER_GDM")) {
++                create_sources_from_current_xkb_config (settings);
++                return;
++        }
++
++        maybe_convert_old_settings (settings);
++
++        /* if we still don't have anything do some educated guesses */
++        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++        if (g_variant_n_children (sources) < 1) {
++                create_sources_from_current_xkb_config (settings);
++#ifdef HAVE_IBUS
++                add_ibus_sources_from_locale (settings);
++#endif
++        }
++        g_variant_unref (sources);
+ }
+ 
+ static gboolean
+@@ -370,26 +1571,41 @@ start_keyboard_idle_cb (CsdKeyboardManag
+ 
+         g_debug ("Starting keyboard manager");
+ 
+-        manager->priv->have_xkb = 0;
+         manager->priv->settings = g_settings_new (CSD_KEYBOARD_DIR);
+-        manager->priv->libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_KEYBOARD_DIR);
+ 
+-        /* Essential - xkb initialization should happen before */
+-        csd_keyboard_xkb_init (manager);
++	xkb_init (manager);
+ 
+-        numlock_xkb_init (manager);
++	set_devicepresence_handler (manager);
+ 
++        manager->priv->input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
++        manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR);
++        manager->priv->xkb_info = gnome_xkb_info_new ();
++
++        maybe_create_input_sources (manager);
++
++#ifdef HAVE_IBUS
++        /* We don't want to touch IBus until we are sure this isn't a
++           fallback session. */
++        manager->priv->session_is_fallback = TRUE;
++        manager->priv->ibus_cancellable = g_cancellable_new ();
++        g_bus_get (G_BUS_TYPE_SESSION,
++                   manager->priv->ibus_cancellable,
++                   (GAsyncReadyCallback)got_bus,
++                   manager);
++#else
++        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
++#endif
+         /* apply current settings before we install the callback */
+-        csd_keyboard_manager_apply_settings (manager);
++        g_debug ("Started the keyboard plugin, applying all settings");
++        apply_all_settings (manager);
+ 
+         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
+-                          G_CALLBACK (apply_settings), manager);
+-
+-        apply_libgnomekbd_settings (manager->priv->libgnomekbd_settings, NULL, manager);
+-        g_signal_connect (G_OBJECT (manager->priv->libgnomekbd_settings), "changed",
+-                          G_CALLBACK (apply_libgnomekbd_settings), manager);
++                          G_CALLBACK (settings_changed), manager);
++        g_signal_connect (G_OBJECT (manager->priv->input_sources_settings), "change-event",
++                          G_CALLBACK (apply_input_sources_settings), manager);
+ 
+-        numlock_install_xkb_callback (manager);
++	install_xkb_filter (manager);
++        set_input_sources_switcher (manager, enable_switcher (manager));
+ 
+         cinnamon_settings_profile_end (NULL);
+ 
+@@ -404,6 +1620,11 @@ csd_keyboard_manager_start (CsdKeyboardM
+ {
+         cinnamon_settings_profile_start (NULL);
+ 
++	if (check_xkb_extension (manager) == FALSE) {
++		g_debug ("XKB is not supported, not applying any settings");
++		return TRUE;
++	}
++
+         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_keyboard_idle_cb, manager);
+ 
+         cinnamon_settings_profile_end (NULL);
+@@ -418,37 +1639,24 @@ csd_keyboard_manager_stop (CsdKeyboardMa
+ 
+         g_debug ("Stopping keyboard manager");
+ 
+-        if (p->settings != NULL) {
+-                g_object_unref (p->settings);
+-                p->settings = NULL;
+-        }
++        g_clear_object (&p->settings);
++        g_clear_object (&p->input_sources_settings);
++        g_clear_object (&p->interface_settings);
++        g_clear_object (&p->xkb_info);
+ 
+-        if (p->libgnomekbd_settings != NULL) {
+-                g_object_unref (p->libgnomekbd_settings);
+-                p->libgnomekbd_settings = NULL;
+-        }
++#ifdef HAVE_IBUS
++        clear_ibus (manager);
++#endif
+ 
+-        if (p->have_xkb) {
+-                gdk_window_remove_filter (NULL,
+-                                          numlock_xkb_callback,
+-                                          manager);
++        if (p->device_manager != NULL) {
++                g_signal_handler_disconnect (p->device_manager, p->device_added_id);
++                g_signal_handler_disconnect (p->device_manager, p->device_removed_id);
++                p->device_manager = NULL;
+         }
+ 
+-        csd_keyboard_xkb_shutdown ();
+-}
+-
+-static GObject *
+-csd_keyboard_manager_constructor (GType                  type,
+-                                  guint                  n_construct_properties,
+-                                  GObjectConstructParam *construct_properties)
+-{
+-        CsdKeyboardManager      *keyboard_manager;
+-
+-        keyboard_manager = CSD_KEYBOARD_MANAGER (G_OBJECT_CLASS (csd_keyboard_manager_parent_class)->constructor (type,
+-                                                                                                      n_construct_properties,
+-                                                                                                      construct_properties));
++	remove_xkb_filter (manager);
+ 
+-        return G_OBJECT (keyboard_manager);
++        set_input_sources_switcher (manager, FALSE);
+ }
+ 
+ static void
+@@ -456,7 +1664,6 @@ csd_keyboard_manager_class_init (CsdKeyb
+ {
+         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+ 
+-        object_class->constructor = csd_keyboard_manager_constructor;
+         object_class->finalize = csd_keyboard_manager_finalize;
+ 
+         g_type_class_add_private (klass, sizeof (CsdKeyboardManagerPrivate));
+diff -uNrp a/plugins/keyboard/csd-keyboard-manager.h b/plugins/keyboard/csd-keyboard-manager.h
+--- a/plugins/keyboard/csd-keyboard-manager.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/csd-keyboard-manager.h	2013-08-25 16:36:02.000000000 +0100
+@@ -51,7 +51,6 @@ CsdKeyboardManager *       csd_keyboard_
+ gboolean                csd_keyboard_manager_start               (CsdKeyboardManager *manager,
+                                                                GError         **error);
+ void                    csd_keyboard_manager_stop                (CsdKeyboardManager *manager);
+-void                    csd_keyboard_manager_apply_settings      (CsdKeyboardManager *manager);
+ 
+ G_END_DECLS
+ 
+diff -uNrp a/plugins/keyboard/csd-keyboard-plugin.h b/plugins/keyboard/csd-keyboard-plugin.h
+--- a/plugins/keyboard/csd-keyboard-plugin.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/csd-keyboard-plugin.h	2013-08-25 16:36:02.000000000 +0100
+@@ -52,7 +52,7 @@ typedef struct
+ GType   csd_keyboard_plugin_get_type            (void) G_GNUC_CONST;
+ 
+ /* All the plugins must implement this function */
+-G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
++G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+ 
+ G_END_DECLS
+ 
+diff -uNrp a/plugins/keyboard/csd-keyboard-xkb.c b/plugins/keyboard/csd-keyboard-xkb.c
+--- a/plugins/keyboard/csd-keyboard-xkb.c	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/csd-keyboard-xkb.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,579 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- *
+- * Copyright (C) 2001 Udaltsoft
+- *
+- * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#include "config.h"
+-
+-#include <string.h>
+-#include <time.h>
+-
+-#include <glib/gi18n.h>
+-#include <gdk/gdk.h>
+-#include <gdk/gdkx.h>
+-#include <gtk/gtk.h>
+-
+-#include <libgnomekbd/gkbd-status.h>
+-
+-#include <libgnomekbd/gkbd-keyboard-drawing.h>
+-#include <libgnomekbd/gkbd-desktop-config.h>
+-#include <libgnomekbd/gkbd-indicator-config.h>
+-#include <libgnomekbd/gkbd-keyboard-config.h>
+-#include <libgnomekbd/gkbd-util.h>
+-
+-#include "csd-keyboard-xkb.h"
+-#include "delayed-dialog.h"
+-#include "cinnamon-settings-profile.h"
+-
+-#define SETTINGS_KEYBOARD_DIR "org.cinnamon.settings-daemon.plugins.keyboard"
+-
+-static CsdKeyboardManager *manager = NULL;
+-
+-static XklEngine *xkl_engine;
+-static XklConfigRegistry *xkl_registry = NULL;
+-
+-static GkbdDesktopConfig current_config;
+-static GkbdKeyboardConfig current_kbd_config;
+-
+-/* never terminated */
+-static GkbdKeyboardConfig initial_sys_kbd_config;
+-
+-static gboolean inited_ok = FALSE;
+-
+-static GSettings *settings_desktop = NULL;
+-static GSettings *settings_keyboard = NULL;
+-
+-static PostActivationCallback pa_callback = NULL;
+-static void *pa_callback_user_data = NULL;
+-
+-static GtkStatusIcon *icon = NULL;
+-
+-static GHashTable *preview_dialogs = NULL;
+-
+-static void
+-activation_error (void)
+-{
+-	char const *vendor;
+-	GtkWidget *dialog;
+-
+-	vendor =
+-	    ServerVendor (GDK_DISPLAY_XDISPLAY
+-			  (gdk_display_get_default ()));
+-
+-	/* VNC viewers will not work, do not barrage them with warnings */
+-	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
+-		return;
+-
+-	dialog = gtk_message_dialog_new_with_markup (NULL,
+-						     0,
+-						     GTK_MESSAGE_ERROR,
+-						     GTK_BUTTONS_CLOSE,
+-						     _
+-						     ("Error activating XKB configuration.\n"
+-						      "There can be various reasons for that.\n\n"
+-						      "If you report this situation as a bug, include the results of\n"
+-						      " • <b>%s</b>\n"
+-						      " • <b>%s</b>\n"
+-						      " • <b>%s</b>\n"
+-						      " • <b>%s</b>"),
+-						     "xprop -root | grep XKB",
+-						     "gsettings get org.gnome.libgnomekbd.keyboard model",
+-						     "gsettings get org.gnome.libgnomekbd.keyboard layouts",
+-						     "gsettings get org.gnome.libgnomekbd.keyboard options");
+-	g_signal_connect (dialog, "response",
+-			  G_CALLBACK (gtk_widget_destroy), NULL);
+-	csd_delayed_show_dialog (dialog);
+-}
+-
+-static gboolean
+-ensure_xkl_registry (void)
+-{
+-	if (!xkl_registry) {
+-		xkl_registry =
+-		    xkl_config_registry_get_instance (xkl_engine);
+-		/* load all materials, unconditionally! */
+-		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
+-			g_object_unref (xkl_registry);
+-			xkl_registry = NULL;
+-			return FALSE;
+-		}
+-	}
+-
+-	return TRUE;
+-}
+-
+-static void
+-apply_desktop_settings (void)
+-{
+-	if (!inited_ok)
+-		return;
+-
+-	csd_keyboard_manager_apply_settings (manager);
+-	gkbd_desktop_config_load (&current_config);
+-	/* again, probably it would be nice to compare things
+-	   before activating them */
+-	gkbd_desktop_config_activate (&current_config);
+-}
+-
+-static void
+-popup_menu_launch_capplet ()
+-{
+-	GAppInfo *info;
+-	GdkAppLaunchContext *ctx;
+-	GError *error = NULL;
+-
+-	info =
+-	    g_app_info_create_from_commandline
+-	    ("cinnamon-settings region", NULL, 0, &error);
+-
+-	if (info != NULL) {
+-		ctx =
+-		    gdk_display_get_app_launch_context
+-		    (gdk_display_get_default ());
+-
+-		if (g_app_info_launch (info, NULL,
+-				   G_APP_LAUNCH_CONTEXT (ctx), &error) == FALSE) {
+-			g_warning
+-				("Could not execute keyboard properties capplet: [%s]\n",
+-				 error->message);
+-			g_error_free (error);
+-		}
+-
+-		g_object_unref (info);
+-		g_object_unref (ctx);
+-	}
+-
+-}
+-
+-static void
+-show_layout_destroy (GtkWidget * dialog, gint group)
+-{
+-	g_hash_table_remove (preview_dialogs, GINT_TO_POINTER (group));
+-}
+-
+-static void
+-popup_menu_show_layout ()
+-{
+-	GtkWidget *dialog;
+-	XklEngine *engine =
+-	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
+-				     (gdk_display_get_default ()));
+-	XklState *xkl_state = xkl_engine_get_current_state (engine);
+-
+-	gchar **group_names = gkbd_status_get_group_names ();
+-
+-	gpointer p = g_hash_table_lookup (preview_dialogs,
+-					  GINT_TO_POINTER
+-					  (xkl_state->group));
+-
+-	if (xkl_state->group < 0
+-	    || xkl_state->group >= g_strv_length (group_names)) {
+-		return;
+-	}
+-
+-	if (p != NULL) {
+-		/* existing window */
+-		gtk_window_present (GTK_WINDOW (p));
+-		return;
+-	}
+-
+-	if (!ensure_xkl_registry ())
+-		return;
+-
+-	dialog = gkbd_keyboard_drawing_dialog_new ();
+-	gkbd_keyboard_drawing_dialog_set_group (dialog, xkl_registry, xkl_state->group);
+-
+-	g_signal_connect (dialog, "destroy",
+-			  G_CALLBACK (show_layout_destroy),
+-			  GINT_TO_POINTER (xkl_state->group));
+-	g_hash_table_insert (preview_dialogs,
+-			     GINT_TO_POINTER (xkl_state->group), dialog);
+-	gtk_widget_show_all (dialog);
+-}
+-
+-static void
+-popup_menu_set_group (gint group_number, gboolean only_menu)
+-{
+-
+-	XklEngine *engine = gkbd_status_get_xkl_engine ();
+-
+-	XklState *st = xkl_engine_get_current_state(engine);
+-	Window cur;
+-	st->group = group_number;
+-	xkl_engine_allow_one_switch_to_secondary_group (engine);
+-	cur = xkl_engine_get_current_window (engine);
+-	if (cur != (Window) NULL) {
+-		xkl_debug (150, "Enforcing the state %d for window %lx\n",
+-			   st->group, cur);
+-
+-		xkl_engine_save_state (engine,
+-				       xkl_engine_get_current_window
+-				       (engine), st);
+-/*    XSetInputFocus( GDK_DISPLAY(), cur, RevertToNone, CurrentTime );*/
+-	} else {
+-		xkl_debug (150,
+-			   "??? Enforcing the state %d for unknown window\n",
+-			   st->group);
+-		/* strange situation - bad things can happen */
+-	}
+-        if (!only_menu)
+-        	xkl_engine_lock_group (engine, st->group);
+-}
+-
+-static void
+-popup_menu_set_group_cb (GtkMenuItem * item, gpointer param)
+-{
+-	gint group_number = GPOINTER_TO_INT (param);
+-
+-	popup_menu_set_group(group_number, FALSE);
+-}
+-
+-
+-static GtkMenu *
+-create_status_menu (void)
+-{
+-	GtkMenu *popup_menu = GTK_MENU (gtk_menu_new ());
+-	int i = 0;
+-
+-	GtkMenu *groups_menu = GTK_MENU (gtk_menu_new ());
+-	gchar **current_name = gkbd_status_get_group_names ();
+-
+-	GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Layouts"));
+-	gtk_widget_show (item);
+-	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
+-				   GTK_WIDGET (groups_menu));
+-
+-	item = gtk_menu_item_new_with_mnemonic (_("Show _Keyboard Layout..."));
+-	gtk_widget_show (item);
+-	g_signal_connect (item, "activate", popup_menu_show_layout, NULL);
+-	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+-
+-	/* translators note:
+-	 * This is the name of the cinnamon-settings "region" panel */
+-	item = gtk_menu_item_new_with_mnemonic (_("Region and Language Settings"));
+-	gtk_widget_show (item);
+-	g_signal_connect (item, "activate", popup_menu_launch_capplet, NULL);
+-	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+-
+-	for (i = 0; current_name && *current_name; i++, current_name++) {
+-
+-		gchar *image_file = gkbd_status_get_image_filename (i);
+-
+-		if (image_file == NULL) {
+-			item =
+-			    gtk_menu_item_new_with_label (*current_name);
+-		} else {
+-			GdkPixbuf *pixbuf =
+-			    gdk_pixbuf_new_from_file_at_size (image_file,
+-							      24, 24,
+-							      NULL);
+-			GtkWidget *img =
+-			    gtk_image_new_from_pixbuf (pixbuf);
+-			item =
+-			    gtk_image_menu_item_new_with_label
+-			    (*current_name);
+-			gtk_widget_show (img);
+-			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
+-						       (item), img);
+-			gtk_image_menu_item_set_always_show_image
+-			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
+-			g_free (image_file);
+-		}
+-		gtk_widget_show (item);
+-		gtk_menu_shell_append (GTK_MENU_SHELL (groups_menu), item);
+-		g_signal_connect (item, "activate",
+-				  G_CALLBACK (popup_menu_set_group_cb),
+-				  GINT_TO_POINTER (i));
+-	}
+-
+-	return popup_menu;
+-}
+-
+-static void
+-status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
+-{
+-	GtkMenu *popup_menu = create_status_menu ();
+-
+-	gtk_menu_popup (popup_menu, NULL, NULL,
+-			gtk_status_icon_position_menu,
+-			(gpointer) icon, button, time);
+-}
+-
+-static void
+-show_hide_icon ()
+-{
+-	if (g_strv_length (current_kbd_config.layouts_variants) > 1) {
+-		if (icon == NULL) {
+-			xkl_debug (150, "Creating keyboard status icon\n");
+-			icon = gkbd_status_new ();
+-			g_signal_connect (icon, "popup-menu",
+-					  G_CALLBACK
+-					  (status_icon_popup_menu_cb),
+-					  NULL);
+-
+-		}
+-	} else {
+-		if (icon != NULL) {
+-			xkl_debug (150, "Destroying icon\n");
+-			g_object_unref (icon);
+-			icon = NULL;
+-		}
+-	}
+-}
+-
+-static gboolean
+-try_activating_xkb_config_if_new (GkbdKeyboardConfig *
+-				  current_sys_kbd_config)
+-{
+-	/* Activate - only if different! */
+-	if (!gkbd_keyboard_config_equals
+-	    (&current_kbd_config, current_sys_kbd_config)) {
+-		if (gkbd_keyboard_config_activate (&current_kbd_config)) {
+-			if (pa_callback != NULL) {
+-				(*pa_callback) (pa_callback_user_data);
+-				return TRUE;
+-			}
+-		} else {
+-			return FALSE;
+-		}
+-	}
+-	return TRUE;
+-}
+-
+-static gboolean
+-filter_xkb_config (void)
+-{
+-	XklConfigItem *item;
+-	gchar *lname;
+-	gchar *vname;
+-	gchar **lv;
+-	gboolean any_change = FALSE;
+-
+-	xkl_debug (100, "Filtering configuration against the registry\n");
+-	if (!ensure_xkl_registry ())
+-		return FALSE;
+-
+-	lv = current_kbd_config.layouts_variants;
+-	item = xkl_config_item_new ();
+-	while (*lv) {
+-		xkl_debug (100, "Checking [%s]\n", *lv);
+-		if (gkbd_keyboard_config_split_items (*lv, &lname, &vname)) {
+-			gboolean should_be_dropped = FALSE;
+-			g_snprintf (item->name, sizeof (item->name), "%s",
+-				    lname);
+-			if (!xkl_config_registry_find_layout
+-			    (xkl_registry, item)) {
+-				xkl_debug (100, "Bad layout [%s]\n",
+-					   lname);
+-				should_be_dropped = TRUE;
+-			} else if (vname) {
+-				g_snprintf (item->name,
+-					    sizeof (item->name), "%s",
+-					    vname);
+-				if (!xkl_config_registry_find_variant
+-				    (xkl_registry, lname, item)) {
+-					xkl_debug (100,
+-						   "Bad variant [%s(%s)]\n",
+-						   lname, vname);
+-					should_be_dropped = TRUE;
+-				}
+-			}
+-			if (should_be_dropped) {
+-				gkbd_strv_behead (lv);
+-				any_change = TRUE;
+-				continue;
+-			}
+-		}
+-		lv++;
+-	}
+-	g_object_unref (item);
+-	return any_change;
+-}
+-
+-static void
+-apply_xkb_settings (void)
+-{
+-	GkbdKeyboardConfig current_sys_kbd_config;
+-
+-	if (!inited_ok)
+-		return;
+-
+-	gkbd_keyboard_config_init (&current_sys_kbd_config, xkl_engine);
+-
+-	gkbd_keyboard_config_load (&current_kbd_config,
+-				   &initial_sys_kbd_config);
+-
+-	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
+-						  NULL);
+-
+-	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
+-		if (filter_xkb_config ()) {
+-			if (!try_activating_xkb_config_if_new
+-			    (&current_sys_kbd_config)) {
+-				g_warning
+-				    ("Could not activate the filtered XKB configuration");
+-				activation_error ();
+-			}
+-		} else {
+-			g_warning
+-			    ("Could not activate the XKB configuration");
+-			activation_error ();
+-		}
+-	} else
+-		xkl_debug (100,
+-			   "Actual KBD configuration was not changed: redundant notification\n");
+-
+-	gkbd_keyboard_config_term (&current_sys_kbd_config);
+-	show_hide_icon ();
+-}
+-
+-static void
+-csd_keyboard_xkb_analyze_sysconfig (void)
+-{
+-	if (!inited_ok)
+-		return;
+-
+-	gkbd_keyboard_config_init (&initial_sys_kbd_config, xkl_engine);
+-	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+-						  NULL);
+-}
+-
+-void
+-csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
+-					       void *user_data)
+-{
+-	pa_callback = fun;
+-	pa_callback_user_data = user_data;
+-}
+-
+-static GdkFilterReturn
+-csd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
+-{
+-	XEvent *xevent = (XEvent *) xev;
+-	xkl_engine_filter_events (xkl_engine, xevent);
+-	return GDK_FILTER_CONTINUE;
+-}
+-
+-/* When new Keyboard is plugged in - reload the settings */
+-static void
+-csd_keyboard_new_device (XklEngine * engine)
+-{
+-	apply_desktop_settings ();
+-	apply_xkb_settings ();
+-}
+-
+-void
+-csd_keyboard_xkb_init (CsdKeyboardManager * kbd_manager)
+-{
+-	Display *display =
+-	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+-	cinnamon_settings_profile_start (NULL);
+-
+-	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+-					   DATADIR G_DIR_SEPARATOR_S
+-					   "icons");
+-
+-	manager = kbd_manager;
+-	cinnamon_settings_profile_start ("xkl_engine_get_instance");
+-	xkl_engine = xkl_engine_get_instance (display);
+-	cinnamon_settings_profile_end ("xkl_engine_get_instance");
+-	if (xkl_engine) {
+-		inited_ok = TRUE;
+-
+-		gkbd_desktop_config_init (&current_config, xkl_engine);
+-		gkbd_keyboard_config_init (&current_kbd_config,
+-					   xkl_engine);
+-		xkl_engine_backup_names_prop (xkl_engine);
+-		csd_keyboard_xkb_analyze_sysconfig ();
+-
+-		settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
+-		settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
+-		g_signal_connect (settings_desktop, "changed",
+-				  (GCallback) apply_desktop_settings,
+-				  NULL);
+-		g_signal_connect (settings_keyboard, "changed",
+-				  (GCallback) apply_xkb_settings, NULL);
+-
+-		gdk_window_add_filter (NULL, (GdkFilterFunc)
+-				       csd_keyboard_xkb_evt_filter, NULL);
+-
+-		if (xkl_engine_get_features (xkl_engine) &
+-		    XKLF_DEVICE_DISCOVERY)
+-			g_signal_connect (xkl_engine, "X-new-device",
+-					  G_CALLBACK
+-					  (csd_keyboard_new_device), NULL);
+-
+-		cinnamon_settings_profile_start ("xkl_engine_start_listen");
+-		xkl_engine_start_listen (xkl_engine,
+-					 XKLL_MANAGE_LAYOUTS |
+-					 XKLL_MANAGE_WINDOW_STATES);
+-		cinnamon_settings_profile_end ("xkl_engine_start_listen");
+-
+-		cinnamon_settings_profile_start ("apply_desktop_settings");
+-		apply_desktop_settings ();
+-		cinnamon_settings_profile_end ("apply_desktop_settings");
+-		cinnamon_settings_profile_start ("apply_xkb_settings");
+-		apply_xkb_settings ();
+-		cinnamon_settings_profile_end ("apply_xkb_settings");
+-	}
+-	preview_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
+-
+-	cinnamon_settings_profile_end (NULL);
+-}
+-
+-void
+-csd_keyboard_xkb_shutdown (void)
+-{
+-	if (!inited_ok)
+-		return;
+-
+-	pa_callback = NULL;
+-	pa_callback_user_data = NULL;
+-	manager = NULL;
+-
+-	if (preview_dialogs != NULL)
+-		g_hash_table_destroy (preview_dialogs);
+-
+-	if (!inited_ok)
+-		return;
+-
+-	xkl_engine_stop_listen (xkl_engine,
+-				XKLL_MANAGE_LAYOUTS |
+-				XKLL_MANAGE_WINDOW_STATES);
+-
+-	gdk_window_remove_filter (NULL, (GdkFilterFunc)
+-				  csd_keyboard_xkb_evt_filter, NULL);
+-
+-	g_object_unref (settings_desktop);
+-	settings_desktop = NULL;
+-	g_object_unref (settings_keyboard);
+-	settings_keyboard = NULL;
+-
+-	if (xkl_registry) {
+-		g_object_unref (xkl_registry);
+-	}
+-
+-	g_object_unref (xkl_engine);
+-
+-	xkl_engine = NULL;
+-
+-	inited_ok = FALSE;
+-}
+diff -uNrp a/plugins/keyboard/csd-keyboard-xkb.h b/plugins/keyboard/csd-keyboard-xkb.h
+--- a/plugins/keyboard/csd-keyboard-xkb.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/csd-keyboard-xkb.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,39 +0,0 @@
+-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+- * cinnamon-settings-keyboard-xkb.h
+- *
+- * Copyright (C) 2001 Udaltsoft
+- *
+- * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifndef __CSD_KEYBOARD_XKB_H
+-#define __CSD_KEYBOARD_XKB_H
+-
+-#include <libxklavier/xklavier.h>
+-#include "csd-keyboard-manager.h"
+-
+-void csd_keyboard_xkb_init (CsdKeyboardManager *manager);
+-void csd_keyboard_xkb_shutdown (void);
+-
+-typedef void (*PostActivationCallback) (void *userData);
+-
+-void
+-csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
+-                                               void                  *userData);
+-
+-#endif
+diff -uNrp a/plugins/keyboard/delayed-dialog.c b/plugins/keyboard/delayed-dialog.c
+--- a/plugins/keyboard/delayed-dialog.c	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/delayed-dialog.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,128 +0,0 @@
+-/*
+- * Copyright © 2006 Novell, Inc.
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#include <stdlib.h>
+-#include <string.h>
+-
+-#include <gtk/gtk.h>
+-#include <gdk/gdkx.h>
+-
+-#include "delayed-dialog.h"
+-
+-static gboolean        delayed_show_timeout (gpointer   data);
+-static GdkFilterReturn message_filter       (GdkXEvent *xevent,
+-                                             GdkEvent  *event,
+-                                             gpointer   data);
+-
+-static GSList *dialogs = NULL;
+-
+-/**
+- * csd_delayed_show_dialog:
+- * @dialog: the dialog
+- *
+- * Shows the dialog as with gtk_widget_show(), unless a window manager
+- * hasn't been started yet, in which case it will wait up to 5 seconds
+- * for that to happen before showing the dialog.
+- **/
+-void
+-csd_delayed_show_dialog (GtkWidget *dialog)
+-{
+-        GdkDisplay *display = gtk_widget_get_display (dialog);
+-        Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+-        GdkScreen *screen = gtk_widget_get_screen (dialog);
+-        char selection_name[10];
+-        Atom selection_atom;
+-
+-        /* We can't use gdk_selection_owner_get() for this, because
+-         * it's an unknown out-of-process window.
+-         */
+-        snprintf (selection_name, sizeof (selection_name), "WM_S%d",
+-                  gdk_screen_get_number (screen));
+-        selection_atom = XInternAtom (xdisplay, selection_name, True);
+-        if (selection_atom &&
+-            XGetSelectionOwner (xdisplay, selection_atom) != None) {
+-                gtk_widget_show (dialog);
+-                return;
+-        }
+-
+-        dialogs = g_slist_prepend (dialogs, dialog);
+-
+-        gdk_window_add_filter (NULL, message_filter, NULL);
+-
+-        g_timeout_add (5000, delayed_show_timeout, NULL);
+-}
+-
+-static gboolean
+-delayed_show_timeout (gpointer data)
+-{
+-        GSList *l;
+-
+-        for (l = dialogs; l; l = l->next)
+-                gtk_widget_show (l->data);
+-        g_slist_free (dialogs);
+-        dialogs = NULL;
+-
+-        /* FIXME: There's no gdk_display_remove_client_message_filter */
+-
+-        return FALSE;
+-}
+-
+-static GdkFilterReturn
+-message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+-{
+-        XClientMessageEvent *evt;
+-        char *selection_name;
+-        int screen;
+-        GSList *l, *next;
+-
+-        if (((XEvent *)xevent)->type != ClientMessage)
+-          return GDK_FILTER_CONTINUE;
+-
+-        evt = (XClientMessageEvent *)xevent;
+-
+-        if (evt->message_type != XInternAtom (evt->display, "MANAGER", FALSE))
+-          return GDK_FILTER_CONTINUE;
+-
+-        selection_name = XGetAtomName (evt->display, evt->data.l[1]);
+-
+-        if (strncmp (selection_name, "WM_S", 4) != 0) {
+-                XFree (selection_name);
+-                return GDK_FILTER_CONTINUE;
+-        }
+-
+-        screen = atoi (selection_name + 4);
+-
+-        for (l = dialogs; l; l = next) {
+-                GtkWidget *dialog = l->data;
+-                next = l->next;
+-
+-                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
+-                        gtk_widget_show (dialog);
+-                        dialogs = g_slist_remove (dialogs, dialog);
+-                }
+-        }
+-
+-        if (!dialogs) {
+-                gdk_window_remove_filter (NULL, message_filter, NULL);
+-        }
+-
+-        XFree (selection_name);
+-
+-        return GDK_FILTER_CONTINUE;
+-}
+diff -uNrp a/plugins/keyboard/delayed-dialog.h b/plugins/keyboard/delayed-dialog.h
+--- a/plugins/keyboard/delayed-dialog.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/delayed-dialog.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,32 +0,0 @@
+-/*
+- * Copyright © 2006 Novell, Inc.
+- *
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License as
+- * published by the Free Software Foundation; either version 2, or (at
+- * your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-
+-#ifndef __DELAYED_DIALOG_H
+-#define __DELAYED_DIALOG_H
+-
+-#include <gtk/gtk.h>
+-
+-G_BEGIN_DECLS
+-
+-void            csd_delayed_show_dialog (GtkWidget *dialog);
+-
+-G_END_DECLS
+-
+-#endif
+diff -uNrp a/plugins/keyboard/gkbd-configuration.c b/plugins/keyboard/gkbd-configuration.c
+--- a/plugins/keyboard/gkbd-configuration.c	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/gkbd-configuration.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,350 +0,0 @@
+-/*
+- * Copyright (C) 2010 Canonical Ltd.
+- * 
+- * Authors: Jan Arne Petersen <jpetersen@openismus.com>
+- * 
+- * Based on gkbd-status.c by Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- */
+-
+-#include <memory.h>
+-
+-#include <gdk/gdkkeysyms.h>
+-#include <gdk/gdkx.h>
+-#include <glib/gi18n.h>
+-
+-#include <libgnomekbd/gkbd-desktop-config.h>
+-#include <libgnomekbd/gkbd-indicator-config.h>
+-
+-#include "gkbd-configuration.h"
+-
+-struct _GkbdConfigurationPrivate {
+-	XklEngine *engine;
+-	XklConfigRegistry *registry;
+-
+-	GkbdDesktopConfig cfg;
+-	GkbdIndicatorConfig ind_cfg;
+-	GkbdKeyboardConfig kbd_cfg;
+-
+-	gchar **full_group_names;
+-	gchar **short_group_names;
+-
+-	gulong state_changed_handler;
+-	gulong config_changed_handler;
+-};
+-
+-enum {
+-	SIGNAL_CHANGED,
+-	SIGNAL_GROUP_CHANGED,
+-	LAST_SIGNAL
+-};
+-
+-static guint signals[LAST_SIGNAL] = { 0, };
+-
+-#define GKBD_CONFIGURATION_GET_PRIVATE(o) \
+-	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GKBD_TYPE_CONFIGURATION, GkbdConfigurationPrivate))
+-
+-G_DEFINE_TYPE (GkbdConfiguration, gkbd_configuration, G_TYPE_OBJECT)
+-
+-/* Should be called once for all widgets */
+-static void
+-gkbd_configuration_cfg_changed (GSettings *settings,
+-				 const char *key,
+-				 GkbdConfiguration * configuration)
+-{
+-	GkbdConfigurationPrivate *priv = configuration->priv;
+-
+-	xkl_debug (100,
+-		   "General configuration changed in GSettings - reiniting...\n");
+-	gkbd_desktop_config_load (&priv->cfg);
+-	gkbd_desktop_config_activate (&priv->cfg);
+-
+-	g_signal_emit (configuration,
+-		       signals[SIGNAL_CHANGED], 0);
+-}
+-
+-/* Should be called once for all widgets */
+-static void
+-gkbd_configuration_ind_cfg_changed (GSettings *settings,
+-				     const char *key,
+-				     GkbdConfiguration * configuration)
+-{
+-	GkbdConfigurationPrivate *priv = configuration->priv;
+-	xkl_debug (100,
+-		   "Applet configuration changed in GSettings - reiniting...\n");
+-	gkbd_indicator_config_load (&priv->ind_cfg);
+-
+-	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
+-	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
+-						    &priv->kbd_cfg);
+-
+-	gkbd_indicator_config_activate (&priv->ind_cfg);
+-
+-	g_signal_emit (configuration,
+-		       signals[SIGNAL_CHANGED], 0);
+-}
+-
+-static void
+-gkbd_configuration_load_group_names (GkbdConfiguration * configuration,
+-				     XklConfigRec * xklrec)
+-{
+-	GkbdConfigurationPrivate *priv = configuration->priv;
+-
+-	if (!gkbd_desktop_config_load_group_descriptions (&priv->cfg,
+-							  priv->registry,
+-							  (const char **) xklrec->layouts,
+-							  (const char **) xklrec->variants,
+-	     						  &priv->short_group_names,
+-							  &priv->full_group_names)) {
+-		/* We just populate no short names (remain NULL) - 
+-		 * full names are going to be used anyway */
+-		gint i, total_groups =
+-		    xkl_engine_get_num_groups (priv->engine);
+-		xkl_debug (150, "group descriptions loaded: %d!\n",
+-			   total_groups);
+-		priv->full_group_names =
+-		    g_new0 (char *, total_groups + 1);
+-
+-		if (xkl_engine_get_features (priv->engine) &
+-		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
+-			for (i = 0; priv->kbd_cfg.layouts_variants[i]; i++) {
+-				priv->full_group_names[i] =
+-				    g_strdup ((char *) priv->kbd_cfg.layouts_variants[i]);
+-			}
+-		} else {
+-			for (i = total_groups; --i >= 0;) {
+-				priv->full_group_names[i] =
+-				    g_strdup_printf ("Group %d", i);
+-			}
+-		}
+-	}
+-}
+-
+-/* Should be called once for all widgets */
+-static void
+-gkbd_configuration_kbd_cfg_callback (XklEngine *engine,
+-				     GkbdConfiguration *configuration)
+-{
+-	GkbdConfigurationPrivate *priv = configuration->priv;
+-	XklConfigRec *xklrec = xkl_config_rec_new ();
+-	xkl_debug (100,
+-		   "XKB configuration changed on X Server - reiniting...\n");
+-
+-	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
+-						  xklrec);
+-
+-	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
+-	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
+-						    &priv->kbd_cfg);
+-
+-	g_strfreev (priv->full_group_names);
+-	priv->full_group_names = NULL;
+-
+-	g_strfreev (priv->short_group_names);
+-	priv->short_group_names = NULL;
+-
+-	gkbd_configuration_load_group_names (configuration,
+-				 	     xklrec);
+-
+-	g_signal_emit (configuration,
+-		       signals[SIGNAL_CHANGED],
+-		       0);
+-
+-	g_object_unref (G_OBJECT (xklrec));
+-}
+-
+-/* Should be called once for all applets */
+-static void
+-gkbd_configuration_state_callback (XklEngine * engine,
+-				   XklEngineStateChange changeType,
+-			    	   gint group, gboolean restore,
+-				   GkbdConfiguration * configuration)
+-{
+-	xkl_debug (150, "group is now %d, restore: %d\n", group, restore);
+-
+-	if (changeType == GROUP_CHANGED) {
+-		g_signal_emit (configuration,
+-			       signals[SIGNAL_GROUP_CHANGED], 0,
+-			       group);
+-	}
+-}
+-
+-static void
+-gkbd_configuration_init (GkbdConfiguration *configuration)
+-{
+-	GkbdConfigurationPrivate *priv;
+-	XklConfigRec *xklrec = xkl_config_rec_new ();
+-
+-	priv = GKBD_CONFIGURATION_GET_PRIVATE (configuration);
+-	configuration->priv = priv;
+-
+-	priv->engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+-	if (priv->engine == NULL) {
+-		xkl_debug (0, "Libxklavier initialization error");
+-		return;
+-	}
+-
+-	priv->state_changed_handler =
+-	    g_signal_connect (priv->engine, "X-state-changed",
+-			      G_CALLBACK (gkbd_configuration_state_callback),
+-			      configuration);
+-	priv->config_changed_handler =
+-	    g_signal_connect (priv->engine, "X-config-changed",
+-			      G_CALLBACK (gkbd_configuration_kbd_cfg_callback),
+-			      configuration);
+-
+-	gkbd_desktop_config_init (&priv->cfg, priv->engine);
+-	gkbd_keyboard_config_init (&priv->kbd_cfg, priv->engine);
+-	gkbd_indicator_config_init (&priv->ind_cfg, priv->engine);
+-
+-	gkbd_desktop_config_load (&priv->cfg);
+-	gkbd_desktop_config_activate (&priv->cfg);
+-
+-	priv->registry = xkl_config_registry_get_instance (priv->engine);
+-	xkl_config_registry_load (priv->registry,
+-				  priv->cfg.load_extra_items);
+-
+-	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
+-						  xklrec);
+-
+-	gkbd_indicator_config_load (&priv->ind_cfg);
+-
+-	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
+-						    &priv->kbd_cfg);
+-
+-	gkbd_indicator_config_activate (&priv->ind_cfg);
+-
+-	gkbd_configuration_load_group_names (configuration,
+-					     xklrec);
+-	g_object_unref (G_OBJECT (xklrec));
+-
+-	gkbd_desktop_config_start_listen (&priv->cfg,
+-					  G_CALLBACK (gkbd_configuration_cfg_changed),
+-					  configuration);
+-	gkbd_indicator_config_start_listen (&priv->ind_cfg,
+-					    G_CALLBACK (gkbd_configuration_ind_cfg_changed),
+-					    configuration);
+-	xkl_engine_start_listen (priv->engine,
+-				 XKLL_TRACK_KEYBOARD_STATE);
+-
+-	xkl_debug (100, "Initiating the widget startup process for %p\n",
+-		   configuration);
+-}
+-
+-static void
+-gkbd_configuration_finalize (GObject * obj)
+-{
+-	GkbdConfiguration *configuration = GKBD_CONFIGURATION (obj);
+-	GkbdConfigurationPrivate *priv = configuration->priv;
+-
+-	xkl_debug (100,
+-		   "Starting the gnome-kbd-configuration widget shutdown process for %p\n",
+-		   configuration);
+-
+-	xkl_engine_stop_listen (priv->engine,
+-				XKLL_TRACK_KEYBOARD_STATE);
+-
+-	gkbd_desktop_config_stop_listen (&priv->cfg);
+-	gkbd_indicator_config_stop_listen (&priv->ind_cfg);
+-
+-	gkbd_indicator_config_term (&priv->ind_cfg);
+-	gkbd_keyboard_config_term (&priv->kbd_cfg);
+-	gkbd_desktop_config_term (&priv->cfg);
+-
+-	if (g_signal_handler_is_connected (priv->engine,
+-					   priv->state_changed_handler)) {
+-		g_signal_handler_disconnect (priv->engine,
+-					     priv->state_changed_handler);
+-		priv->state_changed_handler = 0;
+-	}
+-	if (g_signal_handler_is_connected (priv->engine,
+-					   priv->config_changed_handler)) {
+-		g_signal_handler_disconnect (priv->engine,
+-					     priv->config_changed_handler);
+-		priv->config_changed_handler = 0;
+-	}
+-
+-	g_object_unref (priv->registry);
+-	priv->registry = NULL;
+-	g_object_unref (priv->engine);
+-	priv->engine = NULL;
+-
+-	G_OBJECT_CLASS (gkbd_configuration_parent_class)->finalize (obj);
+-}
+-
+-static void
+-gkbd_configuration_class_init (GkbdConfigurationClass * klass)
+-{
+-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+-
+-	/* Initing vtable */
+-	object_class->finalize = gkbd_configuration_finalize;
+-
+-	/* Signals */
+-	signals[SIGNAL_CHANGED] = g_signal_new ("changed",
+-						GKBD_TYPE_CONFIGURATION,
+-						G_SIGNAL_RUN_LAST,
+-						0,
+-						NULL, NULL,
+-						g_cclosure_marshal_VOID__VOID,
+-						G_TYPE_NONE,
+-						0);
+-	signals[SIGNAL_GROUP_CHANGED] = g_signal_new ("group-changed",
+-						      GKBD_TYPE_CONFIGURATION,
+-						      G_SIGNAL_RUN_LAST,
+-						      0,
+-						      NULL, NULL,
+-						      g_cclosure_marshal_VOID__INT,
+-						      G_TYPE_NONE,
+-						      1,
+-						      G_TYPE_INT);
+-
+-	g_type_class_add_private (klass, sizeof (GkbdConfigurationPrivate));
+-}
+-
+-GkbdConfiguration *
+-gkbd_configuration_get (void)
+-{
+-	static gpointer instance = NULL;
+-
+-	if (!instance) {
+-		instance = g_object_new (GKBD_TYPE_CONFIGURATION, NULL);
+-		g_object_add_weak_pointer (instance, &instance);
+-	} else {
+-		g_object_ref (instance);
+-	}
+-
+-	return instance;
+-}
+-
+-XklEngine *
+-gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
+-{
+-	return configuration->priv->engine;
+-}
+-
+-const char * const *
+-gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
+-{
+-	return configuration->priv->full_group_names;
+-}
+-
+-const char * const *
+-gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
+-{
+-	return configuration->priv->short_group_names;
+-}
+diff -uNrp a/plugins/keyboard/gkbd-configuration.h b/plugins/keyboard/gkbd-configuration.h
+--- a/plugins/keyboard/gkbd-configuration.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/gkbd-configuration.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-/*
+- * Copyright (C) 2010 Canonical Ltd.
+- * 
+- * Authors: Jan Arne Petersen <jpetersen@openismus.com>
+- * 
+- * Based on gkbd-status.h by Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+- * Boston, MA 02110-1335, USA.
+- */
+-
+-#ifndef __GKBD_CONFIGURATION_H__
+-#define __GKBD_CONFIGURATION_H__
+-
+-#include <glib-object.h>
+-
+-#include <libxklavier/xklavier.h>
+-
+-G_BEGIN_DECLS
+-
+-typedef struct _GkbdConfiguration GkbdConfiguration;
+-typedef struct _GkbdConfigurationPrivate GkbdConfigurationPrivate;
+-typedef struct _GkbdConfigurationClass GkbdConfigurationClass;
+-
+-#define GKBD_TYPE_CONFIGURATION           (gkbd_configuration_get_type ())
+-#define GKBD_CONFIGURATION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfiguration))
+-#define GKBD_INDCATOR_CLASS(obj)          (G_TYPE_CHECK_CLASS_CAST ((obj), GKBD_TYPE_CONFIGURATION,  GkbdConfigurationClass))
+-#define GKBD_IS_CONFIGURATION(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
+-#define GKBD_IS_CONFIGURATION_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
+-#define GKBD_CONFIGURATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfigurationClass))
+-
+-struct _GkbdConfiguration {
+-	GObject parent;
+-
+-	GkbdConfigurationPrivate *priv;
+-};
+-
+-struct _GkbdConfigurationClass {
+-	GObjectClass parent_class;
+-};
+-
+-extern GType gkbd_configuration_get_type (void);
+-
+-extern GkbdConfiguration *gkbd_configuration_get (void);
+-
+-extern XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration);
+-
+-extern const char * const *gkbd_configuration_get_group_names (GkbdConfiguration *configuration);
+-extern const char * const *gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration);
+-
+-G_END_DECLS
+-
+-#endif
+diff -uNrp a/plugins/keyboard/.indent.pro b/plugins/keyboard/.indent.pro
+--- a/plugins/keyboard/.indent.pro	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/.indent.pro	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,2 @@
++-kr -i8 -pcs -lps -psl
++
+diff -uNrp a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
+--- a/plugins/keyboard/Makefile.am	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/keyboard/Makefile.am	2013-08-25 16:36:02.000000000 +0100
+@@ -20,25 +20,20 @@ libkeyboard_la_SOURCES = 	\
+ 	csd-keyboard-plugin.c	\
+ 	csd-keyboard-manager.h	\
+ 	csd-keyboard-manager.c	\
+-	csd-keyboard-xkb.h	\
+-	csd-keyboard-xkb.c	\
+-	delayed-dialog.h	\
+-	delayed-dialog.c	\
+-	gkbd-configuration.c	\
+-	gkbd-configuration.h	\
+ 	$(NULL)
+ 
+ libkeyboard_la_CPPFLAGS = \
+ 	-I$(top_srcdir)/cinnamon-settings-daemon		\
+ 	-I$(top_srcdir)/data				\
++	-I$(top_srcdir)/plugins/common			\
+ 	-DDATADIR=\""$(pkgdatadir)"\"			\
++	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+ 	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ 	$(AM_CPPFLAGS)
+ 
+ libkeyboard_la_CFLAGS = \
+ 	$(PLUGIN_CFLAGS)		\
+ 	$(SETTINGS_PLUGIN_CFLAGS)	\
+-	$(APPINDICATOR_CFLAGS)		\
+ 	$(KEYBOARD_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+@@ -46,19 +41,63 @@ libkeyboard_la_LDFLAGS = 	\
+ 	$(CSD_PLUGIN_LDFLAGS)	\
+ 	$(NULL)
+ 
+-libkeyboard_la_LIBADD  = 	\
+-	$(SETTINGS_PLUGIN_LIBS)	\
+-	$(XF86MISC_LIBS)	\
+-	$(KEYBOARD_LIBS)	\
+-	$(APPINDICATOR_LIBS)	\
++libkeyboard_la_LIBADD  =				\
++	$(top_builddir)/plugins/common/libcommon.la	\
++	$(SETTINGS_PLUGIN_LIBS)				\
++	$(XF86MISC_LIBS)				\
++	$(KEYBOARD_LIBS)				\
+ 	$(NULL)
+ 
++libexec_PROGRAMS = csd-test-keyboard
++csd_test_keyboard_SOURCES =	\
++	test-keyboard.c		\
++	csd-keyboard-manager.h	\
++	csd-keyboard-manager.c	\
++	$(NULL)
++
++csd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)
++csd_test_keyboard_CPPFLAGS = $(libkeyboard_la_CPPFLAGS)
++csd_test_keyboard_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/cinnamon-settings-daemon/libcsd.la
++
+ plugin_in_files = 		\
+ 	keyboard.cinnamon-settings-plugin.in	\
+ 	$(NULL)
+ 
+ plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
+ 
++if HAVE_IBUS
++noinst_PROGRAMS = test-keyboard-ibus-utils
++test_keyboard_ibus_utils_SOURCES = test-keyboard-ibus-utils.c
++test_keyboard_ibus_utils_CFLAGS = $(libkeyboard_la_CFLAGS)
++test_keyboard_ibus_utils_CPPFLAGS = $(libkeyboard_la_CPPFLAGS)
++test_keyboard_ibus_utils_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/cinnamon-settings-daemon/libcsd.la
++
++check-local: test-keyboard-ibus-utils
++	$(builddir)/test-keyboard-ibus-utils > /dev/null
++endif
++
++libexec_PROGRAMS += csd-input-sources-switcher
++
++csd_input_sources_switcher_SOURCES = 	\
++	csd-input-sources-switcher.c	\
++	$(NULL)
++
++csd_input_sources_switcher_CPPFLAGS =	\
++	-I$(top_srcdir)/data		\
++	-I$(top_srcdir)/plugins/common	\
++	$(AM_CPPFLAGS)			\
++	$(NULL)
++
++csd_input_sources_switcher_CFLAGS =	\
++	$(SETTINGS_PLUGIN_CFLAGS)	\
++	$(AM_CFLAGS)			\
++	$(NULL)
++
++csd_input_sources_switcher_LDADD  = 	\
++	$(top_builddir)/plugins/common/libcommon.la	\
++	$(SETTINGS_PLUGIN_LIBS)		\
++	$(NULL)
++
+ EXTRA_DIST = 			\
+ 	$(icons_DATA)		\
+ 	$(plugin_in_files)	\
+diff -uNrp a/plugins/keyboard/test-keyboard.c b/plugins/keyboard/test-keyboard.c
+--- a/plugins/keyboard/test-keyboard.c	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/test-keyboard.c	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,7 @@
++#define NEW csd_keyboard_manager_new
++#define START csd_keyboard_manager_start
++#define STOP csd_keyboard_manager_stop
++#define MANAGER CsdKeyboardManager
++#include "csd-keyboard-manager.h"
++
++#include "test-plugin.h"
+diff -uNrp a/plugins/keyboard/test-keyboard-ibus-utils.c b/plugins/keyboard/test-keyboard-ibus-utils.c
+--- a/plugins/keyboard/test-keyboard-ibus-utils.c	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/test-keyboard-ibus-utils.c	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,116 @@
++#include "csd-keyboard-manager.c"
++
++static void
++test_make_xkb_source_id (void)
++{
++        gint i;
++        const gchar *test_strings[][2] = {
++                /* input                output */
++                { "xkb:aa:bb:cc",       "aa+bb" },
++                { "xkb:aa:bb:",         "aa+bb" },
++                { "xkb:aa::cc",         "aa" },
++                { "xkb:aa::",           "aa" },
++                { "xkb::bb:cc",         "+bb" },
++                { "xkb::bb:",           "+bb" },
++                { "xkb:::cc",           "" },
++                { "xkb:::",             "" },
++        };
++
++        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
++                g_assert_cmpstr (make_xkb_source_id (test_strings[i][0]), ==, test_strings[i][1]);
++}
++
++static void
++test_layout_from_ibus_layout (void)
++{
++        gint i;
++        const gchar *test_strings[][2] = {
++                /* input                output */
++                { "",                   "" },
++                { "a",                  "a" },
++                { "a(",                 "a" },
++                { "a[",                 "a" },
++        };
++
++        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
++                g_assert_cmpstr (layout_from_ibus_layout (test_strings[i][0]), ==, test_strings[i][1]);
++}
++
++static void
++test_variant_from_ibus_layout (void)
++{
++        gint i;
++        const gchar *test_strings[][2] = {
++                /* input                output */
++                { "",                   NULL },
++                { "a",                  NULL },
++                { "(",                  NULL },
++                { "()",                 "" },
++                { "(b)",                "b" },
++                { "a(",                 NULL },
++                { "a()",                "" },
++                { "a(b)",               "b" },
++        };
++
++        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
++                g_assert_cmpstr (variant_from_ibus_layout (test_strings[i][0]), ==, test_strings[i][1]);
++}
++
++static void
++test_options_from_ibus_layout (void)
++{
++        gint i, j;
++        gchar *output_0[] = {
++                NULL
++        };
++        gchar *output_1[] = {
++                "",
++                NULL
++        };
++        gchar *output_2[] = {
++                "b",
++                NULL
++        };
++        gchar *output_3[] = {
++                "b", "",
++                NULL
++        };
++        gchar *output_4[] = {
++                "b", "c",
++                NULL
++        };
++        const gpointer tests[][2] = {
++                /* input                output */
++                { "",                   NULL },
++                { "a",                  NULL },
++                { "a[",                 output_0 },
++                { "a[]",                output_1 },
++                { "a[b]",               output_2 },
++                { "a[b,]",              output_3 },
++                { "a[b,c]",             output_4 },
++        };
++
++        for (i = 0; i < G_N_ELEMENTS (tests); ++i) {
++                if (tests[i][1] == NULL) {
++                        g_assert (options_from_ibus_layout (tests[i][0]) == NULL);
++                } else {
++                        gchar **strv_a = options_from_ibus_layout (tests[i][0]);
++                        gchar **strv_b = tests[i][1];
++
++                        g_assert (g_strv_length (strv_a) == g_strv_length (strv_b));
++                        for (j = 0; j < g_strv_length (strv_a); ++j)
++                                g_assert_cmpstr (strv_a[j], ==, strv_b[j]);
++                }
++        }
++}
++
++int
++main (void)
++{
++        test_make_xkb_source_id ();
++        test_layout_from_ibus_layout ();
++        test_variant_from_ibus_layout ();
++        test_options_from_ibus_layout ();
++
++        return 0;
++}
+diff -uNrp a/plugins/keyboard/xxx/csd-keyboard-xkb.c b/plugins/keyboard/xxx/csd-keyboard-xkb.c
+--- a/plugins/keyboard/xxx/csd-keyboard-xkb.c	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/csd-keyboard-xkb.c	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,579 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2001 Udaltsoft
++ *
++ * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++#include "config.h"
++
++#include <string.h>
++#include <time.h>
++
++#include <glib/gi18n.h>
++#include <gdk/gdk.h>
++#include <gdk/gdkx.h>
++#include <gtk/gtk.h>
++
++#include <libgnomekbd/gkbd-status.h>
++
++#include <libgnomekbd/gkbd-keyboard-drawing.h>
++#include <libgnomekbd/gkbd-desktop-config.h>
++#include <libgnomekbd/gkbd-indicator-config.h>
++#include <libgnomekbd/gkbd-keyboard-config.h>
++#include <libgnomekbd/gkbd-util.h>
++
++#include "csd-keyboard-xkb.h"
++#include "delayed-dialog.h"
++#include "cinnamon-settings-profile.h"
++
++#define SETTINGS_KEYBOARD_DIR "org.cinnamon.settings-daemon.plugins.keyboard"
++
++static CsdKeyboardManager *manager = NULL;
++
++static XklEngine *xkl_engine;
++static XklConfigRegistry *xkl_registry = NULL;
++
++static GkbdDesktopConfig current_config;
++static GkbdKeyboardConfig current_kbd_config;
++
++/* never terminated */
++static GkbdKeyboardConfig initial_sys_kbd_config;
++
++static gboolean inited_ok = FALSE;
++
++static GSettings *settings_desktop = NULL;
++static GSettings *settings_keyboard = NULL;
++
++static PostActivationCallback pa_callback = NULL;
++static void *pa_callback_user_data = NULL;
++
++static GtkStatusIcon *icon = NULL;
++
++static GHashTable *preview_dialogs = NULL;
++
++static void
++activation_error (void)
++{
++	char const *vendor;
++	GtkWidget *dialog;
++
++	vendor =
++	    ServerVendor (GDK_DISPLAY_XDISPLAY
++			  (gdk_display_get_default ()));
++
++	/* VNC viewers will not work, do not barrage them with warnings */
++	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
++		return;
++
++	dialog = gtk_message_dialog_new_with_markup (NULL,
++						     0,
++						     GTK_MESSAGE_ERROR,
++						     GTK_BUTTONS_CLOSE,
++						     _
++						     ("Error activating XKB configuration.\n"
++						      "There can be various reasons for that.\n\n"
++						      "If you report this situation as a bug, include the results of\n"
++						      " • <b>%s</b>\n"
++						      " • <b>%s</b>\n"
++						      " • <b>%s</b>\n"
++						      " • <b>%s</b>"),
++						     "xprop -root | grep XKB",
++						     "gsettings get org.gnome.libgnomekbd.keyboard model",
++						     "gsettings get org.gnome.libgnomekbd.keyboard layouts",
++						     "gsettings get org.gnome.libgnomekbd.keyboard options");
++	g_signal_connect (dialog, "response",
++			  G_CALLBACK (gtk_widget_destroy), NULL);
++	csd_delayed_show_dialog (dialog);
++}
++
++static gboolean
++ensure_xkl_registry (void)
++{
++	if (!xkl_registry) {
++		xkl_registry =
++		    xkl_config_registry_get_instance (xkl_engine);
++		/* load all materials, unconditionally! */
++		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
++			g_object_unref (xkl_registry);
++			xkl_registry = NULL;
++			return FALSE;
++		}
++	}
++
++	return TRUE;
++}
++
++static void
++apply_desktop_settings (void)
++{
++	if (!inited_ok)
++		return;
++
++	csd_keyboard_manager_apply_settings (manager);
++	gkbd_desktop_config_load (&current_config);
++	/* again, probably it would be nice to compare things
++	   before activating them */
++	gkbd_desktop_config_activate (&current_config);
++}
++
++static void
++popup_menu_launch_capplet ()
++{
++	GAppInfo *info;
++	GdkAppLaunchContext *ctx;
++	GError *error = NULL;
++
++	info =
++	    g_app_info_create_from_commandline
++	    ("cinnamon-settings region", NULL, 0, &error);
++
++	if (info != NULL) {
++		ctx =
++		    gdk_display_get_app_launch_context
++		    (gdk_display_get_default ());
++
++		if (g_app_info_launch (info, NULL,
++				   G_APP_LAUNCH_CONTEXT (ctx), &error) == FALSE) {
++			g_warning
++				("Could not execute keyboard properties capplet: [%s]\n",
++				 error->message);
++			g_error_free (error);
++		}
++
++		g_object_unref (info);
++		g_object_unref (ctx);
++	}
++
++}
++
++static void
++show_layout_destroy (GtkWidget * dialog, gint group)
++{
++	g_hash_table_remove (preview_dialogs, GINT_TO_POINTER (group));
++}
++
++static void
++popup_menu_show_layout ()
++{
++	GtkWidget *dialog;
++	XklEngine *engine =
++	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
++				     (gdk_display_get_default ()));
++	XklState *xkl_state = xkl_engine_get_current_state (engine);
++
++	gchar **group_names = gkbd_status_get_group_names ();
++
++	gpointer p = g_hash_table_lookup (preview_dialogs,
++					  GINT_TO_POINTER
++					  (xkl_state->group));
++
++	if (xkl_state->group < 0
++	    || xkl_state->group >= g_strv_length (group_names)) {
++		return;
++	}
++
++	if (p != NULL) {
++		/* existing window */
++		gtk_window_present (GTK_WINDOW (p));
++		return;
++	}
++
++	if (!ensure_xkl_registry ())
++		return;
++
++	dialog = gkbd_keyboard_drawing_dialog_new ();
++	gkbd_keyboard_drawing_dialog_set_group (dialog, xkl_registry, xkl_state->group);
++
++	g_signal_connect (dialog, "destroy",
++			  G_CALLBACK (show_layout_destroy),
++			  GINT_TO_POINTER (xkl_state->group));
++	g_hash_table_insert (preview_dialogs,
++			     GINT_TO_POINTER (xkl_state->group), dialog);
++	gtk_widget_show_all (dialog);
++}
++
++static void
++popup_menu_set_group (gint group_number, gboolean only_menu)
++{
++
++	XklEngine *engine = gkbd_status_get_xkl_engine ();
++
++	XklState *st = xkl_engine_get_current_state(engine);
++	Window cur;
++	st->group = group_number;
++	xkl_engine_allow_one_switch_to_secondary_group (engine);
++	cur = xkl_engine_get_current_window (engine);
++	if (cur != (Window) NULL) {
++		xkl_debug (150, "Enforcing the state %d for window %lx\n",
++			   st->group, cur);
++
++		xkl_engine_save_state (engine,
++				       xkl_engine_get_current_window
++				       (engine), st);
++/*    XSetInputFocus( GDK_DISPLAY(), cur, RevertToNone, CurrentTime );*/
++	} else {
++		xkl_debug (150,
++			   "??? Enforcing the state %d for unknown window\n",
++			   st->group);
++		/* strange situation - bad things can happen */
++	}
++        if (!only_menu)
++        	xkl_engine_lock_group (engine, st->group);
++}
++
++static void
++popup_menu_set_group_cb (GtkMenuItem * item, gpointer param)
++{
++	gint group_number = GPOINTER_TO_INT (param);
++
++	popup_menu_set_group(group_number, FALSE);
++}
++
++
++static GtkMenu *
++create_status_menu (void)
++{
++	GtkMenu *popup_menu = GTK_MENU (gtk_menu_new ());
++	int i = 0;
++
++	GtkMenu *groups_menu = GTK_MENU (gtk_menu_new ());
++	gchar **current_name = gkbd_status_get_group_names ();
++
++	GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Layouts"));
++	gtk_widget_show (item);
++	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
++	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
++				   GTK_WIDGET (groups_menu));
++
++	item = gtk_menu_item_new_with_mnemonic (_("Show _Keyboard Layout..."));
++	gtk_widget_show (item);
++	g_signal_connect (item, "activate", popup_menu_show_layout, NULL);
++	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
++
++	/* translators note:
++	 * This is the name of the cinnamon-settings "region" panel */
++	item = gtk_menu_item_new_with_mnemonic (_("Region and Language Settings"));
++	gtk_widget_show (item);
++	g_signal_connect (item, "activate", popup_menu_launch_capplet, NULL);
++	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
++
++	for (i = 0; current_name && *current_name; i++, current_name++) {
++
++		gchar *image_file = gkbd_status_get_image_filename (i);
++
++		if (image_file == NULL) {
++			item =
++			    gtk_menu_item_new_with_label (*current_name);
++		} else {
++			GdkPixbuf *pixbuf =
++			    gdk_pixbuf_new_from_file_at_size (image_file,
++							      24, 24,
++							      NULL);
++			GtkWidget *img =
++			    gtk_image_new_from_pixbuf (pixbuf);
++			item =
++			    gtk_image_menu_item_new_with_label
++			    (*current_name);
++			gtk_widget_show (img);
++			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
++						       (item), img);
++			gtk_image_menu_item_set_always_show_image
++			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
++			g_free (image_file);
++		}
++		gtk_widget_show (item);
++		gtk_menu_shell_append (GTK_MENU_SHELL (groups_menu), item);
++		g_signal_connect (item, "activate",
++				  G_CALLBACK (popup_menu_set_group_cb),
++				  GINT_TO_POINTER (i));
++	}
++
++	return popup_menu;
++}
++
++static void
++status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
++{
++	GtkMenu *popup_menu = create_status_menu ();
++
++	gtk_menu_popup (popup_menu, NULL, NULL,
++			gtk_status_icon_position_menu,
++			(gpointer) icon, button, time);
++}
++
++static void
++show_hide_icon ()
++{
++	if (g_strv_length (current_kbd_config.layouts_variants) > 1) {
++		if (icon == NULL) {
++			xkl_debug (150, "Creating keyboard status icon\n");
++			icon = gkbd_status_new ();
++			g_signal_connect (icon, "popup-menu",
++					  G_CALLBACK
++					  (status_icon_popup_menu_cb),
++					  NULL);
++
++		}
++	} else {
++		if (icon != NULL) {
++			xkl_debug (150, "Destroying icon\n");
++			g_object_unref (icon);
++			icon = NULL;
++		}
++	}
++}
++
++static gboolean
++try_activating_xkb_config_if_new (GkbdKeyboardConfig *
++				  current_sys_kbd_config)
++{
++	/* Activate - only if different! */
++	if (!gkbd_keyboard_config_equals
++	    (&current_kbd_config, current_sys_kbd_config)) {
++		if (gkbd_keyboard_config_activate (&current_kbd_config)) {
++			if (pa_callback != NULL) {
++				(*pa_callback) (pa_callback_user_data);
++				return TRUE;
++			}
++		} else {
++			return FALSE;
++		}
++	}
++	return TRUE;
++}
++
++static gboolean
++filter_xkb_config (void)
++{
++	XklConfigItem *item;
++	gchar *lname;
++	gchar *vname;
++	gchar **lv;
++	gboolean any_change = FALSE;
++
++	xkl_debug (100, "Filtering configuration against the registry\n");
++	if (!ensure_xkl_registry ())
++		return FALSE;
++
++	lv = current_kbd_config.layouts_variants;
++	item = xkl_config_item_new ();
++	while (*lv) {
++		xkl_debug (100, "Checking [%s]\n", *lv);
++		if (gkbd_keyboard_config_split_items (*lv, &lname, &vname)) {
++			gboolean should_be_dropped = FALSE;
++			g_snprintf (item->name, sizeof (item->name), "%s",
++				    lname);
++			if (!xkl_config_registry_find_layout
++			    (xkl_registry, item)) {
++				xkl_debug (100, "Bad layout [%s]\n",
++					   lname);
++				should_be_dropped = TRUE;
++			} else if (vname) {
++				g_snprintf (item->name,
++					    sizeof (item->name), "%s",
++					    vname);
++				if (!xkl_config_registry_find_variant
++				    (xkl_registry, lname, item)) {
++					xkl_debug (100,
++						   "Bad variant [%s(%s)]\n",
++						   lname, vname);
++					should_be_dropped = TRUE;
++				}
++			}
++			if (should_be_dropped) {
++				gkbd_strv_behead (lv);
++				any_change = TRUE;
++				continue;
++			}
++		}
++		lv++;
++	}
++	g_object_unref (item);
++	return any_change;
++}
++
++static void
++apply_xkb_settings (void)
++{
++	GkbdKeyboardConfig current_sys_kbd_config;
++
++	if (!inited_ok)
++		return;
++
++	gkbd_keyboard_config_init (&current_sys_kbd_config, xkl_engine);
++
++	gkbd_keyboard_config_load (&current_kbd_config,
++				   &initial_sys_kbd_config);
++
++	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
++						  NULL);
++
++	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
++		if (filter_xkb_config ()) {
++			if (!try_activating_xkb_config_if_new
++			    (&current_sys_kbd_config)) {
++				g_warning
++				    ("Could not activate the filtered XKB configuration");
++				activation_error ();
++			}
++		} else {
++			g_warning
++			    ("Could not activate the XKB configuration");
++			activation_error ();
++		}
++	} else
++		xkl_debug (100,
++			   "Actual KBD configuration was not changed: redundant notification\n");
++
++	gkbd_keyboard_config_term (&current_sys_kbd_config);
++	show_hide_icon ();
++}
++
++static void
++csd_keyboard_xkb_analyze_sysconfig (void)
++{
++	if (!inited_ok)
++		return;
++
++	gkbd_keyboard_config_init (&initial_sys_kbd_config, xkl_engine);
++	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
++						  NULL);
++}
++
++void
++csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
++					       void *user_data)
++{
++	pa_callback = fun;
++	pa_callback_user_data = user_data;
++}
++
++static GdkFilterReturn
++csd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
++{
++	XEvent *xevent = (XEvent *) xev;
++	xkl_engine_filter_events (xkl_engine, xevent);
++	return GDK_FILTER_CONTINUE;
++}
++
++/* When new Keyboard is plugged in - reload the settings */
++static void
++csd_keyboard_new_device (XklEngine * engine)
++{
++	apply_desktop_settings ();
++	apply_xkb_settings ();
++}
++
++void
++csd_keyboard_xkb_init (CsdKeyboardManager * kbd_manager)
++{
++	Display *display =
++	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
++	cinnamon_settings_profile_start (NULL);
++
++	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
++					   DATADIR G_DIR_SEPARATOR_S
++					   "icons");
++
++	manager = kbd_manager;
++	cinnamon_settings_profile_start ("xkl_engine_get_instance");
++	xkl_engine = xkl_engine_get_instance (display);
++	cinnamon_settings_profile_end ("xkl_engine_get_instance");
++	if (xkl_engine) {
++		inited_ok = TRUE;
++
++		gkbd_desktop_config_init (&current_config, xkl_engine);
++		gkbd_keyboard_config_init (&current_kbd_config,
++					   xkl_engine);
++		xkl_engine_backup_names_prop (xkl_engine);
++		csd_keyboard_xkb_analyze_sysconfig ();
++
++		settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
++		settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
++		g_signal_connect (settings_desktop, "changed",
++				  (GCallback) apply_desktop_settings,
++				  NULL);
++		g_signal_connect (settings_keyboard, "changed",
++				  (GCallback) apply_xkb_settings, NULL);
++
++		gdk_window_add_filter (NULL, (GdkFilterFunc)
++				       csd_keyboard_xkb_evt_filter, NULL);
++
++		if (xkl_engine_get_features (xkl_engine) &
++		    XKLF_DEVICE_DISCOVERY)
++			g_signal_connect (xkl_engine, "X-new-device",
++					  G_CALLBACK
++					  (csd_keyboard_new_device), NULL);
++
++		cinnamon_settings_profile_start ("xkl_engine_start_listen");
++		xkl_engine_start_listen (xkl_engine,
++					 XKLL_MANAGE_LAYOUTS |
++					 XKLL_MANAGE_WINDOW_STATES);
++		cinnamon_settings_profile_end ("xkl_engine_start_listen");
++
++		cinnamon_settings_profile_start ("apply_desktop_settings");
++		apply_desktop_settings ();
++		cinnamon_settings_profile_end ("apply_desktop_settings");
++		cinnamon_settings_profile_start ("apply_xkb_settings");
++		apply_xkb_settings ();
++		cinnamon_settings_profile_end ("apply_xkb_settings");
++	}
++	preview_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
++
++	cinnamon_settings_profile_end (NULL);
++}
++
++void
++csd_keyboard_xkb_shutdown (void)
++{
++	if (!inited_ok)
++		return;
++
++	pa_callback = NULL;
++	pa_callback_user_data = NULL;
++	manager = NULL;
++
++	if (preview_dialogs != NULL)
++		g_hash_table_destroy (preview_dialogs);
++
++	if (!inited_ok)
++		return;
++
++	xkl_engine_stop_listen (xkl_engine,
++				XKLL_MANAGE_LAYOUTS |
++				XKLL_MANAGE_WINDOW_STATES);
++
++	gdk_window_remove_filter (NULL, (GdkFilterFunc)
++				  csd_keyboard_xkb_evt_filter, NULL);
++
++	g_object_unref (settings_desktop);
++	settings_desktop = NULL;
++	g_object_unref (settings_keyboard);
++	settings_keyboard = NULL;
++
++	if (xkl_registry) {
++		g_object_unref (xkl_registry);
++	}
++
++	g_object_unref (xkl_engine);
++
++	xkl_engine = NULL;
++
++	inited_ok = FALSE;
++}
+diff -uNrp a/plugins/keyboard/xxx/csd-keyboard-xkb.h b/plugins/keyboard/xxx/csd-keyboard-xkb.h
+--- a/plugins/keyboard/xxx/csd-keyboard-xkb.h	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/csd-keyboard-xkb.h	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,39 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
++ * cinnamon-settings-keyboard-xkb.h
++ *
++ * Copyright (C) 2001 Udaltsoft
++ *
++ * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++#ifndef __CSD_KEYBOARD_XKB_H
++#define __CSD_KEYBOARD_XKB_H
++
++#include <libxklavier/xklavier.h>
++#include "csd-keyboard-manager.h"
++
++void csd_keyboard_xkb_init (CsdKeyboardManager *manager);
++void csd_keyboard_xkb_shutdown (void);
++
++typedef void (*PostActivationCallback) (void *userData);
++
++void
++csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
++                                               void                  *userData);
++
++#endif
+diff -uNrp a/plugins/keyboard/xxx/delayed-dialog.c b/plugins/keyboard/xxx/delayed-dialog.c
+--- a/plugins/keyboard/xxx/delayed-dialog.c	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/delayed-dialog.c	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,128 @@
++/*
++ * Copyright © 2006 Novell, Inc.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <gtk/gtk.h>
++#include <gdk/gdkx.h>
++
++#include "delayed-dialog.h"
++
++static gboolean        delayed_show_timeout (gpointer   data);
++static GdkFilterReturn message_filter       (GdkXEvent *xevent,
++                                             GdkEvent  *event,
++                                             gpointer   data);
++
++static GSList *dialogs = NULL;
++
++/**
++ * csd_delayed_show_dialog:
++ * @dialog: the dialog
++ *
++ * Shows the dialog as with gtk_widget_show(), unless a window manager
++ * hasn't been started yet, in which case it will wait up to 5 seconds
++ * for that to happen before showing the dialog.
++ **/
++void
++csd_delayed_show_dialog (GtkWidget *dialog)
++{
++        GdkDisplay *display = gtk_widget_get_display (dialog);
++        Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
++        GdkScreen *screen = gtk_widget_get_screen (dialog);
++        char selection_name[10];
++        Atom selection_atom;
++
++        /* We can't use gdk_selection_owner_get() for this, because
++         * it's an unknown out-of-process window.
++         */
++        snprintf (selection_name, sizeof (selection_name), "WM_S%d",
++                  gdk_screen_get_number (screen));
++        selection_atom = XInternAtom (xdisplay, selection_name, True);
++        if (selection_atom &&
++            XGetSelectionOwner (xdisplay, selection_atom) != None) {
++                gtk_widget_show (dialog);
++                return;
++        }
++
++        dialogs = g_slist_prepend (dialogs, dialog);
++
++        gdk_window_add_filter (NULL, message_filter, NULL);
++
++        g_timeout_add (5000, delayed_show_timeout, NULL);
++}
++
++static gboolean
++delayed_show_timeout (gpointer data)
++{
++        GSList *l;
++
++        for (l = dialogs; l; l = l->next)
++                gtk_widget_show (l->data);
++        g_slist_free (dialogs);
++        dialogs = NULL;
++
++        /* FIXME: There's no gdk_display_remove_client_message_filter */
++
++        return FALSE;
++}
++
++static GdkFilterReturn
++message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
++{
++        XClientMessageEvent *evt;
++        char *selection_name;
++        int screen;
++        GSList *l, *next;
++
++        if (((XEvent *)xevent)->type != ClientMessage)
++          return GDK_FILTER_CONTINUE;
++
++        evt = (XClientMessageEvent *)xevent;
++
++        if (evt->message_type != XInternAtom (evt->display, "MANAGER", FALSE))
++          return GDK_FILTER_CONTINUE;
++
++        selection_name = XGetAtomName (evt->display, evt->data.l[1]);
++
++        if (strncmp (selection_name, "WM_S", 4) != 0) {
++                XFree (selection_name);
++                return GDK_FILTER_CONTINUE;
++        }
++
++        screen = atoi (selection_name + 4);
++
++        for (l = dialogs; l; l = next) {
++                GtkWidget *dialog = l->data;
++                next = l->next;
++
++                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
++                        gtk_widget_show (dialog);
++                        dialogs = g_slist_remove (dialogs, dialog);
++                }
++        }
++
++        if (!dialogs) {
++                gdk_window_remove_filter (NULL, message_filter, NULL);
++        }
++
++        XFree (selection_name);
++
++        return GDK_FILTER_CONTINUE;
++}
+diff -uNrp a/plugins/keyboard/xxx/delayed-dialog.h b/plugins/keyboard/xxx/delayed-dialog.h
+--- a/plugins/keyboard/xxx/delayed-dialog.h	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/delayed-dialog.h	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,32 @@
++/*
++ * Copyright © 2006 Novell, Inc.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2, or (at
++ * your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++
++#ifndef __DELAYED_DIALOG_H
++#define __DELAYED_DIALOG_H
++
++#include <gtk/gtk.h>
++
++G_BEGIN_DECLS
++
++void            csd_delayed_show_dialog (GtkWidget *dialog);
++
++G_END_DECLS
++
++#endif
+diff -uNrp a/plugins/keyboard/xxx/gkbd-configuration.c b/plugins/keyboard/xxx/gkbd-configuration.c
+--- a/plugins/keyboard/xxx/gkbd-configuration.c	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/gkbd-configuration.c	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,350 @@
++/*
++ * Copyright (C) 2010 Canonical Ltd.
++ * 
++ * Authors: Jan Arne Petersen <jpetersen@openismus.com>
++ * 
++ * Based on gkbd-status.c by Sergey V. Udaltsov <svu@gnome.org>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
++ * Boston, MA 02110-1335, USA.
++ */
++
++#include <memory.h>
++
++#include <gdk/gdkkeysyms.h>
++#include <gdk/gdkx.h>
++#include <glib/gi18n.h>
++
++#include <libgnomekbd/gkbd-desktop-config.h>
++#include <libgnomekbd/gkbd-indicator-config.h>
++
++#include "gkbd-configuration.h"
++
++struct _GkbdConfigurationPrivate {
++	XklEngine *engine;
++	XklConfigRegistry *registry;
++
++	GkbdDesktopConfig cfg;
++	GkbdIndicatorConfig ind_cfg;
++	GkbdKeyboardConfig kbd_cfg;
++
++	gchar **full_group_names;
++	gchar **short_group_names;
++
++	gulong state_changed_handler;
++	gulong config_changed_handler;
++};
++
++enum {
++	SIGNAL_CHANGED,
++	SIGNAL_GROUP_CHANGED,
++	LAST_SIGNAL
++};
++
++static guint signals[LAST_SIGNAL] = { 0, };
++
++#define GKBD_CONFIGURATION_GET_PRIVATE(o) \
++	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GKBD_TYPE_CONFIGURATION, GkbdConfigurationPrivate))
++
++G_DEFINE_TYPE (GkbdConfiguration, gkbd_configuration, G_TYPE_OBJECT)
++
++/* Should be called once for all widgets */
++static void
++gkbd_configuration_cfg_changed (GSettings *settings,
++				 const char *key,
++				 GkbdConfiguration * configuration)
++{
++	GkbdConfigurationPrivate *priv = configuration->priv;
++
++	xkl_debug (100,
++		   "General configuration changed in GSettings - reiniting...\n");
++	gkbd_desktop_config_load (&priv->cfg);
++	gkbd_desktop_config_activate (&priv->cfg);
++
++	g_signal_emit (configuration,
++		       signals[SIGNAL_CHANGED], 0);
++}
++
++/* Should be called once for all widgets */
++static void
++gkbd_configuration_ind_cfg_changed (GSettings *settings,
++				     const char *key,
++				     GkbdConfiguration * configuration)
++{
++	GkbdConfigurationPrivate *priv = configuration->priv;
++	xkl_debug (100,
++		   "Applet configuration changed in GSettings - reiniting...\n");
++	gkbd_indicator_config_load (&priv->ind_cfg);
++
++	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
++	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
++						    &priv->kbd_cfg);
++
++	gkbd_indicator_config_activate (&priv->ind_cfg);
++
++	g_signal_emit (configuration,
++		       signals[SIGNAL_CHANGED], 0);
++}
++
++static void
++gkbd_configuration_load_group_names (GkbdConfiguration * configuration,
++				     XklConfigRec * xklrec)
++{
++	GkbdConfigurationPrivate *priv = configuration->priv;
++
++	if (!gkbd_desktop_config_load_group_descriptions (&priv->cfg,
++							  priv->registry,
++							  (const char **) xklrec->layouts,
++							  (const char **) xklrec->variants,
++	     						  &priv->short_group_names,
++							  &priv->full_group_names)) {
++		/* We just populate no short names (remain NULL) - 
++		 * full names are going to be used anyway */
++		gint i, total_groups =
++		    xkl_engine_get_num_groups (priv->engine);
++		xkl_debug (150, "group descriptions loaded: %d!\n",
++			   total_groups);
++		priv->full_group_names =
++		    g_new0 (char *, total_groups + 1);
++
++		if (xkl_engine_get_features (priv->engine) &
++		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
++			for (i = 0; priv->kbd_cfg.layouts_variants[i]; i++) {
++				priv->full_group_names[i] =
++				    g_strdup ((char *) priv->kbd_cfg.layouts_variants[i]);
++			}
++		} else {
++			for (i = total_groups; --i >= 0;) {
++				priv->full_group_names[i] =
++				    g_strdup_printf ("Group %d", i);
++			}
++		}
++	}
++}
++
++/* Should be called once for all widgets */
++static void
++gkbd_configuration_kbd_cfg_callback (XklEngine *engine,
++				     GkbdConfiguration *configuration)
++{
++	GkbdConfigurationPrivate *priv = configuration->priv;
++	XklConfigRec *xklrec = xkl_config_rec_new ();
++	xkl_debug (100,
++		   "XKB configuration changed on X Server - reiniting...\n");
++
++	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
++						  xklrec);
++
++	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
++	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
++						    &priv->kbd_cfg);
++
++	g_strfreev (priv->full_group_names);
++	priv->full_group_names = NULL;
++
++	g_strfreev (priv->short_group_names);
++	priv->short_group_names = NULL;
++
++	gkbd_configuration_load_group_names (configuration,
++				 	     xklrec);
++
++	g_signal_emit (configuration,
++		       signals[SIGNAL_CHANGED],
++		       0);
++
++	g_object_unref (G_OBJECT (xklrec));
++}
++
++/* Should be called once for all applets */
++static void
++gkbd_configuration_state_callback (XklEngine * engine,
++				   XklEngineStateChange changeType,
++			    	   gint group, gboolean restore,
++				   GkbdConfiguration * configuration)
++{
++	xkl_debug (150, "group is now %d, restore: %d\n", group, restore);
++
++	if (changeType == GROUP_CHANGED) {
++		g_signal_emit (configuration,
++			       signals[SIGNAL_GROUP_CHANGED], 0,
++			       group);
++	}
++}
++
++static void
++gkbd_configuration_init (GkbdConfiguration *configuration)
++{
++	GkbdConfigurationPrivate *priv;
++	XklConfigRec *xklrec = xkl_config_rec_new ();
++
++	priv = GKBD_CONFIGURATION_GET_PRIVATE (configuration);
++	configuration->priv = priv;
++
++	priv->engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
++	if (priv->engine == NULL) {
++		xkl_debug (0, "Libxklavier initialization error");
++		return;
++	}
++
++	priv->state_changed_handler =
++	    g_signal_connect (priv->engine, "X-state-changed",
++			      G_CALLBACK (gkbd_configuration_state_callback),
++			      configuration);
++	priv->config_changed_handler =
++	    g_signal_connect (priv->engine, "X-config-changed",
++			      G_CALLBACK (gkbd_configuration_kbd_cfg_callback),
++			      configuration);
++
++	gkbd_desktop_config_init (&priv->cfg, priv->engine);
++	gkbd_keyboard_config_init (&priv->kbd_cfg, priv->engine);
++	gkbd_indicator_config_init (&priv->ind_cfg, priv->engine);
++
++	gkbd_desktop_config_load (&priv->cfg);
++	gkbd_desktop_config_activate (&priv->cfg);
++
++	priv->registry = xkl_config_registry_get_instance (priv->engine);
++	xkl_config_registry_load (priv->registry,
++				  priv->cfg.load_extra_items);
++
++	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
++						  xklrec);
++
++	gkbd_indicator_config_load (&priv->ind_cfg);
++
++	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
++						    &priv->kbd_cfg);
++
++	gkbd_indicator_config_activate (&priv->ind_cfg);
++
++	gkbd_configuration_load_group_names (configuration,
++					     xklrec);
++	g_object_unref (G_OBJECT (xklrec));
++
++	gkbd_desktop_config_start_listen (&priv->cfg,
++					  G_CALLBACK (gkbd_configuration_cfg_changed),
++					  configuration);
++	gkbd_indicator_config_start_listen (&priv->ind_cfg,
++					    G_CALLBACK (gkbd_configuration_ind_cfg_changed),
++					    configuration);
++	xkl_engine_start_listen (priv->engine,
++				 XKLL_TRACK_KEYBOARD_STATE);
++
++	xkl_debug (100, "Initiating the widget startup process for %p\n",
++		   configuration);
++}
++
++static void
++gkbd_configuration_finalize (GObject * obj)
++{
++	GkbdConfiguration *configuration = GKBD_CONFIGURATION (obj);
++	GkbdConfigurationPrivate *priv = configuration->priv;
++
++	xkl_debug (100,
++		   "Starting the gnome-kbd-configuration widget shutdown process for %p\n",
++		   configuration);
++
++	xkl_engine_stop_listen (priv->engine,
++				XKLL_TRACK_KEYBOARD_STATE);
++
++	gkbd_desktop_config_stop_listen (&priv->cfg);
++	gkbd_indicator_config_stop_listen (&priv->ind_cfg);
++
++	gkbd_indicator_config_term (&priv->ind_cfg);
++	gkbd_keyboard_config_term (&priv->kbd_cfg);
++	gkbd_desktop_config_term (&priv->cfg);
++
++	if (g_signal_handler_is_connected (priv->engine,
++					   priv->state_changed_handler)) {
++		g_signal_handler_disconnect (priv->engine,
++					     priv->state_changed_handler);
++		priv->state_changed_handler = 0;
++	}
++	if (g_signal_handler_is_connected (priv->engine,
++					   priv->config_changed_handler)) {
++		g_signal_handler_disconnect (priv->engine,
++					     priv->config_changed_handler);
++		priv->config_changed_handler = 0;
++	}
++
++	g_object_unref (priv->registry);
++	priv->registry = NULL;
++	g_object_unref (priv->engine);
++	priv->engine = NULL;
++
++	G_OBJECT_CLASS (gkbd_configuration_parent_class)->finalize (obj);
++}
++
++static void
++gkbd_configuration_class_init (GkbdConfigurationClass * klass)
++{
++	GObjectClass *object_class = G_OBJECT_CLASS (klass);
++
++	/* Initing vtable */
++	object_class->finalize = gkbd_configuration_finalize;
++
++	/* Signals */
++	signals[SIGNAL_CHANGED] = g_signal_new ("changed",
++						GKBD_TYPE_CONFIGURATION,
++						G_SIGNAL_RUN_LAST,
++						0,
++						NULL, NULL,
++						g_cclosure_marshal_VOID__VOID,
++						G_TYPE_NONE,
++						0);
++	signals[SIGNAL_GROUP_CHANGED] = g_signal_new ("group-changed",
++						      GKBD_TYPE_CONFIGURATION,
++						      G_SIGNAL_RUN_LAST,
++						      0,
++						      NULL, NULL,
++						      g_cclosure_marshal_VOID__INT,
++						      G_TYPE_NONE,
++						      1,
++						      G_TYPE_INT);
++
++	g_type_class_add_private (klass, sizeof (GkbdConfigurationPrivate));
++}
++
++GkbdConfiguration *
++gkbd_configuration_get (void)
++{
++	static gpointer instance = NULL;
++
++	if (!instance) {
++		instance = g_object_new (GKBD_TYPE_CONFIGURATION, NULL);
++		g_object_add_weak_pointer (instance, &instance);
++	} else {
++		g_object_ref (instance);
++	}
++
++	return instance;
++}
++
++XklEngine *
++gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
++{
++	return configuration->priv->engine;
++}
++
++const char * const *
++gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
++{
++	return configuration->priv->full_group_names;
++}
++
++const char * const *
++gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
++{
++	return configuration->priv->short_group_names;
++}
+diff -uNrp a/plugins/keyboard/xxx/gkbd-configuration.h b/plugins/keyboard/xxx/gkbd-configuration.h
+--- a/plugins/keyboard/xxx/gkbd-configuration.h	1970-01-01 01:00:00.000000000 +0100
++++ b/plugins/keyboard/xxx/gkbd-configuration.h	2013-08-25 16:36:02.000000000 +0100
+@@ -0,0 +1,65 @@
++/*
++ * Copyright (C) 2010 Canonical Ltd.
++ * 
++ * Authors: Jan Arne Petersen <jpetersen@openismus.com>
++ * 
++ * Based on gkbd-status.h by Sergey V. Udaltsov <svu@gnome.org>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
++ * Boston, MA 02110-1335, USA.
++ */
++
++#ifndef __GKBD_CONFIGURATION_H__
++#define __GKBD_CONFIGURATION_H__
++
++#include <glib-object.h>
++
++#include <libxklavier/xklavier.h>
++
++G_BEGIN_DECLS
++
++typedef struct _GkbdConfiguration GkbdConfiguration;
++typedef struct _GkbdConfigurationPrivate GkbdConfigurationPrivate;
++typedef struct _GkbdConfigurationClass GkbdConfigurationClass;
++
++#define GKBD_TYPE_CONFIGURATION           (gkbd_configuration_get_type ())
++#define GKBD_CONFIGURATION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfiguration))
++#define GKBD_INDCATOR_CLASS(obj)          (G_TYPE_CHECK_CLASS_CAST ((obj), GKBD_TYPE_CONFIGURATION,  GkbdConfigurationClass))
++#define GKBD_IS_CONFIGURATION(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
++#define GKBD_IS_CONFIGURATION_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
++#define GKBD_CONFIGURATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfigurationClass))
++
++struct _GkbdConfiguration {
++	GObject parent;
++
++	GkbdConfigurationPrivate *priv;
++};
++
++struct _GkbdConfigurationClass {
++	GObjectClass parent_class;
++};
++
++extern GType gkbd_configuration_get_type (void);
++
++extern GkbdConfiguration *gkbd_configuration_get (void);
++
++extern XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration);
++
++extern const char * const *gkbd_configuration_get_group_names (GkbdConfiguration *configuration);
++extern const char * const *gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration);
++
++G_END_DECLS
++
++#endif
+diff -uNrp a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
+--- a/plugins/media-keys/csd-media-keys-manager.c	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/media-keys/csd-media-keys-manager.c	2013-08-25 16:36:02.000000000 +0100
+@@ -120,6 +120,10 @@ static const gchar kb_introspection_xml[
+ #define VOLUME_STEP 6           /* percents for one volume button press */
+ #define MAX_VOLUME 65536.0
+ 
++#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
++#define KEY_CURRENT_INPUT_SOURCE "current"
++#define KEY_INPUT_SOURCES        "sources"
++
+ #define CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_MEDIA_KEYS_MANAGER, CsdMediaKeysManagerPrivate))
+ 
+ typedef struct {
+@@ -1750,6 +1754,40 @@ do_keyboard_brightness_action (CsdMediaK
+                            manager);
+ }
+ 
++static void
++do_switch_input_source_action (CsdMediaKeysManager *manager,
++                               MediaKeyType         type)
++{
++        GSettings *settings;
++        GVariant *sources;
++        gint i, n;
++
++        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
++        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
++
++        n = g_variant_n_children (sources);
++        if (n < 2)
++                goto out;
++
++        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
++
++        if (type == SWITCH_INPUT_SOURCE_KEY)
++                i += 1;
++        else
++                i -= 1;
++
++        if (i < 0)
++                i = n - 1;
++        else if (i >= n)
++                i = 0;
++
++        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
++
++ out:
++        g_variant_unref (sources);
++        g_object_unref (settings);
++}
++
+ static gboolean
+ do_action (CsdMediaKeysManager *manager,
+            guint                deviceid,
+@@ -1908,6 +1946,10 @@ do_action (CsdMediaKeysManager *manager,
+         case BATTERY_KEY:
+                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
+                 break;
++        case SWITCH_INPUT_SOURCE_KEY:
++        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
++                do_switch_input_source_action (manager, type);
++                break;
+         /* Note, no default so compiler catches missing keys */
+         case CUSTOM_KEY:
+                 g_assert_not_reached ();
+diff -uNrp a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
+--- a/plugins/media-keys/shortcuts-list.h	2013-08-24 18:04:31.000000000 +0100
++++ b/plugins/media-keys/shortcuts-list.h	2013-08-25 16:36:02.000000000 +0100
+@@ -81,6 +81,8 @@ typedef enum {
+         KEYBOARD_BRIGHTNESS_DOWN_KEY,
+         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
+         BATTERY_KEY,
++        SWITCH_INPUT_SOURCE_KEY,
++        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
+         CUSTOM_KEY
+ } MediaKeyType;
+ 
+@@ -148,6 +150,9 @@ static struct {
+         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
+         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
+         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
++        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
++        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
++
+         { BATTERY_KEY, NULL, "XF86Battery" },
+ };
+ 
diff --git a/pkgs/desktops/cinnamon/systemd-support.patch b/pkgs/desktops/cinnamon/systemd-support.patch
new file mode 100644
index 00000000000..feceaf05f7b
--- /dev/null
+++ b/pkgs/desktops/cinnamon/systemd-support.patch
@@ -0,0 +1,536 @@
+ 
+diff --git a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
+index 02930a3..7c1c519 100644
+--- a/plugins/media-keys/csd-media-keys-manager.c
++++ b/plugins/media-keys/csd-media-keys-manager.c
+@@ -39,6 +39,7 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <gio/gdesktopappinfo.h>
++#include <gio/gunixfdlist.h>
+ 
+ #ifdef HAVE_GUDEV
+ #include <gudev/gudev.h>
+@@ -121,6 +122,10 @@ static const gchar kb_introspection_xml[] =
+ #define VOLUME_STEP 5           /* percents for one volume button press */
+ #define MAX_VOLUME 65536.0
+ 
++#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
++
+ #define CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_MEDIA_KEYS_MANAGER, CsdMediaKeysManagerPrivate))
+ 
+ typedef struct {
+@@ -167,6 +172,10 @@ struct CsdMediaKeysManagerPrivate
+         GDBusProxy      *power_screen_proxy;
+         GDBusProxy      *power_keyboard_proxy;
+ 
++        /* systemd stuff */
++        GDBusProxy      *logind_proxy;
++        gint             inhibit_keys_fd;
++
+         /* Multihead stuff */
+         GdkScreen       *current_screen;
+         GSList          *screens;
+@@ -2213,6 +2222,11 @@ csd_media_keys_manager_stop (CsdMediaKeysManager *manager)
+         }
+ #endif /* HAVE_GUDEV */
+ 
++        if (priv->logind_proxy) {
++                g_object_unref (priv->logind_proxy);
++                priv->logind_proxy = NULL;
++        }
++
+         if (priv->settings) {
+                 g_object_unref (priv->settings);
+                 priv->settings = NULL;
+@@ -2356,9 +2370,85 @@ csd_media_keys_manager_class_init (CsdMediaKeysManagerClass *klass)
+ }
+ 
+ static void
++inhibit_done (GObject      *source,
++              GAsyncResult *result,
++              gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        CsdMediaKeysManager *manager = CSD_MEDIA_KEYS_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit keypresses: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_keys_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++static void
+ csd_media_keys_manager_init (CsdMediaKeysManager *manager)
+ {
++        GError *error;
++        GDBusConnection *bus;
++
++        error = NULL;
+         manager->priv = CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
++
++        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++        if (bus == NULL) {
++                g_warning ("Failed to connect to system bus: %s",
++                           error->message);
++                g_error_free (error);
++                return;
++        }
++
++        manager->priv->logind_proxy =
++                g_dbus_proxy_new_sync (bus,
++                                       0,
++                                       NULL,
++                                       SYSTEMD_DBUS_NAME,
++                                       SYSTEMD_DBUS_PATH,
++                                       SYSTEMD_DBUS_INTERFACE,
++                                       NULL,
++                                       &error);
++
++        if (manager->priv->logind_proxy == NULL) {
++                g_warning ("Failed to connect to systemd: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
++        g_object_unref (bus);
++
++        g_debug ("Adding system inhibitors for power keys");
++        manager->priv->inhibit_keys_fd = -1;
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             g_variant_new ("(ssss)",
++                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
++                                                            g_get_user_name (),
++                                                            "Cinnamon handling keypresses",
++                                                            "block"),
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_done,
++                                             manager);
++
+ }
+ 
+ static void
+@@ -2375,6 +2465,8 @@ csd_media_keys_manager_finalize (GObject *object)
+ 
+         if (media_keys_manager->priv->start_idle_id != 0)
+                 g_source_remove (media_keys_manager->priv->start_idle_id);
++        if (media_keys_manager->priv->inhibit_keys_fd != -1)
++                close (media_keys_manager->priv->inhibit_keys_fd);
+ 
+         G_OBJECT_CLASS (csd_media_keys_manager_parent_class)->finalize (object);
+ }
+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
+index b54cb5b..b9c5429 100644
+--- a/plugins/power/csd-power-manager.c
++++ b/plugins/power/csd-power-manager.c
+@@ -32,6 +32,7 @@
+ #include <libupower-glib/upower.h>
+ #include <libnotify/notify.h>
+ #include <canberra-gtk.h>
++#include <gio/gunixfdlist.h>
+ 
+ #include <X11/extensions/dpms.h>
+ 
+@@ -79,6 +80,10 @@
+ #define CSD_POWER_MANAGER_CRITICAL_ALERT_TIMEOUT        5 /* seconds */
+ #define CSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
+ 
++#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
++#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
++#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
++
+ /* Keep this in sync with gnome-shell */
+ #define SCREENSAVER_FADE_TIME                           10 /* seconds */
+ 
+@@ -203,6 +208,13 @@ struct CsdPowerManagerPrivate
+         GtkStatusIcon           *status_icon;
+         guint                    xscreensaver_watchdog_timer_id;
+         gboolean                 is_virtual_machine;
++
++        /* systemd stuff */
++        GDBusProxy              *logind_proxy;
++        gint                     inhibit_lid_switch_fd;
++        gboolean                 inhibit_lid_switch_taken;
++        gint                     inhibit_suspend_fd;
++        gboolean                 inhibit_suspend_taken;
+ };
+ 
+ enum {
+@@ -3350,30 +3362,6 @@ lock_screensaver (CsdPowerManager *manager)
+         if (!do_lock)
+                 return;
+ 
+-            /* connect to the screensaver first */
+-            g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+-                                      G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+-                                      NULL,
+-                                      GS_DBUS_NAME,
+-                                      GS_DBUS_PATH,
+-                                      GS_DBUS_INTERFACE,
+-                                      NULL,
+-                                      sleep_cb_screensaver_proxy_ready_cb,
+-                                      manager);
+-}
+-
+-static void
+-upower_notify_sleep_cb (UpClient *client,
+-                        UpSleepKind sleep_kind,
+-                        CsdPowerManager *manager)
+-{
+-        gboolean do_lock;
+-
+-        do_lock = g_settings_get_boolean (manager->priv->settings,
+-                                          "lock-on-suspend");
+-        if (!do_lock)
+-                return;
+-
+         /* connect to the screensaver first */
+         g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                   G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+@@ -3384,46 +3372,6 @@ upower_notify_sleep_cb (UpClient *client,
+                                   NULL,
+                                   sleep_cb_screensaver_proxy_ready_cb,
+                                   manager);
+-
+-}
+-
+-static void
+-upower_notify_resume_cb (UpClient *client,
+-                         UpSleepKind sleep_kind,
+-                         CsdPowerManager *manager)
+-{
+-        gboolean ret;
+-        GError *error = NULL;
+-
+-        /* this displays the unlock dialogue so the user doesn't have
+-         * to move the mouse or press any key before the window comes up */
+-        if (manager->priv->screensaver_proxy != NULL) {
+-                g_dbus_proxy_call (manager->priv->screensaver_proxy,
+-                                   "SimulateUserActivity",
+-                                   NULL,
+-                                   G_DBUS_CALL_FLAGS_NONE,
+-                                   -1, NULL, NULL, NULL);
+-        }
+-
+-        if (manager->priv->screensaver_proxy != NULL) {
+-            g_object_unref (manager->priv->screensaver_proxy);
+-            manager->priv->screensaver_proxy = NULL;
+-        }
+-
+-        /* close existing notifications on resume, the system power
+-         * state is probably different now */
+-        notify_close_if_showing (manager->priv->notification_low);
+-        notify_close_if_showing (manager->priv->notification_discharging);
+-
+-        /* ensure we turn the panel back on after resume */
+-        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
+-                                             GNOME_RR_DPMS_ON,
+-                                             &error);
+-        if (!ret) {
+-                g_warning ("failed to turn the panel on after resume: %s",
+-                           error->message);
+-                g_error_free (error);
+-        }
+ }
+ 
+ static void
+@@ -3582,6 +3530,219 @@ disable_builtin_screensaver (gpointer unused)
+         return TRUE;
+ }
+ 
++static void
++inhibit_lid_switch_done (GObject      *source,
++                         GAsyncResult *result,
++                         gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit lid switch: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_lid_switch_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++static void
++inhibit_lid_switch (CsdPowerManager *manager)
++{
++        GVariant *params;
++
++        if (manager->priv->inhibit_lid_switch_taken) {
++                g_debug ("already inhibited lid-switch");
++                return;
++        }
++        g_debug ("Adding lid switch system inhibitor");
++        manager->priv->inhibit_lid_switch_taken = TRUE;
++
++        params = g_variant_new ("(ssss)",
++                                "handle-lid-switch",
++                                g_get_user_name (),
++                                "Multiple displays attached",
++                                "block");
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             params,
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_lid_switch_done,
++                                             manager);
++}
++
++static void
++inhibit_suspend_done (GObject      *source,
++                      GAsyncResult *result,
++                      gpointer      user_data)
++{
++        GDBusProxy *proxy = G_DBUS_PROXY (source);
++        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++        GError *error = NULL;
++        GVariant *res;
++        GUnixFDList *fd_list = NULL;
++        gint idx;
++
++        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
++        if (res == NULL) {
++                g_warning ("Unable to inhibit suspend: %s", error->message);
++                g_error_free (error);
++        } else {
++                g_variant_get (res, "(h)", &idx);
++                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
++                if (manager->priv->inhibit_suspend_fd == -1) {
++                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
++                        g_error_free (error);
++                }
++                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
++                g_object_unref (fd_list);
++                g_variant_unref (res);
++        }
++}
++
++/* We take a delay inhibitor here, which causes logind to send a
++ * PrepareToSleep signal, which gives us a chance to lock the screen
++ * and do some other preparations.
++ */
++static void
++inhibit_suspend (CsdPowerManager *manager)
++{
++        if (manager->priv->inhibit_suspend_taken) {
++                g_debug ("already inhibited lid-switch");
++                return;
++        }
++        g_debug ("Adding suspend delay inhibitor");
++        manager->priv->inhibit_suspend_taken = TRUE;
++        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
++                                             "Inhibit",
++                                             g_variant_new ("(ssss)",
++                                                            "sleep",
++                                                            g_get_user_name (),
++                                                            "Cinnamon needs to lock the screen",
++                                                            "delay"),
++                                             0,
++                                             G_MAXINT,
++                                             NULL,
++                                             NULL,
++                                             inhibit_suspend_done,
++                                             manager);
++}
++
++static void
++uninhibit_suspend (CsdPowerManager *manager)
++{
++        if (manager->priv->inhibit_suspend_fd == -1) {
++                g_debug ("no suspend delay inhibitor");
++                return;
++        }
++        g_debug ("Removing suspend delay inhibitor");
++        close (manager->priv->inhibit_suspend_fd);
++        manager->priv->inhibit_suspend_fd = -1;
++        manager->priv->inhibit_suspend_taken = FALSE;
++}
++
++static void
++handle_suspend_actions (CsdPowerManager *manager)
++{
++        gboolean do_lock;
++
++        do_lock = g_settings_get_boolean (manager->priv->settings,
++                                          "lock-on-suspend");
++        if (do_lock)
++                lock_screensaver (manager);
++
++        /* lift the delay inhibit, so logind can proceed */
++        uninhibit_suspend (manager);
++}
++
++static void
++handle_resume_actions (CsdPowerManager *manager)
++{
++        gboolean ret;
++        GError *error = NULL;
++
++        /* this displays the unlock dialogue so the user doesn't have
++         * to move the mouse or press any key before the window comes up */
++        g_dbus_connection_call (manager->priv->connection,
++                                GS_DBUS_NAME,
++                                GS_DBUS_PATH,
++                                GS_DBUS_INTERFACE,
++                                "SimulateUserActivity",
++                                NULL, NULL,
++                                G_DBUS_CALL_FLAGS_NONE, -1,
++                                NULL, NULL, NULL);
++
++        /* close existing notifications on resume, the system power
++         * state is probably different now */
++        notify_close_if_showing (manager->priv->notification_low);
++        notify_close_if_showing (manager->priv->notification_discharging);
++
++        /* ensure we turn the panel back on after resume */
++        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
++                                             GNOME_RR_DPMS_ON,
++                                             &error);
++        if (!ret) {
++                g_warning ("failed to turn the panel on after resume: %s",
++                           error->message);
++                g_error_free (error);
++        }
++
++        /* set up the delay again */
++        inhibit_suspend (manager);
++}
++
++static void
++upower_notify_sleep_cb (UpClient *client,
++                        UpSleepKind sleep_kind,
++                        CsdPowerManager *manager)
++{
++        handle_suspend_actions (manager);
++}
++
++static void
++upower_notify_resume_cb (UpClient *client,
++                         UpSleepKind sleep_kind,
++                         CsdPowerManager *manager)
++{
++        handle_resume_actions (manager);
++}
++
++static void
++logind_proxy_signal_cb (GDBusProxy  *proxy,
++                        const gchar *sender_name,
++                        const gchar *signal_name,
++                        GVariant    *parameters,
++                        gpointer     user_data)
++{
++        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
++        gboolean is_about_to_suspend;
++
++        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
++                return;
++        g_variant_get (parameters, "(b)", &is_about_to_suspend);
++        if (is_about_to_suspend) {
++                handle_suspend_actions (manager);
++        } else {
++                handle_resume_actions (manager);
++        }
++}
++
+ static gboolean
+ is_hardware_a_virtual_machine (void)
+ {
+@@ -3647,6 +3808,26 @@ csd_power_manager_start (CsdPowerManager *manager,
+         if (manager->priv->x11_screen == NULL)
+                 return FALSE;
+ 
++        /* Set up the logind proxy */
++        manager->priv->logind_proxy =
++                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++                                               0,
++                                               NULL,
++                                               SYSTEMD_DBUS_NAME,
++                                               SYSTEMD_DBUS_PATH,
++                                               SYSTEMD_DBUS_INTERFACE,
++                                               NULL,
++                                               error);
++        g_signal_connect (manager->priv->logind_proxy, "g-signal",
++                          G_CALLBACK (logind_proxy_signal_cb),
++                          manager);
++
++        /* Set up a delay inhibitor to be informed about suspend attempts */
++        inhibit_suspend (manager);
++
++        /* Disable logind's lid handling while g-s-d is active */
++        inhibit_lid_switch (manager);
++
+         /* track the active session */
+         manager->priv->session = cinnamon_settings_session_new ();
+         g_signal_connect (manager->priv->session, "notify::state",
+@@ -3856,6 +4037,22 @@ csd_power_manager_stop (CsdPowerManager *manager)
+                 manager->priv->up_client = NULL;
+         }
+ 
++        if (manager->priv->inhibit_lid_switch_fd != -1) {
++                close (manager->priv->inhibit_lid_switch_fd);
++                manager->priv->inhibit_lid_switch_fd = -1;
++                manager->priv->inhibit_lid_switch_taken = FALSE;
++        }
++        if (manager->priv->inhibit_suspend_fd != -1) {
++                close (manager->priv->inhibit_suspend_fd);
++                manager->priv->inhibit_suspend_fd = -1;
++                manager->priv->inhibit_suspend_taken = FALSE;
++        }
++
++        if (manager->priv->logind_proxy != NULL) {
++                g_object_unref (manager->priv->logind_proxy);
++                manager->priv->logind_proxy = NULL;
++        }
++
+         if (manager->priv->x11_screen != NULL) {
+                 g_object_unref (manager->priv->x11_screen);
+                 manager->priv->x11_screen = NULL;
+@@ -3928,6 +4125,8 @@ static void
+ csd_power_manager_init (CsdPowerManager *manager)
+ {
+         manager->priv = CSD_POWER_MANAGER_GET_PRIVATE (manager);
++        manager->priv->inhibit_lid_switch_fd = -1;
++        manager->priv->inhibit_suspend_fd = -1;
+ }
+ 
+ static void
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 888f62d0f06..99dfa78af18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9885,7 +9885,9 @@ let
 
   cinnamon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common;
+    inherit (gnome3) gnome_common libgnomekbd;
+
+    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
 
     cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
 

From 6fa1ad04da125d14e78634b01295dfd482f1f4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 12:26:29 +0200
Subject: [PATCH 0068/2033] nixos: extend documentation example for
 security.setuidOwners

Show that it is possible to set custom permission bits.
---
 nixos/modules/security/setuid-wrappers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 62df85816e5..78be1cc6cde 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -46,6 +46,7 @@ in
             group = "postdrop";
             setuid = false;
             setgid = true;
+            permissions = "u+rx,g+x,o+x";
           }
         ];
       description = ''

From 086d6c802b26c11ff7b01b4733de0e3b1b2c1c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Apr 2014 14:56:54 +0200
Subject: [PATCH 0069/2033] tk on darwin: another attempt to fix build

They add the -lfontconfig explicitly in macports, so hopefully it fixes it.
https://trac.macports.org/browser/trunk/dports/x11/tk/Portfile
---
 pkgs/development/libraries/tk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 2757a254385..fd3684d189c 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
   buildInputs = [ pkgconfig tcl libXft ]
     ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
 
+  NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
+
   inherit tcl;
 
   passthru = {

From 83044b788c564cb4736c2a743480d575354c91d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Sun, 13 Apr 2014 17:21:21 +0200
Subject: [PATCH 0070/2033] pytest: fix for py2.6 by adding argparse as an
 input

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e45f9825c3..028234a2aeb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1312,6 +1312,7 @@ rec {
     '';
 
     propagatedBuildInputs = [ py ]
+      ++ (optional isPy26 argparse)
       ++ stdenv.lib.optional
         pkgs.config.pythonPackages.pytest.selenium or false
         pythonPackages.selenium;

From e9a8c8417f9e3bb8eb6ff1f09528b72bf27bcc59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 9 Apr 2014 15:47:18 +0800
Subject: [PATCH 0071/2033] wildmidi: update to 0.3.6

---
 .../libraries/wildmidi/default.nix            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index eb55d1d60f4..5b3f9e03ac7 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, alsaLib, freepats }:
+{ stdenv, fetchurl, cmake, alsaLib, freepats }:
 
 stdenv.mkDerivation rec {
-  name = "wildmidi-0.2.3.5";
+  name = "wildmidi-0.3.6";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/wildmidi/wildmidi/${name}.tar.gz";
-    sha256 = "0m75753mn0rbwja180c2qk53s149wp4k35dijr2i6pa7sc12fr00";
+    url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz";
+    sha256 = "0y8r812f8h9jqlajwbzni7f23k8kfcp4wxz3jdq75z902bsmdzpf";
   };
 
-  # NOTE: $out in configureFlags, like this:
-  #   configureFlags = "--disable-werror --with-wildmidi-cfg=$out/etc/wildmidi.cfg";
-  # is not expanded, so use this workaround:
-  preConfigure = ''
-    configureFlags="--disable-werror --with-wildmidi-cfg=$out/etc/wildmidi.cfg"
-  '';
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ alsaLib ];
 
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace /etc/wildmidi $out/etc
+  '';
+
   postInstall = ''
     mkdir "$out"/etc
     echo "dir ${freepats}" > "$out"/etc/wildmidi.cfg

From 57a9eaab67801d4079aaa6cc9f6bcbc583d9d0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 13 Apr 2014 18:40:59 +0200
Subject: [PATCH 0072/2033] haskell: jailbreak pipes-network

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

diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
index b70527ecdad..cd62850c96d 100644
--- a/pkgs/development/libraries/haskell/pipes-network/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-network/default.nix
@@ -7,11 +7,11 @@ cabal.mkDerivation (self: {
   buildDepends = [
     network networkSimple pipes pipesSafe transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/k0001/pipes-network";
     description = "Use network sockets together with the pipes library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })

From e86e76e560a36bb65f4fcd4ad054c53a87824744 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 13 Apr 2014 20:49:26 +0400
Subject: [PATCH 0073/2033] Adding sysdig system call tracer for Linux

---
 pkgs/os-specific/linux/sysdig/default.nix     | 41 +++++++++++++++++++
 .../os-specific/linux/sysdig/default.upstream |  3 ++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/os-specific/linux/sysdig/default.nix
 create mode 100644 pkgs/os-specific/linux/sysdig/default.upstream

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
new file mode 100644
index 00000000000..6f5bb3869bb
--- /dev/null
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, cmake, luajit, kernel}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="sysdig";
+    version="0.1.79";
+    name="${baseName}-${version}";
+    hash="04ng4q859xxlpsnavx6rcgmq7frzgbzxm0p5zmdsmhz8m6hfvz7l";
+    url="https://github.com/draios/sysdig/archive/0.1.79.tar.gz";
+    sha256="04ng4q859xxlpsnavx6rcgmq7frzgbzxm0p5zmdsmhz8m6hfvz7l";
+  };
+  buildInputs = [
+    cmake luajit kernel
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+
+  cmakeFlags = [
+    "-DUSE_BUNDLED_LUAJIT=OFF"
+  ];
+  makeFlags = [
+    "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+  postInstall = ''
+    mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc/sysdig
+    cp driver/*.ko $out/lib/modules/${kernel.modDirVersion}/misc/sysdig
+  '';
+
+  meta = {
+    inherit (s) version;
+    description = ''A tracepoint-based system tracing tool for Linux'';
+    license = stdenv.lib.licenses.gpl2 ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream
new file mode 100644
index 00000000000..7071d982500
--- /dev/null
+++ b/pkgs/os-specific/linux/sysdig/default.upstream
@@ -0,0 +1,3 @@
+url https://github.com/draios/sysdig/releases
+ensure_choice
+version '.*/([0-9.]+)[.]tar[.].*' '\1'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99dfa78af18..514a3f09bfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7055,6 +7055,8 @@ let
 
     spl = callPackage ../os-specific/linux/spl/default.nix { };
 
+    sysdig = callPackage ../os-specific/linux/sysdig {};
+
     tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
 
     v86d = callPackage ../os-specific/linux/v86d { };

From 2b9c96878caa765889588fa9aa6d9849494a8036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 19:04:28 +0200
Subject: [PATCH 0074/2033] qmmp: update 0.7.5 -> 0.7.6

Changes since 0.7.5:
 * added libav 10 and ffmpeg 2.2 support;
 * fixed url parsing;
 * fixed freezing on playback resume;
 * fixed random freezing in the mplayer plugin;
 * fixed reset selection of tracks when calling context menu;
 * fixed multimedia keys support under win32.
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 122b7ed7867..a18ef97dd60 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -28,11 +28,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-0.7.5";
+  name = "qmmp-0.7.6";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0ryg4hns5zi9swn2q4vxjya3i4drdqfzycngwzd6fdl176lswrk0";
+    sha256 = "1hq08ii06lyfg516jrvxdfcjj509gvglvdlsr96aqi1fh8v4k5p9";
   };
 
   buildInputs =

From a555ee2412ab0369f653c40f004e9a624193ed06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 19:16:02 +0200
Subject: [PATCH 0075/2033] xmlrpc-c: bump 1.25.26 -> .27

Release 1.25.27 (released March 15, 2014):

  Fix bug: When serializing a very large floating point number, sender
  of an XML-RPC message adds some junk after the decimal point. With
  assertion checking enabled, it just crashes. Broken in 1.15 (June 2008).
---
 pkgs/development/libraries/xmlrpc-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index ef7a65599a9..9f578e4b9dd 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, curl }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.25.26";
+  name = "xmlrpc-c-1.25.27";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
-    sha256 = "1f82vsdkldhk1sfqyh6z0ylp5769x4fx3rnd2hw0c6fhx8swcmgj";
+    sha256 = "0g9m9n258lpbs42a2lagd4h7qim1g34gkaqyx8h50qrsk49ipspn";
   };
 
   buildInputs = [ curl ];

From 99afbf9e91a187086645a99043631dc74e57ad67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 19:39:32 +0200
Subject: [PATCH 0076/2033] sdcc: bump 3.3.0 -> 3.4.0

This new sdcc doesn't need older boost, so switch to nixpkgs default
version (currently 1.55).
---
 pkgs/development/compilers/sdcc/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index 1a51f087a28..fe293fbc4b8 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, bison, flex, boost, gputils ? null }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.0";
+  version = "3.4.0";
   name = "sdcc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
-    sha256 = "1pj4hssvq34vbryvxc2jpp2b14cgxp695ygwiax6b7l2kvr62gw7";
+    sha256 = "1yavxffqdfhdyabdza936xxh9wq4cfwa385g26gjapsdp5ighsng";
   };
 
   # TODO: remove this comment when gputils != null is tested
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 514a3f09bfb..d695253fbbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3153,9 +3153,7 @@ let
   scala_2_10 = callPackage ../development/compilers/scala { };
   scala = scala_2_10;
 
-  sdcc = callPackage ../development/compilers/sdcc {
-    boost = boost149; # sdcc 3.2.0 fails to build with boost 1.53
-  };
+  sdcc = callPackage ../development/compilers/sdcc { };
 
   smlnj = callPackage_i686 ../development/compilers/smlnj { };
 

From 788d9a13fb313aad40e75a903feb6351b7e9b28a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 13 Apr 2014 13:11:15 -0500
Subject: [PATCH 0077/2033] grsecurity: stable/vserver/testing updates

 - stable:  201404111812            -> 201404131252
 - vserver: vs2.3.2.16-201404111814 -> vs2.3.2.16-201404131253
 - testing: 201404111815            -> 201404131254

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 267e5657e6c..c28a3ad3400 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,23 +86,23 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "201404111812";
+      revision  = "201404131252";
       branch    = "stable";
-      sha256    = "1kp2f5g5jdl6r833fm5l2sgf7qsjddl2br7mislc37iqgwzjmhlx";
+      sha256    = "1yic257h2vy3175c34i54873lc93y0m57rw1d059wz1wxy9waiwl";
     };
 
   grsecurity_vserver = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "vs2.3.2.16-201404111814";
+      revision  = "vs2.3.2.16-201404131253";
       branch    = "vserver";
-      sha256    = "025kxk4j8kx7v5gmpafls67747l39ssfmzh0drg0hyg2yc0hjk2c";
+      sha256    = "0grhd9hbk952dwr91syi5pda1iccmcd8s0l3ki13689z8ns35f7k";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.13.9";
-      revision  = "201404111815";
+      revision  = "201404131254";
       branch    = "test";
-      sha256    = "1ikqvi0hv32m5rgxa8dpqr5v84hx7bnjfr6c1bvsfqikc818isvy";
+      sha256    = "1qslkmqz25rlag0dvv481ka7yylfhmpx7mhzbv9qdaynx5s59l3v";
     };
 
   grsec_fix_path =

From 694eb12f5f3ae862e671c9ae315ff68bc6b4386e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 20:18:38 +0200
Subject: [PATCH 0078/2033] apcupsd: bump 3.14.11 -> 3.14.12 (latest stable)

Release notes:
http://sourceforge.net/p/apcupsd/svn/HEAD/tree/tags/Release-3_14_12/ReleaseNotes
---
 pkgs/servers/apcupsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 6489d4dceff..8e25bdd87f0 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "apcupsd";
-  name = "${pname}-3.14.11";
+  name = "${pname}-3.14.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0wrb8vdc872f1x0gw21b5c81h0vxvsc7yks5qzbq2j3hkbl2vixd";
+    sha256 = "0h54ahj65nqrgmdcg81h1gp0zlxg9hwwhg8pmx6z9zcwn4y70kqv";
   };
 
   buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;

From 1d896c47c98516a727d25f90a11ea9910c2b293f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 20:28:43 +0200
Subject: [PATCH 0079/2033] apcupsd: add missing assert

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

diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix
index 8e25bdd87f0..ad8685d3d42 100644
--- a/pkgs/servers/apcupsd/default.nix
+++ b/pkgs/servers/apcupsd/default.nix
@@ -2,6 +2,8 @@
 , enableCgiScripts ? true, gd
 }:
 
+assert enableCgiScripts -> gd != null;
+
 stdenv.mkDerivation rec {
   pname = "apcupsd";
   name = "${pname}-3.14.12";

From 9878bb47a41db4e50d308a398ba6b743083269b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 21:11:49 +0200
Subject: [PATCH 0080/2033] buildbot{,slave}: bump 0.8.7p1 -> 0.8.8

Build and run tested.
---
 .../tools/build-managers/buildbot-slave/default.nix           | 4 ++--
 pkgs/development/tools/build-managers/buildbot/default.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
index b28c4d9296f..f21be7cc48c 100644
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, coreutils, twisted }:
 
 buildPythonPackage (rec {
-  name = "buildbot-slave-0.8.7p1";
+  name = "buildbot-slave-0.8.8";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://buildbot.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1p7a0srab6ifljh9vi25awvxfrxljj9s0hi1jipiiykyhjihgnxv";
+    sha256 = "1k1pk3y0rk6j01wc491jblryr4ajqg1ing9m3sjaw9s5sga34xcb";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index c872d67146b..2d7c63fdc7d 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -9,12 +9,12 @@
 assert enableDebugClient -> pygobject != null && pyGtkGlade != null;
 
 buildPythonPackage (rec {
-  name = "buildbot-0.8.7p1";
+  name = "buildbot-0.8.8";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://buildbot.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0xjpk8510fhryl1g4mczz319h62il8hw9rh1rzvsfmffgf43zvld";
+    sha256 = "1l1rsy82zv8582wypw00ac0k0wsr82ky74f3np4clbrxv3ry64sh";
   };
 
   patchPhase =

From d5775a5ef934cce8bdabb0878eeae307e919a81b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 21:23:08 +0200
Subject: [PATCH 0081/2033] duply: upgrade 1.6.0 -> 1.7.3

Changes since 1.6.0:

1.7.3 (3.4.2014)
- bugfix: test routines, gpg2 asked for passphrase although GPG_PW was set

1.7.2 (1.4.2014 "April,April")
- bugfix: debian Bug#743190 "duply no longer allows restoration without
   gpg passphrase in conf file"
   GPG_AGENT_INFO env var is now needed to trigger --use-agent
- bugfix: gpg keyenc test routines didn't work if GPG_PW was not set

1.7.1 (30.3.2014)
- bugfix: purge-* commands renamed to purgeFull, purgeIncr due to
   incompatibility with new minus batch separator

1.7.0 (20.3.2014)
- disabled gpg key id plausibility check, too many valid possibilities
- featreq 7 "Halt if precondition fails":
   added and(+), or(-) batch command(separator) support
- featreq 26 "pre/post script with shebang line":
   if a script is flagged executable it's executed in a subshell
   now as opposed to sourced to bash, which is the default
- bugfix: do not check if dpbx, swift credentials are set anymore
- bugfix: properly escape profile name, archdir if used as arguments
- add DUPL_PRECMD conf setting for use with e.g. trickle
---
 pkgs/tools/backup/duply/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix
index 91718fc02f7..73ef23059f4 100644
--- a/pkgs/tools/backup/duply/default.nix
+++ b/pkgs/tools/backup/duply/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "duply-1.6.0";
+  name = "duply-1.7.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.6.x/duply_1.6.0.tgz";
-    sha256 = "1i1yy4z6fcf3lq2k72cqcyqspm7pa1m949f8l9yscjm47bwp5g8f";
+    url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.7.x/duply_1.7.3.tgz";
+    sha256 = "1lq5gwz69l8g4ki4anvmjdngbs9nin124j1zb9kbcnqj0s5jkbp0";
   };
 
   buildInputs = [ txt2man makeWrapper ];

From 641ea31345eed2a0806ce984e4a6b79d0b7ee0f5 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <r.wobben@home.nl>
Date: Sun, 13 Apr 2014 21:46:48 +0200
Subject: [PATCH 0082/2033] new package: cinnamon-control-center

---
 .../cinnamon/cinnamon-control-center.nix      |   40 +
 pkgs/desktops/cinnamon/region.patch           | 5314 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    6 +-
 3 files changed, 5358 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-control-center.nix
 create mode 100644 pkgs/desktops/cinnamon/region.patch

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
new file mode 100644
index 00000000000..ab2f389b4f5
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
@@ -0,0 +1,40 @@
+ 
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
+gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, krb5,
+libxkbfile}:
+
+let
+  version = "2.0.9";
+in
+stdenv.mkDerivation {
+  name = "cinnamon-control-center-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/linuxmint/cinnamon-control-center/archive/${version}.tar.gz";
+    sha256 = "0kivqdgsf8w257j2ja6fap0dpvljcnb9gphr3knp7y6ma2d1gfv3";
+  };
+
+ configureFlags = "--enable-systemd --disable-update-mimedb" ;
+
+  patches = [ ./region.patch];
+
+  buildInputs = [
+    pkgconfig autoreconfHook
+    glib gettext gnome_common
+    intltool libxslt gtk3 cinnamon-desktop
+    libnotify gnome-menus libxml2 systemd
+    upower cinnamon-settings-daemon colord
+    polkit ibus libcanberra_gtk3 pulseaudio 
+    isocodes krb5 libxkbfile ];
+
+  preBuild = "patchShebangs ./scripts";
+  
+  meta = {
+    homepage = "http://cinnamon.linuxmint.com";
+    description = "The cinnamon session files" ;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.roelof ];
+  };
+}
+
diff --git a/pkgs/desktops/cinnamon/region.patch b/pkgs/desktops/cinnamon/region.patch
new file mode 100644
index 00000000000..7b8133e820e
--- /dev/null
+++ b/pkgs/desktops/cinnamon/region.patch
@@ -0,0 +1,5314 @@
+ 
+diff -uNrp a/configure.ac b/configure.ac
+--- a/configure.ac	2013-08-25 14:40:14.000000000 +0100
++++ b/configure.ac	2013-08-25 16:50:30.000000000 +0100
+@@ -82,6 +82,22 @@ else
+   SYSTEMD=
+ fi
+ 
++# IBus support
++IBUS_REQUIRED_VERSION=1.4.2
++
++#AC_ARG_ENABLE(ibus,
++#        AS_HELP_STRING([--disable-ibus],
++#                       [Disable IBus support]),
++#        enable_ibus=$enableval,
++#        enable_ibus=yes)
++enable_ibus=yes
++#if test "x$enable_ibus" = "xyes" ; then
++IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
++AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
++#else
++#        IBUS_MODULE=
++#fi
++
+ dnl ==============================================
+ dnl Check that we meet the  dependencies
+ dnl ==============================================
+@@ -119,9 +135,10 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
+-PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
++PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+-                  libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
++                  cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION
++                  $IBUS_MODULE)
+ PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
+                   libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
+diff -uNrp a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
+--- a/panels/region/cc-region-panel.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cc-region-panel.c	2013-09-21 13:24:15.329949897 +0100
+@@ -18,17 +18,18 @@
+  * Author: Sergey Udaltsov <svu@gnome.org>
+  *
+  */
+-#include "config.h"
++
+ #include "cc-region-panel.h"
++#include <config.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n-lib.h>
+ 
+-#include "cinnamon-region-panel-xkb.h"
++#include "cinnamon-region-panel-input.h"
+ #include "cinnamon-region-panel-lang.h"
+ #include "cinnamon-region-panel-formats.h"
+ #include "cinnamon-region-panel-system.h"
+ 
+-G_DEFINE_DYNAMIC_TYPE (CcRegionPanel, cc_region_panel, CC_TYPE_PANEL)
++CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)
+ 
+ #define REGION_PANEL_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_PANEL, CcRegionPanelPrivate))
+ 
+@@ -48,14 +49,6 @@ enum {
+ 	SYSTEM_PAGE
+ };
+ 
+-
+-static gboolean
+-languages_link_cb (GtkButton *button, gpointer user_data)
+-{
+-    g_spawn_command_line_async ("gnome-language-selector", NULL);
+-    return TRUE;
+-}
+-
+ static void
+ cc_region_panel_set_page (CcRegionPanel *panel,
+ 			  const char    *page)
+@@ -116,13 +109,22 @@ cc_region_panel_finalize (GObject * obje
+ 	G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
+ }
+ 
++static const char *
++cc_region_panel_get_help_uri (CcPanel *panel)
++{
++  return "help:gnome-help/prefs-language";
++}
++
+ static void
+ cc_region_panel_class_init (CcRegionPanelClass * klass)
+ {
+ 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
++	CcPanelClass * panel_class = CC_PANEL_CLASS (klass);
+ 
+ 	g_type_class_add_private (klass, sizeof (CcRegionPanelPrivate));
+ 
++	panel_class->get_help_uri = cc_region_panel_get_help_uri;
++
+ 	object_class->set_property = cc_region_panel_set_property;
+ 	object_class->finalize = cc_region_panel_finalize;
+ 
+@@ -130,22 +132,14 @@ cc_region_panel_class_init (CcRegionPane
+ }
+ 
+ static void
+-cc_region_panel_class_finalize (CcRegionPanelClass * klass)
+-{
+-}
+-
+-static void
+ cc_region_panel_init (CcRegionPanel * self)
+ {
+ 	CcRegionPanelPrivate *priv;
+ 	GtkWidget *prefs_widget;
+-	const char *desktop;
+ 	GError *error = NULL;
+ 
+ 	priv = self->priv = REGION_PANEL_PRIVATE (self);
+ 
+-	desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+-
+ 	priv->builder = gtk_builder_new ();
+     gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
+ 	gtk_builder_add_from_file (priv->builder,
+@@ -157,29 +151,16 @@ cc_region_panel_init (CcRegionPanel * se
+ 		return;
+ 	}
+ 
+-    prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
+-                                                         "region_notebook");
+-
++	prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
++							     "region_notebook");
+ 	gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
+ 
+ 	gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
+ 
+-    setup_xkb_tabs (priv->builder);
+-
+-    setup_language (priv->builder);
+-    setup_formats (priv->builder);
+-    setup_system (priv->builder);
+-
+-        /* set screen link */
+-
+-    GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
+-                                                            "get_languages_button"));
+-
+-    gtk_button_set_label (GTK_BUTTON (widget), _("Get more languages..."));
+-
+-    g_signal_connect (widget, "clicked",
+-                      G_CALLBACK (languages_link_cb),
+-                      self);
++        setup_input_tabs (priv->builder, self);
++	setup_language (priv->builder);
++	setup_formats (priv->builder);
++	setup_system (priv->builder);
+ }
+ 
+ void
+@@ -187,6 +168,7 @@ cc_region_panel_register (GIOModule * mo
+ {
+     bindtextdomain (GETTEXT_PACKAGE, "/usr/share/cinnamon/locale");
+     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++
+ 	cc_region_panel_register_type (G_TYPE_MODULE (module));
+ 	g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
+ 					CC_TYPE_REGION_PANEL,
+diff -uNrp a/panels/region/cinnamon-region-panel-formats.h b/panels/region/cinnamon-region-panel-formats.h
+--- a/panels/region/cinnamon-region-panel-formats.h	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-formats.h	2013-09-21 13:24:15.332949789 +0100
+@@ -19,8 +19,8 @@
+  * 02110-1335, USA.
+  */
+ 
+-#ifndef __GNOME_REGION_PANEL_FORMATS_H
+-#define __GNOME_REGION_PANEL_FORMATS_H
++#ifndef __CINNAMON_REGION_PANEL_FORMATS_H
++#define __CINNAMON_REGION_PANEL_FORMATS_H
+ 
+ #include <gtk/gtk.h>
+ 
+diff -uNrp a/panels/region/cinnamon-region-panel-input.c b/panels/region/cinnamon-region-panel-input.c
+--- a/panels/region/cinnamon-region-panel-input.c	1970-01-01 01:00:00.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-input.c	2013-09-21 13:24:15.338949572 +0100
+@@ -0,0 +1,1563 @@
++/*
++ * Copyright (C) 2011 Red Hat, Inc.
++ *
++ * Written by: Matthias Clasen <mclasen@redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++#include <config.h>
++
++#include <string.h>
++
++#include <glib.h>
++#include <glib/gi18n.h>
++#include <gio/gdesktopappinfo.h>
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libcinnamon-desktop/gnome-xkb-info.h>
++
++#ifdef HAVE_IBUS
++#include <ibus.h>
++#endif
++
++#include "gdm-languages.h"
++#include "cinnamon-region-panel-input.h"
++
++#define WID(s) GTK_WIDGET(gtk_builder_get_object (builder, s))
++
++#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
++
++#define KEY_CURRENT_INPUT_SOURCE "current"
++#define KEY_INPUT_SOURCES        "sources"
++
++#define INPUT_SOURCE_TYPE_XKB  "xkb"
++#define INPUT_SOURCE_TYPE_IBUS "ibus"
++
++enum {
++  NAME_COLUMN,
++  TYPE_COLUMN,
++  ID_COLUMN,
++  SETUP_COLUMN,
++  N_COLUMNS
++};
++
++static GSettings *input_sources_settings = NULL;
++static GnomeXkbInfo *xkb_info = NULL;
++static GtkWidget *input_chooser = NULL; /* weak pointer */
++
++#ifdef HAVE_IBUS
++static IBusBus *ibus = NULL;
++static GHashTable *ibus_engines = NULL;
++static GCancellable *ibus_cancellable = NULL;
++static guint shell_name_watch_id = 0;
++
++static const gchar *supported_ibus_engines[] = {
++  /* Simplified Chinese */
++  "pinyin",
++  "bopomofo",
++  "wubi",
++  "erbi",
++  /* Default in Fedora, where ibus-libpinyin replaces ibus-pinyin */
++  "libpinyin",
++  "libbopomofo",
++
++  /* Traditional Chinese */
++  /* https://bugzilla.gnome.org/show_bug.cgi?id=680840 */
++  "chewing",
++  "cangjie5",
++  "cangjie3",
++  "quick5",
++  "quick3",
++  "stroke5",
++
++  /* Japanese */
++  "anthy",
++  "mozc-jp",
++  "skk",
++
++  /* Korean */
++  "hangul",
++
++  /* Thai */
++  "m17n:th:kesmanee",
++  "m17n:th:pattachote",
++  "m17n:th:tis820",
++
++  /* Vietnamese */
++  "m17n:vi:tcvn",
++  "m17n:vi:telex",
++  "m17n:vi:viqr",
++  "m17n:vi:vni",
++  "Unikey",
++
++  /* Sinhala */
++  "m17n:si:wijesekera",
++  "m17n:si:phonetic-dynamic",
++  "m17n:si:trans",
++  "sayura",
++
++  /* Indic */
++  /* https://fedoraproject.org/wiki/I18N/Indic#Keyboard_Layouts */
++
++  /* Assamese */
++  "m17n:as:phonetic",
++  "m17n:as:inscript",
++  "m17n:as:itrans",
++
++  /* Bengali */
++  "m17n:bn:inscript",
++  "m17n:bn:itrans",
++  "m17n:bn:probhat",
++
++  /* Gujarati */
++  "m17n:gu:inscript",
++  "m17n:gu:itrans",
++  "m17n:gu:phonetic",
++
++  /* Hindi */
++  "m17n:hi:inscript",
++  "m17n:hi:itrans",
++  "m17n:hi:phonetic",
++  "m17n:hi:remington",
++  "m17n:hi:typewriter",
++  "m17n:hi:vedmata",
++
++  /* Kannada */
++  "m17n:kn:kgp",
++  "m17n:kn:inscript",
++  "m17n:kn:itrans",
++
++  /* Kashmiri */
++  "m17n:ks:inscript",
++
++  /* Maithili */
++  "m17n:mai:inscript",
++
++  /* Malayalam */
++  "m17n:ml:inscript",
++  "m17n:ml:itrans",
++  "m17n:ml:mozhi",
++  "m17n:ml:swanalekha",
++
++  /* Marathi */
++  "m17n:mr:inscript",
++  "m17n:mr:itrans",
++  "m17n:mr:phonetic",
++
++  /* Nepali */
++  "m17n:ne:rom",
++  "m17n:ne:trad",
++
++  /* Oriya */
++  "m17n:or:inscript",
++  "m17n:or:itrans",
++  "m17n:or:phonetic",
++
++  /* Punjabi */
++  "m17n:pa:inscript",
++  "m17n:pa:itrans",
++  "m17n:pa:phonetic",
++  "m17n:pa:jhelum",
++
++  /* Sanskrit */
++  "m17n:sa:harvard-kyoto",
++
++  /* Sindhi */
++  "m17n:sd:inscript",
++
++  /* Tamil */
++  "m17n:ta:tamil99",
++  "m17n:ta:inscript",
++  "m17n:ta:itrans",
++  "m17n:ta:phonetic",
++  "m17n:ta:lk-renganathan",
++  "m17n:ta:vutam",
++  "m17n:ta:typewriter",
++
++  /* Telugu */
++  "m17n:te:inscript",
++  "m17n:te:apple",
++  "m17n:te:pothana",
++  "m17n:te:rts",
++
++  /* Urdu */
++  "m17n:ur:phonetic",
++
++  /* Inscript2 - https://bugzilla.gnome.org/show_bug.cgi?id=684854 */
++  "m17n:as:inscript2",
++  "m17n:bn:inscript2",
++  "m17n:brx:inscript2-deva",
++  "m17n:doi:inscript2-deva",
++  "m17n:gu:inscript2",
++  "m17n:hi:inscript2",
++  "m17n:kn:inscript2",
++  "m17n:kok:inscript2-deva",
++  "m17n:mai:inscript2",
++  "m17n:ml:inscript2",
++  "m17n:mni:inscript2-beng",
++  "m17n:mni:inscript2-mtei",
++  "m17n:mr:inscript2",
++  "m17n:ne:inscript2-deva",
++  "m17n:or:inscript2",
++  "m17n:pa:inscript2-guru",
++  "m17n:sa:inscript2",
++  "m17n:sat:inscript2-deva",
++  "m17n:sat:inscript2-olck",
++  "m17n:sd:inscript2-deva",
++  "m17n:ta:inscript2",
++  "m17n:te:inscript2",
++
++  /* No corresponding XKB map available for the languages */
++
++  /* Chinese Yi */
++  "m17n:ii:phonetic",
++
++  /* Tai-Viet */
++  "m17n:tai:sonla",
++
++  /* Kazakh in Arabic script */
++  "m17n:kk:arabic",
++
++  /* Yiddish */
++  "m17n:yi:yivo",
++
++  /* Canadian Aboriginal languages */
++  "m17n:ath:phonetic",
++  "m17n:bla:phonetic",
++  "m17n:cr:western",
++  "m17n:iu:phonetic",
++  "m17n:nsk:phonetic",
++  "m17n:oj:phonetic",
++
++  /* Non-trivial engines, like transliteration-based instead of
++     keymap-based.  Confirmation needed that the engines below are
++     actually used by local language users. */
++
++  /* Tibetan */
++  "m17n:bo:ewts",
++  "m17n:bo:tcrc",
++  "m17n:bo:wylie",
++
++  /* Esperanto */
++  "m17n:eo:h-f",
++  "m17n:eo:h",
++  "m17n:eo:plena",
++  "m17n:eo:q",
++  "m17n:eo:vi",
++  "m17n:eo:x",
++
++  /* Amharic */
++  "m17n:am:sera",
++
++  /* Russian */
++  "m17n:ru:translit",
++
++  /* Classical Greek */
++  "m17n:grc:mizuochi",
++
++  /* Lao */
++  "m17n:lo:lrt",
++
++  /* Postfix modifier input methods */
++  "m17n:da:post",
++  "m17n:sv:post",
++  NULL
++};
++#endif  /* HAVE_IBUS */
++
++static void       populate_model             (GtkListStore  *store,
++                                              GtkListStore  *active_sources_store);
++static GtkWidget *input_chooser_new          (GtkWindow     *main_window,
++                                              GtkListStore  *active_sources);
++static gboolean   input_chooser_get_selected (GtkWidget     *chooser,
++                                              GtkTreeModel **model,
++                                              GtkTreeIter   *iter);
++static GtkTreeModel *tree_view_get_actual_model (GtkTreeView *tv);
++
++static gboolean
++strv_contains (const gchar * const *strv,
++               const gchar         *str)
++{
++  const gchar * const *p = strv;
++  for (p = strv; *p; p++)
++    if (g_strcmp0 (*p, str) == 0)
++      return TRUE;
++
++  return FALSE;
++}
++
++#ifdef HAVE_IBUS
++static void
++clear_ibus (void)
++{
++  if (shell_name_watch_id > 0)
++    {
++      g_bus_unwatch_name (shell_name_watch_id);
++      shell_name_watch_id = 0;
++    }
++  g_cancellable_cancel (ibus_cancellable);
++  g_clear_object (&ibus_cancellable);
++  g_clear_pointer (&ibus_engines, g_hash_table_destroy);
++  g_clear_object (&ibus);
++}
++
++static gchar *
++engine_get_display_name (IBusEngineDesc *engine_desc)
++{
++  const gchar *name;
++  const gchar *language_code;
++  const gchar *language;
++  gchar *display_name;
++
++  name = ibus_engine_desc_get_longname (engine_desc);
++  language_code = ibus_engine_desc_get_language (engine_desc);
++  language = ibus_get_language_name (language_code);
++
++  display_name = g_strdup_printf ("%s (%s)", language, name);
++
++  return display_name;
++}
++
++static GDesktopAppInfo *
++setup_app_info_for_id (const gchar *id)
++{
++  GDesktopAppInfo *app_info;
++  gchar *desktop_file_name;
++  gchar **strv;
++
++  strv = g_strsplit (id, ":", 2);
++  desktop_file_name = g_strdup_printf ("ibus-setup-%s.desktop", strv[0]);
++  g_strfreev (strv);
++
++  app_info = g_desktop_app_info_new (desktop_file_name);
++  g_free (desktop_file_name);
++
++  return app_info;
++}
++
++static void
++input_chooser_repopulate (GtkListStore *active_sources_store)
++{
++  GtkBuilder *builder;
++  GtkListStore *model;
++
++  if (!input_chooser)
++    return;
++
++  builder = g_object_get_data (G_OBJECT (input_chooser), "builder");
++  model = GTK_LIST_STORE (gtk_builder_get_object (builder, "input_source_model"));
++
++  gtk_list_store_clear (model);
++  populate_model (model, active_sources_store);
++}
++
++static void
++update_ibus_active_sources (GtkBuilder *builder)
++{
++  GtkTreeView *tv;
++  GtkTreeModel *model;
++  GtkTreeIter iter;
++  gchar *type, *id;
++  gboolean ret;
++
++  tv = GTK_TREE_VIEW (WID ("active_input_sources"));
++  model = tree_view_get_actual_model (tv);
++
++  ret = gtk_tree_model_get_iter_first (model, &iter);
++  while (ret)
++    {
++      gtk_tree_model_get (model, &iter,
++                          TYPE_COLUMN, &type,
++                          ID_COLUMN, &id,
++                          -1);
++
++      if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
++        {
++          IBusEngineDesc *engine_desc = NULL;
++          GDesktopAppInfo *app_info = NULL;
++          gchar *display_name = NULL;
++
++          engine_desc = g_hash_table_lookup (ibus_engines, id);
++          if (engine_desc)
++            {
++              display_name = engine_get_display_name (engine_desc);
++              app_info = setup_app_info_for_id (id);
++
++              gtk_list_store_set (GTK_LIST_STORE (model), &iter,
++                                  NAME_COLUMN, display_name,
++                                  SETUP_COLUMN, app_info,
++                                  -1);
++              g_free (display_name);
++              if (app_info)
++                g_object_unref (app_info);
++            }
++        }
++
++      g_free (type);
++      g_free (id);
++
++      ret = gtk_tree_model_iter_next (model, &iter);
++    }
++
++  input_chooser_repopulate (GTK_LIST_STORE (model));
++}
++
++static void
++fetch_ibus_engines_result (GObject      *object,
++                           GAsyncResult *result,
++                           GtkBuilder   *builder)
++{
++  gboolean show_all_sources;
++  GList *list, *l;
++  GError *error;
++
++  error = NULL;
++  list = ibus_bus_list_engines_async_finish (ibus, result, &error);
++
++  g_clear_object (&ibus_cancellable);
++
++  if (!list && error)
++    {
++      g_warning ("Couldn't finish IBus request: %s", error->message);
++      g_error_free (error);
++      return;
++    }
++
++  show_all_sources = g_settings_get_boolean (input_sources_settings, "show-all-sources");
++
++  /* Maps engine ids to engine description objects */
++  ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
++
++  for (l = list; l; l = l->next)
++    {
++      IBusEngineDesc *engine = l->data;
++      const gchar *engine_id = ibus_engine_desc_get_name (engine);
++
++      if (show_all_sources || strv_contains (supported_ibus_engines, engine_id))
++        g_hash_table_replace (ibus_engines, (gpointer)engine_id, engine);
++      else
++        g_object_unref (engine);
++    }
++  g_list_free (list);
++
++  update_ibus_active_sources (builder);
++}
++
++static void
++fetch_ibus_engines (GtkBuilder *builder)
++{
++  ibus_cancellable = g_cancellable_new ();
++
++  ibus_bus_list_engines_async (ibus,
++                               -1,
++                               ibus_cancellable,
++                               (GAsyncReadyCallback)fetch_ibus_engines_result,
++                               builder);
++
++  /* We've got everything we needed, don't want to be called again. */
++  g_signal_handlers_disconnect_by_func (ibus, fetch_ibus_engines, builder);
++}
++
++static void
++maybe_start_ibus (void)
++{
++  /* IBus doesn't export API in the session bus. The only thing
++   * we have there is a well known name which we can use as a
++   * sure-fire way to activate it. */
++  g_bus_unwatch_name (g_bus_watch_name (G_BUS_TYPE_SESSION,
++                                        IBUS_SERVICE_IBUS,
++                                        G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
++                                        NULL,
++                                        NULL,
++                                        NULL,
++                                        NULL));
++}
++
++static void
++on_shell_appeared (GDBusConnection *connection,
++                   const gchar     *name,
++                   const gchar     *name_owner,
++                   gpointer         data)
++{
++  GtkBuilder *builder = data;
++
++  if (!ibus)
++    {
++      ibus = ibus_bus_new ();
++      if (ibus_bus_is_connected (ibus))
++        fetch_ibus_engines (builder);
++      else
++        g_signal_connect_swapped (ibus, "connected",
++                                  G_CALLBACK (fetch_ibus_engines), builder);
++    }
++  maybe_start_ibus ();
++}
++#endif  /* HAVE_IBUS */
++
++static gboolean
++add_source_to_table (GtkTreeModel *model,
++                     GtkTreePath  *path,
++                     GtkTreeIter  *iter,
++                     gpointer      data)
++{
++  GHashTable *hash = data;
++  gchar *type;
++  gchar *id;
++
++  gtk_tree_model_get (model, iter,
++                      TYPE_COLUMN, &type,
++                      ID_COLUMN, &id,
++                      -1);
++
++  g_hash_table_add (hash, g_strconcat (type, id, NULL));
++
++  g_free (type);
++  g_free (id);
++
++  return FALSE;
++}
++
++static void
++populate_model (GtkListStore *store,
++                GtkListStore *active_sources_store)
++{
++  GHashTable *active_sources_table;
++  GtkTreeIter iter;
++  const gchar *name;
++  GList *sources, *tmp;
++  gchar *source_id = NULL;
++
++  active_sources_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
++
++  gtk_tree_model_foreach (GTK_TREE_MODEL (active_sources_store),
++                          add_source_to_table,
++                          active_sources_table);
++
++  sources = gnome_xkb_info_get_all_layouts (xkb_info);
++
++  for (tmp = sources; tmp; tmp = tmp->next)
++    {
++      g_free (source_id);
++      source_id = g_strconcat (INPUT_SOURCE_TYPE_XKB, tmp->data, NULL);
++
++      if (g_hash_table_contains (active_sources_table, source_id))
++        continue;
++
++      gnome_xkb_info_get_layout_info (xkb_info, (const gchar *)tmp->data,
++                                      &name, NULL, NULL, NULL);
++
++      gtk_list_store_append (store, &iter);
++      gtk_list_store_set (store, &iter,
++                          NAME_COLUMN, name,
++                          TYPE_COLUMN, INPUT_SOURCE_TYPE_XKB,
++                          ID_COLUMN, tmp->data,
++                          -1);
++    }
++  g_free (source_id);
++
++  g_list_free (sources);
++
++#ifdef HAVE_IBUS
++  if (ibus_engines)
++    {
++      gchar *display_name;
++
++      sources = g_hash_table_get_keys (ibus_engines);
++
++      source_id = NULL;
++      for (tmp = sources; tmp; tmp = tmp->next)
++        {
++          g_free (source_id);
++          source_id = g_strconcat (INPUT_SOURCE_TYPE_IBUS, tmp->data, NULL);
++
++          if (g_hash_table_contains (active_sources_table, source_id))
++            continue;
++
++          display_name = engine_get_display_name (g_hash_table_lookup (ibus_engines, tmp->data));
++
++          gtk_list_store_append (store, &iter);
++          gtk_list_store_set (store, &iter,
++                              NAME_COLUMN, display_name,
++                              TYPE_COLUMN, INPUT_SOURCE_TYPE_IBUS,
++                              ID_COLUMN, tmp->data,
++                              -1);
++          g_free (display_name);
++        }
++      g_free (source_id);
++
++      g_list_free (sources);
++    }
++#endif
++
++  g_hash_table_destroy (active_sources_table);
++}
++
++static void
++populate_with_active_sources (GtkListStore *store)
++{
++  GVariant *sources;
++  GVariantIter iter;
++  const gchar *name;
++  const gchar *type;
++  const gchar *id;
++  gchar *display_name;
++  GDesktopAppInfo *app_info;
++  GtkTreeIter tree_iter;
++
++  sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES);
++
++  g_variant_iter_init (&iter, sources);
++  while (g_variant_iter_next (&iter, "(&s&s)", &type, &id))
++    {
++      display_name = NULL;
++      app_info = NULL;
++
++      if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB))
++        {
++          gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
++          if (!name)
++            {
++              g_warning ("Couldn't find XKB input source '%s'", id);
++              continue;
++            }
++          display_name = g_strdup (name);
++        }
++      else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
++        {
++#ifdef HAVE_IBUS
++          IBusEngineDesc *engine_desc = NULL;
++
++          if (ibus_engines)
++            engine_desc = g_hash_table_lookup (ibus_engines, id);
++
++          if (engine_desc)
++            {
++              display_name = engine_get_display_name (engine_desc);
++              app_info = setup_app_info_for_id (id);
++            }
++#else
++          g_warning ("IBus input source type specified but IBus support was not compiled");
++          continue;
++#endif
++        }
++      else
++        {
++          g_warning ("Unknown input source type '%s'", type);
++          continue;
++        }
++
++      gtk_list_store_append (store, &tree_iter);
++      gtk_list_store_set (store, &tree_iter,
++                          NAME_COLUMN, display_name,
++                          TYPE_COLUMN, type,
++                          ID_COLUMN, id,
++                          SETUP_COLUMN, app_info,
++                          -1);
++      g_free (display_name);
++      if (app_info)
++        g_object_unref (app_info);
++    }
++
++  g_variant_unref (sources);
++}
++
++static void
++update_configuration (GtkTreeModel *model)
++{
++  GtkTreeIter iter;
++  gchar *type;
++  gchar *id;
++  GVariantBuilder builder;
++  GVariant *old_sources;
++  const gchar *old_current_type;
++  const gchar *old_current_id;
++  guint old_current_index;
++  guint old_n_sources;
++  guint index;
++
++  old_sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES);
++  old_current_index = g_settings_get_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
++  old_n_sources = g_variant_n_children (old_sources);
++
++  if (old_n_sources > 0 && old_current_index < old_n_sources)
++    {
++      g_variant_get_child (old_sources,
++                           old_current_index,
++                           "(&s&s)",
++                           &old_current_type,
++                           &old_current_id);
++    }
++  else
++    {
++      old_current_type = "";
++      old_current_id = "";
++    }
++
++  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
++  index = 0;
++  gtk_tree_model_get_iter_first (model, &iter);
++  do
++    {
++      gtk_tree_model_get (model, &iter,
++                          TYPE_COLUMN, &type,
++                          ID_COLUMN, &id,
++                          -1);
++      if (index != old_current_index &&
++          g_str_equal (type, old_current_type) &&
++          g_str_equal (id, old_current_id))
++        {
++          g_settings_set_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE, index);
++        }
++      g_variant_builder_add (&builder, "(ss)", type, id);
++      g_free (type);
++      g_free (id);
++      index += 1;
++    }
++  while (gtk_tree_model_iter_next (model, &iter));
++
++  g_settings_set_value (input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
++  g_settings_apply (input_sources_settings);
++
++  g_variant_unref (old_sources);
++}
++
++static gboolean
++get_selected_iter (GtkBuilder    *builder,
++                   GtkTreeModel **model,
++                   GtkTreeIter   *iter)
++{
++  GtkTreeSelection *selection;
++
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("active_input_sources")));
++
++  return gtk_tree_selection_get_selected (selection, model, iter);
++}
++
++static gint
++idx_from_model_iter (GtkTreeModel *model,
++                     GtkTreeIter  *iter)
++{
++  GtkTreePath *path;
++  gint idx;
++
++  path = gtk_tree_model_get_path (model, iter);
++  if (path == NULL)
++    return -1;
++
++  idx = gtk_tree_path_get_indices (path)[0];
++  gtk_tree_path_free (path);
++
++  return idx;
++}
++
++static void
++update_button_sensitivity (GtkBuilder *builder)
++{
++  GtkWidget *remove_button;
++  GtkWidget *up_button;
++  GtkWidget *down_button;
++  GtkWidget *show_button;
++  GtkWidget *settings_button;
++  GtkTreeView *tv;
++  GtkTreeModel *model;
++  GtkTreeIter iter;
++  gint n_active;
++  gint index;
++  gboolean settings_sensitive;
++  GDesktopAppInfo *app_info;
++
++  remove_button = WID("input_source_remove");
++  show_button = WID("input_source_show");
++  up_button = WID("input_source_move_up");
++  down_button = WID("input_source_move_down");
++  settings_button = WID("input_source_settings");
++
++  tv = GTK_TREE_VIEW (WID ("active_input_sources"));
++  n_active = gtk_tree_model_iter_n_children (gtk_tree_view_get_model (tv), NULL);
++
++  if (get_selected_iter (builder, &model, &iter))
++    {
++      index = idx_from_model_iter (model, &iter);
++      gtk_tree_model_get (model, &iter, SETUP_COLUMN, &app_info, -1);
++    }
++  else
++    {
++      index = -1;
++      app_info = NULL;
++    }
++
++  settings_sensitive = (index >= 0 && app_info != NULL);
++
++  if (app_info)
++    g_object_unref (app_info);
++
++  gtk_widget_set_sensitive (remove_button, index >= 0 && n_active > 1);
++  gtk_widget_set_sensitive (show_button, index >= 0);
++  gtk_widget_set_sensitive (up_button, index > 0);
++  gtk_widget_set_sensitive (down_button, index >= 0 && index < n_active - 1);
++  gtk_widget_set_sensitive (settings_button, settings_sensitive);
++}
++
++static void
++set_selected_path (GtkBuilder  *builder,
++                   GtkTreePath *path)
++{
++  GtkTreeSelection *selection;
++
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("active_input_sources")));
++
++  gtk_tree_selection_select_path (selection, path);
++}
++
++static GtkTreeModel *
++tree_view_get_actual_model (GtkTreeView *tv)
++{
++  GtkTreeModel *filtered_store;
++
++  filtered_store = gtk_tree_view_get_model (tv);
++
++  return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filtered_store));
++}
++
++static void
++chooser_response (GtkWidget *chooser, gint response_id, gpointer data)
++{
++  GtkBuilder *builder = data;
++
++  if (response_id == GTK_RESPONSE_OK)
++    {
++      GtkTreeModel *model;
++      GtkTreeIter iter;
++
++      if (input_chooser_get_selected (chooser, &model, &iter))
++        {
++          GtkTreeView *tv;
++          GtkListStore *child_model;
++          GtkTreeIter child_iter, filter_iter;
++          gchar *name;
++          gchar *type;
++          gchar *id;
++          GDesktopAppInfo *app_info = NULL;
++
++          gtk_tree_model_get (model, &iter,
++                              NAME_COLUMN, &name,
++                              TYPE_COLUMN, &type,
++                              ID_COLUMN, &id,
++                              -1);
++
++#ifdef HAVE_IBUS
++          if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
++            app_info = setup_app_info_for_id (id);
++#endif
++
++          tv = GTK_TREE_VIEW (WID ("active_input_sources"));
++          child_model = GTK_LIST_STORE (tree_view_get_actual_model (tv));
++
++          gtk_list_store_append (child_model, &child_iter);
++
++          gtk_list_store_set (child_model, &child_iter,
++                              NAME_COLUMN, name,
++                              TYPE_COLUMN, type,
++                              ID_COLUMN, id,
++                              SETUP_COLUMN, app_info,
++                              -1);
++          g_free (name);
++          g_free (type);
++          g_free (id);
++          if (app_info)
++            g_object_unref (app_info);
++
++          gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (tv)),
++                                                            &filter_iter,
++                                                            &child_iter);
++          gtk_tree_selection_select_iter (gtk_tree_view_get_selection (tv), &filter_iter);
++
++          update_button_sensitivity (builder);
++          update_configuration (GTK_TREE_MODEL (child_model));
++        }
++      else
++        {
++          g_debug ("nothing selected, nothing added");
++        }
++    }
++
++  gtk_widget_destroy (GTK_WIDGET (chooser));
++}
++
++static void
++add_input (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkWidget *chooser;
++  GtkWidget *toplevel;
++  GtkWidget *treeview;
++  GtkListStore *active_sources;
++
++  g_debug ("add an input source");
++
++  toplevel = gtk_widget_get_toplevel (WID ("region_notebook"));
++  treeview = WID ("active_input_sources");
++  active_sources = GTK_LIST_STORE (tree_view_get_actual_model (GTK_TREE_VIEW (treeview)));
++
++  chooser = input_chooser_new (GTK_WINDOW (toplevel), active_sources);
++  g_signal_connect (chooser, "response",
++                    G_CALLBACK (chooser_response), builder);
++}
++
++static void
++remove_selected_input (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkTreeModel *model;
++  GtkTreeModel *child_model;
++  GtkTreeIter iter;
++  GtkTreeIter child_iter;
++  GtkTreePath *path;
++
++  g_debug ("remove selected input source");
++
++  if (get_selected_iter (builder, &model, &iter) == FALSE)
++    return;
++
++  path = gtk_tree_model_get_path (model, &iter);
++
++  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
++  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
++                                                    &child_iter,
++                                                    &iter);
++  gtk_list_store_remove (GTK_LIST_STORE (child_model), &child_iter);
++
++  if (!gtk_tree_model_get_iter (model, &iter, path))
++    gtk_tree_path_prev (path);
++
++  set_selected_path (builder, path);
++
++  gtk_tree_path_free (path);
++
++  update_button_sensitivity (builder);
++  update_configuration (child_model);
++}
++
++static void
++move_selected_input_up (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkTreeModel *model;
++  GtkTreeModel *child_model;
++  GtkTreeIter iter, prev;
++  GtkTreeIter child_iter, child_prev;
++  GtkTreePath *path;
++
++  g_debug ("move selected input source up");
++
++  if (!get_selected_iter (builder, &model, &iter))
++    return;
++
++  prev = iter;
++  if (!gtk_tree_model_iter_previous (model, &prev))
++    return;
++
++  path = gtk_tree_model_get_path (model, &prev);
++
++  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
++  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
++                                                    &child_iter,
++                                                    &iter);
++  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
++                                                    &child_prev,
++                                                    &prev);
++  gtk_list_store_swap (GTK_LIST_STORE (child_model), &child_iter, &child_prev);
++
++  set_selected_path (builder, path);
++  gtk_tree_path_free (path);
++
++  update_button_sensitivity (builder);
++  update_configuration (child_model);
++}
++
++static void
++move_selected_input_down (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkTreeModel *model;
++  GtkTreeModel *child_model;
++  GtkTreeIter iter, next;
++  GtkTreeIter child_iter, child_next;
++  GtkTreePath *path;
++
++  g_debug ("move selected input source down");
++
++  if (!get_selected_iter (builder, &model, &iter))
++    return;
++
++  next = iter;
++  if (!gtk_tree_model_iter_next (model, &next))
++    return;
++
++  path = gtk_tree_model_get_path (model, &next);
++
++  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
++  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
++                                                    &child_iter,
++                                                    &iter);
++  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
++                                                    &child_next,
++                                                    &next);
++  gtk_list_store_swap (GTK_LIST_STORE (child_model), &child_iter, &child_next);
++
++  set_selected_path (builder, path);
++  gtk_tree_path_free (path);
++
++  update_button_sensitivity (builder);
++  update_configuration (child_model);
++}
++
++static void
++show_selected_layout (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkTreeModel *model;
++  GtkTreeIter iter;
++  gchar *type;
++  gchar *id;
++  gchar *kbd_viewer_args;
++  const gchar *xkb_layout;
++  const gchar *xkb_variant;
++
++  g_debug ("show selected layout");
++
++  if (!get_selected_iter (builder, &model, &iter))
++    return;
++
++  gtk_tree_model_get (model, &iter,
++                      TYPE_COLUMN, &type,
++                      ID_COLUMN, &id,
++                      -1);
++
++  if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB))
++    {
++      gnome_xkb_info_get_layout_info (xkb_info, id, NULL, NULL, &xkb_layout, &xkb_variant);
++
++      if (!xkb_layout || !xkb_layout[0])
++        {
++          g_warning ("Couldn't find XKB input source '%s'", id);
++          goto exit;
++        }
++    }
++  else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
++    {
++#ifdef HAVE_IBUS
++      IBusEngineDesc *engine_desc = NULL;
++
++      if (ibus_engines)
++        engine_desc = g_hash_table_lookup (ibus_engines, id);
++
++      if (engine_desc)
++        {
++          xkb_layout = ibus_engine_desc_get_layout (engine_desc);
++          xkb_variant = "";
++        }
++      else
++        {
++          g_warning ("Couldn't find IBus input source '%s'", id);
++          goto exit;
++        }
++#else
++      g_warning ("IBus input source type specified but IBus support was not compiled");
++      goto exit;
++#endif
++    }
++  else
++    {
++      g_warning ("Unknown input source type '%s'", type);
++      goto exit;
++    }
++
++  if (xkb_variant[0])
++    kbd_viewer_args = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
++                                       xkb_layout, xkb_variant);
++  else
++    kbd_viewer_args = g_strdup_printf ("gkbd-keyboard-display -l %s",
++                                       xkb_layout);
++
++  g_spawn_command_line_async (kbd_viewer_args, NULL);
++
++  g_free (kbd_viewer_args);
++ exit:
++  g_free (type);
++  g_free (id);
++}
++
++static void
++show_selected_settings (GtkButton *button, gpointer data)
++{
++  GtkBuilder *builder = data;
++  GtkTreeModel *model;
++  GtkTreeIter iter;
++  GdkAppLaunchContext *ctx;
++  GDesktopAppInfo *app_info;
++  gchar *id;
++  GError *error = NULL;
++
++  g_debug ("show selected layout");
++
++  if (!get_selected_iter (builder, &model, &iter))
++    return;
++
++  gtk_tree_model_get (model, &iter, SETUP_COLUMN, &app_info, -1);
++
++  if (!app_info)
++    return;
++
++  ctx = gdk_display_get_app_launch_context (gdk_display_get_default ());
++  gdk_app_launch_context_set_timestamp (ctx, gtk_get_current_event_time ());
++
++  gtk_tree_model_get (model, &iter, ID_COLUMN, &id, -1);
++  g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (ctx),
++                               "IBUS_ENGINE_NAME",
++                               id);
++  g_free (id);
++
++  if (!g_app_info_launch (G_APP_INFO (app_info), NULL, G_APP_LAUNCH_CONTEXT (ctx), &error))
++    {
++      g_warning ("Failed to launch input source setup: %s", error->message);
++      g_error_free (error);
++    }
++
++  g_object_unref (ctx);
++  g_object_unref (app_info);
++}
++
++static gboolean
++go_to_shortcuts (GtkLinkButton *button,
++                 CcRegionPanel *panel)
++{
++    gchar *argv[3];
++    argv[0] = "cinnamon-settings";
++    argv[1] = "keyboard";
++    argv[3] = NULL;
++    g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
++    return TRUE;
++}
++
++static void
++input_sources_changed (GSettings  *settings,
++                       gchar      *key,
++                       GtkBuilder *builder)
++{
++  GtkWidget *treeview;
++  GtkTreeModel *store;
++  GtkTreePath *path;
++  GtkTreeIter iter;
++  GtkTreeModel *model;
++
++  treeview = WID("active_input_sources");
++  store = tree_view_get_actual_model (GTK_TREE_VIEW (treeview));
++
++  if (get_selected_iter (builder, &model, &iter))
++    path = gtk_tree_model_get_path (model, &iter);
++  else
++    path = NULL;
++
++  gtk_list_store_clear (GTK_LIST_STORE (store));
++  populate_with_active_sources (GTK_LIST_STORE (store));
++
++  if (path)
++    {
++      set_selected_path (builder, path);
++      gtk_tree_path_free (path);
++    }
++}
++
++static void
++update_shortcut_label (GtkWidget  *widget,
++		       const char *value)
++{
++  char *text;
++  guint accel_key, *keycode;
++  GdkModifierType mods;
++
++  if (value == NULL || *value == '\0')
++    {
++      gtk_label_set_text (GTK_LABEL (widget), "\342\200\224");
++      return;
++    }
++  gtk_accelerator_parse_with_keycode (value, &accel_key, &keycode, &mods);
++  if (accel_key == 0 && keycode == NULL && mods == 0)
++    {
++      gtk_label_set_text (GTK_LABEL (widget), "\342\200\224");
++      g_warning ("Failed to parse keyboard shortcut: '%s'", value);
++      return;
++    }
++
++  text = gtk_accelerator_get_label_with_keycode (gtk_widget_get_display (widget), accel_key, *keycode, mods);
++  g_free (keycode);
++  gtk_label_set_text (GTK_LABEL (widget), text);
++  g_free (text);
++}
++
++static void
++update_shortcuts (GtkBuilder *builder)
++{
++  char *previous, *next;
++  GSettings *settings;
++
++  settings = g_settings_new ("org.cinnamon.settings-daemon.plugins.media-keys");
++
++  previous = g_settings_get_string (settings, "switch-input-source-backward");
++  next = g_settings_get_string (settings, "switch-input-source");
++
++  update_shortcut_label (WID ("prev-source-shortcut-label"), previous);
++  update_shortcut_label (WID ("next-source-shortcut-label"), next);
++
++  g_free (previous);
++  g_free (next);
++}
++
++static gboolean
++active_sources_visible_func (GtkTreeModel *model,
++                             GtkTreeIter  *iter,
++                             gpointer      data)
++{
++  gchar *display_name;
++
++  gtk_tree_model_get (model, iter, NAME_COLUMN, &display_name, -1);
++
++  if (!display_name)
++    return FALSE;
++
++  g_free (display_name);
++
++  return TRUE;
++}
++
++void
++setup_input_tabs (GtkBuilder    *builder,
++                  CcRegionPanel *panel)
++{
++  GtkWidget *treeview;
++  GtkTreeViewColumn *column;
++  GtkCellRenderer *cell;
++  GtkListStore *store;
++  GtkTreeModel *filtered_store;
++  GtkTreeSelection *selection;
++
++  /* set up the list of active inputs */
++  treeview = WID("active_input_sources");
++  column = gtk_tree_view_column_new ();
++  cell = gtk_cell_renderer_text_new ();
++  gtk_tree_view_column_pack_start (column, cell, TRUE);
++  gtk_tree_view_column_add_attribute (column, cell, "text", NAME_COLUMN);
++  gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
++
++  store = gtk_list_store_new (N_COLUMNS,
++                              G_TYPE_STRING,
++                              G_TYPE_STRING,
++                              G_TYPE_STRING,
++                              G_TYPE_DESKTOP_APP_INFO);
++
++  gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
++
++  input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
++  g_settings_delay (input_sources_settings);
++  g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) g_object_unref, input_sources_settings);
++
++  if (!xkb_info)
++    xkb_info = gnome_xkb_info_new ();
++
++#ifdef HAVE_IBUS
++  ibus_init ();
++  shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
++                                          "org.Cinnamon",
++                                          G_BUS_NAME_WATCHER_FLAGS_NONE,
++                                          on_shell_appeared,
++                                          NULL,
++                                          builder,
++                                          NULL);
++  g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) clear_ibus, NULL);
++#endif
++
++  populate_with_active_sources (store);
++
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
++  g_signal_connect_swapped (selection, "changed",
++                            G_CALLBACK (update_button_sensitivity), builder);
++
++  /* Some input source types might have their info loaded
++   * asynchronously. In that case we don't want to show them
++   * immediately so we use a filter model on top of the real model
++   * which mirrors the GSettings key. */
++  filtered_store = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
++  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filtered_store),
++                                          active_sources_visible_func,
++                                          NULL,
++                                          NULL);
++  gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), filtered_store);
++
++  /* set up the buttons */
++  g_signal_connect (WID("input_source_add"), "clicked",
++                    G_CALLBACK (add_input), builder);
++  g_signal_connect (WID("input_source_remove"), "clicked",
++                    G_CALLBACK (remove_selected_input), builder);
++  g_signal_connect (WID("input_source_move_up"), "clicked",
++                    G_CALLBACK (move_selected_input_up), builder);
++  g_signal_connect (WID("input_source_move_down"), "clicked",
++                    G_CALLBACK (move_selected_input_down), builder);
++  g_signal_connect (WID("input_source_show"), "clicked",
++                    G_CALLBACK (show_selected_layout), builder);
++  g_signal_connect (WID("input_source_settings"), "clicked",
++                    G_CALLBACK (show_selected_settings), builder);
++
++  /* use an em dash is no shortcut */
++  update_shortcuts (builder);
++
++  g_signal_connect (WID("jump-to-shortcuts"), "activate-link",
++                    G_CALLBACK (go_to_shortcuts), panel);
++
++  g_signal_connect (G_OBJECT (input_sources_settings),
++                    "changed::" KEY_INPUT_SOURCES,
++                    G_CALLBACK (input_sources_changed),
++                    builder);
++}
++
++static void
++filter_clear (GtkEntry             *entry,
++              GtkEntryIconPosition  icon_pos,
++              GdkEvent             *event,
++              gpointer              user_data)
++{
++  gtk_entry_set_text (entry, "");
++}
++
++static gchar **search_pattern_list;
++
++static void
++filter_changed (GtkBuilder *builder)
++{
++  GtkTreeModelFilter *filtered_model;
++  GtkTreeView *tree_view;
++  GtkTreeSelection *selection;
++  GtkTreeIter selected_iter;
++  GtkWidget *filter_entry;
++  const gchar *pattern;
++  gchar *upattern;
++
++  filter_entry = WID ("input_source_filter");
++  pattern = gtk_entry_get_text (GTK_ENTRY (filter_entry));
++  upattern = g_utf8_strup (pattern, -1);
++  if (!g_strcmp0 (pattern, ""))
++    g_object_set (G_OBJECT (filter_entry),
++                  "secondary-icon-name", "edit-find-symbolic",
++                  "secondary-icon-activatable", FALSE,
++                  "secondary-icon-sensitive", FALSE,
++                  NULL);
++  else
++    g_object_set (G_OBJECT (filter_entry),
++                  "secondary-icon-name", "edit-clear-symbolic",
++                  "secondary-icon-activatable", TRUE,
++                  "secondary-icon-sensitive", TRUE,
++                  NULL);
++
++  if (search_pattern_list != NULL)
++    g_strfreev (search_pattern_list);
++
++  search_pattern_list = g_strsplit (upattern, " ", -1);
++  g_free (upattern);
++
++  filtered_model = GTK_TREE_MODEL_FILTER (gtk_builder_get_object (builder, "filtered_input_source_model"));
++  gtk_tree_model_filter_refilter (filtered_model);
++
++  tree_view = GTK_TREE_VIEW (WID ("filtered_input_source_list"));
++  selection = gtk_tree_view_get_selection (tree_view);
++  if (gtk_tree_selection_get_selected (selection, NULL, &selected_iter))
++    {
++      GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (filtered_model),
++                                                   &selected_iter);
++      gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 0.5, 0.5);
++      gtk_tree_path_free (path);
++    }
++  else
++    {
++      GtkTreeIter iter;
++      if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filtered_model), &iter))
++        gtk_tree_selection_select_iter (selection, &iter);
++    }
++}
++
++static void
++selection_changed (GtkTreeSelection *selection,
++                   GtkBuilder       *builder)
++{
++  gtk_widget_set_sensitive (WID ("ok-button"),
++                            gtk_tree_selection_get_selected (selection, NULL, NULL));
++}
++
++static void
++row_activated (GtkTreeView       *tree_view,
++               GtkTreePath       *path,
++               GtkTreeViewColumn *column,
++               GtkBuilder        *builder)
++{
++  GtkWidget *add_button;
++  GtkWidget *dialog;
++
++  add_button = WID ("ok-button");
++  dialog = WID ("input_source_chooser");
++  if (gtk_widget_is_sensitive (add_button))
++    gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
++}
++
++static void
++entry_activated (GtkBuilder *builder,
++                 gpointer    data)
++{
++  row_activated (NULL, NULL, NULL, builder);
++}
++
++static gboolean
++filter_func (GtkTreeModel *model,
++             GtkTreeIter  *iter,
++             gpointer      data)
++{
++  gchar *name = NULL;
++  gchar **pattern;
++  gboolean rv = TRUE;
++
++  if (search_pattern_list == NULL || search_pattern_list[0] == NULL)
++    return TRUE;
++
++  gtk_tree_model_get (model, iter,
++                      NAME_COLUMN, &name,
++                      -1);
++
++  pattern = search_pattern_list;
++  do {
++    gboolean is_pattern_found = FALSE;
++    gchar *udesc = g_utf8_strup (name, -1);
++    if (udesc != NULL && g_strstr_len (udesc, -1, *pattern))
++      {
++        is_pattern_found = TRUE;
++      }
++    g_free (udesc);
++
++    if (!is_pattern_found)
++      {
++        rv = FALSE;
++        break;
++      }
++
++  } while (*++pattern != NULL);
++
++  g_free (name);
++
++  return rv;
++}
++
++static GtkWidget *
++input_chooser_new (GtkWindow    *main_window,
++                   GtkListStore *active_sources)
++{
++  GtkBuilder *builder;
++  GtkWidget *chooser;
++  GtkWidget *filtered_list;
++  GtkWidget *filter_entry;
++  GtkTreeViewColumn *visible_column;
++  GtkTreeSelection *selection;
++  GtkListStore *model;
++  GtkTreeModelFilter *filtered_model;
++  GtkTreeIter iter;
++
++  builder = gtk_builder_new ();
++  gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
++  gtk_builder_add_from_file (builder,
++                             CINNAMONCC_UI_DIR "/cinnamon-region-panel-input-chooser.ui",
++                             NULL);
++  chooser = WID ("input_source_chooser");
++  input_chooser = chooser;
++  g_object_add_weak_pointer (G_OBJECT (chooser), (gpointer *) &input_chooser);
++  g_object_set_data_full (G_OBJECT (chooser), "builder", builder, g_object_unref);
++
++  filtered_list = WID ("filtered_input_source_list");
++  filter_entry = WID ("input_source_filter");
++
++  g_object_set_data (G_OBJECT (chooser),
++                     "filtered_input_source_list", filtered_list);
++  visible_column =
++    gtk_tree_view_column_new_with_attributes ("Input Sources",
++                                              gtk_cell_renderer_text_new (),
++                                              "text", NAME_COLUMN,
++                                              NULL);
++
++  gtk_window_set_transient_for (GTK_WINDOW (chooser), main_window);
++
++  gtk_tree_view_append_column (GTK_TREE_VIEW (filtered_list),
++                               visible_column);
++  /* We handle searching ourselves, thank you. */
++  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (filtered_list), FALSE);
++  gtk_tree_view_set_search_column (GTK_TREE_VIEW (filtered_list), -1);
++
++  g_signal_connect_swapped (G_OBJECT (filter_entry), "activate",
++                            G_CALLBACK (entry_activated), builder);
++  g_signal_connect_swapped (G_OBJECT (filter_entry), "notify::text",
++                            G_CALLBACK (filter_changed), builder);
++
++  g_signal_connect (G_OBJECT (filter_entry), "icon-release",
++                    G_CALLBACK (filter_clear), NULL);
++
++  filtered_model = GTK_TREE_MODEL_FILTER (gtk_builder_get_object (builder, "filtered_input_source_model"));
++  model = GTK_LIST_STORE (gtk_builder_get_object (builder, "input_source_model"));
++
++  populate_model (model, active_sources);
++
++  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
++                                        NAME_COLUMN, GTK_SORT_ASCENDING);
++
++  gtk_tree_model_filter_set_visible_func (filtered_model,
++                                          filter_func,
++                                          NULL, NULL);
++
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (filtered_list));
++
++  g_signal_connect (G_OBJECT (selection), "changed",
++                    G_CALLBACK (selection_changed), builder);
++
++  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filtered_model), &iter))
++    gtk_tree_selection_select_iter (selection, &iter);
++
++  g_signal_connect (G_OBJECT (filtered_list), "row-activated",
++                    G_CALLBACK (row_activated), builder);
++
++  gtk_widget_grab_focus (filter_entry);
++
++  gtk_widget_show (chooser);
++
++  return chooser;
++}
++
++static gboolean
++input_chooser_get_selected (GtkWidget     *dialog,
++                            GtkTreeModel **model,
++                            GtkTreeIter   *iter)
++{
++  GtkWidget *tv;
++  GtkTreeSelection *selection;
++
++  tv = g_object_get_data (G_OBJECT (dialog), "filtered_input_source_list");
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
++
++  return gtk_tree_selection_get_selected (selection, model, iter);
++}
+diff -uNrp a/panels/region/cinnamon-region-panel-input-chooser.ui b/panels/region/cinnamon-region-panel-input-chooser.ui
+--- a/panels/region/cinnamon-region-panel-input-chooser.ui	1970-01-01 01:00:00.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-input-chooser.ui	2013-09-21 13:24:15.339949536 +0100
+@@ -0,0 +1,157 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<interface>
++  <requires lib="gtk+" version="2.16"/>
++  <object class="GtkListStore" id="input_source_model">
++    <columns>
++      <!-- display name -->
++      <column type="gchararray"/>
++      <!-- input source type -->
++      <column type="gchararray"/>
++      <!-- type specific identifier -->
++      <column type="gchararray"/>
++    </columns>
++  </object>
++  <object class="GtkTreeModelFilter" id="filtered_input_source_model">
++    <property name="child_model">input_source_model</property>
++  </object>
++  <object class="GtkDialog" id="input_source_chooser">
++    <property name="visible">False</property>
++    <property name="can_focus">False</property>
++    <property name="border_width">5</property>
++    <property name="title" translatable="yes">Choose an input source</property>
++    <property name="modal">True</property>
++    <property name="window_position">center-on-parent</property>
++    <property name="type_hint">dialog</property>
++    <child internal-child="vbox">
++      <object class="GtkBox" id="dialog-vbox3">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
++        <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="hbtnBox">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="cancel-button">
++                <property name="label">gtk-cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="pack_type">end</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="ok-button">
++                <property name="label">gtk-add</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="can_default">True</property>
++                <property name="receives_default">False</property>
++                <property name="use_action_appearance">False</property>
++                <property name="use_stock">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="pack_type">end</property>
++                <property name="position">2</property>
++              </packing>
++            </child>
++          </object>
++        </child>
++        <child>
++          <object class="GtkVBox" id="vbox40">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">5</property>
++            <property name="spacing">6</property>
++            <child>
++              <object class="GtkVBox" id="vbox1">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="spacing">6</property>
++                <child>
++                  <object class="GtkLabel" id="label1">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Select an input source to add</property>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkScrolledWindow" id="scrolledwindow1">
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="hscrollbar_policy">never</property>
++                    <property name="shadow_type">etched-in</property>
++                    <property name="min_content_width">450</property>
++                    <property name="min_content_height">250</property>
++                    <child>
++                      <object class="GtkTreeView" id="filtered_input_source_list">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="model">filtered_input_source_model</property>
++                        <property name="headers_visible">False</property>
++                        <property name="search_column">0</property>
++                      </object>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkEntry" id="input_source_filter">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="invisible_char">•</property>
++                <property name="secondary-icon-name">edit-find-symbolic</property>
++                <property name="secondary-icon-activatable">False</property>
++                <property name="secondary-icon-sensitive">False</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">False</property>
++                <property name="pack_type">end</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++    <action-widgets>
++      <action-widget response="-5">ok-button</action-widget>
++      <action-widget response="-6">cancel-button</action-widget>
++    </action-widgets>
++  </object>
++</interface>
+diff -uNrp a/panels/region/cinnamon-region-panel-input.h b/panels/region/cinnamon-region-panel-input.h
+--- a/panels/region/cinnamon-region-panel-input.h	1970-01-01 01:00:00.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-input.h	2013-09-21 13:24:15.339949536 +0100
+@@ -0,0 +1,36 @@
++/* cinnamon-region-panel-input.h
++ * Copyright (C) 2011 Red Hat, Inc.
++ *
++ * Written by Matthias Clasen
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
++ * 02110-1335, USA.
++ */
++
++#ifndef __CINNAMON_KEYBOARD_PROPERTY_INPUT_H
++#define __CINNAMON_KEYBOARD_PROPERTY_INPUT_H
++
++#include <gtk/gtk.h>
++
++#include "cc-region-panel.h"
++
++G_BEGIN_DECLS
++
++void setup_input_tabs (GtkBuilder    *builder,
++                       CcRegionPanel *self);
++
++G_END_DECLS
++
++#endif  /* __CINNAMON_KEYBOARD_PROPERTY_INPUT_H */
+diff -uNrp a/panels/region/cinnamon-region-panel-lang.c b/panels/region/cinnamon-region-panel-lang.c
+--- a/panels/region/cinnamon-region-panel-lang.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-lang.c	2013-09-21 13:24:15.340949500 +0100
+@@ -24,7 +24,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <glib/gi18n-lib.h>
++#include <glib/gi18n.h>
+ 
+ #include "cinnamon-region-panel-lang.h"
+ #include "cinnamon-region-panel-formats.h"
+diff -uNrp a/panels/region/cinnamon-region-panel-lang.h b/panels/region/cinnamon-region-panel-lang.h
+--- a/panels/region/cinnamon-region-panel-lang.h	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-lang.h	2013-09-21 13:24:15.340949500 +0100
+@@ -19,8 +19,8 @@
+  * 02110-1335, USA.
+  */
+ 
+-#ifndef __GNOME_KEYBOARD_PROPERTY_LANG_H
+-#define __GNOME_KEYBOARD_PROPERTY_LANG_H
++#ifndef __CINNAMON_KEYBOARD_PROPERTY_LANG_H
++#define __CINNAMON_KEYBOARD_PROPERTY_LANG_H
+ 
+ #include <gtk/gtk.h>
+ 
+@@ -29,4 +29,4 @@ G_BEGIN_DECLS
+ void setup_language (GtkBuilder *builder);
+ 
+ G_END_DECLS
+-#endif /* __GNOME_KEYBOARD_PROPERTY_LANG_H */
++#endif /* __CINNAMON_KEYBOARD_PROPERTY_LANG_H */
+diff -uNrp a/panels/region/cinnamon-region-panel-layout-chooser.ui b/panels/region/cinnamon-region-panel-layout-chooser.ui
+--- a/panels/region/cinnamon-region-panel-layout-chooser.ui	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-layout-chooser.ui	1970-01-01 01:00:00.000000000 +0100
+@@ -1,180 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <object class="GtkListStore" id="layout_list_model">
+-    <columns>
+-      <!-- column-name sort_order -->
+-      <column type="gchararray"/>
+-      <!-- column-name visible -->
+-      <column type="gchararray"/>
+-      <!-- column-name xkb_id -->
+-      <column type="gchararray"/>
+-      <!-- column-name country_desc -->
+-      <column type="gchararray"/>
+-      <!-- column-name language_desc -->
+-      <column type="gchararray"/>
+-    </columns>
+-  </object>
+-  <object class="GtkTreeModelFilter" id="filtered_layout_list_model">
+-    <property name="child_model">layout_list_model</property>
+-  </object>
+-  <object class="GtkDialog" id="xkb_layout_chooser">
+-    <property name="visible">False</property>
+-    <property name="can_focus">False</property>
+-    <property name="border_width">5</property>
+-    <property name="title" translatable="yes">Choose a Layout</property>
+-    <property name="modal">True</property>
+-    <property name="window_position">center-on-parent</property>
+-    <property name="type_hint">dialog</property>
+-    <child internal-child="vbox">
+-      <object class="GtkBox" id="dialog-vbox3">
+-        <property name="visible">True</property>
+-        <property name="can_focus">False</property>
+-        <property name="orientation">vertical</property>
+-        <property name="spacing">2</property>
+-        <child internal-child="action_area">
+-          <object class="GtkButtonBox" id="hbtnBox">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <object class="GtkButton" id="btnPreview">
+-                <property name="label" translatable="yes">Preview</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="use_action_appearance">False</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">0</property>
+-                <property name="secondary">True</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="btnCancel">
+-                <property name="label">gtk-cancel</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="receives_default">False</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="pack_type">end</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="btnOk">
+-                <property name="label">gtk-add</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="can_default">True</property>
+-                <property name="receives_default">False</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="pack_type">end</property>
+-                <property name="position">2</property>
+-              </packing>
+-            </child>
+-          </object>
+-        </child>
+-        <child>
+-          <object class="GtkVBox" id="vbox40">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="border_width">5</property>
+-            <property name="spacing">6</property>
+-            <child>
+-              <object class="GtkVBox" id="vbox1">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="spacing">6</property>
+-                <child>
+-                  <object class="GtkLabel" id="label1">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="xalign">0</property>
+-                    <property name="label" translatable="yes">Select an input source to add</property>
+-                  </object>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">False</property>
+-                    <property name="position">0</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <object class="GtkScrolledWindow" id="scrolledwindow1">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">True</property>
+-                    <property name="hscrollbar_policy">never</property>
+-                    <property name="shadow_type">etched-in</property>
+-                    <property name="min_content_width">450</property>
+-                    <property name="min_content_height">250</property>
+-                    <child>
+-                      <object class="GtkTreeView" id="xkb_filtered_layouts_list">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">True</property>
+-                        <property name="model">filtered_layout_list_model</property>
+-                        <property name="headers_visible">False</property>
+-                        <property name="search_column">0</property>
+-                        <child internal-child="selection">
+-                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+-                        </child>
+-                      </object>
+-                    </child>
+-                  </object>
+-                  <packing>
+-                    <property name="expand">True</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
+-                  </packing>
+-                </child>
+-              </object>
+-              <packing>
+-                <property name="expand">True</property>
+-                <property name="fill">True</property>
+-                <property name="position">0</property>
+-              </packing>
+-            </child>
+-            <child>
+-              <object class="GtkEntry" id="xkb_layout_filter">
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="invisible_char">•</property>
+-                <property name="secondary-icon-name">edit-find-symbolic</property>
+-                <property name="secondary-icon-activatable">False</property>
+-                <property name="secondary-icon-sensitive">False</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="pack_type">end</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">True</property>
+-            <property name="fill">True</property>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-      </object>
+-    </child>
+-    <action-widgets>
+-      <action-widget response="1">btnPreview</action-widget>
+-      <action-widget response="-5">btnOk</action-widget>
+-      <action-widget response="-6">btnCancel</action-widget>
+-    </action-widgets>
+-  </object>
+-</interface>
+diff -uNrp a/panels/region/cinnamon-region-panel-options-dialog.ui b/panels/region/cinnamon-region-panel-options-dialog.ui
+--- a/panels/region/cinnamon-region-panel-options-dialog.ui	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-options-dialog.ui	1970-01-01 01:00:00.000000000 +0100
+@@ -1,79 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<interface>
+-  <requires lib="gtk+" version="2.16"/>
+-  <object class="GtkDialog" id="xkb_options_dialog">
+-    <property name="can_focus">False</property>
+-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-    <property name="border_width">5</property>
+-    <property name="title" translatable="yes">Keyboard Layout Options</property>
+-    <property name="window_position">center-on-parent</property>
+-    <property name="default_width">550</property>
+-    <property name="default_height">400</property>
+-    <property name="type_hint">dialog</property>
+-    <child internal-child="vbox">
+-      <object class="GtkBox" id="dialog_vbox">
+-        <property name="visible">True</property>
+-        <property name="can_focus">False</property>
+-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-        <property name="orientation">vertical</property>
+-        <property name="spacing">2</property>
+-        <child>
+-          <object class="GtkScrolledWindow" id="options_scroll">
+-            <property name="visible">True</property>
+-            <property name="can_focus">True</property>
+-            <property name="border_width">5</property>
+-            <property name="shadow_type">out</property>
+-            <child>
+-              <object class="GtkViewport" id="viewport1">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="shadow_type">none</property>
+-                <child>
+-                  <object class="GtkVBox" id="options_vbox">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                  </object>
+-                </child>
+-              </object>
+-            </child>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="position">1</property>
+-          </packing>
+-        </child>
+-        <child internal-child="action_area">
+-          <object class="GtkButtonBox" id="dialog-action_area4">
+-            <property name="visible">True</property>
+-            <property name="can_focus">False</property>
+-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-            <property name="layout_style">end</property>
+-            <child>
+-              <placeholder/>
+-            </child>
+-            <child>
+-              <object class="GtkButton" id="button2">
+-                <property name="label">gtk-close</property>
+-                <property name="visible">True</property>
+-                <property name="can_focus">True</property>
+-                <property name="receives_default">True</property>
+-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                <property name="use_action_appearance">False</property>
+-                <property name="use_stock">True</property>
+-              </object>
+-              <packing>
+-                <property name="expand">False</property>
+-                <property name="fill">False</property>
+-                <property name="position">1</property>
+-              </packing>
+-            </child>
+-          </object>
+-        </child>
+-      </object>
+-    </child>
+-    <action-widgets>
+-      <action-widget response="-7">button2</action-widget>
+-    </action-widgets>
+-  </object>
+-</interface>
+diff -uNrp a/panels/region/cinnamon-region-panel-system.c b/panels/region/cinnamon-region-panel-system.c
+--- a/panels/region/cinnamon-region-panel-system.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-system.c	2013-09-21 13:24:15.342949428 +0100
+@@ -27,15 +27,18 @@
+ 
+ #include <polkit/polkit.h>
+ 
+-#include <glib/gi18n-lib.h>
++#include <glib/gi18n.h>
++
++#define GNOME_DESKTOP_USE_UNSTABLE_API
++#include <libcinnamon-desktop/gnome-xkb-info.h>
+ 
+-#include <libgnomekbd/gkbd-keyboard-config.h>
+ #include "cc-common-language.h"
+ #include "gdm-languages.h"
+ #include "cinnamon-region-panel-system.h"
+-#include "cinnamon-region-panel-xkb.h"
+ 
+-static GSettings *locale_settings, *xkb_settings;
++#define WID(s) GTK_WIDGET(gtk_builder_get_object (dialog, s))
++
++static GSettings *locale_settings, *input_sources_settings;
+ static GDBusProxy *localed_proxy;
+ static GPermission *localed_permission;
+ 
+@@ -72,13 +75,14 @@ update_copy_button (GtkBuilder *dialog)
+ 
+         button = WID ("copy_settings_button");
+ 
+-        /* If the version of localed doesn't include layouts... */
+-        if (system_input_source) {
++        if (user_input_source && user_input_source[0]) {
+                 layouts_differ = (g_strcmp0 (user_input_source, system_input_source) != 0);
+                 if (layouts_differ == FALSE)
+                         layouts_differ = (g_strcmp0 (user_input_variants, system_input_variants) != 0);
+-        } else
++        } else {
++                /* Nothing to copy */
+                 layouts_differ = FALSE;
++        }
+ 
+         if (g_strcmp0 (user_lang, system_lang) == 0 &&
+             g_strcmp0 (user_region, system_region) == 0 &&
+@@ -131,61 +135,67 @@ system_update_language (GtkBuilder *dial
+ }
+ 
+ static void
+-xkb_settings_changed (GSettings *settings,
+-                      const gchar *key,
+-                      GtkBuilder *dialog)
++input_sources_changed (GSettings *settings,
++                       const gchar *key,
++                       GtkBuilder *dialog)
+ {
+-	guint i;
+-	GString *disp, *list, *variants;
+-	GtkWidget *label;
+-	gchar **layouts;
+-
+-	layouts = g_settings_get_strv (settings, "layouts");
+-	if (layouts == NULL)
+-		return;
+-
+-	label = WID ("user_input_source");
+-	disp = g_string_new ("");
+-	list = g_string_new ("");
+-	variants = g_string_new ("");
+-
+-	for (i = 0; layouts[i]; i++) {
+-		gchar *utf_visible;
+-		char **split;
+-		gchar *layout, *variant;
+-
+-		utf_visible = xkb_layout_description_utf8 (layouts[i]);
+-		if (disp->str[0] != '\0')
+-			g_string_append (disp, ", ");
+-		g_string_append (disp, utf_visible ? utf_visible : layouts[i]);
+-		g_free (utf_visible);
+-
+-		split = g_strsplit_set (layouts[i], " \t", 2);
+-
+-		if (split == NULL || split[0] == NULL)
+-			continue;
+-
+-		layout = split[0];
+-		variant = split[1];
+-
+-		if (list->str[0] != '\0')
+-			g_string_append (list, ",");
+-		g_string_append (list, layout);
+-
+-		if (variants->str[0] != '\0')
+-			g_string_append (variants, ",");
+-		g_string_append (variants, variant ? variant : "");
+-
+-		g_strfreev (split);
+-	}
+-	g_strfreev (layouts);
++        GString *disp, *list, *variants;
++        GtkWidget *label;
++        GnomeXkbInfo *xkb_info;
++        GVariantIter iter;
++        GVariant *sources;
++        const gchar *type;
++        const gchar *id;
++
++        sources = g_settings_get_value (input_sources_settings, "sources");
++        xkb_info = gnome_xkb_info_new ();
++
++        label = WID ("user_input_source");
++        disp = g_string_new ("");
++        list = g_string_new ("");
++        variants = g_string_new ("");
++
++        g_variant_iter_init (&iter, sources);
++        while (g_variant_iter_next (&iter, "(&s&s)", &type, &id)) {
++                /* We can't copy non-XKB layouts to the system yet */
++                if (g_str_equal (type, "xkb")) {
++                        char **split;
++                        gchar *layout, *variant;
++                        const char *name;
++
++                        gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
++                        if (disp->str[0] != '\0')
++                                g_string_append (disp, ", ");
++                        g_string_append (disp, name);
++
++                        split = g_strsplit (id, "+", 2);
++
++                        if (split == NULL || split[0] == NULL)
++                                continue;
++
++                        layout = split[0];
++                        variant = split[1];
++
++                        if (list->str[0] != '\0') {
++                                g_string_append (list, ",");
++                                g_string_append (variants, ",");
++                        }
++                        g_string_append (list, layout);
++                        g_string_append (variants, variant ? variant : "");
++
++                        g_strfreev (split);
++                }
++        }
++        g_variant_unref (sources);
++        g_object_unref (xkb_info);
+ 
+         g_object_set_data_full (G_OBJECT (label), "input_source", g_string_free (list, FALSE), g_free);
+         g_object_set_data_full (G_OBJECT (label), "input_variants", g_string_free (variants, FALSE), g_free);
++
+         gtk_label_set_text (GTK_LABEL (label), disp->str);
+         g_string_free (disp, TRUE);
+ 
+-	update_copy_button (dialog);
++        update_copy_button (dialog);
+ }
+ 
+ static void
+@@ -222,12 +232,13 @@ on_localed_properties_changed (GDBusProx
+                                const gchar **invalidated_properties,
+                                GtkBuilder   *dialog)
+ {
+-        GVariant *v;
++        GVariant *v, *w;
+         GtkWidget *label;
+-        const char *layout;
++        GnomeXkbInfo *xkb_info;
+         char **layouts;
++        char **variants;
+         GString *disp;
+-        guint i;
++        guint i, n;
+ 
+         if (invalidated_properties != NULL) {
+                 guint i;
+@@ -236,6 +247,8 @@ on_localed_properties_changed (GDBusProx
+                                 update_property (proxy, "Locale");
+                         else if (g_str_equal (invalidated_properties[i], "X11Layout"))
+                                 update_property (proxy, "X11Layout");
++                        else if (g_str_equal (invalidated_properties[i], "X11Variant"))
++                                update_property (proxy, "X11Variant");
+                 }
+         }
+ 
+@@ -290,29 +303,56 @@ on_localed_properties_changed (GDBusProx
+         label = WID ("system_input_source");
+         v = g_dbus_proxy_get_cached_property (proxy, "X11Layout");
+         if (v) {
+-                layout = g_variant_get_string (v, NULL);
+-                g_object_set_data_full (G_OBJECT (label), "input_source", g_strdup (layout), g_free);
+-	} else {
++                layouts = g_strsplit (g_variant_get_string (v, NULL), ",", -1);
++                g_object_set_data_full (G_OBJECT (label), "input_source",
++                                        g_variant_dup_string (v, NULL), g_free);
++                g_variant_unref (v);
++        } else {
+                 g_object_set_data_full (G_OBJECT (label), "input_source", NULL, g_free);
+                 update_copy_button (dialog);
+                 return;
+         }
+ 
+-	disp = g_string_new ("");
+-	layouts = g_strsplit (layout, ",", -1);
+-	for (i = 0; layouts[i]; i++) {
+-		gchar *utf_visible;
+-
+-		utf_visible = xkb_layout_description_utf8 (layouts[i]);
+-		if (disp->str[0] != '\0')
+-			disp = g_string_append (disp, ", ");
+-		disp = g_string_append (disp, utf_visible ? utf_visible : layouts[i]);
+-		g_free (utf_visible);
+-	}
++        w = g_dbus_proxy_get_cached_property (proxy, "X11Variant");
++        if (w) {
++                variants = g_strsplit (g_variant_get_string (w, NULL), ",", -1);
++                g_object_set_data_full (G_OBJECT (label), "input_variants",
++                                        g_variant_dup_string (w, NULL), g_free);
++                g_variant_unref (w);
++        } else {
++                variants = NULL;
++                g_object_set_data_full (G_OBJECT (label), "input_variants", NULL, g_free);
++        }
++
++        if (variants && variants[0])
++                n = MIN (g_strv_length (layouts), g_strv_length (variants));
++        else
++                n = g_strv_length (layouts);
++
++        xkb_info = gnome_xkb_info_new ();
++        disp = g_string_new ("");
++        for (i = 0; i < n && layouts[i][0]; i++) {
++                const char *name;
++                char *id;
++
++                if (variants && variants[i] && variants[i][0])
++                        id = g_strdup_printf ("%s+%s", layouts[i], variants[i]);
++                else
++                        id = g_strdup (layouts[i]);
++
++                gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
++                if (disp->str[0] != '\0')
++                        disp = g_string_append (disp, ", ");
++                disp = g_string_append (disp, name ? name : id);
++
++                g_free (id);
++        }
+         gtk_label_set_text (GTK_LABEL (label), disp->str);
+         g_string_free (disp, TRUE);
+ 
+-        g_variant_unref (v);
++        g_strfreev (variants);
++        g_strfreev (layouts);
++        g_object_unref (xkb_info);
+ 
+         update_copy_button (dialog);
+ }
+@@ -386,6 +426,11 @@ copy_settings (GtkButton *button, GtkBui
+         layout = g_object_get_data (G_OBJECT (label), "input_source");
+         variants = g_object_get_data (G_OBJECT (label), "input_variants");
+ 
++        if (layout == NULL || layout[0] == '\0') {
++                g_debug ("Not calling SetX11Keyboard, as there are no XKB input sources in the user's settings");
++                return;
++        }
++
+         g_dbus_proxy_call (localed_proxy,
+                            "SetX11Keyboard",
+                            g_variant_new ("(ssssbb)", layout, "", variants ? variants : "", "", TRUE, TRUE),
+@@ -468,10 +513,10 @@ setup_system (GtkBuilder *dialog)
+                           G_CALLBACK (locale_settings_changed), dialog);
+         g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, locale_settings);
+ 
+-	xkb_settings = g_settings_new (GKBD_KEYBOARD_SCHEMA);
+-	g_signal_connect (xkb_settings, "changed::layouts",
+-			  G_CALLBACK (xkb_settings_changed), dialog);
+-	g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, xkb_settings);
++        input_sources_settings = g_settings_new ("org.cinnamon.desktop.input-sources");
++        g_signal_connect (input_sources_settings, "changed::sources",
++                          G_CALLBACK (input_sources_changed), dialog);
++        g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, input_sources_settings);
+ 
+         /* Display user settings */
+         language = cc_common_language_get_current_language ();
+@@ -480,7 +525,7 @@ setup_system (GtkBuilder *dialog)
+ 
+         locale_settings_changed (locale_settings, "region", dialog);
+ 
+-        xkb_settings_changed (xkb_settings, "layouts", dialog);
++        input_sources_changed (input_sources_settings, "sources", dialog);
+ 
+         bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
+         g_dbus_proxy_new (bus,
+diff -uNrp a/panels/region/cinnamon-region-panel-system.h b/panels/region/cinnamon-region-panel-system.h
+--- a/panels/region/cinnamon-region-panel-system.h	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-system.h	2013-09-21 13:24:15.342949428 +0100
+@@ -19,8 +19,8 @@
+  * 02110-1335, USA.
+  */
+ 
+-#ifndef __GNOME_REGION_PANEL_SYSTEM_H
+-#define __GNOME_REGION_PANEL_SYSTEM_H
++#ifndef __CINNAMON_REGION_PANEL_SYSTEM_H
++#define __CINNAMON_REGION_PANEL_SYSTEM_H
+ 
+ #include <gtk/gtk.h>
+ 
+diff -uNrp a/panels/region/cinnamon-region-panel.ui b/panels/region/cinnamon-region-panel.ui
+--- a/panels/region/cinnamon-region-panel.ui	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel.ui	2013-09-21 13:24:15.347949247 +0100
+@@ -162,27 +162,17 @@
+                             <style>
+                               <class name="inline-toolbar"/>
+                             </style>
++                            <style>
++                              <class name="inline-toolbar"/>
++                            </style>
+                             <child>
+                               <object class="GtkToolButton" id="language_add">
++                                <property name="use_action_appearance">False</property>
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">False</property>
+                                 <property name="label" translatable="yes">Add Language</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="icon_name">list-add-symbolic</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="homogeneous">True</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkToolButton" id="language_remove">
+-                                <property name="visible">True</property>
+-                                <property name="sensitive">False</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="label" translatable="yes">Remove Language</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="icon_name">list-remove-symbolic</property>
++                                <property name="icon_name">list-add-symbolic</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -198,12 +188,13 @@
+                         </child>
+                         <child>
+                           <object class="GtkVBox" id="vbox3">
+-                            <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+                             <child>
+                               <object class="GtkLabel" id="label23">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
++                                <property name="use_underline">True</property>
++                                <property name="label" translatable="yes">Add Language</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">True</property>
+@@ -212,23 +203,24 @@
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkButton" id="get_languages_button">
+-                                <property name="label" translatable="yes">button</property>
++                              <object class="GtkLinkButton" id="linkbutton1">
++                                <property name="label" translatable="yes">Install languages...</property>
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="receives_default">True</property>
++                                <property name="has_tooltip">True</property>
+                               </object>
+                               <packing>
+-                                <property name="expand">True</property>
++                                <property name="expand">False</property>
+                                 <property name="fill">True</property>
+-                                <property name="position">13</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
+                           <packing>
+                             <property name="expand">False</property>
+                             <property name="fill">True</property>
+-                            <property name="position">2</property>
++                            <property name="position">1</property>
+                           </packing>
+                         </child>
+                       </object>
+@@ -305,19 +297,19 @@
+                         </child>
+                         <child>
+                           <object class="GtkToolbar" id="region-toolbar">
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+                             <property name="toolbar_style">icons</property>
+                             <property name="show_arrow">False</property>
+                             <property name="icon_size">1</property>
++                            <property name="visible">True</property>
+                             <style>
+                               <class name="inline-toolbar"/>
+                             </style>
+                             <child>
+                               <object class="GtkToolButton" id="region_add">
++                                <property name="use_action_appearance">False</property>
++                                <property name="label" translatable="yes">Add Region</property>
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="label" translatable="yes">Add Region</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="icon_name">list-add-symbolic</property>
+                               </object>
+@@ -328,10 +320,11 @@
+                             </child>
+                             <child>
+                               <object class="GtkToolButton" id="region_remove">
++                                <property name="use_action_appearance">False</property>
+                                 <property name="visible">True</property>
++                                <property name="label" translatable="yes">Remove Region</property>
+                                 <property name="sensitive">False</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="label" translatable="yes">Remove Region</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="icon_name">list-remove-symbolic</property>
+                               </object>
+@@ -373,18 +366,6 @@
+                                 <property name="n_rows">9</property>
+                                 <property name="n_columns">2</property>
+                                 <child>
+-                                  <placeholder/>
+-                                </child>
+-                                <child>
+-                                  <placeholder/>
+-                                </child>
+-                                <child>
+-                                  <placeholder/>
+-                                </child>
+-                                <child>
+-                                  <placeholder/>
+-                                </child>
+-                                <child>
+                                   <object class="GtkLabel" id="label7">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">False</property>
+@@ -626,6 +607,12 @@
+                         <property name="height">1</property>
+                       </packing>
+                     </child>
++                    <child>
++                      <placeholder/>
++                    </child>
++                    <child>
++                      <placeholder/>
++                    </child>
+                   </object>
+                   <packing>
+                     <property name="position">1</property>
+@@ -643,36 +630,43 @@
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkVBox" id="vbox1">
++                  <object class="GtkVBox" id="vbox5">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="border_width">10</property>
++                    <property name="border_width">12</property>
+                     <property name="spacing">12</property>
+                     <child>
+-                      <placeholder/>
++                      <object class="GtkLabel" id="label24">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes">Select keyboards or other input sources</property>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
+                     </child>
+                     <child>
+-                      <object class="GtkHBox" id="hbox2">
++                      <object class="GtkHBox" id="hbox3">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+                         <property name="spacing">12</property>
+                         <child>
+-                          <object class="GtkVBox" id="vbox7">
++                          <object class="GtkVBox" id="vbox6">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+                             <child>
+-                              <object class="GtkScrolledWindow" id="xkb_layouts_swindow">
++                              <object class="GtkScrolledWindow" id="input_sources_swindow">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="shadow_type">in</property>
+                                 <child>
+-                                  <object class="GtkTreeView" id="xkb_layouts_selected">
++                                  <object class="GtkTreeView" id="active_input_sources">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="headers_visible">False</property>
+-                                    <child internal-child="selection">
+-                                      <object class="GtkTreeSelection" id="treeview-selection1"/>
+-                                    </child>
+                                   </object>
+                                 </child>
+                               </object>
+@@ -683,7 +677,7 @@
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkToolbar" id="layouts-toolbar">
++                              <object class="GtkToolbar" id="input-toolbar">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+                                 <property name="toolbar_style">icons</property>
+@@ -693,70 +687,166 @@
+                                   <class name="inline-toolbar"/>
+                                 </style>
+                                 <child>
+-                                  <object class="GtkToolButton" id="xkb_layouts_add">
++                                  <object class="GtkToolItem" id="i_s_ar_item">
+                                     <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="label" translatable="yes">Add Layout</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="icon_name">list-add-symbolic</property>
++                                    <child>
++                                      <object class="GtkBox" id="i_s_ar_box">
++                                        <property name="visible">True</property>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_add">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_a_a11y">
++                                                 <property name="accessible-name" translatable="yes">Add Input Source</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_a_image">
++
++                                                  <property name="visible">True</property>
++                                                  <property name="icon-name">list-add-symbolic</property>
++                                                  <property name="icon-size">1</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_remove">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_r_a11y">
++                                                 <property name="accessible-name" translatable="yes">Remove Input Source</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_r_image">
++                                                  <property name="visible">True</property>
++                                                  <property name="icon-name">list-remove-symbolic</property>
++                                                  <property name="icon-size">1</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                      </object>
++                                    </child>
+                                   </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="homogeneous">True</property>
+-                                  </packing>
+                                 </child>
++
+                                 <child>
+-                                  <object class="GtkToolButton" id="xkb_layouts_remove">
++                                  <object class="GtkSeparatorToolItem" id="sep1">
+                                     <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="label" translatable="yes">Remove Layout</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="icon_name">list-remove-symbolic</property>
++                                    <property name="draw">False</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="homogeneous">True</property>
++                                    <property name="expand">True</property>
+                                   </packing>
+                                 </child>
++
+                                 <child>
+-                                  <object class="GtkToolButton" id="xkb_layouts_move_up">
++                                  <object class="GtkToolItem" id="i_s_ud_item">
+                                     <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="label" translatable="yes">Move Up</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="icon_name">go-up-symbolic</property>
++                                    <child>
++                                      <object class="GtkBox" id="i_s_ud_box">
++                                        <property name="visible">True</property>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_move_up">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_u_a11y">
++                                                 <property name="accessible-name" translatable="yes">Move Input Source Up</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_u_image">
++
++                                                  <property name="visible">True</property>
++                                                  <property name="icon-name">go-up-symbolic</property>
++                                                  <property name="icon-size">1</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_move_down">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_d_a11y">
++                                                 <property name="accessible-name" translatable="yes">Move Input Source Down</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_d_image">
++                                                  <property name="visible">True</property>
++                                                  <property name="icon-name">go-down-symbolic</property>
++                                                  <property name="icon-size">1</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                      </object>
++                                    </child>
+                                   </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="homogeneous">True</property>
+-                                  </packing>
+                                 </child>
++
+                                 <child>
+-                                  <object class="GtkToolButton" id="xkb_layouts_move_down">
++                                  <object class="GtkSeparatorToolItem" id="sep2">
+                                     <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="label" translatable="yes">Move Down</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="icon_name">go-down-symbolic</property>
++                                    <property name="draw">False</property>
++                                    <property name="hexpand">True</property>
+                                   </object>
+                                   <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="homogeneous">True</property>
++                                    <property name="expand">True</property>
+                                   </packing>
+                                 </child>
++
+                                 <child>
+-                                  <object class="GtkToolButton" id="xkb_layouts_show">
++                                  <object class="GtkToolItem" id="i_s_sp_item">
+                                     <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="label" translatable="yes">Preview Layout</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="icon_name">input-keyboard-symbolic</property>
++                                    <child>
++                                      <object class="GtkBox" id="i_s_sp_box">
++                                        <property name="visible">True</property>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_settings">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_s_a11y">
++                                                 <property name="accessible-name" translatable="yes">Input Source Settings</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_s_image">
++
++                                                  <property name="visible">True</property>
++                                                  <property name="icon_name">preferences-system-symbolic</property>
++                                                  <property name="icon_size">1</property>
++                                                  <property name="pixel_size">16</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                        <child>
++                                           <object class="GtkButton" id="input_source_show">
++                                             <property name="visible">True</property>
++                                             <child internal-child="accessible">
++                                               <object class="AtkObject" id="i_s_p_a11y">
++                                                 <property name="accessible-name" translatable="yes">Show Keyboard Layout</property>
++                                               </object>
++                                             </child>
++                                             <child>
++                                                <object class="GtkImage" id="i_s_p_image">
++
++                                                  <property name="visible">True</property>
++                                                  <property name="icon_name">input-keyboard-symbolic</property>
++                                                  <property name="icon-size">1</property>
++                                                </object>
++                                             </child>
++                                           </object>
++                                        </child>
++                                      </object>
++                                    </child>
+                                   </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="homogeneous">True</property>
+-                                  </packing>
+                                 </child>
++
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -772,168 +862,111 @@
+                           </packing>
+                         </child>
+                         <child>
+-                          <object class="GtkVBox" id="vbox33">
++                          <object class="GtkFrame" id="frame4">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="spacing">12</property>
++                            <property name="label_xalign">0</property>
++                            <property name="shadow_type">none</property>
+                             <child>
+-                              <object class="GtkVBox" id="vbox34">
++                              <object class="GtkAlignment" id="alignment3">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">6</property>
++                                <property name="left_padding">12</property>
+                                 <child>
+-                                  <object class="GtkRadioButton" id="chk_same_group">
+-                                    <property name="label" translatable="yes">Use the same layout for all windows</property>
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">True</property>
+-                                    <property name="receives_default">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="active">True</property>
+-                                    <property name="draw_indicator">True</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkRadioButton" id="chk_separate_group_per_window">
+-                                    <property name="label" translatable="yes">Allow different layouts for individual windows</property>
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">True</property>
+-                                    <property name="receives_default">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="active">True</property>
+-                                    <property name="draw_indicator">True</property>
+-                                    <property name="group">chk_same_group</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkAlignment" id="alignment1">
++                                  <object class="GtkGrid" id="shortcuts-grid">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">False</property>
+-                                    <property name="left_padding">12</property>
++                                    <property name="margin_top">6</property>
++                                    <property name="row_spacing">6</property>
++                                    <property name="column_spacing">6</property>
+                                     <child>
+-                                      <object class="GtkVBox" id="vbox4">
++                                      <object class="GtkLabel" id="prev-source-label">
+                                         <property name="visible">True</property>
+                                         <property name="can_focus">False</property>
+-                                        <child>
+-                                          <object class="GtkRadioButton" id="chk_new_windows_default_layout">
+-                                            <property name="label" translatable="yes">New windows use the default layout</property>
+-                                            <property name="visible">True</property>
+-                                            <property name="can_focus">True</property>
+-                                            <property name="receives_default">False</property>
+-                                            <property name="xalign">0</property>
+-                                            <property name="active">True</property>
+-                                            <property name="draw_indicator">True</property>
+-                                          </object>
+-                                          <packing>
+-                                            <property name="expand">True</property>
+-                                            <property name="fill">True</property>
+-                                            <property name="position">0</property>
+-                                          </packing>
+-                                        </child>
+-                                        <child>
+-                                          <object class="GtkRadioButton" id="chk_new_windows_inherit_layout">
+-                                            <property name="label" translatable="yes">New windows use the previous window's layout</property>
+-                                            <property name="visible">True</property>
+-                                            <property name="can_focus">True</property>
+-                                            <property name="receives_default">False</property>
+-                                            <property name="xalign">0</property>
+-                                            <property name="active">True</property>
+-                                            <property name="draw_indicator">True</property>
+-                                            <property name="group">chk_new_windows_default_layout</property>
+-                                          </object>
+-                                          <packing>
+-                                            <property name="expand">True</property>
+-                                            <property name="fill">True</property>
+-                                            <property name="position">1</property>
+-                                          </packing>
+-                                        </child>
++                                        <property name="xalign">0</property>
++                                        <property name="label" translatable="yes">Switch to previous source</property>
+                                       </object>
++                                      <packing>
++                                        <property name="left_attach">0</property>
++                                        <property name="top_attach">0</property>
++                                        <property name="width">1</property>
++                                        <property name="height">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="prev-source-shortcut-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="halign">end</property>
++                                        <property name="hexpand">True</property>
++                                        <property name="label" translatable="yes">Ctrl+Alt+Space</property>
++                                        <style><class name="dim-label"/></style>
++                                      </object>
++                                      <packing>
++                                        <property name="left_attach">1</property>
++                                        <property name="top_attach">0</property>
++                                        <property name="width">1</property>
++                                        <property name="height">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="next-source-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="xalign">0</property>
++                                        <property name="label" translatable="yes">Switch to next source</property>
++                                      </object>
++                                      <packing>
++                                        <property name="left_attach">0</property>
++                                        <property name="top_attach">1</property>
++                                        <property name="width">1</property>
++                                        <property name="height">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="next-source-shortcut-label">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="halign">end</property>
++                                        <property name="hexpand">True</property>
++                                        <property name="label" translatable="yes">Ctrl+Alt+Shift+Space</property>
++                                        <style><class name="dim-label"/></style>
++                                      </object>
++                                      <packing>
++                                        <property name="left_attach">1</property>
++                                        <property name="top_attach">1</property>
++                                        <property name="width">1</property>
++                                        <property name="height">1</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLinkButton" id="jump-to-shortcuts">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="label" translatable="yes">Shortcut Settings</property>
++                                        <property name="halign">end</property>
++                                      </object>
++                                      <packing>
++                                        <property name="left_attach">1</property>
++                                        <property name="top_attach">2</property>
++                                        <property name="width">1</property>
++                                        <property name="height">1</property>
++                                      </packing>
+                                     </child>
+                                   </object>
+-                                  <packing>
+-                                    <property name="expand">True</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">2</property>
+-                                  </packing>
+                                 </child>
+                               </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">0</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkLabel" id="label2">
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">False</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">True</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">1</property>
+-                              </packing>
+                             </child>
+-                            <child>
+-                              <object class="GtkHButtonBox" id="hbuttonbox2">
++                            <child type="label">
++                              <object class="GtkLabel" id="shortcuts-frame-label">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">6</property>
+-                                <property name="layout_style">end</property>
+-                                <child>
+-                                  <object class="GtkButton" id="xkb_layout_options">
+-                                    <property name="label" translatable="yes">_Options...</property>
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">True</property>
+-                                    <property name="receives_default">True</property>
+-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+-                                    <property name="has_tooltip">True</property>
+-                                    <property name="tooltip_markup" translatable="yes">View and edit keyboard layout options</property>
+-                                    <property name="tooltip_text" translatable="yes">View and edit keyboard layout options</property>
+-                                    <property name="use_underline">True</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkButton" id="xkb_reset_to_defaults">
+-                                    <property name="label" translatable="yes">Reset to De_faults</property>
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">True</property>
+-                                    <property name="receives_default">True</property>
+-                                    <property name="has_tooltip">True</property>
+-                                    <property name="tooltip_markup" translatable="yes">Replace the current keyboard layout settings with the
+-default settings</property>
+-                                    <property name="tooltip_text" translatable="yes">Replace the current keyboard layout settings with the
+-default settings</property>
+-                                    <property name="use_underline">True</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="pack_type">end</property>
+-                                    <property name="position">1</property>
+-                                    <property name="secondary">True</property>
+-                                  </packing>
+-                                </child>
++                                <property name="label" translatable="yes">Shortcuts</property>
++                                <property name="use_markup">True</property>
++                                <attributes>
++                                  <attribute name="weight" value="bold"/>
++                                </attributes>
+                               </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">2</property>
+-                              </packing>
+                             </child>
+                           </object>
+                           <packing>
+@@ -951,17 +984,17 @@ default settings</property>
+                     </child>
+                   </object>
+                   <packing>
+-                    <property name="position">2</property>
++                    <property name="position">3</property>
+                   </packing>
+                 </child>
+                 <child type="tab">
+-                  <object class="GtkLabel" id="label46">
++                  <object class="GtkLabel" id="label13">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="label" translatable="yes">Keyboard Layouts</property>
++                    <property name="label" translatable="yes">Input Sources</property>
+                   </object>
+                   <packing>
+-                    <property name="position">2</property>
++                    <property name="position">3</property>
+                     <property name="tab_fill">False</property>
+                   </packing>
+                 </child>
+@@ -974,9 +1007,6 @@ default settings</property>
+                     <property name="column_spacing">12</property>
+                     <property name="row_spacing">12</property>
+                     <child>
+-                      <placeholder/>
+-                    </child>
+-                    <child>
+                       <object class="GtkLabel" id="system-title">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+@@ -1051,6 +1081,7 @@ default settings</property>
+                                 <property name="bottom_attach">2</property>
+                                 <property name="x_padding">3</property>
+                                 <property name="y_padding">3</property>
++                                <property name="y_options">GTK_FILL</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1060,6 +1091,7 @@ default settings</property>
+                                 <property name="xalign">0</property>
+                                 <property name="yalign">0</property>
+                                 <property name="wrap">True</property>
++                                <property name="width-chars">18</property>
+                               </object>
+                               <packing>
+                                 <property name="left_attach">1</property>
+@@ -1068,6 +1100,7 @@ default settings</property>
+                                 <property name="bottom_attach">2</property>
+                                 <property name="x_padding">3</property>
+                                 <property name="y_padding">3</property>
++                                <property name="y_options">GTK_FILL</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1178,6 +1211,7 @@ default settings</property>
+                                 <property name="bottom_attach">2</property>
+                                 <property name="x_padding">3</property>
+                                 <property name="y_padding">3</property>
++                                <property name="y_options">GTK_FILL</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1187,6 +1221,7 @@ default settings</property>
+                                 <property name="xalign">0</property>
+                                 <property name="yalign">0</property>
+                                 <property name="wrap">True</property>
++                                <property name="width-chars">18</property>
+                               </object>
+                               <packing>
+                                 <property name="left_attach">1</property>
+@@ -1195,6 +1230,7 @@ default settings</property>
+                                 <property name="bottom_attach">2</property>
+                                 <property name="x_padding">3</property>
+                                 <property name="y_padding">3</property>
++                                <property name="y_options">GTK_FILL</property>
+                               </packing>
+                             </child>
+                             <child>
+@@ -1254,6 +1290,7 @@ default settings</property>
+                     <child>
+                       <object class="GtkButton" id="copy_settings_button">
+                         <property name="label" translatable="yes">Copy Settings...</property>
++                        <property name="use_action_appearance">False</property>
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="receives_default">True</property>
+@@ -1269,9 +1306,12 @@ default settings</property>
+                         <property name="y_padding">3</property>
+                       </packing>
+                     </child>
++                    <child>
++                      <placeholder/>
++                    </child>
+                   </object>
+                   <packing>
+-                    <property name="position">3</property>
++                    <property name="position">4</property>
+                   </packing>
+                 </child>
+                 <child type="tab">
+@@ -1281,7 +1321,7 @@ default settings</property>
+                     <property name="label" translatable="yes">System</property>
+                   </object>
+                   <packing>
+-                    <property name="position">3</property>
++                    <property name="position">4</property>
+                     <property name="tab_fill">False</property>
+                   </packing>
+                 </child>
+@@ -1302,4 +1342,11 @@ default settings</property>
+       </object>
+     </child>
+   </object>
++  <object class="GtkSizeGroup" id="system-input-source-sizegroup">
++    <property name="mode">vertical</property>
++    <widgets>
++      <widget name="user_input_source"/>
++      <widget name="system_input_source"/>
++    </widgets>
++  </object>
+ </interface>
+diff -uNrp a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
+--- a/panels/region/cinnamon-region-panel-xkb.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkb.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,190 +0,0 @@
+-/* cinnamon-region-panel-xkb.c
+- * Copyright (C) 2003-2007 Sergey V. Udaltsov
+- *
+- * Written by: Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include <config.h>
+-#endif
+-
+-#include <string.h>
+-#include <gdk/gdkx.h>
+-#include <glib/gi18n-lib.h>
+-
+-#include "cinnamon-region-panel-xkb.h"
+-
+-#include <libgnomekbd/gkbd-desktop-config.h>
+-
+-XklEngine *engine;
+-XklConfigRegistry *config_registry;
+-
+-GkbdKeyboardConfig initial_config;
+-GkbdDesktopConfig desktop_config;
+-
+-GSettings *xkb_keyboard_settings;
+-GSettings *xkb_desktop_settings;
+-
+-char *
+-xci_desc_to_utf8 (const XklConfigItem * ci)
+-{
+-	gchar *dd = g_strdup (ci->description);
+-	gchar *sd = g_strstrip (dd);
+-	gchar *rv = g_strdup (sd[0] == 0 ? ci->name : sd);
+-	g_free (dd);
+-	return rv;
+-}
+-
+-static void
+-cleanup_xkb_tabs (GtkBuilder * dialog,
+-		  GObject *where_the_object_wa)
+-{
+-	gkbd_desktop_config_term (&desktop_config);
+-	gkbd_keyboard_config_term (&initial_config);
+-	g_object_unref (G_OBJECT (config_registry));
+-	config_registry = NULL;
+-	/* Don't unref it here, or we'll crash if open the panel again */
+-	engine = NULL;
+-	g_object_unref (G_OBJECT (xkb_keyboard_settings));
+-	g_object_unref (G_OBJECT (xkb_desktop_settings));
+-	xkb_keyboard_settings = NULL;
+-	xkb_desktop_settings = NULL;
+-}
+-
+-static void
+-reset_to_defaults (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	GkbdKeyboardConfig empty_kbd_config;
+-
+-	gkbd_keyboard_config_init (&empty_kbd_config, engine);
+-	gkbd_keyboard_config_save (&empty_kbd_config);
+-	gkbd_keyboard_config_term (&empty_kbd_config);
+-
+-	g_settings_reset (xkb_desktop_settings,
+-			  GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP);
+-
+-	/* all the rest is g-s-d's business */
+-}
+-
+-static void
+-chk_new_windows_inherit_layout_toggled (GtkWidget *
+-					chk_new_windows_inherit_layout,
+-					GtkBuilder * dialog)
+-{
+-	xkb_save_default_group (gtk_toggle_button_get_active
+-				(GTK_TOGGLE_BUTTON
+-				 (chk_new_windows_inherit_layout)) ? -1 :
+-				0);
+-}
+-
+-void
+-setup_xkb_tabs (GtkBuilder * dialog)
+-{
+-	GtkWidget *widget;
+-	GtkStyleContext *context;
+-	GtkWidget *chk_new_windows_inherit_layout;
+-
+-	chk_new_windows_inherit_layout = WID ("chk_new_windows_inherit_layout");
+-
+-	xkb_desktop_settings = g_settings_new (GKBD_DESKTOP_SCHEMA);
+-	xkb_keyboard_settings = g_settings_new (GKBD_KEYBOARD_SCHEMA);
+-
+-	engine =
+-	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
+-				     (gdk_display_get_default ()));
+-	config_registry = xkl_config_registry_get_instance (engine);
+-
+-	gkbd_desktop_config_init (&desktop_config, engine);
+-	gkbd_desktop_config_load (&desktop_config);
+-
+-	xkl_config_registry_load (config_registry,
+-				  desktop_config.load_extra_items);
+-
+-	gkbd_keyboard_config_init (&initial_config, engine);
+-	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
+-
+-	/* Set initial state */
+-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("chk_separate_group_per_window")),
+-				      g_settings_get_boolean (xkb_desktop_settings,
+-							      GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW));
+-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chk_new_windows_inherit_layout),
+-				      xkb_get_default_group () < 0);
+-
+-	g_settings_bind (xkb_desktop_settings,
+-			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
+-			 WID ("chk_separate_group_per_window"), "active",
+-			 G_SETTINGS_BIND_DEFAULT);
+-	g_settings_bind (xkb_desktop_settings,
+-			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
+-			 WID ("chk_new_windows_inherit_layout"), "sensitive",
+-			 G_SETTINGS_BIND_DEFAULT);
+-	g_settings_bind (xkb_desktop_settings,
+-			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
+-			 WID ("chk_new_windows_default_layout"), "sensitive",
+-			 G_SETTINGS_BIND_DEFAULT);
+-
+-	xkb_layouts_prepare_selected_tree (dialog);
+-	xkb_layouts_fill_selected_tree (dialog);
+-
+-	xkb_layouts_register_buttons_handlers (dialog);
+-	g_signal_connect (G_OBJECT (WID ("xkb_reset_to_defaults")),
+-			  "clicked", G_CALLBACK (reset_to_defaults),
+-			  dialog);
+-
+-	g_signal_connect (G_OBJECT (chk_new_windows_inherit_layout),
+-			  "toggled",
+-			  G_CALLBACK
+-			  (chk_new_windows_inherit_layout_toggled),
+-			  dialog);
+-
+-	g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")),
+-				  "clicked",
+-				  G_CALLBACK (xkb_options_popup_dialog),
+-				  dialog);
+-
+-	xkb_layouts_register_conf_listener (dialog);
+-	xkb_options_register_conf_listener (dialog);
+-
+-	g_object_weak_ref (G_OBJECT (WID ("region_notebook")),
+-			   (GWeakNotify) cleanup_xkb_tabs, dialog);
+-
+-	enable_disable_restoring (dialog);
+-
+-	/* Setup junction between toolbar and treeview */
+-	widget = WID ("xkb_layouts_swindow");
+-	context = gtk_widget_get_style_context (widget);
+-	gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+-	widget = WID ("layouts-toolbar");
+-	context = gtk_widget_get_style_context (widget);
+-	gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+-}
+-
+-void
+-enable_disable_restoring (GtkBuilder * dialog)
+-{
+-	GkbdKeyboardConfig gswic;
+-	gboolean enable;
+-
+-	gkbd_keyboard_config_init (&gswic, engine);
+-	gkbd_keyboard_config_load (&gswic, NULL);
+-
+-	enable = !gkbd_keyboard_config_equals (&gswic, &initial_config);
+-
+-	gkbd_keyboard_config_term (&gswic);
+-	gtk_widget_set_sensitive (WID ("xkb_reset_to_defaults"), enable);
+-}
+diff -uNrp a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
+--- a/panels/region/cinnamon-region-panel-xkb.h	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkb.h	1970-01-01 01:00:00.000000000 +0100
+@@ -1,96 +0,0 @@
+-/* cinnamon-region-panel-xkb.h
+- * Copyright (C) 2003-2007 Sergey V Udaltsov
+- *
+- * Written by Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifndef __GNOME_KEYBOARD_PROPERTY_XKB_H
+-#define __GNOME_KEYBOARD_PROPERTY_XKB_H
+-
+-#include <gtk/gtk.h>
+-
+-#include "libgnomekbd/gkbd-keyboard-config.h"
+-#include "libgnomekbd/gkbd-util.h"
+-
+-G_BEGIN_DECLS
+-#define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s))
+-#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
+-extern XklEngine *engine;
+-extern XklConfigRegistry *config_registry;
+-extern GSettings *xkb_keyboard_settings;
+-extern GSettings *xkb_desktop_settings;
+-extern GkbdKeyboardConfig initial_config;
+-
+-extern void setup_xkb_tabs (GtkBuilder * dialog);
+-
+-extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
+-
+-extern void xkb_layouts_register_buttons_handlers (GtkBuilder * dialog);
+-
+-extern void xkb_layouts_register_conf_listener (GtkBuilder * dialog);
+-
+-extern void xkb_options_register_conf_listener (GtkBuilder * dialog);
+-
+-extern void xkb_layouts_prepare_selected_tree (GtkBuilder * dialog);
+-
+-extern void xkb_options_load_options (GtkBuilder * dialog);
+-
+-extern void xkb_options_popup_dialog (GtkBuilder * dialog);
+-
+-extern char *xci_desc_to_utf8 (const XklConfigItem * ci);
+-
+-extern gchar *xkb_layout_description_utf8 (const gchar * visible);
+-
+-extern void enable_disable_restoring (GtkBuilder * dialog);
+-
+-extern void preview_toggled (GtkBuilder * dialog, GtkWidget * button);
+-
+-extern GtkWidget *xkb_layout_choose (GtkBuilder * dialog);
+-
+-extern void xkb_layout_chooser_response (GtkDialog *dialog, gint response_id);
+-
+-extern gchar **xkb_layouts_get_selected_list (void);
+-
+-extern gchar **xkb_options_get_selected_list (void);
+-
+-#define xkb_layouts_set_selected_list(list) \
+-        g_settings_set_strv (xkb_keyboard_settings, \
+-                               GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, \
+-                               (const gchar *const*)(list))
+-
+-#define xkb_options_set_selected_list(list) \
+-        g_settings_set_strv (xkb_keyboard_settings, \
+-                               GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, \
+-                               (const gchar *const*)(list))
+-
+-extern GtkWidget *xkb_layout_preview_create_widget (GtkBuilder *
+-						    chooser_dialog);
+-
+-extern void xkb_layout_preview_update (GtkBuilder * chooser_dialog);
+-
+-extern void xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw,
+-						   const gchar * id);
+-
+-extern gchar *xkb_layout_chooser_get_selected_id (GtkDialog *dialog);
+-
+-extern void xkb_save_default_group (gint group_no);
+-
+-extern gint xkb_get_default_group (void);
+-
+-G_END_DECLS
+-#endif				/* __GNOME_KEYBOARD_PROPERTY_XKB_H */
+diff -uNrp a/panels/region/cinnamon-region-panel-xkbltadd.c b/panels/region/cinnamon-region-panel-xkbltadd.c
+--- a/panels/region/cinnamon-region-panel-xkbltadd.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkbltadd.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,495 +0,0 @@
+-/* cinnamon-region-panel-xkbltadd.c
+- * Copyright (C) 2007 Sergey V. Udaltsov
+- *
+- * Written by: Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include <config.h>
+-#endif
+-
+-#include <string.h>
+-
+-#include <libgnomekbd/gkbd-keyboard-drawing.h>
+-#include <libgnomekbd/gkbd-util.h>
+-
+-#include "cinnamon-region-panel-xkb.h"
+-
+-enum {
+-	COMBO_BOX_MODEL_COL_SORT,
+-	COMBO_BOX_MODEL_COL_VISIBLE,
+-	COMBO_BOX_MODEL_COL_XKB_ID,
+-	COMBO_BOX_MODEL_COL_COUNTRY_DESC,
+-	COMBO_BOX_MODEL_COL_LANGUAGE_DESC
+-};
+-
+-static gchar **search_pattern_list = NULL;
+-
+-static GtkWidget *preview_dialog = NULL;
+-
+-static GRegex *left_bracket_regex = NULL;
+-
+-#define RESPONSE_PREVIEW 1
+-
+-static void
+-xkb_preview_destroy_callback (GtkWidget * widget)
+-{
+-	preview_dialog = NULL;
+-}
+-
+-static gboolean
+-xkb_layout_chooser_selection_dupe (GtkDialog * dialog)
+-{
+-	gchar *selected_id =
+-	    (gchar *) xkb_layout_chooser_get_selected_id (dialog);
+-	gchar **layouts_list, **pl;
+-	gboolean rv = FALSE;
+-	if (selected_id == NULL)
+-		return rv;
+-	layouts_list = pl = xkb_layouts_get_selected_list ();
+-	while (pl && *pl) {
+-		if (!g_ascii_strcasecmp (*pl++, selected_id)) {
+-			rv = TRUE;
+-			break;
+-		}
+-	}
+-	g_strfreev (layouts_list);
+-	return rv;
+-}
+-
+-void
+-xkb_layout_chooser_response (GtkDialog * dialog, gint response)
+-{
+-	switch (response)
+-	case GTK_RESPONSE_OK:{
+-			/* Handled by the main code */
+-			break;
+-	case RESPONSE_PREVIEW:{
+-				gchar *selected_id = (gchar *)
+-				    xkb_layout_chooser_get_selected_id
+-				    (dialog);
+-
+-				if (selected_id != NULL) {
+-					if (preview_dialog == NULL) {
+-						preview_dialog =
+-						    gkbd_keyboard_drawing_dialog_new
+-						    ();
+-						g_signal_connect (G_OBJECT
+-								  (preview_dialog),
+-								  "destroy",
+-								  G_CALLBACK
+-								  (xkb_preview_destroy_callback),
+-								  NULL);
+-						/* Put into the separate group to avoid conflict
+-						   with modal parent */
+-						gtk_window_group_add_window
+-						    (gtk_window_group_new
+-						     (),
+-						     GTK_WINDOW
+-						     (preview_dialog));
+-					};
+-					gkbd_keyboard_drawing_dialog_set_layout
+-					    (preview_dialog,
+-					     config_registry, selected_id);
+-
+-					gtk_widget_show_all
+-					    (preview_dialog);
+-				}
+-			}
+-
+-			return;
+-		}
+-	if (preview_dialog != NULL) {
+-		gtk_widget_destroy (preview_dialog);
+-	}
+-	if (search_pattern_list != NULL) {
+-		g_strfreev (search_pattern_list);
+-		search_pattern_list = NULL;
+-	}
+-	gtk_widget_destroy (GTK_WIDGET (dialog));
+-}
+-
+-static gchar *
+-xkl_create_description_from_list (const XklConfigItem * item,
+-				  const XklConfigItem * subitem,
+-				  const gchar * prop_name,
+-				  const gchar *
+-				  (*desc_getter) (const gchar * code))
+-{
+-	gchar *rv = NULL, *code = NULL;
+-	gchar **list = NULL;
+-	const gchar *desc;
+-
+-	if (subitem != NULL)
+-		list =
+-		    (gchar
+-		     **) (g_object_get_data (G_OBJECT (subitem),
+-					     prop_name));
+-	if (list == NULL || *list == 0)
+-		list =
+-		    (gchar
+-		     **) (g_object_get_data (G_OBJECT (item), prop_name));
+-
+-	/* First try the parent id as such */
+-	desc = desc_getter (item->name);
+-	if (desc != NULL) {
+-		rv = g_utf8_strup (desc, -1);
+-	} else {
+-		code = g_utf8_strup (item->name, -1);
+-		desc = desc_getter (code);
+-		if (desc != NULL) {
+-			rv = g_utf8_strup (desc, -1);
+-		}
+-		g_free (code);
+-	}
+-
+-	if (list == NULL || *list == 0)
+-		return rv;
+-
+-	while (*list != 0) {
+-		code = *list++;
+-		desc = desc_getter (code);
+-		if (desc != NULL) {
+-			gchar *udesc = g_utf8_strup (desc, -1);
+-			if (rv == NULL) {
+-				rv = udesc;
+-			} else {
+-				gchar *orv = rv;
+-				rv = g_strdup_printf ("%s %s", rv, udesc);
+-				g_free (orv);
+-				g_free (udesc);
+-			}
+-		}
+-	}
+-	return rv;
+-}
+-
+-static void
+-xkl_layout_add_to_list (XklConfigRegistry * config,
+-			const XklConfigItem * item,
+-			const XklConfigItem * subitem,
+-			GtkBuilder * chooser_dialog)
+-{
+-	GtkListStore *list_store =
+-	    GTK_LIST_STORE (gtk_builder_get_object (chooser_dialog,
+-						    "layout_list_model"));
+-	GtkTreeIter iter;
+-
+-	gchar *utf_variant_name =
+-	    subitem ?
+-	    xkb_layout_description_utf8 (gkbd_keyboard_config_merge_items
+-					 (item->name,
+-					  subitem->name)) :
+-	    xci_desc_to_utf8 (item);
+-
+-	const gchar *xkb_id =
+-	    subitem ? gkbd_keyboard_config_merge_items (item->name,
+-							subitem->name) :
+-	    item->name;
+-
+-	gchar *country_desc =
+-	    xkl_create_description_from_list (item, subitem,
+-					      XCI_PROP_COUNTRY_LIST,
+-					      xkl_get_country_name);
+-	gchar *language_desc =
+-	    xkl_create_description_from_list (item, subitem,
+-					      XCI_PROP_LANGUAGE_LIST,
+-					      xkl_get_language_name);
+-
+-	gchar *tmp = utf_variant_name;
+-	utf_variant_name =
+-	    g_regex_replace_literal (left_bracket_regex, tmp, -1, 0,
+-				     "&lt;", 0, NULL);
+-	g_free (tmp);
+-
+-	if (subitem
+-	    && g_object_get_data (G_OBJECT (subitem),
+-				  XCI_PROP_EXTRA_ITEM)) {
+-		gchar *buf =
+-		    g_strdup_printf ("<i>%s</i>", utf_variant_name);
+-		gtk_list_store_insert_with_values (list_store, &iter, -1,
+-						   COMBO_BOX_MODEL_COL_SORT,
+-						   utf_variant_name,
+-						   COMBO_BOX_MODEL_COL_VISIBLE,
+-						   buf,
+-						   COMBO_BOX_MODEL_COL_XKB_ID,
+-						   xkb_id,
+-						   COMBO_BOX_MODEL_COL_COUNTRY_DESC,
+-						   country_desc,
+-						   COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
+-						   language_desc, -1);
+-		g_free (buf);
+-	} else
+-		gtk_list_store_insert_with_values (list_store, &iter,
+-						   -1,
+-						   COMBO_BOX_MODEL_COL_SORT,
+-						   utf_variant_name,
+-						   COMBO_BOX_MODEL_COL_VISIBLE,
+-						   utf_variant_name,
+-						   COMBO_BOX_MODEL_COL_XKB_ID,
+-						   xkb_id,
+-						   COMBO_BOX_MODEL_COL_COUNTRY_DESC,
+-						   country_desc,
+-						   COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
+-						   language_desc, -1);
+-	g_free (utf_variant_name);
+-	g_free (country_desc);
+-	g_free (language_desc);
+-}
+-
+-static void
+-xkb_layout_filter_clear (GtkEntry * entry,
+-			 GtkEntryIconPosition icon_pos,
+-			 GdkEvent * event, gpointer user_data)
+-{
+-	gtk_entry_set_text (entry, "");
+-}
+-
+-static void
+-xkb_layout_filter_changed (GtkBuilder * chooser_dialog)
+-{
+-	GtkTreeModelFilter *filtered_model =
+-	    GTK_TREE_MODEL_FILTER (gtk_builder_get_object (chooser_dialog,
+-							   "filtered_layout_list_model"));
+-	GtkWidget *xkb_layout_filter = CWID ("xkb_layout_filter");
+-	const gchar *pattern =
+-	    gtk_entry_get_text (GTK_ENTRY (xkb_layout_filter));
+-	gchar *upattern = g_utf8_strup (pattern, -1);
+-
+-	if (!g_strcmp0 (pattern, "")) {
+-		g_object_set (G_OBJECT (xkb_layout_filter),
+-			      "secondary-icon-name", "edit-find-symbolic",
+-			      "secondary-icon-activatable", FALSE,
+-			      "secondary-icon-sensitive", FALSE, NULL);
+-	} else {
+-		g_object_set (G_OBJECT (xkb_layout_filter),
+-			      "secondary-icon-name", "edit-clear-symbolic",
+-			      "secondary-icon-activatable", TRUE,
+-			      "secondary-icon-sensitive", TRUE, NULL);
+-	}
+-
+-	if (search_pattern_list != NULL)
+-		g_strfreev (search_pattern_list);
+-
+-	search_pattern_list = g_strsplit (upattern, " ", -1);
+-	g_free (upattern);
+-
+-	gtk_tree_model_filter_refilter (filtered_model);
+-}
+-
+-static void
+-xkb_layout_chooser_selection_changed (GtkTreeSelection * selection,
+-				      GtkBuilder * chooser_dialog)
+-{
+-	GList *selected_layouts =
+-	    gtk_tree_selection_get_selected_rows (selection, NULL);
+-	GtkWidget *add_button = CWID ("btnOk");
+-	GtkWidget *preview_button = CWID ("btnPreview");
+-	gboolean anything_selected = g_list_length (selected_layouts) == 1;
+-	gboolean dupe =
+-	    xkb_layout_chooser_selection_dupe (GTK_DIALOG
+-					       (CWID
+-						("xkb_layout_chooser")));
+-
+-	gtk_widget_set_sensitive (add_button, anything_selected && !dupe);
+-	gtk_widget_set_sensitive (preview_button, anything_selected);
+-}
+-
+-static void
+-xkb_layout_chooser_row_activated (GtkTreeView * tree_view,
+-				  GtkTreePath * path,
+-				  GtkTreeViewColumn * column,
+-				  GtkBuilder * chooser_dialog)
+-{
+-	GtkWidget *add_button = CWID ("btnOk");
+-	GtkWidget *dialog = CWID ("xkb_layout_chooser");
+-
+-	if (gtk_widget_is_sensitive (add_button))
+-		gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+-}
+-
+-static gboolean
+-xkb_filter_layouts (GtkTreeModel * model,
+-		    GtkTreeIter * iter, gpointer data)
+-{
+-	gchar *desc = NULL, *country_desc = NULL, *language_desc =
+-	    NULL, **pattern;
+-	gboolean rv = TRUE;
+-
+-	if (search_pattern_list == NULL || search_pattern_list[0] == NULL)
+-		return TRUE;
+-
+-	gtk_tree_model_get (model, iter,
+-			    COMBO_BOX_MODEL_COL_SORT, &desc,
+-			    COMBO_BOX_MODEL_COL_COUNTRY_DESC,
+-			    &country_desc,
+-			    COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
+-			    &language_desc, -1);
+-
+-	pattern = search_pattern_list;
+-	do {
+-		gboolean is_pattern_found = FALSE;
+-		gchar *udesc = g_utf8_strup (desc, -1);
+-		if (udesc != NULL && g_strstr_len (udesc, -1, *pattern)) {
+-			is_pattern_found = TRUE;
+-		} else if (country_desc != NULL
+-			   && g_strstr_len (country_desc, -1, *pattern)) {
+-			is_pattern_found = TRUE;
+-		} else if (language_desc != NULL
+-			   && g_strstr_len (language_desc, -1, *pattern)) {
+-			is_pattern_found = TRUE;
+-		}
+-		g_free (udesc);
+-
+-		if (!is_pattern_found) {
+-			rv = FALSE;
+-			break;
+-		}
+-
+-	} while (*++pattern != NULL);
+-
+-	g_free (desc);
+-	g_free (country_desc);
+-	g_free (language_desc);
+-	return rv;
+-}
+-
+-GtkWidget *
+-xkb_layout_choose (GtkBuilder * dialog)
+-{
+-	GtkBuilder *chooser_dialog = gtk_builder_new ();
+-	GtkWidget *chooser, *xkb_filtered_layouts_list, *xkb_layout_filter;
+-	GtkTreeViewColumn *visible_column;
+-	GtkTreeSelection *selection;
+-	GtkListStore *model;
+-	GtkTreeModelFilter *filtered_model;
+-    gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE);
+-	gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR
+-				   "/cinnamon-region-panel-layout-chooser.ui",
+-				   NULL);
+-	chooser = CWID ("xkb_layout_chooser");
+-	xkb_filtered_layouts_list = CWID ("xkb_filtered_layouts_list");
+-	xkb_layout_filter = CWID ("xkb_layout_filter");
+-
+-	g_object_set_data (G_OBJECT (chooser), "xkb_filtered_layouts_list",
+-			   xkb_filtered_layouts_list);
+-	visible_column =
+-	    gtk_tree_view_column_new_with_attributes ("Layout",
+-						      gtk_cell_renderer_text_new
+-						      (), "markup",
+-						      COMBO_BOX_MODEL_COL_VISIBLE,
+-						      NULL);
+-
+-	gtk_window_set_transient_for (GTK_WINDOW (chooser),
+-				      GTK_WINDOW
+-				      (gtk_widget_get_toplevel
+-				       (WID ("region_notebook"))));
+-
+-	gtk_tree_view_append_column (GTK_TREE_VIEW
+-				     (xkb_filtered_layouts_list),
+-				     visible_column);
+-	g_signal_connect_swapped (G_OBJECT (xkb_layout_filter),
+-				  "notify::text",
+-				  G_CALLBACK
+-				  (xkb_layout_filter_changed),
+-				  chooser_dialog);
+-
+-	g_signal_connect (G_OBJECT (xkb_layout_filter), "icon-release",
+-			  G_CALLBACK (xkb_layout_filter_clear), NULL);
+-
+-	selection =
+-	    gtk_tree_view_get_selection (GTK_TREE_VIEW
+-					 (xkb_filtered_layouts_list));
+-
+-	g_signal_connect (G_OBJECT (selection),
+-			  "changed",
+-			  G_CALLBACK
+-			  (xkb_layout_chooser_selection_changed),
+-			  chooser_dialog);
+-
+-	xkb_layout_chooser_selection_changed (selection, chooser_dialog);
+-
+-	g_signal_connect (G_OBJECT (xkb_filtered_layouts_list),
+-			  "row-activated",
+-			  G_CALLBACK (xkb_layout_chooser_row_activated),
+-			  chooser_dialog);
+-
+-	filtered_model =
+-	    GTK_TREE_MODEL_FILTER (gtk_builder_get_object
+-				   (chooser_dialog,
+-				    "filtered_layout_list_model"));
+-	model =
+-	    GTK_LIST_STORE (gtk_builder_get_object
+-			    (chooser_dialog, "layout_list_model"));
+-
+-	left_bracket_regex = g_regex_new ("<", 0, 0, NULL);
+-
+-	xkl_config_registry_search_by_pattern (config_registry,
+-					       NULL,
+-					       (TwoConfigItemsProcessFunc)
+-					       (xkl_layout_add_to_list),
+-					       chooser_dialog);
+-
+-	g_regex_unref (left_bracket_regex);
+-
+-	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
+-					      COMBO_BOX_MODEL_COL_SORT,
+-					      GTK_SORT_ASCENDING);
+-
+-	gtk_tree_model_filter_set_visible_func (filtered_model,
+-						xkb_filter_layouts,
+-						NULL, NULL);
+-
+-	gtk_widget_grab_focus (xkb_layout_filter);
+-
+-	gtk_widget_show (chooser);
+-
+-	return chooser;
+-}
+-
+-gchar *
+-xkb_layout_chooser_get_selected_id (GtkDialog * dialog)
+-{
+-	GtkTreeModel *filtered_list_model;
+-	GtkWidget *xkb_filtered_layouts_list =
+-	    g_object_get_data (G_OBJECT (dialog),
+-			       "xkb_filtered_layouts_list");
+-	GtkTreeIter viter;
+-	gchar *v_id;
+-	GtkTreeSelection *selection =
+-	    gtk_tree_view_get_selection (GTK_TREE_VIEW
+-					 (xkb_filtered_layouts_list));
+-	GList *selected_layouts =
+-	    gtk_tree_selection_get_selected_rows (selection,
+-						  &filtered_list_model);
+-
+-	if (g_list_length (selected_layouts) != 1)
+-		return NULL;
+-
+-	gtk_tree_model_get_iter (filtered_list_model,
+-				 &viter,
+-				 (GtkTreePath *) (selected_layouts->data));
+-	g_list_foreach (selected_layouts,
+-			(GFunc) gtk_tree_path_free, NULL);
+-	g_list_free (selected_layouts);
+-
+-	gtk_tree_model_get (filtered_list_model, &viter,
+-			    COMBO_BOX_MODEL_COL_XKB_ID, &v_id, -1);
+-
+-	return v_id;
+-}
+diff -uNrp a/panels/region/cinnamon-region-panel-xkblt.c b/panels/region/cinnamon-region-panel-xkblt.c
+--- a/panels/region/cinnamon-region-panel-xkblt.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkblt.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,470 +0,0 @@
+-/* cinnamon-region-panel-xkblt.c
+- * Copyright (C) 2003-2007 Sergey V. Udaltsov
+- *
+- * Written by: Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include <config.h>
+-#endif
+-
+-#include <gdk/gdkx.h>
+-#include <glib/gi18n-lib.h>
+-
+-#include <libgnomekbd/gkbd-desktop-config.h>
+-#include <libgnomekbd/gkbd-keyboard-drawing.h>
+-
+-#include "cinnamon-region-panel-xkb.h"
+-
+-enum {
+-	SEL_LAYOUT_TREE_COL_DESCRIPTION,
+-	SEL_LAYOUT_TREE_COL_ID,
+-	SEL_LAYOUT_TREE_COL_ENABLED,
+-	SEL_LAYOUT_N_COLS
+-};
+-
+-static int idx2select = -1;
+-static int max_selected_layouts = -1;
+-
+-static GtkCellRenderer *text_renderer;
+-
+-static gboolean disable_buttons_sensibility_update = FALSE;
+-
+-static gboolean
+-get_selected_iter (GtkBuilder    *dialog,
+-		   GtkTreeModel **model,
+-		   GtkTreeIter   *iter)
+-{
+-	GtkTreeSelection *selection;
+-
+-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("xkb_layouts_selected")));
+-
+-	return gtk_tree_selection_get_selected (selection, model, iter);
+-}
+-
+-static void
+-set_selected_path (GtkBuilder    *dialog,
+-		   GtkTreePath   *path)
+-{
+-	GtkTreeSelection *selection;
+-
+-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("xkb_layouts_selected")));
+-
+-	gtk_tree_selection_select_path (selection, path);
+-}
+-
+-static gint
+-find_selected_layout_idx (GtkBuilder *dialog)
+-{
+-	GtkTreeIter selected_iter;
+-	GtkTreeModel *model;
+-	GtkTreePath *path;
+-	gint *indices;
+-	gint rv;
+-
+-	if (!get_selected_iter (dialog, &model, &selected_iter))
+-		return -1;
+-
+-	path = gtk_tree_model_get_path (model, &selected_iter);
+-	if (path == NULL)
+-		return -1;
+-
+-	indices = gtk_tree_path_get_indices (path);
+-	rv = indices[0];
+-	gtk_tree_path_free (path);
+-	return rv;
+-}
+-
+-gchar **
+-xkb_layouts_get_selected_list (void)
+-{
+-	gchar **retval;
+-
+-	retval = g_settings_get_strv (xkb_keyboard_settings,
+-				      GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS);
+-	if (retval == NULL || retval[0] == NULL) {
+-		g_strfreev (retval);
+-		retval = g_strdupv (initial_config.layouts_variants);
+-	}
+-
+-	return retval;
+-}
+-
+-gint
+-xkb_get_default_group ()
+-{
+-	return g_settings_get_int (xkb_desktop_settings,
+-				   GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP);
+-}
+-
+-void
+-xkb_save_default_group (gint default_group)
+-{
+-	g_settings_set_int (xkb_desktop_settings,
+-			    GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP,
+-			    default_group);
+-}
+-
+-static void
+-xkb_layouts_enable_disable_buttons (GtkBuilder * dialog)
+-{
+-	GtkWidget *add_layout_btn = WID ("xkb_layouts_add");
+-	GtkWidget *show_layout_btn = WID ("xkb_layouts_show");
+-	GtkWidget *del_layout_btn = WID ("xkb_layouts_remove");
+-	GtkWidget *selected_layouts_tree = WID ("xkb_layouts_selected");
+-	GtkWidget *move_up_layout_btn = WID ("xkb_layouts_move_up");
+-	GtkWidget *move_down_layout_btn = WID ("xkb_layouts_move_down");
+-
+-	GtkTreeSelection *s_selection =
+-	    gtk_tree_view_get_selection (GTK_TREE_VIEW
+-					 (selected_layouts_tree));
+-	const int n_selected_selected_layouts =
+-	    gtk_tree_selection_count_selected_rows (s_selection);
+-	GtkTreeModel *selected_layouts_model = gtk_tree_view_get_model
+-	    (GTK_TREE_VIEW (selected_layouts_tree));
+-	const int n_selected_layouts =
+-	    gtk_tree_model_iter_n_children (selected_layouts_model,
+-					    NULL);
+-	gint sidx = find_selected_layout_idx (dialog);
+-
+-	if (disable_buttons_sensibility_update)
+-		return;
+-
+-	gtk_widget_set_sensitive (add_layout_btn,
+-				  (n_selected_layouts <
+-				   max_selected_layouts
+-				   || max_selected_layouts == 0));
+-	gtk_widget_set_sensitive (del_layout_btn, (n_selected_layouts > 1)
+-				  && (n_selected_selected_layouts > 0));
+-	gtk_widget_set_sensitive (show_layout_btn,
+-				  (n_selected_selected_layouts > 0));
+-	gtk_widget_set_sensitive (move_up_layout_btn, sidx > 0);
+-	gtk_widget_set_sensitive (move_down_layout_btn, sidx >= 0
+-				  && sidx < (n_selected_layouts - 1));
+-}
+-
+-static void
+-update_layouts_list (GtkTreeModel *model,
+-		     GtkBuilder   *dialog)
+-{
+-	gboolean cont;
+-	GtkTreeIter iter;
+-	GPtrArray *array;
+-
+-	array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
+-	cont = gtk_tree_model_get_iter_first (model, &iter);
+-	while (cont) {
+-		char *id;
+-
+-		gtk_tree_model_get (model, &iter,
+-				    SEL_LAYOUT_TREE_COL_ID, &id,
+-				    -1);
+-		g_ptr_array_add (array, id);
+-		cont = gtk_tree_model_iter_next (model, &iter);
+-	}
+-	g_ptr_array_add (array, NULL);
+-	xkb_layouts_set_selected_list (array->pdata);
+-	g_ptr_array_free (array, TRUE);
+-
+-	xkb_layouts_enable_disable_buttons (dialog);
+-}
+-
+-static void
+-xkb_layouts_drag_end (GtkWidget	     *widget,
+-		      GdkDragContext *drag_context,
+-		      gpointer	      user_data)
+-{
+-	update_layouts_list (gtk_tree_view_get_model (GTK_TREE_VIEW (widget)),
+-			     GTK_BUILDER (user_data));
+-}
+-
+-void
+-xkb_layouts_prepare_selected_tree (GtkBuilder * dialog)
+-{
+-	GtkListStore *list_store;
+-	GtkWidget *tree_view = WID ("xkb_layouts_selected");
+-	GtkTreeSelection *selection;
+-	GtkTreeViewColumn *desc_column;
+-
+-	list_store = gtk_list_store_new (SEL_LAYOUT_N_COLS,
+-					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+-
+-	text_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
+-
+-	desc_column =
+-	    gtk_tree_view_column_new_with_attributes (_("Layout"),
+-						      text_renderer,
+-						      "text",
+-						      SEL_LAYOUT_TREE_COL_DESCRIPTION,
+-						      "sensitive",
+-						      SEL_LAYOUT_TREE_COL_ENABLED,
+-						      NULL);
+-	selection =
+-	    gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+-
+-	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+-				 GTK_TREE_MODEL (list_store));
+-
+-	gtk_tree_view_column_set_sizing (desc_column,
+-					 GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+-	gtk_tree_view_column_set_resizable (desc_column, TRUE);
+-	gtk_tree_view_column_set_expand (desc_column, TRUE);
+-
+-	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
+-				     desc_column);
+-
+-	g_signal_connect_swapped (G_OBJECT (selection), "changed",
+-				  G_CALLBACK
+-				  (xkb_layouts_enable_disable_buttons),
+-				  dialog);
+-	max_selected_layouts = xkl_engine_get_max_num_groups (engine);
+-
+-	/* Setting up DnD */
+-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (tree_view), TRUE);
+-	g_signal_connect (G_OBJECT (tree_view), "drag-end",
+-			  G_CALLBACK (xkb_layouts_drag_end), dialog);
+-}
+-
+-gchar *
+-xkb_layout_description_utf8 (const gchar * visible)
+-{
+-	char *l, *sl, *v, *sv;
+-	if (gkbd_keyboard_config_get_descriptions
+-	    (config_registry, visible, &sl, &l, &sv, &v))
+-		visible =
+-		    gkbd_keyboard_config_format_full_description (l, v);
+-	return g_strstrip (g_strdup (visible));
+-}
+-
+-void
+-xkb_layouts_fill_selected_tree (GtkBuilder * dialog)
+-{
+-	gchar **layouts = xkb_layouts_get_selected_list ();
+-	guint i;
+-	GtkListStore *list_store =
+-	    GTK_LIST_STORE (gtk_tree_view_get_model
+-			    (GTK_TREE_VIEW
+-			     (WID ("xkb_layouts_selected"))));
+-
+-	/* temporarily disable the buttons' status update */
+-	disable_buttons_sensibility_update = TRUE;
+-
+-	gtk_list_store_clear (list_store);
+-
+-	for (i = 0; layouts != NULL && layouts[i] != NULL; i++) {
+-		char *cur_layout = layouts[i];
+-		gchar *utf_visible =
+-		    xkb_layout_description_utf8 (cur_layout);
+-
+-		gtk_list_store_insert_with_values (list_store, NULL, G_MAXINT,
+-						   SEL_LAYOUT_TREE_COL_DESCRIPTION,
+-						   utf_visible,
+-						   SEL_LAYOUT_TREE_COL_ID,
+-						   cur_layout,
+-						   SEL_LAYOUT_TREE_COL_ENABLED,
+-						   i < max_selected_layouts, -1);
+-		g_free (utf_visible);
+-	}
+-
+-	g_strfreev (layouts);
+-
+-	/* enable the buttons' status update */
+-	disable_buttons_sensibility_update = FALSE;
+-
+-	if (idx2select != -1) {
+-		GtkTreeSelection *selection =
+-		    gtk_tree_view_get_selection ((GTK_TREE_VIEW
+-						  (WID
+-						   ("xkb_layouts_selected"))));
+-		GtkTreePath *path =
+-		    gtk_tree_path_new_from_indices (idx2select, -1);
+-		gtk_tree_selection_select_path (selection, path);
+-		gtk_tree_path_free (path);
+-		idx2select = -1;
+-	} else {
+-		/* if there is nothing to select - just enable/disable the buttons,
+-		   otherwise it would be done by the selection change */
+-		xkb_layouts_enable_disable_buttons (dialog);
+-	}
+-}
+-
+-static void
+-add_default_switcher_if_necessary ()
+-{
+-	gchar **layouts_list = xkb_layouts_get_selected_list();
+-	gchar **options_list = xkb_options_get_selected_list ();
+-	gboolean was_appended;
+-
+-	options_list =
+-	    gkbd_keyboard_config_add_default_switch_option_if_necessary
+-	    (layouts_list, options_list, &was_appended);
+-	if (was_appended)
+-		xkb_options_set_selected_list (options_list);
+-	g_strfreev (options_list);
+-}
+-
+-static void
+-chooser_response (GtkDialog  *chooser,
+-		  int         response_id,
+-		  GtkBuilder *dialog)
+-{
+-	if (response_id == GTK_RESPONSE_OK) {
+-		char *id, *name;
+-		GtkListStore *list_store;
+-
+-		list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (WID ("xkb_layouts_selected"))));
+-		id = xkb_layout_chooser_get_selected_id (chooser);
+-		name = xkb_layout_description_utf8 (id);
+-		gtk_list_store_insert_with_values (list_store, NULL, G_MAXINT,
+-						   SEL_LAYOUT_TREE_COL_DESCRIPTION, name,
+-						   SEL_LAYOUT_TREE_COL_ID, id,
+-						   SEL_LAYOUT_TREE_COL_ENABLED, TRUE,
+-						   -1);
+-		g_free (name);
+-		add_default_switcher_if_necessary ();
+-		update_layouts_list (GTK_TREE_MODEL (list_store), dialog);
+-	}
+-
+-	xkb_layout_chooser_response (chooser, response_id);
+-}
+-
+-static void
+-add_selected_layout (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	GtkWidget *chooser;
+-
+-	chooser = xkb_layout_choose (dialog);
+-	g_signal_connect (G_OBJECT (chooser), "response",
+-			  G_CALLBACK (chooser_response), dialog);
+-}
+-
+-static void
+-show_selected_layout (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	gint idx = find_selected_layout_idx (dialog);
+-
+-	if (idx != -1) {
+-		GtkWidget *parent = WID ("region_notebook");
+-		GtkWidget *popup = gkbd_keyboard_drawing_dialog_new ();
+-		gkbd_keyboard_drawing_dialog_set_group (popup,
+-							config_registry,
+-							idx);
+-		gtk_window_set_transient_for (GTK_WINDOW (popup),
+-					      GTK_WINDOW
+-					      (gtk_widget_get_toplevel
+-					       (parent)));
+-		gtk_widget_show_all (popup);
+-	}
+-}
+-
+-static void
+-remove_selected_layout (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	GtkTreeModel *model;
+-	GtkTreeIter iter;
+-
+-	if (get_selected_iter (dialog, &model, &iter) == FALSE)
+-		return;
+-
+-	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+-	update_layouts_list (model, dialog);
+-}
+-
+-static void
+-move_up_selected_layout (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	GtkTreeModel *model;
+-	GtkTreeIter iter, prev;
+-	GtkTreePath *path;
+-
+-	if (get_selected_iter (dialog, &model, &iter) == FALSE)
+-		return;
+-
+-	prev = iter;
+-	if (!gtk_tree_model_iter_previous (model, &prev))
+-		return;
+-
+-	path = gtk_tree_model_get_path (model, &prev);
+-	
+-	gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &prev);
+-
+-	update_layouts_list (model, dialog);
+-	
+-	set_selected_path (dialog, path);
+-
+-	gtk_tree_path_free (path);	
+-}
+-
+-static void
+-move_down_selected_layout (GtkWidget * button, GtkBuilder * dialog)
+-{
+-	GtkTreeModel *model;
+-	GtkTreeIter iter, next;
+-	GtkTreePath *path;
+-
+-	if (get_selected_iter (dialog, &model, &iter) == FALSE)
+-		return;
+-
+-	next = iter;
+-	if (!gtk_tree_model_iter_next (model, &next))
+-		return;
+-
+-	path = gtk_tree_model_get_path (model, &next);
+-
+-	gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &next);
+-
+-	update_layouts_list (model, dialog);
+-
+-	set_selected_path (dialog, path);
+-
+-	gtk_tree_path_free (path);	
+-}
+-
+-void
+-xkb_layouts_register_buttons_handlers (GtkBuilder * dialog)
+-{
+-	g_signal_connect (G_OBJECT (WID ("xkb_layouts_add")), "clicked",
+-			  G_CALLBACK (add_selected_layout), dialog);
+-	g_signal_connect (G_OBJECT (WID ("xkb_layouts_show")), "clicked",
+-			  G_CALLBACK (show_selected_layout), dialog);
+-	g_signal_connect (G_OBJECT (WID ("xkb_layouts_remove")), "clicked",
+-			  G_CALLBACK (remove_selected_layout), dialog);
+-	g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_up")),
+-			  "clicked", G_CALLBACK (move_up_selected_layout),
+-			  dialog);
+-	g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_down")),
+-			  "clicked",
+-			  G_CALLBACK (move_down_selected_layout), dialog);
+-}
+-
+-static void
+-xkb_layouts_update_list (GSettings * settings,
+-			 gchar * key, GtkBuilder * dialog)
+-{
+-	if (strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS) == 0) {
+-		xkb_layouts_fill_selected_tree (dialog);
+-		enable_disable_restoring (dialog);
+-	}
+-}
+-
+-void
+-xkb_layouts_register_conf_listener (GtkBuilder * dialog)
+-{
+-	g_signal_connect (xkb_keyboard_settings, "changed",
+-			  G_CALLBACK (xkb_layouts_update_list), dialog);
+-}
+diff -uNrp a/panels/region/cinnamon-region-panel-xkbot.c b/panels/region/cinnamon-region-panel-xkbot.c
+--- a/panels/region/cinnamon-region-panel-xkbot.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkbot.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,516 +0,0 @@
+-/* cinnamon-region-panel-xkbot.c
+- * Copyright (C) 2003-2007 Sergey V. Udaltsov
+- *
+- * Written by: Sergey V. Udaltsov <svu@gnome.org>
+- *             John Spray <spray_john@users.sourceforge.net>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include <config.h>
+-#endif
+-
+-#include <glib/gi18n-lib.h>
+-#include <string.h>
+-
+-#include "cinnamon-region-panel-xkb.h"
+-
+-static GtkBuilder *chooser_dialog = NULL;
+-static const char *current1st_level_id = NULL;
+-static GSList *option_checks_list = NULL;
+-static GtkWidget *current_none_radio = NULL;
+-static GtkWidget *current_expander = NULL;
+-static gboolean current_multi_select = FALSE;
+-static GSList *current_radio_group = NULL;
+-
+-#define OPTION_ID_PROP "optionID"
+-#define SELCOUNTER_PROP "selectionCounter"
+-#define GCONFSTATE_PROP "gconfState"
+-#define EXPANDERS_PROP "expandersList"
+-
+-gchar **
+-xkb_options_get_selected_list (void)
+-{
+-	gchar **retval;
+-
+-	retval =
+-	    g_settings_get_strv (xkb_keyboard_settings,
+-				 GKBD_KEYBOARD_CONFIG_KEY_OPTIONS);
+-	if (retval == NULL) {
+-		retval = g_strdupv (initial_config.options);
+-	}
+-
+-	return retval;
+-}
+-
+-/* Returns the selection counter of the expander (static current_expander) */
+-static int
+-xkb_options_expander_selcounter_get (void)
+-{
+-	return
+-	    GPOINTER_TO_INT (g_object_get_data
+-			     (G_OBJECT (current_expander),
+-			      SELCOUNTER_PROP));
+-}
+-
+-/* Increments the selection counter in the expander (static current_expander) 
+-   using the value (can be 0)*/
+-static void
+-xkb_options_expander_selcounter_add (int value)
+-{
+-	g_object_set_data (G_OBJECT (current_expander), SELCOUNTER_PROP,
+-			   GINT_TO_POINTER
+-			   (xkb_options_expander_selcounter_get ()
+-			    + value));
+-}
+-
+-/* Resets the seletion counter in the expander (static current_expander) */
+-static void
+-xkb_options_expander_selcounter_reset (void)
+-{
+-	g_object_set_data (G_OBJECT (current_expander), SELCOUNTER_PROP,
+-			   GINT_TO_POINTER (0));
+-}
+-
+-/* Formats the expander (static current_expander), based on the selection counter */
+-static void
+-xkb_options_expander_highlight (void)
+-{
+-	char *utf_group_name =
+-	    g_object_get_data (G_OBJECT (current_expander),
+-			       "utfGroupName");
+-	int counter = xkb_options_expander_selcounter_get ();
+-	if (utf_group_name != NULL) {
+-		gchar *titlemarkup =
+-		    g_strconcat (counter >
+-				 0 ? "<span weight=\"bold\">" : "<span>",
+-				 utf_group_name, "</span>", NULL);
+-		gtk_expander_set_label (GTK_EXPANDER (current_expander),
+-					titlemarkup);
+-		g_free (titlemarkup);
+-	}
+-}
+-
+-/* Add optionname from the backend's selection list if it's not
+-   already in there. */
+-static void
+-xkb_options_select (gchar * optionname)
+-{
+-	gboolean already_selected = FALSE;
+-	gchar **options_list;
+-	guint i;
+-
+-	options_list = xkb_options_get_selected_list ();
+-	for (i = 0; options_list != NULL && options_list[i] != NULL; i++) {
+-		gchar *option = options_list[i];
+-		if (!strcmp (option, optionname)) {
+-			already_selected = TRUE;
+-			break;
+-		}
+-	}
+-
+-	if (!already_selected) {
+-		options_list =
+-		    gkbd_strv_append (options_list, g_strdup (optionname));
+-		xkb_options_set_selected_list (options_list);
+-	}
+-
+-	g_strfreev (options_list);
+-}
+-
+-/* Remove all occurences of optionname from the backend's selection list */
+-static void
+-xkb_options_deselect (gchar * optionname)
+-{
+-	gchar **options_list = xkb_options_get_selected_list ();
+-	if (options_list != NULL) {
+-		gchar **option = options_list;
+-		while (*option != NULL) {
+-			gchar *id = *option;
+-			if (!strcmp (id, optionname)) {
+-				gkbd_strv_behead (option);
+-			} else
+-				option++;
+-		}
+-		xkb_options_set_selected_list (options_list);
+-	}
+-	g_strfreev (options_list);
+-}
+-
+-/* Return true if optionname describes a string already in the backend's
+-   list of selected options */
+-static gboolean
+-xkb_options_is_selected (gchar * optionname)
+-{
+-	gboolean retval = FALSE;
+-	gchar **options_list = xkb_options_get_selected_list ();
+-	if (options_list != NULL) {
+-		gchar **option = options_list;
+-		while (*option != NULL) {
+-			if (!strcmp (*option, optionname)) {
+-				retval = TRUE;
+-				break;
+-			}
+-			option++;
+-		}
+-	}
+-	g_strfreev (options_list);
+-	return retval;
+-}
+-
+-/* Make sure selected options stay visible when navigating with the keyboard */
+-static gboolean
+-option_focused_cb (GtkWidget * widget, GdkEventFocus * event,
+-		   gpointer data)
+-{
+-	GtkScrolledWindow *win = GTK_SCROLLED_WINDOW (data);
+-	GtkAllocation alloc;
+-	GtkAdjustment *adj;
+-
+-	gtk_widget_get_allocation (widget, &alloc);
+-	adj = gtk_scrolled_window_get_vadjustment (win);
+-	gtk_adjustment_clamp_page (adj, alloc.y, alloc.y + alloc.height);
+-
+-	return FALSE;
+-}
+-
+-/* Update xkb backend to reflect the new UI state */
+-static void
+-option_toggled_cb (GtkWidget * checkbutton, gpointer data)
+-{
+-	gpointer optionID =
+-	    g_object_get_data (G_OBJECT (checkbutton), OPTION_ID_PROP);
+-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)))
+-		xkb_options_select (optionID);
+-	else
+-		xkb_options_deselect (optionID);
+-}
+-
+-/* Add a check_button or radio_button to control a particular option
+-   This function makes particular use of the current... variables at
+-   the top of this file. */
+-static void
+-xkb_options_add_option (XklConfigRegistry * config_registry,
+-			XklConfigItem * config_item, GtkBuilder * dialog)
+-{
+-	GtkWidget *option_check;
+-	gchar *utf_option_name = xci_desc_to_utf8 (config_item);
+-	/* Copy this out because we'll load it into the widget with set_data */
+-	gchar *full_option_name =
+-	    g_strdup (gkbd_keyboard_config_merge_items
+-		      (current1st_level_id, config_item->name));
+-	gboolean initial_state;
+-
+-	if (current_multi_select)
+-		option_check =
+-		    gtk_check_button_new_with_label (utf_option_name);
+-	else {
+-		if (current_radio_group == NULL) {
+-			/* The first radio in a group is to be "Default", meaning none of
+-			   the below options are to be included in the selected list.
+-			   This is a HIG-compliant alternative to allowing no
+-			   selection in the group. */
+-			option_check =
+-			    gtk_radio_button_new_with_label
+-			    (current_radio_group, _("Default"));
+-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
+-						      (option_check),
+-						      TRUE);
+-			/* Make option name underscore - 
+-			   to enforce its first position in the list */
+-			g_object_set_data_full (G_OBJECT (option_check),
+-						"utfOptionName",
+-						g_strdup (" "), g_free);
+-			option_checks_list =
+-			    g_slist_append (option_checks_list,
+-					    option_check);
+-			current_radio_group =
+-			    gtk_radio_button_get_group (GTK_RADIO_BUTTON
+-							(option_check));
+-			current_none_radio = option_check;
+-
+-			g_signal_connect (option_check, "focus-in-event",
+-					  G_CALLBACK (option_focused_cb),
+-					  WID ("options_scroll"));
+-		}
+-		option_check =
+-		    gtk_radio_button_new_with_label (current_radio_group,
+-						     utf_option_name);
+-		current_radio_group =
+-		    gtk_radio_button_get_group (GTK_RADIO_BUTTON
+-						(option_check));
+-		g_object_set_data (G_OBJECT (option_check), "NoneRadio",
+-				   current_none_radio);
+-	}
+-
+-	initial_state = xkb_options_is_selected (full_option_name);
+-
+-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (option_check),
+-				      initial_state);
+-
+-	g_object_set_data_full (G_OBJECT (option_check), OPTION_ID_PROP,
+-				full_option_name, g_free);
+-	g_object_set_data_full (G_OBJECT (option_check), "utfOptionName",
+-				utf_option_name, g_free);
+-
+-	g_signal_connect (option_check, "toggled",
+-			  G_CALLBACK (option_toggled_cb), NULL);
+-
+-	option_checks_list =
+-	    g_slist_append (option_checks_list, option_check);
+-
+-	g_signal_connect (option_check, "focus-in-event",
+-			  G_CALLBACK (option_focused_cb),
+-			  WID ("options_scroll"));
+-
+-	xkb_options_expander_selcounter_add (initial_state);
+-	g_object_set_data (G_OBJECT (option_check), GCONFSTATE_PROP,
+-			   GINT_TO_POINTER (initial_state));
+-}
+-
+-static gint
+-xkb_option_checks_compare (GtkWidget * chk1, GtkWidget * chk2)
+-{
+-	const gchar *t1 =
+-	    g_object_get_data (G_OBJECT (chk1), "utfOptionName");
+-	const gchar *t2 =
+-	    g_object_get_data (G_OBJECT (chk2), "utfOptionName");
+-	return g_utf8_collate (t1, t2);
+-}
+-
+-/* Add a group of options: create title and layout widgets and then
+-   add widgets for all the options in the group. */
+-static void
+-xkb_options_add_group (XklConfigRegistry * config_registry,
+-		       XklConfigItem * config_item, GtkBuilder * dialog)
+-{
+-	GtkWidget *align, *vbox, *option_check;
+-	gboolean allow_multiple_selection =
+-	    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (config_item),
+-						XCI_PROP_ALLOW_MULTIPLE_SELECTION));
+-
+-	GSList *expanders_list =
+-	    g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+-
+-	gchar *utf_group_name = xci_desc_to_utf8 (config_item);
+-	gchar *titlemarkup =
+-	    g_strconcat ("<span>", utf_group_name, "</span>", NULL);
+-
+-	current_expander = gtk_expander_new (titlemarkup);
+-	gtk_expander_set_use_markup (GTK_EXPANDER (current_expander),
+-				     TRUE);
+-	g_object_set_data_full (G_OBJECT (current_expander),
+-				"utfGroupName", utf_group_name, g_free);
+-	g_object_set_data_full (G_OBJECT (current_expander), "groupId",
+-				g_strdup (config_item->name), g_free);
+-
+-	g_free (titlemarkup);
+-	align = gtk_alignment_new (0, 0, 1, 1);
+-	gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+-	gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
+-	gtk_container_add (GTK_CONTAINER (align), vbox);
+-	gtk_container_add (GTK_CONTAINER (current_expander), align);
+-
+-	current_multi_select = (gboolean) allow_multiple_selection;
+-	current_radio_group = NULL;
+-	current1st_level_id = config_item->name;
+-
+-	option_checks_list = NULL;
+-
+-	xkl_config_registry_foreach_option (config_registry,
+-					    config_item->name,
+-					    (ConfigItemProcessFunc)
+-					    xkb_options_add_option,
+-					    dialog);
+-	/* sort it */
+-	option_checks_list =
+-	    g_slist_sort (option_checks_list,
+-			  (GCompareFunc) xkb_option_checks_compare);
+-	while (option_checks_list) {
+-		option_check = GTK_WIDGET (option_checks_list->data);
+-		gtk_box_pack_start (GTK_BOX (vbox), option_check, TRUE,
+-				    TRUE, 0);
+-		option_checks_list = option_checks_list->next;
+-	}
+-	/* free it */
+-	g_slist_free (option_checks_list);
+-	option_checks_list = NULL;
+-
+-	xkb_options_expander_highlight ();
+-
+-	expanders_list = g_slist_append (expanders_list, current_expander);
+-	g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP,
+-			   expanders_list);
+-
+-	g_signal_connect (current_expander, "focus-in-event",
+-			  G_CALLBACK (option_focused_cb),
+-			  WID ("options_scroll"));
+-}
+-
+-static gint
+-xkb_options_expanders_compare (GtkWidget * expander1,
+-			       GtkWidget * expander2)
+-{
+-	const gchar *t1 =
+-	    g_object_get_data (G_OBJECT (expander1), "utfGroupName");
+-	const gchar *t2 =
+-	    g_object_get_data (G_OBJECT (expander2), "utfGroupName");
+-	return g_utf8_collate (t1, t2);
+-}
+-
+-/* Create widgets to represent the options made available by the backend */
+-void
+-xkb_options_load_options (GtkBuilder * dialog)
+-{
+-	GtkWidget *opts_vbox = WID ("options_vbox");
+-	GtkWidget *dialog_vbox = WID ("dialog_vbox");
+-	GtkWidget *options_scroll = WID ("options_scroll");
+-	GtkWidget *expander;
+-	GSList *expanders_list;
+-
+-	current1st_level_id = NULL;
+-	current_none_radio = NULL;
+-	current_multi_select = FALSE;
+-	current_radio_group = NULL;
+-
+-	/* fill the list */
+-	xkl_config_registry_foreach_option_group (config_registry,
+-						  (ConfigItemProcessFunc)
+-						  xkb_options_add_group,
+-						  dialog);
+-	/* sort it */
+-	expanders_list =
+-	    g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+-	expanders_list =
+-	    g_slist_sort (expanders_list,
+-			  (GCompareFunc) xkb_options_expanders_compare);
+-	g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP,
+-			   expanders_list);
+-	while (expanders_list) {
+-		expander = GTK_WIDGET (expanders_list->data);
+-		gtk_box_pack_start (GTK_BOX (opts_vbox), expander, FALSE,
+-				    FALSE, 0);
+-		expanders_list = expanders_list->next;
+-	}
+-
+-	/* Somewhere in gtk3 the top vbox in dialog is made non-expandable */
+-	gtk_box_set_child_packing (GTK_BOX (dialog_vbox), options_scroll,
+-				   TRUE, TRUE, 0, GTK_PACK_START);
+-	gtk_widget_show_all (dialog_vbox);
+-}
+-
+-static void
+-chooser_response_cb (GtkDialog * dialog, gint response, gpointer data)
+-{
+-	switch (response) {
+-	case GTK_RESPONSE_DELETE_EVENT:
+-	case GTK_RESPONSE_CLOSE: {
+-			/* just cleanup */
+-			GSList *expanders_list =
+-			    g_object_get_data (G_OBJECT (dialog),
+-					       EXPANDERS_PROP);
+-			g_object_set_data (G_OBJECT (dialog),
+-					   EXPANDERS_PROP, NULL);
+-			g_slist_free (expanders_list);
+-
+-			gtk_widget_destroy (GTK_WIDGET (dialog));
+-			chooser_dialog = NULL;
+-		}
+-		break;
+-	}
+-}
+-
+-/* Create popup dialog */
+-void
+-xkb_options_popup_dialog (GtkBuilder * dialog)
+-{
+-	GtkWidget *chooser;
+-
+-	chooser_dialog = gtk_builder_new ();
+-    gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE);
+-	gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR
+-				   "/cinnamon-region-panel-options-dialog.ui",
+-				   NULL);
+-
+-	chooser = CWID ("xkb_options_dialog");
+-	gtk_window_set_transient_for (GTK_WINDOW (chooser),
+-				      GTK_WINDOW (gtk_widget_get_toplevel (WID ("region_notebook"))));
+-	gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
+-	xkb_options_load_options (chooser_dialog);
+-
+-	g_signal_connect (chooser, "response",
+-			  G_CALLBACK (chooser_response_cb), dialog);
+-	gtk_widget_show (chooser);
+-}
+-
+-/* Update selected option counters for a group-bound expander */
+-static void
+-xkb_options_update_option_counters (XklConfigRegistry * config_registry,
+-				    XklConfigItem * config_item)
+-{
+-	gchar *full_option_name =
+-	    g_strdup (gkbd_keyboard_config_merge_items
+-		      (current1st_level_id, config_item->name));
+-	gboolean current_state =
+-	    xkb_options_is_selected (full_option_name);
+-        g_free (full_option_name);
+-
+-	xkb_options_expander_selcounter_add (current_state);
+-}
+-
+-/* Respond to a change in the xkb gconf settings */
+-static void
+-xkb_options_update (GSettings * settings, gchar * key, GtkBuilder * dialog)
+-{
+-	if (!strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_OPTIONS)) {
+-		/* Updating options is handled by gconf notifies for each widget
+-		   This is here to avoid calling it N_OPTIONS times for each gconf
+-		   change. */
+-		enable_disable_restoring (dialog);
+-
+-		if (chooser_dialog != NULL) {
+-			GSList *expanders_list =
+-			    g_object_get_data (G_OBJECT (chooser_dialog),
+-					       EXPANDERS_PROP);
+-			while (expanders_list) {
+-				current_expander =
+-				    GTK_WIDGET (expanders_list->data);
+-				gchar *group_id =
+-				    g_object_get_data (G_OBJECT
+-						       (current_expander),
+-						       "groupId");
+-				current1st_level_id = group_id;
+-				xkb_options_expander_selcounter_reset ();
+-				xkl_config_registry_foreach_option
+-				    (config_registry, group_id,
+-				     (ConfigItemProcessFunc)
+-				     xkb_options_update_option_counters,
+-				     current_expander);
+-				xkb_options_expander_highlight ();
+-				expanders_list = expanders_list->next;
+-			}
+-		}
+-	}
+-}
+-
+-void
+-xkb_options_register_conf_listener (GtkBuilder * dialog)
+-{
+-	g_signal_connect (xkb_keyboard_settings, "changed",
+-			  G_CALLBACK (xkb_options_update), dialog);
+-}
+diff -uNrp a/panels/region/cinnamon-region-panel-xkbpv.c b/panels/region/cinnamon-region-panel-xkbpv.c
+--- a/panels/region/cinnamon-region-panel-xkbpv.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/cinnamon-region-panel-xkbpv.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,120 +0,0 @@
+-/* cinnamon-region-panel-xkbpv.c
+- * Copyright (C) 2003-2007 Sergey V. Udaltsov
+- *
+- * Written by: Sergey V. Udaltsov <svu@gnome.org>
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+- * 02110-1335, USA.
+- */
+-
+-#ifdef HAVE_CONFIG_H
+-#  include <config.h>
+-#endif
+-
+-#include <libgnomekbd/gkbd-keyboard-drawing.h>
+-
+-#include "cinnamon-region-panel-xkb.h"
+-
+-#ifdef HAVE_X11_EXTENSIONS_XKB_H
+-#include "X11/XKBlib.h"
+-/**
+- * BAD STYLE: Taken from xklavier_private_xkb.h
+- * Any ideas on architectural improvements are WELCOME
+- */
+-extern gboolean xkl_xkb_config_native_prepare (XklEngine * engine,
+-					       const XklConfigRec * data,
+-					       XkbComponentNamesPtr
+-					       component_names);
+-
+-extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
+-					   XkbComponentNamesPtr
+-					   component_names);
+-
+-/* */
+-#endif
+-
+-static GkbdKeyboardDrawingGroupLevel groupsLevels[] =
+-    { {0, 1}, {0, 3}, {0, 0}, {0, 2} };
+-static GkbdKeyboardDrawingGroupLevel *pGroupsLevels[] = {
+-	groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3
+-};
+-
+-GtkWidget *
+-xkb_layout_preview_create_widget (GtkBuilder * chooserDialog)
+-{
+-	GtkWidget *kbdraw = gkbd_keyboard_drawing_new ();
+-
+-	gkbd_keyboard_drawing_set_groups_levels (GKBD_KEYBOARD_DRAWING
+-						 (kbdraw), pGroupsLevels);
+-	return kbdraw;
+-}
+-
+-void
+-xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw,
+-				       const gchar * id)
+-{
+-#ifdef HAVE_X11_EXTENSIONS_XKB_H
+-	if (kbdraw != NULL) {
+-		if (id != NULL) {
+-			XklConfigRec *data;
+-			char **p, *layout, *variant;
+-			XkbComponentNamesRec component_names;
+-
+-			data = xkl_config_rec_new ();
+-			if (xkl_config_rec_get_from_server (data, engine)) {
+-				if ((p = data->layouts) != NULL)
+-					g_strfreev (data->layouts);
+-
+-				if ((p = data->variants) != NULL)
+-					g_strfreev (data->variants);
+-
+-				data->layouts = g_new0 (char *, 2);
+-				data->variants = g_new0 (char *, 2);
+-				if (gkbd_keyboard_config_split_items
+-				    (id, &layout, &variant)
+-				    && variant != NULL) {
+-					data->layouts[0] =
+-					    (layout ==
+-					     NULL) ? NULL :
+-					    g_strdup (layout);
+-					data->variants[0] =
+-					    (variant ==
+-					     NULL) ? NULL :
+-					    g_strdup (variant);
+-				} else {
+-					data->layouts[0] =
+-					    (id ==
+-					     NULL) ? NULL : g_strdup (id);
+-					data->variants[0] = NULL;
+-				}
+-
+-				if (xkl_xkb_config_native_prepare
+-				    (engine, data, &component_names)) {
+-					gkbd_keyboard_drawing_set_keyboard
+-					    (GKBD_KEYBOARD_DRAWING
+-					     (kbdraw), &component_names);
+-
+-					xkl_xkb_config_native_cleanup
+-					    (engine, &component_names);
+-				}
+-			}
+-			g_object_unref (G_OBJECT (data));
+-		} else
+-			gkbd_keyboard_drawing_set_keyboard
+-			    (GKBD_KEYBOARD_DRAWING (kbdraw), NULL);
+-
+-	}
+-#endif
+-}
+diff -uNrp a/panels/region/.indent.pro b/panels/region/.indent.pro
+--- a/panels/region/.indent.pro	1970-01-01 01:00:00.000000000 +0100
++++ b/panels/region/.indent.pro	2013-08-25 16:50:30.000000000 +0100
+@@ -0,0 +1,2 @@
++-kr -i8 -pcs -lps -psl
++
+diff -uNrp a/panels/region/Makefile.am b/panels/region/Makefile.am
+--- a/panels/region/Makefile.am	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/Makefile.am	2013-09-21 13:24:15.347949247 +0100
+@@ -23,12 +23,9 @@ libregion_la_SOURCES =	\
+ 	cinnamon-region-panel-lang.h \
+ 	cinnamon-region-panel-system.c \
+ 	cinnamon-region-panel-system.h \
+-	cinnamon-region-panel-xkb.c \
+-	cinnamon-region-panel-xkblt.c \
+-	cinnamon-region-panel-xkbltadd.c \
+-	cinnamon-region-panel-xkbot.c \
+-	cinnamon-region-panel-xkbpv.c \
+-	cinnamon-region-panel-xkb.h
++	cinnamon-region-panel-input.c \
++	cinnamon-region-panel-input.h \
++	$(NULL)
+ 
+ libregion_la_LIBADD = $(PANEL_LIBS) $(REGION_PANEL_LIBS) $(builddir)/../common/liblanguage.la
+ 
+@@ -39,8 +36,8 @@ libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
+ uidir   = $(pkgdatadir)/ui
+ ui_DATA = \
+ 	cinnamon-region-panel.ui \
+-	cinnamon-region-panel-layout-chooser.ui \
+-	cinnamon-region-panel-options-dialog.ui
++	cinnamon-region-panel-input-chooser.ui \
++	$(NULL)
+ 
+ desktopdir = $(datadir)/applications
+ Desktop_in_files = cinnamon-region-panel.desktop.in
+diff -uNrp a/panels/region/region-module.c b/panels/region/region-module.c
+--- a/panels/region/region-module.c	2013-08-25 14:40:14.000000000 +0100
++++ b/panels/region/region-module.c	2013-09-21 13:24:15.347949247 +0100
+@@ -28,6 +28,7 @@
+ void
+ g_io_module_load (GIOModule * module)
+ {
++
+ 	/* register the panel */
+ 	cc_region_panel_register (module);
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 514a3f09bfb..cf1c0875e2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9887,8 +9887,10 @@ let
 
   cinnamon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common libgnomekbd;
-
+    inherit (gnome3) gnome_common libgnomekbd gnome-menus;
+    
+    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
+    
     cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
 
     cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;

From f4cc9c29c756681177cb694916b61158ec59642c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 21:49:04 +0200
Subject: [PATCH 0083/2033] ipython: update 1.1.0 -> 2.0.0

Release notes:
http://ipython.org/ipython-doc/2/whatsnew/version2.0.html

Build and run tested terminal mode (default), notebook, qtconsole; all
works. (And the release notes list few backwards incompatible changes.)
---
 pkgs/shells/ipython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix
index b9b9129cb48..cb0cc95c4ce 100644
--- a/pkgs/shells/ipython/default.nix
+++ b/pkgs/shells/ipython/default.nix
@@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null && sip != null;
 
 buildPythonPackage rec {
-  name = "ipython-1.1.0";
+  name = "ipython-2.0.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "1glivwy7k2dciy0y5i39syngip84nrqhpggn4glmpd2s49jllkkc";
+    sha256 = "0fl9sznx83y2ck8wh5zr8avzjm5hz6r0xz38ij2fil3gin7w10sf";
   };
 
   propagatedBuildInputs = [

From f249de831207885d3838fb517ea07848d80f297c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 22:18:33 +0200
Subject: [PATCH 0084/2033] lftp: update 4.4.5 -> 4.4.15

Bug fixes and minor improvements.

I had to switch download mirror because the current one didn't have the
newest release(s).
---
 pkgs/tools/networking/lftp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 2bc575bbd02..a9bbf84a425 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, xz }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.4.5";
+  name = "lftp-4.4.15";
 
   src = fetchurl {
-    url = "ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/${name}.tar.xz";
-    sha256 = "1p3nxsd2an9pdwc3vgwxy8p5nnjrc7mhilikjaddy62cyvxdbpxq";
+    url = "http://lftp.yar.ru/ftp/${name}.tar.gz";
+    sha256 = "1iw0xvvi9wr7grm6dwbxgm8ms98pg5skj44q477gxzrrff9dvvvp";
   };
 
   patches = [ ./no-gets.patch ];

From b8cadc493e5bc7e1875f7fefe6ac6651a2e87c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 22:23:23 +0200
Subject: [PATCH 0085/2033] lftp: add/update meta attributes

---
 pkgs/tools/networking/lftp/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index a9bbf84a425..434ddbce3e7 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -12,9 +12,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gnutls pkgconfig readline zlib ];
 
-  meta = {
-    homepage = http://lftp.yar.ru/;
+  meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";
-    license = "GPL";
+    homepage = http://lftp.yar.ru/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }

From 5e50b35a26911479a62d4c80a76d83014a43be8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 22:36:31 +0200
Subject: [PATCH 0086/2033] bluez5: remove unneeded libusb dependency

bluez >= 5.9 does not depend on libusb[1].

[1] http://www.bluez.org/release-of-bluez-5-9/
---
 pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index ffa91e951a8..f9f5c185bbd 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python,
+{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python,
   pythonPackages, pythonDBus, readline, libsndfile, udev, libical,
   systemd }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     [ pythonDBus pygobject pygobject3 recursivePthLoader ];
 
   buildInputs =
-    [ pkgconfig dbus.libs glib libusb alsaLib python pythonPackages.wrapPython
+    [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.

From 129637268166dd7e63674658c8fb866d9abfe91b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 22:56:21 +0200
Subject: [PATCH 0087/2033] cifs-utils: update 6.2 -> 6.3

January 9, 2014: Release 6.3:
* fixes for various bugs turned up by Coverity
* clean unused cruft out of upcall binary
* add new pam_cifscreds PAM module for establishing NTLM creds on login
* https://lists.samba.org/archive/samba-technical/2014-January/097124.html
---
 pkgs/os-specific/linux/cifs-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index bef8de495ad..ce609c5be47 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cifs-utils-6.2";
+  name = "cifs-utils-6.3";
 
   src = fetchurl {
     url = "ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
-    sha256 = "0cydya7l7xwxk2j1g1659kbvb4jzql11ivb6cldwwfg19qvnwrrl";
+    sha256 = "0nrpd3ibzfhdxgq1pw0jhzx163z5jvq4qcjxl35qlqj74lm3pxzz";
   };
 
   makeFlags = "root_sbindir=$(out)/sbin";

From 091ce87a00fd20d7a4a2ece8e563fd0a013661f1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 13 Apr 2014 23:30:15 +0200
Subject: [PATCH 0088/2033] audacious: find gsettings schemas

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

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index d838d29e8be..409a831727b 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
         source $stdenv/setup
         # gsettings schemas for file dialogues
         for file in "$out/bin/"*; do
-          wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD"
+          wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH"
         done
       )
     '';

From 57b6ecb7999ce57fc131837ba26929f148a56034 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 13 Apr 2014 23:50:21 +0200
Subject: [PATCH 0089/2033] sflphone: find gsettings schemas

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

diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
index 2401d796bfd..a31a682abf8 100644
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -75,8 +75,10 @@ rec {
     '';
 
     # gtk3 programs have the runtime dependency on XDG_DATA_DIRS
-    postInstall = ''
-      wrapProgram $out/bin/sflphone* --prefix XDG_DATA_DIRS ":" ${gtk}/share
+    preFixup = ''
+      for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
+        wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH"
+      done
     '';
 
     buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ];

From 93e91548050cb97f31fdeeb029498d616a6243b3 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 11 Apr 2014 07:35:06 -0400
Subject: [PATCH 0090/2033] rsync updated 3.0.9 to 3.1.0, rsyncd service module

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/network-filesystems/rsyncd.nix   | 139 ++++++++++++++++++
 .../networking/sync/rsync/default.nix         |  13 +-
 3 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100644 nixos/modules/services/network-filesystems/rsyncd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b2f530474b5..f59e04425fc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -159,6 +159,7 @@
   ./services/network-filesystems/drbd.nix
   ./services/network-filesystems/nfsd.nix
   ./services/network-filesystems/openafs-client/default.nix
+  ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
   ./services/networking/amuled.nix
   ./services/networking/avahi-daemon.nix
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
new file mode 100644
index 00000000000..bc17add809b
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -0,0 +1,139 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.rsyncd;
+
+  motdFile = pkgs.writeText "rsyncd-motd" cfg.motd;
+
+  rsyncdCfg = ""
+    + optionalString (cfg.motd != "") "motd file = ${motdFile}\n"
+    + optionalString (cfg.address != "") "address = ${cfg.address}\n"
+    + optionalString (cfg.port != 873) "port = ${toString cfg.port}\n"
+    + cfg.extraConfig
+    + "\n"
+    + flip concatMapStrings cfg.modules (m: "[${m.name}]\n\tpath = ${m.path}\n"
+      + optionalString (m.comment != "") "\tcomment = ${m.comment}\n"
+      + m.extraConfig
+      + "\n"
+    );
+
+  rsyncdCfgFile = pkgs.writeText "rsyncd.conf" rsyncdCfg;
+
+in
+
+{
+  options = {
+
+    services.rsyncd = {
+
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable the rsync daemon.";
+      };
+
+      motd = mkOption {
+        type = types.string;
+        default = "";
+	description = ''
+	  Message of the day to display to clients on each connect.
+	  This usually contains site information and any legal notices.
+	'';
+      };
+
+      port = mkOption {
+        default = 873;
+	type = types.int;
+	description = "TCP port the daemon will listen on.";
+      };
+
+      address = mkOption {
+        default = "";
+	example = "192.168.1.2";
+	description = ''
+	  IP address the daemon will listen on; rsyncd will listen on
+	  all addresses if this is not specified.
+	'';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+	default = "";
+	description = ''
+	  Lines of configuration to add to rsyncd globally.
+	  See <literal>man rsyncd.conf</literal> for more options.
+	'';
+      };
+
+      modules = mkOption {
+        default = [ ];
+	example = [ 
+	  { name = "ftp"; 
+	    path = "/home/ftp"; 
+	    comment = "ftp export area";
+	    extraConfig = ''
+	      secrets file = /etc/rsyncd.secrets
+	    '';
+	  }
+	];
+	description = "The list of file paths to export.";
+	type = types.listOf types.optionSet;
+
+	options = {
+
+	  name = mkOption {
+	    example = "ftp";
+	    type = types.string;
+	    description = "Name of export module.";
+	  };
+
+	  comment = mkOption {
+	    default = "";
+	    description = ''
+	      Description string that is displayed next to the module name
+	      when clients obtain a list of available modules.
+	    '';
+	  };
+
+	  path = mkOption {
+	    example = "/home/ftp";
+	    type = types.string;
+	    description = "Directory to make available in this module.";
+   	  };
+
+          extraConfig = mkOption {
+            type = types.lines;
+	    default = "";
+            description = ''
+	      Lines of configuration to add to this module.
+	      See <literal>man rsyncd.conf</literal> for more options.
+	    '';
+          };
+	};
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.etc = singleton
+    { source = rsyncdCfgFile;
+      target = "rsyncd.conf";
+    };
+
+    systemd.services.rsyncd = {
+      description = "Rsync daemon";
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ pkgs.rsync ];
+
+      serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
+    };
+
+    networking.firewall.allowedTCPPorts = [ cfg.port ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 5447b21009f..5265faf87b6 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -6,16 +6,17 @@
 assert enableACLs -> acl != null;
 
 stdenv.mkDerivation rec {
-  name = "rsync-3.0.9";
+  name = "rsync-${version}";
+  version = "3.1.0";
 
   mainSrc = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
-    sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
+    url = "http://rsync.samba.org/ftp/rsync/src/rsync-${version}.tar.gz";
+    sha256 = "0kirw8wglqvwi1v8bwxp373g03xg857h59j5k3mmgff9gzvj7jl1";
   };
 
   patchesSrc = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/rsync-patches-3.0.9.tar.gz;
-    sha256 = "0c1e9b56e99667dfc47641124460bac61a04c5d2ee89f575c6bc78c7a69005a9";
+    url = "http://rsync.samba.org/ftp/rsync/rsync-patches-${version}.tar.gz";
+    sha256 = "0sl8aadpjblvbb05vgais40z90yzhr09rwz0cykjdiv452gli75p";
   };
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
@@ -30,6 +31,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.emery ];
   };
 }

From da5b52f1b4aaba59e3651caa70d1e3f4fdbea3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Apr 2014 07:06:49 +0200
Subject: [PATCH 0091/2033] minicom: update 2.6.2 -> 2.7

Changelog:
- Configurable status line via -F option, see manpage for a listing of
  format specifier.
- Improve display of device name in status line.
- Script: Binary transmission feature via "!<"
- Bugfixes
---
 pkgs/tools/misc/minicom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix
index 2ab1195020c..8ede3aa918b 100644
--- a/pkgs/tools/misc/minicom/default.nix
+++ b/pkgs/tools/misc/minicom/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "minicom-2.6.2";
+  name = "minicom-2.7";
 
   src = fetchurl {
-    url = "http://alioth.debian.org/frs/download.php/file/3869/${name}.tar.gz";
-    sha256 = "0s4ibk8scspm8a0raf5s4zgp9b82c4bn529rir9abzqlg5gj3kzk";
+    url = "http://alioth.debian.org/frs/download.php/file/3977/${name}.tar.gz";
+    sha256 = "1x04m4k7c71j5cnhzpjrbz43dd96k4mpkd0l87v5skrgp1isdhws";
   };
 
   buildInputs = [ncurses];

From 13137dbb460c14e4ecfd77e2d6ac5149a6bd90ba Mon Sep 17 00:00:00 2001
From: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
Date: Mon, 14 Apr 2014 11:29:36 +0530
Subject: [PATCH 0092/2033] doc: meta.xml -- fix a typo

---
 doc/meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index 00e9b8ac67a..6c8e458509a 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -164,7 +164,7 @@ meta.hydraPlatforms = [];
     <listitem><para>If set to <literal>true</literal>, the package is
     marked as “broken”, meaning that it won’t show up in
     <literal>nix-env -qa</literal>, and cannot be built or installed.
-    Sush packages should be removed from Nixpkgs eventually unless
+    Such packages should be removed from Nixpkgs eventually unless
     they are fixed.</para></listitem>
   </varlistentry>
 

From 58b58903ba2f4f10aae4b29a1fb8625ca6fb5563 Mon Sep 17 00:00:00 2001
From: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
Date: Mon, 14 Apr 2014 11:42:01 +0530
Subject: [PATCH 0093/2033] doc: quick-start.xml -- fix a typo in the link.

Chapter 2, gmp 5.1.1.nix url and filename has changed in the repo
to 5.1.x.nix.
---
 doc/quick-start.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index 35983f0b114..49c674052b9 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -71,7 +71,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
 
         <listitem>
           <para>GNU Multiple Precision arithmetic library (GMP): <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.1.nix"><filename>pkgs/development/libraries/gmp/5.1.1.nix</filename></link>.
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
           Also done by the generic builder, but has a dependency on
           <varname>m4</varname>.</para>
         </listitem>

From ebe8fab999e6333953849cf300b89ed7e9b968be Mon Sep 17 00:00:00 2001
From: Alexander Kjeldaas <ak@formalprivacy.com>
Date: Mon, 14 Apr 2014 09:22:31 +0200
Subject: [PATCH 0094/2033] Make the user aware of the allowUnfree option.

---
 pkgs/stdenv/generic/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 3a475933d24..035e1516932 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -58,7 +58,16 @@ let
           pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
         in
         if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
-          throw "package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate"
+          throw ''package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate.
+                 You can set
+                    { nixpkgs.config.allowUnfree = true; }
+                 in configuration.nix to override this.
+                 If you use nix standalnd, you can add
+                    { config.allowUnfree = true; }
+                 to ~/.nixpkgs/config.nix or pass
+                    --arg config '{ allowUnfree = true; }'
+                 on the command line.
+                ''
         else if !allowBroken && attrs.meta.broken or false then
           throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then

From 722143a5d365ab084bc69db4aa4258d0b4a8c549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 14 Apr 2014 09:29:41 +0200
Subject: [PATCH 0095/2033] fix typo

---
 pkgs/stdenv/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 035e1516932..a341e36b631 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -62,7 +62,7 @@ let
                  You can set
                     { nixpkgs.config.allowUnfree = true; }
                  in configuration.nix to override this.
-                 If you use nix standalnd, you can add
+                 If you use nix standalne, you can add
                     { config.allowUnfree = true; }
                  to ~/.nixpkgs/config.nix or pass
                     --arg config '{ allowUnfree = true; }'

From d5b4c3c63e97415396ff0ad74299aa770512c71b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 9 Apr 2014 15:57:02 +0200
Subject: [PATCH 0096/2033] tracker: new package

Desktop-neutral user information store, search tool and indexer

https://wiki.gnome.org/Projects/Tracker
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/gnome3/tracker.nix      | 39 +++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../desktops/gnome-3/core/tracker/default.nix | 49 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 5 files changed, 92 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/tracker.nix
 create mode 100644 pkgs/desktops/gnome-3/core/tracker/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b2f530474b5..a4915a2fa5c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -101,6 +101,7 @@
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/sushi.nix
+  ./services/desktops/gnome3/tracker.nix
   ./services/desktops/telepathy.nix
   ./services/games/ghost-one.nix
   ./services/games/minecraft-server.nix
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
new file mode 100644
index 00000000000..94a22d0c881
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -0,0 +1,39 @@
+# Tracker daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.tracker = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Tracker services, a search engine,
+          search tool and metadata storage system.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.tracker.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.tracker ];
+
+    services.dbus.packages = [ pkgs.gnome3.tracker ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index bebda772352..aa231f2bad7 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -33,6 +33,7 @@ in {
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.sushi.enable = true;
+    services.gnome3.tracker.enable = mkDefault true;
     services.telepathy.enable = true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
new file mode 100644
index 00000000000..6ac3592f6bf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, intltool, fetchurl, libxml2, upower
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, vala, sqlite
+, gnome3, librsvg, gdk_pixbuf, file, libnotify
+, evolution_data_server, gst_all_1, poppler
+, icu, taglib, libjpeg, libtiff, giflib, libcue
+, libvorbis, flac, exempi, networkmanager
+, libpng, libexif, libgsf, libuuid, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "tracker-1.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
+    sha256 = "a1d033faf2c78f0e239f3c2c961b96623c9a7dabd938c08e3f5660bd70f54ba2";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
+                  bzip2 gnome3.totem-pl-parser
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
+                  upower libnotify evolution_data_server gnome3.libgee
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
+                  poppler icu taglib libjpeg libtiff giflib libvorbis
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Tracker;
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d9a673fb4c7..d8d510b0bb9 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -122,6 +122,8 @@ rec {
 
   totem-pl-parser = callPackage ./core/totem-pl-parser { };
 
+  tracker = callPackage ./core/tracker { };
+
   vte = callPackage ./core/vte { };
 
   vino = callPackage ./core/vino { };

From b4096479faf7147e885e5a7abc03c35c23db88ea Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 10 Apr 2014 22:29:36 +0200
Subject: [PATCH 0097/2033] gnome-user-docs: new package licensed under the new
 licenses.cc-by-30

User and system administration help for the Gnome

https://help.gnome.org/users/gnome-help/3.10
---
 lib/licenses.nix                              |  6 ++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/core/gnome-user-docs/default.nix  | 20 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 4 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 603fddcb857..20c1b220031 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -64,6 +64,12 @@
     url = https://fedoraproject.org/wiki/Licensing/BSD;
   };
 
+  cc-by-30 = {
+    shortName = "CC BY 3.0";
+    fullName = "Creative Commons Attribution 3.0";
+    url = http://creativecommons.org/licenses/by/3.0;
+  };
+
   cddl = {
     shortName = "CDDL";
     fullName = "Common Development Distribution License ";
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index aa231f2bad7..9f0d53bb653 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -85,6 +85,7 @@ in {
         gnome3.gnome-system-log
         gnome3.gnome-system-monitor
         gnome3.gnome_terminal
+        gnome3.gnome-user-docs
 
         gnome3.file-roller
       ] config.environment.gnome3.excludePackages);
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
new file mode 100644
index 00000000000..d66863a2218
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-docs-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz";
+    sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905";
+  };
+
+  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-help/3.10;
+    description = "User and system administration help for the Gnome desktop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.cc-by-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d8d510b0bb9..5ac3fb75f16 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -86,6 +86,8 @@ rec {
 
   gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
 
+  gnome-user-docs = callPackage ./core/gnome-user-docs { };
+
   grilo = callPackage ./core/grilo { };
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };

From 87284dd9e9196caa0c5aa78f997de4d4e8c58d48 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 10 Apr 2014 23:31:37 +0200
Subject: [PATCH 0098/2033] sushi, telepathy: make enabling the service
 overridable

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 9f0d53bb653..be41d917792 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -32,9 +32,9 @@ in {
     services.accounts-daemon.enable = true;
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
-    services.gnome3.sushi.enable = true;
+    services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
-    services.telepathy.enable = true;
+    services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 

From 4c8b9fc957e4dcd15cd0e6ff7d55937f367c4a37 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 00:24:40 +0200
Subject: [PATCH 0099/2033] sushi: upgrade to 3.10.0

---
 pkgs/desktops/gnome-3/core/sushi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 55729a54669..089b5cd03c1 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -4,11 +4,11 @@
 , gdk_pixbuf, librsvg, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
-  name = "sushi-3.8.1";
+  name = "sushi-3.10.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.8/${name}.tar.xz";
-    sha256 = "c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd";
+    url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz";
+    sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8";
   };
 
   propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];

From 9d5a06cfe7160db895962815fb60d989e3705d4b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 00:28:15 +0200
Subject: [PATCH 0100/2033] gnome3: use package names for
 environment.gnome3.excludePackages

---
 lib/lists.nix                                        |  2 --
 .../modules/services/x11/desktop-managers/gnome3.nix | 12 +++++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 6c7773304de..4b5f04a6758 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -227,6 +227,4 @@ in rec {
 
   crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f];
 
-  # List difference, xs - ys. Removes elements of ys from xs.
-  difference = xs: ys: filter (y: !(builtins.elem y ys)) xs;
 }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index be41d917792..60a74d6c7fe 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -5,6 +5,16 @@ with pkgs.lib;
 let
   cfg = config.services.xserver.desktopManager.gnome3;
   gnome3 = pkgs.gnome3;
+
+  # Remove packages of ys from xs, based on their names
+  removePackagesByName = xs: ys:
+    let
+      pkgName = drv: (builtins.parseDrvName drv.name).name;
+	  ysNames = map pkgName ys;
+      res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
+    in
+      filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+
 in {
 
   options = {
@@ -68,7 +78,7 @@ in {
         gnome3.gnome_settings_daemon
         gnome3.gnome_shell
         gnome3.gnome_themes_standard
-      ] ++ (lists.difference [
+      ] ++ (removePackagesByName [
         gnome3.baobab
         gnome3.eog
         gnome3.epiphany

From b0154961ed7765ae11dd857a4699e18a0a36015b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 00:41:51 +0200
Subject: [PATCH 0101/2033] gnome-keyring: add dbus service

---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-keyring.nix         | 40 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-keyring.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a4915a2fa5c..2541bc6a98a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./services/desktops/accountservice.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
+  ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
   ./services/desktops/telepathy.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
new file mode 100644
index 00000000000..447fd783f14
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -0,0 +1,40 @@
+# GNOME Keyring daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-keyring = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Keyring daemon, a service designed to
+          take care of the user's security credentials,
+          such as user names and passwordsa search engine.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-keyring.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
+
+    services.dbus.packages = [ pkgs.gnome3.gnome_keyring ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 60a74d6c7fe..a6f63304d7d 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -42,6 +42,7 @@ in {
     services.accounts-daemon.enable = true;
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
+    services.gnome3.gnome-keyring.enable = true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
     services.telepathy.enable = mkDefault true;

From 191c4b6145aa3c3c2f2b62e4cd26b5ef019dc39e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 15:03:32 +0200
Subject: [PATCH 0102/2033] gnome3: make extensions.gnome.org recognize the
 gnome desktop

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index a6f63304d7d..ea12ce2ef18 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -62,6 +62,9 @@ in {
 
           export XDG_MENU_PREFIX=gnome
 
+          # Don't let epiphany depend upon gnome-shell
+          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
+
           ${gnome3.gnome_session}/bin/gnome-session&
           waitPID=$!
         '';

From bff4580852853f064231397cd4125da8775216e5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 17:12:14 +0200
Subject: [PATCH 0103/2033] gnome-shell: add unzip to PATH for installing
 extensions

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 087b5778163..be25c615d97 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
 , python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit
+, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
 , pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
 , accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
 
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   preFixup = with gnome3; ''
     wrapProgram "$out/bin/gnome-shell" \
+      --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

From d3a34c18622ac7e65c1031e33047e7a278fa8829 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 22:55:15 +0200
Subject: [PATCH 0104/2033] dconf: rm HighContrast icon cache

---
 pkgs/desktops/gnome-3/core/dconf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index a485b18c5e5..a6236f16744 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
     rm $out/lib/gio/modules/giomodule.cache
     rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {

From e08861a4cd7e5e6f84652230bb32d78d4b8dbb3f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 12 Apr 2014 12:48:16 +0200
Subject: [PATCH 0105/2033] mod_dnssd: new apache httpd 2.2 module

Provide Zeroconf support via DNS-SD using Avahi

http://0pointer.de/lennart/projects/mod_dnssd
---
 .../http/apache-modules/mod_dnssd/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/http/apache-modules/mod_dnssd/default.nix

diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
new file mode 100644
index 00000000000..06f12820a10
--- /dev/null
+++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, apacheHttpd_2_2, apr, avahi }:
+
+stdenv.mkDerivation rec {
+  name = "mod_dnssd-0.6";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/mod_dnssd/${name}.tar.gz";
+    sha256 = "2cd171d76eba398f03c1d5bcc468a1756f4801cd8ed5bd065086e4374997c5aa";
+  };
+
+  configureFlags = [ "--disable-lynx" ];
+
+  buildInputs = [ pkgconfig apacheHttpd_2_2 avahi apr ];
+
+  installPhase = ''
+    mkdir -p $out/modules
+    cp src/.libs/mod_dnssd.so $out/modules
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://0pointer.de/lennart/projects/mod_dnssd;
+    description = "Provide Zeroconf support via DNS-SD using Avahi";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ lethalman ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d695253fbbf..3ca1041fa09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6451,6 +6451,8 @@ let
 
   memcached = callPackage ../servers/memcached {};
 
+  mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd/default.nix { };
+
   mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { };
 
   mod_python = callPackage ../servers/http/apache-modules/mod_python { };

From a5b4c74a163660c1adca8ba273b4902ae65098ea Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 11 Apr 2014 23:13:31 +0200
Subject: [PATCH 0106/2033] gnome-user-share: new package

Service that exports the contents of the Public folder in your home directory on the local network

https://help.gnome.org/users/gnome-user-share/3.8
---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-user-share.nix      | 42 +++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/core/gnome-user-share/default.nix | 52 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 5 files changed, 98 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-user-share.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-user-share/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2541bc6a98a..bdb678248eb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -101,6 +101,7 @@
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/gnome-keyring.nix
+  ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
   ./services/desktops/telepathy.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
new file mode 100644
index 00000000000..df796ed77ff
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -0,0 +1,42 @@
+# GNOME User Share daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-user-share = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME User Share, a service that exports the
+          contents of the Public folder in your home directory on the local network.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-user-share.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
+
+    services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
+      # Don't let gnome-control-center depend upon gnome-user-share
+      export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index ea12ce2ef18..f7f11ff5f92 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -43,6 +43,7 @@ in {
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.gnome-keyring.enable = true;
+    services.gnome3.gnome-user-share.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
     services.telepathy.enable = mkDefault true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
new file mode 100644
index 00000000000..976b0eaca45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
+, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-share-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz";
+    sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = ''
+    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
+  '';
+
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+                     "--disable-bluetooth"
+                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  nautilus libnotify libcanberra_gtk3 ];
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/$name
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
+    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-user-share" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
+    description = "Service that exports the contents of the Public folder in your home directory on the local network";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 5ac3fb75f16..a6d4f6197d8 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -88,6 +88,8 @@ rec {
 
   gnome-user-docs = callPackage ./core/gnome-user-docs { };
 
+  gnome-user-share = callPackage ./core/gnome-user-share { };
+
   grilo = callPackage ./core/grilo { };
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };

From add4977a91f90db9ae3389e204f9277f4d43ca17 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 12 Apr 2014 16:30:29 +0200
Subject: [PATCH 0107/2033] system-path, gnome3: run update-desktop-database to
 create the mime cache

This allows programs such as yelp to handle help:// protocol schemas
---
 nixos/modules/config/system-path.nix                   | 4 ++++
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 2 files changed, 5 insertions(+)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 1913e17f929..37d452cf942 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -135,6 +135,10 @@ in
           if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
               $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
           fi
+
+          if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then
+              $out/bin/update-desktop-database $out/share/applications
+          fi
         '';
     };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index f7f11ff5f92..7930a6457fd 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -75,6 +75,7 @@ in {
                                                 "${pkgs.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
       [ gnome3.dconf
+        pkgs.desktop_file_utils
         pkgs.glib_networking
         pkgs.ibus
         gnome3.gnome-backgrounds

From 64ce2101a48643ccc407cc5288b9f593ec7b6f15 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 12 Apr 2014 19:43:42 +0200
Subject: [PATCH 0108/2033] telepathy-glib: update to 0.24.0

Adding a gnome online account was not possible due to
https://bugs.freedesktop.org/show_bug.cgi?id=68892
---
 pkgs/development/libraries/telepathy/glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 78d2d520050..6c0806ec4cd 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -2,11 +2,11 @@
 , gobjectIntrospection, valaSupport ? true, vala }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-glib-0.22.1";
+  name = "telepathy-glib-0.24.0";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "0vf2drh7g55nxyd0mxyn9sf99m981dagnvv9yc3q9f4k8x092a78";
+    sha256 = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf";
   };
 
   configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";

From c6383af311edacfb837be33ae00413b017bf52a9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 12 Apr 2014 19:45:12 +0200
Subject: [PATCH 0109/2033] gnome-online-accounts: add dbus service

---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-online-accounts.nix | 39 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../core/gnome-control-center/default.nix     |  4 ++
 .../core/gnome-online-accounts/default.nix    |  2 +
 5 files changed, 47 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bdb678248eb..bf7e2eb3fa2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -101,6 +101,7 @@
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/gnome-keyring.nix
+  ./services/desktops/gnome3/gnome-online-accounts.nix
   ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
new file mode 100644
index 00000000000..365e19c15bb
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -0,0 +1,39 @@
+# GNOME Online Accounts daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-online-accounts = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Online Accounts daemon, a service that provides
+          a single sign-on framework for the GNOME desktop.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-online-accounts.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
+
+    services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 7930a6457fd..72729f1c1f6 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -43,6 +43,7 @@ in {
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.gnome-keyring.enable = true;
+    services.gnome3.gnome-online-accounts.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 92a6b6c2c40..76b06f59bcb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
                             hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
+  enableParallelBuilding = true;
+
   buildInputs = with gnome3;
     [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
@@ -48,6 +50,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    description = "Single sign-on framework for GNOME";
+    maintainers = with maintainers; [ lethalman ];
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
index c17b3ba3eb6..8c459435733 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
 
+  enableParallelBuilding = true;
+
   buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
 
   meta = with stdenv.lib; {

From dd23d9a5a7d4bad9bdcccc5eeccd03bba4d2cdcb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 13 Apr 2014 17:19:56 +0200
Subject: [PATCH 0110/2033] libnotify: enable gobject introspection

---
 .../development/libraries/libnotify/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index 00308bf9471..2b82fe2a4bc 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, glib, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
+, glib, gdk_pixbuf, gobjectIntrospection, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   ver_maj = "0.7";
@@ -9,23 +10,15 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
     sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf";
   };
-  src_m4 = fetchurl {
-    url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2";
-    sha256 = "1cnqh7aaji648nfd5537v7xaak8hgww3bpifhwam7bl0sc3ad523";
-  };
 
   # see Gentoo ebuild - we don't need to depend on gtk+(2/3)
-  preConfigure = ''
-    cd m4
-    tar xvf ${src_m4}
-    cd ..
-
+  preAutoreconf = ''
     sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
     sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
-    AT_M4DIR=. autoreconf
   '';
 
-  buildInputs = [ pkgconfig automake autoconf glib gdk_pixbuf ];
+  buildInputs = [ pkgconfig automake autoconf autoreconfHook
+                  libtool glib gdk_pixbuf gobjectIntrospection ];
 
   meta = {
     homepage = http://galago-project.org/; # very obsolete but found no better

From 3cc07a44bc45886cb194f79c87a4ebb093c11ddf Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 13 Apr 2014 17:20:40 +0200
Subject: [PATCH 0111/2033] gnome-tweak-tool: new package

A tool to customize advanced GNOME 3 options

https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/default.nix             |  2 +
 .../gnome-3/misc/gnome-tweak-tool/default.nix | 46 +++++++++++++++++++
 .../gnome-tweak-tool/find_gsettings.patch     | 22 +++++++++
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
 create mode 100644 pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 72729f1c1f6..c8a996dca08 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -105,6 +105,7 @@ in {
         gnome3.gnome-user-docs
 
         gnome3.file-roller
+        gnome3.gnome-tweak-tool
       ] config.environment.gnome3.excludePackages);
   };
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a6d4f6197d8..4518293f68e 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -162,4 +162,6 @@ rec {
   libgit2-glib = callPackage ./misc/libgit2-glib { };
   
   gexiv2 = callPackage ./misc/gexiv2 { };
+
+  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
 }
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
new file mode 100644
index 00000000000..2eccb9a32cf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, intltool, fetchurl, python, pygobject3, atk
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, bash, makeWrapper, itstool, libxml2, python3Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tweak-tool-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz";
+    sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  makeFlags = [ "DESTDIR=/" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  python pygobject3 libnotify gnome3.gnome_shell
+                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
+                  gnome3.gnome_desktop ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-tweak-tool" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH ":" "${libsoup}/lib:${gnome3.gnome_desktop}/lib:${libnotify}/lib:${gtk3}/lib:${atk}/lib" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
+  '';
+
+  patches = [ ./find_gsettings.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+    description = "A tool to customize advanced GNOME 3 options";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
new file mode 100644
index 00000000000..3e68c04cb3a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
@@ -0,0 +1,22 @@
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index a00fe19..dce74b2 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
+ 
+ class _GSettingsSchema:
+     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+-        if not schema_dir:
+-            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
+         if not schema_filename:
+             schema_filename = schema_name + ".gschema.xml"
++        if not schema_dir:
++            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++            for xdg_dir in GLib.get_system_data_dirs():
++                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
++                if os.path.exists(os.path.join(dir, schema_filename)):
++                    schema_dir = dir
++                    break
+ 
+         schema_path = os.path.join(schema_dir, schema_filename)
+         if not os.path.exists(schema_path):

From 997b4898b51ca06b952f926c8c026122889dc277 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 13 Apr 2014 17:22:07 +0200
Subject: [PATCH 0112/2033] gnome-shell-extensions: new package

Modify and extend GNOME Shell functionality and behavior

https://wiki.gnome.org/Projects/GnomeShell/Extensions
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../core/gnome-shell-extensions/default.nix   | 26 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c8a996dca08..54bc8524607 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -99,6 +99,7 @@ in {
         gnome3.gnome-contacts
         gnome3.gnome-font-viewer
         gnome3.gnome-screenshot
+        gnome3.gnome-shell-extensions
         gnome3.gnome-system-log
         gnome3.gnome-system-monitor
         gnome3.gnome_terminal
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
new file mode 100644
index 00000000000..00974edb1db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extensions-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz";
+    sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+                  makeWrapper file ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+    description = "Modify and extend GNOME Shell functionality and behavior";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 4518293f68e..d29ea3d1c69 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -74,6 +74,8 @@ rec {
 
   gnome_shell = callPackage ./core/gnome-shell { };
 
+  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
+
   gnome-screenshot = callPackage ./core/gnome-screenshot { };
 
   gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };

From ba29614578dd7181a05ed0972c80ba59548b6f52 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 10:19:30 +0200
Subject: [PATCH 0113/2033] Manual: Generate stable ids for options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

E.g. ‘#opt-boot.initrd.kernelModules’.

Also, shut up a stupid XSLT warning (‘attribute value is not an NCName’).
---
 nixos/doc/manual/options-to-docbook.xsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 9647aae0f2f..6170332880f 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -18,8 +18,10 @@
       <variablelist>
 
         <xsl:for-each select="attrs">
+          <xsl:variable name="id" select="concat('opt-', str:replace(str:replace(str:replace(str:replace(attr[@name = 'name']/string/@value, '*', '_'), '&lt;', '_'), '>', '_'), '?', '_'))" />
           <varlistentry>
-            <term xml:id="{generate-id(attr[@name = 'name']/string/@value)}" xlink:href="#{generate-id(attr[@name = 'name']/string/@value)}">
+            <term xlink:href="#{$id}">
+              <xsl:attribute name="xml:id"><xsl:value-of select="$id"/></xsl:attribute>
               <option>
                  <xsl:for-each select="attr[@name = 'name']/string">
                    <xsl:value-of select="@value" />

From 30d0864dc6ec0c94b5ccb866abea235e9a6f6fcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 10:23:02 +0200
Subject: [PATCH 0114/2033] Simplify

---
 nixos/doc/manual/options-to-docbook.xsl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 6170332880f..bb65a49217f 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -23,10 +23,7 @@
             <term xlink:href="#{$id}">
               <xsl:attribute name="xml:id"><xsl:value-of select="$id"/></xsl:attribute>
               <option>
-                 <xsl:for-each select="attr[@name = 'name']/string">
-                   <xsl:value-of select="@value" />
-                   <xsl:if test="position() != last()">.</xsl:if>
-                 </xsl:for-each>
+                <xsl:value-of select="attr[@name = 'name']/string/@value" />
               </option>
              </term>
 

From 753639e548b32c7afd642e8a9823f6b4205330b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 14 Apr 2014 10:27:07 +0200
Subject: [PATCH 0115/2033] typo

---
 pkgs/stdenv/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a341e36b631..4ee9251f4bb 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -62,7 +62,7 @@ let
                  You can set
                     { nixpkgs.config.allowUnfree = true; }
                  in configuration.nix to override this.
-                 If you use nix standalne, you can add
+                 If you use Nix standalone, you can add
                     { config.allowUnfree = true; }
                  to ~/.nixpkgs/config.nix or pass
                     --arg config '{ allowUnfree = true; }'

From b80925a19e1d3e9c7d45a5489f152be3540825b6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 14 Apr 2014 13:25:55 +0200
Subject: [PATCH 0116/2033] empathy: find gsettings schemas, enable in gnome3,
 disable parallel build

Enabling by default on gnome3 as now it's possible to create and use
accounts (tested with telepathy_gabble and gtalk).

At this time, empathy x86-64 fails to build on hydra but I'm unable
to reproduce. Therefore, try disabling the parallel build.
---
 .../modules/services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/core/empathy/default.nix        | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 54bc8524607..6b7818519cf 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -87,6 +87,7 @@ in {
         gnome3.gnome_themes_standard
       ] ++ (removePackagesByName [
         gnome3.baobab
+        gnome3.empathy
         gnome3.eog
         gnome3.epiphany
         gnome3.evince
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index a227c1422d6..051bc9b7fb2 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -37,13 +37,12 @@ stdenv.mkDerivation rec {
                          "-I${dbus_libs}/include/dbus-1.0"
                          "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
-  enableParallelBuilding = true;
-
   preFixup = ''
-    wrapProgram "$out/bin/empathy" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 

From abe218950c779fd1c98034356d3b324d66a0d30a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 14:02:44 +0200
Subject: [PATCH 0117/2033] Make it easier to run the tests

You can now run a test in the nixos/tests directory directly using
nix-build, e.g.

  $ nix-build '<nixos/tests/login.nix>' -A test

This gets rid of having to add the test to nixos/tests/default.nix.
(Of course, you still need to add it to nixos/release.nix if you want
Hydra to run the test.)
---
 nixos/lib/testing.nix             |  4 ++-
 nixos/release.nix                 | 50 ++++++++++++++++++++++++-------
 nixos/tests/avahi.nix             |  6 ++--
 nixos/tests/bittorrent.nix        |  4 +--
 nixos/tests/containers.nix        |  4 +--
 nixos/tests/default.nix           | 46 ----------------------------
 nixos/tests/firefox.nix           |  6 ++--
 nixos/tests/firewall.nix          |  4 +--
 nixos/tests/gnome3.nix            |  4 +--
 nixos/tests/installer.nix         | 31 +++++++++----------
 nixos/tests/ipv6.nix              |  4 +--
 nixos/tests/jenkins.nix           |  4 +--
 nixos/tests/kde4.nix              |  6 ++--
 nixos/tests/kexec.nix             |  4 +--
 nixos/tests/login.nix             |  9 ++++--
 nixos/tests/logstash.nix          | 11 ++++---
 nixos/tests/misc.nix              |  4 +--
 nixos/tests/mpich.nix             |  6 +---
 nixos/tests/mumble.nix            |  4 +--
 nixos/tests/munin.nix             | 13 ++++----
 nixos/tests/mysql-replication.nix |  5 ++--
 nixos/tests/mysql.nix             |  3 +-
 nixos/tests/nat.nix               |  4 +--
 nixos/tests/nfs.nix               |  6 ++--
 nixos/tests/openssh.nix           |  5 ++--
 nixos/tests/partition.nix         |  4 +--
 nixos/tests/printing.nix          |  6 ++--
 nixos/tests/proxy.nix             |  4 +--
 nixos/tests/quake3.nix            |  4 +--
 nixos/tests/rabbitmq.nix          |  9 +++---
 nixos/tests/run-in-machine.nix    |  8 +++--
 nixos/tests/simple.nix            |  4 +--
 nixos/tests/subversion.nix        |  4 +--
 nixos/tests/tomcat.nix            |  4 +--
 nixos/tests/trac.nix              |  5 ++--
 nixos/tests/udisks.nix            |  4 +--
 nixos/tests/xfce.nix              |  4 +--
 37 files changed, 132 insertions(+), 175 deletions(-)
 delete mode 100644 nixos/tests/default.nix

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index d5338bc04ca..02d865895fb 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -73,7 +73,7 @@ rec {
   apply = makeTest; # compatibility
   call = f: f { inherit pkgs system; };
 
-  complete = { testScript, ... } @ t: t // rec {
+  complete = { testScript, makeCoverageReport ? false, ... } @ t: t // rec {
 
     nodes = buildVirtualNetwork (
       t.nodes or (if t ? machine then { machine = t.machine; } else { }));
@@ -117,6 +117,8 @@ rec {
     test = runTests driver;
 
     report = releaseTools.gcovReport { coverageRuns = [ test ]; };
+
+    result = if makeCoverageReport then report else test;
   };
 
 
diff --git a/nixos/release.nix b/nixos/release.nix
index b98976c2cce..7465488ae16 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -14,6 +14,8 @@ let
 
   forAllSystems = pkgs.lib.genAttrs systems;
 
+  callTest = fn: args: forAllSystems (system: (import fn ({ inherit system; } // args)).result);
+
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 
   lib = pkgs.lib;
@@ -207,14 +209,42 @@ in rec {
   */
 
 
-  # Run the tests in ./tests/default.nix for each platform.  You can
-  # run a test by doing e.g. "nix-build -A tests.login.x86_64-linux".
-  tests =
-    with lib;
-    let
-      testsFor = system:
-        mapAttrsRecursiveCond (x: !x ? test)
-          (n: v: listToAttrs [(nameValuePair system (if v.makeCoverageReport or false then v.report else v.test))])
-          (import ./tests { inherit nixpkgs system; });
-    in fold recursiveUpdate {} (map testsFor systems);
+  # Run the tests for each platform.  You can run a test by doing
+  # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
+  # ‘nix-build tests/login.nix -A result’.
+  tests.avahi = callTest tests/avahi.nix {};
+  tests.bittorrent = callTest tests/bittorrent.nix {};
+  tests.containers = callTest tests/containers.nix {};
+  tests.firefox = callTest tests/firefox.nix {};
+  tests.firewall = callTest tests/firewall.nix {};
+  tests.gnome3 = callTest tests/gnome3.nix {};
+  tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
+  tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
+  tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
+  tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
+  tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+  tests.ipv6 = callTest tests/ipv6.nix {};
+  tests.jenkins = callTest tests/jenkins.nix {};
+  tests.kde4 = callTest tests/kde4.nix {};
+  tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
+  tests.login = callTest tests/login.nix {};
+  tests.logstash = callTest tests/logstash.nix {};
+  tests.misc = callTest tests/misc.nix {};
+  tests.mumble = callTest tests/mumble.nix {};
+  tests.munin = callTest tests/munin.nix {};
+  tests.mysql = callTest tests/mysql.nix {};
+  tests.mysqlReplication = callTest tests/mysql-replication.nix {};
+  tests.nat = callTest tests/nat.nix {};
+  tests.nfs3 = callTest tests/nfs.nix { version = 3; };
+  tests.openssh = callTest tests/openssh.nix {};
+  tests.printing = callTest tests/printing.nix {};
+  tests.proxy = callTest tests/proxy.nix {};
+  tests.quake3 = callTest tests/quake3.nix {};
+  tests.rabbitmq = callTest tests/rabbitmq.nix {};
+  tests.runInMachine = callTest tests/run-in-machine.nix {};
+  tests.simple = callTest tests/simple.nix {};
+  tests.tomcat = callTest tests/tomcat.nix {};
+  tests.udisks = callTest tests/udisks.nix {};
+  tests.xfce = callTest tests/xfce.nix {};
+
 }
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index d95361dcd83..4091e7ece50 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }:
+# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
 
-with pkgs;
+import ./make-test.nix {
 
-{
   nodes = {
     one =
       { config, pkgs, ... }: {
@@ -17,7 +16,6 @@ with pkgs;
       };
   };
 
-  # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
   testScript =
     '' startAll;
 
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index f84b65699d3..2604d1ffc92 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -6,7 +6,7 @@
 # which only works if the first client successfully uses the UPnP-IGD
 # protocol to poke a hole in the NAT.
 
-{ pkgs, ... }:
+import ./make-test.nix ({ pkgs, ... }:
 
 let
 
@@ -108,4 +108,4 @@ in
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
     '';
 
-}
+})
diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index 06b793ed7ac..9580f18189a 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -1,8 +1,6 @@
 # Test for NixOS' container support.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/default.nix b/nixos/tests/default.nix
deleted file mode 100644
index d2eb6a99962..00000000000
--- a/nixos/tests/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ nixpkgs ? <nixpkgs>
-, system ? builtins.currentSystem
-, minimal ? false
-}:
-
-with import ../lib/testing.nix { inherit system minimal; };
-
-{
-  avahi = makeTest (import ./avahi.nix);
-  bittorrent = makeTest (import ./bittorrent.nix);
-  containers = makeTest (import ./containers.nix);
-  firefox = makeTest (import ./firefox.nix);
-  firewall = makeTest (import ./firewall.nix);
-  installer = makeTests (import ./installer.nix);
-  efi-installer = makeTests (import ./efi-installer.nix);
-  gnome3 = makeTest (import ./gnome3.nix);
-  ipv6 = makeTest (import ./ipv6.nix);
-  jenkins = makeTest (import ./jenkins.nix);
-  kde4 = makeTest (import ./kde4.nix);
-  #kexec = makeTest (import ./kexec.nix);
-  login = makeTest (import ./login.nix {});
-  logstash = makeTest (import ./logstash.nix);
-  latestKernel.login = makeTest (import ./login.nix ({ config, pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }));
-  misc = makeTest (import ./misc.nix);
-  #mpich = makeTest (import ./mpich.nix);
-  mysql = makeTest (import ./mysql.nix);
-  mysql_replication = makeTest (import ./mysql-replication.nix);
-  munin = makeTest (import ./munin.nix);
-  mumble = makeTest (import ./mumble.nix);
-  nat = makeTest (import ./nat.nix);
-  nfs3 = makeTest (import ./nfs.nix { version = 3; });
-  #nfs4 = makeTest (import ./nfs.nix { version = 4; });
-  openssh = makeTest (import ./openssh.nix);
-  #partition = makeTest (import ./partition.nix);
-  printing = makeTest (import ./printing.nix);
-  proxy = makeTest (import ./proxy.nix);
-  quake3 = makeTest (import ./quake3.nix);
-  rabbitmq = makeTest (import ./rabbitmq.nix);
-  simple = makeTest (import ./simple.nix);
-  #subversion = makeTest (import ./subversion.nix);
-  tomcat = makeTest (import ./tomcat.nix);
-  udisks = makeTest (import ./udisks.nix);
-  #trac = makeTest (import ./trac.nix);
-  xfce = makeTest (import ./xfce.nix);
-  runInMachine.test = import ./run-in-machine.nix { inherit system; };
-}
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index d6599be13c9..b42d473b802 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+import ./make-test.nix ({ pkgs, ... }: {
 
   machine =
     { config, pkgs, ... }:
@@ -18,4 +16,4 @@
       $machine->screenshot("screen");
     '';
 
-}
+})
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index 15653dedf3c..d10e10b1d91 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -1,8 +1,6 @@
 # Test the firewall module.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   nodes =
     { walled =
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 98a76137842..f1a6ce63331 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index b0c0aa328f0..aebaba91811 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1,7 +1,8 @@
-{ pkgs, system, ... }:
+{ system ? builtins.currentSystem }:
 
-with pkgs.lib;
+with import ../lib/testing.nix { inherit system; };
 with import ../lib/qemu-flags.nix;
+with pkgs.lib;
 
 let
 
@@ -99,7 +100,7 @@ let
       my $machine = createMachine({ hda => "harddisk",
         hdaInterface => "${iface}",
         cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
+        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))} ${optionalString (iso.system == "x86_64-linux") "-cpu kvm64"}'});
       $machine->start;
 
       ${optionalString testChannel ''
@@ -190,13 +191,15 @@ let
     '';
 
 
-  makeTest = { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
-    { inherit iso;
+  makeInstallerTest =
+    { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+    makeTest ({ ... }: {
+      inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
         inherit createPartitions fileSystems testChannel grubVersion grubDevice;
       };
-    };
+    });
 
 
 in {
@@ -206,7 +209,7 @@ in {
 
   # The (almost) simplest partitioning scheme: a swap partition and
   # one big filesystem partition.
-  simple = makeTest
+  simple = makeInstallerTest
     { createPartitions =
         ''
           $machine->succeed(
@@ -225,7 +228,7 @@ in {
     };
 
   # Same as the previous, but now with a separate /boot partition.
-  separateBoot = makeTest
+  separateBoot = makeInstallerTest
     { createPartitions =
         ''
           $machine->succeed(
@@ -248,7 +251,7 @@ in {
 
   # Create two physical LVM partitions combined into one volume group
   # that contains the logical swap and root partitions.
-  lvm = makeTest
+  lvm = makeInstallerTest
     { createPartitions =
         ''
           $machine->succeed(
@@ -271,8 +274,7 @@ in {
       fileSystems = rootFS;
     };
 
-  /*
-  swraid = makeTest
+  swraid = makeInstallerTest
     { createPartitions =
         ''
           $machine->succeed(
@@ -304,10 +306,9 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
-  */
 
   # Test a basic install using GRUB 1.
-  grub1 = makeTest
+  grub1 = makeInstallerTest
     { createPartitions =
         ''
           $machine->succeed(
@@ -328,7 +329,7 @@ in {
     };
 
   # Rebuild the CD configuration with a little modification.
-  rebuildCD =
+  rebuildCD = makeTest ({ ... }:
     { inherit iso;
       nodes = { };
       testScript =
@@ -352,5 +353,5 @@ in {
 
           $machine->shutdown;
         '';
-    };
+    });
 }
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 48c20d7f5c9..eb15363d3c3 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -1,9 +1,7 @@
 # Test of IPv6 functionality in NixOS, including whether router
 # solicication/advertisement using radvd works.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   nodes =
     { client = { config, pkgs, ... }: { };
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 40223482791..9d3f76ca3e1 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -2,9 +2,9 @@
 #   1. jenkins service starts on master node
 #   2. jenkins user can be extended on both master and slave
 #   3. jenkins service not started on slave node
-{ pkgs, ... }:
 
-{
+import ./make-test.nix {
+
   nodes = {
 
     master =
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 3fb35bbab09..725759ab758 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+import ./make-test.nix ({ pkgs, ... }: {
 
   machine =
     { config, pkgs, ... }:
@@ -64,4 +62,4 @@
       $machine->screenshot("screen");
     '';
 
-}
+})
diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix
index b8da332b919..b09287682c0 100644
--- a/nixos/tests/kexec.nix
+++ b/nixos/tests/kexec.nix
@@ -1,8 +1,6 @@
 # Test whether fast reboots via kexec work.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix  {
 
   machine = { config, pkgs, ... }:
     { virtualisation.vlans = [ ]; };
diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index ed7d9786717..0a7d25c37ac 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -1,8 +1,11 @@
-config: { pkgs, ... }:
+import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
 {
 
-  machine = config;
+  machine =
+    { config, pkgs, lib, ... }:
+    { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
+    };
 
   testScript =
     ''
@@ -58,4 +61,4 @@ config: { pkgs, ... }:
       };
     '';
 
-}
+})
diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix
index ee309d39f87..e6aba7a1012 100644
--- a/nixos/tests/logstash.nix
+++ b/nixos/tests/logstash.nix
@@ -1,9 +1,8 @@
-{ pkgs, ... }:
+# This test runs logstash and checks if messages flows and
+# elasticsearch is started.
 
-# This test runs logstash and checks if messages flows and elasticsearch is
-# started
+import ./make-test.nix {
 
-{
   nodes = {
     one =
       { config, pkgs, ... }:
@@ -28,10 +27,10 @@
           };
         };
     };
-  
+
   testScript = ''
     startAll;
-  
+
     $one->waitForUnit("logstash.service");
     $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers");
     $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons");
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index d355d705a24..0f57b9f6126 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -1,8 +1,6 @@
 # Miscellaneous small tests that don't warrant their own VM run.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   machine =
     { config, pkgs, ... }:
diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix
index d57512ebdfe..13cd0960d07 100644
--- a/nixos/tests/mpich.nix
+++ b/nixos/tests/mpich.nix
@@ -1,10 +1,6 @@
 # Simple example to showcase distributed tests using NixOS VMs.
 
-{ pkgs, ... }:
-
-with pkgs;
-
-{
+import ./make-test.nix {
   nodes = {
     master =
       { config, pkgs, ... }: {
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 10658eb5f02..8896830b0c2 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+import ./make-test.nix (
 
 let
   client = { config, pkgs, ... }: {
@@ -52,4 +52,4 @@ in
     $client1->screenshot("screen1");
     $client2->screenshot("screen2");
   '';
-}
+})
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 66ae1c0d87f..acc4b949ab5 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -1,13 +1,12 @@
-{ pkgs, ... }:
-
 # This test runs basic munin setup with node and cron job running on the same
 # machine.
 
-{
-  nodes = { 
+import ./make-test.nix {
+
+  nodes = {
     one =
       { config, pkgs, ... }:
-        { 
+        {
           services = {
            munin-node.enable = true;
            munin-cron = {
@@ -20,10 +19,10 @@
           };
         };
     };
-  
+
   testScript = ''
     startAll;
-  
+
     $one->waitForUnit("munin-node.service");
     $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
     $one->waitForFile("/var/www/munin/one/index.html");
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 44586322600..7d0cf6d85a1 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }:
+import ./make-test.nix (
 
 let
   replicateUser = "replicate";
   replicatePassword = "secret";
 in
+
 {
   nodes = {
     master =
@@ -58,4 +59,4 @@ in
     $slave2->sleep(100); # Hopefully this is long enough!!
     $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
-}
+})
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index bceeb8beabc..566d03baf36 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+import ./make-test.nix {
 
-{
   nodes = {
     master =
       { pkgs, config, ... }:
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 259ab99d301..02981469e10 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -4,9 +4,7 @@
 # router connected to both that performs Network Address Translation
 # for the client.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   nodes =
     { client =
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 7bc99aef3b5..864d05626b6 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -1,6 +1,4 @@
-{ version }:
-
-{ pkgs, ... }:
+import ./make-test.nix ({ version, ... }:
 
 let
 
@@ -84,4 +82,4 @@ in
       die "shutdown took too long ($duration seconds)" if $duration > 30;
     '';
 
-}
+})
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 49d92fbde90..0b9714c275d 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+import ./make-test.nix ({ pkgs, ... }: {
 
-{
   nodes = {
 
     server =
@@ -35,4 +34,4 @@
     $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
     $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
   '';
-}
+})
diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix
index 7126e7255ef..309afa4ce9d 100644
--- a/nixos/tests/partition.nix
+++ b/nixos/tests/partition.nix
@@ -1,4 +1,4 @@
-{ pkgs, system, ... }:
+import ./make-test.nix ({ pkgs, ... }:
 
 with pkgs.lib;
 
@@ -224,4 +224,4 @@ in {
       ensureMountPoint("/mnt/boot");
     };
   '';
-}
+})
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index b5ca0f25e21..9ef28dcfcd4 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -1,8 +1,6 @@
 # Test printing via CUPS.
 
-{ pkgs, ... }:
-
-{
+import ./make-test.nix ({pkgs, ... }: {
 
   nodes = {
 
@@ -88,4 +86,4 @@
       }
     '';
 
-}
+})
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index dd64ca02e16..88dbdb2720f 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+import ./make-test.nix (
 
 let
 
@@ -90,4 +90,4 @@ in
       $client->succeed("curl --fail http://proxy/");
     '';
 
-}
+})
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 2ebac84ca06..3ff12fd57c0 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+import ./make-test.nix (
 
 let
 
@@ -79,4 +79,4 @@ rec {
       $server->stopJob("quake3-server");
     '';
 
-}
+})
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index 271661f0682..ffcdde9d87f 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -1,8 +1,7 @@
-{ pkgs, ... }:
+# This test runs rabbitmq and checks if rabbitmq is up and running.
 
-# This test runs rabbitmq and checks if rabbitmq is up and running
+import ./make-test.nix ({ pkgs, ... }: {
 
-{
   nodes = {
     one = { config, pkgs, ... }: {
       services.rabbitmq.enable = true;
@@ -11,8 +10,8 @@
 
   testScript = ''
     startAll;
-  
+
     $one->waitForUnit("rabbitmq.service");
     $one->waitUntilSucceeds("su -s ${pkgs.stdenv.shell} rabbitmq -c \"rabbitmqctl status\"");
   '';
-}
+})
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 8efe26c1708..7f6e6a6dc57 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -2,7 +2,9 @@
 
 with import ../lib/testing.nix { inherit system; };
 
-runInMachine {
-  drv = pkgs.patchelf;
-  machine = { config, pkgs, ... }: { services.sshd.enable = true; };
+{
+  test = runInMachine {
+    drv = pkgs.hello;
+    machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
+  };
 }
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index eee13a10133..e21b919cdf8 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,11 +1,11 @@
-{ pkgs, ... }:
+import ./make-test.nix {
 
-{
   machine = { config, pkgs, ... }: { };
 
   testScript =
     ''
       startAll;
+      $machine->waitForUnit("multi-user.target");
       $machine->shutdown;
     '';
 }
diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix
index 49450c78f3b..e6746dc0828 100644
--- a/nixos/tests/subversion.nix
+++ b/nixos/tests/subversion.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+import ./make-test.nix (
 
 let
 
@@ -114,4 +114,4 @@ in
       $webserver->stopJob("httpd");
     '';
 
-}
+})
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index 6ec21a72192..3b0b1bb7911 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+import ./make-test.nix {
 
-{
   nodes = {
     server =
       { pkgs, config, ... }:
@@ -25,4 +24,5 @@
     $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
     $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
+
 }
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index e0d256f5701..3f17dafaca1 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+import ./make-test.nix ({ pkgs, ... }: {
 
-{
   nodes = {
     storage =
       { config, pkgs, ... }:
@@ -68,4 +67,4 @@
 
       $client->screenshot("screen");
     '';
-}
+})
diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix
index e3e3f740d07..2354c310661 100644
--- a/nixos/tests/udisks.nix
+++ b/nixos/tests/udisks.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+import ./make-test.nix ({ pkgs, ... }:
 
 let
 
@@ -53,4 +53,4 @@ in
       $machine->fail("[ -e /dev/sda ]");
     '';
 
-}
\ No newline at end of file
+})
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 50ce54c918b..ded37943e51 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
-
-{
+import ./make-test.nix {
 
   machine =
     { config, pkgs, ... }:

From 36c05d5e5b0025c9c6f62b101478e5e9f6da8d91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 14:23:38 +0200
Subject: [PATCH 0118/2033] Simplify running tests even further

Now you can just say:

  $ nix-build '<nixos/tests/login.nix>'

You can still get the driver script for interactive testing:

  $ nix-build '<nixos/tests/login.nix>' -A driver
  $ ./result/bin/nixos-test-driver
---
 nixos/lib/testing.nix | 88 +++++++++++++++++++++----------------------
 nixos/release.nix     |  2 +-
 2 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 02d865895fb..8d17958b9d2 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -67,59 +67,55 @@ rec {
     };
 
 
-  makeTest = testFun: complete (call testFun);
-  makeTests = testsFun: lib.mapAttrs (name: complete) (call testsFun);
+  makeTest =
+    { testScript, makeCoverageReport ? false, ... } @ t:
 
-  apply = makeTest; # compatibility
-  call = f: f { inherit pkgs system; };
+    let
 
-  complete = { testScript, makeCoverageReport ? false, ... } @ t: t // rec {
+      nodes = buildVirtualNetwork (
+        t.nodes or (if t ? machine then { machine = t.machine; } else { }));
 
-    nodes = buildVirtualNetwork (
-      t.nodes or (if t ? machine then { machine = t.machine; } else { }));
+      testScript' =
+        # Call the test script with the computed nodes.
+        if builtins.isFunction testScript
+        then testScript { inherit nodes; }
+        else testScript;
 
-    testScript =
-      # Call the test script with the computed nodes.
-      if builtins.isFunction t.testScript
-      then t.testScript { inherit nodes; }
-      else t.testScript;
+      vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
 
-    vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes);
+      vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
 
-    vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
+      # Generate onvenience wrappers for running the test driver
+      # interactively with the specified network, and for starting the
+      # VMs from the command line.
+      driver = runCommand "nixos-test-driver"
+        { buildInputs = [ makeWrapper];
+          testScript = testScript';
+          preferLocalBuild = true;
+        }
+        ''
+          mkdir -p $out/bin
+          echo "$testScript" > $out/test-script
+          ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
+          vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)"
+          wrapProgram $out/bin/nixos-test-driver \
+            --add-flags "$vms" \
+            --run "testScript=\"\$(cat $out/test-script)\"" \
+            --set testScript '"$testScript"' \
+            --set VLANS '"${toString vlans}"'
+          ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
+          wrapProgram $out/bin/nixos-run-vms \
+            --add-flags "$vms" \
+            --set tests '"startAll; joinAll;"' \
+            --set VLANS '"${toString vlans}"' \
+            ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
+        ''; # "
 
-    # Generate onvenience wrappers for running the test driver
-    # interactively with the specified network, and for starting the
-    # VMs from the command line.
-    driver = runCommand "nixos-test-driver"
-      { buildInputs = [ makeWrapper];
-        inherit testScript;
-        preferLocalBuild = true;
-      }
-      ''
-        mkdir -p $out/bin
-        echo "$testScript" > $out/test-script
-        ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
-        vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)"
-        wrapProgram $out/bin/nixos-test-driver \
-          --add-flags "$vms" \
-          --run "testScript=\"\$(cat $out/test-script)\"" \
-          --set testScript '"$testScript"' \
-          --set VLANS '"${toString vlans}"'
-        ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
-        wrapProgram $out/bin/nixos-run-vms \
-          --add-flags "$vms" \
-          --set tests '"startAll; joinAll;"' \
-          --set VLANS '"${toString vlans}"' \
-          ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
-      ''; # "
+      test = runTests driver;
 
-    test = runTests driver;
+      report = releaseTools.gcovReport { coverageRuns = [ test ]; };
 
-    report = releaseTools.gcovReport { coverageRuns = [ test ]; };
-
-    result = if makeCoverageReport then report else test;
-  };
+    in (if makeCoverageReport then report else test) // { inherit driver test; };
 
 
   runInMachine =
@@ -149,7 +145,7 @@ rec {
         exit $?
       '';
 
-      testscript = ''
+      testScript = ''
         startAll;
         $client->waitForUnit("multi-user.target");
         ${preBuild}
@@ -162,7 +158,7 @@ rec {
         ${coreutils}/bin/mkdir $out
         ${coreutils}/bin/mkdir -p vm-state-client/xchg
         export > vm-state-client/xchg/saved-env
-        export tests='${testscript}'
+        export tests='${testScript}'
         ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
       ''; # */
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 7465488ae16..45c37570c1b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -14,7 +14,7 @@ let
 
   forAllSystems = pkgs.lib.genAttrs systems;
 
-  callTest = fn: args: forAllSystems (system: (import fn ({ inherit system; } // args)).result);
+  callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args));
 
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 

From 3f15f8b703f8737117f7364bb2c4de3f48de4ff0 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 14 Apr 2014 14:38:44 +0200
Subject: [PATCH 0119/2033] Add script to create and upload GCE image.

---
 nixos/maintainers/scripts/gce/create-gce.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100755 nixos/maintainers/scripts/gce/create-gce.sh

diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
new file mode 100755
index 00000000000..8bf36f33c7d
--- /dev/null
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+export NIX_PATH=nixpkgs=../../../..
+export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
+export TIMESTAMP=$(date +%Y%m%d%H%M)
+
+nix-build '<nixpkgs/nixos>' \
+   -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10
+
+img=$(echo gce/*.tar.gz)
+if ! gsutil ls gs://nixos/$(basename $img); then
+  gsutil cp $img gs://nixos/$(basename $img)
+fi
+gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://nixos/$(basename $img)

From 5d6c6abe50257e8a14d5d567e3a2062dc7eb3325 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 15:07:15 +0200
Subject: [PATCH 0120/2033] kde-4.10: Remove

---
 pkgs/desktops/kde-4.10/applications/kate.nix  |  11 -
 .../kde-4.10/applications/konsole.nix         |  11 -
 pkgs/desktops/kde-4.10/default.nix            |  71 ----
 .../files/kde-wallpapers-buildsystem.patch    |  17 -
 .../kde-4.10/files/polkit-install.patch       |  12 -
 pkgs/desktops/kde-4.10/kactivities.nix        |   9 -
 pkgs/desktops/kde-4.10/kde-base-artwork.nix   |  14 -
 .../kde-4.10/kde-baseapps/kde-baseapps.nix    |  11 -
 pkgs/desktops/kde-4.10/kde-package/4.10.5.nix | 399 ------------------
 .../desktops/kde-4.10/kde-package/default.nix | 129 ------
 .../kde-4.10/kde-package/kde-manifest.sh      | 146 -------
 .../kde-4.10/kde-package/kde-submodules.xslt  |  22 -
 pkgs/desktops/kde-4.10/kde-runtime.nix        |  23 -
 pkgs/desktops/kde-4.10/kde-wallpapers.nix     |  17 -
 pkgs/desktops/kde-4.10/kde-workspace.nix      |  45 --
 .../kde-4.10/kdeaccessibility/jovie.nix       |   9 -
 .../kde-4.10/kdeaccessibility/kaccessible.nix |   9 -
 .../kde-4.10/kdeaccessibility/kmag.nix        |  10 -
 .../kde-4.10/kdeaccessibility/kmousetool.nix  |   9 -
 .../kde-4.10/kdeaccessibility/kmouth.nix      |   9 -
 pkgs/desktops/kde-4.10/kdeadmin/kcron.nix     |   5 -
 .../desktops/kde-4.10/kdeadmin/ksystemlog.nix |   5 -
 pkgs/desktops/kde-4.10/kdeadmin/kuser.nix     |   5 -
 .../kde-4.10/kdeartwork/ColorSchemes.nix      |  11 -
 .../kdeartwork/FindXscreensaver.cmake         |  73 ----
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.10/kdeartwork/IconThemes.nix        |  13 -
 .../kde-4.10/kdeartwork/WeatherWallpapers.nix |  11 -
 .../kde-4.10/kdeartwork/desktopthemes.nix     |  11 -
 .../kde-4.10/kdeartwork/emoticons.nix         |  11 -
 .../kde-4.10/kdeartwork/kscreensaver.nix      |  15 -
 .../kde-4.10/kdeartwork/kwin-styles.nix       |   9 -
 pkgs/desktops/kde-4.10/kdeartwork/sounds.nix  |  11 -
 pkgs/desktops/kde-4.10/kdeartwork/styles.nix  |  11 -
 .../kde-4.10/kdeartwork/wallpapers.nix        |  11 -
 pkgs/desktops/kde-4.10/kdebindings/perlqt.nix |  11 -
 .../pykde4-hardcode-lib-python.patch          |  18 -
 pkgs/desktops/kde-4.10/kdebindings/pykde4.nix |  34 --
 .../kdebindings/qtruby-install-prefix.patch   |  15 -
 pkgs/desktops/kde-4.10/kdebindings/qtruby.nix |  15 -
 .../smokegen-CMakeLists.txt-nix.patch         |  14 -
 .../smokegen-SmokeConfig.cmake.in-nix.patch   |  13 -
 .../kde-4.10/kdebindings/smokegen.nix         |  13 -
 .../kde-4.10/kdebindings/smokekde.nix         |  16 -
 .../desktops/kde-4.10/kdebindings/smokeqt.nix |  13 -
 pkgs/desktops/kde-4.10/kdeedu/analitza.nix    |   8 -
 pkgs/desktops/kde-4.10/kdeedu/blinken.nix     |   8 -
 pkgs/desktops/kde-4.10/kdeedu/cantor.nix      |  11 -
 pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix    |   8 -
 pkgs/desktops/kde-4.10/kdeedu/kalzium.nix     |  11 -
 pkgs/desktops/kde-4.10/kdeedu/kanagram.nix    |   8 -
 pkgs/desktops/kde-4.10/kdeedu/kbruch.nix      |   8 -
 pkgs/desktops/kde-4.10/kdeedu/kgeography.nix  |   8 -
 pkgs/desktops/kde-4.10/kdeedu/khangman.nix    |   8 -
 pkgs/desktops/kde-4.10/kdeedu/kig.nix         |  12 -
 pkgs/desktops/kde-4.10/kdeedu/kiten.nix       |   9 -
 pkgs/desktops/kde-4.10/kdeedu/klettres.nix    |   9 -
 pkgs/desktops/kde-4.10/kdeedu/kmplot.nix      |  12 -
 pkgs/desktops/kde-4.10/kdeedu/kstars.nix      |  10 -
 pkgs/desktops/kde-4.10/kdeedu/ktouch.nix      |   9 -
 pkgs/desktops/kde-4.10/kdeedu/kturtle.nix     |   9 -
 pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix   |   9 -
 pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix   |   8 -
 pkgs/desktops/kde-4.10/kdeedu/marble.nix      |  10 -
 pkgs/desktops/kde-4.10/kdeedu/pairs.nix       |   9 -
 pkgs/desktops/kde-4.10/kdeedu/parley.nix      |   9 -
 pkgs/desktops/kde-4.10/kdeedu/rocs.nix        |  14 -
 pkgs/desktops/kde-4.10/kdeedu/step.nix        |  12 -
 pkgs/desktops/kde-4.10/kdegames/bomber.nix    |   7 -
 pkgs/desktops/kde-4.10/kdegames/bovo.nix      |   8 -
 pkgs/desktops/kde-4.10/kdegames/granatier.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/kajongg.nix   |  13 -
 pkgs/desktops/kde-4.10/kdegames/kapman.nix    |   7 -
 pkgs/desktops/kde-4.10/kdegames/katomic.nix   |   7 -
 pkgs/desktops/kde-4.10/kdegames/kblackbox.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/kblocks.nix   |   7 -
 pkgs/desktops/kde-4.10/kdegames/kbounce.nix   |   7 -
 pkgs/desktops/kde-4.10/kdegames/kbreakout.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/kdiamond.nix  |   7 -
 .../kde-4.10/kdegames/kfourinline.nix         |   7 -
 .../kde-4.10/kdegames/kgoldrunner.nix         |   7 -
 pkgs/desktops/kde-4.10/kdegames/kigo.nix      |   7 -
 pkgs/desktops/kde-4.10/kdegames/killbots.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/kiriki.nix    |   7 -
 .../kde-4.10/kdegames/kjumpingcube.nix        |   7 -
 pkgs/desktops/kde-4.10/kdegames/klickety.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/klines.nix    |   7 -
 pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/kmines.nix    |   7 -
 .../kde-4.10/kdegames/knavalbattle.nix        |   7 -
 pkgs/desktops/kde-4.10/kdegames/knetwalk.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/kolf.nix      |   7 -
 pkgs/desktops/kde-4.10/kdegames/kollision.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/konquest.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/kpat.nix      |   7 -
 pkgs/desktops/kde-4.10/kdegames/kreversi.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/kshisen.nix   |   7 -
 pkgs/desktops/kde-4.10/kdegames/ksirk.nix     |   7 -
 .../desktops/kde-4.10/kdegames/ksnakeduel.nix |   7 -
 .../desktops/kde-4.10/kdegames/kspaceduel.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/ksquares.nix  |   7 -
 pkgs/desktops/kde-4.10/kdegames/ksudoku.nix   |   7 -
 .../desktops/kde-4.10/kdegames/ktuberling.nix |   7 -
 pkgs/desktops/kde-4.10/kdegames/kubrick.nix   |   7 -
 .../kde-4.10/kdegames/libkdegames.nix         |   7 -
 .../kde-4.10/kdegames/libkmahjongg.nix        |   7 -
 pkgs/desktops/kde-4.10/kdegames/lskat.nix     |   7 -
 pkgs/desktops/kde-4.10/kdegames/palapeli.nix  |   8 -
 pkgs/desktops/kde-4.10/kdegames/picmi.nix     |   7 -
 .../kde-4.10/kdegraphics/gwenview.nix         |  15 -
 pkgs/desktops/kde-4.10/kdegraphics/kamera.nix |  10 -
 .../kde-4.10/kdegraphics/kcolorchooser.nix    |  10 -
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  10 -
 pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix |  10 -
 .../kde-4.10/kdegraphics/kolourpaint.nix      |  10 -
 pkgs/desktops/kde-4.10/kdegraphics/kruler.nix |  10 -
 .../kde-4.10/kdegraphics/ksaneplugin.nix      |  10 -
 .../kde-4.10/kdegraphics/ksnapshot.nix        |  10 -
 .../kde-4.10/kdegraphics/libkdcraw.nix        |  10 -
 .../kde-4.10/kdegraphics/libkexiv2.nix        |  10 -
 .../desktops/kde-4.10/kdegraphics/libkipi.nix |  10 -
 .../kde-4.10/kdegraphics/libksane.nix         |  10 -
 pkgs/desktops/kde-4.10/kdegraphics/okular.nix |  17 -
 .../desktops/kde-4.10/kdegraphics/svgpart.nix |  10 -
 pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix    |  43 --
 .../kde-4.10/kdelibs/nepomuk-core.nix         |  11 -
 .../kde-4.10/kdelibs/nepomuk-widgets.nix      |  11 -
 .../kde-4.10/kdemultimedia/audiocd-kio.nix    |   7 -
 .../kde-4.10/kdemultimedia/dragon.nix         |   7 -
 .../kde-4.10/kdemultimedia/ffmpegthumbs.nix   |   7 -
 pkgs/desktops/kde-4.10/kdemultimedia/juk.nix  |   7 -
 pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix |   7 -
 pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix |   7 -
 .../kde-4.10/kdemultimedia/libkcddb.nix       |   8 -
 .../kdemultimedia/libkcompactdisc.nix         |   7 -
 .../kde-4.10/kdemultimedia/mplayerthumbs.nix  |   7 -
 .../kde-4.10/kdenetwork/FindmsiLBC.cmake      |  19 -
 .../kdenetwork/kdenetwork-filesharing.nix     |   5 -
 .../kdenetwork-strigi-analyzers.nix           |   9 -
 pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix  |   5 -
 pkgs/desktops/kde-4.10/kdenetwork/kget.nix    |  14 -
 ...te-4.10.4-kopete-linphonemediaengine.patch |  22 -
 .../kopete-4.10.4-kopete-stun.patch           |  47 ---
 .../kde-4.10/kdenetwork/kopete-giflib5.patch  |  70 ---
 pkgs/desktops/kde-4.10/kdenetwork/kopete.nix  |  31 --
 pkgs/desktops/kde-4.10/kdenetwork/kppp.nix    |   5 -
 pkgs/desktops/kde-4.10/kdenetwork/krdc.nix    |   5 -
 pkgs/desktops/kde-4.10/kdenetwork/krfb.nix    |   5 -
 pkgs/desktops/kde-4.10/kdepim-runtime.nix     |  14 -
 pkgs/desktops/kde-4.10/kdepim.nix             |  22 -
 pkgs/desktops/kde-4.10/kdepimlibs.nix         |  19 -
 pkgs/desktops/kde-4.10/kdeplasma-addons.nix   |  22 -
 pkgs/desktops/kde-4.10/kdesdk/cervisia.nix    |   9 -
 .../kdesdk/dolphin-plugins-bazaar.nix         |  15 -
 .../kde-4.10/kdesdk/dolphin-plugins-git.nix   |  15 -
 .../kde-4.10/kdesdk/dolphin-plugins-hg.nix    |  15 -
 .../kde-4.10/kdesdk/dolphin-plugins-svn.nix   |  15 -
 .../desktops/kde-4.10/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix |   9 -
 .../kde-4.10/kdesdk/kde-dev-scripts.nix       |   9 -
 .../kde-4.10/kdesdk/kde-dev-utils.nix         |  11 -
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 -
 .../kde-4.10/kdesdk/kdesdk-thumbnailers.nix   |  12 -
 .../kde-4.10/kdesdk/kioslave-perldoc.nix      |  12 -
 .../desktops/kde-4.10/kdesdk/kioslave-svn.nix |  10 -
 pkgs/desktops/kde-4.10/kdesdk/kompare.nix     |   9 -
 pkgs/desktops/kde-4.10/kdesdk/lokalize.nix    |  13 -
 pkgs/desktops/kde-4.10/kdesdk/okteta.nix      |  13 -
 pkgs/desktops/kde-4.10/kdesdk/poxml.nix       |   9 -
 .../thumbnailers-add-subdirectory.patch       |  12 -
 pkgs/desktops/kde-4.10/kdesdk/umbrello.nix    |   9 -
 pkgs/desktops/kde-4.10/kdetoys/amor.nix       |   9 -
 pkgs/desktops/kde-4.10/kdetoys/kteatime.nix   |   9 -
 pkgs/desktops/kde-4.10/kdetoys/ktux.nix       |   9 -
 pkgs/desktops/kde-4.10/kdeutils/ark.nix       |   9 -
 pkgs/desktops/kde-4.10/kdeutils/filelight.nix |   9 -
 pkgs/desktops/kde-4.10/kdeutils/kcalc.nix     |   9 -
 .../kde-4.10/kdeutils/kcharselect.nix         |   9 -
 pkgs/desktops/kde-4.10/kdeutils/kdf.nix       |  11 -
 pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix   |   9 -
 pkgs/desktops/kde-4.10/kdeutils/kgpg.nix      |   9 -
 .../kde-4.10/kdeutils/kremotecontrol.nix      |   9 -
 pkgs/desktops/kde-4.10/kdeutils/ktimer.nix    |   9 -
 pkgs/desktops/kde-4.10/kdeutils/kwallet.nix   |   9 -
 .../kde-4.10/kdeutils/print-manager.nix       |  28 --
 .../kde-4.10/kdeutils/superkaramba.nix        |  11 -
 pkgs/desktops/kde-4.10/kdeutils/sweeper.nix   |   9 -
 .../kde-4.10/kdewebdev/kfilereplace.nix       |  10 -
 .../kde-4.10/kdewebdev/kimagemapeditor.nix    |  10 -
 .../kde-4.10/kdewebdev/klinkstatus.nix        |  12 -
 .../desktops/kde-4.10/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.10/l10n/default.nix       |  46 --
 pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh  |  32 --
 .../kde-4.10/l10n/manifest-4.10.4.nix         | 282 -------------
 .../kde-4.10/l10n/manifest-4.10.5.nix         | 282 -------------
 pkgs/desktops/kde-4.10/oxygen-icons.nix       |  15 -
 .../kde-4.10/support/akonadi/default.nix      |  24 --
 pkgs/top-level/all-packages.nix               |  14 +-
 200 files changed, 2 insertions(+), 3613 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.10/applications/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.10/applications/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.10/default.nix
 delete mode 100644 pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.10/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kactivities.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-base-artwork.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt
 delete mode 100644 pkgs/desktops/kde-4.10/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kde-workspace.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/sounds.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/analitza.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kstars.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/marble.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/pairs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/bomber.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/bovo.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/granatier.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kajongg.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kapman.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/katomic.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kblackbox.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kblocks.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kbounce.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kbreakout.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kdiamond.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kfourinline.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kigo.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/killbots.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kiriki.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/klickety.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/klines.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kmines.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/knetwalk.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kolf.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kollision.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/konquest.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kpat.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kreversi.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kshisen.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/ksirk.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/ksquares.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/ksudoku.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/ktuberling.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/kubrick.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/libkdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/lskat.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/palapeli.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegames/picmi.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/okular.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/juk.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdepimlibs.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
 delete mode 100644 pkgs/desktops/kde-4.10/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.10/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.10/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix
 delete mode 100644 pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
 delete mode 100644 pkgs/desktops/kde-4.10/oxygen-icons.nix
 delete mode 100644 pkgs/desktops/kde-4.10/support/akonadi/default.nix

diff --git a/pkgs/desktops/kde-4.10/applications/kate.nix b/pkgs/desktops/kde-4.10/applications/kate.nix
deleted file mode 100644
index e8efc87775a..00000000000
--- a/pkgs/desktops/kde-4.10/applications/kate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }:
-
-kde {
-
-  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/applications/konsole.nix b/pkgs/desktops/kde-4.10/applications/konsole.nix
deleted file mode 100644
index 0db47fb2d7c..00000000000
--- a/pkgs/desktops/kde-4.10/applications/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix
deleted file mode 100644
index feb6ed21409..00000000000
--- a/pkgs/desktops/kde-4.10/default.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
-
-let
-  branch = "4.10";
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release branch ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # fake package to make things just work
-    kdesdk = [ "fake" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {
-    kdesdk = [
-      { name="cervisia"; }
-      { name="lokalize"; }
-      { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kdesdk-kioslaves"; }
-      { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kdesdk-kioslaves"; }
-      { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins"; }
-      { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins"; }
-      { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins"; }
-      { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins"; }
-      { name="kcachegrind"; }
-      { name="kapptemplate"; }
-      { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";}
-      { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers";}
-      { name="okteta"; }
-      { name="kompare"; }
-      { name="poxml"; }
-      { name="kde-dev-scripts"; sane = "kde_dev_scripts"; }
-      { name="kde-dev-utils"; sane="kde_dev_utils";}
-      #{ name="kprofilemethod"; subdir = "kde-dev-utils/kprofilemethod";}
-      #{ name="kstartperf"; }
-      #{ name="kmtrace"; subdir = "kde-dev-utils/kmtrace"; }
-      #{ name="kpartloader"; }
-      #{ name="kuiviewer"; }
-      { name="umbrello"; }
-    ];
-  };
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release branch;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb64694..00000000000
--- a/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.10/files/polkit-install.patch b/pkgs/desktops/kde-4.10/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/desktops/kde-4.10/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.10/kactivities.nix b/pkgs/desktops/kde-4.10/kactivities.nix
deleted file mode 100644
index 06381bb13d7..00000000000
--- a/pkgs/desktops/kde-4.10/kactivities.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix
deleted file mode 100644
index 3f416cebddc..00000000000
--- a/pkgs/desktops/kde-4.10/kde-base-artwork.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Base artwork";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index b564e339eb1..00000000000
--- a/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
-
-kde {
-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
deleted file mode 100644
index b1abdb8afec..00000000000
--- a/pkgs/desktops/kde-4.10/kde-package/4.10.5.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="0lc83vmapd66ilph26hlf8shd4xv0v9y8jsjycw5nl4xpfm7l5nr";}
-  {name="ark";value="1fvb6phcfd17fxcbb5w4njmkj0vlnz6g5qa6wv5szn4fakb5db1v";}
-  {name="audiocd-kio";value="11ma2pvc7w6gdd98h806i163dsjhxxly4wv4xdcqq4yhdviq29qv";}
-  {name="blinken";value="1lfv15blwy3m88zylqsa7k1a5z01qmakjrb9wq9yxnjbhb12nyf8";}
-  {name="bomber";value="0z704hzpgl1s7jdcpicvixd2dnfsh7i4ainjd5zc1rcljgabmvmx";}
-  {name="bovo";value="10wp4spcdwsa4nbq9qhancvddv83q12qbi72ksnvds50md12h5xx";}
-  {name="cantor";value="070al4dx7x7kk568lpd1ajq0q5gws48w3n76g0wlf4dqqlijjfx6";}
-  {name="dragon";value="0wj89v1d34s595ky97zwph7rxb97h03qya3bi6y1npcp7kjlv2j9";}
-  {name="ffmpegthumbs";value="0ilc8k601g3m4x1slfcczah87f402a9143a70gvbjprffd7iyf9q";}
-  {name="filelight";value="1wfd498ir1ivcks1ys3h8whvi0l4xwfgz2j5c4m4b517dskrmaxf";}
-  {name="granatier";value="04i1zzqkv0da6ymqvdxlaxgws7z44521zj51nw4mvapf1jcck7bq";}
-  {name="gwenview";value="0rz3va3djm3qxqvchxa3549r1qf124sb4105bs6s42a05h4mzhqv";}
-  {name="jovie";value="05cc6qzn9hgdvqgi8a2k2i89ggx10fv970293z8d59r6wbh1skv6";}
-  {name="juk";value="00j9c3g1zsa9vbfwpg37jb4w8753sr28q9xbxp3kfablndwid3w9";}
-  {name="kaccessible";value="0rsdxzqamq2i3f59npsv6pir9bys3g6zd345sfnpbdkinvxyhrdn";}
-  {name="kactivities";value="0sfbc3w0cvjfp2zs6v28fv69pq5ikignily572jamm8nwaid5h2g";}
-  {name="kajongg";value="1yffsgbabnp4mckirl888bghpyrj71d8fbsb0rjk96av1kzl2yvx";}
-  {name="kalgebra";value="0slvk1c1n9g2b5nakfi53l7gh3c2y78pvcy2snj9f1z5c0sr05cn";}
-  {name="kalzium";value="12gp0k11zf3m5g2aabrbrd7kpi5k3z46w74kalzzk3s1babgnwxn";}
-  {name="kamera";value="13qka1nc0ibn3kb03l11v64r6w3k4g7ayq539ncp1syba5726xy1";}
-  {name="kanagram";value="11vd5abdsggzv4svj4wj6q7mcpbxnpjk4gv0m1zw82ya26aarjnk";}
-  {name="kapman";value="19r8a7k2ib2fijipajbj461b1sfvlfxrlpfmm52njg61xizdxy20";}
-  {name="kate";value="0wzvhywvkagshs1q8q1rmq3dxlc5h62y7mlfb2x9wzp945rshq6d";}
-  {name="katomic";value="0vqqjv1magpc7wgwj0cvbykl9qvphc3s03i30qndygi96mf36iwc";}
-  {name="kblackbox";value="197r2nfrpdynqix1c81y1y72jrbzzl3prjd6q9sca9qnd47xx9kb";}
-  {name="kblocks";value="0nnbaskl1s9gy6kn8qk3j9qr6vmsbnpmjj4ddn1fvr32kqjfzr3h";}
-  {name="kbounce";value="0i962rbbi41m8fd7x1vrbi6q46qnij3d8kdc3cwn7mmjp79gzwmq";}
-  {name="kbreakout";value="1mh7ki87y1jjk7g4n8flr0ym6qk9nh922xsca2ww1vv16mpxww9w";}
-  {name="kbruch";value="1632a7rjrmll42yazdab1hmgjv39mp16xhkj6mq61sqdd4pj316v";}
-  {name="kcalc";value="1gyp45f873q6v2y1l8k52x70b92893314h6ci5a07c0asm8ffrpa";}
-  {name="kcharselect";value="12w3mzh0gqgh6aaih69djv3f4b1z34cxwhnchqz75z2yb9lcdj1c";}
-  {name="kcolorchooser";value="19b0r8jjy3fkhhzp9hhxw7zyrkb7fafkxs22ik3lzlm6wri1dwpj";}
-  {name="kdeadmin";value="1fg49z2lgmsvkhhyvahasb5z0l9cad4xwq5ps3qv5f1yj0hfzic4";}
-  {name="kdeartwork";value="1z1xnljs5lzmahn3i5xs429bpyxzc6b8sw2m216cs06dwfk77if6";}
-  {name="kde-baseapps";value="1d08wqb3a9fi0gzkls4jmlnmqpfd5fmg4310d2ih78gflv1yk2gz";}
-  {name="kde-base-artwork";value="1hq35i8mw3akbg9m6wvp9fv6xpamv9na2bjqzqyph8sx0633dxrw";}
-  {name="kdegraphics-mobipocket";value="0jq1qrrax9w60w35qxvjrazl4c8qvninhgp9na7pgz6sk6ydb0jf";}
-  {name="kdegraphics-strigi-analyzer";value="07z3nzmfw5pxg97qx2jj54f3r6qc2x22yxhn3kmcpifzr3gyi555";}
-  {name="kdegraphics-thumbnailers";value="1iwmyn2r43i3bykrc4vx0785f3x5zrnvvfdhfpr88f6pxr95f7bq";}
-  {name="kdelibs";value="1lgjz90irrqwz8h6w7iwy8icvqyj4kb2sarnyrxna8dy1fah9m5n";}
-  {name="kdenetwork";value="1lra150av4ndq5s9msx1khwdwd8k0n756qg6d4fsjp2fy7scf26k";}
-  {name="kdepim";value="0qs1znrvfzrkhlh1d68pri9fnaq2nhxnih5fsjcn2m7d537havq1";}
-  {name="kdepimlibs";value="01hyi3r2an8g9ds59az39c8qdm8qiws6q16558jna7f6w4m0yq5r";}
-  {name="kdepim-runtime";value="1p293zqwdc0g77h996slc0qwa01a24nq5yh5a4q6ng92rfzzkrl3";}
-  {name="kdeplasma-addons";value="0hs9bmg4gcl9lks78pmb0n29jzzh56w5islyzhzccrrcbimsqvzp";}
-  {name="kde-runtime";value="0daw0sjyqrdhsah920fla05wvcf9zrck1lbkdcbvrk1qvvqwjhpx";}
-  {name="kdesdk";value="0h1il5dza8qcfz1fgz6qhsaccqkp0g5fdi4k3413vr6lhg67dh78";}
-  {name="kdetoys";value="1r2rh0hdipwfxwq29whicbvxa7dr5vswh9pqw60x1c634cgba49p";}
-  {name="kde-wallpapers";value="1d96asb1nn88rwzb2nis37d8qwliaswpzfc15zq6jkcbdyzaxfpv";}
-  {name="kdewebdev";value="18s79ah9j01mb3lpzpsi6wxbh3wjpkswx5snpv1fyphf760jzb3n";}
-  {name="kde-workspace";value="0xg8asnxq48x6zydh09bfga11363bya7hfkygas7ar7rb0144im3";}
-  {name="kdf";value="0d3i5jpikh285vwr93044lws34ihhbszb05gbyvibx7faqdllg2h";}
-  {name="kdiamond";value="1dca5h88lm2syhnk5bd8g83lx9422hyg972di4xj69vnnpl5nsp9";}
-  {name="kfloppy";value="02yq8p8ma1aghm9k442xznk1xwb4mcd36h040ix5rc7j3j02l79m";}
-  {name="kfourinline";value="0ljs9szk4r6iasn4qkclpq3nij5hb8xnyqj36w8nxbvsmka69d2p";}
-  {name="kgamma";value="0byvsk5j2g1ycfq5zskg9bkbmq9jddv0nzck2w4qayf072cqn8b3";}
-  {name="kgeography";value="0icf21sr6w920ga6as9yx1ja85gwk3h2bb1ra9k5bs32vw5r7nk9";}
-  {name="kgoldrunner";value="18i0mj3j6q1gycf33z416kcf9lsksrmk8fnp4j1jg9mlr6y1xc6c";}
-  {name="kgpg";value="1x04mj6ykmhmlr2074bn6kc88zz4y3lgbvnf4qkcj8q5wil1p3gv";}
-  {name="khangman";value="0yrqd17w78pl18ln8rqcb0cmqis8al9k3zvg0hvxyh3qp013xb9m";}
-  {name="kig";value="1wd8kk4gkvgxp83q6dqdqkqaznbrl8kk88ixk17qhlj03iykxfcj";}
-  {name="kigo";value="1g78wqsk72mki48inxam6337hpjd491325j3cmvvlz0196q3s4zn";}
-  {name="killbots";value="1kjmwsrqmj85yawbw6xr025bkv3kidwasiyrjr01mgsndlkn3y47";}
-  {name="kimono";value="0wswbykjq56rxf0rkkl97ipy36r5q8h9sws758fvwmd16nylhdg0";}
-  {name="kiriki";value="0iv3lak13szc93gqqjlqdmdbg3jy4xbxvnahzka0d3m2nkg9iv6h";}
-  {name="kiten";value="1112kl5vbz58v52nss4gd4plnrl3nkp57mnhdbs58dlxv1s1s7b9";}
-  {name="kjumpingcube";value="1y9pgqsq72v9mxw04dkg4x2m15jyl5iahqshxczzihh3pjllv7sr";}
-  {name="klettres";value="0kqjw7vrpzvrr4g6zhdsqppbr2viqr7jann4npnzh0bw48842zhp";}
-  {name="klickety";value="0d78nak6dzmkfsxq7cxndca51paw2giawk31s70fgr7kwa7s9g9f";}
-  {name="klines";value="0z8bp1xwy17k1nv7d8mrgsk7vgb5137icdy0d66jwaa9bzsv3khh";}
-  {name="kmag";value="1iamiy8ppyd4qkbdhqykxgh6c8w31glpjv1srk9s4gqyqj51mf24";}
-  {name="kmahjongg";value="02ai75zc5rfch3b7a2zz9kmw6r3kgkbzr9pi8c1zrdgif8awrl3x";}
-  {name="kmines";value="0hc838cd5h8gjm4alszi8z70r3jmjxqwmhni1silk16gsiy3kqvy";}
-  {name="kmix";value="08ls620ndrvszx36sy2xj32fvwm5b8aggp86cwvzqjvp47c46wjv";}
-  {name="kmousetool";value="02lg84gpnic2l84ay01adw2fynr0x7byklqdz3zphiqhddhfnb81";}
-  {name="kmouth";value="09jg2xar4p6rrcc41qfj0h57fapdgpdpjh6ackhyana0871q5cam";}
-  {name="kmplot";value="17s7n51x2nl5g4l0862gnzigkwa7qwipmvy7krn8b1z051n2jwfx";}
-  {name="knavalbattle";value="15qpgn5bjbk4smwzz5x0x9f1kd5mjhg6p4h4dalcay8k9zixxxvl";}
-  {name="knetwalk";value="0yqdxcah56z1q21xfrk33s4fx6l9q21na5dx1p12d114vzgr3gzq";}
-  {name="kolf";value="08ba3flnknzjgys73lhpy7b98j544wwv6vvbrd6p2675imwk168w";}
-  {name="kollision";value="1jahrgkb9j8shwrmm1486f3w1hd5snwfwv53gj7973z0mmm5468r";}
-  {name="kolourpaint";value="18ql77778zdc9149qd7mslkh780v6qkhdc1wfljrr1mj98p08av9";}
-  {name="konquest";value="1iyqgzyg004lyqssmvh4951m9v56ayw7ggza6awh6a805j0zz0sp";}
-  {name="konsole";value="1zqmmv4zpq59nm2r7ccmp1ij5q3qjclmbmcm667hxmq9dyrwv5an";}
-  {name="korundum";value="12cqg6ib06icadyslnqzqmkal6rmjhki02na09gacqdiwc7gf2p2";}
-  {name="kpat";value="1zdv4jvqg0xbbsf39d2n8d0ya2mqzva06s46m2hb66flyjz5pd3p";}
-  {name="kremotecontrol";value="0jw4jjlhy378f58wgqm5cikqj8i3bdz1s1qm4r24bb1677dqyd4x";}
-  {name="kreversi";value="1mxgb60zbq8qkjnamvlr072vii2px224mg03fjjds063321swx0z";}
-  {name="kross-interpreters";value="0r2y7lscsgk6jkzby7dqwd62yk2nyzwm6chihsvivl9frl38wqza";}
-  {name="kruler";value="0gwyy0k8h705bnp6q7jgzbk8i9d6csffhwlas7y0zwcl7n03664x";}
-  {name="ksaneplugin";value="187n3s19xdfl7bbcpgyappw1v2bgjki8kh1qh8dy8mscm2qn50j9";}
-  {name="kscd";value="0wqm2vhj593x4vps3205gfnl29yglr2szzpdiazi6rq80r8ifvbq";}
-  {name="kshisen";value="1n5131kckixwbllp8sxn5y93z9q2fdvjj77pcy4sadngx5slz718";}
-  {name="ksirk";value="0b2084h246jhphwpa5iwpxbib4z4h6cwvi8bp18l7yid77wz28f2";}
-  {name="ksnakeduel";value="0v74l5svmr21gahxzfz7sjnj5gzhnyir7l7cny1q7xnha7bnaw81";}
-  {name="ksnapshot";value="05l18i9mv9pghlf50qax9drlcrmdahgiljnvcq20vadrxw4qxghv";}
-  {name="kspaceduel";value="0q8iqg5n7w0v5llbgan7vnf41zbfagc0rd8ya7fp9gf5pmx422zf";}
-  {name="ksquares";value="0fnz1hy2n0i1gal9b8ij8bi5sql5iybbjpkyy55dapcbph2br8xc";}
-  {name="kstars";value="0nf3n9f6dmp8401d2jfcyh26xbwmwdav4maacp5dmhv6xvr2ivis";}
-  {name="ksudoku";value="07lxxaw6ykhlxzkbhzsz43ingfx0l1gb38v2z0ag8jd3iln7l79v";}
-  {name="ktimer";value="112449fn8zbgz3s22bswyc8fisa126j6xvmwxzb91c5vx0wj9qg8";}
-  {name="ktouch";value="0a9x6ym3gw3d6jqvlfaw5qyxzcn9vi4sa55ig0d9cdy8057y5pwz";}
-  {name="ktuberling";value="1ihvv3mais39yk84k1a76mpz5c9sbbnw80n536adh3y3fad4yw5a";}
-  {name="kturtle";value="07fxjiaq69x97w45z8r3g1iyi0vyk0wyqwjwn1qb7a1ziwva5jl9";}
-  {name="kubrick";value="0mqf52lp0s61qsv8q47h012m5k8mf6gqwjpb7swrs7hxsc58dspy";}
-  {name="kwallet";value="0mb8ph0wf761gpss7xmi4zngxfalm3sdngjxrpr8brczjp8v9wdm";}
-  {name="kwordquiz";value="0rbrfswf13pw4cam8fj9w7g12yhzvg82izzy79xsxb0dkk4ki42n";}
-  {name="libkcddb";value="033vmv8fin87m788qjyjaravf5gr9cj953yvcfg9438qpavd79qr";}
-  {name="libkcompactdisc";value="105w0bnw6gzjb8gnp2gmwcjgaz3gi4f16fninbl2658dnb24b1kq";}
-  {name="libkdcraw";value="0p1wbdrhpp6rg82kfrxhaz4lxqjix6mb1grj16zy1i24x89mxlya";}
-  {name="libkdeedu";value="1b6qpd3i59hfd7rwij255xyrxp5ylw5mpyr6k10py5pj7fn4zhc2";}
-  {name="libkdegames";value="1cc5011xm9rz9fz2dk3ibfr4cqq3rmw3i7vlcsrhfscsx0xm88sc";}
-  {name="libkexiv2";value="18ngfrz30q0prsrwy92hb7y0hxhcxlr4ic7lq7fv4l45434ry7pv";}
-  {name="libkipi";value="00nn96qwynfx2ajqllh8zkwccc1prigbcq75s1hnpm67nnfc98as";}
-  {name="libkmahjongg";value="06qpykgaxx5r7n3ymph1g2fy0dj2vclfqlnzbdc41ma3l66jci64";}
-  {name="libksane";value="0a0ipz9jmrw076mxsj2k3njaf7dwfrdqd5bqwcc4q8qqlhpp4ljy";}
-  {name="lskat";value="1sxmjhw61w1d19zidf96qkddx9r0h8z5kbjl8xgah8k25ji5qsr6";}
-  {name="marble";value="04cy00jsnahmigffjyqviizj5bvj2aldfgkyj2g5iadfsqflxvy4";}
-  {name="mplayerthumbs";value="0hmdvyillr779c1fmia3h6dcy7j7j0kvxvh4mdz1adfwaz4zgymy";}
-  {name="nepomuk-core";value="12grw88gc4b4i1h346ahpkv8493gyvhvkpcqxwc2dqpsqsfc7rpz";}
-  {name="nepomuk-widgets";value="1npmwv1vh5ci6c9a291vyps85c5cvdg5dn9r9h28dq58s2h274yh";}
-  {name="okular";value="05v23g4w6sw525w7qllcbyhk92k75hyqrvx9hncylig4blivjp9f";}
-  {name="oxygen-icons";value="1y7iq77fyiykmjf8xdyprnshlasazdv6fcjp6ayfx0jkixb2gqya";}
-  {name="pairs";value="1v4h0d04b7g59axkl69gyml02hzxjkfzcgg320mj05xx5q0kjyq5";}
-  {name="palapeli";value="13hvppav7yz9wvvly8f8kads9arqvl25spwa8awpl2f4a394c0sa";}
-  {name="parley";value="0wk6p4rw6063089iq758a0mcq10fh8c1pg0wq00dhs9d05gwk873";}
-  {name="perlkde";value="1hh5y4zmmb97py281i0jhzwg8r4ii3qmilzbwbrvk9j4ngcz37gg";}
-  {name="perlqt";value="09880varap78a44zifqx72wbx23wq0hqq540hf466fmmxk744877";}
-  {name="picmi";value="060a1n5lclsaz4zjq1dpm9y20fqgq3rjlkm54prp3kkj5hpi6kcl";}
-  {name="print-manager";value="0jmvfy376axdwi4a2fc78ldlny4jbk7kxvhi1mwf8piibwc10dvf";}
-  {name="pykde4";value="10aqvx6dfcbi9mrsr0sdhhxp2jqkw06rf55p2nxdadmcszad2k7k";}
-  {name="qtruby";value="042nya6n5sp2r9a9s3limbph8wv5z04fha7pkqznvrkr040qykvj";}
-  {name="qyoto";value="0nxhxvh4zpskvxv7mjz06vililg2wqlabaaaf61j0naxz4aynyrv";}
-  {name="rocs";value="10xb6qh29g4l369dyimwj0yk8s5yi6jg1byaf4z5jnr2w8ysbf7j";}
-  {name="smokegen";value="0myzqfqcl7i8kikcyj2vbip9y4al411jmjm02hv55baccygls8yr";}
-  {name="smokekde";value="0b1m9g1swj9r44zbg8lbqmxp9l342dz8b4wsnn6n9ih0b15p512h";}
-  {name="smokeqt";value="047am45yjkyyza281zfzvv84kvldvmbgch5q3fd89vcvl5sh399j";}
-  {name="step";value="05rjnb16mzz91q7473k2g83g792xqh77p4gc2xmw0a5j4qk6f6ga";}
-  {name="superkaramba";value="0vxb8656ag6hmy3nx9w3xa38j12rajkqsmv4kx6ylnpk6v71s7x2";}
-  {name="svgpart";value="17j59rwg483p7ip1zxq37jnzvkafrkj7yabwrbwk0vvxkqcbqpx3";}
-  {name="sweeper";value="0yhp6k2ai7wgn242932w10xwainq07bf9zjm2fvaavrg3gh38644";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="ksystemlog"; }
-    { name="kcron"; }
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers";}
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing";}
-    { name="kppp"; }
-    { name="kdnssd"; }
-    { name="krdc"; }
-    { name="krfb"; }
-    { name="kget"; }
-    { name="kopete"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-#had to add fake pkgs to kdesdk to get it to be treated like a split module
-{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix
deleted file mode 100644
index 9424a762c8f..00000000000
--- a/pkgs/desktops/kde-4.10/kde-package/default.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, branch, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit branch;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc name;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh
deleted file mode 100755
index e964ce3ddc1..00000000000
--- a/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A modules
-declare -a packages
-declare -a top_level
-
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
-fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
-  package=${i%-${release}.tar.xz}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir $1-$release
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d27..00000000000
--- a/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix
deleted file mode 100644
index a2fef65d75c..00000000000
--- a/pkgs/desktops/kde-4.10/kde-runtime.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
-, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, config
-}:
-
-kde {
-  buildInputs = [
-    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra pulseaudio
-    networkmanager kactivities kdepimlibs openexr
-#todo: add openslp
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kde-wallpapers.nix b/pkgs/desktops/kde-4.10/kde-wallpapers.nix
deleted file mode 100644
index 6e559ad8a6c..00000000000
--- a/pkgs/desktops/kde-4.10/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "01k4rr7xkay5j0g8qwmfmvf4d0rjc9sdk121wravsagbidz3s9ci";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kde-workspace.nix b/pkgs/desktops/kde-4.10/kde-workspace.nix
deleted file mode 100644
index 57b2fea79b2..00000000000
--- a/pkgs/desktops/kde-4.10/kde-workspace.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
-  lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
-  xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
-  libjpeg, pkgconfig, libXft, libXxf86misc, kactivities, qjson, networkmanager,
-  fetchurl
-}:
-
-kde {
-
-#todo: googlegadgets, consolekit, xmms
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt libjpeg xorg.libxcb xorg.xcbutilimage
-      xorg.xcbutilrenderutil libXft #libXxf86misc
-      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst #xorg.libXScrnSaver
-      xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
-      boost gpsd lm_sensors pciutils libraw1394
-      libusb python libqalculate kdepimlibs pam prison akonadi qjson networkmanager
-      kactivities
-    ];
-
-  patches = [(fetchurl {
-    url = "https://git.reviewboard.kde.org/r/111261/diff/raw/";
-    sha256 = "0g8qjna1s0imz7801k4iy2ap5z81izi4bncvks7z3n9agji4zf40";
-    name = "CVE-2013-4132.patch";
-  })];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36..00000000000
--- a/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f..00000000000
--- a/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix
deleted file mode 100644
index 606c61cddb6..00000000000
--- a/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9..00000000000
--- a/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967c..00000000000
--- a/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
deleted file mode 100644
index 571674a461a..00000000000
--- a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976f..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd14..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af73..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a719..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 7028b9db228..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216d..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix
deleted file mode 100644
index e98705da889..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-sounds";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "New login/logout sounds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/styles.nix b/pkgs/desktops/kde-4.10/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c3710..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
deleted file mode 100644
index 7c9846fbf9e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kdeartwork-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
deleted file mode 100644
index 689223e3148..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-#todo: qscintilla2, qwt5
-  buildInputs = [ smokeqt perl ];
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch
deleted file mode 100644
index e7a7cb4c661..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
-index 41fa0fe..642d867 100644
---- a/kpythonpluginfactory/CMakeLists.txt
-+++ b/kpythonpluginfactory/CMakeLists.txt
-@@ -3,7 +3,12 @@
- set(kpythonpluginfactory_SRCS
-     kpythonpluginfactory.cpp)
- 
--GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
-+if(HARDCODE_LIB_PYTHON_PATH)
-+	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
-+else(HARDCODE_LIB_PYTHON_PATH)
-+    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
-+endif(HARDCODE_LIB_PYTHON_PATH)
- ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
- ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
- 
diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
deleted file mode 100644
index 7f6973c054b..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  polkit_qt_1, boost, lndir, pkgconfig }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-
-  # todo: polkit isn't found by the build system
-
-  buildInputs = [
-    python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt_1 pkgconfig
-  ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-#  patches = [ ./pykde4-hardcode-lib-python.patch ];
-#  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON ";
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-    kde.name = "pykde4";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..30aec0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
deleted file mode 100644
index 18a3703426c..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, smokeqt, ruby }:
-
-kde {
-#todo: scintilla2, qwt5
-  buildInputs = [ smokeqt ruby ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
deleted file mode 100644
index 33ec3df6452..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/CMakeLists.txt      2013-07-31 19:15:17.000000000 +0000
-@@ -36,6 +36,10 @@
- set (CMAKE_SKIP_BUILD_RPATH FALSE)
- set (CMAKE_SKIP_RPATH FALSE)
-
-+# add the automatically determined parts of the RPATH
-+# which point to directories outside the build tree to the install RPATH
-+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
-
- add_executable(smokegen ${generator_SRC})
-
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
deleted file mode 100644
index 53257e836e0..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-SmokeConfig.cmake.in-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
-@@ -80,8 +80,7 @@
- set(SMOKE_API_BIN "@SMOKE_API_BIN@")
- 
- find_library(SMOKE_BASE_LIBRARY smokebase 
--              PATHS "@SMOKE_LIBRARY_PREFIX@"
--              NO_DEFAULT_PATH)
-+              PATHS "@SMOKE_LIBRARY_PREFIX@")
- 
- if (NOT SMOKE_BASE_LIBRARY)
-     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
deleted file mode 100644
index 0a3f2a85efa..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./smokegen-SmokeConfig.cmake.in-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
deleted file mode 100644
index d129686b2de..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
-, shared_desktop_ontologies, attica }:
-
-kde {
-  # attica, akonadi and kdepimlibs are disabled due to smokegen crash
-  # okular is disabled because the code generated is broken
-  buildInputs = [
-    smokeqt kdelibs shared_desktop_ontologies
-  ];
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines";
-  meta = {
-    description = "SMOKE bindings for kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix
deleted file mode 100644
index e95b686aee2..00000000000
--- a/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-#todo: Qwt5, QScintilla2
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/analitza.nix b/pkgs/desktops/kde-4.10/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb20..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/blinken.nix b/pkgs/desktops/kde-4.10/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
deleted file mode 100644
index 4563012ac67..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, libspectre, analitza, R, pkgconfig, gfortran, libqalculate }:
-kde {
-
-  buildInputs = [ kdelibs libspectre analitza R gfortran libqalculate];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
-  buildInputs = [ kdelibs libkdeedu analitza ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix
deleted file mode 100644
index 78fa8119583..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
-kde {
-#todo:chemical mime data
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a3..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/khangman.nix b/pkgs/desktops/kde-4.10/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kig.nix b/pkgs/desktops/kde-4.10/kdeedu/kig.nix
deleted file mode 100644
index bd5ef67529c..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kig.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = ''
-    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
-    '';
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kiten.nix b/pkgs/desktops/kde-4.10/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/klettres.nix b/pkgs/desktops/kde-4.10/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix
deleted file mode 100644
index 18458cf6f0b..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-    kde = {
-      name = "kmplot";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix
deleted file mode 100644
index ce0a13b969d..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, eigen, xplanet, indilib }:
-
-kde {
-#todo:wcslib
-  buildInputs = [ kdelibs eigen xplanet indilib ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix
deleted file mode 100644
index 9e606adde33..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxkbfile }:
-
-kde {
-  buildInputs = [ kdelibs libxkbfile ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/marble.nix b/pkgs/desktops/kde-4.10/kdeedu/marble.nix
deleted file mode 100644
index 4f73472f631..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/marble.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-#todo: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/pairs.nix b/pkgs/desktops/kde-4.10/kdeedu/pairs.nix
deleted file mode 100644
index 36c4aba9604..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/pairs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A memory and pairs game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/parley.nix b/pkgs/desktops/kde-4.10/kdeedu/parley.nix
deleted file mode 100644
index f9f86dde150..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/rocs.nix b/pkgs/desktops/kde-4.10/kdeedu/rocs.nix
deleted file mode 100644
index 91976b84001..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeedu/step.nix b/pkgs/desktops/kde-4.10/kdeedu/step.nix
deleted file mode 100644
index fac9974baf1..00000000000
--- a/pkgs/desktops/kde-4.10/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen }:
-
-kde {
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/bomber.nix b/pkgs/desktops/kde-4.10/kdegames/bomber.nix
deleted file mode 100644
index 026227910f2..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/bomber.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/bovo.nix b/pkgs/desktops/kde-4.10/kdegames/bovo.nix
deleted file mode 100644
index b0e7d99c589..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/bovo.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
-  };
-
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/granatier.nix b/pkgs/desktops/kde-4.10/kdegames/granatier.nix
deleted file mode 100644
index 9f1ab005309..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/granatier.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix
deleted file mode 100644
index 9a6f5e83695..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
-kde rec {
-
-  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "an ancient Chinese board game for 4 players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kapman.nix b/pkgs/desktops/kde-4.10/kdegames/kapman.nix
deleted file mode 100644
index f10e099da3c..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kapman.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the well known game Pac-Man";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/katomic.nix b/pkgs/desktops/kde-4.10/kdegames/katomic.nix
deleted file mode 100644
index a9936c04f0e..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/katomic.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and educational puzzle game built around molecular geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix
deleted file mode 100644
index 27eeff2f65b..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kblocks.nix b/pkgs/desktops/kde-4.10/kdegames/kblocks.nix
deleted file mode 100644
index 98cf068de09..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kblocks.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic single player falling blocks puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kbounce.nix b/pkgs/desktops/kde-4.10/kdegames/kbounce.nix
deleted file mode 100644
index 77fa0db6352..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kbounce.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game with the elements of puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix
deleted file mode 100644
index 3a484d919bb..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix
deleted file mode 100644
index 06dfcee5ac3..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix
deleted file mode 100644
index 11b8838e708..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a board game for two players based on the Connect-Four game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix
deleted file mode 100644
index 6217c47a806..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kigo.nix b/pkgs/desktops/kde-4.10/kdegames/kigo.nix
deleted file mode 100644
index 32eee67cc1e..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kigo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an open-source implementation of the popular Go game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/killbots.nix b/pkgs/desktops/kde-4.10/kdegames/killbots.nix
deleted file mode 100644
index d9c1472495e..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/killbots.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple game of evading killer robots";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kiriki.nix b/pkgs/desktops/kde-4.10/kdegames/kiriki.nix
deleted file mode 100644
index 72f7ab67501..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kiriki.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an addictive and fun dice game, designed to be played by as many as six players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix
deleted file mode 100644
index a6d22cff51c..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple dice driven tactical game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/klickety.nix b/pkgs/desktops/kde-4.10/kdegames/klickety.nix
deleted file mode 100644
index b592bc40641..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/klickety.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/klines.nix b/pkgs/desktops/kde-4.10/kdegames/klines.nix
deleted file mode 100644
index 90952fe91c0..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/klines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix
deleted file mode 100644
index 946b531ff12..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kmines.nix b/pkgs/desktops/kde-4.10/kdegames/kmines.nix
deleted file mode 100644
index 538454e9598..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kmines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic Minesweeper game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix
deleted file mode 100644
index 42ffd2fcb4d..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Battle Ship game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix
deleted file mode 100644
index a16e578ce84..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kolf.nix b/pkgs/desktops/kde-4.10/kdegames/kolf.nix
deleted file mode 100644
index 78815ee5799..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kolf.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a miniature golf game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kollision.nix b/pkgs/desktops/kde-4.10/kdegames/kollision.nix
deleted file mode 100644
index 3147c7305ea..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kollision.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple ball dodging game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/konquest.nix b/pkgs/desktops/kde-4.10/kdegames/konquest.nix
deleted file mode 100644
index 53ddd64928c..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/konquest.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "the KDE version of Gnu-Lactic Konquest";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kpat.nix b/pkgs/desktops/kde-4.10/kdegames/kpat.nix
deleted file mode 100644
index f8d9bad36dc..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kpat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a relaxing card sorting game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kreversi.nix b/pkgs/desktops/kde-4.10/kdegames/kreversi.nix
deleted file mode 100644
index 2aed981428e..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kreversi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kshisen.nix b/pkgs/desktops/kde-4.10/kdegames/kshisen.nix
deleted file mode 100644
index 9c888034038..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kshisen.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "a solitaire-like game played using the standard set of Mahjong tiles";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/ksirk.nix b/pkgs/desktops/kde-4.10/kdegames/ksirk.nix
deleted file mode 100644
index 767eb67971a..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/ksirk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, qca2 }:
-kde {
-  buildInputs = [ kdelibs libkdegames qca2 ];
-  meta = {
-    description = "a computerized version of the well known strategic board game Risk";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix
deleted file mode 100644
index ccf1fb551e9..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple Tron-Clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix
deleted file mode 100644
index 5285f7916ca..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/ksquares.nix b/pkgs/desktops/kde-4.10/kdegames/ksquares.nix
deleted file mode 100644
index a17be2da632..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/ksquares.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix
deleted file mode 100644
index ea4e13a5e4f..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a logic-based symbol placement puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix
deleted file mode 100644
index 1a6ba9d653c..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple constructor game suitable for children and adults alike";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/kubrick.nix b/pkgs/desktops/kde-4.10/kdegames/kubrick.nix
deleted file mode 100644
index 9bdc6879db4..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/kubrick.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game based on the Rubik's Cube™ puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix
deleted file mode 100644
index 3819dcdc9ae..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, openal, libsndfile }:
-kde {
-  buildInputs = [ kdelibs openal libsndfile ];
-  meta = {
-    description = "KDE games library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix
deleted file mode 100644
index 383b347dc33..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a library for KMahjongg game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/lskat.nix b/pkgs/desktops/kde-4.10/kdegames/lskat.nix
deleted file mode 100644
index 2a5050cd667..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/lskat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/palapeli.nix b/pkgs/desktops/kde-4.10/kdegames/palapeli.nix
deleted file mode 100644
index 555ffe43c45..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/palapeli.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-#todo:package qvoronoi
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single-player jigsaw puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegames/picmi.nix b/pkgs/desktops/kde-4.10/kdegames/picmi.nix
deleted file mode 100644
index 165d7422f95..00000000000
--- a/pkgs/desktops/kde-4.10/kdegames/picmi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player logic-based puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix
deleted file mode 100644
index 00910ab9d46..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
-, libjpeg, libtiff, pkgconfig, kactivities, lcms2 }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 shared_desktop_ontologies kactivities kde_baseapps libkipi libjpeg lcms2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c23..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186b..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 35af39aa611..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libtiff }:
-
-kde {
-  buildInputs = [ kdelibs libtiff ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 55bf8309b2a..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw }:
-
-kde {
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f46..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd26..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20d..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix
deleted file mode 100644
index e8790205cae..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libjpeg, lcms1, jasper }:
-
-kde {
-  buildInputs = [ kdelibs libjpeg lcms1 jasper ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab3899..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/okular.nix b/pkgs/desktops/kde-4.10/kdegraphics/okular.nix
deleted file mode 100644
index efc1e8f0742..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/okular.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, libtiff, kactivities, pkgconfig }:
-
-kde {
-
-  #todo: package activeapp
-
-  buildInputs =
-    [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz libtiff kactivities ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b4..00000000000
--- a/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix
deleted file mode 100644
index 4386317309f..00000000000
--- a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ kde, gcc, cmake, perl
-, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
-, openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver
-, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, libjpeg, xz, ilmbase
-, pkgconfig
-}:
-
-kde {
-  buildInputs =
-    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper
-      libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2
-      shared_desktop_ontologies xz udev libjpeg kerberos openexr
-    ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  propagatedBuildInputs = [ qt4 soprano strigi phonon ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Split plugins from libs?
-
-  patches = [ ../files/polkit-install.patch ];
-
-  # cmake fails to find acl.h because of C++-style comment
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DHUPNP_ENABLED=ON"
-  ];
-
-  passthru.wantsUdisks2 = false;
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix
deleted file mode 100644
index cd6f3a179c2..00000000000
--- a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 }:
-
-kde {
-
-  buildInputs = [ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg popplerQt4 ];
-
-  meta = {
-    description = "NEPOMUK core";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix
deleted file mode 100644
index 0d29a4f97de..00000000000
--- a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-
-  buildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "NEPOMUK Widgets";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix
deleted file mode 100644
index 4c56e7529dd..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
-kde {
-  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
-  meta = {
-    description = "transparent audio CD access for applications using the KDE Platform";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix
deleted file mode 100644
index 006300742ec..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a multimedia player with the focus on simplicity";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix
deleted file mode 100644
index 45f6c9abcb6..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, ffmpeg }:
-kde {
-  buildInputs = [ kdelibs ffmpeg ];
-  meta = {
-    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix
deleted file mode 100644
index 7a1aab85ed7..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, taglib }:
-kde {
-  buildInputs = [ kdelibs taglib ];
-  meta = {
-    description = "an audio jukebox application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix
deleted file mode 100644
index 1dd8108166f..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libcanberra, pulseaudio }:
-kde {
-  buildInputs = [ kdelibs libcanberra pulseaudio ];
-  meta = {
-    description = "sound mixer, an application to allow you to change the volume of your sound card";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix
deleted file mode 100644
index e99ae53935b..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libmusicbrainz }:
-kde {
-  buildInputs = [ kdelibs libmusicbrainz ];
-  meta = {
-    description = "KDE CD player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix
deleted file mode 100644
index 720b01d1861..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-#todo: libmusicbrainz5
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a library used to retrieve audio CD meta data from the internet";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix
deleted file mode 100644
index 6ed08af89f3..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "KDE library for playing & ripping CDs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix
deleted file mode 100644
index c88ebcc2a5a..00000000000
--- a/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a video thumbnail generator for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake
deleted file mode 100644
index c40b0bed310..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# cmake macro to test msiLBC
-
-# Copyright (c) 2009-2010 Pali Rohár <pali.rohar@gmail.com>
-#
-# MSILBC_FOUND
-# MSILBC_LIBRARY
-
-include ( FindPackageHandleStandardArgs )
-
-if ( MSILBC_LIBRARY )
-	set ( MSILBC_FOUND true )
-	set ( msiLBC_FIND_QUIETLY true )
-else ( MSILBC_LIBRARY )
-	find_library ( MSILBC_LIBRARY NAMES msilbc
-		PATH_SUFFIXES mediastreamer/plugins)
-endif ( MSILBC_LIBRARY )
-
-find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY )
-mark_as_advanced ( MSILBC_LIBRARY )
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
deleted file mode 100644
index ac28edb8dd9..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  name = "strigi-analyzer-torrent";
-
-  buildInputs = [ kdelibs boost ];
-
-  #preConfigure = "mv -v kdenetwork-strigi-analyzers kfile-plugins";
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
deleted file mode 100644
index d5f38096a42..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
-, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
-
-kde {
-  buildInputs =
-    [ kdelibs libktorrent
-      kde_workspace
-      shared_desktop_ontologies
-      # kde_baseapps
-      gpgme boost libmms qca2 sqlite
-    ];
-
-  KDEDIRS = libktorrent;
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
deleted file mode 100644
index ec003732344..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-linphonemediaengine.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
-       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
-       pt_ = i->id;
-       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
--      port2 = rtp_session_get_local_port(audio_stream_->session);
-+      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-       first = false;
-     }
-   }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
-     // working with a buggy client; let's try PCMU.
-     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
-     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
--    port2 = rtp_session_get_local_port(audio_stream_->session);
-+    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-   }
- 
-   return true;
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
deleted file mode 100644
index d6aa9515b76..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete-4.10.4-kopete-stun.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
---- a/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
-+++ b/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h
-@@ -25,16 +25,8 @@
-  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#ifndef __STUN_H__
--#define __STUN_H__
--
--// This file contains classes for dealing with the STUN and TURN protocols.
--// Both protocols use the same wire format.
--
--#include "talk/base/basictypes.h"
--#include "talk/base/bytebuffer.h"
--#include <string>
--#include <vector>
-+#ifndef STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
-+#define STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
- 
- namespace cricket {
- 
-@@ -55,6 +47,23 @@
-   STUN_DATA_INDICATION              = 0x0115
- };
- 
-+}
-+
-+#endif // STUN__HH__IN__STUNREQUEST_CYCLIC_PROBLEM_FIX
-+
-+#ifndef __STUN_H__
-+#define __STUN_H__
-+
-+// This file contains classes for dealing with the STUN and TURN protocols.
-+// Both protocols use the same wire format.
-+
-+#include "talk/base/basictypes.h"
-+#include "talk/base/bytebuffer.h"
-+#include <string>
-+#include <vector>
-+
-+namespace cricket {
-+
- // These are the types of attributes defined in STUN & TURN.  Next to each is
- // the name of the class (T is StunTAttribute) that implements that type.
- enum StunAttributeType {
-
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch b/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
deleted file mode 100644
index 1755bdbce76..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete-giflib5.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: b/kopete/protocols/wlm/wlmchatsession.cpp
-===================================================================
---- a/kopete/protocols/wlm/wlmchatsession.cpp
-+++ b/kopete/protocols/wlm/wlmchatsession.cpp
-@@ -63,10 +63,14 @@
- #include "wlmprotocol.h"
- #include "wlmaccount.h"
- #include "wlmchatsessioninkaction.h"
- #ifdef HAVE_GIFLIB
- #include <gif_lib.h>
-+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
-+#ifndef GIFLIB_MAJOR
-+#define GIFLIB_MAJOR 4
-+#endif
- #endif
- 
- WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
-                                 const Kopete::Contact * user,
-                                 Kopete::ContactPtrList others,
-@@ -465,15 +469,19 @@ WlmChatSession::slotInviteContact (Kopet
- static void
- printGifErrorMessage()
- {
- #ifdef HAVE_GIFLIB
- #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
-+#if GIFLIB_MAJOR >= 5
-+        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
-+#else
-         const char * errorString = GifErrorString();
-         if (errorString)
-             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
-         else
-             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
-+#endif
- #else // older giflib versions, libungif
-         PrintGifError();
- #endif // HAVE_GIF_ERROR_STRING
- #endif // HAVE_GIFLIB
- }
-@@ -481,10 +489,14 @@ printGifErrorMessage()
- /* stolen from kpaint write_to_gif() */
- void
- WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
- {
- #ifdef HAVE_GIFLIB
-+#if GIFLIB_MAJOR >= 5
-+#define FreeMapObject  GifFreeMapObject
-+#define MakeMapObject  GifMakeMapObject
-+#endif
-     int i, status;
-     GifFileType *GifFile;
-     ColorMapObject *screenColourmap;
-     ColorMapObject *imageColourmap;
-     QImage img = ink.toImage().convertToFormat(QImage::Format_Indexed8);
-@@ -523,11 +535,15 @@ WlmChatSession::convertToGif( const QPix
-             screenColourmap->Colors[i].Green= 0;
-             screenColourmap->Colors[i].Blue= 0;
-         }
-     }
- 
-+#if GIFLIB_MAJOR >= 5
-+    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
-+#else
-     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
-+#endif
-     if (!GifFile) {
-         FreeMapObject(imageColourmap);
-         FreeMapObject(screenColourmap);
-         return;
-     }
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
deleted file mode 100644
index b065ae61009..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib,
-  libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies,
-  libjpeg, libmms }:
-
-kde {
-#todo: libmeanwhile, xmms
-  buildInputs = [
-    kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer
-    kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr
-    libxslt libidn speex boost libmms msilbc
-];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  patchPhase =
-    ''
-      cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake
-      patch -p1 < ${./kopete-4.10.4-kopete-linphonemediaengine.patch}
-      patch -p1 < ${./kopete-4.10.4-kopete-stun.patch}
-      patch -p1 < ${./kopete-giflib5.patch}
-    '';
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
deleted file mode 100644
index bada0c1cb10..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
deleted file mode 100644
index 1b7405f1006..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, libvncserver, libjpeg }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libjpeg ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
deleted file mode 100644
index b6c36ea9c15..00000000000
--- a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg ];
-}
diff --git a/pkgs/desktops/kde-4.10/kdepim-runtime.nix b/pkgs/desktops/kde-4.10/kdepim-runtime.nix
deleted file mode 100644
index 8fdd9fc8fa1..00000000000
--- a/pkgs/desktops/kde-4.10/kdepim-runtime.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi
-, shared_desktop_ontologies }:
-
-kde {
-  buildInputs = [
-    kdepimlibs akonadi boost shared_desktop_ontologies
-    libxslt
-  ];
-#todo: libkgapi, libkolab, libkolabxml
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix
deleted file mode 100644
index dca60d3d4b6..00000000000
--- a/pkgs/desktops/kde-4.10/kdepim.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, dblatex }:
-
-kde {
-
-  buildInputs =
-    [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
-      libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex
-    ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix
deleted file mode 100644
index 7ec1612b1e5..00000000000
--- a/pkgs/desktops/kde-4.10/kdepimlibs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, akonadi, libxslt, prison, nepomuk_core
-, shared_desktop_ontologies, qjson }:
-
-kde {
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs =
-    [ boost gpgme libical libxslt qjson
-      openldap cyrus_sasl akonadi shared_desktop_ontologies
-    ];
-
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix
deleted file mode 100644
index 2bd6f5037db..00000000000
--- a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth }:
-# TODO: qwt, scim, ibus
-
-kde {
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-    eigen qca2 libXtst qimageblitz
-    libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
-];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd42..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
deleted file mode 100644
index 500dffc809e..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  patchPhase = ''
-    sed -i 's@macro_optional_add_subdirectory(bazaar)@add_subdirectory(bazaar)@' dolphin-plugins/CMakeLists.txt
-  '';
-
-  meta = {
-    description = "Bazaar plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
deleted file mode 100644
index 2da3603c3be..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  patchPhase = ''
-    sed -i 's@macro_optional_add_subdirectory(git)@add_subdirectory(git)@' dolphin-plugins/CMakeLists.txt
-  '';
-
-  meta = {
-    description = "Git plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
deleted file mode 100644
index 20925842a32..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  patchPhase = ''
-    sed -i 's@macro_optional_add_subdirectory(hg)@add_subdirectory(hg)@' dolphin-plugins/CMakeLists.txt
-  '';
-
-  meta = {
-    description = "Mercurial plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
deleted file mode 100644
index fafdcc55a1f..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  patchPhase = ''
-    sed -i 's@macro_optional_add_subdirectory(svn)@add_subdirectory(svn)@' dolphin-plugins/CMakeLists.txt
-  '';
-
-  meta = {
-    description = "Svn plugin for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix
deleted file mode 100644
index df81145e5d6..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix
deleted file mode 100644
index 85b6ea6ac00..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "various KDE development utilities";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix
deleted file mode 100644
index 4d579b88ba8..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
deleted file mode 100644
index f96b0df2b95..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gettext }:
-
-kde {
-
-  buildInputs = [ kdelibs gettext ];
-
-  patches = [ ./thumbnailers-add-subdirectory.patch ];
-
-  meta = {
-    description = "PO file format thumbnailer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
deleted file mode 100644
index 4c45be6b4fe..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, perl }:
-
-kde {
-
-  buildInputs = [ kdelibs perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "perldoc: kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
deleted file mode 100644
index 0574241353d..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil }:
-
-kde {
-
-  buildInputs = [ kdelibs subversionClient apr aprutil ];
-
-  meta = {
-    description = "Subversion kioslave";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/kompare.nix b/pkgs/desktops/kde-4.10/kdesdk/kompare.nix
deleted file mode 100644
index 1ddb4b8ea5b..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1f..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/okteta.nix b/pkgs/desktops/kde-4.10/kdesdk/okteta.nix
deleted file mode 100644
index 058636596ad..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/okteta.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/poxml.nix b/pkgs/desktops/kde-4.10/kdesdk/poxml.nix
deleted file mode 100644
index 1ab9ed49df5..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr }:
-
-kde {
-  buildInputs = [ kdelibs antlr ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch b/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
deleted file mode 100644
index 5b4f7643bf4..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/thumbnailers-add-subdirectory.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt
---- kdesdk-4.10.2-upstream/kdesdk-thumbnailers/CMakeLists.txt	2013-05-02 21:05:56.446226846 -0430
-+++ kdesdk-4.10.2/kdesdk-thumbnailers/CMakeLists.txt	2013-05-02 21:09:58.504053136 -0430
-@@ -9,7 +9,7 @@
- macro_log_feature(GETTEXTPO_FOUND "gettext-po" "A library for processing PO files" "www.gnu.org/software/gettext" FALSE "" "Required to build the PO thumbnailer")
- 
- if(GETTEXTPO_FOUND)
--macro_optional_add_subdirectory(po_thumbnailer)
-+add_subdirectory(po_thumbnailer)
- endif(GETTEXTPO_FOUND)
- 
- macro_display_feature_log()
diff --git a/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901..00000000000
--- a/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdetoys/amor.nix b/pkgs/desktops/kde-4.10/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a..00000000000
--- a/pkgs/desktops/kde-4.10/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b..00000000000
--- a/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdetoys/ktux.nix b/pkgs/desktops/kde-4.10/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c72..00000000000
--- a/pkgs/desktops/kde-4.10/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/ark.nix b/pkgs/desktops/kde-4.10/kdeutils/ark.nix
deleted file mode 100644
index eb3e12281d6..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/ark.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }:
-
-kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/filelight.nix b/pkgs/desktops/kde-4.10/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27c..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix
deleted file mode 100644
index 4b02c12d88a..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
deleted file mode 100644
index f3b00a5b968..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix
deleted file mode 100644
index 70311a789f9..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix
deleted file mode 100644
index 9ec0e6c0396..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
deleted file mode 100644
index 99feaf3e4f9..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, cups, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer
-, pythonDBus, makeWrapper }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # ‘system-config-printer’ supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer manager";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix
deleted file mode 100644
index cbe7a285606..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz, python }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz python ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30..00000000000
--- a/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix
deleted file mode 100644
index 55e37809e07..00000000000
--- a/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index 6d22f72461f..00000000000
--- a/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 21971beb80a..00000000000
--- a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
-
-kde {
-#todo: ruby is not found. needed for some example scripts
-  buildInputs =
-    [ kdelibs kdepimlibs htmlTidy boost ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix
deleted file mode 100644
index d5f4337f714..00000000000
--- a/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix
deleted file mode 100644
index fa6406043b1..00000000000
--- a/pkgs/desktops/kde-4.10/l10n/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        inherit branch;
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh
deleted file mode 100755
index ec159a1e204..00000000000
--- a/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix
deleted file mode 100644
index 67abb386a48..00000000000
--- a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.4.nix
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1pkca1z620pwd8nk53wpbg6490nzd21i71691dmp233mgb8pzwfz";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1zsml7q434m5242my2y14b5b708ccrmyrvkbl231mjxdqmy137g8";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0qbhix7xxabcgwyjrqhvhqfm2gs72swj2wdbh99csb8y3ms4bhwm";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1hfj9ram95fsv4qbjv6mwc01sl15vw8cj0q7vy3jjvamcjlczn4q";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "19vjxcpvbrip18j26sbs4h16wisvpryfdf4v7z6kg716k6pgj0gb";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1nvyazb2dv03k68shqj7crx01yiwzh1zs5al84ym3j18drq8b66r";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1pclmjkb7c2c6k62pilgi6r7bxw2clpb5vj46n0rdhhr97vfschn";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "15qkm1004mq8g3y7jdhsziabf5c1c57p5h57086ngk9x61r2gfmx";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1il49v54qfc1gy9scqal9fjpkjxk3wpzylcz6n5372n01mgs8ydz";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1c25p3byhlv41b82hlpq6agpnfd5vzfm7a9fb8h7jh8va5ifqwac";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1wa15glj0a11phcm69yaz532j4412vqx1h4cwhddyr2l3d7g135i";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1hsq8213mzxzasydgrmcgid85r9d1p1fgkabb5wd66xz5kgjc5v7";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1xw7hnlqq05bfsgb74qhis8dcnr7nllm3vm2mc4n8g5n7h8c0hq4";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0z0v9m7z557jmqdngw4km4icaxhzlc5np7rzsnzgsqm2xnapc1cm";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0jvy10459fc58d21azbk3jjnq1pb3n4a8v5ynw0f2pcizgivrlm3";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "15wnqcqz1xrdw33xiff0xfnyd56x3hj9nk4i1sxkkymfay2jkdgk";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1n7vzhyph2rr22isnzr7r4yrchkzrgwa1xw00ncpmj4k81gl7yl3";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0hqlhl19y9bc262kk0s5grgvg3xy0gvcvkrcwy2casmrsx3p5f1y";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0yh6l1ypy3h1bgs1kbnjj7fbhap4a416zlsbsd7d4g71dq7hsm1p";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "03j1dvylczy360dndpny9qfijfnacv185qwlji7zj4x83y69zfdc";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1257lwczcyh6nbp3s8078l2h6yj04wqxa4iak7k3q79l8x2jhch6";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1mvqfmmajgf5iyscalmrsipa9vy5b6ap7bdarl0d1i4nwh1g8mxq";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0cq6c2ky8gydzk5rz5yjgb3lp7n2d9h760q7m8skq9f8hks7vlic";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1149l8i96iq195cjzbrrdzxck1zd34w6y8hxs8p6jz49bzf5g5c5";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0n4b7x0xxvmlr55b602pi7bxmrcpsqcc4qk4x58x2kpb9awh896i";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1dfy3kzqx0xm52jp7gzph0xm6zrwb9y3mssyw4shmnvhlf13xkki";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1gd6vnh2vwn4lj8c0qmq7avaz79zv2ldqyb07d2wmvpljpifz5fk";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "0q619ddjj928v376j1ljn2k6br7zlazfkk9q4hndi6kql1712139";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1jmfxpz3pf2zglysjnry0ahygvkapk6v844q1nhsmfci6mmpmlqh";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "01f6krx8ll9jhih5205fxsb0dz3ynwpz43byq7qyi68f1lkaxsd0";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0xnl28havz92ar5gid3p2r8wap3yrsg143fghqcdiymbzwy3sb0k";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1arc5ksxgwvk2i669nhm2y78qf4zd1z3z8fjpixf6ax9g3bqdghd";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1fk0g008pdw4gpbzbycl6xck0m7mf56f27rfa10riy9drmi7bcbj";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1g2gwslqk0zfayhd91mbgl3gwznj8npq9637c3wkk3kdnz6hcsw0";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1j6dw63jph3dbi0v4rlq3mp98fijynd4n0a6z4dwmzdjzb5ccqrg";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0m5i7i6rscqwwx4l0fw0bmg1247hbs3bxbnxmqbz6fv5pp29yh4v";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0bn3bf6pkjvr0la5n4s3lb1ij0q2rh4qx8ig6sbkq0j822c84n11";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "09gw92a41ws5lxapw0160pqrqfhfnk42yshlzmdk3aav88rq1f0q";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1lyh8szfwbd3jm3gsndgigz1xhzldh246c2d6f4lsry9w9557gpl";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "12vgf8qx8244brvfy7mi8ak1nxh9fclj9n2yic5ldf2wfkb7hzjd";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0q995rw2bbv8vjnf9h0ywdvq8v24rkmxck1w7bf0wblcp7w4pcpq";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "014zcdk5kxif17mqb6ivsc44021f4hxr0d2pn2d0jlrhx4dbyvsp";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0y80d8d18di9n0jj8ifxmdc5vgmq6bkc86id5azqrlif4rhs55jj";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1q87ixrqqkhzbyb7mlk0xfnxcih057x9w596spr5br8arxr34912";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1ykbh8j2x14vq7iszll4lgmg8gbnv6jql686x01896ba504144y4";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "03f0jjsn4bwysjs8x8iy61z0rnzm8gn3w9k85wfa0br8cjr36cji";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1bf3795ddlxk9cz686jlifb18wjxfgjqfv3s45gs9q09i6sq0iv4";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "11w9ibw8bbkllrf4628rc5zpwwwp5plcapndwp9sb19rsdx0bnvf";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0rv5l7zplhfr7l8a4wh4ngvh0assq97dlvh5d6x9a464k5fgwg7w";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "15f1rsbzljk120dq2v2wkgn4ym50yzrd9xyzgw9g22hlmy5inmm8";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1f924vl3vm20p5hfyzzv6hx6cvb7ym4bf9lbch808k99jwvh6j99";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1fv78nvvrd6z62fy3iqqbf77vixadl8s2hg6lkg094f1dc8l3w4n";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "1k2i818821bls1vqb614jq8pi6cj43rf2x2bcbcibwdmhs1xljx8";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0bk9mjir5az1rnxclyijc42mfnpgbw1fzzfvw765wdcs1mkjqrdh";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0m3z05zsg2afzfm2ws090rx9214l9zjshfxy7sww3a2nb39f798b";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "09921r007i23q1dyg9gx8zjaf3da0i2r6r673yhaq584srxivznq";
-}
-]
diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
deleted file mode 100644
index 9862efe0b58..00000000000
--- a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.5.nix
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0mxvp97sf1f6w2rfy966fdhpflqfmwv253zswaz3cv9b5m9yf5q8";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "0fk5r0bqnks1ygac6cs8f5gb16lr4qrh32jgdk50hnv6ad51agfv";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "10kc76l1fm56rhnc6wvm29ij15v2pvmsq1djvm6zxhsdm99af25k";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0gn4ghvwwi09aibmx5940b159d7svnbcq25cg02lhvjvfrmyfp1j";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "175j2gn35vzjb17rbd0mvrxas180wq3v1x6q1caykm2qddqqmqgv";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0zxa2cmcwdbdwgz5wm58v0gqzphcc1b1vzzgrrnpsmfjqb6h951c";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0qab4gbilpb8fwyjqcvvmzms4hdbrii4xr5xgcl87v8va5gcdc8s";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1vh9h185qa42q7gkyflp7g93hgvhxjd2cknwz0yq6dxsx8dg5iqd";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1f8wsq9hh2d6wpd7v1bz5mchb1zjnc895mmpawy67rv6s45vx6y8";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1nz7q6fq3242vjh2961r4v4kp1fywknnjrnfadgf3g0dvav2vkq8";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1mazkh53vdvsz5zrx41fi49x44isibpwmrrqwcmpbcwdqx7iaf9v";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0f7bi50gzrhnvif7c1h6mgscbbjvz0cqifdnaaqr9m7d9iafwwyz";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0k0w849nqjsaxsi8rm4jd13fqcvk88v6j0yar36mvblh6x61qgq8";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "12fmd6zy14wsd2i1nszc4bl3q0asvf9wqsgwihxipw34fwa6irpv";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0k76zlfjjz7vlvlz298713c27zbcybjip33wix76ldj7is9yb07v";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "03qxm8q3bvx4cqaxvfbdj07q2rpcwrqyp333x3jwmcc5xj731pww";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "09n5wpc4s2xxv1016dvg8zwbvx6lx6942lnyq3b4adl4yjcghs32";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1w7hj6ma3d03wv2x651hwhxxc4ird23f0khc4z03ncpl9xvyikky";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0jirch5cw99lcs9d83kzifb9wdqz1aqdjmi4wam0gi8nciws8hwr";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "02g0a4l1mlmx64acxfl6a1lqbivnwdfx98q8f9nyb3836i8i3sd7";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "087jww1daqqwrrxi1hz72kc39ipj6hj73cqzy4ds24hm112z58dc";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1mwmbhnzvhxzcfk3j6f61jfprfwaan8mf9l4s7r8f3ddmsz66kha";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0grmi972ndizf3gpjxjv79crc0si4b3dadayzmayrykndd5b30i6";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "13d8ikfhlswpaxrj9l6f0kf4dzbmgri5d3miz3r8h6lmmszq2phr";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1m17wqak0alhkk81fhl32fcv0b2nnszjs7xia0df75z8c2js9vmm";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1br0gipw4ra3bvzdal9dn8x8kldmmk4miw1z5hsimhkgc5y5amb3";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "0vmdfcy2dmxd6bjvz31xhjkxd2q55px70c9d6lj3fmf4bxiqlmc4";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1snrn2yw7z2m0m3wqxgqrq1rxqnjb4ylngdnn0ym87yh7bh6kjsc";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1dyymy3wdldmkxai47y25qzpcajsi18h4rl0m1izm90giwadrk85";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1im120mlnvjdlh5gna9q0qfixg2zz2shhzbxih37ikzpjxr7v5zs";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "07303s04qkh7pa78ranvcvqs75wll427vdb0iv6sr07smd0fzf1d";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1dzzzc3wkjhapmdlbp178w6rm00ibixmp4xhkbsavr7hy18a048c";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "039gi1ba8z9w80b6xsh3b51alq91d4phr6pmfnaqngwqmaksxidh";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0bg55dl284y7wvcl40sgspnvpfiqkapvwwi02n4jyl3w4xsy3b8j";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "048pr21vfcwvfxpw56kil4awmx7samva4jd86g6rvrs6q85c0mxj";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "10xy5r3s79gh28zzy72dhs79ap616qnrqms3mgg9kdvmmi2n32nm";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "08ib4pbahgjww4d82vcgahc7jxky85riim1p0ck5dzhri0664zx8";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0kqr4jvqsyasdacv0kxjcx5nfd6m0kd1vk7418mzbabjyb2nbvl1";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0nfnwcq2n5dp721wi7arp3via0kvhf3rfq8h78k9dqs5afyhf4n1";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1886fga94c7zp0g1hdijqj64mi8asgbmykic6n0mzin33c4rwyjs";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0q51v23dviwrgy1zaq3823xh2vfm2zvkpqizgmi111m681s0n4kx";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0mm8mfqlfbj0r2d4xyli2n8x8sgpw2bjxnlq8yy38pgi9pksgcsl";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0qcvdil9gbgwf10v4j606d0vi4705vb77aq7p1kq3y57khldlhsa";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1rmxh12r7i9cc7nkigxx6igvzjjq1rk3y5nm2mdjq7gcv067gp9i";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0xdd5ini0b0fi5xfai533y8a5g8gyphfrz6qvivpgdd81rfckpk1";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "09rfcrw58f0bvqqkdcpiy56xv591yk6v0iinlabamza63h011rmk";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1slznfn6ghqy5cy870apwgcygdhvbfvh1dy6rplhwnv0riwnx3ay";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "12ic6nd65l6w7vqymfr1djbkn8jfghc5vyyi783mdf3pwx3xjk8i";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0v02h8gdwnabahb3invxvp2ap5x6b4a0pf0sl15phi8s2m1y9fad";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "10asd6ha7fjs4b11vp27xp1piycalvidv3l6z5sv9j5bs4hayp1g";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "11n6z1d2b2b93lj9vps4ry6k671m5lssrv4hi5nr0a1vbc1d6ix1";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1lrghs0s3hmhmrqarsc29518ax95wz6gnhimxs8lyc88b4jil0p5";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "198rr7i673a77v3qlld1c0rm2vr86rr6nf97v4wckcvyz8b6s6i8";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "01glzj5vhhmv6zvrmwd4wwx0bq6b0p08ixx0rf3bh4pdbi42hiin";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0cj8flr5c73crrwchfz3j60snzmvbr3bc1p4pnk4s3vajmwsdaas";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0lc896x55ww3s5jz7ms0gmm22qq9yjpnbzbjfq64574pvr2m3s5y";
-}
-]
diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix
deleted file mode 100644
index adee87c8316..00000000000
--- a/pkgs/desktops/kde-4.10/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1aad2qb9zrjcild5s584q4zz6zc3wgkclv79gnfwkhmy0viqx9l6";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.10/support/akonadi/default.nix b/pkgs/desktops/kde-4.10/support/akonadi/default.nix
deleted file mode 100644
index e1d8a5ef9ae..00000000000
--- a/pkgs/desktops/kde-4.10/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.9.2";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "1ndzc7a1q1hqy4pn9xnihq6ni02zsqfdyy6z6lwn27bkb7pg64p7";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d695253fbbf..01dea0f5b84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9926,17 +9926,7 @@ let
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 
-  kde4_prev = recurseIntoAttrs pkgs.kde410;
-
-  kde410 = kdePackagesFor (pkgs.kde410 // {
-      boost = boost149;
-      eigen = eigen2;
-      libotr = libotr_3_2;
-      libusb = libusb1;
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.10;
-
- kde411 = kdePackagesFor (pkgs.kde411 // {
+  kde411 = kdePackagesFor (pkgs.kde411 // {
       boost = boost149;
       eigen = eigen2;
       libotr = libotr_3_2;
@@ -9944,7 +9934,7 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.11;
 
- kde412 = kdePackagesFor (pkgs.kde412 // {
+  kde412 = kdePackagesFor (pkgs.kde412 // {
       eigen = eigen2;
       libusb = libusb1;
       libcanberra = libcanberra_kde;

From 7a59054dce4ab1193b870d3dbe9f3868f1208a71 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 09:10:10 -0500
Subject: [PATCH 0121/2033] Add a recipe for installing "watch" from procps
 (#2227)

---
 pkgs/os-specific/linux/procps/watch.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/linux/procps/watch.nix

diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix
new file mode 100644
index 00000000000..2547e26def4
--- /dev/null
+++ b/pkgs/os-specific/linux/procps/watch.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation {
+  name = "watch-0.2.0";
+
+  src = fetchurl {
+    url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
+    sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
+  };
+
+  buildInputs = [ ncurses ];
+
+  makeFlags = "watch usrbin_execdir=$(out)/bin" +
+              (if stdenv.isDarwin then " PKG_LDFLAGS=" else "");
+
+  enableParallelBuilding = true;
+
+  crossAttrs = {
+    CC = stdenv.cross.config + "-gcc";
+  };
+
+  installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
+
+  meta = {
+    homepage = http://sourceforge.net/projects/procps/;
+    description = "Utility for watch the output of a given command at intervals";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01dea0f5b84..65cac48e8e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7221,6 +7221,8 @@ let
 
   procps-ng = callPackage ../os-specific/linux/procps-ng { };
 
+  watch = callPackage ../os-specific/linux/procps/watch.nix { };
+
   qemu_kvm = lowPrio (qemu.override { x86Only = true; });
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };

From 4f2aa2f7061984fa7aa21bac92ed5eec3f3daa06 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 16:24:08 +0200
Subject: [PATCH 0122/2033] Fix installer test evaluation

---
 nixos/tests/installer.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index aebaba91811..43bea22d852 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -193,13 +193,13 @@ let
 
   makeInstallerTest =
     { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
-    makeTest ({ ... }: {
+    makeTest {
       inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
         inherit createPartitions fileSystems testChannel grubVersion grubDevice;
       };
-    });
+    };
 
 
 in {
@@ -329,7 +329,7 @@ in {
     };
 
   # Rebuild the CD configuration with a little modification.
-  rebuildCD = makeTest ({ ... }:
+  rebuildCD = makeTest
     { inherit iso;
       nodes = { };
       testScript =
@@ -353,5 +353,5 @@ in {
 
           $machine->shutdown;
         '';
-    });
+    };
 }

From 29027fd1e12461fc5ff5722bea79df7ff4299599 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 16:26:48 +0200
Subject: [PATCH 0123/2033] =?UTF-8?q?Rewrite=20=E2=80=98with=20pkgs.lib?=
 =?UTF-8?q?=E2=80=99=20->=20=E2=80=98with=20lib=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
---
 nixos/doc/manual/development.xml                     |  4 ++--
 nixos/modules/config/fonts/corefonts.nix             |  4 ++--
 nixos/modules/config/fonts/fontconfig.nix            |  4 ++--
 nixos/modules/config/fonts/fontdir.nix               |  4 ++--
 nixos/modules/config/fonts/fonts.nix                 |  4 ++--
 nixos/modules/config/fonts/ghostscript.nix           |  4 ++--
 nixos/modules/config/gnu.nix                         |  4 ++--
 nixos/modules/config/i18n.nix                        |  4 ++--
 nixos/modules/config/krb5.nix                        |  4 ++--
 nixos/modules/config/ldap.nix                        |  4 ++--
 nixos/modules/config/networking.nix                  |  4 ++--
 nixos/modules/config/no-x-libs.nix                   |  4 ++--
 nixos/modules/config/nsswitch.nix                    |  4 ++--
 nixos/modules/config/power-management.nix            |  4 ++--
 nixos/modules/config/pulseaudio.nix                  |  4 ++--
 nixos/modules/config/shells-environment.nix          |  4 ++--
 nixos/modules/config/swap.nix                        |  4 ++--
 nixos/modules/config/sysctl.nix                      |  4 ++--
 nixos/modules/config/system-path.nix                 |  4 ++--
 nixos/modules/config/timezone.nix                    |  4 ++--
 nixos/modules/config/unix-odbc-drivers.nix           |  4 ++--
 nixos/modules/config/users-groups.nix                |  4 ++--
 nixos/modules/hardware/all-firmware.nix              |  4 ++--
 nixos/modules/hardware/cpu/amd-microcode.nix         |  4 ++--
 nixos/modules/hardware/cpu/intel-microcode.nix       |  4 ++--
 nixos/modules/hardware/network/b43.nix               |  4 ++--
 nixos/modules/hardware/pcmcia.nix                    |  4 ++--
 nixos/modules/hardware/video/bumblebee.nix           |  4 ++--
 nixos/modules/installer/cd-dvd/channel.nix           |  4 ++--
 .../installer/cd-dvd/installation-cd-base.nix        |  4 ++--
 .../installer/cd-dvd/installation-cd-graphical.nix   |  4 ++--
 nixos/modules/installer/cd-dvd/iso-image.nix         |  4 ++--
 .../installer/cd-dvd/system-tarball-fuloong2f.nix    |  4 ++--
 nixos/modules/installer/cd-dvd/system-tarball-pc.nix |  4 ++--
 .../installer/cd-dvd/system-tarball-sheevaplug.nix   |  4 ++--
 nixos/modules/installer/cd-dvd/system-tarball.nix    |  4 ++--
 nixos/modules/installer/scan/detected.nix            |  4 ++--
 nixos/modules/installer/scan/not-detected.nix        |  4 ++--
 nixos/modules/installer/tools/nixos-checkout.nix     |  4 ++--
 nixos/modules/installer/tools/tools.nix              |  4 ++--
 nixos/modules/installer/virtualbox-demo.nix          |  4 ++--
 nixos/modules/misc/assertions.nix                    |  4 ++--
 nixos/modules/misc/check-config.nix                  |  4 ++--
 nixos/modules/misc/crashdump.nix                     |  4 ++--
 nixos/modules/misc/locate.nix                        |  4 ++--
 nixos/modules/misc/nixpkgs.nix                       |  4 ++--
 nixos/modules/misc/version.nix                       |  4 ++--
 nixos/modules/profiles/clone-config.nix              |  4 ++--
 nixos/modules/profiles/headless.nix                  |  4 ++--
 nixos/modules/profiles/installation-device.nix       |  6 +++---
 nixos/modules/programs/atop.nix                      |  4 ++--
 nixos/modules/programs/bash/bash.nix                 |  4 ++--
 nixos/modules/programs/bash/command-not-found.nix    |  4 ++--
 nixos/modules/programs/environment.nix               |  4 ++--
 nixos/modules/programs/shadow.nix                    |  4 ++--
 nixos/modules/programs/shell.nix                     |  4 ++--
 nixos/modules/programs/ssh.nix                       |  4 ++--
 nixos/modules/programs/ssmtp.nix                     |  4 ++--
 nixos/modules/programs/venus.nix                     |  4 ++--
 nixos/modules/programs/virtualbox.nix                |  4 ++--
 nixos/modules/programs/wvdial.nix                    |  4 ++--
 nixos/modules/programs/zsh/zsh.nix                   |  4 ++--
 nixos/modules/rename.nix                             |  4 ++--
 nixos/modules/security/apparmor-suid.nix             |  4 ++--
 nixos/modules/security/apparmor.nix                  |  4 ++--
 nixos/modules/security/ca.nix                        |  4 ++--
 nixos/modules/security/duosec.nix                    |  4 ++--
 nixos/modules/security/grsecurity.nix                |  4 ++--
 nixos/modules/security/pam.nix                       |  4 ++--
 nixos/modules/security/pam_usb.nix                   |  4 ++--
 nixos/modules/security/polkit.nix                    |  4 ++--
 nixos/modules/security/prey.nix                      |  4 ++--
 nixos/modules/security/rngd.nix                      |  4 ++--
 nixos/modules/security/rtkit.nix                     |  4 ++--
 nixos/modules/security/setuid-wrappers.nix           |  4 ++--
 nixos/modules/security/sudo.nix                      |  4 ++--
 nixos/modules/services/amqp/activemq/default.nix     |  4 ++--
 nixos/modules/services/amqp/rabbitmq.nix             |  4 ++--
 nixos/modules/services/audio/alsa.nix                |  4 ++--
 nixos/modules/services/audio/fuppes.nix              |  4 ++--
 nixos/modules/services/audio/mpd.nix                 |  4 ++--
 nixos/modules/services/backup/almir.nix              |  4 ++--
 nixos/modules/services/backup/bacula.nix             |  4 ++--
 nixos/modules/services/backup/mysql-backup.nix       |  4 ++--
 nixos/modules/services/backup/postgresql-backup.nix  |  4 ++--
 nixos/modules/services/backup/rsnapshot.nix          |  4 ++--
 nixos/modules/services/backup/sitecopy-backup.nix    |  4 ++--
 nixos/modules/services/backup/tarsnap.nix            |  4 ++--
 .../continuous-integration/jenkins/default.nix       |  4 ++--
 .../continuous-integration/jenkins/slave.nix         |  4 ++--
 nixos/modules/services/databases/4store-endpoint.nix |  4 ++--
 nixos/modules/services/databases/4store.nix          |  4 ++--
 nixos/modules/services/databases/couchdb.nix         |  5 +++--
 nixos/modules/services/databases/firebird.nix        |  4 ++--
 nixos/modules/services/databases/memcached.nix       |  4 ++--
 nixos/modules/services/databases/monetdb.nix         |  4 ++--
 nixos/modules/services/databases/mongodb.nix         |  4 ++--
 nixos/modules/services/databases/mysql.nix           |  4 ++--
 nixos/modules/services/databases/openldap.nix        |  4 ++--
 nixos/modules/services/databases/postgresql.nix      |  4 ++--
 nixos/modules/services/databases/redis.nix           |  4 ++--
 nixos/modules/services/databases/virtuoso.nix        |  4 ++--
 nixos/modules/services/desktops/accountservice.nix   |  4 ++--
 .../services/desktops/gnome3/at-spi2-core.nix        |  4 ++--
 .../desktops/gnome3/evolution-data-server.nix        |  4 ++--
 nixos/modules/services/desktops/gnome3/sushi.nix     |  4 ++--
 nixos/modules/services/desktops/telepathy.nix        |  4 ++--
 nixos/modules/services/games/ghost-one.nix           |  4 ++--
 nixos/modules/services/games/minecraft-server.nix    |  4 ++--
 nixos/modules/services/hardware/acpid.nix            |  4 ++--
 nixos/modules/services/hardware/bluetooth.nix        |  4 ++--
 nixos/modules/services/hardware/pcscd.nix            |  4 ++--
 nixos/modules/services/hardware/pommed.nix           |  4 ++--
 nixos/modules/services/hardware/sane.nix             |  4 ++--
 nixos/modules/services/hardware/thinkfan.nix         |  4 ++--
 nixos/modules/services/hardware/udev.nix             |  4 ++--
 nixos/modules/services/hardware/udisks.nix           |  4 ++--
 nixos/modules/services/hardware/udisks2.nix          |  4 ++--
 nixos/modules/services/hardware/upower.nix           |  4 ++--
 nixos/modules/services/logging/klogd.nix             |  4 ++--
 nixos/modules/services/logging/logcheck.nix          |  4 ++--
 nixos/modules/services/logging/logrotate.nix         |  4 ++--
 nixos/modules/services/logging/logstash.nix          |  4 ++--
 nixos/modules/services/logging/rsyslogd.nix          |  4 ++--
 nixos/modules/services/logging/syslogd.nix           |  4 ++--
 nixos/modules/services/mail/dovecot.nix              |  4 ++--
 nixos/modules/services/mail/freepops.nix             |  4 ++--
 nixos/modules/services/mail/mail.nix                 |  4 ++--
 nixos/modules/services/mail/opensmtpd.nix            |  4 ++--
 nixos/modules/services/mail/postfix.nix              |  4 ++--
 nixos/modules/services/mail/spamassassin.nix         |  4 ++--
 nixos/modules/services/misc/autofs.nix               |  4 ++--
 nixos/modules/services/misc/cgminer.nix              |  4 ++--
 nixos/modules/services/misc/dictd.nix                |  4 ++--
 nixos/modules/services/misc/disnix.nix               |  4 ++--
 nixos/modules/services/misc/felix.nix                |  4 ++--
 nixos/modules/services/misc/folding-at-home.nix      |  4 ++--
 nixos/modules/services/misc/gpsd.nix                 |  4 ++--
 nixos/modules/services/misc/nix-daemon.nix           |  4 ++--
 nixos/modules/services/misc/nix-gc.nix               |  4 ++--
 nixos/modules/services/misc/nixos-manual.nix         |  4 ++--
 nixos/modules/services/misc/rippled.nix              |  4 ++--
 nixos/modules/services/misc/rogue.nix                |  4 ++--
 nixos/modules/services/misc/svnserve.nix             |  4 ++--
 nixos/modules/services/misc/synergy.nix              |  4 ++--
 nixos/modules/services/monitoring/apcupsd.nix        |  4 ++--
 nixos/modules/services/monitoring/dd-agent.nix       |  4 ++--
 nixos/modules/services/monitoring/graphite.nix       |  4 ++--
 nixos/modules/services/monitoring/munin.nix          |  4 ++--
 nixos/modules/services/monitoring/nagios/default.nix |  4 ++--
 nixos/modules/services/monitoring/smartd.nix         |  4 ++--
 nixos/modules/services/monitoring/statsd.nix         |  4 ++--
 nixos/modules/services/monitoring/systemhealth.nix   |  4 ++--
 nixos/modules/services/monitoring/ups.nix            |  4 ++--
 nixos/modules/services/monitoring/zabbix-agent.nix   |  4 ++--
 nixos/modules/services/monitoring/zabbix-server.nix  |  4 ++--
 nixos/modules/services/network-filesystems/drbd.nix  |  4 ++--
 nixos/modules/services/network-filesystems/nfsd.nix  |  4 ++--
 nixos/modules/services/network-filesystems/samba.nix |  4 ++--
 nixos/modules/services/networking/amuled.nix         |  4 ++--
 nixos/modules/services/networking/avahi-daemon.nix   |  4 ++--
 nixos/modules/services/networking/bind.nix           |  4 ++--
 nixos/modules/services/networking/bitlbee.nix        |  4 ++--
 nixos/modules/services/networking/btsync.nix         |  6 +++---
 nixos/modules/services/networking/chrony.nix         |  4 ++--
 nixos/modules/services/networking/cjdns.nix          |  4 ++--
 nixos/modules/services/networking/cntlm.nix          |  6 +++---
 nixos/modules/services/networking/connman.nix        |  4 ++--
 nixos/modules/services/networking/dhcpcd.nix         |  4 ++--
 nixos/modules/services/networking/dhcpd.nix          |  4 ++--
 nixos/modules/services/networking/dnsmasq.nix        |  4 ++--
 nixos/modules/services/networking/ejabberd.nix       |  4 ++--
 nixos/modules/services/networking/firewall.nix       |  4 ++--
 nixos/modules/services/networking/flashpolicyd.nix   |  4 ++--
 nixos/modules/services/networking/freenet.nix        |  4 ++--
 nixos/modules/services/networking/git-daemon.nix     |  4 ++--
 nixos/modules/services/networking/gnunet.nix         |  4 ++--
 nixos/modules/services/networking/gogoclient.nix     |  4 ++--
 nixos/modules/services/networking/haproxy.nix        |  4 ++--
 nixos/modules/services/networking/hostapd.nix        |  4 ++--
 nixos/modules/services/networking/ifplugd.nix        |  4 ++--
 nixos/modules/services/networking/iodined.nix        |  4 ++--
 .../services/networking/ircd-hybrid/default.nix      |  4 ++--
 nixos/modules/services/networking/kippo.nix          |  4 ++--
 nixos/modules/services/networking/minidlna.nix       |  4 ++--
 nixos/modules/services/networking/murmur.nix         |  4 ++--
 nixos/modules/services/networking/nat.nix            |  4 ++--
 nixos/modules/services/networking/networkmanager.nix |  4 ++--
 nixos/modules/services/networking/notbit.nix         |  4 ++--
 nixos/modules/services/networking/ntopng.nix         |  4 ++--
 nixos/modules/services/networking/ntpd.nix           |  4 ++--
 nixos/modules/services/networking/oidentd.nix        |  4 ++--
 nixos/modules/services/networking/openfire.nix       |  4 ++--
 nixos/modules/services/networking/openvpn.nix        |  4 ++--
 nixos/modules/services/networking/prayer.nix         |  4 ++--
 nixos/modules/services/networking/privoxy.nix        |  4 ++--
 nixos/modules/services/networking/quassel.nix        |  4 ++--
 nixos/modules/services/networking/radvd.nix          |  4 ++--
 nixos/modules/services/networking/rdnssd.nix         |  4 ++--
 nixos/modules/services/networking/rpcbind.nix        |  4 ++--
 nixos/modules/services/networking/sabnzbd.nix        |  4 ++--
 nixos/modules/services/networking/searx.nix          |  4 ++--
 nixos/modules/services/networking/ssh/lshd.nix       |  4 ++--
 nixos/modules/services/networking/ssh/sshd.nix       |  4 ++--
 nixos/modules/services/networking/supybot.nix        |  4 ++--
 nixos/modules/services/networking/syncthing.nix      |  4 ++--
 nixos/modules/services/networking/tcpcrypt.nix       |  4 ++--
 nixos/modules/services/networking/tftpd.nix          |  4 ++--
 nixos/modules/services/networking/unbound.nix        |  4 ++--
 nixos/modules/services/networking/vsftpd.nix         |  4 ++--
 nixos/modules/services/networking/wakeonlan.nix      |  4 ++--
 nixos/modules/services/networking/websockify.nix     |  4 ++--
 nixos/modules/services/networking/wicd.nix           |  4 ++--
 nixos/modules/services/networking/wpa_supplicant.nix |  4 ++--
 nixos/modules/services/networking/xinetd.nix         |  4 ++--
 nixos/modules/services/printing/cupsd.nix            |  4 ++--
 nixos/modules/services/scheduling/atd.nix            |  4 ++--
 nixos/modules/services/scheduling/cron.nix           |  4 ++--
 nixos/modules/services/scheduling/fcron.nix          |  4 ++--
 nixos/modules/services/search/elasticsearch.nix      |  4 ++--
 nixos/modules/services/search/solr.nix               |  4 ++--
 nixos/modules/services/security/clamav.nix           |  4 ++--
 nixos/modules/services/security/fail2ban.nix         |  4 ++--
 nixos/modules/services/security/fprot.nix            |  4 ++--
 nixos/modules/services/security/haveged.nix          |  4 ++--
 nixos/modules/services/security/tor.nix              |  4 ++--
 nixos/modules/services/security/torify.nix           |  4 ++--
 nixos/modules/services/security/torsocks.nix         |  4 ++--
 nixos/modules/services/system/dbus.nix               |  4 ++--
 nixos/modules/services/system/nscd.nix               |  4 ++--
 nixos/modules/services/torrent/deluge.nix            |  4 ++--
 nixos/modules/services/torrent/transmission.nix      |  4 ++--
 nixos/modules/services/ttys/agetty.nix               |  4 ++--
 nixos/modules/services/ttys/gpm.nix                  |  4 ++--
 .../services/web-servers/apache-httpd/default.nix    | 10 +++++-----
 .../services/web-servers/apache-httpd/mediawiki.nix  |  4 ++--
 .../web-servers/apache-httpd/per-server-options.nix  |  4 ++--
 .../services/web-servers/apache-httpd/trac.nix       |  4 ++--
 .../services/web-servers/apache-httpd/zabbix.nix     | 12 +++++++-----
 nixos/modules/services/web-servers/jboss/default.nix |  4 ++--
 nixos/modules/services/web-servers/lighttpd/cgit.nix |  4 ++--
 .../services/web-servers/lighttpd/default.nix        |  4 ++--
 .../modules/services/web-servers/lighttpd/gitweb.nix |  4 ++--
 nixos/modules/services/web-servers/nginx/default.nix |  4 ++--
 nixos/modules/services/web-servers/phpfpm.nix        |  4 ++--
 nixos/modules/services/web-servers/tomcat.nix        |  4 ++--
 .../modules/services/web-servers/varnish/default.nix |  4 ++--
 nixos/modules/services/web-servers/winstone.nix      |  4 ++--
 nixos/modules/services/web-servers/zope2.nix         |  4 ++--
 .../services/x11/desktop-managers/default.nix        |  4 ++--
 nixos/modules/services/x11/desktop-managers/e17.nix  |  4 ++--
 .../modules/services/x11/desktop-managers/gnome3.nix |  4 ++--
 nixos/modules/services/x11/desktop-managers/kde4.nix |  4 ++--
 nixos/modules/services/x11/desktop-managers/xbmc.nix |  4 ++--
 nixos/modules/services/x11/desktop-managers/xfce.nix |  4 ++--
 .../modules/services/x11/desktop-managers/xterm.nix  |  4 ++--
 nixos/modules/services/x11/display-managers/auto.nix |  4 ++--
 .../services/x11/display-managers/default.nix        |  4 ++--
 nixos/modules/services/x11/display-managers/kdm.nix  |  4 ++--
 .../services/x11/display-managers/lightdm.nix        |  4 ++--
 nixos/modules/services/x11/display-managers/slim.nix |  4 ++--
 nixos/modules/services/x11/hardware/multitouch.nix   |  4 ++--
 nixos/modules/services/x11/hardware/synaptics.nix    |  4 ++--
 nixos/modules/services/x11/hardware/wacom.nix        |  4 ++--
 nixos/modules/services/x11/redshift.nix              |  4 ++--
 nixos/modules/services/x11/terminal-server.nix       |  4 ++--
 .../modules/services/x11/window-managers/awesome.nix |  4 ++--
 .../modules/services/x11/window-managers/compiz.nix  |  4 ++--
 .../modules/services/x11/window-managers/default.nix |  4 ++--
 .../services/x11/window-managers/herbstluftwm.nix    |  4 ++--
 nixos/modules/services/x11/window-managers/i3.nix    |  4 ++--
 nixos/modules/services/x11/window-managers/icewm.nix |  4 ++--
 .../services/x11/window-managers/metacity.nix        |  4 ++--
 nixos/modules/services/x11/window-managers/twm.nix   |  4 ++--
 nixos/modules/services/x11/window-managers/wmii.nix  |  4 ++--
 nixos/modules/services/x11/xfs.nix                   |  4 ++--
 nixos/modules/services/x11/xserver.nix               |  4 ++--
 .../modules/system/activation/activation-script.nix  |  4 ++--
 nixos/modules/system/activation/no-clone.nix         |  4 ++--
 nixos/modules/system/activation/top-level.nix        |  6 +++---
 nixos/modules/system/boot/kernel.nix                 |  4 ++--
 nixos/modules/system/boot/loader/efi.nix             |  4 ++--
 .../boot/loader/generations-dir/generations-dir.nix  |  4 ++--
 nixos/modules/system/boot/loader/grub/grub.nix       |  4 ++--
 nixos/modules/system/boot/loader/grub/memtest.nix    |  4 ++--
 .../system/boot/loader/gummiboot/gummiboot.nix       |  4 ++--
 .../system/boot/loader/init-script/init-script.nix   |  4 ++--
 .../system/boot/loader/raspberrypi/raspberrypi.nix   |  4 ++--
 nixos/modules/system/boot/luksroot.nix               |  4 ++--
 nixos/modules/system/boot/modprobe.nix               |  4 ++--
 nixos/modules/system/boot/shutdown.nix               |  4 ++--
 nixos/modules/system/boot/stage-1.nix                |  4 ++--
 nixos/modules/system/boot/stage-2.nix                |  4 ++--
 nixos/modules/system/boot/systemd-unit-options.nix   |  4 ++--
 nixos/modules/system/boot/systemd.nix                |  6 +++---
 nixos/modules/system/etc/etc.nix                     |  4 ++--
 nixos/modules/system/upstart/upstart.nix             |  6 +++---
 nixos/modules/tasks/cpu-freq.nix                     |  4 ++--
 nixos/modules/tasks/filesystems.nix                  |  4 ++--
 nixos/modules/tasks/filesystems/btrfs.nix            |  4 ++--
 nixos/modules/tasks/filesystems/nfs.nix              |  4 ++--
 nixos/modules/tasks/filesystems/reiserfs.nix         |  4 ++--
 nixos/modules/tasks/filesystems/vfat.nix             |  4 ++--
 nixos/modules/tasks/filesystems/xfs.nix              |  4 ++--
 nixos/modules/tasks/filesystems/zfs.nix              |  4 ++--
 nixos/modules/tasks/kbd.nix                          |  4 ++--
 nixos/modules/tasks/network-interfaces.nix           |  4 ++--
 nixos/modules/tasks/scsi-link-power-management.nix   |  4 ++--
 nixos/modules/testing/service-runner.nix             |  4 ++--
 nixos/modules/testing/test-instrumentation.nix       |  4 ++--
 nixos/modules/virtualisation/amazon-image.nix        |  4 ++--
 nixos/modules/virtualisation/containers.nix          |  4 ++--
 nixos/modules/virtualisation/ec2-data.nix            |  4 ++--
 .../modules/virtualisation/google-compute-image.nix  |  4 ++--
 nixos/modules/virtualisation/libvirtd.nix            |  4 ++--
 nixos/modules/virtualisation/nixos-container.pl      |  4 ++--
 nixos/modules/virtualisation/nova-image.nix          |  4 ++--
 nixos/modules/virtualisation/nova.nix                |  4 ++--
 nixos/modules/virtualisation/qemu-vm.nix             |  4 ++--
 nixos/modules/virtualisation/virtualbox-guest.nix    |  4 ++--
 nixos/modules/virtualisation/virtualbox-image.nix    |  4 ++--
 nixos/modules/virtualisation/xen-dom0.nix            |  4 ++--
 322 files changed, 659 insertions(+), 656 deletions(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index be1cbc97d5e..88f3dc0d9c1 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -188,9 +188,9 @@ commands to be executed periodically by <command>cron</command>).</para>
 
 <example xml:id='locate-example'><title>NixOS module for the “locate” service</title>
 <programlisting>
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let locatedb = "/var/cache/locatedb"; in
 
diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
index 7de95200cfa..51a6676fe4a 100644
--- a/nixos/modules/config/fonts/corefonts.nix
+++ b/nixos/modules/config/fonts/corefonts.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 987bb1088c0..cf70ca264d6 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix
index a4f69809b2a..c78b52fe29e 100644
--- a/nixos/modules/config/fonts/fontdir.nix
+++ b/nixos/modules/config/fonts/fontdir.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index f43784f6d03..16df197d87f 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix
index 9ef00396808..a41f00a76c5 100644
--- a/nixos/modules/config/fonts/ghostscript.nix
+++ b/nixos/modules/config/fonts/ghostscript.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 6f5d2950463..092828fed0d 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 310739aa170..dd5e0ae2550 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
index 3323046ac5b..bb5a95ebc84 100644
--- a/nixos/modules/config/krb5.nix
+++ b/nixos/modules/config/krb5.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index 113f5d8bcbd..8171f460385 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 with pkgs;
 
 let
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 9ac68b42819..43717697ebd 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -1,8 +1,8 @@
 # /etc files related to networking, such as /etc/services.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index ec7bf3fea7b..4b791c109d7 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 2e2125d44f7..45695d9cb89 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -1,8 +1,8 @@
 # Configuration for the Name Service Switch (/etc/nsswitch.conf).
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index c80b1ec3ddc..4984c0cd826 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index db4f1b43a11..eedc4ca2b2f 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 with pkgs;
 
 let
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 0b4f75a3521..9e212847e48 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -1,9 +1,9 @@
 # This module defines a global environment configuration and
 # a common configuration for all shells.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 65d7722abfa..427b2519cbd 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 
-with pkgs.lib;
+with lib;
 with utils;
 
 {
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index a910c699cc9..b4cd22caa79 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 1913e17f929..b8e61296dd6 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -1,9 +1,9 @@
 # This module defines the packages that appear in
 # /run/current-system/sw.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 42fbe841d07..88aa7866c2b 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index 0f608469058..b725e6cae73 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 # unixODBC drivers (this solution is not perfect.. Because the user has to
 # ask the admin to add a driver.. but it's simple and works
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index c27a94a22d5..8b8f6bd909e 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 027dd827b4d..3820a95b12e 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix
index 5720a63834f..86a3df5da21 100644
--- a/nixos/modules/hardware/cpu/amd-microcode.nix
+++ b/nixos/modules/hardware/cpu/amd-microcode.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix
index 9046ddf83bb..800c391b293 100644
--- a/nixos/modules/hardware/cpu/intel-microcode.nix
+++ b/nixos/modules/hardware/cpu/intel-microcode.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix
index 03f81f92ef0..e63f2d04d1a 100644
--- a/nixos/modules/hardware/network/b43.nix
+++ b/nixos/modules/hardware/network/b43.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let kernelVersion = config.boot.kernelPackages.kernel.version; in
 
diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix
index 20684656750..d7d002ae6c8 100644
--- a/nixos/modules/hardware/pcmcia.nix
+++ b/nixos/modules/hardware/pcmcia.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 504da2cde85..f06139adc44 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let kernel = config.boot.kernelPackages; in
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 74428f66dfa..ca0e233f9e3 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -1,9 +1,9 @@
 # Provide an initial copy of the NixOS channel so that the user
 # doesn't need to run "nix-channel --update" first.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 74a2f50f027..a120a01041b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -1,9 +1,9 @@
 # This module contains the basic configuration for building a NixOS
 # installation CD.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports =
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
index debf3e7db90..65aa1167089 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
@@ -1,9 +1,9 @@
 # This module defines a NixOS installation CD that contains X11 and
 # KDE 4.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports = [ ./installation-cd-base.nix ../../profiles/graphical.nix ];
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 00a9e91c733..00f5fae8434 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -2,9 +2,9 @@
 # configuration.  The derivation for the ISO image will be placed in
 # config.system.build.isoImage.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index 13ed95d4ceb..c274970c553 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index fcb96f7a24f..0357bf80196 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -1,9 +1,9 @@
 # This module contains the basic configuration for building a NixOS
 # tarball, that can directly boot, maybe using PXE or unpacking on a fs.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index c3ced849001..1008bd5d3d0 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -1,9 +1,9 @@
 # This module contains the basic configuration for building a NixOS
 # tarball for the sheevaplug.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index 8d678fba71f..eaecbe1381f 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -2,9 +2,9 @@
 # configuration.  The derivation for the ISO image will be placed in
 # config.system.build.tarball.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index 09d04608e68..f350cd986af 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
@@ -1,8 +1,8 @@
 # List all devices which are detected by nixos-hardware-scan.
 # Common devices are enabled by default.
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   config = mkDefault {
diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix
index 814858fdffd..b30c569ed2a 100644
--- a/nixos/modules/installer/scan/not-detected.nix
+++ b/nixos/modules/installer/scan/not-detected.nix
@@ -1,8 +1,8 @@
 # List all devices which are _not_ detected by nixos-hardware-scan.
 # Common devices are enabled by default.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   hardware.enableAllFirmware = true;
diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix
index 41899855686..3338e5119ac 100644
--- a/nixos/modules/installer/tools/nixos-checkout.nix
+++ b/nixos/modules/installer/tools/nixos-checkout.nix
@@ -1,9 +1,9 @@
 # This module generates the nixos-checkout script, which replaces the
 # Nixpkgs source trees in /etc/nixos/nixpkgs with a Git checkout.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 652bfa917df..7dbcc261485 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -80,9 +80,9 @@ in
   /*
   options = {
 
-    installer.enableGraphicalTools = pkgs.lib.mkOption {
+    installer.enableGraphicalTools = mkOption {
       default = false;
-      type = with pkgs.lib.types; bool;
+      type = types.bool;
       example = true;
       description = ''
         Enable the installation of graphical tools.
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 9ef41e47074..0a52cbea289 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports =
diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index 5fb88308b77..786ec7d250c 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/misc/check-config.nix b/nixos/modules/misc/check-config.nix
index f759c88d3a1..e9803de2196 100644
--- a/nixos/modules/misc/check-config.nix
+++ b/nixos/modules/misc/check-config.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 6e71baa9a43..d68f38bae2f 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   crashdump = config.boot.crashDump;
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index b6408be5844..45da0df7967 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7433fab168e..a5dad7dd907 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   isConfig = x:
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index ae9fb5fb2a0..67bafac4c45 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 04ee76d8d3e..f0d60bb6c42 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, modules, ... }:
+{ config, lib, pkgs, modules, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 541c46ca50c..14fc905f783 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
@@ -1,9 +1,9 @@
 # Common configuration for headless machines (e.g., Amazon EC2
 # instances).
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   sound.enable = false;
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 3b058c6e971..5aab2a2954e 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -1,7 +1,7 @@
 # Provide a basic configuration for installation devices like CDs.
-{ config, pkgs, modules, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports =
@@ -45,7 +45,7 @@ with pkgs.lib;
 
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = true;
-    jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
+    jobs.wpa_supplicant.startOn = mkOverride 50 "";
 
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't
diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix
index 7fdaab9d67d..e457db22333 100644
--- a/nixos/modules/programs/atop.nix
+++ b/nixos/modules/programs/atop.nix
@@ -1,8 +1,8 @@
 # Global configuration for atop.
 
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.programs.atop;
 
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 9d33e26c495..9584f07b094 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -1,9 +1,9 @@
 # This module defines global configuration for the Bash shell, in
 # particular /etc/bashrc and /etc/profile.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/bash/command-not-found.nix b/nixos/modules/programs/bash/command-not-found.nix
index 502320446a3..8c86d48b080 100644
--- a/nixos/modules/programs/bash/command-not-found.nix
+++ b/nixos/modules/programs/bash/command-not-found.nix
@@ -3,9 +3,9 @@
 # SQLite database that maps program names to Nix package names (e.g.,
 # "pdflatex" is mapped to "tetex").
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 489a7a4d269..831c04f1ad8 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -2,9 +2,9 @@
 
 # Most of the stuff here should probably be moved elsewhere sometime.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 15b083b72d2..a2435099499 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -1,8 +1,8 @@
 # Configuration for the pwdutils suite of tools: passwd, useradd, etc.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 226105a0c97..80d40a7c708 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -1,8 +1,8 @@
 # This module defines a standard configuration for NixOS shells.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 89333533465..27db667e440 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -1,8 +1,8 @@
 # Global configuration for the SSH client.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg  = config.programs.ssh;
     cfgd = config.services.openssh;
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 904989d57a0..34eafd4fa84 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -3,9 +3,9 @@
 # directly to an SMTP server defined in its configuration file, wihout
 # queueing mail locally.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 7ab653dd19f..2b70a795f4f 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 let
   cfg = config.services.venus;
 
diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix
index 340fec0496a..10e657abd3c 100644
--- a/nixos/modules/programs/virtualbox.nix
+++ b/nixos/modules/programs/virtualbox.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let virtualbox = config.boot.kernelPackages.virtualbox; in
 
diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
index da3f7dce98a..8e7d0e51a4e 100644
--- a/nixos/modules/programs/wvdial.nix
+++ b/nixos/modules/programs/wvdial.nix
@@ -1,8 +1,8 @@
 # Global configuration for wvdial.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 69a56ff69a0..7bcf8da2c65 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -1,8 +1,8 @@
 # This module defines global configuration for the zshell.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 72093aab5cd..aa3cefdcad1 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, options, ... }:
+{ config, lib, options, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index bc661164fdc..b89b379ae66 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.security.apparmor;
 in
-with pkgs.lib;
+with lib;
 {
 
   options.security.apparmor.confineSUIDApplications = mkOption {
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index b9f15159002..29ac71777f0 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -1,10 +1,10 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.security.apparmor;
 in
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 05cd1c3ecc1..f159e359f96 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 989bd13d101..bd961138482 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.security.duosec;
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 913a0afc452..90462a2d6d0 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.security.grsecurity;
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 93d12d292e4..0d205ce07e5 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1,9 +1,9 @@
 # This module provides configuration for the PAM (Pluggable
 # Authentication Modules) system.
 
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 4cc99995fbc..11708a1f016 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index dbec4ad98d1..054d39c4785 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix
index 75b95d5fbb0..e29fa5395a1 100644
--- a/nixos/modules/security/prey.nix
+++ b/nixos/modules/security/prey.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.prey;
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 720ac02f2e8..c31e57e6f6f 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index 164ad9b3aa7..ba07591bb77 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -1,9 +1,9 @@
 # A module for ‘rtkit’, a DBus system service that hands out realtime
 # scheduling priority to processes that ask for it.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 78be1cc6cde..109e61df79e 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 215a8ecd601..956856c6499 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 915d179e699..f1f3d005f30 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 with pkgs;
 
 let
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index dc1a68aefbb..bef15fb64b7 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.rabbitmq;
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index c9a2ef4589b..9a70d9edfa7 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -1,7 +1,7 @@
 # ALSA sound support.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix
index 3eb0732bae2..4a975ed5f53 100644
--- a/nixos/modules/services/audio/fuppes.nix
+++ b/nixos/modules/services/audio/fuppes.nix
@@ -1,10 +1,10 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.services.fuppesd;
 in
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index a9880dee20c..1b50f06bf30 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/backup/almir.nix b/nixos/modules/services/backup/almir.nix
index 8fdcdd6c7be..5ce215c5c4b 100644
--- a/nixos/modules/services/backup/almir.nix
+++ b/nixos/modules/services/backup/almir.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.almir;
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 272903c99e3..c2255f68818 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -1,9 +1,9 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # TODO: test configuration when building nixexpr (use -t parameter)
 # TODO: support sqlite3 (it's deprecate?) and mysql
 
-with pkgs.lib;
+with lib;
 
 let
   libDir = "/var/lib/bacula";
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 3ff9978fbb9..28f607861f7 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index e68ad794a96..1f7b123eca3 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   inherit (pkgs) postgresql gzip;
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 178ba3ec720..48ad7582b7e 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.rsnapshot;
 in
diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix
index 5c7f7ffae5b..5d3675fa3e9 100644
--- a/nixos/modules/services/backup/sitecopy-backup.nix
+++ b/nixos/modules/services/backup/sitecopy-backup.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   inherit (pkgs) sitecopy;
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index ac8f008069a..1966242e3dc 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.tarsnap;
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 23fa32ef511..b01b5c3245a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   cfg = config.services.jenkins;
 in {
diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix
index 9d952b2d2be..5836d92a4fc 100644
--- a/nixos/modules/services/continuous-integration/jenkins/slave.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   cfg = config.services.jenkinsSlave;
   masterCfg = config.services.jenkins;
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 7872ea2dc6a..68913f15f95 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.services.fourStoreEndpoint;
   endpointUser = "fourstorehttp";
   run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${endpointUser} -c";
 in
-with pkgs.lib;
+with lib;
 {
 
   ###### interface
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 412d14b050c..1725672a659 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -1,11 +1,11 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.services.fourStore;
   stateDir = "/var/lib/4store";
   fourStoreUser = "fourstore";
   run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fourStoreUser}";
 in
-with pkgs.lib;
+with lib;
 {
 
   ###### interface
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index b48d3a64767..5088c741681 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, ... }:
-  with pkgs.lib;
+{ config, lib, pkgs, ... }:
+
+with lib;
 
 let
   cfg = config.services.couchdb;
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index f9f7e9d7c51..83dd4951170 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # TODO: This may file may need additional review, eg which configuartions to
 # expose to the user.
@@ -19,7 +19,7 @@
 # Eg superserver is said to be most efficiently using resources according to
 # http://www.firebirdsql.org/manual/qsg25-classic-or-super.html
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index 505253229c9..c6875af506d 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix
index 9d3059c7f45..9f09c71e005 100644
--- a/nixos/modules/services/databases/monetdb.nix
+++ b/nixos/modules/services/databases/monetdb.nix
@@ -1,9 +1,9 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.services.monetdb;
   monetdbUser = "monetdb";
 in
-with pkgs.lib;
+with lib;
 {
 
   ###### interface
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index a2f2593e797..fe82ca430e1 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 44fb0062f92..1ca45d90f89 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 0fc8b88c652..c95238b3451 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index cc4230d4d6a..2960ad91362 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 9a4ce36a5cb..4ef48df9831 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.redis;
diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix
index 6a29fc13211..f955cb74b6b 100644
--- a/nixos/modules/services/databases/virtuoso.nix
+++ b/nixos/modules/services/databases/virtuoso.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.services.virtuoso;
   virtuosoUser = "virtuoso";
   stateDir = "/var/lib/virtuoso";
 in
-with pkgs.lib;
+with lib;
 {
 
   ###### interface
diff --git a/nixos/modules/services/desktops/accountservice.nix b/nixos/modules/services/desktops/accountservice.nix
index b21207f05a1..386dfe98bd2 100644
--- a/nixos/modules/services/desktops/accountservice.nix
+++ b/nixos/modules/services/desktops/accountservice.nix
@@ -1,8 +1,8 @@
 # AccountsService daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 7a25a794c2e..22a54f511d1 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -1,8 +1,8 @@
 # at-spi2-core daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 64592133666..a49b5b47768 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -1,8 +1,8 @@
 # Evolution Data Server daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
index 7fe37e26f43..7a4389038b2 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -1,8 +1,8 @@
 # GNOME Sushi daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix
index bd417db88af..2554f3a1666 100644
--- a/nixos/modules/services/desktops/telepathy.nix
+++ b/nixos/modules/services/desktops/telepathy.nix
@@ -1,8 +1,8 @@
 # Telepathy daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
index 92c9112eeb6..7a3ecebec39 100644
--- a/nixos/modules/services/games/ghost-one.nix
+++ b/nixos/modules/services/games/ghost-one.nix
@@ -1,5 +1,5 @@
-{pkgs, config, ...}:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
 
   cfg = config.services.ghostOne;
diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix
index ac70bc53473..4c734aefa46 100644
--- a/nixos/modules/services/games/minecraft-server.nix
+++ b/nixos/modules/services/games/minecraft-server.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.minecraft-server;
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index 2329f38dfc2..a710636c140 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index a70a66c2ba0..68d0406e63b 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix
index 6d429c94b28..119761c7a44 100644
--- a/nixos/modules/services/hardware/pcscd.nix
+++ b/nixos/modules/services/hardware/pcscd.nix
@@ -1,10 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfgFile = pkgs.writeText "reader.conf" "";
 in
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index 32599554fc1..04db46999b0 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 5979feb8240..01d910575bb 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index b39c9cb1d9b..16c31aab2d5 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 52b3ad43579..d218aa1e5e1 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
index 531ee192573..c9d11bcfc68 100644
--- a/nixos/modules/services/hardware/udisks.nix
+++ b/nixos/modules/services/hardware/udisks.nix
@@ -1,8 +1,8 @@
 # Udisks daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index 178ec379ff1..0f61f20c33c 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -1,8 +1,8 @@
 # Udisks daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 4a9b13d4aa0..a202d82f646 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -1,8 +1,8 @@
 # Upower daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix
index 36b530d0077..f69e08152b5 100644
--- a/nixos/modules/services/logging/klogd.nix
+++ b/nixos/modules/services/logging/klogd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   ###### interface
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index ef147f95358..1cd032ffa76 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.logcheck;
diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index c6c0d2ea238..804f9a0847f 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.logrotate;
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 21128779e8f..480e35a1156 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.logstash;
diff --git a/nixos/modules/services/logging/rsyslogd.nix b/nixos/modules/services/logging/rsyslogd.nix
index 680c7a912c1..d4b7aa809f0 100644
--- a/nixos/modules/services/logging/rsyslogd.nix
+++ b/nixos/modules/services/logging/rsyslogd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/logging/syslogd.nix b/nixos/modules/services/logging/syslogd.nix
index 36a0ace927a..325868079e2 100644
--- a/nixos/modules/services/logging/syslogd.nix
+++ b/nixos/modules/services/logging/syslogd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 92682d644f4..1fb7102e7f3 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix
index 79f211ad86e..2dd27a2033a 100644
--- a/nixos/modules/services/mail/freepops.nix
+++ b/nixos/modules/services/mail/freepops.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.mail.freepopsd;
diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index bad0b22625d..b7e1d295f2c 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index 0c18c464520..fbc4b1d7d8a 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -1,7 +1,7 @@
-{ pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 
 with pkgs;
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2633289b46d..8f75bd8ab5d 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index aaf1dfcc210..a3ac9e37242 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 50491c556e8..e645bd25a66 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 20b7c34e886..8f25df809cd 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.cgminer;
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index fd68f847010..552e0a435ef 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 82526b154e7..94d0caaa76b 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -1,7 +1,7 @@
 # Disnix server
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index 2da50fc8595..a01c7f08b91 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
@@ -1,7 +1,7 @@
 # Felix server
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 9f4c4645279..0093e3c0c33 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   stateDir = "/var/lib/foldingathome";
   cfg = config.services.foldingAtHome;
diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix
index 99b733d399e..4a677f33fa0 100644
--- a/nixos/modules/services/misc/gpsd.nix
+++ b/nixos/modules/services/misc/gpsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index bbcf290a795..1516736dc2e 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index fa20e0956f5..6a7a7f4cee7 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.nix.gc;
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 1a8b85db329..808c5dcbdc6 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -3,9 +3,9 @@
 # of the virtual consoles.  The latter is useful for the installation
 # CD.
 
-{ config, pkgs, baseModules, ... } @ extraArgs:
+{ config, lib, pkgs, baseModules, ... } @ extraArgs:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index e4d1caa565c..2c1fec9f6d7 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -1,8 +1,8 @@
 # configuration building is commented out until better tested.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.rippled;
diff --git a/nixos/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix
index de25cc0fb98..ed8da8a518f 100644
--- a/nixos/modules/services/misc/rogue.nix
+++ b/nixos/modules/services/misc/rogue.nix
@@ -1,9 +1,9 @@
 # Execute the game `rogue' on tty 9.  Mostly used by the NixOS
 # installation CD.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index b0806d14738..848905ca457 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -1,7 +1,7 @@
 # SVN server
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix
index 63e7c7667e5..ec8ff426f0a 100644
--- a/nixos/modules/services/misc/synergy.nix
+++ b/nixos/modules/services/misc/synergy.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix
index 38fd53653d6..6cc0c122ec6 100644
--- a/nixos/modules/services/monitoring/apcupsd.nix
+++ b/nixos/modules/services/monitoring/apcupsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.apcupsd;
diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index 37ce1c099df..bddf102ee51 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.dd-agent;
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 3e2e7e9df6e..cb67b9d4fcb 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.graphite;
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 39c4fb1aefa..966c2eca282 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # TODO: support munin-async
 # TODO: LWP/Pg perl libs aren't recognized
@@ -11,7 +11,7 @@
 # nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html
 
 
-with pkgs.lib;
+with lib;
 
 let
   nodeCfg = config.services.munin-node;
diff --git a/nixos/modules/services/monitoring/nagios/default.nix b/nixos/modules/services/monitoring/nagios/default.nix
index c809a3b8457..2eeddf78250 100644
--- a/nixos/modules/services/monitoring/nagios/default.nix
+++ b/nixos/modules/services/monitoring/nagios/default.nix
@@ -1,7 +1,7 @@
 # Nagios system/network monitoring daemon.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 512e639721e..250035fe447 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 54b7e79f82e..05950639c1e 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/systemhealth.nix b/nixos/modules/services/monitoring/systemhealth.nix
index 0a3e666ad4e..b0e59595e13 100644
--- a/nixos/modules/services/monitoring/systemhealth.nix
+++ b/nixos/modules/services/monitoring/systemhealth.nix
@@ -1,6 +1,6 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.systemhealth;
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index c00f4bad935..cc9026f768a 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -1,8 +1,8 @@
-{config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 
 # TODO: This is not secure, have a look at the file docs/security.txt inside
 # the project sources.
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.power.ups;
diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index 229236c1bbd..481298f763a 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -1,7 +1,7 @@
 # Zabbix agent daemon.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index 6735b4ca327..ca283ea2a99 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -1,7 +1,7 @@
 # Zabbix server daemon.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 1a00ccab0a6..b914724abfe 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
@@ -1,8 +1,8 @@
 # Support for DRBD, the Distributed Replicated Block Device.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.drbd; in
 
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 4daa5e9d063..2217fec3b0f 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 4f6fce6cd52..51a4d193d50 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index 8652d0daf4c..516238fdddf 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.amule;
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index d7dfca2c8dc..284b2b84e6c 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -1,7 +1,7 @@
 # Avahi daemon.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 765dc014dcb..57547da1006 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix
index fe37e8ea012..7276603da16 100644
--- a/nixos/modules/services/networking/bitlbee.nix
+++ b/nixos/modules/services/networking/bitlbee.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index e7fb471ccf4..8b288a713c6 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.btsync;
@@ -24,7 +24,7 @@ let
     optionalString (e ? "knownHosts")
       (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts"));
 
-  sharedFoldersRecord = with pkgs.lib;
+  sharedFoldersRecord =
     concatStringsSep "," (map (entry:
       let helper = attr: v:
         if (entry ? attr) then boolStr entry.attr else boolStr v;
diff --git a/nixos/modules/services/networking/chrony.nix b/nixos/modules/services/networking/chrony.nix
index 5e9818858e0..d1684dd9f05 100644
--- a/nixos/modules/services/networking/chrony.nix
+++ b/nixos/modules/services/networking/chrony.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 9b715ec6384..9306ffd5a18 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -8,9 +8,9 @@
 # (without too much shell hackery), a skeleton of the
 # configuration building lies commented out.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index 96396878afc..a50aa4d0636 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
@@ -34,7 +34,7 @@ in
 
       password = mkOption {
         default = "/etc/cntlm.password";
-        type = with pkgs.lib.types; string;
+        type = types.str;
         description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.'';
       };
 
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 2b26fe88129..7ed1e4805d8 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 with pkgs;
 
 let
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index bf7f5089368..8c3f651e434 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 5b2058e4e12..89f686c2870 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index b726493d421..8e38b9d017a 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.dnsmasq;
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 8a01c217eb5..28b8e234a5c 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index a1ca5dcdcb1..c2941e12261 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -20,9 +20,9 @@
 
 
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix
index f5bc550ab5f..5ba85178179 100644
--- a/nixos/modules/services/networking/flashpolicyd.nix
+++ b/nixos/modules/services/networking/flashpolicyd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/freenet.nix b/nixos/modules/services/networking/freenet.nix
index a4bd2098986..e9cacf4a16e 100644
--- a/nixos/modules/services/networking/freenet.nix
+++ b/nixos/modules/services/networking/freenet.nix
@@ -1,8 +1,8 @@
 # NixOS module for Freenet daemon
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index 2e7c9c68e2f..5864efaca51 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -1,5 +1,5 @@
-{pkgs, config, ...}:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
 
   cfg = config.services.gitDaemon;
diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 421c0d9bb69..03ee54af433 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix
index 3b92eb8b06b..41600794197 100644
--- a/nixos/modules/services/networking/gogoclient.nix
+++ b/nixos/modules/services/networking/gogoclient.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.gogoclient;
 in
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix
index c8345a528a7..c2e2c2d7a41 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixos/modules/services/networking/haproxy.nix
@@ -1,9 +1,9 @@
-{ config, pkgs, ...}:
+{ config, lib, pkgs, ... }:
 let
   cfg = config.services.haproxy;
   haproxyCfg = pkgs.writeText "haproxy.conf" cfg.config;
 in
-with pkgs.lib;
+with lib;
 {
   options = {
     services.haproxy = {
diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index 4edea12b6be..2adbb0a5c4e 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 # TODO:
 #
@@ -9,7 +9,7 @@
 #   wpa_supplicant and hostapd on the same wireless interface doesn't make any sense
 #   perhaps an assertion that there is a dhcp server and a dns server on the IP address serviced by the hostapd?
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
index 4e939d60354..20bfca8f872 100644
--- a/nixos/modules/services/networking/ifplugd.nix
+++ b/nixos/modules/services/networking/ifplugd.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix
index cd150fe63fd..bc0fbb42c99 100644
--- a/nixos/modules/services/networking/iodined.nix
+++ b/nixos/modules/services/networking/iodined.nix
@@ -1,8 +1,8 @@
 # NixOS module for iodine, ip over dns daemon
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.iodined;
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index cd82a41ef7a..a3d5b71740f 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 164c38940f7..d2045c9efc5 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -6,8 +6,8 @@
 #      iptables -t nat -A PREROUTING -i IN_IFACE -p tcp --dport 22 -j REDIRECT --to-port 2222'';
 #
 # Lastly: use this service at your own risk. I am working on a way to run this inside a VM.
-{ pkgs, config, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   cfg = config.services.kippo;
 in
diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 73fcb1eeea8..a519857d6a0 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -1,8 +1,8 @@
 # Module for MiniDLNA, a simple DLNA server.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 2a5549beaf8..4f91a494747 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.murmur;
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 7f4094de12f..e8d9d00cc0a 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -2,9 +2,9 @@
 # XXX: todo: support multiple upstream links
 # see http://yesican.chsoft.biz/lartc/MultihomedLinuxNetworking.html
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index fd5ff5e4498..54bdf19373d 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 with pkgs;
 
 let
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index 83dafd08379..b9743504239 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   cfg = config.services.notbit;
@@ -16,7 +16,7 @@ let
   };
 in
 
-with pkgs.lib;
+with lib;
 {
 
   ### configuration
diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix
index 156a6b32a6a..ab86f1a5b2b 100644
--- a/nixos/modules/services/networking/ntopng.nix
+++ b/nixos/modules/services/networking/ntopng.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/ntpd.nix b/nixos/modules/services/networking/ntpd.nix
index fb7d6802136..2f638904406 100644
--- a/nixos/modules/services/networking/ntpd.nix
+++ b/nixos/modules/services/networking/ntpd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index a2a555a8ad1..923e7cd0986 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index b2efb5e9c12..c3b4ba90b4e 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 292d45f4347..e3998b1e5b2 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index fb541bf101a..ad0fb0af01c 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 89c40c53157..950112b2dab 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index f3a4e457ec8..749e5dcebb6 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   quassel = pkgs.kde4.quasselDaemon;
diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix
index 8d586ce6e46..08762c9c837 100644
--- a/nixos/modules/services/networking/radvd.nix
+++ b/nixos/modules/services/networking/radvd.nix
@@ -1,8 +1,8 @@
 # Module for the IPv6 Router Advertisement Daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix
index f797206ad5c..4c1891816e3 100644
--- a/nixos/modules/services/networking/rdnssd.nix
+++ b/nixos/modules/services/networking/rdnssd.nix
@@ -1,9 +1,9 @@
 # Module for rdnssd, a daemon that configures DNS servers in
 # /etc/resolv/conf from IPv6 RDNSS advertisements.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/networking/rpcbind.nix b/nixos/modules/services/networking/rpcbind.nix
index c966f85e260..eef1e8e8cd8 100644
--- a/nixos/modules/services/networking/rpcbind.nix
+++ b/nixos/modules/services/networking/rpcbind.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix
index 8816ac0d2f8..83db0841b34 100644
--- a/nixos/modules/services/networking/sabnzbd.nix
+++ b/nixos/modules/services/networking/sabnzbd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 30f21151a76..b29db58af99 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index 04ef76f1e4d..fca30a1fe49 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 537fe0848ea..5bc140ca242 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index fa8b7556de5..2cfb9fc9b92 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 8ca16730a94..02572c1e27d 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
index 48cb884f246..1359006aef4 100644
--- a/nixos/modules/services/networking/tcpcrypt.nix
+++ b/nixos/modules/services/networking/tcpcrypt.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/tftpd.nix b/nixos/modules/services/networking/tftpd.nix
index 37935496c59..a2f7ff06ea6 100644
--- a/nixos/modules/services/networking/tftpd.nix
+++ b/nixos/modules/services/networking/tftpd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index fb75b4ed069..30ce4b49fa8 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 763fa8dc3c4..62b6027c012 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix
index 1fc54986b16..11bb7e92525 100644
--- a/nixos/modules/services/networking/wakeonlan.nix
+++ b/nixos/modules/services/networking/wakeonlan.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   interfaces = config.services.wakeonlan.interfaces;
diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix
index 12042bbad6c..4b76350ecf8 100644
--- a/nixos/modules/services/networking/websockify.nix
+++ b/nixos/modules/services/networking/websockify.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.networking.websockify; in {
   options = {
diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix
index 8e012273216..18258084fc2 100644
--- a/nixos/modules/services/networking/wicd.nix
+++ b/nixos/modules/services/networking/wicd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 5e5f81ed5a0..eb721ec3455 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 626183b810f..14ee52ae52e 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index fb8923e107a..4b758608cb6 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index c516c5889f1..c6f128ec402 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 44ed1ba5a07..5da71b12dd7 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index fda29ca0482..346a64f2c3c 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index d647301889a..b7a3566f95d 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.elasticsearch;
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index a1567c535d9..38d9dedbe3c 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 5ccb4927fcb..057891a6047 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   clamavUser = "clamav";
   stateDir = "/var/lib/clamav";
diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index ae1fd22d23e..af545016637 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index 5f8d398996f..7270a9f9814 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   fprotUser = "fprot";
   stateDir = "/var/lib/fprot";
diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix
index c3ea3fb03ed..1d52ed55dbd 100644
--- a/nixos/modules/services/security/haveged.nix
+++ b/nixos/modules/services/security/haveged.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index e70eb8511a6..582dd124c29 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index 1c158906a91..53f48a714b4 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
 
   cfg = config.services.tor;
diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix
index d6974282a6b..ede6c983677 100644
--- a/nixos/modules/services/security/torsocks.nix
+++ b/nixos/modules/services/security/torsocks.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
 
   cfg = config.services.tor;
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index cb5110f6feb..8cc655803c5 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -1,8 +1,8 @@
 # D-Bus configuration and system bus daemon.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 3259bdbbe12..f357eb4e1fc 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -1,6 +1,6 @@
-{pkgs, config, ...}:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index e0c212e5661..00df4042d89 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.deluge;
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 68f9b0647c0..14472b49a7c 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -1,8 +1,8 @@
 # NixOS module for Transmission BitTorrent daemon
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index ca4fbeb0add..442774af251 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index 74cee67aeae..12fe4e2f84f 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 949dce96824..eced13444de 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
@@ -65,7 +65,7 @@ let
           options = {};
           documentRoot = null;
         };
-        res = defaults // svcFunction { inherit config pkgs serverInfo php; };
+        res = defaults // svcFunction { inherit config lib pkgs serverInfo php; };
       in res;
     in map f defs;
 
@@ -510,7 +510,7 @@ in
       virtualHosts = mkOption {
         type = types.listOf (types.submodule (
           { options = import ./per-server-options.nix {
-              inherit pkgs;
+              inherit lib;
               forMainServer = false;
             };
           }));
@@ -577,7 +577,7 @@ in
 
     # Include the options shared between the main server and virtual hosts.
     // (import ./per-server-options.nix {
-      inherit pkgs;
+      inherit lib;
       forMainServer = true;
     });
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index f5669faebc9..7d59c13b957 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, serverInfo, php, ... }:
+{ config, lib, pkgs, serverInfo, php, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 53f34e28c27..b8e86334539 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -3,9 +3,9 @@
 # has additional options that affect the web server as a whole, like
 # the user/group to run under.)
 
-{ forMainServer, pkgs }:
+{ forMainServer, lib }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index dc82fd34f2f..ad791d7d958 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/apache-httpd/zabbix.nix b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
index a6e6042fdf6..cab16593bcb 100644
--- a/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/zabbix.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, serverInfo, ... }:
+{ config, lib, pkgs, serverInfo, ... }:
+
+with lib;
 
 let
 
@@ -51,7 +53,7 @@ in
 
   options = {
 
-    urlPrefix = pkgs.lib.mkOption {
+    urlPrefix = mkOption {
       default = "/zabbix";
       description = "
         The URL prefix under which the Zabbix service appears.
@@ -59,9 +61,9 @@ in
       ";
     };
 
-    configFile = pkgs.lib.mkOption {
+    configFile = mkOption {
       default = null;
-      type = with pkgs.lib.types; nullOr path;
+      type = types.nullOr types.path;
       description = ''
         The configuration file (zabbix.conf.php) which contains the database
         connection settings. If not set, the configuration settings will created
@@ -69,7 +71,7 @@ in
       '';
     };
 
-    stateDir = pkgs.lib.mkOption {
+    stateDir = mkOption {
       default = "/var/lib/zabbix/frontend";
       description = "
         Directory where the dynamically generated configuration data
diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index e1bcede6563..8a292ad6791 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix
index 62264f1db45..dbff565bd8a 100644
--- a/nixos/modules/services/web-servers/lighttpd/cgit.nix
+++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.lighttpd.cgit;
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 4cc34c65d84..3ba934c72bf 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -1,8 +1,8 @@
 # NixOS module for lighttpd web server
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index f02bd4db264..d49278be09a 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.lighttpd.gitweb;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 62153613355..ff94ee42d28 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.nginx;
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 6ffe4beaa5d..4a14f9b41a4 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.phpfpm;
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index a68828de5d8..b5eee8f8be8 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 7e327120c3d..364f6c68fac 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -1,9 +1,9 @@
-{ config, pkgs, ...}:
+{ config, lib, pkgs, ...}:
 let
   cfg = config.services.varnish;
 
 in
-with pkgs.lib;
+with lib;
 {
   options = {
     services.varnish = {
diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix
index 33c7e730118..7f48012f158 100644
--- a/nixos/modules/services/web-servers/winstone.nix
+++ b/nixos/modules/services/web-servers/winstone.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 576f4b08fb9..21117118457 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 753babf6a22..b82398ccf9d 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/desktop-managers/e17.nix b/nixos/modules/services/x11/desktop-managers/e17.nix
index 3d91617c62a..4cac53c9c75 100644
--- a/nixos/modules/services/x11/desktop-managers/e17.nix
+++ b/nixos/modules/services/x11/desktop-managers/e17.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index bebda772352..c93cd905530 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.xserver.desktopManager.gnome3;
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 108b52bb951..c70dbf3b911 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/desktop-managers/xbmc.nix b/nixos/modules/services/x11/desktop-managers/xbmc.nix
index 51278c5fadb..97e966ca019 100644
--- a/nixos/modules/services/x11/desktop-managers/xbmc.nix
+++ b/nixos/modules/services/x11/desktop-managers/xbmc.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.xserver.desktopManager.xbmc;
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 9ce7744b065..a72eea76239 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index 7321199b818..eab91407141 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix
index 33d97e0e07a..c02ccdf12b6 100644
--- a/nixos/modules/services/x11/display-managers/auto.nix
+++ b/nixos/modules/services/x11/display-managers/auto.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 575386bac0a..2deff602982 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -7,9 +7,9 @@
 # (e.g., KDE, Gnome or a plain xterm), and optionally the *window
 # manager* (e.g. kwin or twm).
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index c51e7edfddf..7ec489ae3e7 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 0fa16a77c1b..d459c59b048 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index cfe3ee53224..114d34557a0 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index 4f9048bfd91..6e6e88e6721 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.xserver.multitouch; in
 
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index fe9dcd51a7a..f2227a34a20 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let cfg = config.services.xserver.synaptics;
     tapConfig = if cfg.tapButtons then enabledTapConfig else disabledTapConfig;
diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix
index dfc588cd213..540ed168b48 100644
--- a/nixos/modules/services/x11/hardware/wacom.nix
+++ b/nixos/modules/services/x11/hardware/wacom.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 02416f5ef12..d73b58de6c0 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with pkgs.lib;
+{ config, lib, pkgs, ... }:
+with lib;
 let
   cfg = config.services.redshift;
 
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index f16a424b457..bdc23c0acd1 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -5,9 +5,9 @@
 # not, a X server (Xvfb) is started for that user.  The Xvfb instances
 # persist across VNC sessions.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix
index 1c61419a44c..9b2f042a87a 100644
--- a/nixos/modules/services/x11/window-managers/awesome.nix
+++ b/nixos/modules/services/x11/window-managers/awesome.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
index 209401f2646..ffd71e5f91e 100644
--- a/nixos/modules/services/x11/window-managers/compiz.nix
+++ b/nixos/modules/services/x11/window-managers/compiz.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 1c10333462c..f27ba366141 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.xserver.windowManager;
diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
index 9480abba43b..6cda910b6b3 100644
--- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix
+++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.xserver.windowManager.herbstluftwm;
diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index e53d86187ae..e85c3bce591 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -1,6 +1,6 @@
-{ pkgs, config, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.services.xserver.windowManager.i3;
diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix
index b7da4051c14..36028da453a 100644
--- a/nixos/modules/services/x11/window-managers/icewm.nix
+++ b/nixos/modules/services/x11/window-managers/icewm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 712e2038594..d13cbcfe40e 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix
index d80ffe4942f..684b34c2f24 100644
--- a/nixos/modules/services/x11/window-managers/twm.nix
+++ b/nixos/modules/services/x11/window-managers/twm.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix
index b61521274fb..75f6fdfe3bc 100644
--- a/nixos/modules/services/x11/window-managers/wmii.nix
+++ b/nixos/modules/services/x11/window-managers/wmii.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix
index 44c1d533c3a..196f3beb41e 100644
--- a/nixos/modules/services/x11/xfs.nix
+++ b/nixos/modules/services/x11/xfs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 2985e55e787..1f02bfd6ef3 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, pkgs_i686, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 1545bcb8a1f..41fe7d309a5 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -1,7 +1,7 @@
 # generate the script used to activate the configuration.
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/activation/no-clone.nix b/nixos/modules/system/activation/no-clone.nix
index c9ab691ce47..7f458443526 100644
--- a/nixos/modules/system/activation/no-clone.nix
+++ b/nixos/modules/system/activation/no-clone.nix
@@ -1,6 +1,6 @@
-{pkgs, ...}:
+{ lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   boot.loader.grub.device = mkOverride 0 "nodev";
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d9891f434cc..a4a0d14df6a 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, modules, baseModules, ... }:
+{ config, lib, pkgs, modules, baseModules, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
@@ -11,7 +11,7 @@ let
   # you can provide an easy way to boot the same configuration
   # as you use, but with another kernel
   # !!! fix this
-  cloner = inheritParent: list: with pkgs.lib;
+  cloner = inheritParent: list:
     map (childConfig:
       (import ../../../lib/eval-config.nix {
         inherit baseModules;
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4cfd8a0b618..cff7c08579f 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/loader/efi.nix b/nixos/modules/system/boot/loader/efi.nix
index 7e739173f9a..241cfc7e836 100644
--- a/nixos/modules/system/boot/loader/efi.nix
+++ b/nixos/modules/system/boot/loader/efi.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options.boot.loader.efi = {
diff --git a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
index 9855c8c19dd..4b5e84f53c1 100644
--- a/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
+++ b/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index ef6ff71ed77..d7f2319975c 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index afe194e672a..94e5a14174b 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -1,8 +1,8 @@
 # This module adds Memtest86+ to the GRUB boot menu.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   memtest86 = pkgs.memtest86plus;
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 7edc3077637..19c613a7c94 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   cfg = config.boot.loader.gummiboot;
diff --git a/nixos/modules/system/boot/loader/init-script/init-script.nix b/nixos/modules/system/boot/loader/init-script/init-script.nix
index 4b0fcd85b4b..3b33d42b4ae 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script.nix
+++ b/nixos/modules/system/boot/loader/init-script/init-script.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index 5bc856c3df0..d3f32418a64 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 117c526fcd3..c923cc49c44 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   luks = config.boot.initrd.luks;
diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix
index f694fd29dd0..7b214cd1e1f 100644
--- a/nixos/modules/system/boot/modprobe.nix
+++ b/nixos/modules/system/boot/modprobe.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index 44cadcd64a7..68bc936c5b0 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 8ed3aecb691..f69e6cfe54c 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -3,9 +3,9 @@
 # the modules necessary to mount the root file system, then calls the
 # init in the root file system to start the second boot stage.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index aa0d7e0c138..2616c8649d5 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 95837644e5c..20ea0ba874d 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -1,6 +1,6 @@
-{ config, pkgs }:
+{ config, lib }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f5cb6507e72..3582694a181 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -1,8 +1,8 @@
-{ config, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 
-with pkgs.lib;
+with lib;
 with utils;
-with import ./systemd-unit-options.nix { inherit config pkgs; };
+with import ./systemd-unit-options.nix { inherit config lib; };
 
 let
 
diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index e9c03df2ba3..22d55a9e246 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -1,8 +1,8 @@
 # Management of static files in /etc.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix
index aa5c8dfe64b..1ad4885edf5 100644
--- a/nixos/modules/system/upstart/upstart.nix
+++ b/nixos/modules/system/upstart/upstart.nix
@@ -1,7 +1,7 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
-with import ../boot/systemd-unit-options.nix { inherit config pkgs; };
+with lib;
+with import ../boot/systemd-unit-options.nix { inherit config lib; };
 
 let
 
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 705ec93a136..3df9b58c524 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   ###### interface
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index f9b40b8366a..954d0b0781f 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 
-with pkgs.lib;
+with lib;
 with utils;
 
 let
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index d95a32e2e3f..d0a2ac645e0 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 2b720a93b89..e8c3d8ab56d 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix
index f8c6a700004..a3bfb3fed8e 100644
--- a/nixos/modules/tasks/filesystems/reiserfs.nix
+++ b/nixos/modules/tasks/filesystems/reiserfs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix
index 5ca72f142b7..4cfe6e208f7 100644
--- a/nixos/modules/tasks/filesystems/vfat.nix
+++ b/nixos/modules/tasks/filesystems/vfat.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
index 6800696a05a..5225b62a88c 100644
--- a/nixos/modules/tasks/filesystems/xfs.nix
+++ b/nixos/modules/tasks/filesystems/xfs.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 32e3da6a273..1d75a24692c 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 #
 # todo:
 #   - crontab for scrubs, etc
@@ -6,7 +6,7 @@
 #   - /etc/zfs/zpool.cache handling
 
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 1083fb784fc..df4737305da 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 548685377a9..a33b571d437 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
index 071a8086598..a74023dec21 100644
--- a/nixos/modules/tasks/scsi-link-power-management.nix
+++ b/nixos/modules/tasks/scsi-link-power-management.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   ###### interface
diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix
index 6f17ed77dad..dfe8b430e04 100644
--- a/nixos/modules/testing/service-runner.nix
+++ b/nixos/modules/testing/service-runner.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 28494e1c7b2..7b4e5a8cac0 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -1,9 +1,9 @@
 # This module allows the test driver to connect to the virtual machine
 # via a root shell attached to port 514.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let kernel = config.boot.kernelPackages.kernel; in
 
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 99d6f927ef0..18b18dd4b23 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports = [ ../profiles/headless.nix ./ec2-data.nix ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index c53bd7d3509..51402f3e32d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 5133a98cd96..246d3506531 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -2,9 +2,9 @@
 # host name of virtual machines running on Amazon EC2, Eucalyptus and
 # OpenStack Compute (Nova).
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   options = {
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 5fca115b819..34b8b0e9c1c 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 let
   diskSize = "100G";
 in
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 6d36fd4caa0..d7d700d8841 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -1,8 +1,8 @@
 # Systemd services for libvirtd.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index d7e8c7339b6..f04b2b3e74e 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -59,9 +59,9 @@ sub writeNixOSConfig {
     my ($nixosConfigFile) = @_;
 
     my $nixosConfig = <<EOF;
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 { boot.isContainer = true;
   security.initialRootPassword = mkDefault "!";
diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
index 5c9481b7127..2523dacc0b5 100644
--- a/nixos/modules/virtualisation/nova-image.nix
+++ b/nixos/modules/virtualisation/nova-image.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix ./ec2-data.nix ];
diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
index e0d25183574..8795b5b52d5 100644
--- a/nixos/modules/virtualisation/nova.nix
+++ b/nixos/modules/virtualisation/nova.nix
@@ -1,8 +1,8 @@
 # Module for Nova, a.k.a. OpenStack Compute.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a866b513f0f..7662427854e 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -7,9 +7,9 @@
 # the VM in the host.  On the other hand, the root filesystem is a
 # read/writable disk image persistent across VM reboots.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index b06ae94438e..96354f1d81d 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -1,8 +1,8 @@
 # Module for VirtualBox guests.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 8323325dabf..3247881784e 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   system.build.virtualBoxImage =
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 40f6929be4f..566059472c9 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -1,8 +1,8 @@
 # Xen hypervisor (Dom0) support.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 

From fd900f2f8a120d0c092d599b4a66370bd3688694 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 14 Apr 2014 17:19:38 +0200
Subject: [PATCH 0124/2033] gnome3: add gtk3 to system packages for
 gtk-update-icon-cache

Updating the icon-cache lets gnome-shell show app icons in the activity
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 6b7818519cf..8601e2bc515 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -75,10 +75,11 @@ in {
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${pkgs.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
-      [ gnome3.dconf
-        pkgs.desktop_file_utils
+      [ pkgs.desktop_file_utils
         pkgs.glib_networking
+        pkgs.gtk3 # for gtk-update-icon-cache
         pkgs.ibus
+        gnome3.dconf
         gnome3.gnome-backgrounds
         gnome3.gnome_control_center
         gnome3.gnome_icon_theme

From e1a1146690736c106c047be9e5ab246e3b9f306b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 19:07:35 +0200
Subject: [PATCH 0125/2033] Update section on writing tests

---
 nixos/doc/manual/development.xml | 389 +++++++++++++++++++++++--------
 nixos/doc/manual/manual.xml      |   2 +-
 2 files changed, 296 insertions(+), 95 deletions(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index 88f3dc0d9c1..a93b4b163bd 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -1,5 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink">
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="ch-development">
 
 <title>Development</title>
 
@@ -9,7 +10,7 @@ NixOS.</para>
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-getting-sources">
 
 <title>Getting the sources</title>
 
@@ -74,7 +75,7 @@ in <filename>nixos/</filename> as packages.</para>
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-writing-modules">
 
 <title>Writing NixOS modules</title>
 
@@ -579,7 +580,7 @@ systemd.services.dhcpcd =
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-building-parts">
 
 <title>Building specific parts of NixOS</title>
 
@@ -692,7 +693,7 @@ $ systemctl start tmp-httpd.service
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-building-cd">
 
 <title>Building your own NixOS CD</title>
 
@@ -748,57 +749,310 @@ $ ./result/bin/nixos-install</screen>
 
 <!--===============================================================-->
 
-<section><title>Whole-system testing using virtual machines</title>
+<section xml:id="sec-nixos-tests">
 
-<para>Complete NixOS GNU/Linux systems can be tested in virtual
-machines (VMs).  This makes it possible to test a system upgrade or
-configuration change before rebooting into it, using the
-<command>nixos-rebuild build-vm</command> or <command>nixos-rebuild
-build-vm-with-bootloader</command> command.</para>
+<title>NixOS tests</title>
 
-<!-- The following is adapted from
-     http://wiki.nixos.org/wiki/NixOS_VM_tests, by Eelco Dolstra. -->
-<para>The <filename>tests/</filename> directory in the NixOS source
-tree contains several <emphasis>whole-system unit tests</emphasis>.
-These tests can be run<footnote><para>NixOS tests can be run both from
-NixOS and from a non-NixOS GNU/Linux distribution, provided the Nix
-package manager is installed.</para></footnote> from the NixOS source
-tree as follows:
+<para>When you add some feature to NixOS, you should write a test for
+it. NixOS tests are kept in the directory <filename
+xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
+and are executed (using Nix) by a testing framework that automatically
+starts one or more virtual machines containing the NixOS system(s)
+required for the test.</para>
+
+<simplesect><title>Writing tests</title>
+
+<para>A NixOS test is a Nix expression that has the following structure:
+
+<programlisting>
+import ./make-test.nix {
+
+  # Either the configuration of a single machine:
+  machine =
+    { config, pkgs, ... }:
+    { <replaceable>configuration…</replaceable>
+    };
+
+  # Or a set of machines:
+  nodes =
+    { <replaceable>machine1</replaceable> =
+        { config, pkgs, ... }: { <replaceable>…</replaceable> };
+      <replaceable>machine2</replaceable> =
+        { config, pkgs, ... }: { <replaceable>…</replaceable> };
+      …
+    };
+
+  testScript =
+    ''
+      <replaceable>Perl code…</replaceable>
+    '';
+}
+</programlisting>
+
+The attribute <literal>testScript</literal> is a bit of Perl code that
+executes the test (described below). During the test, it will start
+one or more virtual machines, the configuration of which is described
+by the attribute <literal>machine</literal> (if you need only one
+machine in your test) or by the attribute <literal>nodes</literal> (if
+you need multiple machines). For instance, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
+only needs a single machine to test whether users can log in on the
+virtual console, whether device ownership is correctly maintained when
+switching between consoles, and so on. On the other hand, <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
+which tests NFS client and server functionality in the Linux kernel
+(including whether locks are maintained across server crashes),
+requires three machines: a server and two clients.</para>
+
+<para>There are a few special NixOS configuration options for test
+VMs:
+
+<!-- FIXME: would be nice to generate this automatically. -->
+
+<variablelist>
+
+  <varlistentry>
+    <term><option>virtualisation.memorySize</option></term>
+    <listitem><para>The memory of the VM in
+    megabytes.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>virtualisation.vlans</option></term>
+    <listitem><para>The virtual networks to which the VM is
+    connected. See <filename
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
+    for an example.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>virtualisation.writableStore</option></term>
+    <listitem><para>By default, the Nix store in the VM is not
+    writable. If you enable this option, a writable union file system
+    is mounted on top of the Nix store to make it appear
+    writable. This is necessary for tests that run Nix operations that
+    modify the store.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+For more options, see the module <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.</para>
+
+<para>The test script is a sequence of Perl statements that perform
+various actions, such as starting VMs, executing commands in the VMs,
+and so on. Each virtual machine is represented as an object stored in
+the variable <literal>$<replaceable>name</replaceable></literal>,
+where <replaceable>name</replaceable> is the identifier of the machine
+(which is just <literal>machine</literal> if you didn’t specify
+multiple machines using the <literal>nodes</literal> attribute). For
+instance, the following starts the machine, waits until it has
+finished booting, then executes a command and checks that the output
+is more-or-less correct:
+
+<programlisting>
+$machine->start;
+$machine->waitForUnit("default.target");
+$machine->succeed("uname") =~ /Linux/;
+</programlisting>
+
+The first line is actually unnecessary; machines are implicitly
+started when you first execute an action on them (such as
+<literal>waitForUnit</literal> or <literal>succeed</literal>). If you
+have multiple machines, you can speed up the test by starting them in
+parallel:
+
+<programlisting>
+startAll;
+</programlisting>
+
+</para>
+
+<para>The following methods are available on machine objects:
+
+<variablelist>
+
+  <varlistentry>
+    <term><methodname>start</methodname></term>
+    <listitem><para>Start the virtual machine. This method is
+    asynchronous — it does not wait for the machine to finish
+    booting.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>shutdown</methodname></term>
+    <listitem><para>Shut down the machine, waiting for the VM to
+    exit.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>crash</methodname></term>
+    <listitem><para>Simulate a sudden power failure, by telling the VM
+    to exit immediately.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>block</methodname></term>
+    <listitem><para>Simulate unplugging the Ethernet cable that
+    connects the machine to the other machines.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>unblock</methodname></term>
+    <listitem><para>Undo the effect of
+    <methodname>block</methodname>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>screenshot</methodname></term>
+    <listitem><para>Take a picture of the display of the virtual
+    machine, in PNG format. The screenshot is linked from the HTML
+    log.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendMonitorCommand</methodname></term>
+    <listitem><para>Send a command to the QEMU monitor. This is rarely
+    used, but allows doing stuff such as attaching virtual USB disks
+    to a running machine.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendKeys</methodname></term>
+    <listitem><para>Simulate pressing keys on the virtual keyboard,
+    e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>sendChars</methodname></term>
+    <listitem><para>Simulate typing a sequence of characters on the
+    virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal>
+    will type the string <literal>foobar</literal> followed by the
+    Enter key.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>execute</methodname></term>
+    <listitem><para>Execute a shell command, returning a list
+    <literal>(<replaceable>status</replaceable>,
+    <replaceable>stdout</replaceable>)</literal>.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>succeed</methodname></term>
+    <listitem><para>Execute a shell command, raising an exception if
+    the exit status is not zero, otherwise returning the standard
+    output.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>fail</methodname></term>
+    <listitem><para>Like <methodname>succeed</methodname>, but raising
+    an exception if the command returns a zero status.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitUntilSucceeds</methodname></term>
+    <listitem><para>Repeat a shell command with 1-second intervals
+    until it succeeds.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitUntilFails</methodname></term>
+    <listitem><para>Repeat a shell command with 1-second intervals
+    until it fails.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForUnit</methodname></term>
+    <listitem><para>Wait until the specified systemd unit has reached
+    the “active” state.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForFile</methodname></term>
+    <listitem><para>Wait until the specified file
+    exists.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForOpenPort</methodname></term>
+    <listitem><para>Wait until a process is listening on the given TCP
+    port (on <literal>localhost</literal>, at least).</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForClosedPort</methodname></term>
+    <listitem><para>Wait until nobody is listening on the given TCP
+    port.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForX</methodname></term>
+    <listitem><para>Wait until the X11 server is accepting
+    connections.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><methodname>waitForWindow</methodname></term>
+    <listitem><para>Wait until an X11 window has appeared whose name
+    matches the given regular expression, e.g.,
+    <literal>waitForWindow(qr/Terminal/)</literal>.</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</para>
+
+</simplesect>
+
+
+<simplesect><title>Running tests</title>
+
+<para>You can run tests using <command>nix-build</command>. For
+example, to run the test <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
+you just do:
 
 <screen>
-$ nix-build tests/ -A nfs.test
+$ nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
 </screen>
 
-This performs an automated test of the NFS client and server
-functionality in the Linux kernel, including file locking semantics
-(e.g., whether locks are maintained across server crashes).  It will
-first build or download all the dependencies of the test (e.g., all
-packages needed to run a NixOS VM). The test is defined in <link
-xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
-<filename>tests/nfs.nix</filename></link>.  If the test succeeds,
-<command>nix-build</command> will place a symlink
-<filename>./result</filename> in the current directory pointing at the
-location in the Nix store of the test results (e.g., screenshots, test
-reports, and so on).  In particular, a pretty-printed log of the test
-is written to <filename>log.html</filename>, which can be viewed using
-a web browser like this:
+or, if you don’t want to rely on <envar>NIX_PATH</envar>:
+
+<screen>
+$ cd /my/nixpkgs/nixos/tests
+$ nix-build login.nix
+…
+running the VM test script
+machine: QEMU running (pid 8841)
+…
+6 out of 6 tests succeeded
+</screen>
+
+After building/downloading all required dependencies, this will
+perform a build that starts a QEMU/KVM virtual machine containing a
+NixOS system. The virtual machine mounts the Nix store of the host;
+this makes VM creation very fast, as no disk image needs to be
+created. Afterwards, you can view a pretty-printed log of the test:
 
 <screen>
 $ firefox result/log.html
 </screen>
+
 </para>
 
 <para>It is also possible to run the test environment interactively,
 allowing you to experiment with the VMs.  For example:
 
 <screen>
-$ nix-build tests/ -A nfs.driver
+$ nix-build login.nix -A driver
 $ ./result/bin/nixos-run-vms
 </screen>
 
-The script <command>nixos-run-vms</command> starts the three virtual
-machines defined in the NFS test using QEMU/KVM.  The root file system
-of the VMs is created on the fly and kept across VM restarts in
+The script <command>nixos-run-vms</command> starts the virtual
+machines defined by test.  The root file system of the VMs is created
+on the fly and kept across VM restarts in
 <filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
 
 <para>Finally, the test itself can be run interactively.  This is
@@ -811,17 +1065,11 @@ starting VDE switch for network 1
 &gt;
 </screen>
 
-Perl statements can now be typed in to start or manipulate the VMs:
+You can then take any Perl statement, e.g.
 
 <screen>
-&gt; startAll;
-(the VMs start booting)
-&gt; $server-&gt;waitForJob("nfs-kernel-nfsd");
-&gt; $client1-&gt;succeed("flock -x /data/lock -c 'sleep 100000' &amp;");
-&gt; $client2-&gt;fail("flock -n -s /data/lock true");
-&gt; $client1-&gt;shutdown;
-(this releases client1's lock)
-&gt; $client2-&gt;succeed("flock -n -s /data/lock true");
+&gt; startAll
+&gt; $machine->succeed("touch /tmp/foo")
 </screen>
 
 The function <command>testScript</command> executes the entire test
@@ -829,54 +1077,7 @@ script and drops you back into the test driver command line upon its
 completion.  This allows you to inspect the state of the VMs after the
 test (e.g. to debug the test script).</para>
 
-<para>This and other tests are continuously run on <link
-xlink:href="http://hydra.nixos.org/jobset/nixos/trunk">the Hydra
-instance at <literal>nixos.org</literal></link>, which allows
-developers to be notified of any regressions introduced by a NixOS or
-Nixpkgs change.</para>
-
-<para>The actual Nix programming interface to VM testing is in NixOS,
-under <link
-xlink:href="https://nixos.org/repos/nix/nixos/trunk/lib/testing.nix">
-<filename>lib/testing.nix</filename></link>.  This file defines a
-function which takes an attribute set containing a
-<literal>nixpkgs</literal> attribute (the path to a Nixpkgs checkout),
-and a <literal>system</literal> attribute (the system type).  It
-returns an attribute set containing several utility functions, among
-which the main entry point is <literal>makeTest</literal>.
-</para>
-
-<para>The <literal>makeTest</literal> function takes a function
-similar to that found in <link
-xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
-<filename>tests/nfs.nix</filename></link> (discussed above).  It
-returns an attribute set containing (among others):
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>test</varname></term>
-    <listitem><para>A derivation containing the test log as an HTML
-    file, as seen above, suitable for presentation in the Hydra
-    continuous build system.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>report</varname></term>
-    <listitem><para>A derivation containing a code coverage report, with
-    meta-data suitable for Hydra.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>driver</varname></term>
-    <listitem><para>A derivation containing scripts to run the VM test or
-    interact with the VM network interactively, as seen above.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
+</simplesect>
 
 </section>
 
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 5753a8ff9e7..8d7c28dee73 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -60,7 +60,7 @@
   <xi:include href="release-notes.xml" />
 
   <appendix xml:id="ch-options">
-    <title>List of options</title>
+    <title>Configuration options</title>
     <xi:include href="options-db.xml" />
   </appendix>
 

From 7ce743b4226e44067e1562eac125d267dcce04f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 19:27:26 +0200
Subject: [PATCH 0126/2033] Manual: Add some IDs

---
 nixos/doc/manual/configuration.xml   | 32 +++++++++++++++-------------
 nixos/doc/manual/installation.xml    |  8 +++----
 nixos/doc/manual/release-notes.xml   |  2 +-
 nixos/doc/manual/running.xml         | 12 +++++------
 nixos/doc/manual/troubleshooting.xml | 13 +++++------
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 246ab11587a..1dff9d2f21e 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -237,7 +237,7 @@ postgresql.package = pkgs.postgresql90;
 </section>
 
 
-<section><title>Abstractions</title>
+<section xml:id="sec-module-abstractions"><title>Abstractions</title>
 
 <para>If you find yourself repeating yourself over and over, it’s time
 to abstract.  Take, for instance, this Apache HTTP Server configuration:
@@ -399,7 +399,7 @@ of an expression to be spliced into a string.</para>
 </section>
 
 
-<section><title>Modularity</title>
+<section xml:id="sec-modularity"><title>Modularity</title>
 
 <para>The NixOS configuration mechanism is modular.  If your
 <filename>configuration.nix</filename> becomes too big, you can split
@@ -538,7 +538,7 @@ nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
 </section>
 
 
-<section><title>Syntax summary</title>
+<section xml:id="sec-nix-syntax-summary"><title>Syntax summary</title>
 
 <para>Below is a summary of the most important syntactic constructs in
 the Nix expression language.  It’s not complete.  In particular, there
@@ -730,7 +730,7 @@ manual</link> for the rest.</para>
 
 <!--===============================================================-->
 
-<section><title>Package management</title>
+<section xml:id="sec-package-management"><title>Package management</title>
 
 <para>This section describes how to add additional packages to your
 system.  NixOS has two distinct styles of package management:
@@ -1183,7 +1183,7 @@ fileSystems."/".device = "/dev/mapper/crypted";
 
 <!--===============================================================-->
 
-<section><title>X Window System</title>
+<section xml:id="sec-x11"><title>X Window System</title>
 
 <para>The X Window System (X11) provides the basis of NixOS’ graphical
 user interface.  It can be enabled as follows:
@@ -1275,9 +1275,9 @@ services.xserver.synaptics.twoFingerScroll = true;
 
 <!--===============================================================-->
 
-<section><title>Networking</title>
+<section xml:id="sec-networking"><title>Networking</title>
 
-<section><title>Secure shell access</title>
+<section xml:id="sec-ssh"><title>Secure shell access</title>
 
 <para>Secure shell (SSH) access to your machine can be enabled by
 setting:
@@ -1305,7 +1305,7 @@ users.extraUsers.alice.openssh.authorizedKeys.keys =
 </section>
 
 
-<section><title>IPv4 configuration</title>
+<section xml:id="sec-ipv4"><title>IPv4 configuration</title>
 
 <para>By default, NixOS uses DHCP (specifically,
 <command>dhcpcd</command>) to automatically configure network
@@ -1348,7 +1348,7 @@ provide the host name.</para>
 </section>
 
 
-<section><title>IPv6 configuration</title>
+<section xml:id="sec-ipv6"><title>IPv6 configuration</title>
 
 <para>IPv6 is enabled by default.  Stateless address autoconfiguration
 is used to automatically assign IPv6 addresses to all interfaces.  You
@@ -1363,17 +1363,19 @@ networking.enableIPv6 = false;
 </section>
 
 
-<section><title>Firewall</title>
+<section xml:id="sec-firewall"><title>Firewall</title>
 
 <para>NixOS has a simple stateful firewall that blocks incoming
 connections and other unexpected packets.  The firewall applies to
-both IPv4 and IPv6 traffic.  It can be enabled as follows:
+both IPv4 and IPv6 traffic. It is enabled by default. It can be
+disabled as follows:
 
 <programlisting>
-networking.firewall.enable = true;
+networking.firewall.enable = false;
 </programlisting>
 
-You can open specific TCP ports to the outside world:
+If the firewall is enabled, you can open specific TCP ports to the
+outside world:
 
 <programlisting>
 networking.firewall.allowedTCPPorts = [ 80 443 ];
@@ -1395,7 +1397,7 @@ always allowed.)</para>
 </section>
 
 
-<section><title>Wireless networks</title>
+<section xml:id="sec-wireless"><title>Wireless networks</title>
 
 <para>
 NixOS will start wpa_supplicant for you if you enable this setting:
@@ -1456,7 +1458,7 @@ networking.localCommands =
 
 <!--===============================================================-->
 
-<section><title>Linux kernel</title>
+<section xml:id="sec-kernel-config"><title>Linux kernel</title>
 
 <para>You can override the Linux kernel and associated packages using
 the option <option>boot.kernelPackages</option>.  For instance, this
diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index f6b477ed69b..03540aa83aa 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -1,13 +1,13 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="installing-nixos">
+         xml:id="ch-installation">
 
 <title>Installing NixOS</title>
 
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-obtaining">
 
 <title>Obtaining NixOS</title>
 
@@ -51,7 +51,7 @@ running NixOS system through several other means:
 
 <!--===============================================================-->
 
-<section>
+<section xml:id="sec-installation">
 
 <title>Installation</title>
 
@@ -339,7 +339,7 @@ changes:
 
 <section>
 
-<title>Booting from a USB stick</title>
+<title xml:id="sec-booting-from-usb">Booting from a USB stick</title>
 
 <para>For systems withoua CD drive, the NixOS livecd can be booted from
 a usb stick. For non-UEFI installations,
diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 10815ba613a..7995497708e 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -5,7 +5,7 @@
 
 <!--==================================================================-->
 
-<section xml:id="sec-release-14.02">
+<section xml:id="sec-release-14.04">
 
 <title>Release 14.04 (“Baboon”, 2014/04/??)</title>
 
diff --git a/nixos/doc/manual/running.xml b/nixos/doc/manual/running.xml
index e50099707cc..e1a358df2aa 100644
--- a/nixos/doc/manual/running.xml
+++ b/nixos/doc/manual/running.xml
@@ -11,7 +11,7 @@ service manager.</para>
 
 <!--===============================================================-->
 
-<section><title>Service management</title>
+<section xml:id="sec-systemctl"><title>Service management</title>
 
 <para>In NixOS, all system services are started and monitored using
 the systemd program.  Systemd is the “init” process of the system
@@ -92,7 +92,7 @@ necessary).</para>
 
 <!--===============================================================-->
 
-<section><title>Rebooting and shutting down</title>
+<section xml:id="sec-rebooting"><title>Rebooting and shutting down</title>
 
 <para>The system can be shut down (and automatically powered off) by
 doing:
@@ -134,7 +134,7 @@ authentication.</para>
 
 <!--===============================================================-->
 
-<section><title>User sessions</title>
+<section xml:id="sec-user-sessions"><title>User sessions</title>
 
 <para>Systemd keeps track of all users who are logged into the system
 (e.g. on a virtual console or remotely via SSH).  The command
@@ -185,7 +185,7 @@ $ loginctl terminate-session c3
 
 <!--===============================================================-->
 
-<section><title>Control groups</title>
+<section xml:id="sec-cgroups"><title>Control groups</title>
 
 <para>To keep track of the processes in a running system, systemd uses
 <emphasis>control groups</emphasis> (cgroups).  A control group is a
@@ -258,7 +258,7 @@ usage.</para>
 
 <!--===============================================================-->
 
-<section><title>Logging</title>
+<section xml:id="sec-logging"><title>Logging</title>
 
 <para>System-wide logging is provided by systemd’s
 <emphasis>journal</emphasis>, which subsumes traditional logging
@@ -308,7 +308,7 @@ groups.  All users have a private journal that can be read using
 
 <!--===============================================================-->
 
-<section><title>Cleaning up the Nix store</title>
+<section xml:id="sec-nix-gc"><title>Cleaning up the Nix store</title>
 
 <para>Nix has a purely functional model, meaning that packages are
 never upgraded in place.  Instead new versions of packages end up in a
diff --git a/nixos/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml
index c6e0a3a7888..c7d65112b64 100644
--- a/nixos/doc/manual/troubleshooting.xml
+++ b/nixos/doc/manual/troubleshooting.xml
@@ -1,12 +1,13 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink">
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="ch-troubleshooting">
 
 <title>Troubleshooting</title>
 
 
 <!--===============================================================-->
 
-<section><title>Boot problems</title>
+<section xml:id="sec-boot-problems"><title>Boot problems</title>
 
 <para>If NixOS fails to boot, there are a number of kernel command
 line parameters that may help you to identify or fix the issue.  You
@@ -69,7 +70,7 @@ unless something is very wrong.)</para>
 
 <!--===============================================================-->
 
-<section><title>Maintenance mode</title>
+<section xml:id="sec-maintenance-mode"><title>Maintenance mode</title>
 
 <para>You can enter rescue mode by running:
 
@@ -85,7 +86,7 @@ just exit from the rescue shell.</para>
 
 <!--===============================================================-->
 
-<section><title>Rolling back configuration changes</title>
+<section xml:id="sec-rollback"><title>Rolling back configuration changes</title>
 
 <para>After running <command>nixos-rebuild</command> to switch to a
 new configuration, you may find that the new configuration doesn’t
@@ -131,7 +132,7 @@ lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link ->
 
 <!--===============================================================-->
 
-<section><title>Nix store corruption</title>
+<section xml:id="sec-nix-store-corruption"><title>Nix store corruption</title>
 
 <para>After a system crash, it’s possible for files in the Nix store
 to become corrupted.  (For instance, the Ext4 file system has the
@@ -166,7 +167,7 @@ binary cache; otherwise, they cannot be repaired.</para>
 
 <!--===============================================================-->
 
-<section><title>Nix network issues</title>
+<section xml:id="sec-nix-network-issues"><title>Nix network issues</title>
 
 <para>Nix uses a so-called <emphasis>binary cache</emphasis> to
 optimise building a package from source into downloading it as a

From 86a89a41f8490f50d639aaff65ed8a03c69f1adf Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 12:56:52 -0500
Subject: [PATCH 0127/2033] Update mtr to 0.85, and allow building on any unix

---
 pkgs/tools/networking/mtr/default.nix  |  12 +-
 pkgs/tools/networking/mtr/edd425.patch | 218 +++++++++++++++++++++++++
 2 files changed, 225 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/networking/mtr/edd425.patch

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 45dcb087bd7..c463c94d610 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -10,10 +10,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="mtr";
-    version="0.82";
+    version="0.85";
     name="${baseName}-${version}";
     url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz";
-    hash="185nx4y6xn7vv6l3pbyc0ljmwfl4si4zszwad1jkbq1scb4mgd7k";
+    hash="1jqrz8mil3lraaqgc87dyvx8d4bf3vq232pfx9mksxnkbphp4qvd";
   };
 in
 rec {
@@ -25,9 +25,11 @@ rec {
   inherit (sourceInfo) name version;
   inherit buildInputs;
 
+  patches = [ ./edd425.patch ];
+
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
+  phaseNames = ["doConfigure" "doPatch" "doMakeInstall"];
+
   meta = {
     description = "A network diagnostics tool";
     maintainers = with a.lib.maintainers;
@@ -35,7 +37,7 @@ rec {
       raskin
     ];
     platforms = with a.lib.platforms;
-      linux;
+      unix;
     license = a.lib.licenses.gpl2;
   };
   passthru = {
diff --git a/pkgs/tools/networking/mtr/edd425.patch b/pkgs/tools/networking/mtr/edd425.patch
new file mode 100644
index 00000000000..b950cacd2e5
--- /dev/null
+++ b/pkgs/tools/networking/mtr/edd425.patch
@@ -0,0 +1,218 @@
+diff --git a/asn.c b/asn.c
+index eac8d5e..33622ca 100644
+--- a/asn.c
++++ b/asn.c
+@@ -16,6 +16,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include "config.h"
++
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -35,7 +37,6 @@
+ #include <sys/socket.h>
+ #include <search.h>
+ 
+-#include "config.h"
+ #include "mtr.h"
+ #include "asn.h"
+ 
+diff --git a/curses.c b/curses.c
+index eacc40d..b96daee 100644
+--- a/curses.c
++++ b/curses.c
+@@ -16,7 +16,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <strings.h>
+ #include <unistd.h>
+ 
+diff --git a/display.c b/display.c
+index aa369ee..3545467 100644
+--- a/display.c
++++ b/display.c
+@@ -16,7 +16,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+diff --git a/dns.c b/dns.c
+index e89fd4b..4076b71 100644
+--- a/dns.c
++++ b/dns.c
+@@ -22,7 +22,8 @@
+     Released under GPL, as above.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/select.h>
+diff --git a/getopt.c b/getopt.c
+index 3d43e26..e2f8758 100644
+--- a/getopt.c
++++ b/getopt.c
+@@ -27,7 +27,7 @@
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
+-#include <config.h>
++#include "config.h"
+ #endif
+ 
+ #if !defined (__STDC__) || !__STDC__
+diff --git a/getopt1.c b/getopt1.c
+index bccf8b2..0a2d405 100644
+--- a/getopt1.c
++++ b/getopt1.c
+@@ -16,7 +16,7 @@
+    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
+ #ifdef HAVE_CONFIG_H
+-#include <config.h>
++#include "config.h"
+ #endif
+ 
+ #include "getopt.h"
+diff --git a/gtk.c b/gtk.c
+index 38ed507..7faa132 100644
+--- a/gtk.c
++++ b/gtk.c
+@@ -17,7 +17,7 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff --git a/mtr.c b/mtr.c
+index 50eb464..416b744 100644
+--- a/mtr.c
++++ b/mtr.c
+@@ -16,19 +16,21 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#include "config.h"
++
+ #include <sys/types.h>
+-#include <config.h>
+-#include <netdb.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <netinet/in.h>
+-#include <sys/socket.h>
+ #include <unistd.h>
+-#include <strings.h>
+-#include <time.h>
+ #include <errno.h>
+ #include <string.h>
++#include <strings.h>
++
++#include <netdb.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
++#include <time.h>
+ #include <ctype.h>
+ #include <assert.h>
+ #include <fcntl.h>
+diff --git a/net.c b/net.c
+index 1c8d28f..d648804 100644
+--- a/net.c
++++ b/net.c
+@@ -16,7 +16,7 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
+ 
+ #if defined(HAVE_SYS_XTI_H)
+ #include <sys/xti.h>
+@@ -1562,4 +1562,4 @@ void net_harvest_fds(void)
+   net_add_fds(&writefd, &maxfd);
+   select(maxfd, NULL, &writefd, NULL, &tv);
+   net_process_fds(&writefd);
+-}
+\ No newline at end of file
++}
+diff --git a/raw.c b/raw.c
+index 8b0df47..0e1f4f4 100644
+--- a/raw.c
++++ b/raw.c
+@@ -18,7 +18,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -27,7 +28,6 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
+-
+ #include "mtr.h"
+ #include "raw.h"
+ #include "net.h"
+diff --git a/report.c b/report.c
+index 71040e4..39b2fb2 100644
+--- a/report.c
++++ b/report.c
+@@ -16,7 +16,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <netdb.h>
+diff --git a/select.c b/select.c
+index 31bfd5f..7553675 100644
+--- a/select.c
++++ b/select.c
+@@ -16,7 +16,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <stdlib.h>
+diff --git a/split.c b/split.c
+index 642353e..5ead235 100644
+--- a/split.c
++++ b/split.c
+@@ -20,7 +20,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
+-#include <config.h>
++#include "config.h"
++
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>

From 269bd7ef83670738270f655520c01af536febf98 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 21:03:43 +0200
Subject: [PATCH 0128/2033] Add missing file

---
 nixos/tests/make-test.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 nixos/tests/make-test.nix

diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix
new file mode 100644
index 00000000000..285ca5b71d6
--- /dev/null
+++ b/nixos/tests/make-test.nix
@@ -0,0 +1,5 @@
+f: { system ? builtins.currentSystem, ... } @ args:
+
+with import ../lib/testing.nix { inherit system; };
+
+makeTest (if builtins.isFunction f then f (args // { inherit pkgs; }) else f)

From 73b4b287bbf01177fdc29e8c858f47a5f2212907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Apr 2014 21:06:04 +0200
Subject: [PATCH 0129/2033] linux: Don't use underscores in the timestamp

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 47f5c034c74..30e2a37cb91 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -100,12 +100,13 @@ let
         ln -sv ${configfile} $buildRoot/.config
         make $makeFlags "''${makeFlagsArray[@]}" oldconfig
         runHook postConfigure
+
+        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970")
       '';
 
       buildFlags = [
         "KBUILD_BUILD_VERSION=1-NixOS"
-        "KBUILD_BUILD_TIMESTAMP=Thu_Jan__1_00:00:01_UTC_1970"
-	platform.kernelTarget
+        platform.kernelTarget
       ] ++ optional isModular "modules";
 
       installFlags = [

From 557dff54aacdfd34f6f39d5e1d6c7354dba390f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 10 Apr 2014 20:22:53 +0200
Subject: [PATCH 0130/2033] nixos opengl: add s2tc to mesa drivers by default

Close #2200. Thanks to @cpages for suggesting and testing this.
---
 nixos/modules/hardware/opengl.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 603012cb109..06ecddab236 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -39,8 +39,7 @@ in {
       default = false;
       description = ''
         Make S3TC(S3 Texture Compression) via libtxc_dxtn available
-        to OpenGL drivers. It is essential for many games to work
-        with FOSS GPU drivers.
+        to OpenGL drivers instead of the patent-free S2TC replacement.
 
         Using this library may require a patent license depending on your location.
       '';
@@ -89,17 +88,24 @@ in {
         else if elem "ati_unfree" cfg.videoDrivers then
           "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
         else
+          let
+            lib_fun = p: p.buildEnv {
+              name = "mesa-drivers+txc-${p.mesa_drivers.version}";
+              paths = [
+                p.mesa_drivers
+                (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
+              ];
+            };
+          in
           ''
-            ${optionalString cfg.driSupport "ln -sf ${pkgs.mesa_drivers} /run/opengl-driver"}
+            ${optionalString cfg.driSupport "ln -sf ${lib_fun pkgs} /run/opengl-driver"}
             ${optionalString cfg.driSupport32Bit
-              "ln -sf ${pkgs_i686.mesa_drivers} /run/opengl-driver-32"}
+              "ln -sf ${lib_fun pkgs_i686} /run/opengl-driver-32"}
           ''
       );
 
     environment.variables.LD_LIBRARY_PATH =
-      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
-      ++ optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
-      ++ optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
+      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
 
     boot.extraModulePackages =
       optional (elem "nvidia" cfg.videoDrivers) kernelPackages.nvidia_x11 ++

From 8340454544b5f6502056d9ddbf919a6395164033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Apr 2014 21:02:27 +0200
Subject: [PATCH 0131/2033] mesa: have all output on /run/opengl-driver{,-32}

Fixes #2242 in a different way (cleaner, I hope).
---
 nixos/modules/hardware/opengl.nix           | 1 +
 pkgs/development/libraries/mesa/default.nix | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 06ecddab236..485ac008dd8 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -93,6 +93,7 @@ in {
               name = "mesa-drivers+txc-${p.mesa_drivers.version}";
               paths = [
                 p.mesa_drivers
+                p.mesa_noglu # mainly for libGL
                 (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
               ];
             };
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b7de29109dc..9452ae0a7c2 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -151,11 +151,6 @@ stdenv.mkDerivation {
     substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
   '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
     mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
-  '' + /* add libGL* links from /run/opengl-driver */ ''
-    (
-      cd "$drivers/lib"
-      cp -s "$out"/lib/*.so .
-    )
   '';
   #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM
 

From 84dae6fe2862e08775363099a3b584d90dd93b25 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 14:24:24 -0500
Subject: [PATCH 0132/2033] gsasl: fix build on Darwin (close #2260, fixes
 #2259)

@vcunat rewrote with "more standard" optional functions.
---
 pkgs/development/libraries/gsasl/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index a4a3a01299c..70b4ab8639d 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii";
   };
 
-  buildInputs = [ gss libidn ];
+  buildInputs = [ libidn ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) gss;
+
+  configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit";
 
   doCheck = true;
 

From f9c2f684e816df1241b66afddd14341cac68dda3 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 14:39:23 -0500
Subject: [PATCH 0133/2033] Allow lua5 to build as a dylib on Darwin

---
 .../interpreters/lua-5/5.1.darwin.patch       | 52 +++++++++++++++++++
 pkgs/development/interpreters/lua-5/5.1.nix   |  9 +++-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/lua-5/5.1.darwin.patch

diff --git a/pkgs/development/interpreters/lua-5/5.1.darwin.patch b/pkgs/development/interpreters/lua-5/5.1.darwin.patch
new file mode 100644
index 00000000000..b7754da79ba
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.1.darwin.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index 209a132..9387b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.5.1.5.dylib
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
+@@ -64,6 +64,8 @@ install: dummy
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
++	ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib
++	ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib
+
+ ranlib:
+ 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+diff --git a/src/Makefile b/src/Makefile
+index e0d4c9f..4477d7b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -22,7 +22,7 @@ MYLIBS=
+
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+-LUA_A=	liblua.a
++LUA_A=	liblua.5.1.5.dylib
+ CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
+ 	lundump.o lvm.o lzio.o
+@@ -48,11 +48,13 @@ o:	$(ALL_O)
+ a:	$(ALL_A)
+
+ $(LUA_A): $(CORE_O) $(LIB_O)
+-	$(AR) $@ $(CORE_O) $(LIB_O)	# DLL needs all object files
+-	$(RANLIB) $@
++	$(CC) -dynamiclib -install_name $(out)/lib/liblua.5.1.dylib \
++		-compatibility_version 5.1 -current_version 5.1.5 \
++		-o liblua.5.1.5.dylib $^
+
+ $(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	$(CC) -fno-common $(MYLDFLAGS) \
++		-o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS)
+
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 27b1589d27f..9a57a034ad1 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -18,9 +18,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline ];
 
-  patches = [ dsoPatch ];
+  patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ];
 
-  configurePhase = ''
+  configurePhase = 
+    if stdenv.isDarwin
+    then ''
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDLAGS="" )
+    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' )
+  '' else ''
     makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" )
     installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' )
   '';

From cfe42425c3f2208e3a075a21a4bbee5a2949f4af Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 14:53:15 -0500
Subject: [PATCH 0134/2033] On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git
 builds

---
 .../version-management/git-and-tools/git/default.nix          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 649b0a7e4a2..a7be9b5798a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -36,7 +36,9 @@ stdenv.mkDerivation {
 
   makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
       + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
-      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "");
+      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
+      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else "");
+
 
   # FIXME: "make check" requires Sparse; the Makefile must be tweaked
   # so that `SPARSE_FLAGS' corresponds to the current architecture...

From 5846a07226dec78e96a48684e6f102f8235dd338 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 14 Apr 2014 23:15:12 +0200
Subject: [PATCH 0135/2033] gnome-shell: maybe fix the background corruption
 bug

---
 .../gnome-3/core/gnome-shell/default.nix      |   2 +
 .../fix_background_corruption.patch           | 147 ++++++++++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index be25c615d97..554b09a1e59 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
+  patches = [ ./fix_background_corruption.patch ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch
new file mode 100644
index 00000000000..9cb041bcce2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch
@@ -0,0 +1,147 @@
+commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d
+Author: Jasper St. Pierre <jstpierre@mecheye.net>
+Date:   Thu Nov 7 17:14:47 2013 -0500
+
+    layout: Fix several issues with the background management code
+    
+    If monitor-changed fires at startup, it will destroy all of the
+    backgrounds, but since this._isStartup is true, won't recreate any
+    of them. Additionally, since _bgManagers is indexed by monitor index,
+    if the primary index is not 0, it could become a sparse array (e.g.
+    [undefined, undefined, primaryBackground]), and our for loop will
+    crash trying to access properties of undefined.
+    
+    Fix both of these issues by always creating background managers for
+    every monitor, hiding them on startup but only showing them after
+    the startup animation is complete.
+    
+    One thing we need to watch out for is that while LayoutManager is
+    constructing, Main.uiGroup / Main.layoutManager will be undefined,
+    so addBackgroundMenu will fail. Fix this by passing down the uiGroup
+    to the background menu code.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=709313
+
+diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
+index 06e698c..dcbbb39 100644
+--- a/js/ui/backgroundMenu.js
++++ b/js/ui/backgroundMenu.js
+@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({
+     Name: 'BackgroundMenu',
+     Extends: PopupMenu.PopupMenu,
+ 
+-    _init: function(source) {
++    _init: function(source, layoutManager) {
+         this.parent(source, 0, St.Side.TOP);
+ 
+         this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
+@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({
+ 
+         this.actor.add_style_class_name('background-menu');
+ 
+-        Main.uiGroup.add_actor(this.actor);
++        layoutManager.uiGroup.add_actor(this.actor);
+         this.actor.hide();
+     }
+ });
+ 
+-function addBackgroundMenu(actor) {
++function addBackgroundMenu(actor, layoutManager) {
+     let cursor = new St.Bin({ opacity: 0 });
+-    Main.uiGroup.add_actor(cursor);
++    layoutManager.uiGroup.add_actor(cursor);
+ 
+     actor.reactive = true;
+-    actor._backgroundMenu = new BackgroundMenu(cursor);
++    actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
+     actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+     actor._backgroundManager.addMenu(actor._backgroundMenu);
+ 
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 17073a6..80bae9d 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({
+         this.emit('hot-corners-changed');
+     },
+ 
+-    _createBackground: function(monitorIndex) {
++    _addBackgroundMenu: function(bgManager) {
++        BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
++    },
++
++    _createBackgroundManager: function(monitorIndex) {
+         let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
+                                                            layoutManager: this,
+                                                            monitorIndex: monitorIndex });
+-        BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
+-
+-        bgManager.connect('changed', Lang.bind(this, function() {
+-                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
+-                          }));
+ 
+-        this._bgManagers[monitorIndex] = bgManager;
++        bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu));
++        this._addBackgroundMenu(bgManager);
+ 
+-        return bgManager.background;
++        return bgManager;
+     },
+ 
+-    _createSecondaryBackgrounds: function() {
++    _showSecondaryBackgrounds: function() {
+         for (let i = 0; i < this.monitors.length; i++) {
+             if (i != this.primaryIndex) {
+-                let background = this._createBackground(i);
+-
++                let background = this._bgManagers[i].background;
++                background.actor.show();
+                 background.actor.opacity = 0;
+                 Tweener.addTween(background.actor,
+                                  { opacity: 255,
+@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({
+         }
+     },
+ 
+-    _createPrimaryBackground: function() {
+-        this._createBackground(this.primaryIndex);
+-    },
+-
+     _updateBackgrounds: function() {
+         let i;
+         for (i = 0; i < this._bgManagers.length; i++)
+@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({
+         if (Main.sessionMode.isGreeter)
+             return;
+ 
+-        if (this._startingUp)
+-            return;
+-
+         for (let i = 0; i < this.monitors.length; i++) {
+-            this._createBackground(i);
++            let bgManager = this._createBackgroundManager(i);
++            this._bgManagers.push(bgManager);
++
++            if (i != this.primaryIndex && this._startingUp)
++                bgManager.background.actor.hide();
+         }
+     },
+ 
+@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({
+         if (Main.sessionMode.isGreeter) {
+             this.panelBox.translation_y = -this.panelBox.height;
+         } else {
+-            this._createPrimaryBackground();
++            this._updateBackgrounds();
+ 
+             // We need to force an update of the regions now before we scale
+             // the UI group to get the coorect allocation for the struts.
+@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({
+         this.keyboardBox.show();
+ 
+         if (!Main.sessionMode.isGreeter) {
+-            this._createSecondaryBackgrounds();
++            this._showSecondaryBackgrounds();
+             global.window_group.remove_clip();
+         }
+ 

From b3a9cc1725dbaaddccfbcdbe396140e8b924bf69 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 15 Apr 2014 00:15:20 +0200
Subject: [PATCH 0136/2033] gnome3: add gnome-menus and shared_mime_info
 packages to find applications

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 8601e2bc515..d2f671f4377 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -79,10 +79,12 @@ in {
         pkgs.glib_networking
         pkgs.gtk3 # for gtk-update-icon-cache
         pkgs.ibus
+        pkgs.shared_mime_info # for update-mime-database
         gnome3.dconf
         gnome3.gnome-backgrounds
         gnome3.gnome_control_center
         gnome3.gnome_icon_theme
+        gnome3.gnome-menus
         gnome3.gnome_settings_daemon
         gnome3.gnome_shell
         gnome3.gnome_themes_standard
@@ -110,6 +112,10 @@ in {
         gnome3.file-roller
         gnome3.gnome-tweak-tool
       ] config.environment.gnome3.excludePackages);
+
+    # Needed for themes and backgrounds
+    environment.pathsToLink = [ "/share" ];
+
   };
 
 

From 3a1c9a2945aaa89f96dc484d56ec2136446380b9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 15 Apr 2014 00:09:37 +0200
Subject: [PATCH 0137/2033] linux: Update to 3.13.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index 136b5241347..e63756a8c68 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.13.9";
+  version = "3.13.10";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1nfxmxmpvw9lr5595ivsshdhk81bjcbx8k92qs0qql6d06bpa921";
+    sha256 = "00j7123r4zxypas5bs5c8girii6jrz5dwg4zzicgj3gj3frirah3";
   };
 
   features.iwlwifi = true;

From 1b113178ee4ac31179bc529bfaa174982651c471 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 15 Apr 2014 00:14:04 +0200
Subject: [PATCH 0138/2033] grsecurity: Update test patch from
 3.0-3.13.9-201404131254 -> 3.0-3.13.10-201404141717

---
 pkgs/os-specific/linux/kernel/patches.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c28a3ad3400..f42bf440c3b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -99,10 +99,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.13.9";
-      revision  = "201404131254";
+    { kversion  = "3.13.10";
+      revision  = "201404141717";
       branch    = "test";
-      sha256    = "1qslkmqz25rlag0dvv481ka7yylfhmpx7mhzbv9qdaynx5s59l3v";
+      sha256    = "1vraf9g7za0syx5c1x1ks7kgaxc9mjspy6pvgrs0vi326v12sqnx";
     };
 
   grsec_fix_path =

From 6376ac57d881b96c9caaf35e44d1b6ea7fce3e3e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 14 Apr 2014 18:23:40 -0500
Subject: [PATCH 0139/2033] emacsPackages: add cryptol-mode

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../editors/emacs-modes/cryptol/default.nix   | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/cryptol/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
new file mode 100644
index 00000000000..3290041178e
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation rec {
+  name    = "cryptol-mode-${version}";
+  version = "20141010";
+
+  src = fetchgit {
+    url    = "https://github.com/thoughtpolice/cryptol-mode.git";
+    rev    = "50075d49d7c4ec4b03ce31b634424410262c1ad4";
+    sha256 = "6ecd4904b7f3b1cd0721591ce45f16fe11cd1dd5fd7af8110d1f84b133ed4aec";
+  };
+
+  buildInputs = [ emacs ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs major mode for Cryptol";
+    homepage    = "https://thoughtpolice/cryptol-mode";
+    license     = stdenv.lib.licenses.gpl3Plus;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01dea0f5b84..b062a1a3a1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7934,6 +7934,8 @@ let
 
     colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
 
+    cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
+
     cua = callPackage ../applications/editors/emacs-modes/cua { };
 
     darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };

From ba2f861f055a46b48eb001190f67c383fed7e220 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 14 Apr 2014 19:46:35 -0500
Subject: [PATCH 0140/2033] kernel: stable/longterm updates

 - stable:   3.14    -> 3.14.1
 - longterm: 3.10.36 -> 3.10.37
 - longterm: 3.4.86  -> 3.4.86

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 5 ++---
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 520b41ec206..138dad2eda5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.36";
+  version = "3.10.37";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bx94v829qvv5r9h6cj5ddyj5n6qddy8bppnl8minjnqsv5l0vnr";
+    sha256 = "0dh52s9jdvgs75dai5zqlx52xahdrscp048yd96x699hcl3g99d7";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 31e6226a3de..e81619becdf 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14";
+  version = "3.14.1";
   extraMeta.branch = "3.14";
-  modDirVersion = "3.14.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa";
+    sha256 = "1njm8gvlj7cq0m1051yxszl4f63383a7sv1na13hkqkv36kipgqx";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 28542b88966..07712b4d01c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.86";
+  version = "3.4.87";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1gb0pgpikl2fvwbkzpyh38ji0i656jgz902918kvxsip263w675q";
+    sha256 = "1b7isypwjnhvdqsjnq2gsylfasjk560fq0klx18gj3kvyx6ijmqd";
   };
 
   features.iwlwifi = true;

From c83903069f15df913e4ca45c9bd895d16ef11013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Apr 2014 22:47:31 +0200
Subject: [PATCH 0141/2033] gnuradio: update 3.7.2.1 -> 3.7.3

Changelog:
http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_7_3/

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

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 7e67682f17f..1a0dea586d0 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.2.1";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "101wr19nxfc5x7i4s10vgrypaa0vj2pkg8b2vn5j5s9iv8gpwswc";
+    sha256 = "0caj7dqppav53nhn0ima106hpsn0sakw57v1ihac9fk7ka0x2w8w";
   };
 
   buildInputs = [

From 5c2d17780d0fed25b9528d607fc0511a25eb21ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 14 Apr 2014 22:49:12 +0200
Subject: [PATCH 0142/2033] uhd: update 3.5.4 -> 3.7.0

Build tested (with gnuradio).
---
 pkgs/development/tools/misc/uhd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index d49077a5ef6..67ef086941e 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -8,15 +8,15 @@
 
 stdenv.mkDerivation rec {
   name = "uhd-${version}";
-  version = "3.5.4";
+  version = "3.7.0";
 
   # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
   # and xxx.yyy.zzz. Hrmpf...
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://github.com/EttusResearch/uhd/archive/release_003_005_004.tar.gz";
-    sha256 = "1l11dv72r4ynfpw58aacq0kjylzw85yapv3kzc76lg6qgdb0pqrd";
+    url = "https://github.com/EttusResearch/uhd/archive/release_003_007_000.tar.gz";
+    sha256 = "0x9imfy63s6wlbilr2n82c15nd33ix0mbap0q1xwh2pj1mk4d5jk";
   };
 
   cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0";
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
   preConfigure = "cd host";
 
   # Firmware images are downloaded (pre-built)
-  uhdImagesName = "uhd-images_003.005.004-release";
+  uhdImagesName = "uhd-images_003.007.000-release";
   uhdImagesSrc = fetchurl {
     url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz";
-    sha256 = "0lgy9076vshlaq7l4n3q1hka3q4xxzdz7mqh7kawg4dziq7j8nl6";
+    sha256 = "0vb0rc5ji8n6l6ycvd7pbazxzm0ihvkmqm77jflqrd3kky8r722d";
   };
 
   postPhases = [ "installFirmware" ];

From 1daddde5dd0abce47f3a6e33506dd2600edd68a5 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 14 Apr 2014 11:54:14 +0200
Subject: [PATCH 0143/2033] add pythonPackages.contextlib2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 028234a2aeb..44bfcacc5ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1142,6 +1142,15 @@ rec {
   };
 
 
+  contextlib2 = buildPythonPackage rec {
+    name = "contextlib2-0.4.0";
+
+    src = fetchurl rec {
+      url = "https://pypi.python.org/packages/source/c/contextlib2/${name}.tar.gz";
+      md5 = "ea687207db25f65552061db4a2c6727d";
+    };
+  };
+
   coverage = buildPythonPackage rec {
     name = "coverage-3.6";
 

From 5ab600ab0013f6e52390cf189c64046f48d42fda Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Mon, 14 Apr 2014 11:54:32 +0200
Subject: [PATCH 0144/2033] add pythonPackages.bedup (btrfs deduplication tool)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44bfcacc5ac..9dcb6283f41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -581,6 +581,34 @@ rec {
   };
 
 
+  bedup = buildPythonPackage rec {
+    name = "bedup-20140206";
+
+    src = fetchgit {
+      url = "git@github.com:g2p/bedup.git";
+      rev = "80cb217d4819a03e159e42850a9a3f14e2b278a3";
+      sha256 = "c6ab696a767efc20f25faecbb74833e6e396d89ea70a3a7e97e4dbd9b58e90f4";
+    };
+
+    buildInputs = [ pkgs.btrfsProgs ];
+    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy pyxdg pycparser cffi alembic ];
+
+    meta = {
+      description = "Deduplication for Btrfs";
+      longDescription = ''
+        Deduplication for Btrfs. bedup looks for new and changed files, making sure that multiple
+        copies of identical files share space on disk. It integrates deeply with btrfs so that scans
+        are incremental and low-impact.
+      '';
+      homepage = https://github.com/g2p/bedup;
+      license = stdenv.lib.licenses.gpl2;
+
+      platforms = stdenv.lib.platforms.linux;
+
+      maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    };
+  };
+
   beets = buildPythonPackage rec {
     name = "beets-1.0.0";
 

From d5898b373322a4318c722afce4fd879b1e62940c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 02:28:02 -0500
Subject: [PATCH 0145/2033] Add the Haskell system utility "sizes"

---
 pkgs/tools/system/sizes/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/system/sizes/default.nix

diff --git a/pkgs/tools/system/sizes/default.nix b/pkgs/tools/system/sizes/default.nix
new file mode 100644
index 00000000000..9be2a709af5
--- /dev/null
+++ b/pkgs/tools/system/sizes/default.nix
@@ -0,0 +1,21 @@
+{ cabal, cmdargs, deepseq, dlist, lens, parallelIo, regexPosix
+, systemFileio, systemFilepath, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "sizes";
+  version = "2.3.1.1";
+  sha256 = "1k7rvcj5sp30zwm16wnsw40y4rkqnfxlrl3ridqhp91q8286qjbs";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs deepseq dlist lens parallelIo regexPosix systemFileio
+    systemFilepath text
+  ];
+  meta = {
+    homepage = "https://github.com/jwiegley/sizes";
+    description = "Recursively show space (size and i-nodes) used in subdirectories";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 91aa2aac5aa..e655a33ef7d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3025,6 +3025,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   packunused = callPackage ../development/tools/haskell/packunused {};
 
+  sizes = callPackage ../tools/system/sizes {};
+
   splot = callPackage ../development/tools/haskell/splot {};
 
   timeplot = callPackage ../development/tools/haskell/timeplot {};

From 42954a2d20dc3a97772dace8737ff863e7f0e8fd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 15 Apr 2014 02:28:01 -0500
Subject: [PATCH 0146/2033] Fix hydra UID

The style for IDs dictates that groups/users should have the same ID -
so if a user doesn't have a group or vice versa, then we should skip
that ID.

In this case, we had already assigned grsecurity GID 121, but I
accidentally also assigned Hydra UID 121. Instead, let's assign Hydra
UID 122. And also assign a GID (122) as well.

Luckily nobody was depending on this yet (except me).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 664aed7fbc9..0954e6185af 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -129,7 +129,7 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
-      hydra     = 121;
+      hydra     = 122;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -233,6 +233,7 @@
       newrelic = 119;
       starbound = 120;
       grsecurity = 121;
+      hydra = 122;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 

From 8ee52f38565702ef74c3250135d18b992659532c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 02:54:58 -0500
Subject: [PATCH 0147/2033] Add leafnode for unix systems

---
 pkgs/servers/news/leafnode/default.nix | 28 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/servers/news/leafnode/default.nix

diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
new file mode 100644
index 00000000000..9da83fe891f
--- /dev/null
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pcre }:
+
+stdenv.mkDerivation rec {
+  name = "leafnode-2.0.0.alpha20121101a.12";
+
+  src = fetchurl {
+    url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2";
+    sha256 = "096w4gxj08m3vwmyv4sxpmbl8dn6mzqfmrhc32jgyca6qzlrdin8";
+  };
+
+  configureFlags = "--enable-runas-user=nobody";
+
+  postConfigure = ''
+      # The is_validfqdn is far too restrictive, and only allows
+      # Internet-facing servers to run.  In order to run leafnode via
+      # localhost only, we need to disable this check.
+      sed -i validatefqdn.c -e 's/int is_validfqdn(const char \*f) {/int is_validfqdn(const char *f) { return 1;/;'
+  '';
+
+  buildInputs = [ pcre];
+
+  meta = {
+    homepage = "http://leafnode.sourceforge.net/";
+    description = "Leafnode implements a store & forward NNTP proxy";
+    license = "X11";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b062a1a3a1f..743d699ee87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6443,6 +6443,8 @@ let
 
   joseki = callPackage ../servers/http/joseki {};
 
+  leafnode = callPackage ../servers/news/leafnode { };
+
   lighttpd = callPackage ../servers/http/lighttpd { };
 
   mailman = callPackage ../servers/mail/mailman { };

From ae207efc071ded1bc54f26c563711b496b8dbae7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 15 Apr 2014 03:21:53 -0500
Subject: [PATCH 0148/2033] nixos: add spiped service module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix                   |   2 +
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/networking/spiped.nix | 212 +++++++++++++++++++
 3 files changed, 215 insertions(+)
 create mode 100644 nixos/modules/services/networking/spiped.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0954e6185af..2d9ea1450ff 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -130,6 +130,7 @@
       newrelic = 119;
       starbound = 120;
       hydra     = 122;
+      spiped    = 123;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
@@ -234,6 +235,7 @@
       starbound = 120;
       grsecurity = 121;
       hydra = 122;
+      spiped = 123;
 
       # When adding a gid, make sure it doesn't match an existing uid.
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b2f530474b5..b58e5b6a79a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -207,6 +207,7 @@
   ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/searx.nix
+  ./services/networking/spiped.nix
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
   ./services/networking/ssh/lshd.nix
diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix
new file mode 100644
index 00000000000..ec5908b182f
--- /dev/null
+++ b/nixos/modules/services/networking/spiped.nix
@@ -0,0 +1,212 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.spiped;
+in
+{
+  options = {
+    services.spiped = mkOption {
+      type = types.attrsOf (types.submodule (
+        {
+          options = {
+            encrypt = mkOption {
+              type    = types.bool;
+              default = false;
+              description = ''
+                Take unencrypted connections from the
+                <literal>source</literal> socket and send encrypted
+                connections to the <literal>target</literal> socket.
+              '';
+            };
+
+            decrypt = mkOption {
+              type    = types.bool;
+              default = false;
+              description = ''
+                Take encrypted connections from the
+                <literal>source</literal> socket and send unencrypted
+                connections to the <literal>target</literal> socket.
+              '';
+            };
+
+            source = mkOption {
+              type    = types.str;
+              description = ''
+                Address on which spiped should listen for incoming
+                connections.  Must be in one of the following formats:
+                <literal>/absolute/path/to/unix/socket</literal>,
+                <literal>host.name:port</literal>,
+                <literal>[ip.v4.ad.dr]:port</literal> or
+                <literal>[ipv6::addr]:port</literal> - note that
+                hostnames are resolved when spiped is launched and are
+                not re-resolved later; thus if DNS entries change
+                spiped will continue to connect to the expired
+                address.
+              '';
+            };
+
+            target = mkOption {
+              type    = types.str;
+              description = "Address to which spiped should connect.";
+            };
+
+            keyfile = mkOption {
+              type    = types.path;
+              description = ''
+                Name of a file containing the spiped key. As the
+                daemon runs as the <literal>spiped</literal> user, the
+                key file must be somewhere owned by that user. By
+                default, we recommend putting the keys for any spipe
+                services in <literal>/var/lib/spiped</literal>.
+              '';
+            };
+
+            timeout = mkOption {
+              type = types.int;
+              default = 5;
+              description = ''
+                Timeout, in seconds, after which an attempt to connect to
+                the target or a protocol handshake will be aborted (and the
+                connection dropped) if not completed
+              '';
+            };
+
+            maxConns = mkOption {
+              type = types.int;
+              default = 100;
+              description = ''
+                Limit on the number of simultaneous connections allowed.
+              '';
+            };
+
+            waitForDNS = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Wait for DNS. Normally when <literal>spiped</literal> is
+                launched it resolves addresses and binds to its source
+                socket before the parent process returns; with this option
+                it will daemonize first and retry failed DNS lookups until
+                they succeed. This allows <literal>spiped</literal> to
+                launch even if DNS isn't set up yet, but at the expense of
+                losing the guarantee that once <literal>spiped</literal> has
+                finished launching it will be ready to create pipes.
+              '';
+            };
+
+            disableKeepalives = mkOption {
+              type = types.bool;
+              default = false;
+              description = "Disable transport layer keep-alives.";
+            };
+
+            weakHandshake = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Use fast/weak handshaking: This reduces the CPU time spent
+                in the initial connection setup, at the expense of losing
+                perfect forward secrecy.
+              '';
+            };
+
+            resolveRefresh = mkOption {
+              type = types.int;
+              default = 60;
+              description = ''
+                Resolution refresh time for the target socket, in seconds.
+              '';
+            };
+
+            disableReresolution = mkOption {
+              type = types.bool;
+              default = false;
+              description = "Disable target address re-resolution.";
+            };
+          };
+        }
+      ));
+
+      default = {};
+
+      example = literalExample ''
+        {
+          pipe1 =
+            { keyfile = "/var/lib/spiped/pipe1.key";
+              encrypt = true;
+              source  = "localhost:6000";
+              target  = "endpoint.example.com:7000";
+            };
+          pipe2 =
+            { keyfile = "/var/lib/spiped/pipe2.key";
+              decrypt = true;
+              source  = "0.0.0.0:7000";
+              target  = "localhost:3000";
+            };
+        }
+      '';
+
+      description = ''
+        Configuration for a secure pipe daemon. The daemon can be
+        started, stopped, or examined using
+        <literal>systemctl</literal>, under the name
+        <literal>spiped@foo</literal>.
+      '';
+    };
+  };
+
+  config = {
+    assertions = mapAttrsToList (name: c: {
+      assertion = (c.encrypt -> !c.decrypt) || (c.decrypt -> c.encrypt);
+      message   = "A pipe must either encrypt or decrypt";
+    }) cfg;
+
+    users.extraGroups.spiped.gid = config.ids.gids.spiped;
+    users.extraUsers.spiped = {
+      description = "Secure Pipe Service user";
+      group       = "spiped";
+      uid         = config.ids.uids.spiped;
+    };
+
+    systemd.services."spiped@" = {
+      description = "Secure pipe '%i'";
+      after       = [ "network.target" ];
+
+      serviceConfig = {
+        Restart   = "always";
+        User      = "spiped";
+        PermissionsStartOnly = true;
+      };
+
+      preStart  = ''
+        cd /var/lib/spiped
+        chmod -R 0660 *
+        chown -R spiped:spiped *
+      '';
+      scriptArgs = "%i";
+      script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`";
+    };
+
+    system.activationScripts.spiped = optionalString (cfg != {})
+      "mkdir -p /var/lib/spiped";
+
+    # Setup spiped config files
+    environment.etc = mapAttrs' (name: cfg: nameValuePair "spiped/${name}.spec"
+      { text = concatStringsSep " "
+          [ (if cfg.encrypt then "-e" else "-d")        # Mode
+            "-s ${cfg.source}"                          # Source
+            "-t ${cfg.target}"                          # Target
+            "-k ${cfg.keyfile}"                         # Keyfile
+            "-n ${toString cfg.maxConns}"               # Max number of conns
+            "-o ${toString cfg.timeout}"                # Timeout
+            (optionalString cfg.waitForDNS "-D")        # Wait for DNS
+            (optionalString cfg.weakHandshake "-f")     # No PFS
+            (optionalString cfg.disableKeepalives "-j") # Keepalives
+            (if cfg.disableReresolution then "-R"
+              else "-r ${toString cfg.resolveRefresh}")
+          ];
+      }) cfg;
+  };
+}

From 8decc8fc2fe39db9682d81b11f0d80e943cdf345 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 15 Apr 2014 10:40:58 +0200
Subject: [PATCH 0149/2033] apparix: new package

Add directory bookmarks, distant listing, and distant editing to the command line

http://micans.org/apparix
---
 pkgs/tools/misc/apparix/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/misc/apparix/default.nix

diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
new file mode 100644
index 00000000000..693ca27a88d
--- /dev/null
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "apparix-11-062";
+
+  src = fetchurl {
+    url = "http://micans.org/apparix/src/${name}.tar.gz";
+    sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235";
+  };
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://micans.org/apparix;
+    description = "Add directory bookmarks, distant listing, and distant editing to the command line";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d695253fbbf..106cd3291fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -606,6 +606,8 @@ let
 
   mcelog = callPackage ../os-specific/linux/mcelog { };
 
+  apparix = callPackage ../tools/misc/apparix { };
+
   asciidoc = callPackage ../tools/typesetting/asciidoc {
     inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader;
     enableStandardFeatures = false;

From 1ae0fec71bb76af3622fb883512873acda66f424 Mon Sep 17 00:00:00 2001
From: Lukas Toth <lukas@lukastoth.com>
Date: Tue, 15 Apr 2014 01:57:29 +0200
Subject: [PATCH 0150/2033] haskellPackages.ipprint: New expression

---
 .../libraries/haskell/ipprint/default.nix           | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/ipprint/default.nix

diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix
new file mode 100644
index 00000000000..e648ae19c3d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ipprint/default.nix
@@ -0,0 +1,13 @@
+{ cabal, Extra, haskellSrc }:
+
+cabal.mkDerivation (self: {
+  pname = "ipprint";
+  version = "0.5";
+  sha256 = "0h75k21blbnzvp5l20qsima557dx6zfrww79y7qsqf04pbd81j7s";
+  buildDepends = [ Extra haskellSrc ];
+  meta = {
+    description = "Tiny helper for pretty-printing values in ghci console";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e655a33ef7d..da6705fbfd6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1566,6 +1566,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ioStreams = callPackage ../development/libraries/haskell/io-streams {};
 
+  ipprint = callPackage ../development/libraries/haskell/ipprint {};
+
   iproute = callPackage ../development/libraries/haskell/iproute {};
 
   irc = callPackage ../development/libraries/haskell/irc {};

From cf63d8953c4b6daa56f3cb6d411bfcb048ceecf5 Mon Sep 17 00:00:00 2001
From: Lukas Toth <lukas@lukastoth.com>
Date: Tue, 15 Apr 2014 01:58:31 +0200
Subject: [PATCH 0151/2033] haskellPackages.Extra: New expression

---
 .../libraries/haskell/Extra/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Extra/default.nix

diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra/default.nix
new file mode 100644
index 00000000000..2634f849114
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Extra/default.nix
@@ -0,0 +1,19 @@
+{ cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck
+, random, regexCompat, time, Unixutils, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Extra";
+  version = "1.46.1";
+  sha256 = "0dgj72s60mhc36x7hpfdcdvxydq5d5aj006gxma9zz3hqzy5nnz9";
+  buildDepends = [
+    bzlib filepath HUnit mtl network pureMD5 QuickCheck random
+    regexCompat time Unixutils zlib
+  ];
+  meta = {
+    homepage = "http://src.seereason.com/haskell-extra";
+    description = "A grab bag of modules";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index da6705fbfd6..c92e284027f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1087,6 +1087,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   executablePath = callPackage ../development/libraries/haskell/executable-path {};
 
+  Extra = callPackage ../development/libraries/haskell/Extra {};
+
   fay = callPackage ../development/libraries/haskell/fay {};
 
   fayBase = callPackage ../development/libraries/haskell/fay-base {};

From 66e750190fe56275f78f39b27652c8712c2a3a95 Mon Sep 17 00:00:00 2001
From: Lukas Toth <lukas@lukastoth.com>
Date: Tue, 15 Apr 2014 01:59:19 +0200
Subject: [PATCH 0152/2033] haskellPackages.bzlib: New expression

---
 .../development/libraries/haskell/bzlib/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bzlib/default.nix

diff --git a/pkgs/development/libraries/haskell/bzlib/default.nix b/pkgs/development/libraries/haskell/bzlib/default.nix
new file mode 100644
index 00000000000..cc9f244261b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bzlib/default.nix
@@ -0,0 +1,13 @@
+{ cabal, bzip2 }:
+
+cabal.mkDerivation (self: {
+  pname = "bzlib";
+  version = "0.5.0.4";
+  sha256 = "1vf37y7wknrihf7hipd6lihkmn7sszbgfb325my52yzbjs3baccd";
+  extraLibraries = [ bzip2 ];
+  meta = {
+    description = "Compression and decompression in the bzip2 format";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c92e284027f..85bfc911005 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -705,6 +705,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
 
+  bzlib = callPackage ../development/libraries/haskell/bzlib {};
+
   c2hs = callPackage ../development/libraries/haskell/c2hs {};
 
   c2hsc = callPackage ../development/libraries/haskell/c2hsc {};

From f5fa89f1988dabb5d22b1a3956aede5cd49f9080 Mon Sep 17 00:00:00 2001
From: Lukas Toth <lukas@lukastoth.com>
Date: Tue, 15 Apr 2014 01:59:59 +0200
Subject: [PATCH 0153/2033] haskellPackages.Unixutils: New expression

---
 .../libraries/haskell/Unixutils/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Unixutils/default.nix

diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix
new file mode 100644
index 00000000000..37c1aaf6cef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Unixutils/default.nix
@@ -0,0 +1,14 @@
+{ cabal, filepath, pureMD5, regexTdfa, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "Unixutils";
+  version = "1.52";
+  sha256 = "1gp04mc6irycwazykl9kpyhkkryn3hbnpn08ih6cjbsm3p8yi8b4";
+  buildDepends = [ filepath pureMD5 regexTdfa zlib ];
+  meta = {
+    homepage = "http://src.seereason.com/haskell-unixutils";
+    description = "A crude interface between Haskell and Unix-like operating systems";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 85bfc911005..e94c8a4e52c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2607,6 +2607,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   unixTime = callPackage ../development/libraries/haskell/unix-time {};
 
+  Unixutils = callPackage ../development/libraries/haskell/Unixutils {};
+
   unlambda = callPackage ../development/libraries/haskell/unlambda {};
 
   unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {};

From abdd87da3c19cfcf8311886cd5f90643612fb023 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 15 Apr 2014 10:59:53 +0200
Subject: [PATCH 0154/2033] haskell-text-icu: don't run test suite on Darwin

https://github.com/bos/text-icu/issues/6
https://github.com/NixOS/nixpkgs/pull/2254
---
 pkgs/development/libraries/haskell/text-icu/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix
index 6dc42beee40..222475b24bb 100644
--- a/pkgs/development/libraries/haskell/text-icu/default.nix
+++ b/pkgs/development/libraries/haskell/text-icu/default.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     testFrameworkQuickcheck2 text
   ];
   extraLibraries = [ icu ];
+  doCheck = !self.stdenv.isDarwin;
   meta = {
     homepage = "https://github.com/bos/text-icu";
     description = "Bindings to the ICU library";

From 00d5f3ab79582c7f48e3cee2ff27ae809cb317f6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 04:16:55 -0500
Subject: [PATCH 0155/2033] Add expression for cabal-delete

---
 .../tools/haskell/cabal-delete/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal-delete/default.nix

diff --git a/pkgs/development/tools/haskell/cabal-delete/default.nix b/pkgs/development/tools/haskell/cabal-delete/default.nix
new file mode 100644
index 00000000000..65a7b4d3211
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal-delete/default.nix
@@ -0,0 +1,34 @@
+{ cabal, fetchgit, bytestring ? null, containers ? null, directory ? null,
+  filepath, process ? null, attoparsec, ghcPaths, transformers }:
+
+let
+  tag = "0.5.2.0";
+in
+
+cabal.mkDerivation (self: {
+  pname = "cabal-delete";
+  version = "${tag}";
+  src = fetchgit {
+    url = git://github.com/iquiw/cabal-delete.git;
+    rev = "refs/tags/v${tag}";
+    sha256 = "1ap319isjg8bafm4jz2krfwvvg11hj5yk0g99a3l1a3a36hpdgzw";
+  };
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+      bytestring
+      containers
+      directory
+      filepath
+      process
+      attoparsec
+      ghcPaths
+      transformers
+  ];
+  meta = {
+    homepage = "https://github.com/iquiw/cabal-delete";
+    description = "Uninstall packages installed by cabal";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e655a33ef7d..3c4c5618bdb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2994,6 +2994,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     });
   in callPackage cabalExpr { inherit src; };
 
+  cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
+
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
   cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};

From f2690384c97afab6860af47c30920a3ccca741b6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 04:32:06 -0500
Subject: [PATCH 0156/2033] Three new Haskell tools: rehoo, una, cabal-meta

---
 .../tools/haskell/cabal-meta/default.nix      | 18 ++++++++++++++++++
 .../tools/haskell/rehoo/default.nix           | 19 +++++++++++++++++++
 .../development/tools/haskell/una/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 ++++++
 4 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal-meta/default.nix
 create mode 100644 pkgs/development/tools/haskell/rehoo/default.nix
 create mode 100644 pkgs/development/tools/haskell/una/default.nix

diff --git a/pkgs/development/tools/haskell/cabal-meta/default.nix b/pkgs/development/tools/haskell/cabal-meta/default.nix
new file mode 100644
index 00000000000..62048e2893b
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal-meta/default.nix
@@ -0,0 +1,18 @@
+{ cabal, hspec, shelly, systemFileio, systemFilepath, text }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-meta";
+  version = "0.4.1.2";
+  sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk";
+  isLibrary = true;
+  isExecutable = true;
+  doCheck = false;
+  buildDepends = [ shelly systemFileio systemFilepath text ];
+  testDepends = [ hspec shelly systemFilepath text ];
+  meta = {
+    homepage = "http://www.yesodweb.com/";
+    description = "build multiple packages at once";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/rehoo/default.nix b/pkgs/development/tools/haskell/rehoo/default.nix
new file mode 100644
index 00000000000..016070f66c3
--- /dev/null
+++ b/pkgs/development/tools/haskell/rehoo/default.nix
@@ -0,0 +1,19 @@
+{ cabal, cmdargs, parallelIo, shelly, split, systemFilepath, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "rehoo";
+  version = "0.3.1";
+  sha256 = "0pwmz1q2866yj8hxbvha4v1smhppkd3jsrrhbhmbxw137l54ijgf";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    cmdargs parallelIo shelly split systemFilepath text
+  ];
+  meta = {
+    homepage = "https://github.com/jwiegley/rehoo";
+    description = "Rebuild default.hoo from many .hoo files in the current directory";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/tools/haskell/una/default.nix b/pkgs/development/tools/haskell/una/default.nix
new file mode 100644
index 00000000000..172949818a6
--- /dev/null
+++ b/pkgs/development/tools/haskell/una/default.nix
@@ -0,0 +1,16 @@
+{ cabal, cmdargs, filepath, ioStorage }:
+
+cabal.mkDerivation (self: {
+  pname = "una";
+  version = "2.1.0";
+  sha256 = "0gpycwd0dgnw7cdicpn19wv1xb4jq3j9dfzry2ilv85h02zkwfvh";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ cmdargs filepath ioStorage ];
+  meta = {
+    homepage = "https://github.com/jwiegley/una";
+    description = "Universal un-archiver utility";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e94c8a4e52c..c3ca926e2cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3004,6 +3004,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
+  cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};
+
   cabal2Ghci = callPackage ../development/tools/haskell/cabal2ghci {};
 
   cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
@@ -3033,12 +3035,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   packunused = callPackage ../development/tools/haskell/packunused {};
 
+  rehoo = callPackage ../development/tools/haskell/rehoo {};
+
   sizes = callPackage ../tools/system/sizes {};
 
   splot = callPackage ../development/tools/haskell/splot {};
 
   timeplot = callPackage ../development/tools/haskell/timeplot {};
 
+  una = callPackage ../development/tools/haskell/una {};
+
   # Games.
 
   LambdaHack = callPackage ../games/LambdaHack {

From b18dc38dc141e294312d41d5f2222819053c5ea9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 04:46:14 -0500
Subject: [PATCH 0157/2033] Patch lua52 to build on Darwin

---
 .../interpreters/lua-5/5.2.darwin.patch       | 52 +++++++++++++++++++
 pkgs/development/interpreters/lua-5/5.2.nix   |  9 +++-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/lua-5/5.2.darwin.patch

diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
new file mode 100644
index 00000000000..ffc3ff34be7
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index 209a132..9387b09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,5 +43,5 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.${version}.dylib
+ TO_MAN= lua.1 luac.1
+
+ # Lua version and release.
+@@ -64,3 +64,5 @@ install: dummy
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
++	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib
++	ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib
+
+ ranlib:
+ 	cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+diff --git a/src/Makefile b/src/Makefile
+index fea895b..d9146d0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -28,7 +28,7 @@ MYOBJS=
+ 
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+-LUA_A=	liblua.a
++LUA_A=	liblua.${version}.dylib
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -56,11 +56,13 @@ o:	$(ALL_O)
+ a:	$(ALL_A)
+ 
+ $(LUA_A): $(BASE_O)
+-	$(AR) $@ $(BASE_O)
+-	$(RANLIB) $@
++	$(CC) -dynamiclib -install_name $(out)/lib/liblua.${version}.dylib \
++		-compatibility_version ${version} -current_version ${version} \
++		-o liblua.${version}.dylib $^
+ 
+ $(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	$(CC) -fno-common $(MYLDFLAGS) \
++		-o $@ $(LUA_O) $(LUA_A) -L. -llua.${version} $(LIBS)
+ 
+ $(LUAC_T): $(LUAC_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 70ab0c3bdf8..3e7323e461d 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -19,9 +19,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ readline ];
 
-  patches = [ dsoPatch ];
+  patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ];
 
-  configurePhase = ''
+  configurePhase =
+    if stdenv.isDarwin
+    then ''
+    makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
+    installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' )
+  '' else ''
     makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} )
     installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' )
   '';

From bc08fa99f1adc02cf25c21a7f89f2f322abca150 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 05:04:27 -0500
Subject: [PATCH 0158/2033] Fix flex for building on darwin systems

---
 pkgs/development/tools/parsing/flex/2.5.39.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/parsing/flex/2.5.39.nix b/pkgs/development/tools/parsing/flex/2.5.39.nix
index c5337d647de..f12f89f6e24 100644
--- a/pkgs/development/tools/parsing/flex/2.5.39.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.39.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
 
   propagatedNativeBuildInputs = [ m4 ];
 
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i Makefile -e 's/-no-undefined//;'
+  '';
+
   crossAttrs = {
     preConfigure = ''
       export ac_cv_func_malloc_0_nonnull=yes

From 596bd3716366ac497e5b12668e9fff7b7aa9e30c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 11:22:31 +0200
Subject: [PATCH 0159/2033] Don't restart container shells in
 switch-to-configuration

---
 nixos/modules/virtualisation/container-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 21e64c8c095..697c53ce7a2 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -28,6 +28,7 @@ with lib;
             ExecStart = "${pkgs.socat}/bin/socat -t0 - exec:${pkgs.shadow}/bin/login,pty,setsid,setpgid,stderr,ctty";
             TimeoutStopSec = 1; # FIXME
           };
+        restartIfChanged = false;
       };
 
     # Also provide a root login prompt on /var/lib/root-login.socket
@@ -52,6 +53,7 @@ with lib;
             ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\"";
             TimeoutStopSec = 1; # FIXME
           };
+        restartIfChanged = false;
       };
 
     # Provide a daemon on /var/lib/run-command.socket that reads a
@@ -82,6 +84,7 @@ with lib;
             eval "command=($c)"
             exec "''${command[@]}"
           '';
+        restartIfChanged = false;
       };
 
     systemd.services.container-startup-done =

From 35bf0f48107d973a584c635219e098d837c8183e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 11:26:16 +0200
Subject: [PATCH 0160/2033] Don't restart container-startup-done

---
 nixos/modules/virtualisation/container-config.nix | 1 +
 nixos/modules/virtualisation/containers.nix       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 697c53ce7a2..da80e44f2c3 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -99,6 +99,7 @@ with lib;
           '';
         serviceConfig.Type = "oneshot";
         serviceConfig.RemainAfterExit = true;
+        restartIfChanged = false;
       };
 
   };
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 51402f3e32d..72462a8dfd8 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -225,6 +225,7 @@ in
             # writes something to this pipe.  FIXME: it also hangs
             # until the start timeout expires if systemd-nspawn exits.
             read x < $root/var/lib/startup-done
+            rm -f $root/var/lib/startup-done
           '';
 
         preStop =

From f9e6181478ed851e1915ac478d8ed598397345a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 11:47:41 +0200
Subject: [PATCH 0161/2033] nixos-rebuild: Exec nixos-rebuild from the new
 Nixpkgs tree

This allows doing any necessary actions that were not in the installed
nixos-rebuild (such as downloading a new version of Nix). This does
require us to be careful that nixos-rebuild is backwards-compatible
(i.e. can run in any old installation).
---
 .../modules/installer/tools/nixos-rebuild.sh  | 53 ++++++++++++++-----
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 2a1c397553b..4582028eb9b 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -1,4 +1,6 @@
-#! @shell@ -e
+#! @shell@
+
+set -e
 
 showSyntax() {
     exec man nixos-rebuild
@@ -7,6 +9,7 @@ showSyntax() {
 
 
 # Parse the command line.
+origArgs=("$@")
 extraBuildFlags=()
 action=
 buildNix=1
@@ -76,8 +79,30 @@ done
 
 if [ -z "$action" ]; then showSyntax; fi
 
-if [ -n "$rollback" ]; then
-    buildNix=
+# Only run shell scripts from the Nixpkgs tree if the action is
+# "switch", "boot", or "test". With other actions (such as "build"),
+# the user may reasonably expect that no code from the Nixpkgs tree is
+# executed, so it's safe to run nixos-rebuild against a potentially
+# untrusted tree.
+canRun=
+if [ "$action" = switch -o "$action" = boot -o "$action" = test ]; then
+    canRun=1
+fi
+
+
+# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
+if [ -n "$upgrade" -a -z "$_NIXOS_REBUILD_REEXEC" ]; then
+    nix-channel --update nixos
+fi
+
+
+# Re-execute nixos-rebuild from the Nixpkgs tree.
+if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then
+    if p=$(nix-instantiate --find-file nixpkgs/nixos/modules/installer/tools/nixos-rebuild.sh "${extraBuildFlags[@]}"); then
+        export _NIXOS_REBUILD_REEXEC=1
+        exec $SHELL -e $p "${origArgs[@]}"
+        exit 1
+    fi
 fi
 
 
@@ -98,16 +123,14 @@ if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | gre
 fi
 
 
-# If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
-if [ -n "$upgrade" ]; then
-    nix-channel --update nixos
-fi
-
-
 # First build Nix, since NixOS may require a newer version than the
 # current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
 # more conservative.
-if [ "$action" != dry-run -a -n "$buildNix" ]; then
+if [ -n "$rollback" -o "$action" = dry-run ]; then
+    buildNix=
+fi
+
+if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
         if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
@@ -120,10 +143,12 @@ fi
 
 # Update the version suffix if we're building from Git (so that
 # nixos-version shows something useful).
-if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then
-    suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true)
-    if [ -n "$suffix" ]; then
-        echo -n "$suffix" > "$nixpkgs/.version-suffix" || true
+if [ -n "$canRun" ]; then
+    if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then
+        suffix=$($SHELL $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}" || true)
+        if [ -n "$suffix" ]; then
+            echo -n "$suffix" > "$nixpkgs/.version-suffix" || true
+        fi
     fi
 fi
 

From 00372ca63890ed25543ffea2c4e625d365beff03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 12:03:30 +0200
Subject: [PATCH 0162/2033] nixos-rebuild: Fallback for upgrading Nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, if the currently installed Nix is too old to evaluate
Nixpkgs, then nixos-rebuild would fail and the user had to upgrade Nix
manually. Now, as a fallback, we run ‘nix-store -r’ to obtain a binary
Nix directly from the binary cache.
---
 .../modules/installer/tools/nixos-rebuild.sh  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 4582028eb9b..2d137dd52ad 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -124,8 +124,7 @@ fi
 
 
 # First build Nix, since NixOS may require a newer version than the
-# current one.  Of course, the same goes for Nixpkgs, but Nixpkgs is
-# more conservative.
+# current one.
 if [ -n "$rollback" -o "$action" = dry-run ]; then
     buildNix=
 fi
@@ -134,7 +133,23 @@ if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
         if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-            nix-build '<nixpkgs>' -A nixUnstable -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null
+            if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+                machine="$(uname -m)"
+                if [ "$machine" = x86_64 ]; then
+                    nixStorePath=/nix/store/d34q3q2zj9nriq4ifhn3dnnngqvinjb3-nix-1.7
+                elif [[ "$machine" =~ i.86 ]]; then
+                    nixStorePath=/nix/store/qlah0darpcn6sf3lr2226rl04l1gn4xz-nix-1.7
+                else
+                    echo "$0: unsupported platform"
+                    exit 1
+                fi
+                if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
+                    --option extra-binary-caches http://cache.nixos.org/; then
+                    echo "warning: don't know how to get latest Nix" >&2
+                fi
+                # Older version of nix-store -r don't support --add-root.
+                [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
+            fi
         fi
     fi
     PATH=$tmpDir/nix/bin:$PATH

From 9646ddc5a3d737cd8a268c2f334cc7e25a7c5b43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 12:49:25 +0200
Subject: [PATCH 0163/2033] Archive::Cpio: Add to channel

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c61b4c74ffc..7eb6d051fff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -206,6 +206,10 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.09.tar.gz;
       sha256 = "1cf8k5zjykdbc1mn8lixlkij6jklwn6divzyq2grycj3rpd36g5c";
     };
+    meta = {
+      description = "Module for manipulations of cpio archives";
+      platforms = stdenv.lib.platforms.linux;
+    };
   };
 
   ArchiveZip = buildPerlPackage {

From 5fa812ba5ea37a8424fd742d2df73dfc99bb9ab3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 12:58:28 +0200
Subject: [PATCH 0164/2033] Containers: Inherit the platform type of the host

http://hydra.nixos.org/build/10350055
---
 nixos/modules/virtualisation/containers.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 72462a8dfd8..065c4dc50d2 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -23,6 +23,8 @@ let
     inherit (pkgs) socat;
   };
 
+  system = config.nixpkgs.system;
+
 in
 
 {
@@ -99,6 +101,7 @@ in
           config = mkMerge
             [ (mkIf options.config.isDefined {
                 path = (import ../../lib/eval-config.nix {
+                  inherit system;
                   modules =
                     let extraConfig =
                       { boot.isContainer = true;

From da6bc44dd7eb39b68d9b16bc398e64248d7a09c3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 15 Apr 2014 06:50:39 -0500
Subject: [PATCH 0165/2033] nixos: transmission improvements

This mostly upgrades transmission, and does some very minor touchups on
AppArmor support.

In particular, there is now no need to ever specify the umask as part of
the settings, as it will be mixed in by default (which is essentially
always what you want). Also, the default configuration is now more
sensible: Downloads are put in /var/lib/transmission/Downloads, and
incomplete files are put in /var/lib/transmission/.incomplete - this
also allows easy use of file syncing probrams, like BitTorrent Sync.

Finally, this unconditionally enables the AppArmor profiles for the
daemon, if AppArmor is enabled - rather than letting the user specify
profile support, it's best to default to supporting profiles for daemons
transparently in all places.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/apparmor.nix           | 43 +++--------
 .../modules/services/torrent/transmission.nix | 73 +++++++------------
 2 files changed, 38 insertions(+), 78 deletions(-)

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 29ac71777f0..da7c93beee9 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -1,55 +1,39 @@
 { config, lib, pkgs, ... }:
 
+with lib;
+
 let
   cfg = config.security.apparmor;
 in
-
-with lib;
-
 {
-
-  ###### interface
-
   options = {
-
     security.apparmor = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = ''
-          Enable AppArmor application security system. Enable only if
-          you want to further improve AppArmor.
-        '';
+        description = "Enable the AppArmor Mandatory Access Control system.";
       };
 
       profiles = mkOption {
         type = types.listOf types.path;
         default = [];
-        description = ''
-          List of file names of AppArmor profiles.
-        '';
+        description = "List of files containing AppArmor profiles.";
       };
-
     };
   };
 
-
-  ###### implementation
-
-  config = mkIf (cfg.enable) {
-
-    assertions = [ { assertion = config.boot.kernelPackages.kernel.features ? apparmor
-                               && config.boot.kernelPackages.kernel.features.apparmor;
-                     message = "AppArmor is enabled, but the kernel doesn't have AppArmor support"; }
-                 ];
+  config = mkIf cfg.enable {
+    assertions =
+      [ { assertion = config.boot.kernelPackages.kernel.features ? apparmor
+                   && config.boot.kernelPackages.kernel.features.apparmor;
+          message = "Your selected kernel does not have AppArmor support";
+        }
+      ];
 
     environment.systemPackages = [ pkgs.apparmor ];
-
     systemd.services.apparmor = {
-      #wantedBy = [ "basic.target" ];
       wantedBy = [ "local-fs.target" ];
-      path = [ pkgs.apparmor ];
+      path     = [ pkgs.apparmor ];
 
       serviceConfig = {
         Type = "oneshot";
@@ -61,9 +45,6 @@ with lib;
           ''${pkgs.apparmor}/sbin/apparmor_parser -Rv -I ${pkgs.apparmor}/etc/apparmor.d/ "${profile}" ; ''
         ) cfg.profiles;
       };
-
     };
-
   };
-
 }
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 14472b49a7c..5cdecd1eb57 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -1,13 +1,14 @@
-# NixOS module for Transmission BitTorrent daemon
-
 { config, lib, pkgs, ... }:
 
 with lib;
 
 let
-
   cfg = config.services.transmission;
+  apparmor = config.security.apparmor.enable;
+
   homeDir = "/var/lib/transmission";
+  downloadDir = "${homeDir}/Downloads";
+  incompleteDir = "${homeDir}/.incomplete";
   settingsDir = "${homeDir}/.config/transmission-daemon";
   settingsFile = "${settingsDir}/settings.json";
 
@@ -31,16 +32,12 @@ let
         (if isList value then value else [value]))
         as));
 
+  # for users in group "transmission" to have access to torrents
+  fullSettings = cfg.settings // { umask = 2; };
 in
-
 {
-
-  ### configuration
-
   options = {
-
     services.transmission = {
-
       enable = mkOption {
         type = types.uniq types.bool;
         default = false;
@@ -59,65 +56,48 @@ in
         type = types.attrs;
         default =
           {
-            # for users in group "transmission" to have access to torrents
-            umask = 2;
-          }
-        ;
+            download-dir = downloadDir;
+            incomplete-dir = incompleteDir;
+            incomplete-dir-enabled = true;
+          };
         example =
           {
             download-dir = "/srv/torrents/";
             incomplete-dir = "/srv/torrents/.incomplete/";
             incomplete-dir-enabled = true;
             rpc-whitelist = "127.0.0.1,192.168.*.*";
-            # for users in group "transmission" to have access to torrents
-            umask = 2;
-          }
-        ;
+          };
         description = ''
           Attribute set whos fields overwrites fields in settings.json (each
           time the service starts). String values must be quoted, integer and
           boolean values must not.
 
-          See https://trac.transmissionbt.com/wiki/EditConfigFiles for documentation
-          and/or look at ${settingsFile}."
+          See https://trac.transmissionbt.com/wiki/EditConfigFiles for
+          documentation and/or look at ${settingsFile}.
         '';
       };
 
-      rpc_port = mkOption {
+      port = mkOption {
         type = types.uniq types.int;
         default = 9091;
         description = "TCP port number to run the RPC/web interface.";
       };
-
-      apparmor = mkOption {
-        type = types.uniq types.bool;
-        default = true;
-        description = "Generate apparmor profile for transmission-daemon.";
-      };
     };
-
   };
 
-  ### implementation
-
   config = mkIf cfg.enable {
-
     systemd.services.transmission = {
-      description = "Transmission BitTorrent Daemon";
-      after = [ "network.target" ] ++ optional (config.security.apparmor.enable && cfg.apparmor) "apparmor.service";
-      requires = mkIf (config.security.apparmor.enable && cfg.apparmor) [ "apparmor.service" ];
+      description = "Transmission BitTorrent Service";
+      after = [ "network.target" ] ++ optional apparmor "apparmor.service";
+      requires = mkIf apparmor [ "apparmor.service" ];
       wantedBy = [ "multi-user.target" ];
 
       # 1) Only the "transmission" user and group have access to torrents.
       # 2) Optionally update/force specific fields into the configuration file.
-      serviceConfig.ExecStartPre =
-        if cfg.settings != {} then ''
-          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs cfg.settings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}"
-        ''
-        else ''
-          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir}"
-        '';
-      serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.rpc_port}";
+      serviceConfig.ExecStartPre = ''
+          ${pkgs.stdenv.shell} -c "chmod 770 ${homeDir} && mkdir -p ${settingsDir} ${downloadDir} ${incompleteDir} && ${pkgs.transmission}/bin/transmission-daemon -d |& sed ${attrsToSedArgs fullSettings} > ${settingsFile}.tmp && mv ${settingsFile}.tmp ${settingsFile}"
+      '';
+      serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
       serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       serviceConfig.User = "transmission";
       # NOTE: transmission has an internal umask that also must be set (in settings.json)
@@ -127,6 +107,7 @@ in
     # It's useful to have transmission in path, e.g. for remote control
     environment.systemPackages = [ pkgs.transmission ];
 
+    users.extraGroups.transmission.gid = config.ids.gids.transmission;
     users.extraUsers.transmission = {
       group = "transmission";
       uid = config.ids.uids.transmission;
@@ -135,10 +116,8 @@ in
       createHome = true;
     };
 
-    users.extraGroups.transmission.gid = config.ids.gids.transmission;
-
     # AppArmor profile
-    security.apparmor.profiles = mkIf (config.security.apparmor.enable && cfg.apparmor) [
+    security.apparmor.profiles = mkIf apparmor [
       (pkgs.writeText "apparmor-transmission-daemon" ''
         #include <tunables/global>
 
@@ -161,9 +140,9 @@ in
 
           owner ${settingsDir}/** rw,
 
-          ${cfg.settings.download-dir}/** rw,
-          ${optionalString cfg.settings.incomplete-dir-enabled ''
-            ${cfg.settings.incomplete-dir}/** rw,
+          ${fullSettings.download-dir}/** rw,
+          ${optionalString fullSettings.incomplete-dir-enabled ''
+            ${fullSettings.incomplete-dir}/** rw,
           ''}
         }
       '')

From 06edd48842c9ca2488f66e35dee0f45141b1cda5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 14:35:34 +0200
Subject: [PATCH 0166/2033] Fix the bittorrent test

This was broken since e8baaba044689b75ef4f36ebc5a93b7462c23cb2,
because on the tracker, a DNS lookup for "tracker" returns ::1 due to
nss_myhostname. This apparently confused it.
---
 nixos/tests/bittorrent.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 2604d1ffc92..b58657a5ecd 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -42,8 +42,9 @@ in
         { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
           networking.nat.enable = true;
-          networking.nat.internalIPs = [ "192.168.2.0/24" ];
+          networking.nat.internalInterfaces = [ "eth2" ];
           networking.nat.externalInterface = "eth1";
+          networking.firewall.enable = false;
         };
 
       client1 =
@@ -79,7 +80,7 @@ in
       # Create the torrent.
       $tracker->succeed("mkdir /tmp/data");
       $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2");
-      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://tracker:6969/announce -o /tmp/test.torrent");
+      $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent");
       $tracker->succeed("chmod 644 /tmp/test.torrent");
 
       # Start the tracker.  !!! use a less crappy tracker

From 61cc18c55ff34c1df2360d3709c9cf87bc829be7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 14:36:58 +0200
Subject: [PATCH 0167/2033] miniupnpd: Update to 1.8.20140401

---
 pkgs/tools/networking/miniupnpd/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index b5002d22990..ef3db0a4a21 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchurl, iptables, libnfnetlink, libnetfilter_conntrack }:
+{ stdenv, fetchurl, iptables, libnfnetlink }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.7.20121005";
+  name = "miniupnpd-1.8.20140401";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "03kaxj808hgj1zf2528pzilgywgh70mh0qivjb5nm3spziiq32sv";
+    sha256 = "1gfdbfqcw6ih830si51yzqbyymgcbwkiv9vk5dwnxs78b7xgyv88";
   };
 
-  buildInputs = [ iptables libnfnetlink libnetfilter_conntrack ];
-
-  patchPhase = ''
-    sed -i -e 's/upnputils\.o -lnfnetlink/upnputils.o/' Makefile.linux
-  '';
+  buildInputs = [ iptables libnfnetlink ];
 
   NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
 
@@ -24,12 +20,9 @@ stdenv.mkDerivation rec {
 
   makeFlags = "LIBS=";
 
-  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+  buildFlags = "miniupnpd genuuid";
 
-  preInstall =
-    ''
-      mkdir -p $out/share/man/man8
-    '';
+  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
   meta = {
     homepage = http://miniupnp.free.fr/;

From d2ee6e6a247094d91f3e94954ec0fa799aac6e1c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 18 Mar 2014 02:33:31 -0500
Subject: [PATCH 0168/2033] stage 1: Remove scsi_wait_scan as it is not
 supported after kernel 3.7

---
 nixos/modules/system/boot/stage-1-init.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index d0f4576f811..216937a619b 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -139,8 +139,6 @@ mkdir -p /dev/.mdadm
 systemd-udevd --daemon
 udevadm trigger --action=add
 udevadm settle || true
-modprobe scsi_wait_scan || true
-udevadm settle || true
 
 
 # Load boot-time keymap before any LVM/LUKS initialization

From 9e457049e450fce7547f90b033cd257bb793776c Mon Sep 17 00:00:00 2001
From: Eric Kow <eric.kow@gmail.com>
Date: Tue, 15 Apr 2014 13:23:07 +0100
Subject: [PATCH 0169/2033] megam: New package

Maximum Entropy (GA) Model Optimization Package
---
 .../science/misc/megam/default.nix            | 46 +++++++++++++++++++
 .../science/misc/megam/ocaml-3.12.patch       | 12 +++++
 .../science/misc/megam/ocaml-includes.patch   | 21 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 81 insertions(+)
 create mode 100644 pkgs/applications/science/misc/megam/default.nix
 create mode 100644 pkgs/applications/science/misc/megam/ocaml-3.12.patch
 create mode 100644 pkgs/applications/science/misc/megam/ocaml-includes.patch

diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
new file mode 100644
index 00000000000..a0ee505dc97
--- /dev/null
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -0,0 +1,46 @@
+{ fetchurl, stdenv, ocaml, makeWrapper, ncurses }:
+
+let version = "0.92"; in
+stdenv.mkDerivation rec {
+  name = "megam-${version}";
+
+  src = fetchurl {
+    url = "http://hal3.name/megam/megam_src.tgz";
+    sha256 = "dc0e9f59ff8513449fe3bd40b260141f89c88a4edf6ddc8b8a394c758e49724e";
+  };
+
+  patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ];
+  
+  buildInputs = [ ocaml ncurses ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  makeFlags = "CAML_INCLUDES=${ocaml}/lib/ocaml/caml";
+
+  # see https://bugzilla.redhat.com/show_bug.cgi?id=435559
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    cp -Rv megam $out/bin
+  '';
+
+
+  meta = {
+    description = "MEGA Model Optimization Package";
+
+    longDescription =
+      ''  The software here is an implementation of maximum likelihood
+          and maximum a posterior optimization of the parameters of
+          these models.  The algorithms used are much more efficient
+          than the iterative scaling techniques used in almost every
+          other maxent package out there.  '';
+
+    homepage = http://www.umiacs.umd.edu/~hal/megam;
+
+    license = "non-commercial";
+
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/applications/science/misc/megam/ocaml-3.12.patch b/pkgs/applications/science/misc/megam/ocaml-3.12.patch
new file mode 100644
index 00000000000..8265acf6e4a
--- /dev/null
+++ b/pkgs/applications/science/misc/megam/ocaml-3.12.patch
@@ -0,0 +1,12 @@
+diff -ru megam_0.92/Makefile megam_0.92-b/Makefile
+--- megam_0.92/Makefile	2007-10-08 18:06:04.000000000 +0100
++++ megam_0.92-b/Makefile	2013-11-25 10:14:20.000000000 +0000
+@@ -59,7 +59,7 @@
+ 
+ WITHUNIX =unix.cma -cclib -lunix
+ 
+-WITHSTR =str.cma -cclib -lstr
++WITHSTR =str.cma -cclib -lcamlstr
+ 
+ WITHBIGARRAY =bigarray.cma -cclib -lbigarray
+ 
diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/applications/science/misc/megam/ocaml-includes.patch
new file mode 100644
index 00000000000..b3a56643448
--- /dev/null
+++ b/pkgs/applications/science/misc/megam/ocaml-includes.patch
@@ -0,0 +1,21 @@
+diff -ru megam_0.92/Makefile megam_0.92-b/Makefile
+--- megam_0.92/Makefile	2007-10-08 18:06:04.000000000 +0100
++++ megam_0.92-b/Makefile	2013-11-25 10:14:20.000000000 +0000
+@@ -41,7 +41,7 @@
+ #
+ # The Caml compilers. #
+ # You may fix here the path to access the Caml compiler on your machine
+-CAMLC = ocamlc -g
++CAMLC = ocamlc -g $(WITHCLIBS)
+ CAMLOPT = ocamlopt -unsafe -ccopt -O4 -ccopt -ffast-math -inline 99999 
+ CAMLDEP = ocamldep
+ CAMLLEX = ocamllex
+@@ -70,7 +70,7 @@
+ WITHDBM =dbm.cma -cclib -lmldbm -cclib -lndbm
+ 
+ #WITHCLIBS =-I /usr/lib/ocaml/3.09.2/caml
+-WITHCLIBS =-I /usr/lib/ocaml/caml
++WITHCLIBS =-I $(CAML_INCLUDES) 
+ 
+ ################ End of user's variables #####################
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 743d699ee87..9fdfda37a76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10352,6 +10352,8 @@ let
 
   golly = callPackage ../applications/science/misc/golly { };
 
+  megam = callPackage ../applications/science/misc/megam { };
+
   root = callPackage ../applications/science/misc/root { };
 
   simgrid = callPackage ../applications/science/misc/simgrid { };

From 38e81b5640f43fc5191a45d04d528bf8bf985541 Mon Sep 17 00:00:00 2001
From: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
Date: Tue, 15 Apr 2014 07:54:36 +0530
Subject: [PATCH 0170/2033] plan9port: modify the builder to use the INSTALL
 script.

plan9port ships with an INSTALL script. This commit modifies the
builder to use the script instead of a custom build script. The
commit also adds a patch to build fontsrv, which is otherwise
omitted from the build.
---
 pkgs/tools/system/plan9port/builder.sh    | 46 ++++-------------------
 pkgs/tools/system/plan9port/default.nix   |  4 +-
 pkgs/tools/system/plan9port/fontsrv.patch | 14 +++++++
 3 files changed, 24 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/tools/system/plan9port/fontsrv.patch

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index bf5e6eeffa5..729da7015d9 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -4,46 +4,14 @@ tar xvfz $src
 
 cd plan9
 
-export PLAN9=`pwd`
-export X11=/tmp
+for p in $patches; do
+  echo "applying patch $p"
+  patch -p1 < $p
+done
 
-# Patch for the installation
-sed -i -e 's@`which echo`@echo@' lib/moveplan9.sh
+./INSTALL -b
+./INSTALL -r $out/plan9
 
-OLDPATH=$PATH
-PATH=`pwd`/bin:$PATH
-
-gcc lib/linux-isnptl.c -lpthread
-set +e 
-if ./a.out > /dev/null
-then
-  echo "SYSVERSION=2.6.x" >config
-else
-  echo "SYSVERSION=2.4.x" >config
-fi
-rm -f ./a.out
-set -e
-
-pushd src
-
-# Build mk
-../dist/buildmk 2>&1 | sed 's/^[+] //'
-
-# Build everything
-
-mk clean
-mk libs-nuke
-mk all || exit 1
-mk install || exit 1
-
-popd
-
-# Installation
-export PLAN9=$out
+export PLAN9=$out/plan9
 mkdir -p $PLAN9
-GLOBIGNORE='src:.*'
 cp -R * $PLAN9
-GLOBIGNORE=
-
-cd $PLAN9
-sh lib/moveplan9.sh `pwd`
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index e5ec557a79a..a6bc427178c 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation rec {
   name = "plan9port-20140228";
-  
+
+  patches = [ ./fontsrv.patch ];
+
   builder = ./builder.sh;
 
   src = fetchurl {
diff --git a/pkgs/tools/system/plan9port/fontsrv.patch b/pkgs/tools/system/plan9port/fontsrv.patch
new file mode 100644
index 00000000000..49fd9c04231
--- /dev/null
+++ b/pkgs/tools/system/plan9port/fontsrv.patch
@@ -0,0 +1,14 @@
+diff -r dc0640f14d07 src/cmd/mkfile
+--- a/src/cmd/mkfile	Tue Mar 25 23:23:10 2014 -0400
++++ b/src/cmd/mkfile	Mon Apr 14 22:36:05 2014 +0530
+@@ -4,8 +4,8 @@
+ 
+ <$PLAN9/src/mkmany
+ 
+-BUGGERED='CVS|faces|factotum|fontsrv|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
+-DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
++BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
++DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'`
+ 
+ <$PLAN9/src/mkdirs
+ 

From 420263ba50d86be044a5ff7118ff2da740205925 Mon Sep 17 00:00:00 2001
From: Ramakrishnan Muthukrishnan <vu3rdd@gmail.com>
Date: Tue, 15 Apr 2014 10:52:12 +0530
Subject: [PATCH 0171/2033] plan9port: Do not fetch X11 build dependencies if
 building on darwin.

---
 pkgs/tools/system/plan9port/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index a6bc427178c..f166f198b70 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,4 +1,8 @@
-{stdenv, fetchurl, libX11, xproto, libXt, xextproto, libXext}:
+{stdenv, fetchurl, libX11
+, xproto ? null
+, libXt ? null
+, xextproto ? null
+, libXext ? null }:
 
 stdenv.mkDerivation rec {
   name = "plan9port-20140228";
@@ -12,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l7nsjfrrcq0l43kw0f1437jz3nyl9qw7i2vn0sbmcsv5vmsj0cr";
   };
 
-  buildInputs = [ libX11 xproto libXt xextproto libXext ];
+  buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 xproto libXt xextproto libXext ];
 
   meta = {
     homepage = "http://swtch.com/plan9port/";

From 0ae505179bab43426533773dd02c77ced27bdb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 15 Apr 2014 15:13:12 +0200
Subject: [PATCH 0172/2033] haskell-pipes-network: add maintainers attribute
 again

---
 pkgs/development/libraries/haskell/pipes-network/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
index cd62850c96d..1b816a704f2 100644
--- a/pkgs/development/libraries/haskell/pipes-network/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-network/default.nix
@@ -13,5 +13,6 @@ cabal.mkDerivation (self: {
     description = "Use network sockets together with the pipes library";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
   };
 })

From f0d7c3841e4a00574adb29cae265b4161e8a0dbf Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 15 Apr 2014 09:26:58 -0400
Subject: [PATCH 0173/2033] Update node packages, add pure-css

---
 pkgs/top-level/node-packages-generated.nix | 1831 +++++++++++---------
 pkgs/top-level/node-packages.json          |    1 +
 2 files changed, 998 insertions(+), 834 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index b764512ff0b..28154178770 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -2,14 +2,14 @@
 
 {
   by-spec."Base64"."~0.2.0" =
-    self.by-version."Base64"."0.2.0";
-  by-version."Base64"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-Base64-0.2.0";
+    self.by-version."Base64"."0.2.1";
+  by-version."Base64"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-Base64-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/Base64/-/Base64-0.2.0.tgz";
-        name = "Base64-0.2.0.tgz";
-        sha1 = "448879efb6803979daaf7f36e7807e8a1d291205";
+        url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+        name = "Base64-0.2.1.tgz";
+        sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
       })
     ];
     buildInputs =
@@ -35,7 +35,7 @@
       (self.nativeDeps."CSSselect" or []);
     deps = [
       self.by-version."CSSwhat"."0.4.5"
-      self.by-version."domutils"."1.4.1"
+      self.by-version."domutils"."1.4.3"
       self.by-version."boolbase"."1.0.0"
       self.by-version."nth-check"."1.0.0"
     ];
@@ -58,7 +58,7 @@
       (self.nativeDeps."CSSselect" or []);
     deps = [
       self.by-version."CSSwhat"."0.4.5"
-      self.by-version."domutils"."1.4.1"
+      self.by-version."domutils"."1.4.3"
     ];
     peerDependencies = [
     ];
@@ -105,21 +105,21 @@
     passthru.names = [ "JSONStream" ];
   };
   by-spec."JSONStream"."~0.7.1" =
-    self.by-version."JSONStream"."0.7.1";
-  by-version."JSONStream"."0.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-JSONStream-0.7.1";
+    self.by-version."JSONStream"."0.7.2";
+  by-version."JSONStream"."0.7.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-JSONStream-0.7.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.1.tgz";
-        name = "JSONStream-0.7.1.tgz";
-        sha1 = "0a6bf7f85459beb1319486927d293c7cef8a0260";
+        url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.2.tgz";
+        name = "JSONStream-0.7.2.tgz";
+        sha1 = "27f4d7fe1918dc08ee72aed9c794e32ce80618f7";
       })
     ];
     buildInputs =
       (self.nativeDeps."JSONStream" or []);
     deps = [
       self.by-version."jsonparse"."0.0.5"
-      self.by-version."through"."2.2.7"
+      self.by-version."through"."2.3.4"
     ];
     peerDependencies = [
     ];
@@ -746,35 +746,35 @@
     ];
     passthru.names = [ "assertion-error" ];
   };
-  by-spec."astw"."~0.1.0" =
-    self.by-version."astw"."0.1.0";
-  by-version."astw"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-astw-0.1.0";
+  by-spec."astw"."~1.1.0" =
+    self.by-version."astw"."1.1.0";
+  by-version."astw"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-astw-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
-        name = "astw-0.1.0.tgz";
-        sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085";
+        url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
+        name = "astw-1.1.0.tgz";
+        sha1 = "f394778ab01c4ea467e64a614ed896ace0321a34";
       })
     ];
     buildInputs =
       (self.nativeDeps."astw" or []);
     deps = [
-      self.by-version."esprima-six"."0.0.3"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "astw" ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.6.2";
-  by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-async-0.6.2";
+    self.by-version."async"."0.7.0";
+  by-version."async"."0.7.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.7.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
-        name = "async-0.6.2.tgz";
-        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
+        url = "http://registry.npmjs.org/async/-/async-0.7.0.tgz";
+        name = "async-0.7.0.tgz";
+        sha1 = "4429e0e62f5de0a54f37458c49f0b897eb52ada5";
       })
     ];
     buildInputs =
@@ -785,7 +785,7 @@
     ];
     passthru.names = [ "async" ];
   };
-  "async" = self.by-version."async"."0.6.2";
+  "async" = self.by-version."async"."0.7.0";
   by-spec."async"."0.1.15" =
     self.by-version."async"."0.1.15";
   by-version."async"."0.1.15" = lib.makeOverridable self.buildNodePackage {
@@ -868,8 +868,6 @@
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
-  by-spec."async"."~0.2.10" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
@@ -878,6 +876,44 @@
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.10";
+  by-spec."async"."~0.4" =
+    self.by-version."async"."0.4.1";
+  by-version."async"."0.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.4.1.tgz";
+        name = "async-0.4.1.tgz";
+        sha1 = "1985abade017df906bfaa8d77d424b25366b3a5b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
+  by-spec."async"."~0.6.2" =
+    self.by-version."async"."0.6.2";
+  by-version."async"."0.6.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-async-0.6.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.6.2.tgz";
+        name = "async-0.6.2.tgz";
+        sha1 = "41fd038a3812c0a8bc1842ecf08ba63eb0392bef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."async" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "async" ];
+  };
   by-spec."aws-sdk"."*" =
     self.by-version."aws-sdk"."2.0.0-rc9";
   by-version."aws-sdk"."2.0.0-rc9" = lib.makeOverridable self.buildNodePackage {
@@ -1156,14 +1192,14 @@
     passthru.names = [ "binary" ];
   };
   by-spec."bindings"."*" =
-    self.by-version."bindings"."1.1.1";
-  by-version."bindings"."1.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-bindings-1.1.1";
+    self.by-version."bindings"."1.2.0";
+  by-version."bindings"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bindings-1.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
-        name = "bindings-1.1.1.tgz";
-        sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+        url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
+        name = "bindings-1.2.0.tgz";
+        sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
       })
     ];
     buildInputs =
@@ -1234,6 +1270,28 @@
     ];
     passthru.names = [ "blueimp-md5" ];
   };
+  by-spec."body-parser"."~1.0.1" =
+    self.by-version."body-parser"."1.0.2";
+  by-version."body-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-body-parser-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/body-parser/-/body-parser-1.0.2.tgz";
+        name = "body-parser-1.0.2.tgz";
+        sha1 = "3461479a3278fe00fcaebec3314bb54fc4f7b47c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."body-parser" or []);
+    deps = [
+      self.by-version."type-is"."1.1.0"
+      self.by-version."raw-body"."1.1.3"
+      self.by-version."qs"."0.6.6"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "body-parser" ];
+  };
   by-spec."boolbase"."~1.0.0" =
     self.by-version."boolbase"."1.0.0";
   by-version."boolbase"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -1294,14 +1352,14 @@
     passthru.names = [ "boom" ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.3.1";
-  by-version."bower"."1.3.1" = lib.makeOverridable self.buildNodePackage {
-    name = "bower-1.3.1";
+    self.by-version."bower"."1.3.2";
+  by-version."bower"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "bower-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/bower/-/bower-1.3.1.tgz";
-        name = "bower-1.3.1.tgz";
-        sha1 = "60d564e774be4e60631a159566830fce260e469a";
+        url = "http://registry.npmjs.org/bower/-/bower-1.3.2.tgz";
+        name = "bower-1.3.2.tgz";
+        sha1 = "ae1eeea5c3ba9300e10e55b193e9d2fd5407fb7b";
       })
     ];
     buildInputs =
@@ -1317,7 +1375,7 @@
       self.by-version."cardinal"."0.4.4"
       self.by-version."chalk"."0.4.0"
       self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.5"
+      self.by-version."decompress-zip"."0.0.6"
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.9"
@@ -1326,10 +1384,10 @@
       self.by-version."inquirer"."0.4.1"
       self.by-version."junk"."0.2.2"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."mout"."0.9.0"
+      self.by-version."mout"."0.9.1"
       self.by-version."nopt"."2.1.2"
       self.by-version."lru-cache"."2.5.0"
-      self.by-version."open"."0.0.4"
+      self.by-version."open"."0.0.5"
       self.by-version."osenv"."0.0.3"
       self.by-version."promptly"."0.2.0"
       self.by-version."q"."1.0.1"
@@ -1347,16 +1405,17 @@
       self.by-version."insight"."0.3.1"
       self.by-version."is-root"."0.1.0"
       self.by-version."shell-quote"."1.4.1"
+      self.by-version."lockfile"."0.4.2"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "bower" ];
   };
-  "bower" = self.by-version."bower"."1.3.1";
+  "bower" = self.by-version."bower"."1.3.2";
   by-spec."bower".">=0.9.0" =
-    self.by-version."bower"."1.3.1";
+    self.by-version."bower"."1.3.2";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.1";
+    self.by-version."bower"."1.3.2";
   by-spec."bower"."~1.2.0" =
     self.by-version."bower"."1.2.8";
   by-version."bower"."1.2.8" = lib.makeOverridable self.buildNodePackage {
@@ -1381,7 +1440,7 @@
       self.by-version."cardinal"."0.4.4"
       self.by-version."chalk"."0.2.1"
       self.by-version."chmodr"."0.1.0"
-      self.by-version."decompress-zip"."0.0.5"
+      self.by-version."decompress-zip"."0.0.6"
       self.by-version."fstream"."0.1.25"
       self.by-version."fstream-ignore"."0.0.7"
       self.by-version."glob"."3.2.9"
@@ -1393,7 +1452,7 @@
       self.by-version."mout"."0.7.1"
       self.by-version."nopt"."2.1.2"
       self.by-version."lru-cache"."2.3.1"
-      self.by-version."open"."0.0.4"
+      self.by-version."open"."0.0.5"
       self.by-version."osenv"."0.0.3"
       self.by-version."promptly"."0.2.0"
       self.by-version."q"."0.9.7"
@@ -1591,7 +1650,7 @@
       self.by-version."bower-json"."0.4.0"
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.1"
+      self.by-version."bower"."1.3.2"
       self.by-version."argparse"."0.1.15"
       self.by-version."clone"."0.1.11"
       self.by-version."semver"."2.2.1"
@@ -1687,7 +1746,7 @@
       (self.nativeDeps."browserchannel" or []);
     deps = [
       self.by-version."hat"."0.0.3"
-      self.by-version."connect"."2.14.3"
+      self.by-version."connect"."2.14.4"
       self.by-version."request"."2.34.0"
       self.by-version."ascii-json"."0.2.0"
     ];
@@ -1696,65 +1755,65 @@
     passthru.names = [ "browserchannel" ];
   };
   "browserchannel" = self.by-version."browserchannel"."1.2.0";
-  by-spec."browserify"."~3.32.0" =
-    self.by-version."browserify"."3.32.1";
-  by-version."browserify"."3.32.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.32.1";
+  by-spec."browserify"."~3.38.0" =
+    self.by-version."browserify"."3.38.1";
+  by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.38.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.32.1.tgz";
-        name = "browserify-3.32.1.tgz";
-        sha1 = "5d4ad85d5cafee3fc1062e76e56143d0c298bfcb";
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.38.1.tgz";
+        name = "browserify-3.38.1.tgz";
+        sha1 = "4790937ec5b01f1c340e83521e36c4e3aaf3d7ba";
       })
     ];
     buildInputs =
       (self.nativeDeps."browserify" or []);
     deps = [
-      self.by-version."module-deps"."1.7.1"
+      self.by-version."JSONStream"."0.7.2"
+      self.by-version."assert"."1.1.1"
       self.by-version."browser-pack"."2.0.1"
-      self.by-version."deps-sort"."0.1.1"
-      self.by-version."shell-quote"."0.0.1"
-      self.by-version."through"."2.3.4"
-      self.by-version."duplexer"."0.1.1"
-      self.by-version."stream-combiner"."0.0.4"
-      self.by-version."concat-stream"."1.4.4"
-      self.by-version."insert-module-globals"."3.2.0"
-      self.by-version."syntax-error"."0.1.0"
       self.by-version."browser-resolve"."1.2.2"
-      self.by-version."inherits"."2.0.1"
-      self.by-version."JSONStream"."0.7.1"
-      self.by-version."umd"."2.0.0"
-      self.by-version."parents"."0.0.2"
-      self.by-version."deep-equal"."0.1.2"
-      self.by-version."constants-browserify"."0.0.1"
-      self.by-version."os-browserify"."0.1.2"
+      self.by-version."buffer"."2.1.12"
+      self.by-version."builtins"."0.0.3"
+      self.by-version."commondir"."0.0.1"
+      self.by-version."concat-stream"."1.4.5"
       self.by-version."console-browserify"."1.0.3"
+      self.by-version."constants-browserify"."0.0.1"
+      self.by-version."crypto-browserify"."1.0.9"
+      self.by-version."deep-equal"."0.1.2"
+      self.by-version."defined"."0.0.0"
+      self.by-version."deps-sort"."0.1.1"
+      self.by-version."derequire"."0.8.0"
+      self.by-version."domain-browser"."1.1.1"
+      self.by-version."duplexer"."0.1.1"
+      self.by-version."events"."1.0.0"
+      self.by-version."glob"."3.2.9"
+      self.by-version."http-browserify"."1.3.2"
+      self.by-version."https-browserify"."0.0.0"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."insert-module-globals"."5.0.1"
+      self.by-version."module-deps"."1.8.1"
+      self.by-version."os-browserify"."0.1.2"
+      self.by-version."parents"."0.0.2"
+      self.by-version."path-browserify"."0.0.0"
+      self.by-version."punycode"."1.2.4"
+      self.by-version."querystring-es3"."0.2.0"
+      self.by-version."resolve"."0.6.2"
+      self.by-version."shallow-copy"."0.0.1"
+      self.by-version."shell-quote"."0.0.1"
+      self.by-version."stream-browserify"."0.1.3"
+      self.by-version."stream-combiner"."0.0.4"
+      self.by-version."string_decoder"."0.0.1"
+      self.by-version."subarg"."0.0.1"
+      self.by-version."syntax-error"."1.1.0"
+      self.by-version."through2"."0.4.1"
+      self.by-version."timers-browserify"."1.0.1"
+      self.by-version."tty-browserify"."0.0.0"
+      self.by-version."umd"."2.0.0"
+      self.by-version."url"."0.7.9"
+      self.by-version."util"."0.10.3"
       self.by-version."vm-browserify"."0.0.4"
       self.by-version."zlib-browserify"."0.0.3"
-      self.by-version."assert"."1.1.1"
-      self.by-version."http-browserify"."1.3.2"
-      self.by-version."crypto-browserify"."1.0.9"
-      self.by-version."util"."0.10.3"
-      self.by-version."events"."1.0.0"
-      self.by-version."buffer"."2.1.5"
-      self.by-version."url"."0.7.9"
-      self.by-version."https-browserify"."0.0.0"
-      self.by-version."path-browserify"."0.0.0"
-      self.by-version."querystring-es3"."0.2.0"
-      self.by-version."stream-browserify"."0.1.3"
-      self.by-version."string_decoder"."0.0.1"
-      self.by-version."tty-browserify"."0.0.0"
-      self.by-version."timers-browserify"."1.0.1"
-      self.by-version."punycode"."1.2.4"
-      self.by-version."defined"."0.0.0"
-      self.by-version."domain-browser"."1.1.1"
-      self.by-version."derequire"."0.6.1"
-      self.by-version."commondir"."0.0.1"
-      self.by-version."shallow-copy"."0.0.1"
-      self.by-version."subarg"."0.0.1"
-      self.by-version."resolve"."0.6.2"
-      self.by-version."glob"."3.2.9"
-      self.by-version."builtins"."0.0.2"
     ];
     peerDependencies = [
     ];
@@ -1838,14 +1897,14 @@
     passthru.names = [ "bson" ];
   };
   by-spec."buffer"."~2.1.4" =
-    self.by-version."buffer"."2.1.5";
-  by-version."buffer"."2.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-2.1.5";
+    self.by-version."buffer"."2.1.12";
+  by-version."buffer"."2.1.12" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.1.12";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.5.tgz";
-        name = "buffer-2.1.5.tgz";
-        sha1 = "15373190bc584061de5cbc155db82a0dc1a462de";
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.12.tgz";
+        name = "buffer-2.1.12.tgz";
+        sha1 = "da6270d276406da92cdf357b5fb09e1edc547f22";
       })
     ];
     buildInputs =
@@ -1956,15 +2015,15 @@
     ];
     passthru.names = [ "buffertools" ];
   };
-  by-spec."builtins"."0.0.2" =
-    self.by-version."builtins"."0.0.2";
-  by-version."builtins"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-builtins-0.0.2";
+  by-spec."builtins"."~0.0.3" =
+    self.by-version."builtins"."0.0.3";
+  by-version."builtins"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-builtins-0.0.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.2.tgz";
-        name = "builtins-0.0.2.tgz";
-        sha1 = "b738db1ea166b752f7e0144c76f6ad5289448e51";
+        url = "http://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz";
+        name = "builtins-0.0.3.tgz";
+        sha1 = "5d006166da71610bc2bcf73019f0f0cc43309755";
       })
     ];
     buildInputs =
@@ -2073,6 +2132,25 @@
     ];
     passthru.names = [ "bytes" ];
   };
+  by-spec."bytes"."0.3.0" =
+    self.by-version."bytes"."0.3.0";
+  by-version."bytes"."0.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-bytes-0.3.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
+        name = "bytes-0.3.0.tgz";
+        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."bytes" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "bytes" ];
+  };
   by-spec."bytes"."~0.2.0" =
     self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.2.1" =
@@ -2173,7 +2251,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.4"
+      self.by-version."has-color"."0.1.6"
       self.by-version."ansi-styles"."1.0.0"
       self.by-version."strip-ansi"."0.1.1"
     ];
@@ -2195,7 +2273,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.4"
+      self.by-version."has-color"."0.1.6"
       self.by-version."ansi-styles"."0.1.2"
     ];
     peerDependencies = [
@@ -2216,7 +2294,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.4"
+      self.by-version."has-color"."0.1.6"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -2237,7 +2315,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.4"
+      self.by-version."has-color"."0.1.6"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -2369,7 +2447,7 @@
     ];
     passthru.names = [ "chmodr" ];
   };
-  by-spec."chokidar"."~0.8.0" =
+  by-spec."chokidar".">=0.8.2" =
     self.by-version."chokidar"."0.8.2";
   by-version."chokidar"."0.8.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-chokidar-0.8.2";
@@ -2409,6 +2487,26 @@
     ];
     passthru.names = [ "chownr" ];
   };
+  by-spec."circular-json"."0.1.x" =
+    self.by-version."circular-json"."0.1.6";
+  by-version."circular-json"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-circular-json-0.1.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/circular-json/-/circular-json-0.1.6.tgz";
+        name = "circular-json-0.1.6.tgz";
+        sha1 = "fd692b65f8bce4f2900bea14f74ad681ab294c7f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."circular-json" or []);
+    deps = [
+      self.by-version."wru"."0.2.7"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "circular-json" ];
+  };
   by-spec."class-extend"."~0.1.0" =
     self.by-version."class-extend"."0.1.1";
   by-version."class-extend"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -3072,14 +3170,14 @@
     passthru.names = [ "compression" ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.4";
-  by-version."concat-stream"."1.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-concat-stream-1.4.4";
+    self.by-version."concat-stream"."1.4.5";
+  by-version."concat-stream"."1.4.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-concat-stream-1.4.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.4.tgz";
-        name = "concat-stream-1.4.4.tgz";
-        sha1 = "88cf474555dfbbdbeb34453e7f1e417dae97ce21";
+        url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.5.tgz";
+        name = "concat-stream-1.4.5.tgz";
+        sha1 = "cbf6ffd17c15d58f0baeacbb47d927cf566446a6";
       })
     ];
     buildInputs =
@@ -3094,7 +3192,7 @@
     passthru.names = [ "concat-stream" ];
   };
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.4";
+    self.by-version."concat-stream"."1.4.5";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = lib.makeOverridable self.buildNodePackage {
@@ -3212,7 +3310,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3222,40 +3320,6 @@
     ];
     passthru.names = [ "connect" ];
   };
-  by-spec."connect"."2.12.0" =
-    self.by-version."connect"."2.12.0";
-  by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.12.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz";
-        name = "connect-2.12.0.tgz";
-        sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."connect" or []);
-    deps = [
-      self.by-version."batch"."0.5.0"
-      self.by-version."qs"."0.6.6"
-      self.by-version."cookie-signature"."1.0.1"
-      self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."cookie"."0.1.0"
-      self.by-version."send"."0.1.4"
-      self.by-version."bytes"."0.2.1"
-      self.by-version."fresh"."0.2.0"
-      self.by-version."pause"."0.0.1"
-      self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.0"
-      self.by-version."methods"."0.1.0"
-      self.by-version."raw-body"."1.1.2"
-      self.by-version."negotiator"."0.3.0"
-      self.by-version."multiparty"."2.2.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "connect" ];
-  };
   by-spec."connect"."2.14.1" =
     self.by-version."connect"."2.14.1";
   by-version."connect"."2.14.1" = lib.makeOverridable self.buildNodePackage {
@@ -3289,7 +3353,7 @@
       self.by-version."vhost"."1.0.0"
       self.by-version."bytes"."0.2.1"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3318,7 +3382,7 @@
       self.by-version."bytes"."0.1.0"
       self.by-version."send"."0.0.3"
       self.by-version."fresh"."0.1.0"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3347,7 +3411,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3376,21 +3440,21 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "connect" ];
   };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.14.3";
-  by-version."connect"."2.14.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-connect-2.14.3";
+    self.by-version."connect"."2.14.4";
+  by-version."connect"."2.14.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.14.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/connect/-/connect-2.14.3.tgz";
-        name = "connect-2.14.3.tgz";
-        sha1 = "be8267f116cc905b53b29e0e7c9ea278d71d597b";
+        url = "http://registry.npmjs.org/connect/-/connect-2.14.4.tgz";
+        name = "connect-2.14.4.tgz";
+        sha1 = "40e74de3947a5278035c12f21535604555609a5a";
       })
     ];
     buildInputs =
@@ -3401,7 +3465,7 @@
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."compression"."1.0.0"
       self.by-version."connect-timeout"."1.0.0"
-      self.by-version."csurf"."1.0.0"
+      self.by-version."csurf"."1.1.0"
       self.by-version."errorhandler"."1.0.0"
       self.by-version."express-session"."1.0.2"
       self.by-version."fresh"."0.2.2"
@@ -3409,13 +3473,14 @@
       self.by-version."morgan"."1.0.0"
       self.by-version."qs"."0.6.6"
       self.by-version."response-time"."1.0.0"
+      self.by-version."setimmediate"."1.0.1"
       self.by-version."serve-index"."1.0.1"
-      self.by-version."serve-static"."1.0.2"
+      self.by-version."serve-static"."1.0.4"
       self.by-version."static-favicon"."1.0.2"
       self.by-version."vhost"."1.0.0"
-      self.by-version."bytes"."0.2.1"
+      self.by-version."bytes"."0.3.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3425,6 +3490,38 @@
   };
   by-spec."connect"."~2.12.0" =
     self.by-version."connect"."2.12.0";
+  by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-connect-2.12.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/connect/-/connect-2.12.0.tgz";
+        name = "connect-2.12.0.tgz";
+        sha1 = "31d8fa0dcacdf1908d822bd2923be8a2d2a7ed9a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."connect" or []);
+    deps = [
+      self.by-version."batch"."0.5.0"
+      self.by-version."qs"."0.6.6"
+      self.by-version."cookie-signature"."1.0.1"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."cookie"."0.1.0"
+      self.by-version."send"."0.1.4"
+      self.by-version."bytes"."0.2.1"
+      self.by-version."fresh"."0.2.0"
+      self.by-version."pause"."0.0.1"
+      self.by-version."uid2"."0.0.3"
+      self.by-version."debug"."0.8.1"
+      self.by-version."methods"."0.1.0"
+      self.by-version."raw-body"."1.1.2"
+      self.by-version."negotiator"."0.3.0"
+      self.by-version."multiparty"."2.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "connect" ];
+  };
   by-spec."connect-flash"."*" =
     self.by-version."connect-flash"."0.1.1";
   by-version."connect-flash"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -3478,7 +3575,7 @@
     buildInputs =
       (self.nativeDeps."connect-jade-static" or []);
     deps = [
-      self.by-version."jade"."1.3.0"
+      self.by-version."jade"."1.3.1"
     ];
     peerDependencies = [
     ];
@@ -3520,7 +3617,7 @@
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3798,6 +3895,8 @@
     ];
     passthru.names = [ "cookie-parser" ];
   };
+  by-spec."cookie-parser"."~1.0.1" =
+    self.by-version."cookie-parser"."1.0.1";
   by-spec."cookie-signature"."1.0.0" =
     self.by-version."cookie-signature"."1.0.0";
   by-version."cookie-signature"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -4211,6 +4310,27 @@
     ];
     passthru.names = [ "csurf" ];
   };
+  by-spec."csurf"."1.1.0" =
+    self.by-version."csurf"."1.1.0";
+  by-version."csurf"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-csurf-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
+        name = "csurf-1.1.0.tgz";
+        sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."csurf" or []);
+    deps = [
+      self.by-version."uid2"."0.0.3"
+      self.by-version."scmp"."0.0.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "csurf" ];
+  };
   by-spec."ctype"."0.5.0" =
     self.by-version."ctype"."0.5.0";
   by-version."ctype"."0.5.0" = lib.makeOverridable self.buildNodePackage {
@@ -4326,14 +4446,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.8.0";
-  by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.8.0";
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
-        name = "debug-0.8.0.tgz";
-        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+        name = "debug-0.8.1.tgz";
+        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
       })
     ];
     buildInputs =
@@ -4383,48 +4503,48 @@
     passthru.names = [ "debug" ];
   };
   by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.8.0";
+    self.by-version."debug"."0.8.1";
   by-spec."debug"."~0.7.0" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
-  by-spec."debug"."~0.7.3" =
-    self.by-version."debug"."0.7.4";
-  by-spec."decompress"."~0.2.0" =
-    self.by-version."decompress"."0.2.0";
-  by-version."decompress"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-decompress-0.2.0";
+  by-spec."debug"."~0.8" =
+    self.by-version."debug"."0.8.1";
+  by-spec."decompress"."^0.2.0" =
+    self.by-version."decompress"."0.2.2";
+  by-version."decompress"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-decompress-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.0.tgz";
-        name = "decompress-0.2.0.tgz";
-        sha1 = "548f7d789181afe2378ddff1db18784ffa181410";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.2.tgz";
+        name = "decompress-0.2.2.tgz";
+        sha1 = "12ab828b16f5990de645e48917774ef6045267c0";
       })
     ];
     buildInputs =
       (self.nativeDeps."decompress" or []);
     deps = [
       self.by-version."adm-zip"."0.4.4"
+      self.by-version."map-key"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."rimraf"."2.2.6"
-      self.by-version."stream-combiner"."0.0.2"
+      self.by-version."stream-combiner"."0.0.4"
       self.by-version."tar"."0.1.19"
       self.by-version."tempfile"."0.1.3"
-      self.by-version."map-key"."0.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "decompress" ];
   };
   by-spec."decompress-zip"."~0.0.3" =
-    self.by-version."decompress-zip"."0.0.5";
-  by-version."decompress-zip"."0.0.5" = lib.makeOverridable self.buildNodePackage {
-    name = "decompress-zip-0.0.5";
+    self.by-version."decompress-zip"."0.0.6";
+  by-version."decompress-zip"."0.0.6" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-zip-0.0.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.5.tgz";
-        name = "decompress-zip-0.0.5.tgz";
-        sha1 = "ab145d0dfe4f1c4249af7efcdff1df669eca0c8c";
+        url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.6.tgz";
+        name = "decompress-zip-0.0.6.tgz";
+        sha1 = "263ef05b304cdcd1172858af453561c53ae017bb";
       })
     ];
     buildInputs =
@@ -4621,44 +4741,44 @@
     ];
     passthru.names = [ "deps-sort" ];
   };
-  by-spec."derequire"."~0.6.0" =
-    self.by-version."derequire"."0.6.1";
-  by-version."derequire"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-derequire-0.6.1";
+  by-spec."derequire"."~0.8.0" =
+    self.by-version."derequire"."0.8.0";
+  by-version."derequire"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-derequire-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
-        name = "derequire-0.6.1.tgz";
-        sha1 = "cce8ee25380de715deb61900f0bdd38222928788";
+        url = "http://registry.npmjs.org/derequire/-/derequire-0.8.0.tgz";
+        name = "derequire-0.8.0.tgz";
+        sha1 = "c1f7f1da2cede44adede047378f03f444e9c4c0d";
       })
     ];
     buildInputs =
       (self.nativeDeps."derequire" or []);
     deps = [
       self.by-version."estraverse"."1.5.0"
-      self.by-version."esprima-six"."0.0.3"
       self.by-version."esrefactor"."0.1.0"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "derequire" ];
   };
-  by-spec."detective"."~2.4.0" =
-    self.by-version."detective"."2.4.1";
-  by-version."detective"."2.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-detective-2.4.1";
+  by-spec."detective"."~3.1.0" =
+    self.by-version."detective"."3.1.0";
+  by-version."detective"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-detective-3.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/detective/-/detective-2.4.1.tgz";
-        name = "detective-2.4.1.tgz";
-        sha1 = "943b8eec4c346f6ac501de25da2ea1a57ed77819";
+        url = "http://registry.npmjs.org/detective/-/detective-3.1.0.tgz";
+        name = "detective-3.1.0.tgz";
+        sha1 = "77782444ab752b88ca1be2e9d0a0395f1da25eed";
       })
     ];
     buildInputs =
       (self.nativeDeps."detective" or []);
     deps = [
       self.by-version."escodegen"."1.1.0"
-      self.by-version."esprima-six"."0.0.3"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
     ];
     peerDependencies = [
     ];
@@ -4904,14 +5024,14 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."domutils"."1.4" =
-    self.by-version."domutils"."1.4.1";
-  by-version."domutils"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-domutils-1.4.1";
+    self.by-version."domutils"."1.4.3";
+  by-version."domutils"."1.4.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-domutils-1.4.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.1.tgz";
-        name = "domutils-1.4.1.tgz";
-        sha1 = "e716621c245561dd03c1ecd5667f70e8ddeb2f59";
+        url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
+        name = "domutils-1.4.3.tgz";
+        sha1 = "0865513796c6b306031850e175516baf80b72a6f";
       })
     ];
     buildInputs =
@@ -4924,22 +5044,25 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.12";
-  by-version."download"."0.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-download-0.1.12";
+    self.by-version."download"."0.1.15";
+  by-version."download"."0.1.15" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.15";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.12.tgz";
-        name = "download-0.1.12.tgz";
-        sha1 = "ff596658f301c340a292ac0ac1972790084568ad";
+        url = "http://registry.npmjs.org/download/-/download-0.1.15.tgz";
+        name = "download-0.1.15.tgz";
+        sha1 = "8dc3d49a131cd3714eb8fd614a155077d2c7f630";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.2.0"
+      self.by-version."decompress"."0.2.2"
       self.by-version."each-async"."0.1.2"
+      self.by-version."get-stdin"."0.1.0"
+      self.by-version."get-urls"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
+      self.by-version."nopt"."2.2.0"
       self.by-version."request"."2.34.0"
       self.by-version."through2"."0.4.1"
     ];
@@ -4987,25 +5110,6 @@
     ];
     passthru.names = [ "dtrace-provider" ];
   };
-  by-spec."duplexer"."~0.0.3" =
-    self.by-version."duplexer"."0.0.4";
-  by-version."duplexer"."0.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-duplexer-0.0.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/duplexer/-/duplexer-0.0.4.tgz";
-        name = "duplexer-0.0.4.tgz";
-        sha1 = "afcb7f1f8b8d74f820726171d5d64ac9e4a8ff20";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."duplexer" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "duplexer" ];
-  };
   by-spec."duplexer"."~0.1.1" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -5025,7 +5129,7 @@
     ];
     passthru.names = [ "duplexer" ];
   };
-  by-spec."each-async"."~0.1.1" =
+  by-spec."each-async"."^0.1.1" =
     self.by-version."each-async"."0.1.2";
   by-version."each-async"."0.1.2" = lib.makeOverridable self.buildNodePackage {
     name = "node-each-async-0.1.2";
@@ -5243,22 +5347,22 @@
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
   by-spec."escodegen"."1.3.x" =
-    self.by-version."escodegen"."1.3.0";
-  by-version."escodegen"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "escodegen-1.3.0";
+    self.by-version."escodegen"."1.3.2";
+  by-version."escodegen"."1.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "escodegen-1.3.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.0.tgz";
-        name = "escodegen-1.3.0.tgz";
-        sha1 = "9d7b4aa74aa32f300474381c098f930eb1e9973a";
+        url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.2.tgz";
+        name = "escodegen-1.3.2.tgz";
+        sha1 = "bb0f434dbd594f2060639a79b4b06259dd5372de";
       })
     ];
     buildInputs =
       (self.nativeDeps."escodegen" or []);
     deps = [
-      self.by-version."esprima"."1.0.4"
-      self.by-version."estraverse"."1.5.0"
       self.by-version."esutils"."1.0.0"
+      self.by-version."estraverse"."1.5.0"
+      self.by-version."esprima"."1.1.1"
       self.by-version."source-map"."0.1.33"
     ];
     peerDependencies = [
@@ -5420,7 +5524,9 @@
     self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.0.4" =
     self.by-version."esprima"."1.0.4";
-  by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" =
+  by-spec."esprima"."~1.1.1" =
+    self.by-version."esprima"."1.1.1";
+  by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage {
     name = "esprima-fb-3001.1.0-dev-harmony-fb";
@@ -5439,27 +5545,10 @@
     ];
     passthru.names = [ "esprima-fb" ];
   };
-  by-spec."esprima-six"."0.0.3" =
-    self.by-version."esprima-six"."0.0.3";
-  by-version."esprima-six"."0.0.3" = lib.makeOverridable self.buildNodePackage {
-    name = "esprima-six-0.0.3";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz";
-        name = "esprima-six-0.0.3.tgz";
-        sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."esprima-six" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "esprima-six" ];
-  };
-  by-spec."esprima-six"."~0.0.3" =
-    self.by-version."esprima-six"."0.0.3";
+  by-spec."esprima-fb"."^3001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+  by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
   by-spec."esrefactor"."~0.1.0" =
     self.by-version."esrefactor"."0.1.0";
   by-version."esrefactor"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -5737,7 +5826,7 @@
       self.by-version."oauth"."0.9.11"
       self.by-version."request"."2.9.203"
       self.by-version."connect"."2.3.9"
-      self.by-version."openid"."0.5.5"
+      self.by-version."openid"."0.5.7"
       self.by-version."xml2js"."0.4.2"
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
@@ -5790,14 +5879,14 @@
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
   by-spec."express"."*" =
-    self.by-version."express"."4.0.0-rc4";
-  by-version."express"."4.0.0-rc4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-4.0.0-rc4";
+    self.by-version."express"."4.0.0";
+  by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-4.0.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-4.0.0-rc4.tgz";
-        name = "express-4.0.0-rc4.tgz";
-        sha1 = "1cedc8790f47b776b9d100f5388e5fb652ea4388";
+        url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz";
+        name = "express-4.0.0.tgz";
+        sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094";
       })
     ];
     buildInputs =
@@ -5819,13 +5908,13 @@
       self.by-version."qs"."0.6.6"
       self.by-version."serve-static"."1.0.1"
       self.by-version."path-to-regexp"."0.1.2"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  "express" = self.by-version."express"."4.0.0-rc4";
+  "express" = self.by-version."express"."4.0.0";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage {
@@ -5873,7 +5962,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -5903,7 +5992,7 @@
       self.by-version."methods"."0.1.0"
       self.by-version."send"."0.1.4"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -5934,7 +6023,7 @@
       self.by-version."send"."0.2.0"
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."merge-descriptors"."0.0.2"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -5964,54 +6053,25 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.0"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
-  by-spec."express"."~3.4" =
-    self.by-version."express"."3.4.8";
-  by-version."express"."3.4.8" = lib.makeOverridable self.buildNodePackage {
-    name = "express-3.4.8";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/express/-/express-3.4.8.tgz";
-        name = "express-3.4.8.tgz";
-        sha1 = "aa7a8986de07053337f4bc5ed9a6453d9cc8e2e1";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."express" or []);
-    deps = [
-      self.by-version."connect"."2.12.0"
-      self.by-version."commander"."1.3.2"
-      self.by-version."range-parser"."0.0.4"
-      self.by-version."mkdirp"."0.3.5"
-      self.by-version."cookie"."0.1.0"
-      self.by-version."buffer-crc32"."0.2.1"
-      self.by-version."fresh"."0.2.0"
-      self.by-version."methods"."0.1.0"
-      self.by-version."send"."0.1.4"
-      self.by-version."cookie-signature"."1.0.1"
-      self.by-version."merge-descriptors"."0.0.1"
-      self.by-version."debug"."0.8.0"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "express" ];
-  };
-  by-spec."express"."~3.4.8" =
-    self.by-version."express"."3.4.8";
+  by-spec."express"."~3.5" =
+    self.by-version."express"."3.5.1";
+  by-spec."express"."~4.0.0-rc4" =
+    self.by-version."express"."4.0.0";
   by-spec."express-form"."*" =
-    self.by-version."express-form"."0.12.0";
-  by-version."express-form"."0.12.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-form-0.12.0";
+    self.by-version."express-form"."0.12.1";
+  by-version."express-form"."0.12.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-form-0.12.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.0.tgz";
-        name = "express-form-0.12.0.tgz";
-        sha1 = "0525ce1365760fd90fb785829a430122aceb893a";
+        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.1.tgz";
+        name = "express-form-0.12.1.tgz";
+        sha1 = "1b62e580303919799598e038fdfba8c65a2cd677";
       })
     ];
     buildInputs =
@@ -6026,7 +6086,7 @@
     ];
     passthru.names = [ "express-form" ];
   };
-  "express-form" = self.by-version."express-form"."0.12.0";
+  "express-form" = self.by-version."express-form"."0.12.1";
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
   by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -6071,6 +6131,8 @@
     ];
     passthru.names = [ "express-session" ];
   };
+  by-spec."express-session"."~1.0.2" =
+    self.by-version."express-session"."1.0.2";
   by-spec."extend"."*" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -6229,7 +6291,7 @@
     deps = [
       self.by-version."bower-endpoint-parser"."0.2.1"
       self.by-version."bower-logger"."0.2.1"
-      self.by-version."bower"."1.3.1"
+      self.by-version."bower"."1.3.2"
       self.by-version."glob"."3.2.9"
     ];
     peerDependencies = [
@@ -6330,14 +6392,14 @@
     passthru.names = [ "findit" ];
   };
   by-spec."findup"."~0.1.3" =
-    self.by-version."findup"."0.1.4";
-  by-version."findup"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "findup-0.1.4";
+    self.by-version."findup"."0.1.5";
+  by-version."findup"."0.1.5" = lib.makeOverridable self.buildNodePackage {
+    name = "findup-0.1.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/findup/-/findup-0.1.4.tgz";
-        name = "findup-0.1.4.tgz";
-        sha1 = "28cd82e13eb629b40688f08f613f5cae5a29a0f5";
+        url = "http://registry.npmjs.org/findup/-/findup-0.1.5.tgz";
+        name = "findup-0.1.5.tgz";
+        sha1 = "8ad929a3393bac627957a7e5de4623b06b0e2ceb";
       })
     ];
     buildInputs =
@@ -6440,14 +6502,14 @@
     passthru.names = [ "forEachAsync" ];
   };
   by-spec."forever"."*" =
-    self.by-version."forever"."0.10.11";
-  by-version."forever"."0.10.11" = lib.makeOverridable self.buildNodePackage {
-    name = "forever-0.10.11";
+    self.by-version."forever"."0.11.0";
+  by-version."forever"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "forever-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/forever/-/forever-0.10.11.tgz";
-        name = "forever-0.10.11.tgz";
-        sha1 = "925cae528c074a29c0119809ca08e382ef194ad0";
+        url = "http://registry.npmjs.org/forever/-/forever-0.11.0.tgz";
+        name = "forever-0.11.0.tgz";
+        sha1 = "97de678915c64dacce2ccbfb94620723b308d44f";
       })
     ];
     buildInputs =
@@ -6470,7 +6532,7 @@
     ];
     passthru.names = [ "forever" ];
   };
-  "forever" = self.by-version."forever"."0.10.11";
+  "forever" = self.by-version."forever"."0.11.0";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -6780,7 +6842,7 @@
     buildInputs =
       (self.nativeDeps."fs-walk" or []);
     deps = [
-      self.by-version."async"."0.6.2"
+      self.by-version."async"."0.7.0"
     ];
     peerDependencies = [
     ];
@@ -6975,14 +7037,14 @@
     passthru.names = [ "generator-mocha" ];
   };
   by-spec."generator-webapp"."*" =
-    self.by-version."generator-webapp"."0.4.8";
-  by-version."generator-webapp"."0.4.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-generator-webapp-0.4.8";
+    self.by-version."generator-webapp"."0.4.9";
+  by-version."generator-webapp"."0.4.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-generator-webapp-0.4.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.8.tgz";
-        name = "generator-webapp-0.4.8.tgz";
-        sha1 = "d0dc7e8040ec41fe6cf42ec43291157a3bd515be";
+        url = "http://registry.npmjs.org/generator-webapp/-/generator-webapp-0.4.9.tgz";
+        name = "generator-webapp-0.4.9.tgz";
+        sha1 = "df8aa10af9bac7fd59f4072b9cdf0f120e8bb611";
       })
     ];
     buildInputs =
@@ -6998,7 +7060,45 @@
     ];
     passthru.names = [ "generator-webapp" ];
   };
-  "generator-webapp" = self.by-version."generator-webapp"."0.4.8";
+  "generator-webapp" = self.by-version."generator-webapp"."0.4.9";
+  by-spec."get-stdin"."^0.1.0" =
+    self.by-version."get-stdin"."0.1.0";
+  by-version."get-stdin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-get-stdin-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz";
+        name = "get-stdin-0.1.0.tgz";
+        sha1 = "5998af24aafc802d15c82c685657eeb8b10d4a91";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."get-stdin" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "get-stdin" ];
+  };
+  by-spec."get-urls"."^0.1.1" =
+    self.by-version."get-urls"."0.1.1";
+  by-version."get-urls"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "get-urls-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/get-urls/-/get-urls-0.1.1.tgz";
+        name = "get-urls-0.1.1.tgz";
+        sha1 = "f94aa79c9e5d99cb843e44c5f67e24954e08fb59";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."get-urls" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "get-urls" ];
+  };
   by-spec."getmac"."~1.0.6" =
     self.by-version."getmac"."1.0.6";
   by-version."getmac"."1.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -7055,13 +7155,13 @@
       self.by-version."async"."0.2.10"
       self.by-version."cli-color"."0.2.3"
       self.by-version."cli-log"."0.0.8"
-      self.by-version."github"."0.1.15"
+      self.by-version."github"."0.1.16"
       self.by-version."copy-paste"."0.2.0"
       self.by-version."handlebars"."1.3.0"
       self.by-version."inquirer"."0.4.1"
       self.by-version."moment"."2.5.1"
       self.by-version."nopt"."2.2.0"
-      self.by-version."open"."0.0.4"
+      self.by-version."open"."0.0.5"
       self.by-version."truncate"."1.0.2"
       self.by-version."update-notifier"."0.1.8"
       self.by-version."userhome"."0.1.0"
@@ -7074,14 +7174,14 @@
   };
   "gh" = self.by-version."gh"."1.9.1";
   by-spec."github"."~0.1.15" =
-    self.by-version."github"."0.1.15";
-  by-version."github"."0.1.15" = lib.makeOverridable self.buildNodePackage {
-    name = "node-github-0.1.15";
+    self.by-version."github"."0.1.16";
+  by-version."github"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+    name = "node-github-0.1.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/github/-/github-0.1.15.tgz";
-        name = "github-0.1.15.tgz";
-        sha1 = "3df037442518fe800c75b1a243a13154d334069c";
+        url = "http://registry.npmjs.org/github/-/github-0.1.16.tgz";
+        name = "github-0.1.16.tgz";
+        sha1 = "895d2a85b0feb7980d89ac0ce4f44dcaa03f17b5";
       })
     ];
     buildInputs =
@@ -7464,20 +7564,20 @@
   };
   "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.9.0";
   by-spec."grunt-contrib-jshint"."*" =
-    self.by-version."grunt-contrib-jshint"."0.9.2";
-  by-version."grunt-contrib-jshint"."0.9.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-grunt-contrib-jshint-0.9.2";
+    self.by-version."grunt-contrib-jshint"."0.10.0";
+  by-version."grunt-contrib-jshint"."0.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-grunt-contrib-jshint-0.10.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.9.2.tgz";
-        name = "grunt-contrib-jshint-0.9.2.tgz";
-        sha1 = "d6301597bcc3611e95f5f35ff582a7b3d73d20fb";
+        url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.10.0.tgz";
+        name = "grunt-contrib-jshint-0.10.0.tgz";
+        sha1 = "57ebccca87e8f327af6645d8a3c586d4845e4d81";
       })
     ];
     buildInputs =
       (self.nativeDeps."grunt-contrib-jshint" or []);
     deps = [
-      self.by-version."jshint"."2.4.4"
+      self.by-version."jshint"."2.5.0"
       self.by-version."hooker"."0.2.3"
     ];
     peerDependencies = [
@@ -7485,7 +7585,7 @@
     ];
     passthru.names = [ "grunt-contrib-jshint" ];
   };
-  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.9.2";
+  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.10.0";
   by-spec."grunt-contrib-less"."*" =
     self.by-version."grunt-contrib-less"."0.11.0";
   by-version."grunt-contrib-less"."0.11.0" = lib.makeOverridable self.buildNodePackage {
@@ -7576,7 +7676,7 @@
     ];
     peerDependencies = [
       self.by-version."grunt"."0.4.4"
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "grunt-karma" ];
   };
@@ -7644,10 +7744,10 @@
       (self.nativeDeps."guifi-earth" or []);
     deps = [
       self.by-version."coffee-script"."1.7.1"
-      self.by-version."jade"."1.3.0"
+      self.by-version."jade"."1.3.1"
       self.by-version."q"."2.0.1"
       self.by-version."xml2js"."0.4.2"
-      self.by-version."msgpack"."0.2.2"
+      self.by-version."msgpack"."0.2.3"
     ];
     peerDependencies = [
     ];
@@ -7655,20 +7755,20 @@
   };
   "guifi-earth" = self.by-version."guifi-earth"."0.2.1";
   by-spec."gzip-size"."^0.1.0" =
-    self.by-version."gzip-size"."0.1.0";
-  by-version."gzip-size"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "gzip-size-0.1.0";
+    self.by-version."gzip-size"."0.1.1";
+  by-version."gzip-size"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "gzip-size-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.0.tgz";
-        name = "gzip-size-0.1.0.tgz";
-        sha1 = "2beaecdaf4917bd151fe9a9d43ae199392d6c32a";
+        url = "http://registry.npmjs.org/gzip-size/-/gzip-size-0.1.1.tgz";
+        name = "gzip-size-0.1.1.tgz";
+        sha1 = "ae33483b6fc8224e8342296de108ef93757f76e0";
       })
     ];
     buildInputs =
       (self.nativeDeps."gzip-size" or []);
     deps = [
-      self.by-version."concat-stream"."1.4.4"
+      self.by-version."concat-stream"."1.4.5"
       self.by-version."zlib-browserify"."0.0.3"
     ];
     peerDependencies = [
@@ -7743,14 +7843,14 @@
   by-spec."handlebars"."~1.3.0" =
     self.by-version."handlebars"."1.3.0";
   by-spec."has-color"."~0.1.0" =
-    self.by-version."has-color"."0.1.4";
-  by-version."has-color"."0.1.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-has-color-0.1.4";
+    self.by-version."has-color"."0.1.6";
+  by-version."has-color"."0.1.6" = lib.makeOverridable self.buildNodePackage {
+    name = "node-has-color-0.1.6";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.4.tgz";
-        name = "has-color-0.1.4.tgz";
-        sha1 = "d1dadeea5b9e8b446bf08603532333710c95a290";
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.6.tgz";
+        name = "has-color-0.1.6.tgz";
+        sha1 = "a77443bddb036c6df06e04a4493ce9f23533731b";
       })
     ];
     buildInputs =
@@ -7889,20 +7989,19 @@
     passthru.names = [ "he" ];
   };
   by-spec."hipache"."*" =
-    self.by-version."hipache"."0.2.4";
-  by-version."hipache"."0.2.4" = lib.makeOverridable self.buildNodePackage {
-    name = "hipache-0.2.4";
+    self.by-version."hipache"."0.2.9";
+  by-version."hipache"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "hipache-0.2.9";
     src = [
       (self.patchSource fetchurl {
-        url = "http://registry.npmjs.org/hipache/-/hipache-0.2.4.tgz";
-        name = "hipache-0.2.4.tgz";
-        sha1 = "1d6a06bf88cac084b5fcd01959392c8b4889ec65";
+        url = "http://registry.npmjs.org/hipache/-/hipache-0.2.9.tgz";
+        name = "hipache-0.2.9.tgz";
+        sha1 = "48a7fa7170be328b264d6e413bfb76d130e03b2a";
       })
     ];
     buildInputs =
       (self.nativeDeps."hipache" or []);
     deps = [
-      self.by-version."read-installed"."0.2.2"
       self.by-version."http-proxy"."0.10.3"
       self.by-version."redis"."0.8.6"
       self.by-version."lru-cache"."2.2.4"
@@ -7912,7 +8011,7 @@
     ];
     passthru.names = [ "hipache" ];
   };
-  "hipache" = self.by-version."hipache"."0.2.4";
+  "hipache" = self.by-version."hipache"."0.2.9";
   by-spec."hiredis"."*" =
     self.by-version."hiredis"."0.1.16";
   by-version."hiredis"."0.1.16" = lib.makeOverridable self.buildNodePackage {
@@ -7927,7 +8026,7 @@
     buildInputs =
       (self.nativeDeps."hiredis" or []);
     deps = [
-      self.by-version."bindings"."1.1.1"
+      self.by-version."bindings"."1.2.0"
     ];
     peerDependencies = [
     ];
@@ -8113,20 +8212,20 @@
     buildInputs =
       (self.nativeDeps."http-browserify" or []);
     deps = [
-      self.by-version."Base64"."0.2.0"
+      self.by-version."Base64"."0.2.1"
       self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "http-browserify" ];
   };
-  by-spec."http-proxy"."git://github.com/samalba/node-http-proxy" =
+  by-spec."http-proxy"."git+https://github.com/samalba/node-http-proxy.git" =
     self.by-version."http-proxy"."0.10.3";
   by-version."http-proxy"."0.10.3" = lib.makeOverridable self.buildNodePackage {
     name = "http-proxy-0.10.3";
     src = [
       (fetchgit {
-        url = "git://github.com/samalba/node-http-proxy";
+        url = "https://github.com/samalba/node-http-proxy.git";
         rev = "8e277989d2d05edaee65e524fb4fba9142c52aa5";
         sha256 = "8ce0e05c73e517eefc6d9bf8b61349351aee119c2fb60763f23170607cc0e41f";
       })
@@ -8543,25 +8642,25 @@
   };
   by-spec."inquirer"."~0.4.1" =
     self.by-version."inquirer"."0.4.1";
-  by-spec."insert-module-globals"."~3.2.0" =
-    self.by-version."insert-module-globals"."3.2.0";
-  by-version."insert-module-globals"."3.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "insert-module-globals-3.2.0";
+  by-spec."insert-module-globals"."~5.0.1" =
+    self.by-version."insert-module-globals"."5.0.1";
+  by-version."insert-module-globals"."5.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "insert-module-globals-5.0.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.2.0.tgz";
-        name = "insert-module-globals-3.2.0.tgz";
-        sha1 = "5692a834207adebb3effa9f9def7cf314890a63b";
+        url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-5.0.1.tgz";
+        name = "insert-module-globals-5.0.1.tgz";
+        sha1 = "eec9c0dfad30380e8eda313a094165dc2f2350d2";
       })
     ];
     buildInputs =
       (self.nativeDeps."insert-module-globals" or []);
     deps = [
-      self.by-version."lexical-scope"."0.1.0"
-      self.by-version."process"."0.5.2"
+      self.by-version."JSONStream"."0.7.2"
+      self.by-version."concat-stream"."1.4.5"
+      self.by-version."lexical-scope"."1.1.0"
+      self.by-version."process"."0.6.0"
       self.by-version."through"."2.3.4"
-      self.by-version."JSONStream"."0.7.1"
-      self.by-version."concat-stream"."1.4.4"
     ];
     peerDependencies = [
     ];
@@ -8630,9 +8729,9 @@
       self.by-version."winston"."0.7.3"
       self.by-version."nconf"."0.6.9"
       self.by-version."fs-walk"."0.0.1"
-      self.by-version."async"."0.6.2"
-      self.by-version."express"."4.0.0-rc4"
-      self.by-version."jade"."1.3.0"
+      self.by-version."async"."0.7.0"
+      self.by-version."express"."4.0.0"
+      self.by-version."jade"."1.3.1"
       self.by-version."passport"."0.2.0"
       self.by-version."passport-http"."0.2.2"
       self.by-version."js-yaml"."3.0.2"
@@ -8760,7 +8859,7 @@
       (self.nativeDeps."istanbul" or []);
     deps = [
       self.by-version."esprima"."1.1.1"
-      self.by-version."escodegen"."1.3.0"
+      self.by-version."escodegen"."1.3.2"
       self.by-version."handlebars"."1.3.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."nopt"."2.2.0"
@@ -8782,14 +8881,14 @@
   by-spec."istanbul"."~0.2.4" =
     self.by-version."istanbul"."0.2.7";
   by-spec."jade"."*" =
-    self.by-version."jade"."1.3.0";
-  by-version."jade"."1.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "jade-1.3.0";
+    self.by-version."jade"."1.3.1";
+  by-version."jade"."1.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "jade-1.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jade/-/jade-1.3.0.tgz";
-        name = "jade-1.3.0.tgz";
-        sha1 = "776cae93f1ad5af6b61eff2340fcdc19a3225d48";
+        url = "http://registry.npmjs.org/jade/-/jade-1.3.1.tgz";
+        name = "jade-1.3.1.tgz";
+        sha1 = "7483d848b8714dc50a40da98b0409790b374216b";
       })
     ];
     buildInputs =
@@ -8807,7 +8906,7 @@
     ];
     passthru.names = [ "jade" ];
   };
-  "jade" = self.by-version."jade"."1.3.0";
+  "jade" = self.by-version."jade"."1.3.1";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage {
@@ -8877,7 +8976,7 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.3.0";
+    self.by-version."jade"."1.3.1";
   by-spec."jade"."~0.35.0" =
     self.by-version."jade"."0.35.0";
   by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage {
@@ -9082,32 +9181,8 @@
     passthru.names = [ "jshint" ];
   };
   "jshint" = self.by-version."jshint"."2.5.0";
-  by-spec."jshint"."~2.4.0" =
-    self.by-version."jshint"."2.4.4";
-  by-version."jshint"."2.4.4" = lib.makeOverridable self.buildNodePackage {
-    name = "jshint-2.4.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/jshint/-/jshint-2.4.4.tgz";
-        name = "jshint-2.4.4.tgz";
-        sha1 = "4162238314c649f987752651e8e064e30a68706e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."jshint" or []);
-    deps = [
-      self.by-version."shelljs"."0.1.4"
-      self.by-version."underscore"."1.4.4"
-      self.by-version."cli"."0.4.5"
-      self.by-version."minimatch"."0.2.14"
-      self.by-version."htmlparser2"."3.3.0"
-      self.by-version."console-browserify"."0.1.6"
-      self.by-version."exit"."0.1.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "jshint" ];
-  };
+  by-spec."jshint"."~2.5.0" =
+    self.by-version."jshint"."2.5.0";
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -9223,14 +9298,14 @@
     passthru.names = [ "jsonparse" ];
   };
   by-spec."jsontool"."*" =
-    self.by-version."jsontool"."7.0.1";
-  by-version."jsontool"."7.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "jsontool-7.0.1";
+    self.by-version."jsontool"."7.0.2";
+  by-version."jsontool"."7.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "jsontool-7.0.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.1.tgz";
-        name = "jsontool-7.0.1.tgz";
-        sha1 = "d5a705e46e305d7377ede769707c072e6d957977";
+        url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
+        name = "jsontool-7.0.2.tgz";
+        sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
       })
     ];
     buildInputs =
@@ -9241,7 +9316,7 @@
     ];
     passthru.names = [ "jsontool" ];
   };
-  "jsontool" = self.by-version."jsontool"."7.0.1";
+  "jsontool" = self.by-version."jsontool"."7.0.2";
   by-spec."jsprim"."0.3.0" =
     self.by-version."jsprim"."0.3.0";
   by-version."jsprim"."0.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -9306,14 +9381,14 @@
     passthru.names = [ "junk" ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.3";
-  by-version."karma"."0.12.3" = lib.makeOverridable self.buildNodePackage {
-    name = "karma-0.12.3";
+    self.by-version."karma"."0.12.9";
+  by-version."karma"."0.12.9" = lib.makeOverridable self.buildNodePackage {
+    name = "karma-0.12.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma/-/karma-0.12.3.tgz";
-        name = "karma-0.12.3.tgz";
-        sha1 = "2599e3e8797de991cf68ed80290e7462c1e8483d";
+        url = "http://registry.npmjs.org/karma/-/karma-0.12.9.tgz";
+        name = "karma-0.12.9.tgz";
+        sha1 = "9431735e50fcbd8ca04963a0e4da0b6550b41998";
       })
     ];
     buildInputs =
@@ -9331,7 +9406,7 @@
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.12"
+      self.by-version."log4js"."0.6.13"
       self.by-version."useragent"."2.0.8"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
@@ -9341,15 +9416,15 @@
     ];
     passthru.names = [ "karma" ];
   };
-  "karma" = self.by-version."karma"."0.12.3";
+  "karma" = self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.3";
+    self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.3";
+    self.by-version."karma"."0.12.9";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.3";
+    self.by-version."karma"."0.12.9";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.3";
+    self.by-version."karma"."0.12.9";
   by-spec."karma-chrome-launcher"."*" =
     self.by-version."karma-chrome-launcher"."0.1.3";
   by-version."karma-chrome-launcher"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -9366,7 +9441,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-chrome-launcher" ];
   };
@@ -9390,20 +9465,20 @@
       self.by-version."dateformat"."1.0.7-1.2.3"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-coverage" ];
   };
   "karma-coverage" = self.by-version."karma-coverage"."0.2.1";
   by-spec."karma-junit-reporter"."*" =
-    self.by-version."karma-junit-reporter"."0.2.1";
-  by-version."karma-junit-reporter"."0.2.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-junit-reporter-0.2.1";
+    self.by-version."karma-junit-reporter"."0.2.2";
+  by-version."karma-junit-reporter"."0.2.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-junit-reporter-0.2.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.1.tgz";
-        name = "karma-junit-reporter-0.2.1.tgz";
-        sha1 = "ae125962683a0d1286dc7768fbf66a8f02e448fc";
+        url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
+        name = "karma-junit-reporter-0.2.2.tgz";
+        sha1 = "4cdd4e21affd3e090e7ba73e3c766ea9e13c45ba";
       })
     ];
     buildInputs =
@@ -9412,11 +9487,11 @@
       self.by-version."xmlbuilder"."0.4.2"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-junit-reporter" ];
   };
-  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.1";
+  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
   by-spec."karma-mocha"."*" =
     self.by-version."karma-mocha"."0.1.3";
   by-version."karma-mocha"."0.1.3" = lib.makeOverridable self.buildNodePackage {
@@ -9433,7 +9508,7 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
       self.by-version."mocha"."1.18.2"
     ];
     passthru.names = [ "karma-mocha" ];
@@ -9455,37 +9530,37 @@
     deps = [
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
       self.by-version."requirejs"."2.1.11"
     ];
     passthru.names = [ "karma-requirejs" ];
   };
   "karma-requirejs" = self.by-version."karma-requirejs"."0.2.1";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.2.5";
-  by-version."karma-sauce-launcher"."0.2.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-karma-sauce-launcher-0.2.5";
+    self.by-version."karma-sauce-launcher"."0.2.7";
+  by-version."karma-sauce-launcher"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-karma-sauce-launcher-0.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.5.tgz";
-        name = "karma-sauce-launcher-0.2.5.tgz";
-        sha1 = "d1fe0c0dbc104e5be04a2050a61f13ab7ae8ca04";
+        url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.7.tgz";
+        name = "karma-sauce-launcher-0.2.7.tgz";
+        sha1 = "a87a0b2e3612b298f3f6c2a96839940af85ac849";
       })
     ];
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.14"
-      self.by-version."sauce-connect-launcher"."0.3.3"
+      self.by-version."wd"."0.2.17"
+      self.by-version."sauce-connect-launcher"."0.4.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
     ];
     peerDependencies = [
-      self.by-version."karma"."0.12.3"
+      self.by-version."karma"."0.12.9"
     ];
     passthru.names = [ "karma-sauce-launcher" ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.5";
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.7";
   by-spec."keen.io"."~0.0.4" =
     self.by-version."keen.io"."0.0.4";
   by-version."keen.io"."0.0.4" = lib.makeOverridable self.buildNodePackage {
@@ -9604,15 +9679,15 @@
   };
   by-spec."keypress"."~0.1.0" =
     self.by-version."keypress"."0.1.0";
-  by-spec."knockout"."~3.0.0" =
-    self.by-version."knockout"."3.0.0";
-  by-version."knockout"."3.0.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-knockout-3.0.0";
+  by-spec."knockout"."~3.1.0" =
+    self.by-version."knockout"."3.1.0";
+  by-version."knockout"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-knockout-3.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/knockout/-/knockout-3.0.0.tgz";
-        name = "knockout-3.0.0.tgz";
-        sha1 = "fd8d43ee446237cde7df650f5c7dbcf68ae49a80";
+        url = "http://registry.npmjs.org/knockout/-/knockout-3.1.0.tgz";
+        name = "knockout-3.1.0.tgz";
+        sha1 = "8960ecfafa20e1d5795badfbf6256693f17b7bf5";
       })
     ];
     buildInputs =
@@ -9778,21 +9853,21 @@
   };
   by-spec."less"."~1.7.0" =
     self.by-version."less"."1.7.0";
-  by-spec."lexical-scope"."~0.1.0" =
-    self.by-version."lexical-scope"."0.1.0";
-  by-version."lexical-scope"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-lexical-scope-0.1.0";
+  by-spec."lexical-scope"."~1.1.0" =
+    self.by-version."lexical-scope"."1.1.0";
+  by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lexical-scope-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
-        name = "lexical-scope-0.1.0.tgz";
-        sha1 = "8f30004c80234ffac083b990079d7b267e18441b";
+        url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
+        name = "lexical-scope-1.1.0.tgz";
+        sha1 = "899f36c4ec9c5af19736361aae290a6ef2af0800";
       })
     ];
     buildInputs =
       (self.nativeDeps."lexical-scope" or []);
     deps = [
-      self.by-version."astw"."0.1.0"
+      self.by-version."astw"."1.1.0"
     ];
     peerDependencies = [
     ];
@@ -9857,6 +9932,8 @@
     ];
     passthru.names = [ "lockfile" ];
   };
+  by-spec."lockfile"."~0.4.2" =
+    self.by-version."lockfile"."0.4.2";
   by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-version."lodash"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -9994,6 +10071,25 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
+  by-spec."lodash-node"."~2.4.1" =
+    self.by-version."lodash-node"."2.4.1";
+  by-version."lodash-node"."2.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-lodash-node-2.4.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
+        name = "lodash-node-2.4.1.tgz";
+        sha1 = "ea82f7b100c733d1a42af76801e506105e2a80ec";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."lodash-node" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "lodash-node" ];
+  };
   by-spec."lodash._isnative"."~2.4.1" =
     self.by-version."lodash._isnative"."2.4.1";
   by-version."lodash._isnative"."2.4.1" = lib.makeOverridable self.buildNodePackage {
@@ -10196,14 +10292,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.12";
-  by-version."log4js"."0.6.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.12";
+    self.by-version."log4js"."0.6.13";
+  by-version."log4js"."0.6.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.12.tgz";
-        name = "log4js-0.6.12.tgz";
-        sha1 = "ef806ec669ea3fc7bf5be92a95891fb67517e642";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.13.tgz";
+        name = "log4js-0.6.13.tgz";
+        sha1 = "42676b039cc89881e374093ae16f29a42e607234";
       })
     ];
     buildInputs =
@@ -10391,21 +10487,21 @@
     passthru.names = [ "lsmod" ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
-    self.by-version."mailcomposer"."0.2.8";
-  by-version."mailcomposer"."0.2.8" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mailcomposer-0.2.8";
+    self.by-version."mailcomposer"."0.2.9";
+  by-version."mailcomposer"."0.2.9" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mailcomposer-0.2.9";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.8.tgz";
-        name = "mailcomposer-0.2.8.tgz";
-        sha1 = "bcb4d84aea08ea6f4c007f927c0ad214986370cc";
+        url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.9.tgz";
+        name = "mailcomposer-0.2.9.tgz";
+        sha1 = "2b6417a4fb5de8ffcaf1a27e1b024463903f908e";
       })
     ];
     buildInputs =
       (self.nativeDeps."mailcomposer" or []);
     deps = [
       self.by-version."mimelib"."0.2.14"
-      self.by-version."mime"."1.2.9"
+      self.by-version."mime"."1.2.11"
       self.by-version."he"."0.3.6"
       self.by-version."punycode"."1.2.4"
       self.by-version."follow-redirects"."0.0.3"
@@ -10415,21 +10511,21 @@
     ];
     passthru.names = [ "mailcomposer" ];
   };
-  by-spec."map-key"."^0.1.0" =
-    self.by-version."map-key"."0.1.0";
-  by-version."map-key"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-map-key-0.1.0";
+  by-spec."map-key"."^0.1.1" =
+    self.by-version."map-key"."0.1.1";
+  by-version."map-key"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-map-key-0.1.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.0.tgz";
-        name = "map-key-0.1.0.tgz";
-        sha1 = "7ce8f677ba4051e23ddab5ce0d19c256cbf701fc";
+        url = "http://registry.npmjs.org/map-key/-/map-key-0.1.1.tgz";
+        name = "map-key-0.1.1.tgz";
+        sha1 = "cf0d6ad80ae145477d25904c9eb44b23ac471c8b";
       })
     ];
     buildInputs =
       (self.nativeDeps."map-key" or []);
     deps = [
-      self.by-version."mout"."0.9.0"
+      self.by-version."mout"."0.9.1"
     ];
     peerDependencies = [
     ];
@@ -10449,7 +10545,7 @@
     buildInputs =
       (self.nativeDeps."maxmin" or []);
     deps = [
-      self.by-version."gzip-size"."0.1.0"
+      self.by-version."gzip-size"."0.1.1"
       self.by-version."pretty-bytes"."0.1.0"
       self.by-version."chalk"."0.4.0"
     ];
@@ -10507,25 +10603,6 @@
     ];
     passthru.names = [ "memoizee" ];
   };
-  by-spec."merge-descriptors"."0.0.1" =
-    self.by-version."merge-descriptors"."0.0.1";
-  by-version."merge-descriptors"."0.0.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-merge-descriptors-0.0.1";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz";
-        name = "merge-descriptors-0.0.1.tgz";
-        sha1 = "2ff0980c924cf81d0b5d1fb601177cb8bb56c0d0";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."merge-descriptors" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "merge-descriptors" ];
-  };
   by-spec."merge-descriptors"."0.0.2" =
     self.by-version."merge-descriptors"."0.0.2";
   by-version."merge-descriptors"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -10624,6 +10701,8 @@
     ];
     passthru.names = [ "mime" ];
   };
+  by-spec."mime"."1.2.11" =
+    self.by-version."mime"."1.2.11";
   by-spec."mime"."1.2.4" =
     self.by-version."mime"."1.2.4";
   by-version."mime"."1.2.4" = lib.makeOverridable self.buildNodePackage {
@@ -10950,7 +11029,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -10983,28 +11062,28 @@
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-spec."module-deps"."~1.7.0" =
-    self.by-version."module-deps"."1.7.1";
-  by-version."module-deps"."1.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "module-deps-1.7.1";
+  by-spec."module-deps"."~1.8.0" =
+    self.by-version."module-deps"."1.8.1";
+  by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "module-deps-1.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.7.1.tgz";
-        name = "module-deps-1.7.1.tgz";
-        sha1 = "1e9a6809727282323abf1d5eee5ce8860b2e7bbf";
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.8.1.tgz";
+        name = "module-deps-1.8.1.tgz";
+        sha1 = "9d603b286f87cf62aad9e3f7b65a2f8bfa21de5b";
       })
     ];
     buildInputs =
       (self.nativeDeps."module-deps" or []);
     deps = [
-      self.by-version."through"."2.3.4"
-      self.by-version."JSONStream"."0.7.1"
+      self.by-version."JSONStream"."0.7.2"
       self.by-version."browser-resolve"."1.2.2"
-      self.by-version."resolve"."0.6.2"
-      self.by-version."concat-stream"."1.4.4"
+      self.by-version."concat-stream"."1.4.5"
+      self.by-version."detective"."3.1.0"
       self.by-version."minimist"."0.0.8"
       self.by-version."parents"."0.0.2"
-      self.by-version."detective"."2.4.1"
+      self.by-version."resolve"."0.6.2"
+      self.by-version."through"."2.3.4"
     ];
     peerDependencies = [
     ];
@@ -11068,14 +11147,14 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.0-rc9";
-  by-version."mongodb"."1.4.0-rc9" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.0-rc9";
+    self.by-version."mongodb"."1.4.1";
+  by-version."mongodb"."1.4.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.0-rc9.tgz";
-        name = "mongodb-1.4.0-rc9.tgz";
-        sha1 = "1b3887e9b2846de7557a009e1702f7dbc70d4c12";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.1.tgz";
+        name = "mongodb-1.4.1.tgz";
+        sha1 = "6b37d2c90c2a70ee12fbf7289a45f694f9530b79";
       })
     ];
     buildInputs =
@@ -11088,7 +11167,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.0-rc9";
+  "mongodb" = self.by-version."mongodb"."1.4.1";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -11268,7 +11347,7 @@
     buildInputs =
       (self.nativeDeps."mongoose-schema-extend" or []);
     deps = [
-      self.by-version."owl-deepcopy"."0.0.2"
+      self.by-version."owl-deepcopy"."0.0.4"
     ];
     peerDependencies = [
     ];
@@ -11336,14 +11415,14 @@
     passthru.names = [ "morgan" ];
   };
   by-spec."mout"."^0.9.0" =
-    self.by-version."mout"."0.9.0";
-  by-version."mout"."0.9.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mout-0.9.0";
+    self.by-version."mout"."0.9.1";
+  by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mout-0.9.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mout/-/mout-0.9.0.tgz";
-        name = "mout-0.9.0.tgz";
-        sha1 = "4b6ef8cae5099151d9a7ddb6ebb9a56f9de6aaeb";
+        url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
+        name = "mout-0.9.1.tgz";
+        sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
       })
     ];
     buildInputs =
@@ -11393,7 +11472,7 @@
     passthru.names = [ "mout" ];
   };
   by-spec."mout"."~0.9.0" =
-    self.by-version."mout"."0.9.0";
+    self.by-version."mout"."0.9.1";
   by-spec."mpath"."0.1.1" =
     self.by-version."mpath"."0.1.1";
   by-version."mpath"."0.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -11494,14 +11573,14 @@
     passthru.names = [ "ms" ];
   };
   by-spec."msgpack".">= 0.0.1" =
-    self.by-version."msgpack"."0.2.2";
-  by-version."msgpack"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "msgpack-0.2.2";
+    self.by-version."msgpack"."0.2.3";
+  by-version."msgpack"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "msgpack-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.2.tgz";
-        name = "msgpack-0.2.2.tgz";
-        sha1 = "e7aec9bea24d9b07940dee6cfa536c469cd1776c";
+        url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.3.tgz";
+        name = "msgpack-0.2.3.tgz";
+        sha1 = "0739ab7eaa0a5ba0ff7da2061c72ab806b6afe5f";
       })
     ];
     buildInputs =
@@ -11989,25 +12068,25 @@
   by-spec."node-gyp"."~0.13.0" =
     self.by-version."node-gyp"."0.13.0";
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.7.2";
-  by-version."node-inspector"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-inspector-0.7.2";
+    self.by-version."node-inspector"."0.7.3";
+  by-version."node-inspector"."0.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-inspector-0.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.2.tgz";
-        name = "node-inspector-0.7.2.tgz";
-        sha1 = "b9f1a1bbec7960d504edbfbc4bf191841794aab8";
+        url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.3.tgz";
+        name = "node-inspector-0.7.3.tgz";
+        sha1 = "988317f9a7e645d1bb78e40bb2289db82a077e73";
       })
     ];
     buildInputs =
       (self.nativeDeps."node-inspector" or []);
     deps = [
-      self.by-version."express"."3.4.8"
-      self.by-version."async"."0.2.10"
+      self.by-version."express"."3.5.1"
+      self.by-version."async"."0.4.1"
       self.by-version."glob"."3.2.9"
       self.by-version."rc"."0.3.4"
       self.by-version."strong-data-uri"."0.1.1"
-      self.by-version."debug"."0.7.4"
+      self.by-version."debug"."0.8.1"
       self.by-version."ws"."0.4.31"
       self.by-version."opener"."1.3.0"
       self.by-version."yargs"."1.1.3"
@@ -12017,7 +12096,7 @@
     ];
     passthru.names = [ "node-inspector" ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.7.2";
+  "node-inspector" = self.by-version."node-inspector"."0.7.3";
   by-spec."node-protobuf"."*" =
     self.by-version."node-protobuf"."1.0.10";
   by-version."node-protobuf"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -12227,7 +12306,7 @@
     buildInputs =
       (self.nativeDeps."nodemailer" or []);
     deps = [
-      self.by-version."mailcomposer"."0.2.8"
+      self.by-version."mailcomposer"."0.2.9"
       self.by-version."simplesmtp"."0.3.24"
       self.by-version."optimist"."0.6.1"
     ];
@@ -12320,6 +12399,8 @@
   };
   by-spec."nopt"."2.2.x" =
     self.by-version."nopt"."2.2.0";
+  by-spec."nopt"."^2.2.0" =
+    self.by-version."nopt"."2.2.0";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = lib.makeOverridable self.buildNodePackage {
@@ -12427,9 +12508,9 @@
       self.by-version."node-gyp"."0.13.0"
       self.by-version."nopt"."2.2.0"
       self.by-version."npm-install-checks"."1.0.0"
-      self.by-version."npm-registry-client"."0.4.6"
+      self.by-version."npm-registry-client"."0.4.7"
       self.by-version."npm-user-validate"."0.0.3"
-      self.by-version."npmconf"."0.1.13"
+      self.by-version."npmconf"."0.1.14"
       self.by-version."npmlog"."0.0.6"
       self.by-version."once"."1.3.0"
       self.by-version."opener"."1.3.0"
@@ -12505,15 +12586,15 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.4" =
-    self.by-version."npm-registry-client"."0.4.6";
-  by-version."npm-registry-client"."0.4.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npm-registry-client-0.4.6";
+  by-spec."npm-registry-client"."~0.4.5" =
+    self.by-version."npm-registry-client"."0.4.7";
+  by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npm-registry-client-0.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.6.tgz";
-        name = "npm-registry-client-0.4.6.tgz";
-        sha1 = "657f69a79543fc4cc264c3b2de958bd15f7140fe";
+        url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.4.7.tgz";
+        name = "npm-registry-client-0.4.7.tgz";
+        sha1 = "f4369b59890da7882527eb7c427dd95d43707afb";
       })
     ];
     buildInputs =
@@ -12533,8 +12614,8 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.5" =
-    self.by-version."npm-registry-client"."0.4.6";
+  by-spec."npm-registry-client"."~0.4.7" =
+    self.by-version."npm-registry-client"."0.4.7";
   by-spec."npm-user-validate"."0.0.3" =
     self.by-version."npm-user-validate"."0.0.3";
   by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -12637,14 +12718,14 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.13" =
-    self.by-version."npmconf"."0.1.13";
-  by-version."npmconf"."0.1.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-npmconf-0.1.13";
+    self.by-version."npmconf"."0.1.14";
+  by-version."npmconf"."0.1.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-npmconf-0.1.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.13.tgz";
-        name = "npmconf-0.1.13.tgz";
-        sha1 = "d47241b5b074f554ced90cd888d0dc96e4b1a4da";
+        url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.14.tgz";
+        name = "npmconf-0.1.14.tgz";
+        sha1 = "aea4bc12c5a84191a32cd350e325da4fe8b127e7";
       })
     ];
     buildInputs =
@@ -12664,7 +12745,7 @@
     passthru.names = [ "npmconf" ];
   };
   by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.13";
+    self.by-version."npmconf"."0.1.14";
   by-spec."npmlog"."*" =
     self.by-version."npmlog"."0.0.6";
   by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -12925,9 +13006,26 @@
     passthru.names = [ "open" ];
   };
   by-spec."open"."~0.0.3" =
-    self.by-version."open"."0.0.4";
+    self.by-version."open"."0.0.5";
+  by-version."open"."0.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-open-0.0.5";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
+        name = "open-0.0.5.tgz";
+        sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."open" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "open" ];
+  };
   by-spec."open"."~0.0.4" =
-    self.by-version."open"."0.0.4";
+    self.by-version."open"."0.0.5";
   by-spec."opener"."~1.3.0" =
     self.by-version."opener"."1.3.0";
   by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage {
@@ -12948,14 +13046,14 @@
     passthru.names = [ "opener" ];
   };
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.5";
-  by-version."openid"."0.5.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-openid-0.5.5";
+    self.by-version."openid"."0.5.7";
+  by-version."openid"."0.5.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-openid-0.5.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.5.tgz";
-        name = "openid-0.5.5.tgz";
-        sha1 = "a4ce534ca82d68f81ccf45109fc92b4547b2cdd1";
+        url = "http://registry.npmjs.org/openid/-/openid-0.5.7.tgz";
+        name = "openid-0.5.7.tgz";
+        sha1 = "cb92228f7b887bd5af0a444db42b67db785b0e9b";
       })
     ];
     buildInputs =
@@ -13162,14 +13260,14 @@
   by-spec."osenv"."~0.0.3" =
     self.by-version."osenv"."0.0.3";
   by-spec."owl-deepcopy"."*" =
-    self.by-version."owl-deepcopy"."0.0.2";
-  by-version."owl-deepcopy"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-owl-deepcopy-0.0.2";
+    self.by-version."owl-deepcopy"."0.0.4";
+  by-version."owl-deepcopy"."0.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-owl-deepcopy-0.0.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.2.tgz";
-        name = "owl-deepcopy-0.0.2.tgz";
-        sha1 = "056c40e1af73dff6e2c7afae983d2a7760fdff88";
+        url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
+        name = "owl-deepcopy-0.0.4.tgz";
+        sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369";
       })
     ];
     buildInputs =
@@ -13180,9 +13278,9 @@
     ];
     passthru.names = [ "owl-deepcopy" ];
   };
-  "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.2";
+  "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
   by-spec."owl-deepcopy"."~0.0.1" =
-    self.by-version."owl-deepcopy"."0.0.2";
+    self.by-version."owl-deepcopy"."0.0.4";
   by-spec."p-throttler"."~0.0.1" =
     self.by-version."p-throttler"."0.0.1";
   by-version."p-throttler"."0.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -13265,7 +13363,7 @@
     passthru.names = [ "passport" ];
   };
   "passport" = self.by-version."passport"."0.2.0";
-  by-spec."passport"."~0.1.1" =
+  by-spec."passport"."~0.1.3" =
     self.by-version."passport"."0.1.18";
   by-version."passport"."0.1.18" = lib.makeOverridable self.buildNodePackage {
     name = "node-passport-0.1.18";
@@ -13286,8 +13384,6 @@
     ];
     passthru.names = [ "passport" ];
   };
-  by-spec."passport"."~0.1.3" =
-    self.by-version."passport"."0.1.18";
   by-spec."passport"."~0.2.0" =
     self.by-version."passport"."0.2.0";
   by-spec."passport-http"."*" =
@@ -13333,27 +13429,8 @@
     passthru.names = [ "passport-local" ];
   };
   "passport-local" = self.by-version."passport-local"."1.0.0";
-  by-spec."passport-local"."0.1.6" =
-    self.by-version."passport-local"."0.1.6";
-  by-version."passport-local"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-passport-local-0.1.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/passport-local/-/passport-local-0.1.6.tgz";
-        name = "passport-local-0.1.6.tgz";
-        sha1 = "fb0cf828048db931b67d19985c7aa06dd377a9db";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."passport-local" or []);
-    deps = [
-      self.by-version."pkginfo"."0.2.3"
-      self.by-version."passport"."0.1.18"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "passport-local" ];
-  };
+  by-spec."passport-local"."~1.0.0" =
+    self.by-version."passport-local"."1.0.0";
   by-spec."passport-strategy"."1.x.x" =
     self.by-version."passport-strategy"."1.0.0";
   by-version."passport-strategy"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -13450,14 +13527,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.7-1";
-  by-version."phantomjs"."1.9.7-1" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.7-1";
+    self.by-version."phantomjs"."1.9.7-3";
+  by-version."phantomjs"."1.9.7-3" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.7-3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-1.tgz";
-        name = "phantomjs-1.9.7-1.tgz";
-        sha1 = "57a191c908de74d27ac4948bd66100ae88222f47";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-3.tgz";
+        name = "phantomjs-1.9.7-3.tgz";
+        sha1 = "5deffc801452c4a44e65b02c26e8672617b9bdbf";
       })
     ];
     buildInputs =
@@ -13634,6 +13711,25 @@
     ];
     passthru.names = [ "process" ];
   };
+  by-spec."process"."~0.6.0" =
+    self.by-version."process"."0.6.0";
+  by-version."process"."0.6.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-process-0.6.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
+        name = "process-0.6.0.tgz";
+        sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."process" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "process" ];
+  };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -13818,6 +13914,26 @@
   };
   by-spec."punycode"."~1.2.3" =
     self.by-version."punycode"."1.2.4";
+  by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
+    self.by-version."pure-css"."0.5.0-rc-1";
+  by-version."pure-css"."0.5.0-rc-1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pure-0.5.0-rc-1";
+    src = [
+      (fetchgit {
+        url = "git://github.com/yui/pure.git";
+        rev = "f5ce3ae4b48ce252adac7b6ddac50c9518729a2d";
+        sha256 = "049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pure" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pure" ];
+  };
+  "pure-css" = self.by-version."pure-css"."0.5.0-rc-1";
   by-spec."q".">= 0.0.1" =
     self.by-version."q"."2.0.1";
   by-version."q"."2.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -14022,6 +14138,8 @@
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
+  by-spec."qs"."~0.6.6" =
+    self.by-version."qs"."0.6.6";
   by-spec."querystring".">=0.1.0 <0.2.0" =
     self.by-version."querystring"."0.1.0";
   by-version."querystring"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -14119,15 +14237,15 @@
   };
   by-spec."range-parser"."~1.0.0" =
     self.by-version."range-parser"."1.0.0";
-  by-spec."raven"."~0.6.2" =
-    self.by-version."raven"."0.6.2";
-  by-version."raven"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "raven-0.6.2";
+  by-spec."raven"."~0.6.3" =
+    self.by-version."raven"."0.6.3";
+  by-version."raven"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "raven-0.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/raven/-/raven-0.6.2.tgz";
-        name = "raven-0.6.2.tgz";
-        sha1 = "391a7395b6088518a01697f639f21ce6ea9841a3";
+        url = "http://registry.npmjs.org/raven/-/raven-0.6.3.tgz";
+        name = "raven-0.6.3.tgz";
+        sha1 = "3e7c72d45e0dff93ecc54978661331755c637320";
       })
     ];
     buildInputs =
@@ -14201,6 +14319,8 @@
     ];
     passthru.names = [ "raw-body" ];
   };
+  by-spec."raw-body"."~1.1.2" =
+    self.by-version."raw-body"."1.1.3";
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -14311,29 +14431,6 @@
     self.by-version."read"."1.0.5";
   by-spec."read"."~1.0.4" =
     self.by-version."read"."1.0.5";
-  by-spec."read-installed"."0.2.2" =
-    self.by-version."read-installed"."0.2.2";
-  by-version."read-installed"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-read-installed-0.2.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.2.tgz";
-        name = "read-installed-0.2.2.tgz";
-        sha1 = "f570ac84fb29c75f16faa3940a8c1e602c8eecab";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."read-installed" or []);
-    deps = [
-      self.by-version."semver"."2.2.1"
-      self.by-version."slide"."1.1.5"
-      self.by-version."read-package-json"."1.1.8"
-      self.by-version."graceful-fs"."1.2.3"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "read-installed" ];
-  };
   by-spec."read-installed"."~2.0.1" =
     self.by-version."read-installed"."2.0.2";
   by-version."read-installed"."2.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -14794,6 +14891,8 @@
   };
   by-spec."request".">=2.33.0" =
     self.by-version."request"."2.34.0";
+  by-spec."request"."^2.34.0" =
+    self.by-version."request"."2.34.0";
   by-spec."request"."~2" =
     self.by-version."request"."2.34.0";
   by-spec."request"."~2.27.0" =
@@ -14889,8 +14988,6 @@
     ];
     passthru.names = [ "request" ];
   };
-  by-spec."request"."~2.34.0" =
-    self.by-version."request"."2.34.0";
   by-spec."request-progress"."~0.3.0" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -15295,15 +15392,15 @@
     passthru.names = [ "s3http" ];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
-  by-spec."sauce-connect-launcher"."~0.3.0" =
-    self.by-version."sauce-connect-launcher"."0.3.3";
-  by-version."sauce-connect-launcher"."0.3.3" = lib.makeOverridable self.buildNodePackage {
-    name = "node-sauce-connect-launcher-0.3.3";
+  by-spec."sauce-connect-launcher"."~0.4.0" =
+    self.by-version."sauce-connect-launcher"."0.4.2";
+  by-version."sauce-connect-launcher"."0.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sauce-connect-launcher-0.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.3.3.tgz";
-        name = "sauce-connect-launcher-0.3.3.tgz";
-        sha1 = "6c8b59d16b795ffc9439f162d5abd24387cdc23d";
+        url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.4.2.tgz";
+        name = "sauce-connect-launcher-0.4.2.tgz";
+        sha1 = "a24b9fde59e3b29ca2011174c5c08ef8f74e44b9";
       })
     ];
     buildInputs =
@@ -15375,6 +15472,25 @@
     ];
     passthru.names = [ "sax" ];
   };
+  by-spec."scmp"."~0.0.3" =
+    self.by-version."scmp"."0.0.3";
+  by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-scmp-0.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
+        name = "scmp-0.0.3.tgz";
+        sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."scmp" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "scmp" ];
+  };
   by-spec."selenium-webdriver"."*" =
     self.by-version."selenium-webdriver"."2.41.0";
   by-version."selenium-webdriver"."2.41.0" = lib.makeOverridable self.buildNodePackage {
@@ -15521,7 +15637,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.2"
       self.by-version."range-parser"."1.0.0"
@@ -15544,7 +15660,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -15567,7 +15683,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -15590,7 +15706,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -15683,6 +15799,48 @@
     ];
     passthru.names = [ "serve-static" ];
   };
+  by-spec."serve-static"."1.0.4" =
+    self.by-version."serve-static"."1.0.4";
+  by-version."serve-static"."1.0.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-serve-static-1.0.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.4.tgz";
+        name = "serve-static-1.0.4.tgz";
+        sha1 = "426fedebe77bad21f373f1efcae09746639fba06";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."serve-static" or []);
+    deps = [
+      self.by-version."parseurl"."1.0.1"
+      self.by-version."send"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "serve-static" ];
+  };
+  by-spec."serve-static"."~1.0.3" =
+    self.by-version."serve-static"."1.0.4";
+  by-spec."setimmediate"."1.0.1" =
+    self.by-version."setimmediate"."1.0.1";
+  by-version."setimmediate"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-setimmediate-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
+        name = "setimmediate-1.0.1.tgz";
+        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."setimmediate" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "setimmediate" ];
+  };
   by-spec."sha"."~1.2.1" =
     self.by-version."sha"."1.2.3";
   by-version."sha"."1.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -15804,14 +15962,14 @@
     passthru.names = [ "shelljs" ];
   };
   by-spec."should"."*" =
-    self.by-version."should"."3.2.0";
-  by-version."should"."3.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.2.0";
+    self.by-version."should"."3.3.0";
+  by-version."should"."3.3.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-3.3.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.2.0.tgz";
-        name = "should-3.2.0.tgz";
-        sha1 = "0dbbaec439c37eac010d4c0c2304815598be659f";
+        url = "http://registry.npmjs.org/should/-/should-3.3.0.tgz";
+        name = "should-3.3.0.tgz";
+        sha1 = "88b1adeab97d8811e0e479e3b93d7f1c1bd5bbca";
       })
     ];
     buildInputs =
@@ -15822,7 +15980,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.2.0";
+  "should" = self.by-version."should"."3.3.0";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16119,7 +16277,7 @@
     ];
     passthru.names = [ "socket.io" ];
   };
-  by-spec."socket.io"."0.9.16" =
+  by-spec."socket.io"."~0.9.13" =
     self.by-version."socket.io"."0.9.16";
   by-version."socket.io"."0.9.16" = lib.makeOverridable self.buildNodePackage {
     name = "node-socket.io-0.9.16";
@@ -16142,7 +16300,7 @@
     ];
     passthru.names = [ "socket.io" ];
   };
-  by-spec."socket.io"."~0.9.13" =
+  by-spec."socket.io"."~0.9.16" =
     self.by-version."socket.io"."0.9.16";
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
@@ -16527,27 +16685,7 @@
     ];
     passthru.names = [ "stream-browserify" ];
   };
-  by-spec."stream-combiner"."^0.0.2" =
-    self.by-version."stream-combiner"."0.0.2";
-  by-version."stream-combiner"."0.0.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stream-combiner-0.0.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.2.tgz";
-        name = "stream-combiner-0.0.2.tgz";
-        sha1 = "dfe0e74675742565e76c6056788ea5c23bd97db4";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."stream-combiner" or []);
-    deps = [
-      self.by-version."duplexer"."0.0.4"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "stream-combiner" ];
-  };
-  by-spec."stream-combiner"."~0.0.2" =
+  by-spec."stream-combiner"."^0.0.4" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-stream-combiner-0.0.4";
@@ -16567,6 +16705,8 @@
     ];
     passthru.names = [ "stream-combiner" ];
   };
+  by-spec."stream-combiner"."~0.0.2" =
+    self.by-version."stream-combiner"."0.0.4";
   by-spec."stream-counter"."~0.1.0" =
     self.by-version."stream-counter"."0.1.0";
   by-version."stream-counter"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -16782,14 +16922,14 @@
     passthru.names = [ "strong-data-uri" ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.42.3";
-  by-version."stylus"."0.42.3" = lib.makeOverridable self.buildNodePackage {
-    name = "stylus-0.42.3";
+    self.by-version."stylus"."0.44.0-beta3";
+  by-version."stylus"."0.44.0-beta3" = lib.makeOverridable self.buildNodePackage {
+    name = "stylus-0.44.0-beta3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stylus/-/stylus-0.42.3.tgz";
-        name = "stylus-0.42.3.tgz";
-        sha1 = "23e8b3e71eb7f60bc4a657de498c8feb9c366c32";
+        url = "http://registry.npmjs.org/stylus/-/stylus-0.44.0-beta3.tgz";
+        name = "stylus-0.44.0-beta3.tgz";
+        sha1 = "a602b30f57f1692cf0f1fb664e60a14e26102cff";
       })
     ];
     buildInputs =
@@ -16797,15 +16937,16 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
+      self.by-version."circular-json"."0.1.6"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "stylus" ];
   };
-  "stylus" = self.by-version."stylus"."0.42.3";
+  "stylus" = self.by-version."stylus"."0.44.0-beta3";
   by-spec."stylus"."0.42.2" =
     self.by-version."stylus"."0.42.2";
   by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage {
@@ -16822,7 +16963,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
     ];
@@ -16943,42 +17084,17 @@
     ];
     passthru.names = [ "superagent" ];
   };
-  by-spec."superagent"."~0.16.0" =
-    self.by-version."superagent"."0.16.0";
-  by-version."superagent"."0.16.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-superagent-0.16.0";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/superagent/-/superagent-0.16.0.tgz";
-        name = "superagent-0.16.0.tgz";
-        sha1 = "f38df4a476565dffdbaa07764b81a19f0ab38a4e";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."superagent" or []);
-    deps = [
-      self.by-version."qs"."0.6.5"
-      self.by-version."formidable"."1.0.14"
-      self.by-version."mime"."1.2.5"
-      self.by-version."emitter-component"."1.0.0"
-      self.by-version."methods"."0.0.1"
-      self.by-version."cookiejar"."1.3.0"
-      self.by-version."debug"."0.7.4"
-      self.by-version."reduce-component"."1.0.1"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "superagent" ];
-  };
+  by-spec."superagent"."~0.17.0" =
+    self.by-version."superagent"."0.17.0";
   by-spec."supertest"."*" =
-    self.by-version."supertest"."0.10.0";
-  by-version."supertest"."0.10.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-supertest-0.10.0";
+    self.by-version."supertest"."0.11.0";
+  by-version."supertest"."0.11.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-supertest-0.11.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/supertest/-/supertest-0.10.0.tgz";
-        name = "supertest-0.10.0.tgz";
-        sha1 = "5ba821b5f4e9e643292fcf87268dfd2688bdbb58";
+        url = "http://registry.npmjs.org/supertest/-/supertest-0.11.0.tgz";
+        name = "supertest-0.11.0.tgz";
+        sha1 = "f8496b9f05cac1ea2fcec1d21adeca7167f42460";
       })
     ];
     buildInputs =
@@ -16991,7 +17107,7 @@
     ];
     passthru.names = [ "supertest" ];
   };
-  "supertest" = self.by-version."supertest"."0.10.0";
+  "supertest" = self.by-version."supertest"."0.11.0";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = lib.makeOverridable self.buildNodePackage {
@@ -17034,21 +17150,21 @@
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
-  by-spec."syntax-error"."~0.1.0" =
-    self.by-version."syntax-error"."0.1.0";
-  by-version."syntax-error"."0.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-syntax-error-0.1.0";
+  by-spec."syntax-error"."~1.1.0" =
+    self.by-version."syntax-error"."1.1.0";
+  by-version."syntax-error"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-syntax-error-1.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
-        name = "syntax-error-0.1.0.tgz";
-        sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65";
+        url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.0.tgz";
+        name = "syntax-error-1.1.0.tgz";
+        sha1 = "8bc3b08141b4e5084dfc66c74e15928db9f34e85";
       })
     ];
     buildInputs =
       (self.nativeDeps."syntax-error" or []);
     deps = [
-      self.by-version."esprima-six"."0.0.3"
+      self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"
     ];
     peerDependencies = [
     ];
@@ -17253,6 +17369,25 @@
     ];
     passthru.names = [ "throttleit" ];
   };
+  by-spec."through".">=2.2.7 <3" =
+    self.by-version."through"."2.3.4";
+  by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-through-2.3.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
+        name = "through-2.3.4.tgz";
+        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."through" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "through" ];
+  };
   by-spec."through"."~2.2.7" =
     self.by-version."through"."2.2.7";
   by-version."through"."2.2.7" = lib.makeOverridable self.buildNodePackage {
@@ -17274,24 +17409,7 @@
   };
   by-spec."through"."~2.3.4" =
     self.by-version."through"."2.3.4";
-  by-version."through"."2.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-through-2.3.4";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
-        name = "through-2.3.4.tgz";
-        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."through" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "through" ];
-  };
-  by-spec."through2"."~0.4.0" =
+  by-spec."through2"."^0.4.0" =
     self.by-version."through2"."0.4.1";
   by-version."through2"."0.4.1" = lib.makeOverridable self.buildNodePackage {
     name = "node-through2-0.4.1";
@@ -17312,6 +17430,8 @@
     ];
     passthru.names = [ "through2" ];
   };
+  by-spec."through2"."~0.4.1" =
+    self.by-version."through2"."0.4.1";
   by-spec."timers-browserify"."~1.0.1" =
     self.by-version."timers-browserify"."1.0.1";
   by-version."timers-browserify"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -17660,6 +17780,26 @@
     ];
     passthru.names = [ "type-is" ];
   };
+  by-spec."type-is"."~1.1.0" =
+    self.by-version."type-is"."1.1.0";
+  by-version."type-is"."1.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-type-is-1.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/type-is/-/type-is-1.1.0.tgz";
+        name = "type-is-1.1.0.tgz";
+        sha1 = "d0245ec8b2676668d59dd0cf3255060676a57db6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."type-is" or []);
+    deps = [
+      self.by-version."mime"."1.2.11"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "type-is" ];
+  };
   by-spec."typechecker"."~2.0.1" =
     self.by-version."typechecker"."2.0.8";
   by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage {
@@ -17941,8 +18081,6 @@
     self.by-version."underscore"."1.6.0";
   by-spec."underscore".">=1.5.0" =
     self.by-version."underscore"."1.6.0";
-  by-spec."underscore".">=1.5.x" =
-    self.by-version."underscore"."1.6.0";
   by-spec."underscore"."~1.4" =
     self.by-version."underscore"."1.4.4";
   by-spec."underscore"."~1.4.3" =
@@ -18033,31 +18171,31 @@
     passthru.names = [ "unfunk-diff" ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.7.2";
-  by-version."ungit"."0.7.2" = lib.makeOverridable self.buildNodePackage {
-    name = "ungit-0.7.2";
+    self.by-version."ungit"."0.8.0";
+  by-version."ungit"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "ungit-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/ungit/-/ungit-0.7.2.tgz";
-        name = "ungit-0.7.2.tgz";
-        sha1 = "fc4d6943c407ca4ed08b7c48841419050e3ce52a";
+        url = "http://registry.npmjs.org/ungit/-/ungit-0.8.0.tgz";
+        name = "ungit-0.8.0.tgz";
+        sha1 = "ca1f166ee65fbfe54469459d51f77ca502f1c6a4";
       })
     ];
     buildInputs =
       (self.nativeDeps."ungit" or []);
     deps = [
-      self.by-version."express"."3.4.8"
-      self.by-version."superagent"."0.16.0"
+      self.by-version."express"."4.0.0"
+      self.by-version."superagent"."0.17.0"
       self.by-version."lodash"."2.4.1"
       self.by-version."temp"."0.7.0"
       self.by-version."socket.io"."0.9.16"
       self.by-version."moment"."2.5.1"
-      self.by-version."async"."0.2.10"
+      self.by-version."async"."0.6.2"
       self.by-version."rc"."0.3.4"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.3"
       self.by-version."passport"."0.2.0"
-      self.by-version."passport-local"."0.1.6"
+      self.by-version."passport-local"."1.0.0"
       self.by-version."semver"."2.2.1"
       self.by-version."forever-monitor"."1.1.0"
       self.by-version."open"."0.0.4"
@@ -18070,19 +18208,23 @@
       self.by-version."keen.io"."0.0.4"
       self.by-version."getmac"."1.0.6"
       self.by-version."deep-extend"."0.2.8"
-      self.by-version."raven"."0.6.2"
-      self.by-version."knockout"."3.0.0"
-      self.by-version."npm-registry-client"."0.4.6"
-      self.by-version."npmconf"."0.1.13"
+      self.by-version."raven"."0.6.3"
+      self.by-version."knockout"."3.1.0"
+      self.by-version."npm-registry-client"."0.4.7"
+      self.by-version."npmconf"."0.1.14"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."less"."1.7.0"
-      self.by-version."browserify"."3.32.1"
+      self.by-version."browserify"."3.38.1"
+      self.by-version."body-parser"."1.0.2"
+      self.by-version."cookie-parser"."1.0.1"
+      self.by-version."express-session"."1.0.2"
+      self.by-version."serve-static"."1.0.4"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "ungit" ];
   };
-  "ungit" = self.by-version."ungit"."0.7.2";
+  "ungit" = self.by-version."ungit"."0.8.0";
   by-spec."update-notifier"."~0.1.3" =
     self.by-version."update-notifier"."0.1.8";
   by-version."update-notifier"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -18624,14 +18766,14 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.14";
-  by-version."wd"."0.2.14" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.14";
+    self.by-version."wd"."0.2.17";
+  by-version."wd"."0.2.17" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.17";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.14.tgz";
-        name = "wd-0.2.14.tgz";
-        sha1 = "834dfc756e03a68013ff3a3f62aea0cb1302f879";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.17.tgz";
+        name = "wd-0.2.17.tgz";
+        sha1 = "277b417057a1a5fe7845ab3dc4ff130888f4ec95";
       })
     ];
     buildInputs =
@@ -18685,8 +18827,8 @@
       self.by-version."adm-zip"."0.4.4"
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."npmconf"."0.1.13"
-      self.by-version."phantomjs"."1.9.7-1"
+      self.by-version."npmconf"."0.1.14"
+      self.by-version."phantomjs"."1.9.7-3"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];
@@ -18862,6 +19004,8 @@
   };
   by-spec."winston"."~0.7.2" =
     self.by-version."winston"."0.7.3";
+  by-spec."winston"."~0.7.3" =
+    self.by-version."winston"."0.7.3";
   by-spec."wiredep"."~1.0.0" =
     self.by-version."wiredep"."1.0.0";
   by-version."wiredep"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -19007,6 +19151,25 @@
   };
   by-spec."wrench"."~1.5.4" =
     self.by-version."wrench"."1.5.8";
+  by-spec."wru".">= 0.0.0" =
+    self.by-version."wru"."0.2.7";
+  by-version."wru"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "wru-0.2.7";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/wru/-/wru-0.2.7.tgz";
+        name = "wru-0.2.7.tgz";
+        sha1 = "f6fa4fc7d54f44bec19d55c66c4667078d73062d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."wru" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "wru" ];
+  };
   by-spec."ws"."0.4.x" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = lib.makeOverridable self.buildNodePackage {
@@ -19127,7 +19290,7 @@
       (self.nativeDeps."xml2js" or []);
     deps = [
       self.by-version."sax"."0.5.8"
-      self.by-version."xmlbuilder"."2.1.0"
+      self.by-version."xmlbuilder"."2.2.1"
     ];
     peerDependencies = [
     ];
@@ -19155,20 +19318,20 @@
     passthru.names = [ "xmlbuilder" ];
   };
   by-spec."xmlbuilder".">=0.4.2" =
-    self.by-version."xmlbuilder"."2.1.0";
-  by-version."xmlbuilder"."2.1.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-xmlbuilder-2.1.0";
+    self.by-version."xmlbuilder"."2.2.1";
+  by-version."xmlbuilder"."2.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-xmlbuilder-2.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.1.0.tgz";
-        name = "xmlbuilder-2.1.0.tgz";
-        sha1 = "6ddae31683b6df12100b29fc8a0d4f46349abbed";
+        url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
+        name = "xmlbuilder-2.2.1.tgz";
+        sha1 = "9326430f130d87435d4c4086643aa2926e105a32";
       })
     ];
     buildInputs =
       (self.nativeDeps."xmlbuilder" or []);
     deps = [
-      self.by-version."underscore"."1.6.0"
+      self.by-version."lodash-node"."2.4.1"
     ];
     peerDependencies = [
     ];
@@ -19305,7 +19468,7 @@
       self.by-version."findup-sync"."0.1.3"
       self.by-version."chalk"."0.3.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.12"
+      self.by-version."download"."0.1.15"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -19345,7 +19508,7 @@
       self.by-version."findup-sync"."0.1.3"
       self.by-version."chalk"."0.4.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.12"
+      self.by-version."download"."0.1.15"
       self.by-version."request"."2.30.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."class-extend"."0.1.1"
@@ -19377,12 +19540,12 @@
       self.by-version."async"."0.2.10"
       self.by-version."open"."0.0.4"
       self.by-version."chalk"."0.4.0"
-      self.by-version."findup"."0.1.4"
+      self.by-version."findup"."0.1.5"
       self.by-version."shelljs"."0.2.6"
     ];
     peerDependencies = [
       self.by-version."grunt-cli"."0.1.13"
-      self.by-version."bower"."1.3.1"
+      self.by-version."bower"."1.3.2"
     ];
     passthru.names = [ "yo" ];
   };
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 025c636b737..45447127dca 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -121,4 +121,5 @@
 , "deepmerge"
 , "slasp"
 , "react"
+, { "pure-css": "git://github.com/yui/pure.git#v0.5.0-rc-1" }
 ]

From 0fc9f65ff28abda378e8c7967804e3cf05351ba7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 16:50:29 +0200
Subject: [PATCH 0174/2033] linux-headers-2.6.28: Remove, no longer used

---
 .../linux/kernel-headers/2.6.28.nix           | 61 -------------------
 pkgs/top-level/all-packages.nix               | 16 ++---
 2 files changed, 6 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.28.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
deleted file mode 100644
index 1ba03010f8a..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, perl, cross ? null}:
-
-assert cross == null -> stdenv.isLinux;
-
-let version = "2.6.28.5"; in
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9";
-  };
-
-  targetConfig = if cross != null then cross.config else null;
-
-  platform =
-    if cross != null then cross.arch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.system == "mips64el-linux" then "mips" else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  buildInputs = [perl];
-
-  extraIncludeDirs =
-    if cross != null then
-	(if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  patchPhase = ''
-    patch --verbose -p1 < "${./unifdef-getline.patch}"
-    sed -i '/scsi/d' include/Kbuild
-    sed -i 's|/ %/: prepare scripts FORCE|%/: prepare scripts FORCE|' Makefile
-  '';
-
-  buildPhase = ''
-    if test -n "$targetConfig"; then
-       export ARCH=$platform
-    fi
-    make mrproper headers_check
-  '';
-
-  installPhase = ''
-    make INSTALL_HDR_PATH=$out headers_install
-
-    # Some builds (e.g. KVM) want a kernel.release.
-    mkdir -p $out/include/config
-    echo "${version}-default" > $out/include/config/kernel.release
-  '';
-
-  # !!! hacky
-  fixupPhase = ''
-    ln -s asm $out/include/asm-$platform
-    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
-      ln -s asm $out/include/asm-x86
-    fi
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 743d699ee87..f5977e400f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6874,23 +6874,21 @@ let
   libnl = callPackage ../os-specific/linux/libnl { };
   libnl_3_2_19 = callPackage ../os-specific/linux/libnl/3.2.19.nix { };
 
-  linuxHeaders = linuxHeaders37;
-
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
-  linuxHeaders26 = callPackage ../os-specific/linux/kernel-headers/2.6.32.nix { };
+  linuxHeaders = linuxHeaders37;
 
-  linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
+  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
+    inherit stdenv fetchurl perl;
+    cross = assert crossSystem != null; crossSystem;
+  });
 
   linuxHeaders26Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
     inherit stdenv fetchurl perl;
     cross = assert crossSystem != null; crossSystem;
   });
 
-  linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
-    inherit stdenv fetchurl perl;
-    cross = assert crossSystem != null; crossSystem;
-  });
+  linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
 
   # We can choose:
   linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross
@@ -6900,8 +6898,6 @@ let
   linuxHeadersCross = assert crossSystem != null;
     linuxHeadersCrossChooser crossSystem.platform.kernelMajor;
 
-  linuxHeaders_2_6_28 = callPackage ../os-specific/linux/kernel-headers/2.6.28.nix { };
-
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {

From a37edbbb636d0332592fa8c70e78496c988b49d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 16:59:19 +0200
Subject: [PATCH 0175/2033] linux-headers: Add 3.14

---
 .../os-specific/linux/kernel-headers/3.14.nix | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel-headers/3.14.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/3.14.nix b/pkgs/os-specific/linux/kernel-headers/3.14.nix
new file mode 100644
index 00000000000..d9d0ce7e3b3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/3.14.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, perl, cross ? null }:
+
+assert cross == null -> stdenv.isLinux;
+
+let
+
+  version = "3.14.1";
+
+  kernelHeadersBaseConfig =
+    if cross == null
+    then stdenv.platform.kernelHeadersBaseConfig
+    else cross.platform.kernelHeadersBaseConfig;
+
+in
+
+stdenv.mkDerivation {
+  name = "linux-headers-${version}";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
+    sha256 = "1njm8gvlj7cq0m1051yxszl4f63383a7sv1na13hkqkv36kipgqx";
+  };
+
+  targetConfig = if cross != null then cross.config else null;
+
+  platform =
+    if cross != null then cross.platform.kernelArch else
+    if stdenv.system == "i686-linux" then "i386" else
+    if stdenv.system == "x86_64-linux" then "x86_64" else
+    if stdenv.system == "powerpc-linux" then "powerpc" else
+    if stdenv.isArm then "arm" else
+    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
+    abort "don't know what the kernel include directory is called for this platform";
+
+  buildInputs = [perl];
+
+  extraIncludeDirs =
+    if cross != null then
+        (if cross.arch == "powerpc" then ["ppc"] else [])
+    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+
+  buildPhase = ''
+    if test -n "$targetConfig"; then
+       export ARCH=$platform
+    fi
+    make ${kernelHeadersBaseConfig} SHELL=bash
+    make mrproper headers_check SHELL=bash
+  '';
+
+  installPhase = ''
+    make INSTALL_HDR_PATH=$out headers_install
+
+    # Some builds (e.g. KVM) want a kernel.release.
+    mkdir -p $out/include/config
+    echo "${version}-default" > $out/include/config/kernel.release
+  '';
+
+  # !!! hacky
+  fixupPhase = ''
+    ln -s asm $out/include/asm-$platform
+    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
+      ln -s asm $out/include/asm-x86
+    fi
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Header files and scripts for Linux kernel";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5977e400f4..9c37e0009de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6876,7 +6876,7 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
-  linuxHeaders = linuxHeaders37;
+  linuxHeaders = linuxHeaders_3_7;
 
   linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
     inherit stdenv fetchurl perl;
@@ -6888,7 +6888,9 @@ let
     cross = assert crossSystem != null; crossSystem;
   });
 
-  linuxHeaders37 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
+  linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { };
+
+  linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { };
 
   # We can choose:
   linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross

From 07cb7451d95a290a44c5b00d192c87333960b87f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 18:02:07 +0200
Subject: [PATCH 0176/2033] lvm2: Update to 2.02.106

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

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index bd748dadf61..9e2b0c90079 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
 
 let
-  v = "2.02.104";
+  v = "2.02.106";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz";
-    sha256 = "1xa7hvp8bsx96nncgksxrqxaqcgipfmmpr8aysayb8aisyjvas0d";
+    sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc";
   };
 
   configureFlags =
@@ -29,6 +29,8 @@ stdenv.mkDerivation {
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
     '';
 
+  enableParallelBuilding = true;
+
   #patches = [ ./purity.patch ];
 
   # To prevent make install from failing.

From e8eea659a09d7688145188537716dc751554ece4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Apr 2014 23:43:39 +0200
Subject: [PATCH 0177/2033] Don't enable LVM2 in containers

It's a somewhat pointless dependency.
---
 nixos/modules/tasks/lvm.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 0e0272388c7..d56a8a2f63a 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -1,10 +1,12 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+
+with lib;
 
 {
 
   ###### implementation
 
-  config = {
+  config = mkIf (!config.boot.isContainer) {
 
     environment.systemPackages = [ pkgs.lvm2 ];
 

From ee9c068b0cd82422ad95c20446d66b5d98869f8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 00:59:26 +0200
Subject: [PATCH 0178/2033] systemd: Update to 212

Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
---
 nixos/modules/system/boot/systemd.nix         |  53 +-
 pkgs/development/libraries/dbus/default.nix   |  23 +-
 pkgs/os-specific/linux/systemd/default.nix    |  51 +-
 .../systemd/fix_console_in_containers.patch   |  14 -
 pkgs/os-specific/linux/systemd/fixes.patch    | 717 ++----------------
 .../linux/systemd/libc-bug-accept4-arm.patch  |  81 --
 pkgs/top-level/all-packages.nix               |   4 +-
 7 files changed, 126 insertions(+), 817 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/systemd/fix_console_in_containers.patch
 delete mode 100644 pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3582694a181..7d528348918 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -41,6 +41,7 @@ let
       "sigpwr.target"
       "timers.target"
       "paths.target"
+      "rpcbind.target"
 
       # Rescue mode.
       "rescue.target"
@@ -91,10 +92,14 @@ let
       "swap.target"
       "dev-hugepages.mount"
       "dev-mqueue.mount"
+      "proc-sys-fs-binfmt_misc.mount"
       "sys-fs-fuse-connections.mount"
       "sys-kernel-config.mount"
       "sys-kernel-debug.mount"
 
+      # Maintaining state across reboots.
+      "systemd-random-seed.service"
+
       # Hibernate / suspend.
       "hibernate.target"
       "suspend.target"
@@ -119,12 +124,21 @@ let
       "final.target"
       "kexec.target"
       "systemd-kexec.service"
+      "systemd-update-utmp.service"
 
       # Password entry.
       "systemd-ask-password-console.path"
       "systemd-ask-password-console.service"
       "systemd-ask-password-wall.path"
       "systemd-ask-password-wall.service"
+
+      # Slices / containers.
+      "slices.target"
+      "-.slice"
+      "system.slice"
+      "user.slice"
+      "machine.slice"
+      "systemd-machined.service"
     ]
 
     ++ optionals cfg.enableEmergencyMode [
@@ -143,7 +157,6 @@ let
       "sockets.target.wants"
       "local-fs.target.wants"
       "multi-user.target.wants"
-      "shutdown.target.wants"
       "timers.target.wants"
     ];
 
@@ -708,43 +721,5 @@ in
         })
         (filterAttrs (name: service: service.startAt != "") cfg.services);
 
-    # FIXME: These are borrowed from upstream systemd.
-    systemd.services."systemd-update-utmp" =
-      { description = "Update UTMP about System Reboot/Shutdown";
-        wantedBy = [ "sysinit.target" ];
-        after = [ "systemd-remount-fs.service" ];
-        before = [ "sysinit.target" "shutdown.target" ];
-        conflicts = [ "shutdown.target" ];
-        unitConfig = {
-          DefaultDependencies = false;
-          RequiresMountsFor = "/var/log";
-        };
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${systemd}/lib/systemd/systemd-update-utmp reboot";
-          ExecStop = "${systemd}/lib/systemd/systemd-update-utmp shutdown";
-        };
-        restartIfChanged = false;
-      };
-
-    systemd.services."systemd-random-seed" =
-      { description = "Load/Save Random Seed";
-        wantedBy = [ "sysinit.target" "multi-user.target" ];
-        after = [ "systemd-remount-fs.service" ];
-        before = [ "sysinit.target" "shutdown.target" ];
-        conflicts = [ "shutdown.target" ];
-        unitConfig = {
-          DefaultDependencies = false;
-          RequiresMountsFor = "/var/lib";
-        };
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${systemd}/lib/systemd/systemd-random-seed load";
-          ExecStop = "${systemd}/lib/systemd/systemd-random-seed save";
-        };
-      };
-
   };
 }
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 11ad2014663..ff1c9f76cd0 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -67,14 +67,12 @@ let
 
   } merge ]);
 
-  libs = dbus_drv "libs" "dbus" ({
+  libs = dbus_drv "libs" "dbus" {
     # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
     # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
     NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
-  } // stdenv.lib.optionalAttrs (systemdOrEmpty != []) {
-    buildInputs = [ systemd.headers ];
-    patches = [ ./systemd.patch ]; # bypass systemd detection
-  });
+    buildInputs = [ systemdOrEmpty ];
+  };
 
 
   attrs = rec {
@@ -83,14 +81,13 @@ let
   # This package has been split because most applications only need dbus.lib
   # which serves as an interface to a *system-wide* daemon,
   # see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture .
-  # Also some circular dependencies get split by this (like with systemd).
 
   inherit libs;
 
   tools = dbus_drv "tools" "tools" {
     configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ];
-    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon dbus_glib ];
-    NIX_CFLAGS_LINK = 
+    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon ];
+    NIX_CFLAGS_LINK =
       stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
       + "-ldbus-1";
 
@@ -102,16 +99,6 @@ let
     buildInputs = systemdOrEmpty;
   };
 
-  # Some of the tests don't work yet; in fact, @vcunat tried several packages
-  # containing dbus testing, and all of them have some test failure.
-  tests = dbus_drv "tests" "test" {
-    preBuild = makeInternalLib;
-    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs tools daemon dbus_glib python ];
-    NIX_CFLAGS_LINK = 
-      stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
-      + "-ldbus-1";
-  };
-
   docs = dbus_drv "docs" "doc" {
     postInstall = ''rm -r "$out/lib"'';
   };
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0afaf7b0370..e48c875d6f9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
-, kexectools, libmicrohttpd
+, kexectools, libmicrohttpd, linuxHeaders
 , python ? null, pythonSupport ? false
 }:
 
@@ -10,26 +10,24 @@ assert stdenv.isLinux;
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation rec {
-  version = "203";
+  version = "212";
   name = "systemd-${version}";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
-    sha256 = "07gvn3rpski8sh1nz16npjf2bvj0spsjdwc5px9685g2pi6kxcb1";
+    sha256 = "1hpjcc42svrs06q3isjm3m5aphgkpfdylmvpnif71zh46ys0cab5";
   };
 
   patches =
     [ # These are all changes between upstream and
-      # https://github.com/edolstra/systemd/tree/nixos-v203.
+      # https://github.com/edolstra/systemd/tree/nixos-v212.
       ./fixes.patch
-      ./fix_console_in_containers.patch
-    ]
-    ++ stdenv.lib.optional stdenv.isArm ./libc-bug-accept4-arm.patch;
+    ];
 
   buildInputs =
-    [ pkgconfig intltool gperf libcap dbus.libs kmod xz pam acl
+    [ pkgconfig intltool gperf libcap kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
-      libmicrohttpd
+      libmicrohttpd linuxHeaders
     ] ++ stdenv.lib.optional pythonSupport python;
 
   configureFlags =
@@ -45,15 +43,18 @@ stdenv.mkDerivation rec {
       "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
       "--with-firmware-path=/root/test-firmware:/run/current-system/firmware"
       "--with-tty-gid=3" # tty in NixOS has gid 3
+      "--disable-networkd" # enable/use eventually
+      "--enable-compat-libs" # get rid of this eventually
     ];
 
   preConfigure =
     ''
       # FIXME: patch this in systemd properly (and send upstream).
       # FIXME: use sulogin from util-linux once updated.
-      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c src/core/shutdown.c; do
+      for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c; do
         test -e $i
         substituteInPlace $i \
+          --replace /usr/bin/getent ${stdenv.glibc}/bin/getent \
           --replace /bin/mount ${utillinux}/bin/mount \
           --replace /bin/umount ${utillinux}/bin/umount \
           --replace /sbin/swapon ${utillinux}/sbin/swapon \
@@ -69,6 +70,10 @@ stdenv.mkDerivation rec {
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
     '';
 
+  # This is needed because systemd uses the gold linker, which doesn't
+  # yet have the wrapper script to add rpath flags automatically.
+  NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib";
+
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
 
   NIX_CFLAGS_COMPILE =
@@ -77,10 +82,6 @@ stdenv.mkDerivation rec {
       "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
       "-fno-stack-protector"
 
-      # Work around our kernel headers being too old.  FIXME: remove
-      # this after the next stdenv update.
-      "-DFS_NOCOW_FL=0x00800000"
-
       # Set the release_agent on /sys/fs/cgroup/systemd to the
       # currently running systemd (/run/current-system/systemd) so
       # that we don't use an obsolete/garbage-collected release agent.
@@ -94,7 +95,12 @@ stdenv.mkDerivation rec {
   # /var is mounted.
   makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
 
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d";
+  installFlags =
+    [ "localstatedir=$(TMPDIR)/var"
+      "sysconfdir=$(out)/etc"
+      "sysvinitdir=$(TMPDIR)/etc/init.d"
+      "pamconfdir=$(out)/etc/pam.d"
+    ];
 
   # Get rid of configuration-specific data.
   postInstall =
@@ -103,6 +109,8 @@ stdenv.mkDerivation rec {
       mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
       mv $out/lib/systemd/{system,user} $out/example/systemd
 
+      rm -rf $out/etc/systemd/system
+
       # Install SysV compatibility commands.
       mkdir -p $out/sbin
       ln -s $out/lib/systemd/systemd $out/sbin/telinit
@@ -128,19 +136,6 @@ stdenv.mkDerivation rec {
   # runtime; otherwise we can't and we need to reboot.
   passthru.interfaceVersion = 2;
 
-  passthru.headers = stdenv.mkDerivation {
-    name = "systemd-headers-${version}";
-    inherit src;
-
-    phases = [ "unpackPhase" "installPhase" ];
-
-    # some are needed by dbus.libs, which is needed for systemd :-)
-    installPhase = ''
-      mkdir -p "$out/include/systemd"
-      mv src/systemd/*.h "$out/include/systemd"
-    '';
-  };
-
   meta = {
     homepage = "http://www.freedesktop.org/wiki/Software/systemd";
     description = "A system and service manager for Linux";
diff --git a/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch b/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch
deleted file mode 100644
index 005c0028202..00000000000
--- a/pkgs/os-specific/linux/systemd/fix_console_in_containers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN systemd-203/units/getty@.service.m4 systemd-203-patched/units/getty@.service.m4
---- systemd-203/units/getty@.service.m4	2013-01-07 22:50:49.083315575 +0100
-+++ systemd-203-patched/units/getty@.service.m4	2014-03-18 09:54:40.002476232 +0100
-@@ -23,7 +23,9 @@
- # On systems without virtual consoles, don't start any getty. (Note
- # that serial gettys are covered by serial-getty@.service, not this
- # unit
--ConditionPathExists=/dev/tty0
-+ConditionPathExists=|/dev/tty0
-+ConditionVirtualization=|lxc
-+ConditionVirtualization=|lxc-libvirt
- 
- [Service]
- # the VT is cleared by TTYVTDisallocate
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 0ad420cd35c..5ef248dc75d 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -1,144 +1,23 @@
-diff --git a/man/systemd.special.xml b/man/systemd.special.xml
-index 7164b1e..29401eb 100644
---- a/man/systemd.special.xml
-+++ b/man/systemd.special.xml
-@@ -381,7 +381,7 @@
-                                         this unit during
-                                         installation. This is best
-                                         configured via
--                                        <varname>WantedBy=multi-uer.target</varname>
-+                                        <varname>WantedBy=multi-user.target</varname>
-                                         in the unit's
-                                         <literal>[Install]</literal>
-                                         section.</para>
-diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules
-index 15b5bc4..c5f1b38 100644
---- a/rules/80-net-name-slot.rules
-+++ b/rules/80-net-name-slot.rules
-@@ -1,6 +1,6 @@
- # do not edit this file, it will be overwritten on update
- 
--ACTION=="remove", GOTO="net_name_slot_end"
-+ACTION!="add", GOTO="net_name_slot_end"
- SUBSYSTEM!="net", GOTO="net_name_slot_end"
- NAME!="", GOTO="net_name_slot_end"
- 
 diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
-index d17bdd9..040b10e 100644
+index db72373..2fc12ca 100644
 --- a/rules/99-systemd.rules.in
 +++ b/rules/99-systemd.rules.in
 @@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd"
- SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd"
- SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+ SUBSYSTEM=="block", KERNEL!="ram*", TAG+="systemd"
+ SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
  
 -# Ignore encrypted devices with no identified superblock on it, since
 -# we are probably still calling mke2fs or mkswap on it.
--SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
+-SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 -
  # Ignore raid devices that are not yet assembled and started
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
  SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
-diff --git a/src/core/cgroup-semantics.c b/src/core/cgroup-semantics.c
-index 82b02bb..7df9d01 100644
---- a/src/core/cgroup-semantics.c
-+++ b/src/core/cgroup-semantics.c
-@@ -255,7 +255,7 @@ static int map_blkio(const CGroupSemantics *s, const char *value, char **ret) {
- }
- 
- static const CGroupSemantics semantics[] = {
--        { "cpu",     "cpu.shares",                 "CPUShare",              false, parse_cpu_shares,          NULL,       NULL },
-+        { "cpu",     "cpu.shares",                 "CPUShares",             false, parse_cpu_shares,          NULL,       NULL },
-         { "memory",  "memory.soft_limit_in_bytes", "MemorySoftLimit",       false, parse_memory_limit,        NULL,       NULL },
-         { "memory",  "memory.limit_in_bytes",      "MemoryLimit",           false, parse_memory_limit,        NULL,       NULL },
-         { "devices", "devices.allow",              "DeviceAllow",           true,  parse_device,              map_device, NULL },
-diff --git a/src/core/dbus-execute.h b/src/core/dbus-execute.h
-index 91d70e5..698102f 100644
---- a/src/core/dbus-execute.h
-+++ b/src/core/dbus-execute.h
-@@ -63,7 +63,7 @@
-         "  <property name=\"CPUSchedulingPolicy\" type=\"i\" access=\"read\"/>\n" \
-         "  <property name=\"CPUSchedulingPriority\" type=\"i\" access=\"read\"/>\n" \
-         "  <property name=\"CPUAffinity\" type=\"ay\" access=\"read\"/>\n" \
--        "  <property name=\"TimerSlackNS\" type=\"t\" access=\"read\"/>\n" \
-+        "  <property name=\"TimerSlackNSec\" type=\"t\" access=\"read\"/>\n" \
-         "  <property name=\"CPUSchedulingResetOnFork\" type=\"b\" access=\"read\"/>\n" \
-         "  <property name=\"NonBlocking\" type=\"b\" access=\"read\"/>\n" \
-         "  <property name=\"StandardInput\" type=\"s\" access=\"read\"/>\n" \
-diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
-index 56b02a1..2b6d799 100644
---- a/src/core/dbus-manager.c
-+++ b/src/core/dbus-manager.c
-@@ -1550,7 +1550,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
-                 _cleanup_strv_free_ char **l = NULL;
-                 char **e = NULL;
- 
--                SELINUX_ACCESS_CHECK(connection, message, "reboot");
-+                SELINUX_ACCESS_CHECK(connection, message, "reload");
- 
-                 r = bus_parse_strv(message, &l);
-                 if (r == -ENOMEM)
-@@ -1577,7 +1577,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
-                 _cleanup_strv_free_ char **l = NULL;
-                 char **e = NULL;
- 
--                SELINUX_ACCESS_CHECK(connection, message, "reboot");
-+                SELINUX_ACCESS_CHECK(connection, message, "reload");
- 
-                 r = bus_parse_strv(message, &l);
-                 if (r == -ENOMEM)
-@@ -1605,7 +1605,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
-                 char **f = NULL;
-                 DBusMessageIter iter;
- 
--                SELINUX_ACCESS_CHECK(connection, message, "reboot");
-+                SELINUX_ACCESS_CHECK(connection, message, "reload");
- 
-                 if (!dbus_message_iter_init(message, &iter))
-                         goto oom;
-diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
-index 2e99fba..e72749a 100644
---- a/src/core/dbus-swap.c
-+++ b/src/core/dbus-swap.c
-@@ -93,6 +93,7 @@ static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_swap_append_swap_result, swap_result,
- static const BusProperty bus_swap_properties[] = {
-         { "What",       bus_property_append_string, "s", offsetof(Swap, what),  true },
-         { "Priority",   bus_swap_append_priority,   "i", 0 },
-+        { "TimeoutUSec",bus_property_append_usec,   "t", offsetof(Swap, timeout_usec)},
-         BUS_EXEC_COMMAND_PROPERTY("ExecActivate",   offsetof(Swap, exec_command[SWAP_EXEC_ACTIVATE]),   false),
-         BUS_EXEC_COMMAND_PROPERTY("ExecDeactivate", offsetof(Swap, exec_command[SWAP_EXEC_DEACTIVATE]), false),
-         { "ControlPID", bus_property_append_pid,    "u", offsetof(Swap, control_pid) },
 diff --git a/src/core/main.c b/src/core/main.c
-index 7fc06be..101ce79 100644
+index 41605ee..8517369 100644
 --- a/src/core/main.c
 +++ b/src/core/main.c
-@@ -1590,14 +1590,14 @@ int main(int argc, char *argv[]) {
-                         log_error("Failed to adjust timer slack: %m");
- 
-         if (arg_capability_bounding_set_drop) {
--                r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
-+                r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
-                 if (r < 0) {
--                        log_error("Failed to drop capability bounding set: %s", strerror(-r));
-+                        log_error("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r));
-                         goto finish;
-                 }
--                r = capability_bounding_set_drop_usermode(arg_capability_bounding_set_drop);
-+                r = capability_bounding_set_drop(arg_capability_bounding_set_drop, true);
-                 if (r < 0) {
--                        log_error("Failed to drop capability bounding set of usermode helpers: %s", strerror(-r));
-+                        log_error("Failed to drop capability bounding set: %s", strerror(-r));
-                         goto finish;
-                 }
-         }
-@@ -1650,6 +1650,7 @@ int main(int argc, char *argv[]) {
-         /* This will close all file descriptors that were opened, but
-          * not claimed by any unit. */
-         fdset_free(fds);
-+        fds = NULL;
- 
-         if (serialization) {
-                 fclose(serialization);
-@@ -1857,7 +1858,7 @@ finish:
+@@ -1883,7 +1883,7 @@ finish:
                          char_array_0(sfd);
  
                          i = 0;
@@ -147,69 +26,11 @@ index 7fc06be..101ce79 100644
                          if (switch_root_dir)
                                  args[i++] = "--switched-root";
                          args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
-diff --git a/src/core/manager.c b/src/core/manager.c
-index c7f8f20..0508628 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -1372,7 +1372,7 @@ static int manager_process_signal_fd(Manager *m) {
- 
-                 case SIGINT:
-                         if (m->running_as == SYSTEMD_SYSTEM) {
--                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE);
-+                                manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
-                                 break;
-                         }
- 
-diff --git a/src/core/service.c b/src/core/service.c
-index 3617c24..4d0e2ad 100644
---- a/src/core/service.c
-+++ b/src/core/service.c
-@@ -2642,6 +2642,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
-         if (s->exec_context.var_tmp_dir)
-                 unit_serialize_item(u, f, "var-tmp-dir", s->exec_context.var_tmp_dir);
- 
-+        if (s->forbid_restart)
-+                unit_serialize_item(u, f, "forbid-restart", yes_no(s->forbid_restart));
-+
-         return 0;
- }
- 
-@@ -2776,6 +2779,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
-                         return log_oom();
- 
-                 s->exec_context.var_tmp_dir = t;
-+        } else if (streq(key, "forbid-restart")) {
-+                int b;
-+
-+                b = parse_boolean(value);
-+                if (b < 0)
-+                        log_debug_unit(u->id, "Failed to parse forbid-restart value %s", value);
-+                else
-+                        s->forbid_restart = b;
-         } else
-                 log_debug_unit(u->id, "Unknown serialization key '%s'", key);
- 
-diff --git a/src/core/snapshot.c b/src/core/snapshot.c
-index a63eccd..a6807eb 100644
---- a/src/core/snapshot.c
-+++ b/src/core/snapshot.c
-@@ -217,8 +217,10 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
-                         if (asprintf(&n, "snapshot-%u.snapshot", ++ m->n_snapshots) < 0)
-                                 return -ENOMEM;
- 
--                        if (!manager_get_unit(m, n))
-+                        if (!manager_get_unit(m, n)) {
-+                                name = n;
-                                 break;
-+                        }
- 
-                         free(n);
-                 }
 diff --git a/src/core/umount.c b/src/core/umount.c
-index 1e95ad7..9f0e471 100644
+index d1258f0..0311812 100644
 --- a/src/core/umount.c
 +++ b/src/core/umount.c
-@@ -435,6 +435,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
+@@ -404,6 +404,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
                   * anyway, since we are running from it. They have
                   * already been remounted ro. */
                  if (path_equal(m->path, "/")
@@ -218,285 +39,11 @@ index 1e95ad7..9f0e471 100644
  #ifndef HAVE_SPLIT_USR
                      || path_equal(m->path, "/usr")
  #endif
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 81b7708..edd0b40 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -111,6 +111,7 @@ static int create_disk(
-                 "Conflicts=umount.target\n"
-                 "DefaultDependencies=no\n"
-                 "BindsTo=dev-mapper-%i.device\n"
-+                "IgnoreOnIsolate=true\n"
-                 "After=systemd-readahead-collect.service systemd-readahead-replay.service\n",
-                 f);
- 
-diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index c17299f..6b3e67e 100644
---- a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -351,7 +351,7 @@ static int add_mount(
- 
-         if (automount && !path_equal(where, "/")) {
-                 automount_name = unit_name_from_path(where, ".automount");
--                if (!name)
-+                if (!automount_name)
-                         return log_oom();
- 
-                 automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
-@@ -596,9 +596,9 @@ static int parse_proc_cmdline(void) {
-                 } else if (startswith(word, "rd.fstab=")) {
- 
-                         if (in_initrd()) {
--                                r = parse_boolean(word + 6);
-+                                r = parse_boolean(word + 9);
-                                 if (r < 0)
--                                        log_warning("Failed to parse fstab switch %s. Ignoring.", word + 6);
-+                                        log_warning("Failed to parse fstab switch %s. Ignoring.", word + 9);
-                                 else
-                                         arg_enabled = r;
-                         }
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 38499a6..bb80905 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -907,6 +907,8 @@ static int journal_file_append_field(
- 
-         osize = offsetof(Object, field.payload) + size;
-         r = journal_file_append_object(f, OBJECT_FIELD, osize, &o, &p);
-+        if (r < 0)
-+                return r;
- 
-         o->field.hash = htole64(hash);
-         memcpy(o->field.payload, field, size);
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index 88163c0..e09ba4c 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -333,8 +333,10 @@ void server_rotate(Server *s) {
-                 if (r < 0)
-                         if (f)
-                                 log_error("Failed to rotate %s: %s", f->path, strerror(-r));
--                        else
-+                        else {
-                                 log_error("Failed to create user journal: %s", strerror(-r));
-+                                hashmap_remove(s->user_journals, k);
-+                        }
-                 else {
-                         hashmap_replace(s->user_journals, k, f);
-                         server_fix_perms(s, f, PTR_TO_UINT32(k));
-@@ -975,7 +977,8 @@ int process_event(Server *s, struct epoll_event *ev) {
-                 ssize_t n;
- 
-                 if (ev->events != EPOLLIN) {
--                        log_error("Got invalid event from epoll.");
-+                        log_error("Got invalid event from epoll for %s: %"PRIx32,
-+                                  "signal fd", ev->events);
-                         return -EIO;
-                 }
- 
-@@ -1024,8 +1027,12 @@ int process_event(Server *s, struct epoll_event *ev) {
-         } else if (ev->data.fd == s->dev_kmsg_fd) {
-                 int r;
- 
--                if (ev->events != EPOLLIN) {
--                        log_error("Got invalid event from epoll.");
-+                if (ev->events & EPOLLERR)
-+                        log_warning("/dev/kmsg buffer overrun, some messages lost.");
-+
-+                if (!(ev->events & EPOLLIN)) {
-+                        log_error("Got invalid event from epoll for %s: %"PRIx32,
-+                                  "/dev/kmsg", ev->events);
-                         return -EIO;
-                 }
- 
-@@ -1039,7 +1046,9 @@ int process_event(Server *s, struct epoll_event *ev) {
-                    ev->data.fd == s->syslog_fd) {
- 
-                 if (ev->events != EPOLLIN) {
--                        log_error("Got invalid event from epoll.");
-+                        log_error("Got invalid event from epoll for %s: %"PRIx32,
-+                                  ev->data.fd == s->native_fd ? "native fd" : "syslog fd",
-+                                  ev->events);
-                         return -EIO;
-                 }
- 
-@@ -1140,12 +1149,7 @@ int process_event(Server *s, struct epoll_event *ev) {
-                                 char *e;
- 
-                                 if (n > 0 && n_fds == 0) {
--                                        e = memchr(s->buffer, '\n', n);
--                                        if (e)
--                                                *e = 0;
--                                        else
--                                                s->buffer[n] = 0;
--
-+                                        s->buffer[n] = 0;
-                                         server_process_syslog_message(s, strstrip(s->buffer), ucred, tv, label, label_len);
-                                 } else if (n_fds > 0)
-                                         log_warning("Got file descriptors via syslog socket. Ignoring.");
-@@ -1167,7 +1171,8 @@ int process_event(Server *s, struct epoll_event *ev) {
-         } else if (ev->data.fd == s->stdout_fd) {
- 
-                 if (ev->events != EPOLLIN) {
--                        log_error("Got invalid event from epoll.");
-+                        log_error("Got invalid event from epoll for %s: %"PRIx32,
-+                                  "stdout fd", ev->events);
-                         return -EIO;
-                 }
- 
-@@ -1178,6 +1183,8 @@ int process_event(Server *s, struct epoll_event *ev) {
-                 StdoutStream *stream;
- 
-                 if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
-+                        log_error("Got invalid event from epoll for %s: %"PRIx32,
-+                                  "stdout stream", ev->events);
-                         log_error("Got invalid event from epoll.");
-                         return -EIO;
-                 }
-diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
-index 54bf114..bd197d0 100644
---- a/src/journal/mmap-cache.c
-+++ b/src/journal/mmap-cache.c
-@@ -308,9 +308,13 @@ static void mmap_cache_free(MMapCache *m) {
-         while ((c = hashmap_first(m->contexts)))
-                 context_free(c);
- 
-+        hashmap_free(m->contexts);
-+
-         while ((f = hashmap_first(m->fds)))
-                 fd_free(f);
- 
-+        hashmap_free(m->fds);
-+
-         while (m->unused)
-                 window_free(m->unused);
- 
-diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
-index 0e66f3d..cac948e 100644
---- a/src/libsystemd-bus/bus-internal.c
-+++ b/src/libsystemd-bus/bus-internal.c
-@@ -63,7 +63,7 @@ bool object_path_is_valid(const char *p) {
- 
- bool interface_name_is_valid(const char *p) {
-         const char *q;
--        bool dot, found_dot;
-+        bool dot, found_dot = false;
- 
-         if (isempty(p))
-                 return false;
-@@ -103,7 +103,7 @@ bool interface_name_is_valid(const char *p) {
- 
- bool service_name_is_valid(const char *p) {
-         const char *q;
--        bool dot, found_dot, unique;
-+        bool dot, found_dot = false, unique;
- 
-         if (isempty(p))
-                 return false;
-diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c
-index 7d6d848..b0eb2f1 100644
---- a/src/libsystemd-bus/sd-bus.c
-+++ b/src/libsystemd-bus/sd-bus.c
-@@ -1088,11 +1088,11 @@ static int dispatch_rqueue(sd_bus *bus, sd_bus_message **m) {
-                 if (r == 0)
-                         return ret;
- 
--                r = 1;
-+                ret = 1;
-         } while (!z);
- 
-         *m = z;
--        return 1;
-+        return ret;
- }
- 
- int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *serial) {
-diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
-index 5ccaabd..100c1fb 100644
---- a/src/libudev/libudev-enumerate.c
-+++ b/src/libudev/libudev-enumerate.c
-@@ -299,7 +299,7 @@ _public_ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enume
-                         /* skip to be delayed devices, and move the to
-                          * the point where the prefix changes. We can
-                          * only move one item at a time. */
--                        if (!move_later) {
-+                        if (move_later == -1) {
-                                 move_later_prefix = devices_delay_later(udev_enumerate->udev, entry->syspath);
- 
-                                 if (move_later_prefix > 0) {
-@@ -718,6 +718,8 @@ static bool match_subsystem(struct udev_enumerate *udev_enumerate, const char *s
- {
-         struct udev_list_entry *list_entry;
- 
-+        subsystem = subsystem ? : "";
-+
-         udev_list_entry_foreach(list_entry, udev_list_get_entry(&udev_enumerate->subsystem_nomatch_list)) {
-                 if (fnmatch(udev_list_entry_get_name(list_entry), subsystem, 0) == 0)
-                         return false;
-@@ -826,23 +828,27 @@ nomatch:
- static int parent_add_child(struct udev_enumerate *enumerate, const char *path)
- {
-         struct udev_device *dev;
-+        int r = 0;
- 
-         dev = udev_device_new_from_syspath(enumerate->udev, path);
-         if (dev == NULL)
-                 return -ENODEV;
- 
-         if (!match_subsystem(enumerate, udev_device_get_subsystem(dev)))
--                return 0;
-+                goto nomatch;
-         if (!match_sysname(enumerate, udev_device_get_sysname(dev)))
--                return 0;
-+                goto nomatch;
-         if (!match_property(enumerate, dev))
--                return 0;
-+                goto nomatch;
-         if (!match_sysattr(enumerate, dev))
--                return 0;
-+                goto nomatch;
- 
-         syspath_add(enumerate, udev_device_get_syspath(dev));
-+        r = 1;
-+
-+nomatch:
-         udev_device_unref(dev);
--        return 1;
-+        return r;
- }
- 
- static int parent_crawl_children(struct udev_enumerate *enumerate, const char *path, int maxdepth)
-diff --git a/src/libudev/libudev.sym b/src/libudev/libudev.sym
-index 8e09430..1e6f885 100644
---- a/src/libudev/libudev.sym
-+++ b/src/libudev/libudev.sym
-@@ -109,5 +109,6 @@ global:
- } LIBUDEV_189;
- 
- LIBUDEV_199 {
-+global:
-         udev_device_set_sysattr_value;
- } LIBUDEV_196;
-diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
-index 7b19ee0..49ee420 100644
---- a/src/modules-load/modules-load.c
-+++ b/src/modules-load/modules-load.c
-@@ -302,8 +302,8 @@ int main(int argc, char *argv[]) {
- 
-                 STRV_FOREACH(i, arg_proc_cmdline_modules) {
-                         k = load_module(ctx, *i);
--                        if (k < 0)
--                                r = EXIT_FAILURE;
-+                        if (k < 0 && r == 0)
-+                                r = k;
-                 }
- 
-                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
 diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
-index b1ef912..4f2ab5c 100644
+index d61ecdf..228a3a4 100644
 --- a/src/nss-myhostname/netlink.c
 +++ b/src/nss-myhostname/netlink.c
-@@ -113,6 +113,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) {
+@@ -112,6 +112,10 @@ static int read_reply(int fd, struct address **list, unsigned *n_list) {
                      ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
                          continue;
  
@@ -507,174 +54,21 @@ index b1ef912..4f2ab5c 100644
                  if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
                          continue;
  
-diff --git a/src/shared/efivars.c b/src/shared/efivars.c
-index 8d004ba..99340c9 100644
---- a/src/shared/efivars.c
-+++ b/src/shared/efivars.c
-@@ -383,7 +383,8 @@ int efi_get_boot_options(uint16_t **options) {
-                 list[count ++] = id;
-         }
- 
--        qsort(list, count, sizeof(uint16_t), cmp_uint16);
-+        if (list)
-+                qsort(list, count, sizeof(uint16_t), cmp_uint16);
- 
-         *options = list;
-         return count;
-diff --git a/src/shared/env-util.c b/src/shared/env-util.c
-index 6a52fb9..598222c 100644
---- a/src/shared/env-util.c
-+++ b/src/shared/env-util.c
-@@ -406,7 +406,9 @@ char **strv_env_clean_log(char **e, const char *message) {
-                 e[k++] = *p;
-         }
- 
--        e[k] = NULL;
-+        if (e)
-+                e[k] = NULL;
-+
-         return e;
- }
- 
-diff --git a/src/shared/log.c b/src/shared/log.c
-index 27317f7..8f4995a 100644
---- a/src/shared/log.c
-+++ b/src/shared/log.c
-@@ -115,16 +115,20 @@ void log_close_syslog(void) {
- 
- static int create_log_socket(int type) {
-         int fd;
-+        struct timeval tv;
- 
--        /* All output to the syslog/journal fds we do asynchronously,
--         * and if the buffers are full we just drop the messages */
--
--        fd = socket(AF_UNIX, type|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-+        fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0);
-         if (fd < 0)
-                 return -errno;
- 
-         fd_inc_sndbuf(fd, SNDBUF_SIZE);
- 
-+        /* We need a blocking fd here since we'd otherwise lose
-+        messages way too early. However, let's not hang forever in the
-+        unlikely case of a deadlock. */
-+        timeval_store(&tv, 1*USEC_PER_MINUTE);
-+        setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-+
-         return fd;
- }
- 
-diff --git a/src/shared/polkit.c b/src/shared/polkit.c
-index cea7074..1c5e9e3 100644
---- a/src/shared/polkit.c
-+++ b/src/shared/polkit.c
-@@ -38,12 +38,8 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
-         DBusMessage *m = NULL, *reply = NULL;
--        const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = "";
-+        const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = "";
-         uint32_t flags = interactive ? 1 : 0;
--        pid_t pid_raw;
--        uint32_t pid_u32;
--        unsigned long long starttime_raw;
--        uint64_t starttime_u64;
-         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-         int r;
-         dbus_bool_t authorized = FALSE, challenge = FALSE;
-@@ -68,14 +64,6 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
- 
--        pid_raw = bus_get_unix_process_id(c, sender, error);
--        if (pid_raw == 0)
--                return -EINVAL;
--
--        r = get_starttime_of_pid(pid_raw, &starttime_raw);
--        if (r < 0)
--                return r;
--
-         m = dbus_message_new_method_call(
-                         "org.freedesktop.PolicyKit1",
-                         "/org/freedesktop/PolicyKit1/Authority",
-@@ -86,22 +74,13 @@ int verify_polkit(
- 
-         dbus_message_iter_init_append(m, &iter_msg);
- 
--        pid_u32 = (uint32_t) pid_raw;
--        starttime_u64 = (uint64_t) starttime_raw;
--
-         if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) ||
--            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) ||
-+            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) ||
-             !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) ||
-             !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) ||
--            !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
--            !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
--            !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) ||
-+            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) ||
-+            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) ||
-+            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) ||
-             !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
-             !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
-             !dbus_message_iter_close_container(&iter_struct, &iter_array) ||
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 3cca861..f6052dd 100644
+index 0887bc3..6b502ce 100644
 --- a/src/systemctl/systemctl.c
 +++ b/src/systemctl/systemctl.c
-@@ -1482,7 +1482,7 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
- 
-         } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Manager", "JobRemoved")) {
-                 uint32_t id;
--                const char *path, *result, *unit;
-+                const char *path, *result, *unit, *r;
- 
-                 if (dbus_message_get_args(message, &error,
-                                           DBUS_TYPE_UINT32, &id,
-@@ -1491,7 +1491,11 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
-                                           DBUS_TYPE_STRING, &result,
-                                           DBUS_TYPE_INVALID)) {
- 
--                        free(set_remove(d->set, (char*) path));
-+                        r = set_remove(d->set, (char*) path);
-+                        if (!r)
-+                                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+
-+                        free(r);
- 
-                         if (!isempty(result))
-                                 d->result = strdup(result);
-@@ -1511,7 +1515,11 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
-                         /* Compatibility with older systemd versions <
-                          * 183 during upgrades. This should be dropped
-                          * one day. */
--                        free(set_remove(d->set, (char*) path));
-+                        r = set_remove(d->set, (char*) path);
-+                        if (!r)
-+                                return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+
-+                        free(r);
- 
-                         if (*result)
-                                 d->result = strdup(result);
-@@ -1867,7 +1875,7 @@ static int start_unit_one(
-                         return log_oom();
+@@ -2561,7 +2561,7 @@ static int start_unit_one(
  
+                 log_debug("Adding %s to the set", p);
                  r = set_consume(s, p);
--                if (r < 0) {
-+                if (r < 0 && r != -EEXIST) {
-                         log_error("Failed to add path to set.");
-                         return r;
-                 }
+-                if (r < 0)
++                if (r < 0 && r != -EEXIST)
+                         return log_oom();
+         }
+ 
 diff --git a/units/emergency.service.in b/units/emergency.service.in
-index 442f0e0..6b7eafd 100644
+index 94c090f..0d20640 100644
 --- a/units/emergency.service.in
 +++ b/units/emergency.service.in
 @@ -15,7 +15,6 @@ Before=shutdown.target
@@ -685,30 +79,45 @@ index 442f0e0..6b7eafd 100644
  ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
  ExecStart=-/sbin/sulogin
  ExecStopPost=@SYSTEMCTL@ --fail --no-block default
+diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
+index aa853b8..f76cde0 100644
+--- a/units/getty@.service.m4
++++ b/units/getty@.service.m4
+@@ -23,7 +23,9 @@ IgnoreOnIsolate=yes
+ # On systems without virtual consoles, don't start any getty. Note
+ # that serial gettys are covered by serial-getty@.service, not this
+ # unit.
+-ConditionPathExists=/dev/tty0
++ConditionPathExists=|/dev/tty0
++ConditionVirtualization=|lxc
++ConditionVirtualization=|lxc-libvirt
+ 
+ [Service]
+ # the VT is cleared by TTYVTDisallocate
 diff --git a/units/local-fs.target b/units/local-fs.target
-index 18c3d74..a09054c 100644
+index ae3cedc..0e36840 100644
 --- a/units/local-fs.target
 +++ b/units/local-fs.target
-@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
- After=local-fs-pre.target
+@@ -13,3 +13,5 @@ DefaultDependencies=no
+ Conflicts=shutdown.target
  OnFailure=emergency.target
- OnFailureIsolate=no
+ OnFailureJobMode=replace-irreversibly
 +
 +X-StopOnReconfiguration=yes
 diff --git a/units/remote-fs.target b/units/remote-fs.target
-index 09213e8..47b4cf5 100644
+index 43ffa5c..156a681 100644
 --- a/units/remote-fs.target
 +++ b/units/remote-fs.target
-@@ -10,5 +10,7 @@ Description=Remote File Systems
- Documentation=man:systemd.special(7)
- After=remote-fs-pre.target
+@@ -12,5 +12,7 @@ After=remote-fs-pre.target
+ DefaultDependencies=no
+ Conflicts=shutdown.target
  
 +X-StopOnReconfiguration=yes
 +
  [Install]
  WantedBy=multi-user.target
 diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
-index 269797a..2c640f4 100644
+index 552ef89..af3915f 100644
 --- a/units/rescue.service.m4.in
 +++ b/units/rescue.service.m4.in
 @@ -16,7 +16,6 @@ Before=shutdown.target
@@ -731,11 +140,20 @@ index 8f4fb8f..e0f0147 100644
 -After=local-fs.target swap.target emergency.service emergency.target
 +After=emergency.service emergency.target
  RefuseManualStart=yes
+diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
+index e945d87..77728f2 100644
+--- a/units/systemd-backlight@.service.in
++++ b/units/systemd-backlight@.service.in
+@@ -19,3 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-backlight load %i
+ ExecStop=@rootlibexecdir@/systemd-backlight save %i
++X-RestartIfChanged=false
 diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
-index ab2e50c..9563a7d 100644
+index de93879..c9a49f3 100644
 --- a/units/systemd-journald.service.in
 +++ b/units/systemd-journald.service.in
-@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
+@@ -25,3 +25,8 @@ WatchdogSec=1min
  # Increase the default a bit in order to allow many simultaneous
  # services being run since we keep one fd open per service.
  LimitNOFILE=16384
@@ -744,6 +162,33 @@ index ab2e50c..9563a7d 100644
 +# journald to stop logging (see
 +# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
 +X-RestartIfChanged=no
+diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in
+index 1879b2f..9b895b9 100644
+--- a/units/systemd-random-seed.service.in
++++ b/units/systemd-random-seed.service.in
+@@ -19,3 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-random-seed load
+ ExecStop=@rootlibexecdir@/systemd-random-seed save
++X-RestartIfChanged=false
+diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in
+index 9d264a2..c505535 100644
+--- a/units/systemd-rfkill@.service.in
++++ b/units/systemd-rfkill@.service.in
+@@ -19,3 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-rfkill load %I
+ ExecStop=@rootlibexecdir@/systemd-rfkill save %I
++X-RestartIfChanged=false
+diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
+index da7dda7..4cc550d 100644
+--- a/units/systemd-update-utmp.service.in
++++ b/units/systemd-update-utmp.service.in
+@@ -19,3 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-update-utmp reboot
+ ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown
++X-RestartIfChanged=false
 diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
 index 0869e73..b6ed958 100644
 --- a/units/systemd-user-sessions.service.in
diff --git a/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch b/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch
deleted file mode 100644
index 7cde2260189..00000000000
--- a/pkgs/os-specific/linux/systemd/libc-bug-accept4-arm.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Based on a patch for udev in
-nixpkgs(upstart)/pkgs/os-specific/linux/udev/pre-accept4-kernel.patch
-
-It was taken from:
-https://github.com/archlinuxarm/PKGBUILDs/blob/master/core/udev-oxnas/pre-accept4-kernel.patch
-
-Basically, ARM implemented accept4() only in 2.6.36. Nixpkgs now uses
-linux headers from 2.6.35. And the particular nixpkgs glibc version had a bug,
-not checking about 2.6.36 for accept4 on arm.
-
-diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
-index 7b88f74..a9f7b62 100644
---- a/src/journal/journald-stream.c
-+++ b/src/journal/journald-stream.c
-@@ -347,10 +347,12 @@ int stdout_stream_new(Server *s) {
-         int fd, r;
-         socklen_t len;
-         struct epoll_event ev;
-+        int flgs;
- 
-         assert(s);
- 
--        fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
-+        //fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
-+        fd = accept(s->stdout_fd, NULL, NULL);
-         if (fd < 0) {
-                 if (errno == EAGAIN)
-                         return 0;
-@@ -359,6 +361,11 @@ int stdout_stream_new(Server *s) {
-                 return -errno;
-         }
- 
-+        // Since we don't have accept4
-+        flgs = fcntl(fd, F_GETFL, NULL);
-+        if(flgs >= 0) fcntl(fd, F_SETFL, flgs | O_NONBLOCK);
-+        fcntl(fd, F_SETFD, FD_CLOEXEC);
-+
-         if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
-                 log_warning("Too many stdout streams, refusing connection.");
-                 close_nointr_nofail(fd);
-diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
-index a235912..c05e4b4 100644
---- a/src/udev/udev-ctrl.c
-+++ b/src/udev/udev-ctrl.c
-@@ -15,6 +15,7 @@
- #include <stddef.h>
- #include <string.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <sys/types.h>
- #include <sys/poll.h>
- #include <sys/socket.h>
-@@ -181,6 +182,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
-         struct ucred ucred;
-         socklen_t slen;
-         const int on = 1;
-+        int flgs;
- 
-         conn = calloc(1, sizeof(struct udev_ctrl_connection));
-         if (conn == NULL)
-@@ -188,13 +190,19 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl)
-         conn->refcount = 1;
-         conn->uctrl = uctrl;
- 
--        conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+        //conn->sock = accept4(uctrl->sock, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
-+        conn->sock = accept(uctrl->sock, NULL, NULL);
-         if (conn->sock < 0) {
-                 if (errno != EINTR)
-                         log_error("unable to receive ctrl connection: %m\n");
-                 goto err;
-         }
- 
-+        // Since we don't have accept4
-+        flgs = fcntl(conn->sock, F_GETFL, NULL);
-+        if(flgs >= 0) fcntl(conn->sock, F_SETFL, flgs | O_NONBLOCK);
-+        fcntl(conn->sock, F_SETFD, FD_CLOEXEC);
-+
-         /* check peer credential of connection */
-         slen = sizeof(ucred);
-         if (getsockopt(conn->sock, SOL_SOCKET, SO_PEERCRED, &ucred, &slen) < 0) {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c37e0009de..f86cff13ad8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7263,7 +7263,9 @@ let
 
   sysstat = callPackage ../os-specific/linux/sysstat { };
 
-  systemd = callPackage ../os-specific/linux/systemd { };
+  systemd = callPackage ../os-specific/linux/systemd {
+    linuxHeaders = linuxHeaders_3_14;
+  };
 
   systemtap = callPackage ../development/tools/profiling/systemtap {
     inherit (gnome) libglademm;

From 6ff2521974681c406d36bb5f631261a8b6b8e3dc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 10 Apr 2014 10:16:30 -0500
Subject: [PATCH 0179/2033] upstart: Oneshot rules should always have
 Restart=no

---
 nixos/modules/system/upstart/upstart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix
index 1ad4885edf5..5c046130407 100644
--- a/nixos/modules/system/upstart/upstart.nix
+++ b/nixos/modules/system/upstart/upstart.nix
@@ -93,7 +93,7 @@ let
             if job.daemonType == "fork" || job.daemonType == "daemon" then { Type = "forking"; GuessMainPID = true; } else
             if job.daemonType == "none" then { } else
             throw "invalid daemon type `${job.daemonType}'")
-        // optionalAttrs (!job.task && job.respawn)
+        // optionalAttrs (!job.task && !(job.script == "" && job.exec == "") && job.respawn)
           { Restart = "always"; }
         // optionalAttrs job.task
           { Type = "oneshot"; RemainAfterExit = false; };

From eda854d50f6515e4a5e61a846a18a1f0efaa7886 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 9 Apr 2014 23:55:17 -0500
Subject: [PATCH 0180/2033] systemd: Add an assertion to guarantee oneshot
 units do not have restart set

This prevents insidious errors once systemd begins handling the unit. If
the unit is loaded at boot, any errors of this nature are logged to the
console before the journal service is running. This makes it very hard
to diagnose the issue. Therefore, this assertion helps guarantee the
mistake is not made.
---
 nixos/modules/system/boot/systemd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 7d528348918..4705ceb8086 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -630,6 +630,12 @@ in
 
   config = {
 
+    assertions = mapAttrsToList (name: service: {
+      assertion = !hasAttr "Type" service.serviceConfig || service.serviceConfig.Type != "oneshot"
+        || !hasAttr "Restart" service.serviceConfig || service.serviceConfig.Restart == "no";
+      message = "${name}: Type=oneshot services must have Restart=no";
+    }) cfg.services;
+
     system.build.units = units;
 
     environment.systemPackages = [ systemd ];

From 2fc520d699a853089cba5fb7c733db0c3789dc7b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 01:08:14 +0200
Subject: [PATCH 0181/2033] Simplify assertion

---
 nixos/modules/system/boot/systemd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 4705ceb8086..1e4963c7ca6 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -631,8 +631,7 @@ in
   config = {
 
     assertions = mapAttrsToList (name: service: {
-      assertion = !hasAttr "Type" service.serviceConfig || service.serviceConfig.Type != "oneshot"
-        || !hasAttr "Restart" service.serviceConfig || service.serviceConfig.Restart == "no";
+      assertion = service.serviceConfig.Type or "" == "oneshot" -> service.serviceConfig.Restart or "no" == "no";
       message = "${name}: Type=oneshot services must have Restart=no";
     }) cfg.services;
 

From 171a58bcd68e59d8df461cce133cacb67b488bb2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Mar 2014 17:33:39 -0500
Subject: [PATCH 0182/2033] cpupower: Add package to replace cpufrequtils

---
 pkgs/os-specific/linux/cpupower/default.nix | 42 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/os-specific/linux/cpupower/default.nix

diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
new file mode 100644
index 00000000000..bf6e8c36f3d
--- /dev/null
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, kernel, coreutils, pciutils, gettext }:
+
+stdenv.mkDerivation {
+  name = "cpupower-${kernel.version}";
+
+  src = kernel.src;
+
+  buildInputs = [ coreutils pciutils gettext ];
+
+  configurePhase = ''
+    cd tools/power/cpupower
+    sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile
+    sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile
+    sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile
+  '';
+
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    make \
+      bindir="$out/bin" \
+      sbindir="$out/sbin" \
+      mandir="$out/share/man" \
+      includedir="$out/include" \
+      libdir="$out/lib" \
+      localedir="$out/share/locale" \
+      docdir="$out/share/doc/cpupower" \
+      confdir="$out/etc" \
+      install install-man
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Tool to examine and tune power saving features.";
+    homepage = https://www.kernel.org.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f86cff13ad8..e542389bdbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7008,6 +7008,8 @@ let
 
     cryptodev = callPackage ../os-specific/linux/cryptodev { };
 
+    cpupower = callPackage ../os-specific/linux/cpupower { };
+
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { };

From dd209e901cfbac8e68949b4871d6aece935b6215 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 17 Mar 2014 18:07:46 -0500
Subject: [PATCH 0183/2033] cpu-freq: Use cpupower instead of cpufrequtils

Additionally, put the powersave utility in charge of loading the
cpufrequency modules based on the governor specified in the
configuration.
---
 nixos/modules/config/power-management.nix |  6 +---
 nixos/modules/tasks/cpu-freq.nix          | 43 ++++++++++++-----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix
index 4984c0cd826..17f3ed00b9b 100644
--- a/nixos/modules/config/power-management.nix
+++ b/nixos/modules/config/power-management.nix
@@ -65,11 +65,7 @@ in
 
   config = mkIf cfg.enable {
 
-    boot.kernelModules =
-      [ "acpi_cpufreq" "powernow-k8" "cpufreq_performance" "cpufreq_powersave" "cpufreq_ondemand"
-        "cpufreq_conservative"
-      ];
-
+    # FIXME: Implement powersave governor for sandy bridge or later Intel CPUs
     powerManagement.cpuFreqGovernor = mkDefault "ondemand";
     powerManagement.scsiLinkPolicy = mkDefault "min_power";
 
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 3df9b58c524..02f269f28f9 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -2,6 +2,11 @@
 
 with lib;
 
+let
+  cpupower = config.boot.kernelPackages.cpupower;
+  cfg = config.powerManagement;
+in
+
 {
   ###### interface
 
@@ -25,29 +30,25 @@ with lib;
 
   config = mkIf (config.powerManagement.cpuFreqGovernor != null) {
 
-    environment.systemPackages = [ pkgs.cpufrequtils ];
+    boot.kernelModules = [ "acpi-cpufreq" "speedstep-lib" "pcc-cpufreq"
+      "cpufreq_${cfg.cpuFreqGovernor}"
+    ];
 
-    jobs.cpufreq =
-      { description = "CPU Frequency Governor Setup";
+    environment.systemPackages = [ cpupower ];
 
-        after = [ "systemd-modules-load.service" ];
-        wantedBy = [ "multi-user.target" ];
-
-        unitConfig.ConditionPathIsReadWrite = "/sys/devices/";
-
-        path = [ pkgs.cpufrequtils ];
-
-        preStart = ''
-          for i in $(seq 0 $(($(nproc) - 1))); do
-            for gov in $(cpufreq-info -c $i -g); do
-              if [ "$gov" = ${config.powerManagement.cpuFreqGovernor} ]; then
-                echo "<6>setting governor on CPU $i to ‘$gov’"
-                cpufreq-set -c $i -g $gov
-              fi
-            done
-          done
-        '';
+    systemd.services.cpufreq = {
+      description = "CPU Frequency Governor Setup";
+      after = [ "systemd-modules-load.service" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ cpupower ];
+      script = ''
+        cpupower frequency-set -g ${cfg.cpuFreqGovernor}
+      '';
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = "yes";
       };
-  };
+    };
 
+  };
 }

From 60a84019b40337b6ef2b4cf7487baa4edcf5593c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 01:11:32 +0200
Subject: [PATCH 0184/2033] Don't make containers depend on cpupower

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

diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 02f269f28f9..edce562b005 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -28,7 +28,7 @@ in
 
   ###### implementation
 
-  config = mkIf (config.powerManagement.cpuFreqGovernor != null) {
+  config = mkIf (!config.boot.isContainer && config.powerManagement.cpuFreqGovernor != null) {
 
     boot.kernelModules = [ "acpi-cpufreq" "speedstep-lib" "pcc-cpufreq"
       "cpufreq_${cfg.cpuFreqGovernor}"

From ab989f525bf0b8dbe402924f931d3063dc0b8ca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 01:44:43 +0200
Subject: [PATCH 0185/2033] Drop ALSA dependency in containers

---
 nixos/modules/virtualisation/container-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index da80e44f2c3..ae06fcb41e3 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -6,6 +6,8 @@ with lib;
 
   config = mkIf config.boot.isContainer {
 
+    sound.enable = mkDefault false;
+
     # Provide a login prompt on /var/lib/login.socket.  On the host,
     # you can connect to it by running ‘socat
     # unix:<path-to-container>/var/lib/login.socket -,echo=0,raw’.

From 85e9ad1b2f4a789272f115d2a8ffe31ed3338ea8 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 14 Mar 2014 23:54:13 -0500
Subject: [PATCH 0186/2033] stage1: Systemd libraries were renamed

---
 nixos/modules/system/boot/stage-1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index f69e6cfe54c..c38d33c45d6 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -74,7 +74,7 @@ let
       cp -v ${pkgs.lvm2}/sbin/dmsetup $out/bin/dmsetup
       cp -v ${pkgs.lvm2}/sbin/lvm $out/bin/lvm
       cp -v ${pkgs.lvm2}/lib/libdevmapper.so.*.* $out/lib
-      cp -v ${pkgs.systemd}/lib/libsystemd-daemon.so.* $out/lib
+      cp -v ${pkgs.systemd}/lib/libsystemd.so.* $out/lib
 
       # Add RAID mdadm tool.
       cp -v ${pkgs.mdadm}/sbin/mdadm $out/bin/mdadm

From 44bda71b88a8c7e96421e2d7766e30d5a22ee134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 16 Apr 2014 10:33:27 +0200
Subject: [PATCH 0187/2033] Adding ghdl 0.31 mcode flavour

This allows having a recent ghdl, without building it with gcc.
The major drawback is the speed.
---
 pkgs/development/compilers/ghdl/default.nix | 64 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/compilers/ghdl/default.nix

diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
new file mode 100644
index 00000000000..cd33d3d79a7
--- /dev/null
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, gnat, zlib }:
+
+assert stdenv.system == "i686-linux";
+
+let
+  version = "0.31";
+in
+stdenv.mkDerivation rec {
+  name = "ghdl-mcode-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ghdl/ghdl-${version}.tar.gz";
+    sha256 = "1v0l9h6906b0bvnwfi2qg5nz9vjg80isc5qgjxr1yqxpkfm2xcf0";
+  };
+
+  buildInputs = [ gnat zlib ];
+
+  # Tarbomb
+  preUnpack = ''
+    mkdir ghdl
+    cd ghdl
+  '';
+
+  sourceRoot = "translate/ghdldrv";
+
+  patchPhase = ''
+    sed -i 's,$$curdir/lib,'$out'/share/ghdl_mcode/translate/lib,' Makefile
+  '';
+
+  postBuild = ''
+    # Build the LIB
+    ln -s ghdl_mcode ghdl
+    make install.mcode
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp ghdl_mcode $out/bin
+
+    ensureDir $out/share/ghdl_mcode/translate
+    cp -R ../lib $out/share/ghdl_mcode/translate
+    cp -R ../../libraries $out/share/ghdl_mcode
+
+    ensureDir $out/share/man/man1
+    cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1
+
+    # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
+    # As we will change the timestamps to 1970-01-01 00:00:01, we also set the
+    # content of that .cf to that value. This way ghdl does not complain on
+    # the installed object files from the basic libraries (ieee, ...)
+    pushd $out
+    find . -name "*.cf" -exec \
+        sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;
+    popd
+  '';
+
+  meta = {
+    homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/";
+    description = "Free VHDL simulator, mcode flavour";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87e6afac202..2ec6b868cb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2732,6 +2732,8 @@ let
     enableMultilib = false;
   });
 
+  ghdl_mcode = callPackage ../development/compilers/ghdl { };
+
   gcl = builderDefsPackage ../development/compilers/gcl {
     inherit mpfr m4 binutils fetchcvs emacs zlib which
       texinfo;

From 8b7d73abba46e11d9df5e673f1afe37b87bbe22e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:36:16 +0200
Subject: [PATCH 0188/2033] Don't run the cpufreq service in VMs

---
 nixos/modules/tasks/cpu-freq.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index edce562b005..eb1dfe5f6be 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -44,6 +44,7 @@ in
       script = ''
         cpupower frequency-set -g ${cfg.cpuFreqGovernor}
       '';
+      unitConfig.ConditionVirtualization = false;
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = "yes";

From 566a5c33e86bfd2956867c8184728825e58817e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:43:33 +0200
Subject: [PATCH 0189/2033] Set MODULE_DIR in systemd-load-modules.service

---
 nixos/modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cff7c08579f..a90d1f7c2aa 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -249,6 +249,7 @@ in
             SuccessExitStatus = "0 1";
           };
         restartTriggers = [ kernelModulesConf ];
+        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
       };
 
     lib.kernelConfig = {

From e8af68d2dcc064be54a2f0906b52e2b951b1756f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 10:48:14 +0200
Subject: [PATCH 0190/2033] Make machinectl work

---
 nixos/modules/system/boot/systemd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 1e4963c7ca6..30cff8c8ab2 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -66,6 +66,7 @@ let
       #"systemd-vconsole-setup.service"
       "systemd-user-sessions.service"
       "dbus-org.freedesktop.login1.service"
+      "dbus-org.freedesktop.machine1.service"
       "user@.service"
 
       # Journal.

From 0ac322c7a0502c98a8ebdcf34a1ee8e820537dcd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 11:34:34 +0200
Subject: [PATCH 0191/2033] systemd-nspawn: Fix starting NixOS containers

---
 pkgs/os-specific/linux/systemd/fixes.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 5ef248dc75d..298a6247ccb 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -39,6 +39,26 @@ index d1258f0..0311812 100644
  #ifndef HAVE_SPLIT_USR
                      || path_equal(m->path, "/usr")
  #endif
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 9a9ed9d..9e46e18 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -2667,6 +2667,7 @@ int main(int argc, char *argv[]) {
+                                 goto finish;
+                         }
+                 } else {
++#if 0
+                         const char *p;
+ 
+                         p = strappenda(arg_directory,
+@@ -2676,6 +2677,7 @@ int main(int argc, char *argv[]) {
+                                 goto finish;
+ 
+                         }
++#endif
+                 }
+         } else {
+                 char template[] = "/tmp/nspawn-root-XXXXXX";
 diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c
 index d61ecdf..228a3a4 100644
 --- a/src/nss-myhostname/netlink.c

From ec021b116dad0b04acfe14f5ebb576cca1e387a2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 16 Apr 2014 12:33:05 +0200
Subject: [PATCH 0192/2033] gnome-control-center: enable network settings

---
 .../gnome-3/core/gnome-control-center/default.nix      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index 76b06f59bcb..ac8b362839c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -2,11 +2,12 @@
 , libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
 , gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, libwacom, samba
-, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns }:
+, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, libwacom, samba, shared_mime_info, tzdata, icu, libtool
+, docbook_xsl, docbook_xsl_ns, modemmanager }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, networkmanager, wacom, smbclient, printers
+# TODO: bluetooth, wacom, smbclient, printers
 
 stdenv.mkDerivation rec {
   name = "gnome-control-center-3.10.2";
@@ -27,7 +28,8 @@ stdenv.mkDerivation rec {
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
       accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns makeWrapper ];
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns 
+      networkmanager modemmanager makeWrapper  ];
 
   preBuild = ''
     substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

From f44a3235a91981d1b783ae90dd0ade030e923a16 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 16 Apr 2014 14:47:18 +0400
Subject: [PATCH 0193/2033] Use IcedTea for VUE, not Oracle JRE

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ec6b868cb4..3ddc9eec0fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9347,7 +9347,7 @@ let
   vorbisTools = callPackage ../applications/audio/vorbis-tools { };
 
   vue = callPackage ../applications/misc/vue {
-    jre = oraclejre;
+    jre = icedtea7_jre;
   };
 
   vwm = callPackage ../applications/window-managers/vwm { };

From 922e4f38584ada87d7cb2caf93d11776d6238b6c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 16 Apr 2014 07:49:51 -0500
Subject: [PATCH 0194/2033] ffmpeg 2.1.4 -> 2.2.1

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

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 931881fd142..919972efb3c 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.1.4";
+  name = "ffmpeg-2.2.1";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "00c1k84amgkc7vk5xkrg7z99q7jbfhbz3qk854cxnc38d2ynrd3z";
+    sha256 = "153kfk8rzrfxx930rrk417b2m695dvy47v4hci3nd49iggx9jzz1";
   };
 
   mp3Support = config.ffmpeg.mp3 or true;

From d809a2785980daa243b9bf69b1c469ca706be750 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 16 Apr 2014 07:51:38 -0500
Subject: [PATCH 0195/2033] haskell-alsa-mixer 0.2.0.1 -> 0.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
index 35cc7aa0c93..2b3961f5cf1 100644
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "alsa-mixer";
-  version = "0.2.0.1";
-  sha256 = "1306kw4w85d3pkdqjw8cwx77a2mbhw2hlmxcjczym1nsyp4rhyhr";
+  version = "0.2.0.2";
+  sha256 = "11sc2n879a8rb9yz54cb8vg8rplgapbymzy785p7n7638xx877hk";
   buildDepends = [ alsaCore ];
   buildTools = [ c2hs ];
   extraLibraries = [ alsaLib ];

From 0b84d35175d9303d0806903ce545c01186c1d3e1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 16 Apr 2014 07:58:12 -0500
Subject: [PATCH 0196/2033] Assume maintainership of alsa-mixer

---
 pkgs/development/libraries/haskell/alsa-mixer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
index 2b3961f5cf1..0e7ef5e2a9f 100644
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
@@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
     description = "Bindings to the ALSA simple mixer API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;
+    maintainers = with self.stdenv.lib.maintainers; [ ttuegel ];
   };
 })

From 92a831a4ecfdc58106564ff7f69f13a7dd29a079 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 16 Apr 2014 15:01:11 +0200
Subject: [PATCH 0197/2033] xdg-user-dirs: new package

A tool to help manage well known user directories
like the desktop folder and the music folder

http://freedesktop.org/wiki/Software/xdg-user-dirs
---
 .../services/x11/desktop-managers/gnome3.nix  |  3 +++
 pkgs/tools/X11/xdg-user-dirs/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/X11/xdg-user-dirs/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d2f671f4377..5c602e6eb83 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -67,6 +67,9 @@ in {
           # Don't let epiphany depend upon gnome-shell
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
 
+          # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+          ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+
           ${gnome3.gnome_session}/bin/gnome-session&
           waitPID=$!
         '';
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
new file mode 100644
index 00000000000..bb26c0f46ce
--- /dev/null
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libxslt, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  name = "xdg-user-dirs-0.15";
+  
+  src = fetchurl {
+    url = "http://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786";
+  };
+
+  buildInputs = [ libxslt docbook_xsl ];
+
+  meta = with stdenv.lib; {
+    homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs;
+    description = "A tool to help manage well known user directories like the desktop folder and the music folder";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ lethalman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ca1041fa09..1f0b34750fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9455,6 +9455,8 @@ let
 
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
+  xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
+
   xdg_utils = callPackage ../tools/X11/xdg-utils { };
 
   xdotool = callPackage ../tools/X11/xdotool { };

From edee246684429eb9efea25b38c17cc37ad010ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 16 Apr 2014 15:22:02 +0200
Subject: [PATCH 0198/2033] Updating gnunet to 0.10.1.

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

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 045e6557730..bbb3561bae9 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -4,11 +4,11 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gnunet-0.10.0";
+  name = "gnunet-0.10.1";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/${name}.tar.gz";
-    sha256 = "0zqpc47kywhjrpphl0palz849khv00ra2gjrfkysp6p0gfsbvd0i";
+    sha256 = "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n";
   };
 
   buildInputs = [

From 19d4e40dfc1f9b426df168c47d1ca82be1af96b9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 15:25:37 +0200
Subject: [PATCH 0199/2033] systemd: Build on i686-linux

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e48c875d6f9..262fde74984 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   # This is needed because systemd uses the gold linker, which doesn't
   # yet have the wrapper script to add rpath flags automatically.
-  NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib";
+  NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.gcc.gcc}/lib";
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
 

From c382ad1e17c3b11374a1c1d72f6623e163d01b11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:09:32 +0200
Subject: [PATCH 0200/2033] Fix tests

Doing a =~ regexp check doesn't do anything in itself...
---
 nixos/tests/containers.nix | 4 ++--
 nixos/tests/udisks.nix     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index 9580f18189a..8ad9cd6e0d7 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -25,7 +25,7 @@ import ./make-test.nix {
 
   testScript =
     ''
-      $machine->succeed("nixos-container list") =~ /webserver/;
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
 
       # Start the webserver container.
       $machine->succeed("nixos-container start webserver");
@@ -65,7 +65,7 @@ import ./make-test.nix {
       $machine->succeed("nixos-container start $id1");
 
       # Execute commands via the root shell.
-      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/;
+      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
       $machine->succeed("nixos-container set-root-password $id1 foobar");
 
       # Destroy the containers.
diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix
index 2354c310661..b7f2e2c0031 100644
--- a/nixos/tests/udisks.nix
+++ b/nixos/tests/udisks.nix
@@ -40,7 +40,7 @@ in
       # Mount the stick as a non-root user and do some stuff with it.
       $machine->succeed("su - alice -c 'udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1'");
       $machine->succeed("su - alice -c 'udisks --mount /dev/sda1'");
-      $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/;
+      $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/ or die;
       $machine->succeed("su - alice -c 'echo foo > /media/USBSTICK/bar.txt'");
 
       # Unmounting the stick should make the mountpoint disappear.

From c81565f6cf7e0763d17b8513bc5183b778ae699b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:10:11 +0200
Subject: [PATCH 0201/2033] Remove hack for using upstream getty units

Also, enable the container-getty@ unit so that "machinectl login"
works.
---
 nixos/modules/services/ttys/agetty.nix     | 21 ++++++-----
 pkgs/os-specific/linux/systemd/fixes.patch | 44 +++++++++++++++++++++-
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 442774af251..c4571ef856f 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -49,22 +49,23 @@ with lib;
   config = {
 
     systemd.services."getty@" =
-      { baseUnit = pkgs.runCommand "getty.service" {}
-          ''
-            sed '/ExecStart/ d' < ${config.systemd.package}/example/systemd/system/getty@.service > $out
-          '';
-        serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login %I 38400";
+      { baseUnit = "${config.systemd.package}/example/systemd/system/getty@.service";
+        serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud %I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."serial-getty@" =
-      { baseUnit = pkgs.runCommand "serial-getty.service" {}
-          ''
-            sed '/ExecStart/ d' < ${config.systemd.package}/example/systemd/system/serial-getty@.service > $out
-          '';
+      { baseUnit = "${config.systemd.package}/example/systemd/system/serial-getty@.service";
         serviceConfig.ExecStart =
           let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
-          in "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds}";
+          in "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds} $TERM";
+        restartIfChanged = false;
+      };
+
+    systemd.services."container-getty@" =
+      { baseUnit = "${config.systemd.package}/example/systemd/system/container-getty@.service";
+        unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits.
+        serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud pts/%I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
 
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 298a6247ccb..4e9e71765ae 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -87,6 +87,30 @@ index 0887bc3..6b502ce 100644
                          return log_oom();
          }
  
+diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in
+index 8ac51a4..cae9fb5 100644
+--- a/units/console-getty.service.m4.in
++++ b/units/console-getty.service.m4.in
+@@ -15,7 +15,6 @@ After=rc-local.service
+ Before=getty.target
+ 
+ [Service]
+-ExecStart=-/sbin/agetty --noclear --keep-baud console 115200,38400,9600 $TERM
+ Type=idle
+ Restart=always
+ RestartSec=0
+diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in
+index 4f7794b..bad2a9a 100644
+--- a/units/container-getty@.service.m4.in
++++ b/units/container-getty@.service.m4.in
+@@ -16,7 +16,6 @@ Before=getty.target
+ IgnoreOnIsolate=yes
+ 
+ [Service]
+-ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM
+ Type=idle
+ Restart=always
+ RestartSec=0
 diff --git a/units/emergency.service.in b/units/emergency.service.in
 index 94c090f..0d20640 100644
 --- a/units/emergency.service.in
@@ -100,10 +124,10 @@ index 94c090f..0d20640 100644
  ExecStart=-/sbin/sulogin
  ExecStopPost=@SYSTEMCTL@ --fail --no-block default
 diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index aa853b8..f76cde0 100644
+index aa853b8..8bcc647 100644
 --- a/units/getty@.service.m4
 +++ b/units/getty@.service.m4
-@@ -23,7 +23,9 @@ IgnoreOnIsolate=yes
+@@ -23,11 +23,12 @@ IgnoreOnIsolate=yes
  # On systems without virtual consoles, don't start any getty. Note
  # that serial gettys are covered by serial-getty@.service, not this
  # unit.
@@ -114,6 +138,10 @@ index aa853b8..f76cde0 100644
  
  [Service]
  # the VT is cleared by TTYVTDisallocate
+-ExecStart=-/sbin/agetty --noclear %I $TERM
+ Type=idle
+ Restart=always
+ RestartSec=0
 diff --git a/units/local-fs.target b/units/local-fs.target
 index ae3cedc..0e36840 100644
 --- a/units/local-fs.target
@@ -148,6 +176,18 @@ index 552ef89..af3915f 100644
  ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
  ExecStart=-/sbin/sulogin
  ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
+diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
+index 4ac51e7..86a3b59 100644
+--- a/units/serial-getty@.service.m4
++++ b/units/serial-getty@.service.m4
+@@ -22,7 +22,6 @@ Before=getty.target
+ IgnoreOnIsolate=yes
+ 
+ [Service]
+-ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
+ Type=idle
+ Restart=always
+ RestartSec=0
 diff --git a/units/sysinit.target b/units/sysinit.target
 index 8f4fb8f..e0f0147 100644
 --- a/units/sysinit.target

From 7438b95437ae7dbf359fa86224057d74112807f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:29:38 +0200
Subject: [PATCH 0202/2033] util-linux: Update to 2.24.1

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

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index ec43ee1e64f..cdc384f3ee8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
-let
-  ver = "2.24";
-in
+
 stdenv.mkDerivation rec {
-  name = "util-linux-${ver}";
+  name = "util-linux-2.24.1";
 
   src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/utils/util-linux/v${ver}/${name}.tar.bz2";
-    sha256 = "1nfnymj03rdcxjb677a9qq1zirppr8csh32cb85qm23x5xndi6v3";
+    url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz";
+    sha256 = "0444xhfm9525v3aagyfbp38mp7xsw2fn9zg4ya713c7s5hivcpl3";
   };
 
   crossAttrs = {
@@ -19,8 +17,6 @@ stdenv.mkDerivation rec {
   # (/sbin/mount.*) through an environment variable, but that's
   # somewhat risky because we have to consider that mount can setuid
   # root...
-  # --enable-libmount-mount  fixes the behaviour being /etc/mtab a symlink to /proc/monunts
-  #     http://pl.digipedia.org/usenet/thread/19513/1924/
   configureFlags = ''
     --enable-write
     --enable-last

From c21ef8481075e345da7c534d969d8d4c3c2a0838 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:44:05 +0200
Subject: [PATCH 0203/2033] linux-pam: Update to 1.1.8

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

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 43300425c00..afc125556fe 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, cracklib }:
 
 stdenv.mkDerivation rec {
-  name = "linux-pam-1.1.6";
+  name = "linux-pam-1.1.8";
 
   src = fetchurl {
-    url = https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.6.tar.bz2;
-    sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s";
+    url = http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2;
+    sha256 = "0m8ygb40l1c13nsd4hkj1yh4p1ldawhhg8pyjqj9w5kd4cxg5cf4";
   };
 
   nativeBuildInputs = [ flex ];

From c13d582c782536718c7d62a10c2f83f19f0ce22e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:44:27 +0200
Subject: [PATCH 0204/2033] Make dbus overridable

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e542389bdbb..144651fe2eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4182,10 +4182,11 @@ let
   dbus_glib       = callPackage ../development/libraries/dbus-glib { };
   dbus_java       = callPackage ../development/libraries/java/dbus-java { };
   dbus_python     = callPackage ../development/python-modules/dbus { };
+
   # Should we deprecate these? Currently there are many references.
-  dbus_tools = dbus.tools;
-  dbus_libs = dbus.libs;
-  dbus_daemon = dbus.daemon;
+  dbus_tools = pkgs.dbus.tools;
+  dbus_libs = pkgs.dbus.libs;
+  dbus_daemon = pkgs.dbus.daemon;
 
   dhex = callPackage ../applications/editors/dhex { };
 

From 150d3b00951a2f0f1f65a22602422c2e75616c1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:58:06 +0200
Subject: [PATCH 0205/2033] no-x-libs.nix: Disable su xauth forwarding, and X11
 dependency in dbus

---
 nixos/lib/eval-config.nix          |  2 +-
 nixos/modules/config/no-x-libs.nix | 21 ++++++++++++++-------
 nixos/modules/profiles/minimal.nix |  7 ++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index e082b174454..0fa00637a93 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -58,7 +58,7 @@ rec {
           inherit system extraArgs modules prefix;
           # For efficiency, leave out most NixOS modules; they don't
           # define nixpkgs.config, so it's pointless to evaluate them.
-          baseModules = [ ../modules/misc/nixpkgs.nix ];
+          baseModules = [ ../modules/misc/nixpkgs.nix ../modules/config/no-x-libs.nix ];
           pkgs = import ./nixpkgs.nix { system = system_; config = {}; };
           check = false;
         }).config.nixpkgs;
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 4b791c109d7..f91dbb4cc28 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -1,3 +1,6 @@
+# This module gets rid of all dependencies on X11 client libraries
+# (including fontconfig).
+
 { config, lib, pkgs, ... }:
 
 with lib;
@@ -8,18 +11,22 @@ with lib;
       type = types.bool;
       default = false;
       description = ''
-        Switch off the options in the default configuration that require X libraries.
-        Currently this includes: ssh X11 forwarding, dbus, fonts.enableCoreFonts,
-        fonts.enableFontConfig
+        Switch off the options in the default configuration that
+        require X11 libraries. This includes client-side font
+        configuration and SSH forwarding of X11 authentication
+        in. Thus, you probably do not want to enable this option if
+        you want to run X11 programs on this machine via SSH.
       '';
     };
   };
 
   config = mkIf config.environment.noXlibs {
     programs.ssh.setXAuthLocation = false;
-    fonts = {
-      enableCoreFonts = false;
-      enableFontConfig = false;
-    };
+    security.pam.services.su.forwardXAuth = lib.mkForce false;
+
+    fonts.enableFontConfig = false;
+
+    nixpkgs.config.packageOverrides = pkgs:
+      { dbus = pkgs.dbus.override { useX11 = false; }; };
   };
 }
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 821b9f93465..5067622aaf1 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -1,11 +1,8 @@
 # This module defines a small NixOS configuration.  It does not
 # contain any graphical stuff.
 
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  # Don't include X libraries.
-  programs.ssh.setXAuthLocation = false;
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
+  environment.noXlibs = true;
 }

From 3b3f7d2595662d748e63ba08ea591ca04b53ae32 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 16 Apr 2014 16:39:12 +0100
Subject: [PATCH 0206/2033] haskellPackages.digestiveFunctorsAeson: Update to
 1.1.7

---
 .../haskell/digestive-functors-aeson/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index 64137054a70..ba0866b72d7 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -1,14 +1,14 @@
-{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe, tasty
-, tastyHunit, text, vector
+{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe
+, scientific, tasty, tastyHunit, text, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.6";
-  sha256 = "1zhw0zksl48q9y699phadf6ixsyll52clr3yyhqghki6l820xwci";
+  version = "1.1.7";
+  sha256 = "07dnwmbcyb64yp51ijwsc84r6gf4rxxc4bi3wkzwxq1ijm1qhpni";
   buildDepends = [ aeson digestiveFunctors lens safe text vector ];
   testDepends = [
-    aeson digestiveFunctors HUnit mtl tasty tastyHunit text
+    aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text
   ];
   meta = {
     homepage = "http://github.com/ocharles/digestive-functors-aeson";

From 2503e7e0c897409c41d0bffcc46e40ea1826a539 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 18:15:48 +0200
Subject: [PATCH 0207/2033] systemd: Apply patch to make container logins work
 again

---
 pkgs/os-specific/linux/systemd/fixes.patch | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 4e9e71765ae..493a9d266d7 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -26,6 +26,45 @@ index 41605ee..8517369 100644
                          if (switch_root_dir)
                                  args[i++] = "--switched-root";
                          args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+diff --git a/src/core/socket.c b/src/core/socket.c
+index 7c18a2b..eba67d5 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -663,16 +663,25 @@ static int instance_from_socket(int fd, unsigned nr, char **instance) {
+                 int k;
+ 
+                 k = getpeercred(fd, &ucred);
+-                if (k < 0)
++                if (k == -ENODATA) {
++                        /* This handles the case where somebody is
++                         * connecting from another pid/uid namespace
++                         * (e.g. from outside of our container). */
++                        if (asprintf(&r,
++                                     "%u-unknown",
++                                     nr) < 0)
++                                return -ENOMEM;
++                }
++                else if (k < 0)
+                         return k;
+-
+-                if (asprintf(&r,
+-                             "%u-%lu-%lu",
+-                             nr,
+-                             (unsigned long) ucred.pid,
+-                             (unsigned long) ucred.uid) < 0)
+-                        return -ENOMEM;
+-
++                else {
++                        if (asprintf(&r,
++                                     "%u-%lu-%lu",
++                                     nr,
++                                     (unsigned long) ucred.pid,
++                                     (unsigned long) ucred.uid) < 0)
++                                return -ENOMEM;
++                }
+                 break;
+         }
+ 
 diff --git a/src/core/umount.c b/src/core/umount.c
 index d1258f0..0311812 100644
 --- a/src/core/umount.c

From eddb702c96af34dc5a56ae29af5d706d6878348f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 16 Apr 2014 18:27:19 +0200
Subject: [PATCH 0208/2033] gnome3: enable pulseaudio by default

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index f5a2702904d..b88c98bdf07 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -47,6 +47,7 @@ in {
     services.gnome3.gnome-user-share.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
+    hardware.pulseaudio.enable = mkDefault true;
     services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;

From cce948e16521df30839312fbf330b47fbe1e68ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 17:46:55 +0200
Subject: [PATCH 0209/2033] man-pages: Update to 3.64

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f384aa512eb..5fc0b4752bc 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.63";
+  name = "man-pages-3.64";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "06iw95d3xpr9y5kbf889g4zvqlp7z68yabk3sjylbjdzapyqhgz6";
+    sha256 = "1p9zk130c852gqci6dyw57yaqx4v871n8n82kkccdpj7y63xr4bl";
   };
 
   preBuild =

From 5e16621afcaffe833aa285e10b1d4b6a36e99631 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 18:29:24 +0200
Subject: [PATCH 0210/2033] IO::Socket::SSL: Update to 1.981

Required by "git send-email".
---
 pkgs/top-level/perl-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7eb6d051fff..ad5a5bf9fed 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4394,17 +4394,19 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
-  IOSocketSSL = buildPerlPackage rec {
-    name = "IO-Socket-SSL-1.81";
+  IOSocketSSL = buildPerlPackage {
+    name = "IO-Socket-SSL-1.981";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz";
-      sha256 = "1vg7jpn7vz3a2j3fxjjkaxiiqg7azqmy7afrpghiqkjcr8b6zs9y";
+      url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.981.tar.gz;
+      sha256 = "d78f3aac72888a350962c2da87b2b459513a175d7ac641cb1482bacbb81e76eb";
     };
     propagatedBuildInputs = [ URI NetSSLeay ];
     meta = {
+      homepage = https://github.com/noxxi/p5-io-socket-ssl;
       description = "Nearly transparent SSL encapsulation for IO::Socket::INET";
       license = "perl";
     };
+    doCheck = false; # tries to connect to facebook.com etc.
   };
 
   IOString = buildPerlPackage rec {

From a1af25033a248fc75fcff4ac7441676a61cde8a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 18:43:02 +0200
Subject: [PATCH 0211/2033] git send-email: Respect $OPENSSL_X509_CERT_FILE

---
 .../git-and-tools/git/cert-path.patch                | 12 ++++++++++++
 .../version-management/git-and-tools/git/default.nix |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git/cert-path.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
new file mode 100644
index 00000000000..846752f5bfe
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.perl
+--- git-1.9.2-orig/git-send-email.perl	2014-04-09 21:09:34.000000000 +0200
++++ git-1.9.2/git-send-email.perl	2014-04-16 18:35:05.861132282 +0200
+@@ -1094,6 +1094,8 @@
+ 		return;
+ 	}
+ 
++	$smtp_ssl_cert_path //= $ENV{'OPENSSL_X509_CERT_FILE'};
++
+ 	if (!defined $smtp_ssl_cert_path) {
+ 		# use the OpenSSL defaults
+ 		return (SSL_verify_mode => SSL_VERIFY_PEER());
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a7be9b5798a..861030bae99 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13";
   };
 
-  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
+  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x

From 78d452c93c109bfddacf9e816b16a8f5f2c724cf Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 16 Apr 2014 12:59:27 -0500
Subject: [PATCH 0212/2033] Change aspell configure to use $out/lib/aspell

---
 pkgs/development/libraries/aspell/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index a69cee99b2b..6b054aaf44b 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  preConfigure = ''
+    configureFlagsArray=(
+      --enable-pkglibdir=$out/lib/aspell
+      --enable-pkgdatadir=$out/lib/aspell
+    );
+  '';
+
   # Note: Users should define the `ASPELL_CONF' environment variable to
   # `dict-dir $HOME/.nix-profile/lib/aspell/' so that they can access
   # dictionaries installed in their profile.

From df56712700afad166ce299c908cdbcdd663edc0c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 16 Apr 2014 13:09:31 -0500
Subject: [PATCH 0213/2033] The timeparsers library requires convertible ==
 1.0.*

---
 .../libraries/haskell/convertible/1.0.11.1.nix  | 17 +++++++++++++++++
 .../convertible/{default.nix => 1.1.0.0.nix}    |  0
 pkgs/top-level/haskell-packages.nix             |  8 ++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/convertible/1.0.11.1.nix
 rename pkgs/development/libraries/haskell/convertible/{default.nix => 1.1.0.0.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix
new file mode 100644
index 00000000000..8a79e50527d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix
@@ -0,0 +1,17 @@
+{ cabal, mtl, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "convertible";
+  version = "1.0.11.1";
+  sha256 = "1r50a2rpfsx0s7dv8ww5xck33b1mhy73gfilffrbqd4hxjgnxlj6";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ mtl text time ];
+  meta = {
+    homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
+    description = "Typeclasses and instances for converting between types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/convertible/default.nix b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/convertible/default.nix
rename to pkgs/development/libraries/haskell/convertible/1.1.0.0.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 283f3ffdcca..3eb4038b69b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -835,7 +835,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {};
 
-  convertible = callPackage ../development/libraries/haskell/convertible {};
+  convertible_1_0_11_1 = callPackage ../development/libraries/haskell/convertible/1.0.11.1.nix {};
+  convertible_1_1_0_0 = callPackage ../development/libraries/haskell/convertible/1.1.0.0.nix {};
+  convertible = self.convertible_1_1_0_0;
 
   continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
 
@@ -2540,7 +2542,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   # pass it explicitly in rare circumstances.
   time = null;
 
-  timeparsers = callPackage ../development/libraries/haskell/timeparsers {};
+  timeparsers = callPackage ../development/libraries/haskell/timeparsers {
+    convertible = self.convertible_1_0_11_1;
+  };
 
   timeRecurrence = callPackage ../development/libraries/haskell/time-recurrence {};
 

From 3f01caa89f5f65cb55632ce2815ede33440aa9be Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 22:30:58 +0200
Subject: [PATCH 0214/2033] linux: Enable transparent hugepages

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5aed09105cc..15473ea257c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -311,6 +311,11 @@ with stdenv.lib;
   9P_FSCACHE y
   9P_FS_POSIX_ACL y
 
+  # Enable transparent support for huge pages.
+  TRANSPARENT_HUGEPAGE? y
+  TRANSPARENT_HUGEPAGE_ALWAYS? n
+  TRANSPARENT_HUGEPAGE_MADVISE? y
+
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''

From b280f3d3aa94f255db6fe6feddd40c5768b4e575 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 16 Apr 2014 16:07:41 -0500
Subject: [PATCH 0215/2033] btrfsProgs: 3.12 -> 3.14

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 16c5b58c38d..a41b2f28d85 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }:
 
-let version = "3.12"; in
+let version = "3.14"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1pwcjf9jqdiy8445r1xkazqa07xmapnn0ylyz7yzphci3ib66zh9";
+    sha256 = "1qjy4bc96nfzkdjp6hwb85aasqs87nkmgi8pl6qa6cpvml3627cq";
   };
 
   buildInputs = [ attr acl zlib libuuid e2fsprogs lzo ];

From 0556bc0fcba94f09c0175846706383eae8223f1d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 16 Apr 2014 16:43:32 -0500
Subject: [PATCH 0216/2033] Add hfsevents expression, and make fsnotify use it
 on darwin

---
 .../libraries/haskell/fsnotify/default.nix       | 10 ++++++----
 .../libraries/haskell/hfsevents/default.nix      | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/hfsevents/default.nix

diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix
index 1ef55d105f7..3d308f6a88f 100644
--- a/pkgs/development/libraries/haskell/fsnotify/default.nix
+++ b/pkgs/development/libraries/haskell/fsnotify/default.nix
@@ -1,16 +1,18 @@
-{ cabal, Cabal, Glob, hinotify, hspec, QuickCheck, random
+{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random
 , systemFileio, systemFilepath, text, time, uniqueid
+, hinotify, hfsevents
 }:
 
 cabal.mkDerivation (self: {
   pname = "fsnotify";
   version = "0.0.11";
   sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq";
-  buildDepends = [ hinotify systemFileio systemFilepath text time ];
+  buildDepends = [ systemFileio systemFilepath text time ] ++
+    (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
   testDepends = [
-    Cabal Glob hinotify hspec QuickCheck random systemFileio
+    Cabal Glob hspec QuickCheck random systemFileio
     systemFilepath text time uniqueid
-  ];
+  ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]);
   doCheck = false;
   meta = {
     description = "Cross platform library for file change notification";
diff --git a/pkgs/development/libraries/haskell/hfsevents/default.nix b/pkgs/development/libraries/haskell/hfsevents/default.nix
new file mode 100644
index 00000000000..624420fb0ca
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hfsevents/default.nix
@@ -0,0 +1,16 @@
+{ cabal, cereal, mtl, text, gccApple }:
+
+cabal.mkDerivation (self: {
+  pname = "hfsevents";
+  version = "0.1.5";
+  sha256 = "0hp9jjj59smfcs51d9zjhyvgdbn46l0rl0jr98wbzg3qya0vwj5k";
+  buildDepends = [ cereal mtl text ];
+  buildTools = [ gccApple ];
+  configureFlags = "--ghc-option=-pgmc=${gccApple}/bin/gcc";
+  meta = {
+    homepage = "http://github.com/luite/hfsevents";
+    description = "File/folder watching for OS X";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 283f3ffdcca..a2a34c8cbad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1398,6 +1398,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hflags = callPackage ../development/libraries/haskell/hflags {};
 
+  hfsevents = callPackage ../development/libraries/haskell/hfsevents {};
+
   HFuse = callPackage ../development/libraries/haskell/HFuse {};
 
   highlightingKate = callPackage ../development/libraries/haskell/highlighting-kate {};

From 1a2784ee686a5c821db170175a0973be95f37ff3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 16 Apr 2014 18:56:22 -0500
Subject: [PATCH 0217/2033] btsync: 1.3.77 -> 1.3.87

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index c260b75c9fe..d0611d5b602 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1x95pag8ncjx3svm4424fjk5nmbdg8m87fsxy9sc63ba3qs9645j"
-    else if stdenv.system == "i686-linux" then "0l8d85ib6kbpz5sh9v0qga03i4xph61iiy9xlhazm9h30d5a6l8v"
+  sha256 = if stdenv.system == "x86_64-linux" then "16jdnip51fsnc2g0vib2zb4f06z5p1myzv9brrp42lq63l4skylj"
+    else if stdenv.system == "i686-linux" then "15bspn9frm2n7bzj7pdgbpd7gjjcxp0yx2sksa4ly6wmlv9lvf1j"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "1.3.77";
+  version = "1.3.87";
 
   src  = fetchurl {
     url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";

From 28b3318a046c2c7c8086c450cf6073e155f94289 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 16 Apr 2014 21:48:13 +0200
Subject: [PATCH 0218/2033] bedup: fix public github url

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9dcb6283f41..0312aeda4ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -585,7 +585,7 @@ rec {
     name = "bedup-20140206";
 
     src = fetchgit {
-      url = "git@github.com:g2p/bedup.git";
+      url = "https://github.com/g2p/bedup.git";
       rev = "80cb217d4819a03e159e42850a9a3f14e2b278a3";
       sha256 = "c6ab696a767efc20f25faecbb74833e6e396d89ea70a3a7e97e4dbd9b58e90f4";
     };

From eeb32fd82b1b30b3af16375de8dd8fc2918d43de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 10:53:08 +0200
Subject: [PATCH 0219/2033] Hopefully fix random failure in cups test

http://hydra.nixos.org/build/10372895
---
 nixos/tests/printing.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 9ef28dcfcd4..9b96e3d7b20 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -31,7 +31,9 @@ import ./make-test.nix ({pkgs, ... }: {
 
       # Make sure that cups is up on both sides.
       $server->waitForUnit("cupsd.service");
+      $server->waitForUnit("network.target");
       $client->waitForUnit("cupsd.service");
+      $client->waitForUnit("network.target");
       $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
       $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
       $client->succeed("curl --fail http://localhost:631/");

From f0a9703f7784e4759a6704606346920c78a9095d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 10:56:10 +0200
Subject: [PATCH 0220/2033] journalctl no longer parses the flag "-bu"

---
 nixos/lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 99810f87750..6d3ffa17359 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -495,7 +495,7 @@ sub waitForX {
     my ($self, $regexp) = @_;
     $self->nest("waiting for the X11 server", sub {
         retry sub {
-            my ($status, $out) = $self->execute("journalctl -bu systemd-logind | grep Linked");
+            my ($status, $out) = $self->execute("journalctl -b -u systemd-logind | grep Linked");
             return 0 if $status != 0;
             ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
             return 1 if $status == 0;

From 5378da25a027f73bbbb25e1d111499f3b7dba2e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 11:35:18 +0200
Subject: [PATCH 0221/2033] Apply pam_loginuid before pam_systemd

As recommended by the pam_systemd manpage.
---
 nixos/modules/security/pam.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 0d205ce07e5..6a5eb4c720f 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -187,6 +187,8 @@ let
 
           # Session management.
           session required pam_unix.so
+          ${optionalString cfg.setLoginUid
+              "session required pam_loginuid.so"}
           ${optionalString cfg.updateWtmp
               "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"}
           ${optionalString config.users.ldap.enable
@@ -197,8 +199,6 @@ let
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
           ${optionalString cfg.startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
-          ${optionalString cfg.setLoginUid
-              "session required pam_loginuid.so"}
           ${optionalString cfg.forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
           ${optionalString (cfg.limits != [])

From 89155dbc01e899a08151e50c01e82ad469c5ad59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 12:03:04 +0200
Subject: [PATCH 0222/2033] systemd: Enable user systemd instances

---
 nixos/modules/system/boot/systemd.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 30cff8c8ab2..a35c3224db2 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -727,5 +727,17 @@ in
         })
         (filterAttrs (name: service: service.startAt != "") cfg.services);
 
+    # Provide the systemd-user PAM service, required to run systemd
+    # user instances.
+    security.pam.services.systemd-user =
+      { # Ensure that pam_systemd gets included. This is special-cased
+        # in systemd to provide XDG_RUNTIME_DIR.
+        startSession = true;
+      };
+
+    # Provide systemd user units. FIXME: Should make this definable,
+    # just like the system units.
+    environment.etc."systemd/user".source = "${systemd}/example/systemd/user";
+
   };
 }

From 518f710547b92c3f3a5ef7fdf55be1e8cb66bea1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 12:22:24 +0200
Subject: [PATCH 0223/2033] Fix module loading in systemd-udevd

---
 nixos/modules/services/hardware/udev.nix | 5 +++++
 nixos/modules/system/boot/systemd.nix    | 2 +-
 nixos/tests/misc.nix                     | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index d218aa1e5e1..875de55b6c6 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -243,5 +243,10 @@ in
         fi
       '';
 
+    systemd.services.systemd-udevd =
+      { baseUnit = "${config.systemd.package}/example/systemd/system/systemd-udevd.service";
+        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+      };
+
   };
 }
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index a35c3224db2..36d27356408 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -50,7 +50,7 @@ let
       # Udev.
       "systemd-udevd-control.socket"
       "systemd-udevd-kernel.socket"
-      "systemd-udevd.service"
+      #"systemd-udevd.service"
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
 
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 0f57b9f6126..76298f1abd4 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -63,6 +63,12 @@ import ./make-test.nix {
           $machine->succeed('[ "`hostname`" = machine ]');
           $machine->succeed('[ "`hostname -s`" = machine ]');
       };
+
+      # Test whether systemd-udevd automatically loads modules for our hardware.
+      subtest "udev-auto-load", sub {
+          $machine->waitForUnit('systemd-udev-settle.service');
+          $machine->succeed('lsmod | grep psmouse');
+      };
     '';
 
 }

From 317a81ada216fa6e97ba60a313bd4f7ba6b6d890 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 13:23:06 +0200
Subject: [PATCH 0224/2033] Enable systemd-tmpfiles

---
 nixos/modules/system/boot/systemd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 36d27356408..f70efeca4b9 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -140,6 +140,11 @@ let
       "user.slice"
       "machine.slice"
       "systemd-machined.service"
+
+      # Temporary file creation / cleanup.
+      "systemd-tmpfiles-clean.service"
+      "systemd-tmpfiles-setup.service"
+      "systemd-tmpfiles-setup-dev.service"
     ]
 
     ++ optionals cfg.enableEmergencyMode [
@@ -739,5 +744,7 @@ in
     # just like the system units.
     environment.etc."systemd/user".source = "${systemd}/example/systemd/user";
 
+    environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
+
   };
 }

From 4cfe7a7334f98f540c41c3f2d3453543810ce45c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 10:11:15 +0200
Subject: [PATCH 0225/2033] transmission-gtk: fix gsettings schemas, closes
 #2295

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 958e19a0986..29fb558c83d 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-systemd-daemon" ]
     ++ optional enableGTK3 "--with-gtk";
 
-  postInstall = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
+  preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ ''
     rm "$out/share/icons/hicolor/icon-theme.cache"
     wrapProgram "$out/bin/transmission-gtk" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 7d64d63a1cf94a0d1d03fa32cff5108cdbdd542d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 10:22:16 +0200
Subject: [PATCH 0226/2033] spacefm: fix gsettings schemas

Could not test it as the application did not start
for other reasons.
---
 pkgs/applications/misc/spacefm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index e1f98fceace..7dbe723d9eb 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -15,9 +15,9 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig makeWrapper ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/spacefm" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {

From 6f61f7dc0da1635fb16b78c607853f9ba7b0a199 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 10:25:20 +0200
Subject: [PATCH 0227/2033] midori: fix gsettings schemas

Could not test it because it does not compile for other reasons.
---
 pkgs/applications/networking/browsers/midori/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index db9e1c24cb5..d3135e0be8e 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
     -DUSE_ZEITGEIST=OFF
   '';
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram $out/bin/midori \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gsettings_desktop_schemas}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 }

From 64d4b9c3de1bd6093d986a7d568379e712d6683b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 11:27:57 +0200
Subject: [PATCH 0228/2033] transmission-remote-gtk: fix gsettings schemas

---
 .../networking/p2p/transmission-remote-gtk/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 5403f6e3156..968aba20754 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper pkgconfig intltool gtk3 json_glib curl ];
 
-  postInstall = ''
+  preFixup = ''
     wrapProgram "$out/bin/transmission-remote-gtk" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = {

From 8dbdebb50f7d5c5e09017fcc17aa4a75f7614483 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 11:44:11 +0200
Subject: [PATCH 0229/2033] gnumeric: fix gsettings schemas

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

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 0ae27e322b7..014aa5bf0fd 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -20,9 +20,12 @@ stdenv.mkDerivation rec {
     goffice gtk3 makeWrapper
   ];
 
-  postInstall = ''
-    wrapProgram "$out"/bin/gnumeric-* \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome_icon_theme}/share"
+  preFixup = ''
+    for f in "$out"/bin/gnumeric-*; do
+      wrapProgram $f \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {

From 82744e57d6515881fec92dcdb18e6300dea8ea04 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 13:30:08 +0200
Subject: [PATCH 0230/2033] pitivi: fix gsettings schemas, depend upon
 gnome-desktop

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

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 947d2517808..7f53aa07db6 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, makeWrapper
 , pythonPackages, gst, clutter-gst, clutter-gtk
 , gobjectIntrospection, clutter, gtk3, librsvg
-, gnome_icon_theme, gnome_icon_theme_symbolic
+, gnome_icon_theme, gnome_icon_theme_symbolic, gnome3
 }:
 
 let
@@ -39,20 +39,18 @@ in stdenv.mkDerivation rec {
     python pygobject3 pyxdg numpy pycairo sqlite3
   ]);
 
-  postInstall = with stdenv.lib; with gst; let
+  preFixup = with stdenv.lib; with gst; let
     libraryPath = makeLibraryPath [
       gstreamer gst-editing-services
       clutter-gst clutter-gtk clutter gtk3
-    ];
-
-    xdgDataDirs = makeSearchPath "share" [
-      gtk3 gnome_icon_theme gnome_icon_theme_symbolic
+      gnome3.gnome_desktop
     ];
   in ''
     wrapProgram "$out/bin/pitivi" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix LD_LIBRARY_PATH : "${libraryPath}" \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:${xdgDataDirs}:$out/share"
+      --prefix XDG_DATA_DIRS : "\$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 }

From 51a1e0a4a9515134bcb7801cd55b43192485786a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 13:46:48 +0200
Subject: [PATCH 0231/2033] kmod: Update to 17

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

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 378e1a87d07..380b4a35f1c 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "kmod-16";
+  name = "kmod-17";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5";
+    sha256 = "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.

From 9594421617b912f3996fd9f9ad94405762e49bbc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 13:52:30 +0200
Subject: [PATCH 0232/2033] =?UTF-8?q?kmod:=20Respect=20$MODULE=5FDIR=20in?=
 =?UTF-8?q?=20=E2=80=98kmod=20static-nodes=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/os-specific/linux/kmod/module-dir.patch | 46 +++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod/module-dir.patch b/pkgs/os-specific/linux/kmod/module-dir.patch
index 95d08da4580..0c4ab4bd4c4 100644
--- a/pkgs/os-specific/linux/kmod/module-dir.patch
+++ b/pkgs/os-specific/linux/kmod/module-dir.patch
@@ -1,7 +1,7 @@
-diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c
---- kmod-7-orig/libkmod/libkmod.c	2012-03-15 08:19:16.750010226 -0400
-+++ kmod-7/libkmod/libkmod.c	2012-04-04 15:21:29.532074313 -0400
-@@ -200,7 +200,7 @@
+diff -ru -x '*~' kmod-17-orig/libkmod/libkmod.c kmod-17/libkmod/libkmod.c
+--- kmod-17-orig/libkmod/libkmod.c	2014-04-01 12:40:37.161940089 +0200
++++ kmod-17/libkmod/libkmod.c	2014-04-17 13:47:15.871441987 +0200
+@@ -201,7 +201,7 @@
  static char *get_kernel_release(const char *dirname)
  {
  	struct utsname u;
@@ -10,7 +10,7 @@ diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c
  
  	if (dirname != NULL)
  		return path_make_absolute_cwd(dirname);
-@@ -208,7 +208,10 @@
+@@ -209,7 +209,10 @@
  	if (uname(&u) < 0)
  		return NULL;
  
@@ -22,3 +22,39 @@ diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c
  		return NULL;
  
  	return p;
+diff -ru -x '*~' kmod-17-orig/tools/static-nodes.c kmod-17/tools/static-nodes.c
+--- kmod-17-orig/tools/static-nodes.c	2013-12-17 22:05:42.159047316 +0100
++++ kmod-17/tools/static-nodes.c	2014-04-17 13:51:17.945974320 +0200
+@@ -159,6 +159,7 @@
+ 	FILE *in = NULL, *out = NULL;
+ 	const struct static_nodes_format *format = &static_nodes_format_human;
+ 	int r, ret = EXIT_SUCCESS;
++	char *dirname_prefix;
+ 
+ 	for (;;) {
+ 		int c, idx = 0, valid;
+@@ -211,16 +212,19 @@
+ 		goto finish;
+ 	}
+ 
+-	snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release);
++	if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)
++		dirname_prefix = "/lib/modules";
++
++	snprintf(modules, sizeof(modules), "%s/%s/modules.devname", dirname_prefix, kernel.release);
+ 	in = fopen(modules, "re");
+ 	if (in == NULL) {
+ 		if (errno == ENOENT) {
+-			fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n",
+-				kernel.release);
++			fprintf(stderr, "Warning: %s/%s/modules.devname not found - ignoring\n",
++				dirname_prefix, kernel.release);
+ 			ret = EXIT_SUCCESS;
+ 		} else {
+-			fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",
+-				kernel.release);
++			fprintf(stderr, "Error: could not open %s/%s/modules.devname - %m\n",
++				dirname_prefix, kernel.release);
+ 			ret = EXIT_FAILURE;
+ 		}
+ 		goto finish;

From 0af5954f5bf4ead2d7300ca67d5ac60270dddf74 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Mon, 7 Apr 2014 17:13:24 -0400
Subject: [PATCH 0233/2033] unrar: update 3.9.10 to 5.1.2

---
 pkgs/tools/archivers/unrar/default.nix | 34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index c790f767f12..a3ab95d1ab8 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,28 +1,32 @@
 {stdenv, fetchurl}:
+
+let
+  version = "5.1.2";
+in
 stdenv.mkDerivation {
-  name = "unrar-3.9.10";
+  name = "unrar-${version}";
 
   src = fetchurl {
-    url = http://www.rarlab.com/rar/unrarsrc-3.9.10.tar.gz;
-    sha256 = "0yi0i2j4srca8cag96ajc80m5xb5328ydzjab6y8h1bhypc2fiiv";
+    url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
+    sha256 = "0344cn4w3lw2111m3g431khiyndx9ibbp952bli1inx2fixps9cq";
   };
 
-  # Add a missing objects to the library
-  #patchPhase = ''
-  #  sed -i 's/^\(LIB_OBJ=.*\)/\1 recvol.o rs.o/' makefile.unix
-  #'';
-
-  buildPhase = ''
-    make -f makefile.unix unrar
-    rm *.o
-    make -f makefile.unix lib CXXFLAGS="-fPIC -O2 -DSILENT";
+  patchPhase = ''
+    sed -i \
+      -e "/CXX=/d" \
+      -e "/CXXFLAGS=/d" \
+      makefile
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/lib
+    mkdir -p $out/bin
     cp unrar $out/bin
-    cp libunrar.so $out/lib
   '';
 
-  buildInputs = [];
+  meta = {
+    description = "Utility for RAR archives";
+    license = "freeware";
+    maintainers = [ stdenv.lib.maintainers.emery ];
+    platforms = stdenv.lib.platforms.linux; # arbitrary
+  };
 }

From 7ea51b1c6c390591afd21eb58f6a3fb0de9806e9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 14:35:05 +0200
Subject: [PATCH 0234/2033] Enable kmod-static-nodes.service

This creates static device nodes such as /dev/fuse or
/dev/snd/seq. The kernel modules for these devices will be loaded on
demand when the device node is opened.
---
 nixos/modules/system/boot/kernel.nix       |  6 ++++++
 pkgs/os-specific/linux/systemd/fixes.patch | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index a90d1f7c2aa..2e036fafae6 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -147,6 +147,12 @@ in
 
   config = mkIf (!config.boot.isContainer) {
 
+    systemd.services.kmod-static-nodes =
+      { wantedBy = [ "sysinit.target" ];
+        baseUnit = "${config.systemd.package}/example/systemd/system/kmod-static-nodes.service";
+        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+      };
+
     system.build = { inherit kernel; };
 
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 493a9d266d7..c33d05da55a 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -181,6 +181,18 @@ index aa853b8..8bcc647 100644
  Type=idle
  Restart=always
  RestartSec=0
+diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
+index 368f980..d0c1bd2 100644
+--- a/units/kmod-static-nodes.service.in
++++ b/units/kmod-static-nodes.service.in
+@@ -10,7 +10,6 @@ Description=Create list of required static device nodes for the current kernel
+ DefaultDependencies=no
+ Before=sysinit.target systemd-tmpfiles-setup-dev.service
+ ConditionCapability=CAP_MKNOD
+-ConditionPathExists=/lib/modules/%v/modules.devname
+ 
+ [Service]
+ Type=oneshot
 diff --git a/units/local-fs.target b/units/local-fs.target
 index ae3cedc..0e36840 100644
 --- a/units/local-fs.target

From 47d783ce9d6d8bad230a818a2c6a1385a1587ee8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 17 Apr 2014 13:51:36 +0100
Subject: [PATCH 0235/2033] sqlite: update to 3.8.4.3

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index de96ab58eae..ec392e71531 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.0.2";
+  name = "sqlite-3.8.4.3";
 
   src = fetchurl {
-    url = http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz;
-    sha1 = "294c30e882a0d45877bce09afe72d08ccfc6b650";
+    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz";
+    sha1 = "zd9nqg1fc41222hvzvmvzr92z80b3wvh";
   };
 
   buildInputs = [ readline ncurses ];

From d17af6b9a8bde0823d62c329506ce151a698b902 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 14:53:48 +0200
Subject: [PATCH 0236/2033] dhcpcd: Update to 6.3.2

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

diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index 758e3fd7980..d247dbe38aa 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-6.2.1";
+  name = "dhcpcd-6.3.2";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "1gs23zwhzml2aam4j6rdncaqfv3z5n1ifx6lq4b8ccifqa87gbga";
+    sha256 = "1v2m5wdr6x5cz6i0n1y63am9dhj5j7ylrk717scjgwwjdbq1x75n";
   };
 
   patches = [ ./lxc_ro_promote_secondaries.patch ];

From c1e638abb67d51320907c1245992bea4a8694c83 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 17 Apr 2014 15:20:39 +0200
Subject: [PATCH 0237/2033] systemd: oneshot units should be allowed to restart
 on failure/abort

---
 nixos/modules/system/boot/systemd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f70efeca4b9..5f07d6482b7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -637,7 +637,8 @@ in
   config = {
 
     assertions = mapAttrsToList (name: service: {
-      assertion = service.serviceConfig.Type or "" == "oneshot" -> service.serviceConfig.Restart or "no" == "no";
+      assertion = service.serviceConfig.Type or "" == "oneshot" ->
+                    builtins.elem (service.serviceConfig.Restart or "no") ["no" "on-failure" "on-abort"];
       message = "${name}: Type=oneshot services must have Restart=no";
     }) cfg.services;
 

From ffb593f88093760bc0a1d7c925661aad1a5955bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 17 Apr 2014 15:40:02 +0200
Subject: [PATCH 0238/2033] nixos/graphite-service: fix startup issue

The preStart snippets (graphite, carbon) try to create directories under
/var/db/. That currently fails because the code is run as user
"graphite". Fix by setting "PermissionsStartOnly = true" so that the
preStart stuff is run as 'root'.

Further:
 * graphite-web-0.9.12/bin/build-index.sh needs perl, so add it to PATH.
 * Now that preStart runs as root, we must wait with "chown graphite"
   until we're done creating files/directories.
 * Drop needless check for root (uid 0) before running chown.
---
 nixos/modules/services/monitoring/graphite.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index cb67b9d4fcb..abdaf6ec296 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -184,6 +184,7 @@ in {
         ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}";
         User = "graphite";
         Group = "graphite";
+        PermissionsStartOnly = true;
       };
       restartTriggers = [
         pkgs.pythonPackages.carbon
@@ -194,7 +195,7 @@ in {
       ];
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}/whisper
-        if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi
+        chown -R graphite:graphite ${cfg.dataDir}
       '';
     };
 
@@ -235,6 +236,7 @@ in {
       description = "Graphite Web Interface";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
+      path = [ pkgs.perl ];
       environment = {
         PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages";
         DJANGO_SETTINGS_MODULE = "graphite.settings";
@@ -248,11 +250,11 @@ in {
           --call django.core.handlers.wsgi:WSGIHandler'';
         User = "graphite";
         Group = "graphite";
+        PermissionsStartOnly = true;
       };
       preStart = ''
         if ! test -e ${dataDir}/db-created; then
           mkdir -m 0700 -p ${dataDir}/{whisper/,log/webapp/}
-          if [ "$(id -u)" = 0 ]; then chown -R graphite:graphite ${cfg.dataDir}; fi
 
           # populate database
           ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput
@@ -261,6 +263,8 @@ in {
           ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
 
           touch ${dataDir}/db-created
+
+          chown -R graphite:graphite ${cfg.dataDir}
         fi
       '';
       restartTriggers = [

From 705dd70b32e2764ae8489a286afce896d48ebe93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 17 Apr 2014 15:49:46 +0200
Subject: [PATCH 0239/2033] nixos/grahite-service: mkdir -m => mkdir && chmod

mkdir -m will only set the permissions if it *creates* the directory.
Existing directories, with possibly wrong permissions, will not be
updated.

Use explicit chmod so permissions will always be correct.
---
 nixos/modules/services/monitoring/graphite.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index abdaf6ec296..d543d15b34e 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -194,7 +194,8 @@ in {
         cfg.carbon.rewriteRules
       ];
       preStart = ''
-        mkdir -m 0700 -p ${cfg.dataDir}/whisper
+        mkdir -p ${cfg.dataDir}/whisper
+        chmod 0700 ${cfg.dataDir}/whisper
         chown -R graphite:graphite ${cfg.dataDir}
       '';
     };
@@ -254,7 +255,8 @@ in {
       };
       preStart = ''
         if ! test -e ${dataDir}/db-created; then
-          mkdir -m 0700 -p ${dataDir}/{whisper/,log/webapp/}
+          mkdir -p ${dataDir}/{whisper/,log/webapp/}
+          chmod 0700 ${dataDir}/{whisper/,log/webapp/}
 
           # populate database
           ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput

From f2cb4def59802c35ccc65b330715ac8c0a7cd277 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 15:54:42 +0200
Subject: [PATCH 0240/2033] qemu: Update to 1.7.1

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index af2e1efb59e..b6e28d44411 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -7,14 +7,14 @@
 , x86Only ? false
 }:
 
-let n = "qemu-1.7.0"; in
+let n = "qemu-1.7.1"; in
 
 stdenv.mkDerivation rec {
   name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "050kq9mz8c2jcshm7nn7dldypsk8jr590ybnlw2wc51dbyl37wri";
+    sha256 = "1x5y06zhp0gc97g1sb98vf7dkawg63xywv0mbnpfnbi20jh452fn";
   };
 
   buildInputs =

From bb9304e2806f316ce201d05416b3c4db975b62b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 15:25:10 +0200
Subject: [PATCH 0241/2033] Remove creation of /tmp/.ICE-unix

This is now done by tmpfiles.
---
 nixos/modules/system/boot/stage-2-init.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index ee042992b17..6657897750e 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -104,14 +104,8 @@ if test -n "@cleanTmpDir@"; then
     echo -n "cleaning \`/tmp'..."
     find /tmp -maxdepth 1 -mindepth 1 -print0 | xargs -0r rm -rf --one-file-system
     echo " done"
-else
-    # Get rid of ICE locks...
-    rm -rf /tmp/.ICE-unix
 fi
 
-# ... and ensure that it's owned by root.
-mkdir -m 1777 /tmp/.ICE-unix
-
 # This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
 # -rf' on it isn't safe in general because it can contain bind mounts
 # to /nix/store and other places.  But after rebooting these are all

From 560a1103adf3834698c73cc98a5b70ec6aa3bbcc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 16:10:48 +0200
Subject: [PATCH 0242/2033] =?UTF-8?q?Add=20option=20=E2=80=98systemd.tmpfi?=
 =?UTF-8?q?les.rules=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows specifying rules for systemd-tmpfiles.

Also, enable systemd-tmpfiles-clean.timer so that stuff is cleaned up
automatically 15 minutes after boot and every day, *if* you have the
appropriate cleanup rules (which we don't have by default).
---
 nixos/modules/system/boot/stage-2.nix |  1 +
 nixos/modules/system/boot/systemd.nix | 24 ++++++++++++++++++++++++
 nixos/tests/misc.nix                  | 11 +++++++++++
 3 files changed, 36 insertions(+)

diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 2616c8649d5..f2a177fbdbc 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -79,6 +79,7 @@ in
         '';
       };
 
+      # FIXME: should replace this with something that uses systemd-tmpfiles.
       cleanTmpDir = mkOption {
         type = types.bool;
         default = false;
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 5f07d6482b7..5d144a3642b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -143,6 +143,7 @@ let
 
       # Temporary file creation / cleanup.
       "systemd-tmpfiles-clean.service"
+      "systemd-tmpfiles-clean.timer"
       "systemd-tmpfiles-setup.service"
       "systemd-tmpfiles-setup-dev.service"
     ]
@@ -629,6 +630,22 @@ in
       '';
     };
 
+    systemd.tmpfiles.rules = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "d /tmp 1777 root root 10d" ];
+      description = ''
+        Rules for creating and cleaning up temporary files
+        automatically. See
+        <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for the exact format. You should not use this option to create
+        files required by systemd services, since there is no
+        guarantee that <command>systemd-tmpfiles</command> runs when
+        the system is reconfigured using
+        <command>nixos-rebuild</command>.
+      '';
+    };
+
   };
 
 
@@ -747,5 +764,12 @@ in
 
     environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 
+    environment.etc."tmpfiles.d/nixos.conf".text =
+      ''
+        # This file is created automatically and should not be modified.
+        # Please change the option ‘systemd.tmpfiles.rules’ instead.
+        ${concatStringsSep "\n" cfg.tmpfiles.rules}
+      '';
+
   };
 }
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 76298f1abd4..363be2cbb35 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -8,6 +8,7 @@ import ./make-test.nix {
         [ { device = "/root/swapfile"; size = 128; } ];
       environment.variables.EDITOR = pkgs.lib.mkOverride 0 "emacs";
       services.nixosManual.enable = pkgs.lib.mkOverride 0 true;
+      systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
     };
 
   testScript =
@@ -69,6 +70,16 @@ import ./make-test.nix {
           $machine->waitForUnit('systemd-udev-settle.service');
           $machine->succeed('lsmod | grep psmouse');
       };
+
+      # Test whether systemd-tmpfiles-clean works.
+      subtest "tmpfiles", sub {
+          $machine->succeed('touch /tmp/foo');
+          $machine->succeed('systemctl start systemd-tmpfiles-clean');
+          $machine->succeed('[ -e /tmp/foo ]');
+          $machine->succeed('date -s "@$(($(date +%s) + 1000000))"'); # move into the future
+          $machine->succeed('systemctl start systemd-tmpfiles-clean');
+          $machine->fail('[ -e /tmp/foo ]');
+      };
     '';
 
 }

From bfda72c2f95b39c2dfa95680dd2b186ba01420d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 17:07:03 +0200
Subject: [PATCH 0243/2033] Fix waitForX

---
 nixos/lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 6d3ffa17359..e2bd3393d87 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -495,7 +495,7 @@ sub waitForX {
     my ($self, $regexp) = @_;
     $self->nest("waiting for the X11 server", sub {
         retry sub {
-            my ($status, $out) = $self->execute("journalctl -b -u systemd-logind | grep Linked");
+            my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
             return 0 if $status != 0;
             ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");
             return 1 if $status == 0;

From 1942d9cadc339b3e2ee85486949f128e396bc874 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 17 Apr 2014 17:31:18 +0200
Subject: [PATCH 0244/2033] gnome-control-center: find gnome-shell search
 providers

---
 .../services/x11/desktop-managers/gnome3.nix    |  3 +++
 .../core/gnome-control-center/default.nix       |  2 ++
 .../search_providers_dir.patch                  | 17 +++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b88c98bdf07..4620bc6722a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -68,6 +68,9 @@ in {
           # Don't let epiphany depend upon gnome-shell
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
 
+          # Let gnome-control-center find gnome-shell search providers
+          export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
+
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index ac8b362839c..1222f03d66e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
+  patches = [ ./search_providers_dir.patch ];
+
   meta = with stdenv.lib; {
     description = "Single sign-on framework for GNOME";
     maintainers = with maintainers; [ lethalman ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch
new file mode 100644
index 00000000000..7f5ad970f34
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
+index d08e230..3bff4ad 100644
+--- a/panels/search/cc-search-panel.c
++++ b/panels/search/cc-search-panel.c
+@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self)
+ {
+   GFile *providers_location;
+ 
+-  providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers");
++  const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR");
++  if (search_providers_dir == NULL) {
++    search_providers_dir = DATADIR "/gnome-shell/search-providers";
++  }
++  providers_location = g_file_new_for_path (search_providers_dir);
+   g_file_enumerate_children_async (providers_location,
+                                    "standard::type,standard::name,standard::content-type",
+                                    G_FILE_QUERY_INFO_NONE,

From 19060fde7b5437ea506ba04d7f240fa89145a0b2 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 17 Apr 2014 15:40:50 +0200
Subject: [PATCH 0245/2033] qrencode: upgrade to 3.4.3

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

diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index 3b83a18fd36..892ef54cdee 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qrencode-3.2.0";
+  name = "qrencode-3.4.3";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "13q6cz2lif8d7y95f8sgfqaxc1qr0sz9nl2xh71lfmx7v5ybri03";
+    sha256 = "163sb580p570p27imc6jhkfdw15kzp8vy1jq92nip1rwa63i9myz";
   };
 
   buildInputs = [ libpng ];

From 8ca0bbe1a92b3c889410fab7361c91ccb9eeb58a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 17 Apr 2014 17:26:01 +0200
Subject: [PATCH 0246/2033] bedup: fix hash

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0312aeda4ee..0d43dfb4d71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -587,7 +587,7 @@ rec {
     src = fetchgit {
       url = "https://github.com/g2p/bedup.git";
       rev = "80cb217d4819a03e159e42850a9a3f14e2b278a3";
-      sha256 = "c6ab696a767efc20f25faecbb74833e6e396d89ea70a3a7e97e4dbd9b58e90f4";
+      sha256 = "1rik7a62v708ivfcy0pawhfnrb84b7gm3qr54x6jsxl0iqz078h6";
     };
 
     buildInputs = [ pkgs.btrfsProgs ];

From 8dcf76480c34520997816d1bf4cfd68c6280ebbd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 18:10:20 +0200
Subject: [PATCH 0247/2033] firewall: Order after systemd-modules-load.service

This ensures that connection tracking modules are loaded on time.
---
 nixos/modules/services/networking/firewall.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index c2941e12261..e604ba23b87 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -273,6 +273,8 @@ in
 
         path = [ pkgs.iptables ];
 
+        after = [ "systemd-modules-load.service" ];
+
         preStart =
           ''
             ${helpers}

From 179acfb664ed06519ac515eada7bbef677cbee87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 18:52:31 +0200
Subject: [PATCH 0248/2033] Allow upstream systemd units to be extended

If you define a unit, and either systemd or a package in
systemd.packages already provides that unit, then we now generate a
file /etc/systemd/system/<unit>.d/overrides.conf. This makes it
possible to use upstream units, while allowing them to be customised
from the NixOS configuration. For instance, the module nix-daemon.nix
now uses the units provided by the Nix package. And all unit
definitions that duplicated upstream systemd units are finally gone.

This makes the baseUnit option unnecessary, so I've removed it.
---
 nixos/modules/config/sysctl.nix               | 13 +---
 nixos/modules/services/hardware/udev.nix      |  3 +-
 nixos/modules/services/misc/nix-daemon.nix    | 20 ++----
 nixos/modules/services/ttys/agetty.nix        |  9 +--
 .../activation/switch-to-configuration.pl     | 10 ++-
 nixos/modules/system/boot/kernel.nix          | 33 +++-------
 .../system/boot/systemd-unit-options.nix      |  6 --
 nixos/modules/system/boot/systemd.nix         | 61 ++++++++++++++-----
 nixos/modules/tasks/kbd.nix                   | 14 +----
 9 files changed, 72 insertions(+), 97 deletions(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index b4cd22caa79..54236021919 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -45,19 +45,8 @@ in
       ) config.boot.kernel.sysctl);
 
     systemd.services.systemd-sysctl =
-      { description = "Apply Kernel Variables";
-        before = [ "sysinit.target" "shutdown.target" ];
-        wantedBy = [ "sysinit.target" "multi-user.target" ];
+      { wantedBy = [ "multi-user.target" ];
         restartTriggers = [ config.environment.etc."sysctl.d/nixos.conf".source ];
-        unitConfig = {
-          DefaultDependencies = false; # needed to prevent a cycle
-          ConditionPathIsReadWrite = "/proc/sys/"; # prevent systemd-sysctl in containers
-        };
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${config.systemd.package}/lib/systemd/systemd-sysctl";
-        };
       };
 
     # Enable hardlink and symlink restrictions.  See
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 875de55b6c6..169a2e88414 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -244,8 +244,7 @@ in
       '';
 
     systemd.services.systemd-udevd =
-      { baseUnit = "${config.systemd.package}/example/systemd/system/systemd-udevd.service";
-        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+      { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
       };
 
   };
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 1516736dc2e..e6528777c32 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -275,28 +275,16 @@ in
           ) cfg.buildMachines;
       };
 
-    systemd.sockets."nix-daemon" =
-      { description = "Nix Daemon Socket";
-        wantedBy = [ "sockets.target" ];
-        before = [ "multi-user.target" ];
-        unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket/";
-        socketConfig.ListenStream = "/nix/var/nix/daemon-socket/socket";
-      };
+    systemd.packages = [ nix ];
 
-    systemd.services."nix-daemon" =
-      { description = "Nix Daemon";
-
-        path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
+    systemd.services.nix-daemon =
+      { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
         environment = cfg.envVars // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; };
 
-        unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket/";
-
         serviceConfig =
-          { ExecStart = "@${nix}/bin/nix-daemon nix-daemon --daemon";
-            KillMode = "process";
-            Nice = cfg.daemonNiceLevel;
+          { Nice = cfg.daemonNiceLevel;
             IOSchedulingPriority = cfg.daemonIONiceLevel;
             LimitNOFILE = 4096;
           };
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index c4571ef856f..df21ebbd974 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -49,22 +49,19 @@ with lib;
   config = {
 
     systemd.services."getty@" =
-      { baseUnit = "${config.systemd.package}/example/systemd/system/getty@.service";
-        serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud %I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud %I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."serial-getty@" =
-      { baseUnit = "${config.systemd.package}/example/systemd/system/serial-getty@.service";
-        serviceConfig.ExecStart =
+      { serviceConfig.ExecStart =
           let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
           in "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds} $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."container-getty@" =
-      { baseUnit = "${config.systemd.package}/example/systemd/system/container-getty@.service";
-        unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits.
+      { unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits.
         serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud pts/%I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index fd2b5b7950d..13bd0b60f82 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -115,6 +115,14 @@ sub boolIsTrue {
     return $s eq "yes" || $s eq "true";
 }
 
+# As a fingerprint for determining whether a unit has changed, we use
+# its absolute path. If it has an override file, we append *its*
+# absolute path as well.
+sub fingerprintUnit {
+    my ($s) = @_;
+    return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : "");
+}
+
 # Stop all services that no longer exist or have changed in the new
 # configuration.
 my (@unitsToStop, @unitsToSkip);
@@ -166,7 +174,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             }
         }
 
-        elsif (abs_path($prevUnitFile) ne abs_path($newUnitFile)) {
+        elsif (fingerprintUnit($prevUnitFile) ne fingerprintUnit($newUnitFile)) {
             if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {
                 # Do nothing.  These cannot be restarted directly.
             } elsif ($unit =~ /\.mount$/) {
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 2e036fafae6..5e5b2abbb9c 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -147,12 +147,6 @@ in
 
   config = mkIf (!config.boot.isContainer) {
 
-    systemd.services.kmod-static-nodes =
-      { wantedBy = [ "sysinit.target" ];
-        baseUnit = "${config.systemd.package}/example/systemd/system/kmod-static-nodes.service";
-        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
-      };
-
     system.build = { inherit kernel; };
 
     system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
@@ -224,37 +218,26 @@ in
 
     # Create /etc/modules-load.d/nixos.conf, which is read by
     # systemd-modules-load.service to load required kernel modules.
-    # FIXME: ensure that systemd-modules-load.service is restarted if
-    # this file changes.
     environment.etc = singleton
       { target = "modules-load.d/nixos.conf";
         source = kernelModulesConf;
       };
 
-    # Sigh.  This overrides systemd's systemd-modules-load.service
-    # just so we can set a restart trigger.  Also make
-    # multi-user.target pull it in so that it gets started if it
-    # failed earlier.
     systemd.services."systemd-modules-load" =
-      { description = "Load Kernel Modules";
-        wantedBy = [ "sysinit.target" "multi-user.target" ];
-        before = [ "sysinit.target" "shutdown.target" ];
-        conflicts = [ "shutdown.target" ];
-        unitConfig =
-          { DefaultDependencies = false;
-            ConditionCapability = "CAP_SYS_MODULE";
-          };
+      { wantedBy = [ "multi-user.target" ];
+        restartTriggers = [ kernelModulesConf ];
+        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
         serviceConfig =
-          { Type = "oneshot";
-            RemainAfterExit = true;
-            ExecStart = "${config.systemd.package}/lib/systemd/systemd-modules-load";
-            # Ignore failed module loads.  Typically some of the
+          { # Ignore failed module loads.  Typically some of the
             # modules in ‘boot.kernelModules’ are "nice to have but
             # not required" (e.g. acpi-cpufreq), so we don't want to
             # barf on those.
             SuccessExitStatus = "0 1";
           };
-        restartTriggers = [ kernelModulesConf ];
+      };
+
+    systemd.services.kmod-static-nodes =
+      { wantedBy = [ "sysinit.target" ];
         environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
       };
 
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 20ea0ba874d..a16263b390d 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -41,12 +41,6 @@ in rec {
       '';
     };
 
-    baseUnit = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = "Path to an upstream unit file on which the NixOS unit configuration will be based.";
-    };
-
     description = mkOption {
       default = "";
       type = types.str;
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 5d144a3642b..ee809a8ec44 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -31,7 +31,6 @@ let
       "sockets.target"
       "graphical.target"
       "multi-user.target"
-      "getty.target"
       "network.target"
       "network-online.target"
       "nss-lookup.target"
@@ -50,10 +49,17 @@ let
       # Udev.
       "systemd-udevd-control.socket"
       "systemd-udevd-kernel.socket"
-      #"systemd-udevd.service"
+      "systemd-udevd.service"
       "systemd-udev-settle.service"
       "systemd-udev-trigger.service"
 
+      # Consoles.
+      "getty.target"
+      "getty@.service"
+      "serial-getty@.service"
+      "container-getty@.service"
+      "systemd-vconsole-setup.service"
+
       # Hardware (started by udev when a relevant device is plugged in).
       "sound.target"
       "bluetooth.target"
@@ -80,7 +86,8 @@ let
       "systemd-initctl.service"
 
       # Kernel module loading.
-      #"systemd-modules-load.service"
+      "systemd-modules-load.service"
+      "kmod-static-nodes.service"
 
       # Filesystems.
       "systemd-fsck@.service"
@@ -146,6 +153,9 @@ let
       "systemd-tmpfiles-clean.timer"
       "systemd-tmpfiles-setup.service"
       "systemd-tmpfiles-setup-dev.service"
+
+      # Misc.
+      "systemd-sysctl.service"
     ]
 
     ++ optionals cfg.enableEmergencyMode [
@@ -198,7 +208,7 @@ let
 
   serviceConfig = { name, config, ... }: {
     config = mkMerge
-      [ (mkIf (config.baseUnit == null) { # Default path for systemd services.  Should be quite minimal.
+      [ { # Default path for systemd services.  Should be quite minimal.
           path =
             [ pkgs.coreutils
               pkgs.findutils
@@ -207,7 +217,7 @@ let
               systemd
             ];
           environment.PATH = config.path;
-        })
+        }
         (mkIf (config.preStart != "")
           { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" ''
               #! ${pkgs.stdenv.shell} -e
@@ -275,10 +285,7 @@ let
         (if isList value then value else [value]))
         as));
 
-  commonUnitText = def:
-    optionalString (def.baseUnit != null) ''
-      .include ${def.baseUnit}
-    '' + ''
+  commonUnitText = def: ''
       [Unit]
       ${attrsToSection def.unitConfig}
     '';
@@ -358,6 +365,8 @@ let
   units = pkgs.runCommand "units" { preferLocalBuild = true; }
     ''
       mkdir -p $out
+
+      # Copy the upstream systemd units we're interested in.
       for i in ${toString upstreamUnits}; do
         fn=${systemd}/example/systemd/system/$i
         if ! [ -e $fn ]; then echo "missing $fn"; false; fi
@@ -368,6 +377,8 @@ let
         fi
       done
 
+      # Copy .wants links, but only those that point to units that
+      # we're interested in.
       for i in ${toString upstreamWants}; do
         fn=${systemd}/example/systemd/system/$i
         if ! [ -e $fn ]; then echo "missing $fn"; false; fi
@@ -376,18 +387,35 @@ let
         for i in $fn/*; do
           y=$x/$(basename $i)
           cp -pd $i $y
-          if ! [ -e $y ]; then rm -v $y; fi
+          if ! [ -e $y ]; then rm $y; fi
         done
       done
 
-      for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do
-        ln -fs $i/* $out/
-      done
-
+      # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
-        ln -s $i/etc/systemd/system/* $out/
+        ln -s $i/etc/systemd/system/* $i/lib/systemd/system/* $out/
       done
 
+      # Symlink all units defined by systemd.units. If these are also
+      # provided by systemd or systemd.packages, then add them as
+      # <unit-name>.d/overrides.conf, which makes them extend the
+      # upstream unit.
+      for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do
+        fn=$(basename $i/*)
+        if [ -e $out/$fn ]; then
+          if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
+            ln -sfn /dev/null $out/$fn
+          else
+            mkdir $out/$fn.d
+            ln -s $i/$fn $out/$fn.d/overrides.conf
+          fi
+       else
+          ln -fs $i/$fn $out/
+        fi
+      done
+
+      # Created .wants and .requires symlinks from the wantedBy and
+      # requiredBy options.
       ${concatStrings (mapAttrsToList (name: unit:
           concatMapStrings (name2: ''
             mkdir -p $out/'${name2}.wants'
@@ -400,6 +428,7 @@ let
             ln -sfn '../${name}' $out/'${name2}.requires'/
           '') unit.requiredBy) cfg.units)}
 
+      # Stupid misc. symlinks.
       ln -s ${cfg.defaultUnit} $out/default.target
 
       ln -s rescue.target $out/kbrequest.target
@@ -411,7 +440,7 @@ let
             ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
 
       ${ optionalString config.services.journald.enableHttpGateway ''
-      ln -s ../systemd-journal-gatewayd.service $out/multi-user-target.wants/
+        ln -s ../systemd-journal-gatewayd.service $out/multi-user-target.wants/
       ''}
     ''; # */
 
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index df4737305da..03c42404e5d 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -52,19 +52,7 @@ in
     # /dev/tty0 to prevent putting the X server in non-raw mode, and
     # it has a restart trigger.
     systemd.services."systemd-vconsole-setup" =
-      { description = "Setup Virtual Console";
-        wantedBy = [ "sysinit.target" "multi-user.target" ];
-        before = [ "sysinit.target" "shutdown.target" ];
-        conflicts = [ "shutdown.target" ];
-        unitConfig =
-          { DefaultDependencies = "no";
-            ConditionPathExists = "/dev/tty1";
-          };
-        serviceConfig =
-          { Type = "oneshot";
-            RemainAfterExit = true;
-            ExecStart = "${config.systemd.package}/lib/systemd/systemd-vconsole-setup /dev/tty1";
-          };
+      { wantedBy = [ "multi-user.target" ];
         restartTriggers = [ vconsoleConf ];
       };
 

From 2ad6933a22fd0f834f4abf1766f56c797c26991c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 19:05:29 +0200
Subject: [PATCH 0249/2033] Remove special handling of systemd-journal-gatewayd

---
 nixos/modules/system/boot/systemd.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index ee809a8ec44..d37cb80748d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -79,6 +79,8 @@ let
       "systemd-journald.socket"
       "systemd-journald.service"
       "systemd-journal-flush.service"
+      "systemd-journal-gatewayd.socket"
+      "systemd-journal-gatewayd.service"
       "syslog.socket"
 
       # SysV init compatibility.
@@ -161,11 +163,6 @@ let
     ++ optionals cfg.enableEmergencyMode [
       "emergency.target"
       "emergency.service"
-    ]
-
-    ++ optionals config.services.journald.enableHttpGateway [
-      "systemd-journal-gatewayd.socket"
-      "systemd-journal-gatewayd.service"
     ];
 
   upstreamWants =
@@ -438,10 +435,6 @@ let
 
       ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
             ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
-
-      ${ optionalString config.services.journald.enableHttpGateway ''
-        ln -s ../systemd-journal-gatewayd.service $out/multi-user-target.wants/
-      ''}
     ''; # */
 
 in
@@ -632,7 +625,7 @@ in
       default = false;
       type = types.bool;
       description = ''
-        Enable journal http gateway
+        Whether to enable the HTTP gateway to the journal.
       '';
     };
 
@@ -779,6 +772,9 @@ in
         })
         (filterAttrs (name: service: service.startAt != "") cfg.services);
 
+    systemd.sockets.systemd-journal-gatewayd.wantedBy =
+      optional config.services.journald.enableHttpGateway "sockets.target";
+
     # Provide the systemd-user PAM service, required to run systemd
     # user instances.
     security.pam.services.systemd-user =

From 09f0d57842ac08e97b360cb2f040547c9b25eead Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 16 Apr 2014 01:22:46 +0200
Subject: [PATCH 0250/2033] bitcoin: Update from 0.8.6 -> 0.9.1

---
 pkgs/applications/misc/bitcoin/default.nix | 35 +++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 1785526d14a..118b56c55b0 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,26 +1,39 @@
-{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }:
+{ fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux
+, pkgconfig, protobuf, qrencode }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.6";
+  version = "0.9.1";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bitcoin/${name}-linux.tar.gz";
-    sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
+    url = "https://bitcoin.org/bin/${version}/${name}-linux.tar.gz";
+    sha256 = "3fabc1c629007b465a278525883663d41a2ba62699f2773536a8bf59ca210425";
   };
 
-  buildInputs = [ openssl db boost zlib miniupnpc qt4 ];
+  # hexdump from utillinux is required for tests
+  buildInputs = [
+    openssl db48 boost zlib miniupnpc qt4 utillinux pkgconfig protobuf qrencode
+  ];
 
-  configurePhase = ''
-    cd src
-    qmake
+  unpackPhase = ''
+    mkdir tmp-extract && (cd tmp-extract && tar xf $src)
+    tar xf tmp-extract/bitcoin*/src/bitcoin*.tar*
+    cd bitcoin*
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bitcoin-qt $out/bin
+  configureFlags = [
+    "--with-boost=${boost}"
+  ];
+
+  preCheck = ''
+    # At least one test requires writing in $HOME
+    HOME=$TMPDIR
   '';
 
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
   meta = {
       description = "Bitcoin is a peer-to-peer currency";
       longDescription= ''

From 7aa3790f34af75acfe38aebc662081f41bdf4744 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 17 Apr 2014 22:22:54 +0100
Subject: [PATCH 0251/2033] adding development version of weechat (alongside
 stable)

---
 .../networking/irc/weechat/devel.nix          | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/weechat/devel.nix

diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
new file mode 100644
index 00000000000..cf52838b78c
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchgit, ncurses, openssl, perl, python, aspell, gnutls
+, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
+, pythonPackages, cacert, cmake, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b";
+  version = "0.4.4-rev${rev}";
+  name = "weechat-${version}";
+
+  src = fetchgit {
+    inherit rev;
+    url = "git://github.com/weechat/weechat.git";
+    sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z";
+  };
+
+  buildInputs = 
+    [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
+      libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
+      cacert cmake
+    ];
+
+  postInstall = ''
+       wrapProgram "$out/bin/weechat" \
+         --prefix PYTHONPATH : "$PYTHONPATH" \
+         --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages"
+  '';
+
+  meta = {
+    homepage = http://www.weechat.org/;
+    description = "A fast, light and extensible chat client";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec496af6185..7854029d21e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9360,6 +9360,8 @@ let
 
   weechat = callPackage ../applications/networking/irc/weechat { };
 
+  weechatDevel = callPackage ../applications/networking/irc/weechat/devel.nix { };
+
   weston = callPackage ../applications/window-managers/weston { };
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };

From 073351a5cfdcf844e05f3ce0e03df686769a7c43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 17 Apr 2014 23:35:05 +0200
Subject: [PATCH 0252/2033] Refactor unit option declarations

This gets rid of some duplication.
---
 .../system/boot/systemd-unit-options.nix      | 59 +++++++++++++------
 nixos/modules/system/boot/systemd.nix         | 34 +----------
 2 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index a16263b390d..a6183c47eb1 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -28,7 +28,7 @@ let
 
 in rec {
 
-  unitOptions = {
+  sharedOptions = {
 
     enable = mkOption {
       default = true;
@@ -41,6 +41,37 @@ in rec {
       '';
     };
 
+    requiredBy = mkOption {
+      default = [];
+      type = types.listOf types.string;
+      description = "Units that require (i.e. depend on and need to go down with) this unit.";
+    };
+
+    wantedBy = mkOption {
+      default = [];
+      type = types.listOf types.string;
+      description = "Units that want (i.e. depend on) this unit.";
+    };
+
+  };
+
+  concreteUnitOptions = sharedOptions // {
+
+    text = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Text of this systemd unit.";
+    };
+
+    unit = mkOption {
+      internal = true;
+      description = "The generated unit.";
+    };
+
+  };
+
+  commonUnitOptions = sharedOptions // {
+
     description = mkOption {
       default = "";
       type = types.str;
@@ -109,18 +140,6 @@ in rec {
       '';
     };
 
-    requiredBy = mkOption {
-      default = [];
-      type = types.listOf types.str;
-      description = "Units that require (i.e. depend on and need to go down with) this unit.";
-    };
-
-    wantedBy = mkOption {
-      default = [];
-      type = types.listOf types.str;
-      description = "Units that want (i.e. depend on) this unit.";
-    };
-
     unitConfig = mkOption {
       default = {};
       example = { RequiresMountsFor = "/data"; };
@@ -146,7 +165,7 @@ in rec {
   };
 
 
-  serviceOptions = unitOptions // {
+  serviceOptions = commonUnitOptions // {
 
     environment = mkOption {
       default = {};
@@ -280,7 +299,7 @@ in rec {
   };
 
 
-  socketOptions = unitOptions // {
+  socketOptions = commonUnitOptions // {
 
     listenStreams = mkOption {
       default = [];
@@ -307,7 +326,7 @@ in rec {
   };
 
 
-  timerOptions = unitOptions // {
+  timerOptions = commonUnitOptions // {
 
     timerConfig = mkOption {
       default = {};
@@ -326,7 +345,7 @@ in rec {
   };
 
 
-  pathOptions = unitOptions // {
+  pathOptions = commonUnitOptions // {
 
     pathConfig = mkOption {
       default = {};
@@ -343,7 +362,7 @@ in rec {
   };
 
 
-  mountOptions = unitOptions // {
+  mountOptions = commonUnitOptions // {
 
     what = mkOption {
       example = "/dev/sda1";
@@ -387,7 +406,7 @@ in rec {
     };
   };
 
-  automountOptions = unitOptions // {
+  automountOptions = commonUnitOptions // {
 
     where = mkOption {
       example = "/mnt";
@@ -411,4 +430,6 @@ in rec {
     };
   };
 
+  targetOptions = commonUnitOptions;
+
 }
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d37cb80748d..08ed482ef43 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -456,37 +456,7 @@ in
       default = {};
       type = types.attrsOf types.optionSet;
       options = { name, config, ... }:
-        { options = {
-            text = mkOption {
-              type = types.nullOr types.str;
-              default = null;
-              description = "Text of this systemd unit.";
-            };
-            enable = mkOption {
-              default = true;
-              type = types.bool;
-              description = ''
-                If set to false, this unit will be a symlink to
-                /dev/null. This is primarily useful to prevent specific
-                template instances (e.g. <literal>serial-getty@ttyS0</literal>)
-                from being started.
-              '';
-            };
-            requiredBy = mkOption {
-              default = [];
-              type = types.listOf types.string;
-              description = "Units that require (i.e. depend on and need to go down with) this unit.";
-            };
-            wantedBy = mkOption {
-              default = [];
-              type = types.listOf types.string;
-              description = "Units that want (i.e. depend on) this unit.";
-            };
-            unit = mkOption {
-              internal = true;
-              description = "The generated unit.";
-            };
-          };
+        { options = concreteUnitOptions;
           config = {
             unit = mkDefault (makeUnit name config);
           };
@@ -502,7 +472,7 @@ in
     systemd.targets = mkOption {
       default = {};
       type = types.attrsOf types.optionSet;
-      options = [ unitOptions unitConfig ];
+      options = [ targetOptions unitConfig ];
       description = "Definition of systemd target units.";
     };
 

From e34a1589fe1e2cd37a4d47a0dbf6c5791719e0f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 00:38:40 +0200
Subject: [PATCH 0253/2033] Add support for user units
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With ‘systemd.user.units’ and ‘systemd.user.services’, you can specify
units used by per-user systemd instances.  For example,

  systemd.user.services.foo =
    { description = "foo";
      wantedBy = [ "default.target" ];
      serviceConfig.ExecStart = "${pkgs.foo}/bin/foo";
    };

declares a unit ‘foo.service’ that gets started automatically when the
user systemd instance starts, and is stopped when the user systemd
instance stops.

Note that there is at most one systemd instance per user: it's created
when a user logs in and there is no systemd instance for that user
yet, and it's removed when the user fully logs out (i.e. has no
sessions anymore). So if you're simultaneously logged in via X11 and a
virtual console, you get only one copy of foo.
---
 nixos/modules/system/boot/systemd.nix | 83 +++++++++++++++++++--------
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 08ed482ef43..db253a0c582 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -24,7 +24,7 @@ let
           ln -s /dev/null $out/${name}
         '';
 
-  upstreamUnits =
+  upstreamSystemUnits =
     [ # Targets.
       "basic.target"
       "sysinit.target"
@@ -165,7 +165,7 @@ let
       "emergency.service"
     ];
 
-  upstreamWants =
+  upstreamSystemWants =
     [ #"basic.target.wants"
       "sysinit.target.wants"
       "sockets.target.wants"
@@ -174,6 +174,17 @@ let
       "timers.target.wants"
     ];
 
+  upstreamUserUnits =
+    [ "basic.target"
+      "default.target"
+      "exit.target"
+      "paths.target"
+      "shutdown.target"
+      "sockets.target"
+      "systemd-exit.service"
+      "timers.target"
+    ];
+
   makeJobScript = name: text:
     let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${name}"; inherit text; };
     in "${x}/bin/${name}";
@@ -359,13 +370,13 @@ let
         '';
     };
 
-  units = pkgs.runCommand "units" { preferLocalBuild = true; }
-    ''
+  generateUnits = type: units: upstreamUnits: upstreamWants:
+    pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''
       mkdir -p $out
 
       # Copy the upstream systemd units we're interested in.
       for i in ${toString upstreamUnits}; do
-        fn=${systemd}/example/systemd/system/$i
+        fn=${systemd}/example/systemd/${type}/$i
         if ! [ -e $fn ]; then echo "missing $fn"; false; fi
         if [ -L $fn ]; then
           cp -pd $fn $out/
@@ -377,7 +388,7 @@ let
       # Copy .wants links, but only those that point to units that
       # we're interested in.
       for i in ${toString upstreamWants}; do
-        fn=${systemd}/example/systemd/system/$i
+        fn=${systemd}/example/systemd/${type}/$i
         if ! [ -e $fn ]; then echo "missing $fn"; false; fi
         x=$out/$(basename $fn)
         mkdir $x
@@ -390,14 +401,16 @@ let
 
       # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
-        ln -s $i/etc/systemd/system/* $i/lib/systemd/system/* $out/
+        if [ -n "$(echo $i/etc/systemd/${type}/*)" ]; then
+          ln -s $i/etc/systemd/${type}/* $i/lib/systemd/${type}/* $out/
+        fi
       done
 
       # Symlink all units defined by systemd.units. If these are also
       # provided by systemd or systemd.packages, then add them as
       # <unit-name>.d/overrides.conf, which makes them extend the
       # upstream unit.
-      for i in ${toString (mapAttrsToList (n: v: v.unit) cfg.units)}; do
+      for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do
         fn=$(basename $i/*)
         if [ -e $out/$fn ]; then
           if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
@@ -417,24 +430,26 @@ let
           concatMapStrings (name2: ''
             mkdir -p $out/'${name2}.wants'
             ln -sfn '../${name}' $out/'${name2}.wants'/
-          '') unit.wantedBy) cfg.units)}
+          '') unit.wantedBy) units)}
 
       ${concatStrings (mapAttrsToList (name: unit:
           concatMapStrings (name2: ''
             mkdir -p $out/'${name2}.requires'
             ln -sfn '../${name}' $out/'${name2}.requires'/
-          '') unit.requiredBy) cfg.units)}
+          '') unit.requiredBy) units)}
 
-      # Stupid misc. symlinks.
-      ln -s ${cfg.defaultUnit} $out/default.target
+      ${optionalString (type == "system") ''
+        # Stupid misc. symlinks.
+        ln -s ${cfg.defaultUnit} $out/default.target
 
-      ln -s rescue.target $out/kbrequest.target
+        ln -s rescue.target $out/kbrequest.target
 
-      mkdir -p $out/getty.target.wants/
-      ln -s ../autovt@tty1.service $out/getty.target.wants/
+        mkdir -p $out/getty.target.wants/
+        ln -s ../autovt@tty1.service $out/getty.target.wants/
 
-      ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
-            ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
+        ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
+              ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
+      ''}
     ''; # */
 
 in
@@ -638,6 +653,25 @@ in
       '';
     };
 
+    systemd.user.units = mkOption {
+      description = "Definition of systemd per-user units.";
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = { name, config, ... }:
+        { options = concreteUnitOptions;
+          config = {
+            unit = mkDefault (makeUnit name config);
+          };
+        };
+    };
+
+    systemd.user.services = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ serviceOptions unitConfig serviceConfig ];
+      description = "Definition of systemd per-user service units.";
+    };
+
   };
 
 
@@ -651,11 +685,15 @@ in
       message = "${name}: Type=oneshot services must have Restart=no";
     }) cfg.services;
 
-    system.build.units = units;
+    system.build.units = cfg.units;
 
     environment.systemPackages = [ systemd ];
 
-    environment.etc."systemd/system".source = units;
+    environment.etc."systemd/system".source =
+      generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants;
+
+    environment.etc."systemd/user".source =
+      generateUnits "user" cfg.user.units upstreamUserUnits [];
 
     environment.etc."systemd/system.conf".text =
       ''
@@ -719,6 +757,9 @@ in
                    (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
 
+    systemd.user.units =
+      mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services;
+
     system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
       "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
     ];
@@ -753,10 +794,6 @@ in
         startSession = true;
       };
 
-    # Provide systemd user units. FIXME: Should make this definable,
-    # just like the system units.
-    environment.etc."systemd/user".source = "${systemd}/example/systemd/user";
-
     environment.etc."tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
 
     environment.etc."tmpfiles.d/nixos.conf".text =

From ffedee6ed523864dd5f871ffd85e3c2099d579a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 00:45:26 +0200
Subject: [PATCH 0254/2033] Start ssh-agent as a user unit

This has some advantages:

* You get ssh-agent regardless of how you logged in. Previously it was
  only started for X11 sessions.

* All sessions of a user share the same agent. So if you added a key
  on tty1, it will also be available on tty2.

* Systemd will restart ssh-agent if it dies.

* $SSH_AUTH_SOCK now points to the /run/user/<uid> directory, which is
  more secure than /tmp.

For bonus points, we should patch ssh-agent to support socket-based
activation...
---
 nixos/modules/config/gnu.nix                  |  2 +-
 nixos/modules/programs/ssh.nix                | 33 +++++++++++++++++++
 nixos/modules/rename.nix                      |  1 +
 .../services/x11/display-managers/default.nix | 11 -------
 nixos/modules/services/x11/xserver.nix        | 17 ++--------
 5 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index 092828fed0d..f8c35b440d1 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -36,7 +36,7 @@ with lib;
     # GNU lsh.
     services.openssh.enable = false;
     services.lshd.enable = true;
-    services.xserver.startOpenSSHAgent = false;
+    programs.ssh.startAgent = false;
     services.xserver.startGnuPGAgent = true;
 
     # TODO: GNU dico.
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 27db667e440..005c77d255c 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -47,7 +47,20 @@ in
           for help.
         '';
       };
+
+      startAgent = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
+          remembers private keys for you so that you don't have to type in
+          passphrases every time you make an SSH connection.  Use
+          <command>ssh-add</command> to add a key to the agent.
+        '';
+      };
+
     };
+
   };
 
   config = {
@@ -71,5 +84,25 @@ in
           target = "ssh/ssh_config";
         }
       ];
+
+    # FIXME: this should really be socket-activated for über-awesomeness.
+    systemd.user.services.ssh-agent =
+      { enable = cfg.startAgent;
+        description = "SSH Agent";
+        wantedBy = [ "default.target" ];
+        serviceConfig =
+          { ExecStart = "${pkgs.openssh}/bin/ssh-agent -a %t/ssh-agent";
+            Type = "forking";
+            Restart = "on-failure";
+          };
+      };
+
+    environment.extraInit = optionalString cfg.startAgent
+      ''
+        if [ -z "$SSH_AUTH_SOCK" -a -n "$XDG_RUNTIME_DIR" ]; then
+          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent"
+        fi
+      '';
+
   };
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aa3cefdcad1..1128b9c0da8 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -103,6 +103,7 @@ in zipModules ([]
 ++ obsolete [ "services" "sshd" "gatewayPorts" ] [ "services" "openssh" "gatewayPorts" ]
 ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]
 ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]
+++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
 ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
 
 # KDE
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 2deff602982..3bf18bd58c8 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -51,17 +51,6 @@ let
 
       ''}
 
-      ${optionalString cfg.startOpenSSHAgent ''
-        if test -z "$SSH_AUTH_SOCK"; then
-            # Restart this script as a child of the SSH agent.  (It is
-            # also possible to start the agent as a child that prints
-            # the required environment variabled on stdout, but in
-            # that mode ssh-agent is not terminated when we log out.)
-            export SSH_ASKPASS=${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass
-            exec ${pkgs.openssh}/bin/ssh-agent "$0" "$sessionType"
-        fi
-      ''}
-
       ${optionalString cfg.startGnuPGAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the GnuPG agent.
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1f02bfd6ef3..65f93b54499 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -201,17 +201,6 @@ in
         '';
       };
 
-      startOpenSSHAgent = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
-          remembers private keys for you so that you don't have to type in
-          passphrases every time you make an SSH connection.  Use
-          <command>ssh-add</command> to add a key to the agent.
-        '';
-      };
-
       startGnuPGAgent = mkOption {
         type = types.bool;
         default = false;
@@ -400,11 +389,11 @@ in
     hardware.opengl.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
 
     assertions =
-      [ { assertion = !(cfg.startOpenSSHAgent && cfg.startGnuPGAgent);
+      [ { assertion = !(config.programs.ssh.startAgent && cfg.startGnuPGAgent);
           message =
             ''
-              The OpenSSH agent and GnuPG agent cannot be started both.
-              Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
+              The OpenSSH agent and GnuPG agent cannot be started both. Please
+              choose between ‘programs.ssh.startAgent’ and ‘services.xserver.startGnuPGAgent’.
             '';
         }
         { assertion = config.security.polkit.enable;

From 9f65e82b59fde4f7d12c144832e0ff13f8399a40 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 01:22:38 +0200
Subject: [PATCH 0255/2033] Make the login test a bit more robust

http://hydra.nixos.org/build/10397037
---
 nixos/tests/login.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index 0a7d25c37ac..44c53c231c8 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -9,7 +9,8 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
   testScript =
     ''
-      $machine->waitForUnit("default.target");
+      $machine->waitForUnit('multi-user.target');
+      $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
       $machine->screenshot("postboot");
 
       subtest "create user", sub {
@@ -19,9 +20,11 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
 
       # Check whether switching VTs works.
       subtest "virtual console switching", sub {
+          $machine->fail("pgrep -f 'agetty.*tty2'");
           $machine->sendKeys("alt-f2");
           $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
           $machine->waitForUnit('getty@tty2.service');
+          $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
       };
 
       # Log in as alice on a virtual console.

From a2a398fbda842594ab17d0b98f68dba4c51e49e8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 11:25:21 +0200
Subject: [PATCH 0256/2033] pkgs/build-support/cabal: the release version of
 GHC 7.8.x no longer requires the -rpath hack added in
 63c60638fcc148a3f1d786216c434da723aeef3d and
 edaa56041ceb3185d9c104ca72c457a5e7ae6e03 to produce dynamically linked
 executables

---
 pkgs/build-support/cabal/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 5e028863b06..ed7ca30db13 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -195,10 +195,6 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
                 done
               done
 
-              ${optionalString self.enableSharedExecutables ''
-                configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
-              ''}
-
               echo "configure flags: $extraConfigureFlags $configureFlags"
               ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
                 --libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \

From 12f06ae4997c5b5ac123454ba1a86c0a294504a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 01:36:43 +0200
Subject: [PATCH 0257/2033] Doh

---
 nixos/modules/system/boot/systemd.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index db253a0c582..5bdb8bdac0b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -401,8 +401,10 @@ let
 
       # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
-        if [ -n "$(echo $i/etc/systemd/${type}/*)" ]; then
-          ln -s $i/etc/systemd/${type}/* $i/lib/systemd/${type}/* $out/
+        files=$(echo $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*)
+        echo $i: $files
+        if [ -n "$files" ]; then
+          ln -s $files $out/
         fi
       done
 

From 64b968f81f6ef611826aeda4a1982830e5e3986c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 02:31:10 +0200
Subject: [PATCH 0258/2033] Remove debug line

---
 nixos/modules/system/boot/systemd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 5bdb8bdac0b..20748f9c3eb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -402,7 +402,6 @@ let
       # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
         files=$(echo $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*)
-        echo $i: $files
         if [ -n "$files" ]; then
           ln -s $files $out/
         fi

From f7d28f7cd65bb0321880158073915b76836b91a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 02:40:01 +0200
Subject: [PATCH 0259/2033] Slight test speedup

Don't do a pointless ARP check in dhcpcd.
---
 nixos/modules/services/networking/dhcpcd.nix | 2 ++
 nixos/modules/virtualisation/qemu-vm.nix     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 8c3f651e434..349ad27b41c 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -80,6 +80,7 @@ in
   options = {
 
     networking.dhcpcd.denyInterfaces = mkOption {
+      type = types.listOf types.str;
       default = [];
       description = ''
          Disable the DHCP client for any interface whose name matches
@@ -90,6 +91,7 @@ in
     };
 
     networking.dhcpcd.extraConfig = mkOption {
+      type = types.lines;
       default = "";
       description = ''
          Literal string to append to the config file generated for dhcpcd.
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 7662427854e..3152a227418 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -399,6 +399,9 @@ in
     # Wireless won't work in the VM.
     networking.wireless.enable = mkVMOverride false;
 
+    # Speed up booting by not waiting for ARP.
+    networking.dhcpcd.extraConfig = "noarp";
+
     system.requiredKernelConfig = with config.lib.kernelConfig;
       [ (isEnabled "VIRTIO_BLK")
         (isEnabled "VIRTIO_PCI")

From d43b536ab65baec218fe6ed513f6e0aa2bf6b3ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 02:43:00 +0200
Subject: [PATCH 0260/2033] Work around apparent dhcpcd bug

---
 nixos/modules/services/networking/dhcpcd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 349ad27b41c..920c4d173e4 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -109,6 +109,7 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
+        after = [ "systemd-udev-settle.service" ]; # FIXME
 
         # Stopping dhcpcd during a reconfiguration is undesirable
         # because it brings down the network interfaces configured by

From 5c18bbe34fca3c6e38b06017780973e2c30cdd85 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 17 Apr 2014 21:47:15 -0500
Subject: [PATCH 0261/2033] Update ledger expression, add myself as a
 maintainer

---
 lib/maintainers.nix                     |  1 +
 pkgs/applications/office/ledger/3.0.nix | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 34896dfaeac..78355eff004 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -39,6 +39,7 @@
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  jwiegley = "John Wiegley <johnw@newartisans.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 1afa3a979e3..44cf87b7929 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }:
+{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python
+, texinfo, gnused }:
 
 let
-  rev = "3b5f496536";
+  rev = "a0c5addbbd";
 in
+
 stdenv.mkDerivation {
-  name = "ledger3-2013.12.${rev}";
+  name = "ledger-3.0.2.${rev}";
 
   src = fetchgit {
-    url = "https://github.com/ledger/ledger.git";
+    url = "git://github.com/ledger/ledger.git";
     inherit rev;
-    sha256 = "0r36zsdsyy6aylfcwyqra4796y4abi3b27wv5fvk3g2bmyzqzx4j";
+    sha256 = "1yr4i8gpby67j4vl7xk109dwb14z8a424nwgva8rbms8115w4ps5";
   };
 
-  buildInputs = [ cmake boost gmp mpfr libedit python texinfo ];
+  buildInputs = [ cmake boost gmp mpfr libedit python texinfo gnused ];
 
-  # Tests on Darwin are failing
-  doCheck = !stdenv.isDarwin;
   enableParallelBuilding = true;
 
   # Skip byte-compiling of emacs-lisp files because this is currently
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ simons the-kenny jwiegley ];
   };
 }

From 1be71ec4a2c4fe71c7571d554a4aebc116eecb41 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 17 Apr 2014 21:48:05 -0500
Subject: [PATCH 0262/2033] Update logging expression to 1.4.0

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

diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
index 1c7323f54cf..7cfcf147957 100644
--- a/pkgs/development/libraries/haskell/logging/default.nix
+++ b/pkgs/development/libraries/haskell/logging/default.nix
@@ -1,14 +1,14 @@
 { cabal, binary, fastLogger, hspec, liftedBase, monadControl
-, monadLogger, pcreLight, text, thyme, transformers, vectorSpace
+, monadLogger, pcreLight, text, time, transformers, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "logging";
-  version = "1.3.0";
-  sha256 = "1d2is6p828xvh59f9b971xf0w2l229652rniccxpm2mcfs893c79";
+  version = "1.4.0";
+  sha256 = "0xkk6j9wa5n0qg0wp7a9bwaz328hrjk1fwanpa515hh3gvz62g94";
   buildDepends = [
     binary fastLogger liftedBase monadControl monadLogger pcreLight
-    text thyme transformers vectorSpace
+    text time transformers vectorSpace
   ];
   testDepends = [ hspec monadLogger ];
   meta = {

From 3b0ed7bb14974ffb8acec33f5a44dd37957e409e Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 18 Apr 2014 15:03:33 +0400
Subject: [PATCH 0263/2033] fix missing su in chrootenv

---
 pkgs/games/steam/chrootenv.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 2173d12666e..b77046746cd 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,10 +1,10 @@
 { buildFHSChrootEnv, steam
-, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib
+, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib, su
 }:
 
 buildFHSChrootEnv {
   name = "steam";
-  pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ];
+  pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib su ];
   profile = ''
     export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib
     export FONTCONFIG_FILE=/etc/fonts/fonts.conf

From 104c841c85702ab684393f958bf90bdb23af52c5 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 18 Apr 2014 13:30:24 +0200
Subject: [PATCH 0264/2033] Move su to the base packages of chrootenv builder

---
 .../build-fhs-chrootenv/default.nix           | 28 ++++++++++---------
 pkgs/games/steam/chrootenv.nix                |  4 +--
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 8756c4835b2..2f3aa14c6a0 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,10 +1,12 @@
 {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, 
-bashInteractive, xz, shadow, gawk, less, buildEnv}:
+bashInteractive, xz, shadow, gawk, less, su, buildEnv}:
 {name, pkgs ? [], profile ? ""}:
 
 let
-  basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar gzip bzip2 
-bashInteractive xz shadow gawk less ];
+  basePkgs = [
+    glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
+    gzip bzip2 bashInteractive xz shadow gawk less su
+  ];
 
   # Compose a global profile for the chroot environment
   profilePkg = stdenv.mkDerivation {
@@ -31,16 +33,16 @@ bashInteractive xz shadow gawk less ];
   mountSh = ./mount.sh.in;
   loadSh = ./load.sh.in;
   umountSh = ./umount.sh.in;
-  destroySh = ./destroy.sh.in;                                                                                       
-in                                                                                                                   
-stdenv.mkDerivation {                                                                                                
-  name = "${name}-chrootenv";                                                                                        
-  buildCommand = ''                                                                                                  
-    mkdir -p $out/sw                                                                                                 
-    cd $out/sw                                                                                                       
-                                                                                                                     
-    for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}                                                      
-    do                                                                                                               
+  destroySh = ./destroy.sh.in;
+in
+stdenv.mkDerivation {
+  name = "${name}-chrootenv";
+  buildCommand = ''
+    mkdir -p $out/sw
+    cd $out/sw
+    
+    for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}
+    do
         if [ -x "$i" ]
         then
             ln -s "$i"
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index b77046746cd..2173d12666e 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,10 +1,10 @@
 { buildFHSChrootEnv, steam
-, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib, su
+, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib
 }:
 
 buildFHSChrootEnv {
   name = "steam";
-  pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib su ];
+  pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ];
   profile = ''
     export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib
     export FONTCONFIG_FILE=/etc/fonts/fonts.conf
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7854029d21e..7f424d0c66d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -270,7 +270,7 @@ let
   buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
     inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
     inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
-    inherit less buildEnv;
+    inherit less su buildEnv;
   };
 
   dotnetenv = import ../build-support/dotnetenv {

From 9bb40b7a5b05c61bceb200e770a58fc3250ce23a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 14:47:02 +0200
Subject: [PATCH 0265/2033] Pull in nix-daemon.socket

This led to the container test failing, which made no sense
whatsoever, until I realized nix-daemon.socket creates the socket
directory as a side effect, which systemd-nspawn then bind-mounts.

http://hydra.nixos.org/build/10397575
---
 nixos/modules/services/misc/nix-daemon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index e6528777c32..09a874481dc 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -277,6 +277,8 @@ in
 
     systemd.packages = [ nix ];
 
+    systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
+
     systemd.services.nix-daemon =
       { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ]
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];

From 359935a1ef8e4e76832a7db412521d31538e5dba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 14:48:04 +0200
Subject: [PATCH 0266/2033] kmod-static-nodes: Drop superfluous wantedBy

---
 nixos/modules/system/boot/kernel.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 5e5b2abbb9c..b81bcf20f43 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -237,8 +237,7 @@ in
       };
 
     systemd.services.kmod-static-nodes =
-      { wantedBy = [ "sysinit.target" ];
-        environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+      { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
       };
 
     lib.kernelConfig = {

From 4c764479a6905c8f29fb0363dd63c76da8d35cb0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 14:59:59 +0200
Subject: [PATCH 0267/2033] Remove redundant space

---
 nixos/modules/rename.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1128b9c0da8..0a67aeb81e5 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,7 +17,7 @@ let
     inherit from to;
     name = "Obsolete name";
     use = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
-    define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to  `${showOption to}'." x;
+    define = x: builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'." x;
   };
 
   # abort if deprecated option is used
@@ -25,7 +25,7 @@ let
     inherit from to;
     name = "Deprecated name";
     use = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
-    define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to  `${showOption to}'.";
+    define = x: abort "Deprecated option `${showOption from}' is used. It was renamed to `${showOption to}'.";
   };
 
   showOption = concatStringsSep ".";

From 890d0cc3a507e10f9f402805d1b5c43997ce603a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 15:34:10 +0200
Subject: [PATCH 0268/2033] firmware-linux-nonfree: Update to 0.41

---
 .../firmware-linux-nonfree/default.nix        | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index f5efc565753..5afa2cbe4eb 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -6,26 +6,27 @@
 { stdenv, fetchurl, dpkg }:
 
 let
-  version = "0.40";
+  version = "0.41";
 
   packages = [
-    { name = "adi"; sha256 = "0wwks9ff4n772435s57z1fjrffi4xl9nxnfn3v7xfcwdjb395d88"; }
-    { name = "atheros"; sha256 = "1gj7hfnyclzgyq06scynaclnfajhs6lw5i51j1w1hikv4yh20djz"; }
-    { name = "bnx2"; sha256 = "15qjj0sfjin5cbkpby29r5czn11xyiyyc4fmhwlqvgfgrnbp0aqk"; }
-    { name = "bnx2x"; sha256 = "08nvbln94ff47b2q0avxj1aa2wx4qih8sq8knbq54lp46kjf3k0h"; }
-    { name = "brcm80211"; sha256 = "1ndsw3s6xkr1n39nf9ig1xhnaglx5qvvvm8rh6ah41v644lzha79"; }
-    { name = "intelwimax"; sha256 = "1qwxmykh90v92asn4ivq0fak761hs7hd2zmz1dpkjidwsycrfyqn"; }
-    { name = "ipw2x00"; sha256 = "0a2nb17b5n3k1b6y4dbi5i8k1fm19ba2abq2jh2hjjmyyl3y388m"; }
-    { name = "ivtv"; sha256 = "1239gsjq16f4kd1yn77iq3ar8ndx3pzd16kpqafr1h2y0zwh452r"; }
-    { name = "iwlwifi"; sha256 = "03kmh5szd02pkbm1nlyz99fr2njhg88wiv73f1fz485m9rvgga43"; }
-    { name = "libertas"; sha256 = "0qjziwmwqbp83hxrjw7x3ralxg4ib9y23bcbn1g8yb5b6m84ca6b"; }
-    { name = "linux"; sha256 = "0ypidsrrfx4kvbfisdpgx2fzbil7g2jixgqhnv960iy5l348amrl"; }
-    { name = "linux-nonfree"; sha256 = "0p9ql3cdxljflh48r6z40kpyisbzp3s3g1qjb9f64n6cppllwjfr"; }
-    { name = "myricom"; sha256 = "12spfaq7z2bb93cy15zldlic1wx2v6h9sn7ny09nkzy4m26zds4q"; }
-    { name = "netxen"; sha256 = "03gmda16bdqw8a4x8x11ph41ksjh48hxydv0f0z3gi3czgbh7sn3"; }
-    { name = "qlogic"; sha256 = "1ah8rrwzi44p1l4q8qkql18djmn5kihsiinpy204xklm1csf3vs1"; }
-    { name = "ralink"; sha256 = "005549jk0wnyfnb247awv2wncsx5is05m1hdwcd33iq0dlbmm39b"; }
-    { name = "realtek"; sha256 = "1ai1klzrql8qxmb7945xiqlkfkyz8admrpb10b3r4ixvclkrvfi2"; }
+    { name = "adi"; sha256 = "19dm96djp34g6l84g9shwbmqbmfd15c24frcy1zh5nz8x12phgm4"; }
+    { name = "atheros"; sha256 = "0vrdyxiq7nx89h6ykdrs8s3l9frn3hmcfb9vsz68i12975y8ib5n"; }
+    { name = "bnx2"; sha256 = "12l3l54q69n1ky8lp7bmzscfqysabjrgmswwj57ryc6l82s7081y"; }
+    { name = "bnx2x"; sha256 = "10m9p479dq2ylpj5mw6d5vyfh9hybmh5xgs5sxma065v7r3c3v31"; }
+    { name = "brcm80211"; sha256 = "0l2lg5pshb1kb829hfq9w791scwa8biikrfzsx9wvlvkyxfdh187"; }
+    { name = "intelwimax"; sha256 = "13jqm8ik0mm8vnsskbbp63idpjqazzp2x4gaq7786jg5yj3zh1cf"; }
+    { name = "ipw2x00"; sha256 = "1hvxrzqbc75phxdbmqfh7ky36m0qna2pncwxpfdircy9i6fx7ipy"; }
+    { name = "ivtv"; sha256 = "0ckw1ynzfqnkwlmwpzfbdfx4s6bsl4nwp097g8khaavqxk94n88v"; }
+    { name = "iwlwifi"; sha256 = "1djazi2qsi5z6q0izirprxgfpg8vh55skab2nijyfl66drlcha72"; }
+    { name = "libertas"; sha256 = "1yj9dd9pwd98gknx5mvblfcbr6k347xzi8l6bk0pr4570j8ss8y3"; }
+    { name = "linux"; sha256 = "0vc4cbrq73y5hibx5k3gbfqaqxvaa3g8rv9kzwks2zl3hdxm6xaq"; }
+    { name = "linux-nonfree"; sha256 = "05vv8yq7kix5cw9s4agz4vgya6i3ff88jp3rxln1ssznhvzrjzx9"; }
+    { name = "myricom"; sha256 = "1idfvdfw7z4jbbjyq40hd2bpllvw7jz0ah7k3iwljxp8l2lf2nmf"; }
+    { name = "netxen"; sha256 = "0fdgllv8i7j9qbk5hi14zvw6fcn4nd1isr1486d8fv7nf2bf1mxx"; }
+    { name = "qlogic"; sha256 = "12w1qnqhs24am2psdfmv0ligczzxh9crllmp7r4y3vqghyvwax7i"; }
+    { name = "ralink"; sha256 = "1ryplg9shi7nam79zd86z7a0qzp0f9m7q89nq989z57qiysbrra4"; }
+    { name = "realtek"; sha256 = "1l867724qrw7nwksdv4k0hkz7nrjjs9vq2s3937wyaa0r2r66mg6"; }
+    { name = "ti-connectivity"; sha256 = "00cl9gyxa7795a57zwcvl26kxfl4qzppi4z8ksg5friv3db8sm1p"; }
   ];
 
   fetchPackage =

From da774bced5ed308c0393d7bb2c542fc84278b4bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 15:36:06 +0200
Subject: [PATCH 0269/2033] Remove dhcpcd_without_udev attribute

---
 nixos/modules/services/networking/dhcpcd.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 920c4d173e4..35a3cfff840 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  dhcpcd =  if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd_without_udev;
+  dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; };
 
   # Don't start dhcpcd on explicitly configured interfaces or on
   # interfaces that are part of a bridge.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 144651fe2eb..0d81df6c31d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -827,8 +827,6 @@ let
 
   dhcpcd = callPackage ../tools/networking/dhcpcd { };
 
-  dhcpcd_without_udev = callPackage ../tools/networking/dhcpcd { udev = null; };
-
   diffstat = callPackage ../tools/text/diffstat { };
 
   diffutils = callPackage ../tools/text/diffutils { };

From 1833b1a4cc6a77b5984542b0a73c3d1d6d9ad841 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 15:39:11 +0200
Subject: [PATCH 0270/2033] dnsmasq: Update to 2.69

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

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 0c5dfc6fd74..d8f62913ad5 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.68";
+  name = "dnsmasq-2.69";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "0bvw16i83ybiajskma59zjiqw59vzlcqf8f69k0crwak3zb1j820";
+    sha256 = "1zf4d6kjbsn6gwfwvmch1y84q67na1qhh0gyd50ip1vjsmw2l4i7";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";

From 5c62d3d26b07bb78ec92aec69e99dbee542f5e9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 16:05:20 +0200
Subject: [PATCH 0271/2033] nixos-rebuild: Handle $SHELL not being bash

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 2d137dd52ad..d7b749573fa 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -1,5 +1,7 @@
 #! @shell@
 
+if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
+
 set -e
 
 showSyntax() {

From c796adfd65e7ae62e2a5dbd153d98ff23ffd719d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Fri, 18 Apr 2014 22:07:17 +0800
Subject: [PATCH 0272/2033] add kakasi, a Kanji to Hiragana, Katakana or Romaji
 converter

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

diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix
new file mode 100644
index 00000000000..b73654da405
--- /dev/null
+++ b/pkgs/tools/text/kakasi/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "kakasi-2.3.6";
+
+  meta = with stdenv.lib; {
+    description = "Kanji Kana Simple Inverter";
+    longDescription = ''
+      KAKASI is the language processing filter to convert Kanji
+      characters to Hiragana, Katakana or Romaji and may be
+      helpful to read Japanese documents.
+    '';
+    homepage    = "http://kakasi.namazu.org/";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    url = "http://kakasi.namazu.org/stable/${name}.tar.xz";
+    sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7854029d21e..05c07c2c917 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9936,6 +9936,8 @@ let
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
+  kakasi = callPackage ../tools/text/kakasi { };
+
   kde4 = recurseIntoAttrs pkgs.kde411;
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );

From 96257ea486c70278e01e2739901a16c454f8085a Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Fri, 18 Apr 2014 16:09:34 +0200
Subject: [PATCH 0273/2033] Adding pamixer.

---
 pkgs/applications/audio/pamixer/default.nix | 38 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/audio/pamixer/default.nix

diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
new file mode 100644
index 00000000000..4337164fe3a
--- /dev/null
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, pulseaudio, boost }:
+
+let
+  tag = "1.1";
+in
+
+stdenv.mkDerivation rec {
+
+  name = "pamixer-${tag}";
+
+  src = fetchgit {
+    url = git://github.com/cdemoulins/pamixer;
+    rev = "refs/tags/${tag}";
+    sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034";
+  };
+
+  buildInputs = [ pulseaudio boost ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pamixer $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "pamixer is like amixer but for pulseaudio.";
+    longDescription = "Features:
+      - Get the current volume of the default sink, the default source or a selected one by his id
+      - Set the volume for the default sink, the default source or any other device
+      - List the sinks
+      - List the sources
+      - Increase / Decrease the volume for a device
+      - Mute or unmute a device";
+    homepage = https://github.com/cdemoulins/pamixer;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ _1126 ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec496af6185..23f3c514126 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8853,6 +8853,8 @@ let
 
   opusTools = callPackage ../applications/audio/opus-tools { };
 
+  pamixer = callPackage ../applications/audio/pamixer { };
+
   pan = callPackage ../applications/networking/newsreaders/pan {
     spellChecking = false;
   };

From 21573af9fb0b53806703c44b46d813b0c5d6efa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 16:40:27 +0200
Subject: [PATCH 0274/2033] Containers: Use /etc/resolv.conf supplied by the
 host

This used to work with systemd-nspawn 203, because it bind-mounted
/etc/resolv.conf (so openresolv couldn't overwrite it). Now it's just
copied, so we need some special handling.
---
 nixos/modules/system/boot/stage-2-init.sh         | 8 ++++++--
 nixos/modules/system/boot/stage-2.nix             | 2 ++
 nixos/modules/tasks/network-interfaces.nix        | 9 +++++++++
 nixos/modules/virtualisation/container-config.nix | 2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 6657897750e..62e08bb9ece 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -96,8 +96,6 @@ mkdir -m 0755 -p /etc/nixos
 
 # Miscellaneous boot time cleanup.
 rm -rf /var/run /var/lock
-rm -f /etc/resolv.conf
-touch /etc/resolv.conf
 rm -f /etc/{group,passwd,shadow}.lock
 
 if test -n "@cleanTmpDir@"; then
@@ -149,6 +147,12 @@ if test -n "$resumeDevice"; then
 fi
 
 
+# Use /etc/resolv.conf supplied by systemd-nspawn, if applicable.
+if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
+    cat /etc/resolv.conf | resolvconf -m 1000 -a host
+fi
+
+
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 echo "running activation script..."
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index f2a177fbdbc..f53c3b8b8e7 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -19,11 +19,13 @@ let
     isExecutable = true;
     inherit (config.boot) devShmSize runSize cleanTmpDir;
     inherit (config.nix) readOnlyStore;
+    inherit (config.networking) useHostResolvConf;
     ttyGid = config.ids.gids.tty;
     path =
       [ pkgs.coreutils
         pkgs.utillinux
         pkgs.sysvtools
+        pkgs.openresolv
       ] ++ (optional config.boot.cleanTmpDir pkgs.findutils)
       ++ optional config.nix.readOnlyStore readonlyMountpoint;
     postBootCommands = pkgs.writeText "local-cmds"
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index a33b571d437..9cc8b154324 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -191,6 +191,15 @@ in
       '';
     };
 
+    networking.useHostResolvConf = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        In containers, whether to use the
+        <filename>resolv.conf</filename> supplied by the host.
+      '';
+    };
+
     networking.localCommands = mkOption {
       default = "";
       example = "text=anything; echo You can put $text here.";
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index ae06fcb41e3..46dcdbd7712 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -8,6 +8,8 @@ with lib;
 
     sound.enable = mkDefault false;
 
+    networking.useHostResolvConf = true;
+
     # Provide a login prompt on /var/lib/login.socket.  On the host,
     # you can connect to it by running ‘socat
     # unix:<path-to-container>/var/lib/login.socket -,echo=0,raw’.

From c13cede19d7ad1088e3eda358eb57890ef59bec7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 16:50:37 +0200
Subject: [PATCH 0275/2033] Remove long-obsolete /nix/var/nix/chroots directory

---
 nixos/modules/services/misc/nix-daemon.nix | 3 +--
 nixos/modules/system/boot/stage-2-init.sh  | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 09a874481dc..4bfd6268234 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -342,8 +342,7 @@ in
           /nix/var/nix/profiles \
           /nix/var/nix/db \
           /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache \
-          /nix/var/nix/chroots
+          /nix/var/nix/channel-cache
         mkdir -m 1777 -p \
           /nix/var/nix/gcroots/per-user \
           /nix/var/nix/profiles/per-user \
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 62e08bb9ece..cee9db091c1 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -104,12 +104,6 @@ if test -n "@cleanTmpDir@"; then
     echo " done"
 fi
 
-# This is a good time to clean up /nix/var/nix/chroots.  Doing an `rm
-# -rf' on it isn't safe in general because it can contain bind mounts
-# to /nix/store and other places.  But after rebooting these are all
-# gone, of course.
-rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh
-
 
 # Also get rid of temporary GC roots.
 rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots

From dd49094a25057211d77a3dc4d075a749db748139 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 16:56:20 +0200
Subject: [PATCH 0276/2033] Put /nix/var/nix/{temproots,userpool} on a tmpfs

---
 nixos/modules/services/misc/nix-daemon.nix | 9 ++++++---
 nixos/modules/system/boot/stage-2-init.sh  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4bfd6268234..171fd08f1e1 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -336,13 +336,13 @@ in
         # Nix initialisation.
         mkdir -m 0755 -p \
           /nix/var/nix/gcroots \
-          /nix/var/nix/temproots \
           /nix/var/nix/manifests \
-          /nix/var/nix/userpool \
           /nix/var/nix/profiles \
           /nix/var/nix/db \
           /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache
+          /nix/var/nix/channel-cache \
+          /run/nix/temproots \
+          /run/nix/userpool
         mkdir -m 1777 -p \
           /nix/var/nix/gcroots/per-user \
           /nix/var/nix/profiles/per-user \
@@ -350,6 +350,9 @@ in
 
         ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
         ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+
+        [ -d /nix/var/nix/temproots ] || ln -sfn /run/nix/temproots /nix/var/nix/temproots
+        [ -d /nix/var/nix/userpool ] || ln -sfn /run/nix/userpool /nix/var/nix/userpool
       '';
 
   };
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index cee9db091c1..5be38725ab7 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -106,7 +106,7 @@ fi
 
 
 # Also get rid of temporary GC roots.
-rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
+rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots /nix/var/nix/userpool
 
 
 # Create a tmpfs on /run to hold runtime state for programs such as

From f9423208c2a2cf039d626515937d2c5f76fcfe05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 17:00:11 +0200
Subject: [PATCH 0277/2033] Containers: Don't warn about not having a boot
 loader

---
 nixos/modules/virtualisation/container-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 46dcdbd7712..35f8a03f192 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -10,6 +10,9 @@ with lib;
 
     networking.useHostResolvConf = true;
 
+    # Shut up warnings about not having a boot loader.
+    system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
+
     # Provide a login prompt on /var/lib/login.socket.  On the host,
     # you can connect to it by running ‘socat
     # unix:<path-to-container>/var/lib/login.socket -,echo=0,raw’.

From 16bba2db2ef9fd42a5f1f3517bdd33c217fe3c26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 17:11:59 +0200
Subject: [PATCH 0278/2033] Use "machinectl poweroff" to shut down containers

---
 nixos/modules/virtualisation/containers.nix | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 065c4dc50d2..4ce113f10ee 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -233,20 +233,7 @@ in
 
         preStop =
           ''
-            pid="$(cat /sys/fs/cgroup/systemd/machine/$INSTANCE.nspawn/system/tasks 2> /dev/null)"
-            if [ -n "$pid" ]; then
-              # Send the RTMIN+3 signal, which causes the container
-              # systemd to start halt.target.
-              echo "killing container systemd, PID = $pid"
-              kill -RTMIN+3 $pid
-              # Wait for the container to exit.  We can't let systemd
-              # do this because it will send a signal to the entire
-              # cgroup.
-              for ((n = 0; n < 180; n++)); do
-                if ! kill -0 $pid 2> /dev/null; then break; fi
-                sleep 1
-              done
-            fi
+            machinectl poweroff "$INSTANCE"
           '';
 
         restartIfChanged = false;

From fec3bc85a686bce8b1c9405b88ff3fbc7dd69344 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 17:32:24 +0200
Subject: [PATCH 0279/2033] postgresql: Use systemd's new "mixed" kill mode

"Mixed" mode sends the initial SIGINT only to the main process, but
sends the SIGKILL after the time-out expires to the entire cgroup.
---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 2960ad91362..ad83cb553e1 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -215,7 +215,7 @@ in
             # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
             KillSignal = "SIGINT";
-            KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL
+            KillMode = "mixed";
 
             # Give Postgres a decent amount of time to clean up after
             # receiving systemd's SIGINT.

From 85fdaed9debd63624729d34cdc9ba4d8aa8cb689 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 17:37:47 +0200
Subject: [PATCH 0280/2033] ssh-agent: Tweaks

---
 nixos/modules/programs/ssh.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 005c77d255c..fdb9dfd4b8c 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -91,9 +91,12 @@ in
         description = "SSH Agent";
         wantedBy = [ "default.target" ];
         serviceConfig =
-          { ExecStart = "${pkgs.openssh}/bin/ssh-agent -a %t/ssh-agent";
+          { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
+            ExecStart = "${pkgs.openssh}/bin/ssh-agent -a %t/ssh-agent";
+            StandardOutput = "null";
             Type = "forking";
             Restart = "on-failure";
+            SuccessExitStatus = "0 2";
           };
       };
 

From 1e540af43bce0e23d72b338f5c8359e73ae49f38 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 17:38:06 +0200
Subject: [PATCH 0281/2033] Fix broken upstream user unit symlinks

---
 nixos/modules/system/boot/systemd.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 20748f9c3eb..f5d73ba665e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -379,7 +379,12 @@ let
         fn=${systemd}/example/systemd/${type}/$i
         if ! [ -e $fn ]; then echo "missing $fn"; false; fi
         if [ -L $fn ]; then
-          cp -pd $fn $out/
+          target="$(readlink "$fn")"
+          if [ ''${target:0:3} = ../ ]; then
+            ln -s "$(readlink -f "$fn")" $out/
+          else
+            cp -pd $fn $out/
+          fi
         else
           ln -s $fn $out/
         fi

From e70602e12b8eedb871615776c53980b2c8b89583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Fri, 18 Apr 2014 18:08:49 +0200
Subject: [PATCH 0282/2033] #492 python-virtualenv: make modules of the python
 wrapper available

Note: simply calling `virtualenv .` will not produce a ./bin/python
which can import e.g. sqlite3, using `virtualenv --python=python2.7`
will, if python2.7 is python27Full (the wrapped python). I'm not sure
if this is a bug or a feature.
---
 .../virtualenv-change-prefix.patch            | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv-change-prefix.patch
index d3e588bd1cd..958187f982f 100644
--- a/pkgs/development/python-modules/virtualenv-change-prefix.patch
+++ b/pkgs/development/python-modules/virtualenv-change-prefix.patch
@@ -1,8 +1,23 @@
-Without this patch `virtualenv --python=python2.7 .` fails with an error because it notices that the python readline.so is not in the same path as python2.7. I assume this is to avoid copying the wrong file on systems where it is possible to find incompatible libraries by accident. Adding "/nix/store" to the prefix fixes this problem. Unfortunately readline is still not available if you just run `virtualenv .`.
+Without this patch `virtualenv --python=python2.7 .` fails with an
+error because it notices that the python readline.so is not in the
+same path as python2.7. I assume this is to avoid copying the wrong
+file on systems where it is possible to find incompatible libraries by
+accident. Adding "/nix/store" to the prefix fixes this problem.
 
---- virtualenv-1.8.4/virtualenv.py        2013-01-16 23:43:37.583615220 +0100
-+++ virtualenv-1.8.4/virtualenv.py        2013-01-16 23:44:47.885973431 +0100
-@@ -1135,17 +1135,7 @@
+A sitecustomize.py is created in the virtualenv which makes libraries
+from the python specified by the --python argument available to the
+virtualenv. For example, this makes readline and sqlite3 available
+when a wrapped python is specified. If no --python argument is passed,
+it will only add the path to the python used when building
+`virtualenv`, which is the unwrapped python, so sqlite3 won't be
+available.
+
+
+diff --git a/virtualenv.py b/virtualenv.py
+index d3e76a7..cb307fa 100755
+--- a/virtualenv.py
++++ b/virtualenv.py
+@@ -1051,17 +1051,7 @@ def path_locations(home_dir):
  
  
  def change_prefix(filename, dst_prefix):
@@ -21,7 +36,7 @@ Without this patch `virtualenv --python=python2.7 .` fails with an error because
  
      if hasattr(sys, 'real_prefix'):
          prefixes.append(sys.real_prefix)
-@@ -1162,6 +1152,8 @@
+@@ -1078,6 +1068,8 @@ def change_prefix(filename, dst_prefix):
              if src_prefix != os.sep: # sys.prefix == "/"
                  assert relpath[0] == os.sep
                  relpath = relpath[1:]
@@ -30,3 +45,15 @@ Without this patch `virtualenv --python=python2.7 .` fails with an error because
              return join(dst_prefix, relpath)
      assert False, "Filename %s does not start with any of these prefixes: %s" % \
          (filename, prefixes)
+@@ -1190,6 +1182,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
+     site_filename_dst = change_prefix(site_filename, home_dir)
+     site_dir = os.path.dirname(site_filename_dst)
+     writefile(site_filename_dst, SITE_PY)
++    wrapper_path = join(prefix, "lib", py_version, "site-packages")
++    writefile(
++        join(site_dir, 'sitecustomize.py',),
++        "import sys; sys.path.append('%s')" % wrapper_path
++    )
+     writefile(join(site_dir, 'orig-prefix.txt'), prefix)
+     site_packages_filename = join(site_dir, 'no-global-site-packages.txt')
+     if not site_packages:

From 48d90cf3b67d01dd7812ed62dfb916905e34e13a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 18:37:07 +0200
Subject: [PATCH 0283/2033] Revert "Put /nix/var/nix/{temproots,userpool} on a
 tmpfs"

This reverts commit dd49094a25057211d77a3dc4d075a749db748139. Nix
barfs if /nix/var/nix/temproots is a symlink :-(
---
 nixos/modules/services/misc/nix-daemon.nix | 9 +++------
 nixos/modules/system/boot/stage-2-init.sh  | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 171fd08f1e1..4bfd6268234 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -336,13 +336,13 @@ in
         # Nix initialisation.
         mkdir -m 0755 -p \
           /nix/var/nix/gcroots \
+          /nix/var/nix/temproots \
           /nix/var/nix/manifests \
+          /nix/var/nix/userpool \
           /nix/var/nix/profiles \
           /nix/var/nix/db \
           /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache \
-          /run/nix/temproots \
-          /run/nix/userpool
+          /nix/var/nix/channel-cache
         mkdir -m 1777 -p \
           /nix/var/nix/gcroots/per-user \
           /nix/var/nix/profiles/per-user \
@@ -350,9 +350,6 @@ in
 
         ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
         ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
-
-        [ -d /nix/var/nix/temproots ] || ln -sfn /run/nix/temproots /nix/var/nix/temproots
-        [ -d /nix/var/nix/userpool ] || ln -sfn /run/nix/userpool /nix/var/nix/userpool
       '';
 
   };
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 5be38725ab7..cee9db091c1 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -106,7 +106,7 @@ fi
 
 
 # Also get rid of temporary GC roots.
-rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots /nix/var/nix/userpool
+rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 
 
 # Create a tmpfs on /run to hold runtime state for programs such as

From 02b936189cb9cc5c2e33eae686bd95ccb2995196 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 18:45:20 +0200
Subject: [PATCH 0284/2033] Improve gpm service

---
 nixos/modules/services/ttys/gpm.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index 12fe4e2f84f..eda06249428 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
@@ -40,12 +40,15 @@ in
 
   config = mkIf cfg.enable {
 
-    jobs.gpm =
-      { description = "General purpose mouse";
+    systemd.services.gpm =
+      { description = "Console Mouse Daemon";
 
-        startOn = "started udev";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "systemd-udev-settle.service" ];
 
-        exec = "${pkgs.gpm}/sbin/gpm -m /dev/input/mice -t ${cfg.protocol} -D &>/dev/null";
+        serviceConfig.ExecStart = "@${pkgs.gpm}/sbin/gpm gpm -m /dev/input/mice -t ${cfg.protocol}";
+        serviceConfig.Type = "forking";
+        serviceConfig.PIDFile = "/run/gpm.pid";
       };
 
   };

From 313c38d5f1aeda1b065ba9b15380918ebd771c99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 18:45:46 +0200
Subject: [PATCH 0285/2033] switch-to-configuration: Handle systemctl output
 change

---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 13bd0b60f82..f8c1ab12ebf 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -65,12 +65,12 @@ $SIG{PIPE} = "IGNORE";
 sub getActiveUnits {
     # FIXME: use D-Bus or whatever to query this, since parsing the
     # output of list-units is likely to break.
-    my $lines = `@systemd@/bin/systemctl list-units --full`;
+    my $lines = `LANG= @systemd@/bin/systemctl list-units --full`;
     my $res = {};
     foreach my $line (split '\n', $lines) {
         chomp $line;
         last if $line eq "";
-        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
+        $line =~ /^\*?\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
         next if $1 eq "UNIT";
         $res->{$1} = { load => $2, state => $3, substate => $4 };
     }

From 465d6ff5722cf1c9b7e58793ed50c5bc750c5098 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 19:03:50 +0200
Subject: [PATCH 0286/2033] Set $LOCALE_ARCHIVE in all systemd units

This variable used to be inherited implicitly from the stage-2 script,
but systemd now clears the environment. So we need to set it
explicitly.
---
 nixos/modules/config/i18n.nix                  | 7 ++++++-
 nixos/modules/programs/environment.nix         | 3 +--
 nixos/modules/services/networking/ssh/sshd.nix | 1 -
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index dd5e0ae2550..8182b8ae808 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -76,7 +76,12 @@ in
 
     environment.systemPackages = [ glibcLocales ];
 
-    environment.variables.LANG = config.i18n.defaultLocale;
+    environment.variables =
+      { LANG = config.i18n.defaultLocale;
+        LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
+      };
+
+    systemd.globalEnvironment.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
 
     # ‘/etc/locale.conf’ is used by systemd.
     environment.etc = singleton
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 831c04f1ad8..aa9aec07834 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -17,8 +17,7 @@ in
   config = {
 
     environment.variables =
-      { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
-        LOCATE_PATH = "/var/cache/locatedb";
+      { LOCATE_PATH = "/var/cache/locatedb";
         NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
         NIX_PATH =
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 5bc140ca242..b66ccb87120 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -258,7 +258,6 @@ in
         path = [ pkgs.openssh pkgs.gawk ];
 
         environment.LD_LIBRARY_PATH = nssModulesPath;
-        environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
 
         preStart =
           ''

From 232a9caa9680db0d084504a43c334e2e583a8cd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 19:34:45 +0200
Subject: [PATCH 0287/2033] Fix predictable network interface naming

In current systemd, this has been moved to systemd-network, which
we're not using yet. So revive the old udev rules from systemd 203.
---
 .../services/hardware/80-net-name-slot.rules        | 13 +++++++++++++
 nixos/modules/services/hardware/udev.nix            |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/hardware/80-net-name-slot.rules

diff --git a/nixos/modules/services/hardware/80-net-name-slot.rules b/nixos/modules/services/hardware/80-net-name-slot.rules
new file mode 100644
index 00000000000..18547f170a3
--- /dev/null
+++ b/nixos/modules/services/hardware/80-net-name-slot.rules
@@ -0,0 +1,13 @@
+# Copied from systemd 203.
+ACTION=="remove", GOTO="net_name_slot_end"
+SUBSYSTEM!="net", GOTO="net_name_slot_end"
+NAME!="", GOTO="net_name_slot_end"
+
+IMPORT{cmdline}="net.ifnames"
+ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
+
+NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
+NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
+NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
+
+LABEL="net_name_slot_end"
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 169a2e88414..507752dabcf 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -83,8 +83,8 @@ let
         grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
       done
 
-      ${optionalString (!config.networking.usePredictableInterfaceNames) ''
-        ln -s /dev/null $out/80-net-name-slot.rules
+      ${optionalString config.networking.usePredictableInterfaceNames ''
+        cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules
       ''}
 
       # If auto-configuration is disabled, then remove

From febb15f72219e334e07adc094fbeefadf0e2deb9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 19:37:15 +0200
Subject: [PATCH 0288/2033] systemd: Enable keeping backlight / rfkill state
 across reboots

---
 nixos/modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f5d73ba665e..ffa6d76481d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -109,6 +109,8 @@ let
 
       # Maintaining state across reboots.
       "systemd-random-seed.service"
+      "systemd-backlight@.service"
+      "systemd-rfkill@.service"
 
       # Hibernate / suspend.
       "hibernate.target"

From e9a1b1e18c3fb48e5f61a658cdf8715bde79bfd1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 18 Apr 2014 20:05:39 +0200
Subject: [PATCH 0289/2033] Add allowUnfree parameter to allow Java builds to
 work

---
 .../mobile/titaniumenv/examples/default.nix         | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index b81fcd41bcb..556b96975b4 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -4,15 +4,16 @@
 , tiVersion ? "3.2.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? ""
+, allowUnfree ? false
 }:
 
 let
-  pkgs = import nixpkgs {};
+  pkgs = import nixpkgs { config.allowUnfree = allowUnfree; };
 in
 rec {
   kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -23,7 +24,7 @@ rec {
   
   kitchensink_android_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -35,7 +36,7 @@ rec {
   
   emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -44,7 +45,7 @@ rec {
   
   emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -78,7 +79,7 @@ rec {
   };
 } else {}) // (if rename then
   let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; };
+    pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; };
   in
   {
     kitchensink_ipa = import ./kitchensink {

From 01216884242c0322efa20fd727ad1b55e8489dff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 20:23:27 +0200
Subject: [PATCH 0290/2033] gpm: Better start condition

---
 nixos/modules/services/ttys/gpm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index eda06249428..03b0f39824d 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
@@ -44,7 +44,7 @@ in
       { description = "Console Mouse Daemon";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "systemd-udev-settle.service" ];
+        requires = [ "getty.target" ];
 
         serviceConfig.ExecStart = "@${pkgs.gpm}/sbin/gpm gpm -m /dev/input/mice -t ${cfg.protocol}";
         serviceConfig.Type = "forking";

From 5ee5aa1b909595133280580c9b2f0c32189e8894 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 20:47:31 +0200
Subject: [PATCH 0291/2033] Make "nixos-container login" an alias of
 "machinectl login"

---
 .../virtualisation/container-config.nix       | 31 ++-----------------
 .../modules/virtualisation/nixos-container.pl |  2 +-
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 35f8a03f192..76e4b561218 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -13,34 +13,9 @@ with lib;
     # Shut up warnings about not having a boot loader.
     system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
 
-    # Provide a login prompt on /var/lib/login.socket.  On the host,
-    # you can connect to it by running ‘socat
-    # unix:<path-to-container>/var/lib/login.socket -,echo=0,raw’.
-    systemd.sockets.login =
-      { description = "Login Socket";
-        wantedBy = [ "sockets.target" ];
-        socketConfig =
-          { ListenStream = "/var/lib/login.socket";
-            SocketMode = "0666";
-            Accept = true;
-          };
-      };
-
-    systemd.services."login@" =
-      { description = "Login %i";
-        environment.TERM = "linux";
-        serviceConfig =
-          { Type = "simple";
-            StandardInput = "socket";
-            ExecStart = "${pkgs.socat}/bin/socat -t0 - exec:${pkgs.shadow}/bin/login,pty,setsid,setpgid,stderr,ctty";
-            TimeoutStopSec = 1; # FIXME
-          };
-        restartIfChanged = false;
-      };
-
-    # Also provide a root login prompt on /var/lib/root-login.socket
-    # that doesn't ask for a password. This socket can only be used by
-    # root on the host.
+    # Provide a root login prompt on /var/lib/root-login.socket that
+    # doesn't ask for a password. This socket can only be used by root
+    # on the host.
     systemd.sockets.root-login =
       { description = "Root Login Socket";
         wantedBy = [ "sockets.target" ];
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index f04b2b3e74e..2fd41a34096 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -203,7 +203,7 @@ elsif ($action eq "update") {
 }
 
 elsif ($action eq "login") {
-    exec($socat, "unix:$root/var/lib/login.socket", "-,echo=0,raw");
+    exec("machinectl", "login", "--", $containerName);
 }
 
 elsif ($action eq "root-login") {

From bf841cd892c099ac674184ee31c7352cb62dad0a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 18 Apr 2014 21:42:22 +0200
Subject: [PATCH 0292/2033] Revert "systemd: oneshot units should be allowed to
 restart on failure/abort"

This reverts commit c1e638abb67d51320907c1245992bea4a8694c83.

As pointed out by wkennington, upstream disallows all cases as of v207
---
 nixos/modules/system/boot/systemd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index ffa6d76481d..6c6adab66e7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -688,8 +688,7 @@ in
   config = {
 
     assertions = mapAttrsToList (name: service: {
-      assertion = service.serviceConfig.Type or "" == "oneshot" ->
-                    builtins.elem (service.serviceConfig.Restart or "no") ["no" "on-failure" "on-abort"];
+      assertion = service.serviceConfig.Type or "" == "oneshot" -> service.serviceConfig.Restart or "no" == "no";
       message = "${name}: Type=oneshot services must have Restart=no";
     }) cfg.services;
 

From 5da309fcaa2340943ad17a1bda56d37eaee78a8d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 21:06:34 +0200
Subject: [PATCH 0293/2033] linux: Enable SND_DYNAMIC_MINORS

This is necessary if you get:

  kernel: Too many HDMI devices
  kernel: Consider building the kernel with CONFIG_SND_DYNAMIC_MINORS=y
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5aed09105cc..7fe6f486a60 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -114,6 +114,7 @@ with stdenv.lib;
   VGA_SWITCHEROO y
 
   # Sound.
+  SND_DYNAMIC_MINORS y
   SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
   SND_HDA_INPUT_BEEP y # Support digital beep via input layer
   SND_USB_CAIAQ_INPUT y

From 1d6ac39d21a5e666ecf43663a8fd4c4c7a3aeaee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 21:39:11 +0200
Subject: [PATCH 0294/2033] Fix indentation

---
 pkgs/stdenv/generic/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 4ee9251f4bb..b0031178bbd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -58,16 +58,14 @@ let
           pos' = if pos != null then "‘" + pos.file + ":" + toString pos.line + "’" else "«unknown-file»";
         in
         if !allowUnfree && (let l = lib.lists.toList attrs.meta.license or []; in lib.lists.elem "unfree" l || lib.lists.elem "unfree-redistributable" l) then
-          throw ''package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate.
-                 You can set
-                    { nixpkgs.config.allowUnfree = true; }
-                 in configuration.nix to override this.
-                 If you use Nix standalone, you can add
-                    { config.allowUnfree = true; }
-                 to ~/.nixpkgs/config.nix or pass
-                    --arg config '{ allowUnfree = true; }'
-                 on the command line.
-                ''
+          throw ''
+            Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set
+              { nixpkgs.config.allowUnfree = true; }
+            in configuration.nix to override this. If you use Nix standalone, you can add
+              { config.allowUnfree = true; }
+            to ~/.nixpkgs/config.nix or pass
+              --arg config '{ allowUnfree = true; }'
+            on the command line.''
         else if !allowBroken && attrs.meta.broken or false then
           throw "you can't use package ‘${attrs.name}’ in ${pos'} because it has been marked as broken"
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then

From 1c21456a67a77acba699b7b4d83ac3f4c8418d7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 21:39:31 +0200
Subject: [PATCH 0295/2033] xorg-server: Update to 1.14.6

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0ec14c8d62c..c341cd69150 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1960,11 +1960,11 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.5";
+    name = "xorg-server-1.14.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2;
-      sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd";
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
+      sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index a3faf256926..74aa31ea935 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 660d38e838855850528ba74d8a38be8a8dedc15c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 18 Apr 2014 21:41:28 +0200
Subject: [PATCH 0296/2033] nvidia-x11: Update to 331.67

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 74863496a0f..2eb5c7e480a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "331.49";
+  versionNumber = "331.67";
 
 in
 
@@ -27,12 +27,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "00d7bq8cfxk52qd4y226fz8m9m3mjq45fbgr3q7k08jyy9qmswmn";
+        sha256 = "1imc66yxnm01i58xwqrwqc612h0rhdz8x170hqr2pjyk99bllsv9";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0q3lvl1lypi33i847nqz4k3161ackh2n9kgyjn6v2c480f405hfk";
+        sha256 = "0qxd4jd25ymcr6w97f71kfn549x6wgg4g3vixd3sqlczknn85f47";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From 8b666e44fdb11e232d08f71a5caf21ed817ab48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 18 Apr 2014 22:48:12 +0200
Subject: [PATCH 0297/2033] Unbreak tarball job

Fix undefined variable in pamixer.
---
 pkgs/applications/audio/pamixer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index 4337164fe3a..acdda1799d0 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/cdemoulins/pamixer;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ _1126 ];
+    maintainers = [ maintainers._1126 ];
   };
-}
\ No newline at end of file
+}

From e2dba7c6cffd5c48a2f2e17d33b0560bad172d32 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 12:29:59 +0100
Subject: [PATCH 0298/2033] chromium: Use version 3 of libgnome_keyring.

Starting with version 35, version 2 of libgnome_keyring is no longer
supported and it's probably pretty useless to do backports to version 2,
given the assumption that most users on Nix probably don't use it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 213e75ee6ef..7ae83186567 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -24,7 +24,7 @@
 , enableNaCl ? false
 , useOpenSSL ? false, nss ? null, openssl ? null
 , gnomeSupport ? false, gconf ? null
-, gnomeKeyringSupport ? false, libgnome_keyring ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
 , proprietaryCodecs ? true
 , cupsSupport ? false
 , pulseSupport ? false, pulseaudio ? null
@@ -171,7 +171,7 @@ in stdenv.mkDerivation rec {
     libXScrnSaver libXcursor libXtst mesa
     pciutils protobuf speechd libXdamage
     pythonPackages.gyp
-  ] ++ optional gnomeKeyringSupport libgnome_keyring
+  ] ++ optional gnomeKeyringSupport libgnome_keyring3
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt

From 9f45c2cbbab6ac763860c1b5d58c36a2208685a5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 21:53:29 +0100
Subject: [PATCH 0299/2033] chromium: Prepare for building the -lite package.

We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7ae83186567..5c0d44f05a3 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, ninja, which
 
 # default dependencies
-, bzip2, flac, speex
-, libevent, expat, libjpeg
+, bzip2, flac, speex, icu, libopus
+, libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt
 , xdg_utils, yasm, zlib
 , libusb1, libexif, pciutils
@@ -117,8 +117,9 @@ let
     use_system_libexif = true;
     use_system_libjpeg = true;
     use_system_libpng = false; # PNG dlopen() version conflict
-    use_system_libusb = true;
     use_system_libxml = true;
+    use_system_opus = true;
+    use_system_snappy = true;
     use_system_speex = true;
     use_system_ssl = useOpenSSL;
     use_system_stlport = true;
@@ -128,7 +129,8 @@ let
     use_system_protobuf = true;
 
     use_system_harfbuzz = false;
-    use_system_icu = false;
+    use_system_icu = false; # Doesn't support ICU 52 yet.
+    use_system_libusb = false; # http://crbug.com/266149
     use_system_libwebp = false; # http://crbug.com/133161
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
@@ -136,8 +138,8 @@ let
   };
 
   defaultDependencies = [
-    bzip2 flac speex
-    libevent expat libjpeg
+    bzip2 flac speex icu libopus
+    libevent expat libjpeg snappy
     libpng libxml2 libxslt
     xdg_utils yasm zlib
     libusb1 libexif
@@ -230,6 +232,7 @@ in stdenv.mkDerivation rec {
   });
 
   configurePhase = ''
+    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
     python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
   '';
 

From 8ddc86d6e486e577afb746c55cbec181f372f6b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:03:06 +0100
Subject: [PATCH 0300/2033] v8: Refactor package and update to version 3.25.9.

This now uses fetchurl instead of fetchsvn and now invokes gyp directly
instead of copying over the gyp command to the source tree.

Also, we're now using stdenv.is64bit to properly determine the host
architecture.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/v8/default.nix | 101 +++++++++++-----------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 0564e688795..db8e491caae 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -1,65 +1,66 @@
-{ stdenv, fetchsvn, gyp, readline, python, which }:
+{ stdenv, fetchurl, gyp, readline, python, which, icu }:
 
 assert readline != null;
 
 let
-  system = stdenv.system;
-  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
-  version = "3.14.5.9";
+  arch = if stdenv.is64bit then "x64" else "ia32";
 in
 
-assert arch != "";
+stdenv.mkDerivation rec {
+  name = "v8-${version}";
+  version = "3.25.9";
 
-stdenv.mkDerivation {
-    name = "v8-${version}";
+  src = fetchurl {
+    url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
+        + "${name}.tar.bz2";
+    sha256 = "0x6czv99dr701vljyb4ghyhhc5rmv7vfkpvigcnrqz2an9q1pc28";
+  };
 
-    src = fetchsvn {
-      url = "http://v8.googlecode.com/svn/tags/${version}";
-      sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr";
-      name = "v8-${version}-src";
-    };
+  configurePhase = ''
+    PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
+      ${gyp}/bin/gyp \
+        -f make \
+        --generator-output="out" \
+        -Dflock_index=0 \
+        -Dv8_enable_i18n_support=1 \
+        -Duse_system_icu=1 \
+        -Dconsole=readline \
+        -Dcomponent=shared_library \
+        -Dv8_target_arch=${arch} \
+        --depth=. -Ibuild/standalone.gypi \
+        build/all.gyp
+  '';
 
-    patches = [ ./fix-GetLocalizedMessage-usage.patch ];
+  nativeBuildInputs = [ which ];
+  buildInputs = [ readline python icu ];
 
-    configurePhase = ''
-      mkdir build/gyp
-      ln -sv ${gyp}/bin/gyp build/gyp/gyp
-    '';
+  buildFlags = [
+    "LINK=g++"
+    "-C out"
+    "builddir=$(CURDIR)/Release"
+    "BUILDTYPE=Release"
+  ];
 
-    nativeBuildInputs = [ which ];
-    buildInputs = [ readline python ];
+  enableParallelBuilding = true;
 
-    buildFlags = [
-      "library=shared"
-      "console=readline"
-      "${arch}.release"
-    ];
+  installPhase = ''
+    install -vD out/Release/d8 "$out/bin/d8"
+    ${if stdenv.system == "x86_64-darwin" then ''
+    install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib"
+    '' else ''
+    install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"
+    ''}
+    cp -vr include "$out/"
+  '';
 
-    # http://code.google.com/p/v8/issues/detail?id=2149
-    NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs -Wno-aggressive-loop-optimizations";
+  postFixup = if stdenv.isDarwin then ''
+    install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
+    install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+  '' else null;
 
-    enableParallelBuilding = true;
-
-    installPhase = ''
-      mkdir -p $out/bin
-      mkdir -p $out/lib
-      mv -v out/${arch}.release/d8 $out/bin
-
-      ${if stdenv.system == "x86_64-darwin" then
-        "mv -v out/${arch}.release/libv8.dylib $out/lib"
-      else
-        "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"}
-      mv -v include $out/
-    '';
-
-    postFixup = if stdenv.isDarwin then ''
-      install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
-      install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-    '' else null;
-
-    meta = with stdenv.lib; {
-      description = "V8 is Google's open source JavaScript engine";
-      platforms = platforms.linux ++ platforms.darwin;
-      license = licenses.bsd3;
-    };
+  meta = with stdenv.lib; {
+    description = "V8 is Google's open source JavaScript engine";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.bsd3;
+  };
 }

From 2f23f57b28fc7cb41bec51250e4566e969e3aa2c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:15:46 +0100
Subject: [PATCH 0301/2033] chromium: Build beta/dev with v8 from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5c0d44f05a3..292b99f92eb 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt
+, libpng, libxml2, libxslt, v8
 , xdg_utils, yasm, zlib
 , libusb1, libexif, pciutils
 
@@ -134,13 +134,13 @@ let
     use_system_libwebp = false; # http://crbug.com/133161
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = false;
+    use_system_v8 = !versionOlder src.version "34.0.0.0";
   };
 
   defaultDependencies = [
     bzip2 flac speex icu libopus
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt
+    libpng libxml2 libxslt v8
     xdg_utils yasm zlib
     libusb1 libexif
   ];

From a01f279d2e1b7cffd1cee29ae555d5ddedfa9b73 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:17:16 +0100
Subject: [PATCH 0302/2033] libwebp: Update to new upstream version 0.4.0.

Now the version should be recent enough to be built against Chromium,
see: https://code.google.com/p/webp/issues/detail?id=122#c6

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libwebp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 854af5942f9..95b9e6bc95c 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libpng, libjpeg}:
 
 stdenv.mkDerivation rec {
-  name = "libwebp-0.1.3";
-  
+  name = "libwebp-0.4.0";
+
   src = fetchurl {
     url = "http://webp.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1fkssvg99s9ypswh4ywkirgcy1wmy3b6388f3cqj4a4vwdb89ca0";
+    sha256 = "0sadjkx8m6sf064r5gngjvz4b5246q3j27dlaml5b1k3x5vkb49i";
   };
 
   buildInputs = [ libpng libjpeg ];

From 7f47785d67b028a02b76aa3aec79b13366bd003d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:25:39 +0100
Subject: [PATCH 0303/2033] libwebp: Build with support for GIF and TIFF.

Not sure whether those are really needed for Chromium, but I suppose it
doesn't hurt to have support for conversion.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libwebp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 95b9e6bc95c..aeac9239c8b 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libpng, libjpeg}:
+{ stdenv, fetchurl, libpng, libjpeg, giflib, libtiff }:
 
 stdenv.mkDerivation rec {
   name = "libwebp-0.4.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0sadjkx8m6sf064r5gngjvz4b5246q3j27dlaml5b1k3x5vkb49i";
   };
 
-  buildInputs = [ libpng libjpeg ];
+  buildInputs = [ libpng libjpeg giflib libtiff ];
 
   meta = {
     homepage = http://code.google.com/p/webp/;

From 823b72d0ad26d1bad0c6d5107a2dd8fc0c131995 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:27:46 +0100
Subject: [PATCH 0304/2033] chromium: Build with libwebp from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 292b99f92eb..8ef102c34cc 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -4,7 +4,7 @@
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt, v8
-, xdg_utils, yasm, zlib
+, xdg_utils, yasm, zlib, libwebp
 , libusb1, libexif, pciutils
 
 , python, pythonPackages, perl, pkgconfig
@@ -117,6 +117,7 @@ let
     use_system_libexif = true;
     use_system_libjpeg = true;
     use_system_libpng = false; # PNG dlopen() version conflict
+    use_system_libwebp = true;
     use_system_libxml = true;
     use_system_opus = true;
     use_system_snappy = true;
@@ -131,7 +132,6 @@ let
     use_system_harfbuzz = false;
     use_system_icu = false; # Doesn't support ICU 52 yet.
     use_system_libusb = false; # http://crbug.com/266149
-    use_system_libwebp = false; # http://crbug.com/133161
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
     use_system_v8 = !versionOlder src.version "34.0.0.0";
@@ -141,7 +141,7 @@ let
     bzip2 flac speex icu libopus
     libevent expat libjpeg snappy
     libpng libxml2 libxslt v8
-    xdg_utils yasm zlib
+    xdg_utils yasm zlib libwebp
     libusb1 libexif
   ];
 

From 5b67290740fbb0d8b9a5bcc0d9a9108b844add5d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:30:51 +0100
Subject: [PATCH 0305/2033] chromium: Build using libpng from nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8ef102c34cc..66fbe9779b9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -116,7 +116,7 @@ let
     use_system_libexpat = true;
     use_system_libexif = true;
     use_system_libjpeg = true;
-    use_system_libpng = false; # PNG dlopen() version conflict
+    use_system_libpng = true;
     use_system_libwebp = true;
     use_system_libxml = true;
     use_system_opus = true;

From 33acfbe9176cd0b88d3cb821a749de757e19ce58 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 18 Mar 2014 02:21:10 +0100
Subject: [PATCH 0306/2033] minizip: New package based on zlib derivation.

This is needed by Chromium and is part of the zlib source tree in
contrib/, so let's propagate the version of zlib and use the same source
tree.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/minizip/default.nix | 14 ++++++++++++++
 pkgs/development/libraries/zlib/default.nix    |  2 ++
 pkgs/top-level/all-packages.nix                |  2 ++
 3 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/minizip/default.nix

diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix
new file mode 100644
index 00000000000..b71920446e4
--- /dev/null
+++ b/pkgs/development/libraries/minizip/default.nix
@@ -0,0 +1,14 @@
+{ stdenv, zlib, autoconf, automake, libtool }:
+
+stdenv.mkDerivation {
+  name = "minizip-${zlib.version}";
+  inherit (zlib) src;
+
+  nativeBuildInputs = [ autoconf automake libtool ];
+  buildInputs = [ zlib ];
+
+  preConfigure = ''
+    cd contrib/minizip
+    autoreconf -vfi
+  '';
+}
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 0d4abaf25e0..f1eea80ab7a 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -40,4 +40,6 @@ stdenv.mkDerivation rec {
 
   # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
   cygwinConfigureEnableShared = true;
+
+  passthru.version = version;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae947c552b7..fda6cdaa261 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5398,6 +5398,8 @@ let
 
   ming = callPackage ../development/libraries/ming { };
 
+  minizip = callPackage ../development/libraries/minizip { };
+
   minmay = callPackage ../development/libraries/minmay { };
 
   miro = callPackage ../applications/video/miro {

From c9c9ca38b94389851bc86b381038d919ffee1d2f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 17 Mar 2014 22:31:15 +0100
Subject: [PATCH 0307/2033] chromium: Build using minizip from nixpkgs.

Well, the gyp flag mentions "zlib" but in reality, minizip is used.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 66fbe9779b9..dcd2f78a4f5 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -4,7 +4,7 @@
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
 , libpng, libxml2, libxslt, v8
-, xdg_utils, yasm, zlib, libwebp
+, xdg_utils, yasm, minizip, libwebp
 , libusb1, libexif, pciutils
 
 , python, pythonPackages, perl, pkgconfig
@@ -126,7 +126,7 @@ let
     use_system_stlport = true;
     use_system_xdg_utils = true;
     use_system_yasm = true;
-    use_system_zlib = false; # http://crbug.com/143623
+    use_system_zlib = true;
     use_system_protobuf = true;
 
     use_system_harfbuzz = false;
@@ -141,7 +141,7 @@ let
     bzip2 flac speex icu libopus
     libevent expat libjpeg snappy
     libpng libxml2 libxslt v8
-    xdg_utils yasm zlib libwebp
+    xdg_utils yasm minizip libwebp
     libusb1 libexif
   ];
 

From 5e95ae5e88fd0faddf9ceb85e856f8a220150fe1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 18 Mar 2014 03:38:06 +0100
Subject: [PATCH 0308/2033] libwebp: Enable (de)mux and decoder.

This is required to build Chromium. Making it a non-optional dependency
as it shouldn't really hurt other packages using it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libwebp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index aeac9239c8b..6800541d923 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng libjpeg giflib libtiff ];
 
+  configureFlags = [
+    "--enable-libwebpmux"
+    "--enable-libwebpdemux"
+    "--enable-libwebpdecoder"
+  ];
+
   meta = {
     homepage = http://code.google.com/p/webp/;
     description = "Tools and library for the WebP image format";

From c2abe4da6c0e19358d46e6fdd4d5ff5bfddfff82 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Mar 2014 11:32:39 +0100
Subject: [PATCH 0309/2033] chromium: Add support for ppapi flash and PDF.

This is hardcoded for the dev channel at the moment and we're going to
fetch it along with the main Chromium sources.

Also I'm putting this in default.nix at the moment, because we're going
to tear apart the whole Chromium package into several subparts soon.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  | 74 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index dcd2f78a4f5..b7082567015 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -26,6 +26,8 @@
 , gnomeSupport ? false, gconf ? null
 , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
 , proprietaryCodecs ? true
+, enablePepperFlash ? false
+, enablePepperPDF ? false
 , cupsSupport ? false
 , pulseSupport ? false, pulseaudio ? null
 }:
@@ -151,6 +153,68 @@ let
     binary = "${packageName}_sandbox";
   };
 
+  binaryPlugins = stdenv.mkDerivation {
+    name = "chromium-binary-plugins";
+
+    # XXX: Only temporary and has to be version-specific
+    src = fetchurl {
+      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
+          + "google-chrome-unstable/google-chrome-unstable_"
+          + "35.0.1897.2-1_amd64.deb";
+      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
+    };
+
+    phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
+    outputs = [ "pdf" "flash" ];
+
+    unpackCmd = ''
+      ensureDir plugins
+      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
+        ./opt/google/chrome-unstable/PepperFlash \
+        ./opt/google/chrome-unstable/libpdf.so
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+    '';
+
+    patchPhase = let
+      rpaths = [ stdenv.gcc.gcc ];
+      mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
+    in ''
+      for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
+        chmod +x "$sofile"
+        patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
+      done
+    '';
+
+    installPhase = let
+      pdfName = "Chrome PDF Viewer";
+      pdfDescription = "Portable Document Format";
+      pdfMimeTypes = concatStringsSep ";" [
+        "application/pdf"
+        "application/x-google-chrome-print-preview-pdf"
+      ];
+      pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
+    in ''
+      install -vD libpdf.so "$pdf/lib/libpdf.so"
+      ensureDir "$pdf/nix-support"
+      echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
+        > "$pdf/nix-support/chromium-flags"
+
+      flashVersion="$(
+        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
+      )"
+
+      install -vD libpepflashplayer.so "$flash/lib/libpepflashplayer.so"
+      ensureDir "$flash/nix-support"
+      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
+           "--ppapi-flash-version=$flashVersion" \
+           > "$flash/nix-support/chromium-flags"
+    '';
+  };
+
   # build paths and release info
   packageName = "chromium";
   buildType = "Release";
@@ -248,7 +312,12 @@ in stdenv.mkDerivation rec {
         chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
   '';
 
-  installPhase = ''
+  installPhase = let
+    enabledPlugins = optional enablePepperFlash binaryPlugins.flash
+                  ++ optional enablePepperPDF   binaryPlugins.pdf;
+    getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
+    pluginArgs = concatStringsSep " " (map getFlags enabledPlugins);
+  in ''
     ensureDir "${libExecPath}"
     cp -v "${buildPath}/"*.pak "${libExecPath}/"
     ${optionalString (!versionOlder src.version "34.0.0.0") ''
@@ -260,7 +329,8 @@ in stdenv.mkDerivation rec {
     cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
 
     mkdir -vp "$out/bin"
-    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}"
+    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" \
+      --add-flags "${pluginArgs}"
 
     mkdir -vp "$out/share/man/man1"
     cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"

From 88a939c2d116236fbfb48d9a27741584b6a6e055 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Mar 2014 12:21:10 +0100
Subject: [PATCH 0310/2033] chromium: Decouple browser from default.nix.

This currently only passes through the arguments and is nothing more
than the foundation of the new structure. In essence, I want to have a
really small default.nix which is then going down into the respective
subparts that are isolated from each other.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 361 ++++++++++++++++++
 .../networking/browsers/chromium/default.nix  | 358 +----------------
 pkgs/top-level/all-packages.nix               |   1 -
 3 files changed, 374 insertions(+), 346 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/browser.nix

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
new file mode 100644
index 00000000000..e98c47d8cdd
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -0,0 +1,361 @@
+{ stdenv, fetchurl, makeWrapper, ninja, which
+
+# default dependencies
+, bzip2, flac, speex, icu, libopus
+, libevent, expat, libjpeg, snappy
+, libpng, libxml2, libxslt, v8
+, xdg_utils, yasm, minizip, libwebp
+, libusb1, libexif, pciutils
+
+, python, pythonPackages, perl, pkgconfig
+, nspr, udev, krb5
+, utillinux, alsaLib
+, gcc, bison, gperf
+, glib, gtk, dbus_glib
+, libXScrnSaver, libXcursor, libXtst, mesa
+, protobuf, speechd, libXdamage
+
+# optional dependencies
+, libgcrypt ? null # gnomeSupport || cupsSupport
+
+# package customization
+, channel ? "stable"
+, enableSELinux ? false, libselinux ? null
+, enableNaCl ? false
+, useOpenSSL ? false, nss ? null, openssl ? null
+, gnomeSupport ? false, gnome ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, proprietaryCodecs ? true
+, enablePepperFlash ? false
+, enablePepperPDF ? false
+, cupsSupport ? false
+, pulseSupport ? false, pulseaudio ? null
+}:
+
+with stdenv.lib;
+
+let
+  src = with getAttr channel (import ./sources.nix); stdenv.mkDerivation {
+    name = "chromium-source-${version}";
+
+    src = fetchurl {
+      inherit url sha256;
+    };
+
+    buildInputs = [ python ]; # cannot patch shebangs otherwise
+
+    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+    opensslPatches = optional useOpenSSL openssl.patches;
+
+    prePatch = "patchShebangs .";
+
+    patches = singleton ./sandbox_userns_31.patch;
+
+    postPatch = ''
+      sed -i -r \
+        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
+        -e 's|/bin/echo|echo|' \
+        -e "/python_arch/s/: *'[^']*'/: '""'/" \
+        build/common.gypi chrome/chrome_tests.gypi
+      sed -i '/not RunGN/,+1d' build/gyp_chromium
+      sed -i -e 's|/usr/bin/gcc|gcc|' \
+        third_party/WebKit/Source/build/scripts/scripts.gypi \
+        third_party/WebKit/Source/build/scripts/preprocessor.pm
+    '' + optionalString useOpenSSL ''
+      cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+    '' + optionalString (!versionOlder version "34.0.0.0") ''
+      sed -i '/import.*depot/d' build/gyp_chromium
+    '';
+
+    outputs = [ "out" "sandbox" "bundled" "main" ];
+    installPhase = ''
+      ensureDir "$out" "$sandbox" "$bundled" "$main"
+
+      header "copying browser main sources to $main"
+      find . -mindepth 1 -maxdepth 1 \
+        \! -path ./sandbox \
+        \! -path ./third_party \
+        \! -path ./build \
+        \! -path ./tools \
+        \! -name '.*' \
+        -print | xargs cp -rt "$main"
+      stopNest
+
+      header "copying sandbox components to $sandbox"
+      cp -rt "$sandbox" sandbox/*
+      stopNest
+
+      header "copying third party sources to $bundled"
+      cp -rt "$bundled" third_party/*
+      stopNest
+
+      header "copying build requisites to $out"
+      cp -rt "$out" build tools
+      stopNest
+
+      rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
+    '';
+
+    passthru = {
+      inherit version;
+    };
+  };
+
+  mkGypFlags =
+    let
+      sanitize = value:
+        if value == true then "1"
+        else if value == false then "0"
+        else "${value}";
+      toFlag = key: value: "-D${key}=${sanitize value}";
+    in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
+
+  gypFlagsUseSystemLibs = {
+    use_system_bzip2 = true;
+    use_system_flac = true;
+    use_system_libevent = true;
+    use_system_libexpat = true;
+    use_system_libexif = true;
+    use_system_libjpeg = true;
+    use_system_libpng = true;
+    use_system_libwebp = true;
+    use_system_libxml = true;
+    use_system_opus = true;
+    use_system_snappy = true;
+    use_system_speex = true;
+    use_system_ssl = useOpenSSL;
+    use_system_stlport = true;
+    use_system_xdg_utils = true;
+    use_system_yasm = true;
+    use_system_zlib = true;
+    use_system_protobuf = true;
+
+    use_system_harfbuzz = false;
+    use_system_icu = false; # Doesn't support ICU 52 yet.
+    use_system_libusb = false; # http://crbug.com/266149
+    use_system_skia = false;
+    use_system_sqlite = false; # http://crbug.com/22208
+    use_system_v8 = !versionOlder src.version "34.0.0.0";
+  };
+
+  defaultDependencies = [
+    bzip2 flac speex icu libopus
+    libevent expat libjpeg snappy
+    libpng libxml2 libxslt v8
+    xdg_utils yasm minizip libwebp
+    libusb1 libexif
+  ];
+
+  sandbox = import ./sandbox.nix {
+    inherit stdenv;
+    src = src.sandbox;
+    binary = "${packageName}_sandbox";
+  };
+
+  binaryPlugins = stdenv.mkDerivation {
+    name = "chromium-binary-plugins";
+
+    # XXX: Only temporary and has to be version-specific
+    src = fetchurl {
+      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
+          + "google-chrome-unstable/google-chrome-unstable_"
+          + "35.0.1897.2-1_amd64.deb";
+      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
+    };
+
+    phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
+    outputs = [ "pdf" "flash" ];
+
+    unpackCmd = ''
+      ensureDir plugins
+      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
+        ./opt/google/chrome-unstable/PepperFlash \
+        ./opt/google/chrome-unstable/libpdf.so
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+    '';
+
+    patchPhase = let
+      rpaths = [ stdenv.gcc.gcc ];
+      mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
+    in ''
+      for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
+        chmod +x "$sofile"
+        patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
+      done
+    '';
+
+    installPhase = let
+      pdfName = "Chrome PDF Viewer";
+      pdfDescription = "Portable Document Format";
+      pdfMimeTypes = concatStringsSep ";" [
+        "application/pdf"
+        "application/x-google-chrome-print-preview-pdf"
+      ];
+      pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
+    in ''
+      install -vD libpdf.so "$pdf/lib/libpdf.so"
+      ensureDir "$pdf/nix-support"
+      echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
+        > "$pdf/nix-support/chromium-flags"
+
+      flashVersion="$(
+        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
+      )"
+
+      install -vD libpepflashplayer.so "$flash/lib/libpepflashplayer.so"
+      ensureDir "$flash/nix-support"
+      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
+           "--ppapi-flash-version=$flashVersion" \
+           > "$flash/nix-support/chromium-flags"
+    '';
+  };
+
+  # build paths and release info
+  packageName = "chromium";
+  buildType = "Release";
+  buildPath = "out/${buildType}";
+  libExecPath = "$out/libexec/${packageName}";
+  sandboxPath = "${sandbox}/bin/${packageName}_sandbox";
+
+in stdenv.mkDerivation rec {
+  name = "${packageName}-${src.version}";
+  inherit packageName src;
+
+  buildInputs = defaultDependencies ++ [
+    which makeWrapper
+    python perl pkgconfig
+    nspr udev
+    (if useOpenSSL then openssl else nss)
+    utillinux alsaLib
+    gcc bison gperf
+    gcc bison gperf krb5
+    glib gtk dbus_glib
+    libXScrnSaver libXcursor libXtst mesa
+    pciutils protobuf speechd libXdamage
+    pythonPackages.gyp
+  ] ++ optional gnomeKeyringSupport libgnome_keyring3
+    ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
+    ++ optional enableSELinux libselinux
+    ++ optional cupsSupport libgcrypt
+    ++ optional pulseSupport pulseaudio;
+
+  prePatch = ''
+    # XXX: Figure out a way how to split these properly.
+    #cpflags="-dsr --no-preserve=mode"
+    cpflags="-dr"
+    cp $cpflags "${src.main}"/* .
+    cp $cpflags "${src.bundled}" third_party
+    cp $cpflags "${src.sandbox}" sandbox
+    chmod -R u+w . # XXX!
+  '';
+
+  postPatch = ''
+    sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
+      sandbox_binary = \
+        base::FilePath("'"${sandboxPath}"'");
+    ' content/browser/browser_main_loop.cc
+  '';
+
+  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+    linux_use_gold_binary = false;
+    linux_use_gold_flags = false;
+    proprietary_codecs = false;
+    use_gnome_keyring = gnomeKeyringSupport;
+    use_gconf = gnomeSupport;
+    use_gio = gnomeSupport;
+    use_pulseaudio = pulseSupport;
+    disable_nacl = !enableNaCl;
+    use_openssl = useOpenSSL;
+    selinux = enableSELinux;
+    use_cups = cupsSupport;
+    linux_sandbox_path="${sandboxPath}";
+    linux_sandbox_chrome_path="${libExecPath}/${packageName}";
+    werror = "";
+
+    # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
+    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+    # please get your own set of keys.
+    google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
+    google_default_client_id = "404761575300.apps.googleusercontent.com";
+    google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+
+  } // optionalAttrs proprietaryCodecs {
+    # enable support for the H.264 codec
+    proprietary_codecs = true;
+    ffmpeg_branding = "Chrome";
+  } // optionalAttrs (stdenv.system == "x86_64-linux") {
+    target_arch = "x64";
+    python_arch = "x86-64";
+  } // optionalAttrs (stdenv.system == "i686-linux") {
+    target_arch = "ia32";
+    python_arch = "ia32";
+  });
+
+  configurePhase = ''
+    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
+    python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
+  '';
+
+  buildPhase = let
+    CC = "${gcc}/bin/gcc";
+    CXX = "${gcc}/bin/g++";
+  in ''
+    CC="${CC}" CC_host="${CC}"     \
+    CXX="${CXX}" CXX_host="${CXX}" \
+    LINK_host="${CXX}"             \
+      "${ninja}/bin/ninja" -C "${buildPath}"  \
+        -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+        chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
+  '';
+
+  installPhase = let
+    enabledPlugins = optional enablePepperFlash binaryPlugins.flash
+                  ++ optional enablePepperPDF   binaryPlugins.pdf;
+    getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
+    pluginArgs = concatStringsSep " " (map getFlags enabledPlugins);
+  in ''
+    ensureDir "${libExecPath}"
+    cp -v "${buildPath}/"*.pak "${libExecPath}/"
+    ${optionalString (!versionOlder src.version "34.0.0.0") ''
+    cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
+    ''}
+    cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
+    cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/"
+
+    cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
+
+    mkdir -vp "$out/bin"
+    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" \
+      --add-flags "${pluginArgs}"
+
+    mkdir -vp "$out/share/man/man1"
+    cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
+
+    for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
+      num_and_suffix="''${icon_file##*logo_}"
+      icon_size="''${num_and_suffix%.*}"
+      expr "$icon_size" : "^[0-9][0-9]*$" || continue
+      logo_output_prefix="$out/share/icons/hicolor"
+      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
+      mkdir -vp "$logo_output_path"
+      cp -v "$icon_file" "$logo_output_path/${packageName}.png"
+    done
+  '';
+
+  passthru = {
+    inherit sandbox;
+  };
+
+  meta = {
+    description = "An open source web browser from Google";
+    homepage = http://www.chromium.org/;
+    maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index b7082567015..bb6f530309f 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,360 +1,28 @@
-{ stdenv, fetchurl, makeWrapper, ninja, which
-
-# default dependencies
-, bzip2, flac, speex, icu, libopus
-, libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt, v8
-, xdg_utils, yasm, minizip, libwebp
-, libusb1, libexif, pciutils
-
-, python, pythonPackages, perl, pkgconfig
-, nspr, udev, krb5
-, utillinux, alsaLib
-, gcc, bison, gperf
-, glib, gtk, dbus_glib
-, libXScrnSaver, libXcursor, libXtst, mesa
-, protobuf, speechd, libXdamage
-
-# optional dependencies
-, libgcrypt ? null # gnomeSupport || cupsSupport
+{ newScope
 
 # package customization
 , channel ? "stable"
-, enableSELinux ? false, libselinux ? null
+, enableSELinux ? false
 , enableNaCl ? false
-, useOpenSSL ? false, nss ? null, openssl ? null
-, gnomeSupport ? false, gconf ? null
-, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, useOpenSSL ? false
+, gnomeSupport ? false
+, gnomeKeyringSupport ? false
 , proprietaryCodecs ? true
 , enablePepperFlash ? false
 , enablePepperPDF ? false
 , cupsSupport ? false
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false
 }:
 
-with stdenv.lib;
-
 let
-  src = with getAttr channel (import ./sources.nix); stdenv.mkDerivation {
-    name = "chromium-source-${version}";
+  callPackage = newScope chromium;
 
-    src = fetchurl {
-      inherit url sha256;
-    };
-
-    buildInputs = [ python ]; # cannot patch shebangs otherwise
-
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-
-    opensslPatches = optional useOpenSSL openssl.patches;
-
-    prePatch = "patchShebangs .";
-
-    patches = singleton ./sandbox_userns_31.patch;
-
-    postPatch = ''
-      sed -i -r \
-        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
-        -e 's|/bin/echo|echo|' \
-        -e "/python_arch/s/: *'[^']*'/: '""'/" \
-        build/common.gypi chrome/chrome_tests.gypi
-      sed -i '/not RunGN/,+1d' build/gyp_chromium
-      sed -i -e 's|/usr/bin/gcc|gcc|' \
-        third_party/WebKit/Source/build/scripts/scripts.gypi \
-        third_party/WebKit/Source/build/scripts/preprocessor.pm
-    '' + optionalString useOpenSSL ''
-      cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-    '' + optionalString (!versionOlder version "34.0.0.0") ''
-      sed -i '/import.*depot/d' build/gyp_chromium
-    '';
-
-    outputs = [ "out" "sandbox" "bundled" "main" ];
-    installPhase = ''
-      ensureDir "$out" "$sandbox" "$bundled" "$main"
-
-      header "copying browser main sources to $main"
-      find . -mindepth 1 -maxdepth 1 \
-        \! -path ./sandbox \
-        \! -path ./third_party \
-        \! -path ./build \
-        \! -path ./tools \
-        \! -name '.*' \
-        -print | xargs cp -rt "$main"
-      stopNest
-
-      header "copying sandbox components to $sandbox"
-      cp -rt "$sandbox" sandbox/*
-      stopNest
-
-      header "copying third party sources to $bundled"
-      cp -rt "$bundled" third_party/*
-      stopNest
-
-      header "copying build requisites to $out"
-      cp -rt "$out" build tools
-      stopNest
-
-      rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
-    '';
-
-    passthru = {
-      inherit version;
+  chromium = {
+    browser = callPackage ./browser.nix {
+      inherit channel enableSELinux enableNaCl useOpenSSL gnomeSupport
+              gnomeKeyringSupport proprietaryCodecs enablePepperFlash
+              enablePepperPDF cupsSupport pulseSupport;
     };
   };
 
-  mkGypFlags =
-    let
-      sanitize = value:
-        if value == true then "1"
-        else if value == false then "0"
-        else "${value}";
-      toFlag = key: value: "-D${key}=${sanitize value}";
-    in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
-
-  gypFlagsUseSystemLibs = {
-    use_system_bzip2 = true;
-    use_system_flac = true;
-    use_system_libevent = true;
-    use_system_libexpat = true;
-    use_system_libexif = true;
-    use_system_libjpeg = true;
-    use_system_libpng = true;
-    use_system_libwebp = true;
-    use_system_libxml = true;
-    use_system_opus = true;
-    use_system_snappy = true;
-    use_system_speex = true;
-    use_system_ssl = useOpenSSL;
-    use_system_stlport = true;
-    use_system_xdg_utils = true;
-    use_system_yasm = true;
-    use_system_zlib = true;
-    use_system_protobuf = true;
-
-    use_system_harfbuzz = false;
-    use_system_icu = false; # Doesn't support ICU 52 yet.
-    use_system_libusb = false; # http://crbug.com/266149
-    use_system_skia = false;
-    use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = !versionOlder src.version "34.0.0.0";
-  };
-
-  defaultDependencies = [
-    bzip2 flac speex icu libopus
-    libevent expat libjpeg snappy
-    libpng libxml2 libxslt v8
-    xdg_utils yasm minizip libwebp
-    libusb1 libexif
-  ];
-
-  sandbox = import ./sandbox.nix {
-    inherit stdenv;
-    src = src.sandbox;
-    binary = "${packageName}_sandbox";
-  };
-
-  binaryPlugins = stdenv.mkDerivation {
-    name = "chromium-binary-plugins";
-
-    # XXX: Only temporary and has to be version-specific
-    src = fetchurl {
-      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
-          + "google-chrome-unstable/google-chrome-unstable_"
-          + "35.0.1897.2-1_amd64.deb";
-      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
-    };
-
-    phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
-    outputs = [ "pdf" "flash" ];
-
-    unpackCmd = ''
-      ensureDir plugins
-      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/chrome-unstable/PepperFlash \
-        ./opt/google/chrome-unstable/libpdf.so
-    '';
-
-    doCheck = true;
-    checkPhase = ''
-      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
-    '';
-
-    patchPhase = let
-      rpaths = [ stdenv.gcc.gcc ];
-      mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
-    in ''
-      for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
-        chmod +x "$sofile"
-        patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
-      done
-    '';
-
-    installPhase = let
-      pdfName = "Chrome PDF Viewer";
-      pdfDescription = "Portable Document Format";
-      pdfMimeTypes = concatStringsSep ";" [
-        "application/pdf"
-        "application/x-google-chrome-print-preview-pdf"
-      ];
-      pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
-    in ''
-      install -vD libpdf.so "$pdf/lib/libpdf.so"
-      ensureDir "$pdf/nix-support"
-      echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
-        > "$pdf/nix-support/chromium-flags"
-
-      flashVersion="$(
-        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
-      )"
-
-      install -vD libpepflashplayer.so "$flash/lib/libpepflashplayer.so"
-      ensureDir "$flash/nix-support"
-      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
-           "--ppapi-flash-version=$flashVersion" \
-           > "$flash/nix-support/chromium-flags"
-    '';
-  };
-
-  # build paths and release info
-  packageName = "chromium";
-  buildType = "Release";
-  buildPath = "out/${buildType}";
-  libExecPath = "$out/libexec/${packageName}";
-  sandboxPath = "${sandbox}/bin/${packageName}_sandbox";
-
-in stdenv.mkDerivation rec {
-  name = "${packageName}-${src.version}";
-  inherit packageName src;
-
-  buildInputs = defaultDependencies ++ [
-    which makeWrapper
-    python perl pkgconfig
-    nspr udev
-    (if useOpenSSL then openssl else nss)
-    utillinux alsaLib
-    gcc bison gperf krb5
-    glib gtk dbus_glib
-    libXScrnSaver libXcursor libXtst mesa
-    pciutils protobuf speechd libXdamage
-    pythonPackages.gyp
-  ] ++ optional gnomeKeyringSupport libgnome_keyring3
-    ++ optionals gnomeSupport [ gconf libgcrypt ]
-    ++ optional enableSELinux libselinux
-    ++ optional cupsSupport libgcrypt
-    ++ optional pulseSupport pulseaudio;
-
-  prePatch = ''
-    # XXX: Figure out a way how to split these properly.
-    #cpflags="-dsr --no-preserve=mode"
-    cpflags="-dr"
-    cp $cpflags "${src.main}"/* .
-    cp $cpflags "${src.bundled}" third_party
-    cp $cpflags "${src.sandbox}" sandbox
-    chmod -R u+w . # XXX!
-  '';
-
-  postPatch = ''
-    sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
-      sandbox_binary = \
-        base::FilePath("'"${sandboxPath}"'");
-    ' content/browser/browser_main_loop.cc
-  '';
-
-  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
-    linux_use_gold_binary = false;
-    linux_use_gold_flags = false;
-    proprietary_codecs = false;
-    use_gnome_keyring = gnomeKeyringSupport;
-    use_gconf = gnomeSupport;
-    use_gio = gnomeSupport;
-    use_pulseaudio = pulseSupport;
-    disable_nacl = !enableNaCl;
-    use_openssl = useOpenSSL;
-    selinux = enableSELinux;
-    use_cups = cupsSupport;
-    linux_sandbox_path="${sandboxPath}";
-    linux_sandbox_chrome_path="${libExecPath}/${packageName}";
-    werror = "";
-
-    # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
-    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
-    # please get your own set of keys.
-    google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
-    google_default_client_id = "404761575300.apps.googleusercontent.com";
-    google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
-
-  } // optionalAttrs proprietaryCodecs {
-    # enable support for the H.264 codec
-    proprietary_codecs = true;
-    ffmpeg_branding = "Chrome";
-  } // optionalAttrs (stdenv.system == "x86_64-linux") {
-    target_arch = "x64";
-    python_arch = "x86-64";
-  } // optionalAttrs (stdenv.system == "i686-linux") {
-    target_arch = "ia32";
-    python_arch = "ia32";
-  });
-
-  configurePhase = ''
-    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
-    python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
-  '';
-
-  buildPhase = let
-    CC = "${gcc}/bin/gcc";
-    CXX = "${gcc}/bin/g++";
-  in ''
-    CC="${CC}" CC_host="${CC}"     \
-    CXX="${CXX}" CXX_host="${CXX}" \
-    LINK_host="${CXX}"             \
-      "${ninja}/bin/ninja" -C "${buildPath}"  \
-        -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-        chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
-  '';
-
-  installPhase = let
-    enabledPlugins = optional enablePepperFlash binaryPlugins.flash
-                  ++ optional enablePepperPDF   binaryPlugins.pdf;
-    getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
-    pluginArgs = concatStringsSep " " (map getFlags enabledPlugins);
-  in ''
-    ensureDir "${libExecPath}"
-    cp -v "${buildPath}/"*.pak "${libExecPath}/"
-    ${optionalString (!versionOlder src.version "34.0.0.0") ''
-    cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
-    ''}
-    cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
-    cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/"
-
-    cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
-
-    mkdir -vp "$out/bin"
-    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" \
-      --add-flags "${pluginArgs}"
-
-    mkdir -vp "$out/share/man/man1"
-    cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
-
-    for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
-      num_and_suffix="''${icon_file##*logo_}"
-      icon_size="''${num_and_suffix%.*}"
-      expr "$icon_size" : "^[0-9][0-9]*$" || continue
-      logo_output_prefix="$out/share/icons/hicolor"
-      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
-      mkdir -vp "$logo_output_path"
-      cp -v "$icon_file" "$logo_output_path/${packageName}.png"
-    done
-  '';
-
-  passthru = {
-    inherit sandbox;
-  };
-
-  meta = {
-    description = "An open source web browser from Google";
-    homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ goibhniu chaoflow aszlig wizeman ];
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
+in chromium.browser
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fda6cdaa261..79c1ce219da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7739,7 +7739,6 @@ let
 
   chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
-    gconf = gnome.GConf;
     pulseSupport = config.pulseaudio or true;
   });
 

From 1ae328ba86aeb046ea9220550ef994e6df9a0fd8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Mar 2014 12:51:39 +0100
Subject: [PATCH 0311/2033] chromium: Factor out source into its own Nix file.

The name is a bit unfortunate, so it would make sense to rename
"sources.nix" into something else.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 86 +++----------------
 .../networking/browsers/chromium/default.nix  |  8 +-
 .../networking/browsers/chromium/source.nix   | 74 ++++++++++++++++
 3 files changed, 92 insertions(+), 76 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source.nix

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index e98c47d8cdd..ee2d29065e6 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -19,7 +19,6 @@
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
 # package customization
-, channel ? "stable"
 , enableSELinux ? false, libselinux ? null
 , enableNaCl ? false
 , useOpenSSL ? false, nss ? null, openssl ? null
@@ -30,77 +29,13 @@
 , enablePepperPDF ? false
 , cupsSupport ? false
 , pulseSupport ? false, pulseaudio ? null
+
+, source
 }:
 
 with stdenv.lib;
 
 let
-  src = with getAttr channel (import ./sources.nix); stdenv.mkDerivation {
-    name = "chromium-source-${version}";
-
-    src = fetchurl {
-      inherit url sha256;
-    };
-
-    buildInputs = [ python ]; # cannot patch shebangs otherwise
-
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-
-    opensslPatches = optional useOpenSSL openssl.patches;
-
-    prePatch = "patchShebangs .";
-
-    patches = singleton ./sandbox_userns_31.patch;
-
-    postPatch = ''
-      sed -i -r \
-        -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
-        -e 's|/bin/echo|echo|' \
-        -e "/python_arch/s/: *'[^']*'/: '""'/" \
-        build/common.gypi chrome/chrome_tests.gypi
-      sed -i '/not RunGN/,+1d' build/gyp_chromium
-      sed -i -e 's|/usr/bin/gcc|gcc|' \
-        third_party/WebKit/Source/build/scripts/scripts.gypi \
-        third_party/WebKit/Source/build/scripts/preprocessor.pm
-    '' + optionalString useOpenSSL ''
-      cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
-    '' + optionalString (!versionOlder version "34.0.0.0") ''
-      sed -i '/import.*depot/d' build/gyp_chromium
-    '';
-
-    outputs = [ "out" "sandbox" "bundled" "main" ];
-    installPhase = ''
-      ensureDir "$out" "$sandbox" "$bundled" "$main"
-
-      header "copying browser main sources to $main"
-      find . -mindepth 1 -maxdepth 1 \
-        \! -path ./sandbox \
-        \! -path ./third_party \
-        \! -path ./build \
-        \! -path ./tools \
-        \! -name '.*' \
-        -print | xargs cp -rt "$main"
-      stopNest
-
-      header "copying sandbox components to $sandbox"
-      cp -rt "$sandbox" sandbox/*
-      stopNest
-
-      header "copying third party sources to $bundled"
-      cp -rt "$bundled" third_party/*
-      stopNest
-
-      header "copying build requisites to $out"
-      cp -rt "$out" build tools
-      stopNest
-
-      rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
-    '';
-
-    passthru = {
-      inherit version;
-    };
-  };
 
   mkGypFlags =
     let
@@ -136,7 +71,7 @@ let
     use_system_libusb = false; # http://crbug.com/266149
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = !versionOlder src.version "34.0.0.0";
+    use_system_v8 = !versionOlder source.version "34.0.0.0";
   };
 
   defaultDependencies = [
@@ -149,7 +84,7 @@ let
 
   sandbox = import ./sandbox.nix {
     inherit stdenv;
-    src = src.sandbox;
+    src = source.sandbox;
     binary = "${packageName}_sandbox";
   };
 
@@ -223,8 +158,9 @@ let
   sandboxPath = "${sandbox}/bin/${packageName}_sandbox";
 
 in stdenv.mkDerivation rec {
-  name = "${packageName}-${src.version}";
-  inherit packageName src;
+  name = "${packageName}-${source.version}";
+  inherit packageName;
+  src = source;
 
   buildInputs = defaultDependencies ++ [
     which makeWrapper
@@ -248,9 +184,9 @@ in stdenv.mkDerivation rec {
     # XXX: Figure out a way how to split these properly.
     #cpflags="-dsr --no-preserve=mode"
     cpflags="-dr"
-    cp $cpflags "${src.main}"/* .
-    cp $cpflags "${src.bundled}" third_party
-    cp $cpflags "${src.sandbox}" sandbox
+    cp $cpflags "${source.main}"/* .
+    cp $cpflags "${source.bundled}" third_party
+    cp $cpflags "${source.sandbox}" sandbox
     chmod -R u+w . # XXX!
   '';
 
@@ -321,7 +257,7 @@ in stdenv.mkDerivation rec {
   in ''
     ensureDir "${libExecPath}"
     cp -v "${buildPath}/"*.pak "${libExecPath}/"
-    ${optionalString (!versionOlder src.version "34.0.0.0") ''
+    ${optionalString (!versionOlder source.version "34.0.0.0") ''
     cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
     ''}
     cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bb6f530309f..c62de9859c3 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -18,8 +18,14 @@ let
   callPackage = newScope chromium;
 
   chromium = {
+    source = callPackage ./source.nix {
+      inherit channel;
+      # XXX: common config
+      inherit useOpenSSL;
+    };
+
     browser = callPackage ./browser.nix {
-      inherit channel enableSELinux enableNaCl useOpenSSL gnomeSupport
+      inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
               gnomeKeyringSupport proprietaryCodecs enablePepperFlash
               enablePepperPDF cupsSupport pulseSupport;
     };
diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source.nix
new file mode 100644
index 00000000000..12a691db633
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, python
+, channel ? "stable"
+, useOpenSSL # XXX
+}:
+
+with stdenv.lib;
+with getAttr channel (import ./sources.nix);
+
+stdenv.mkDerivation {
+  name = "chromium-source-${version}";
+
+  src = fetchurl {
+    inherit url sha256;
+  };
+
+  buildInputs = [ python ]; # cannot patch shebangs otherwise
+
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+  opensslPatches = optional useOpenSSL openssl.patches;
+
+  prePatch = "patchShebangs .";
+
+  patches = singleton ./sandbox_userns_31.patch;
+
+  postPatch = ''
+    sed -i -r \
+      -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
+      -e 's|/bin/echo|echo|' \
+      -e "/python_arch/s/: *'[^']*'/: '""'/" \
+      build/common.gypi chrome/chrome_tests.gypi
+    sed -i '/not RunGN/,+1d' build/gyp_chromium
+    sed -i -e 's|/usr/bin/gcc|gcc|' \
+      third_party/WebKit/Source/build/scripts/scripts.gypi \
+      third_party/WebKit/Source/build/scripts/preprocessor.pm
+  '' + optionalString useOpenSSL ''
+    cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
+  '' + optionalString (!versionOlder version "34.0.0.0") ''
+    sed -i '/import.*depot/d' build/gyp_chromium
+  '';
+
+  outputs = [ "out" "sandbox" "bundled" "main" ];
+  installPhase = ''
+    ensureDir "$out" "$sandbox" "$bundled" "$main"
+
+    header "copying browser main sources to $main"
+    find . -mindepth 1 -maxdepth 1 \
+      \! -path ./sandbox \
+      \! -path ./third_party \
+      \! -path ./build \
+      \! -path ./tools \
+      \! -name '.*' \
+      -print | xargs cp -rt "$main"
+    stopNest
+
+    header "copying sandbox components to $sandbox"
+    cp -rt "$sandbox" sandbox/*
+    stopNest
+
+    header "copying third party sources to $bundled"
+    cp -rt "$bundled" third_party/*
+    stopNest
+
+    header "copying build requisites to $out"
+    cp -rt "$out" build tools
+    stopNest
+
+    rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
+  '';
+
+  passthru = {
+    inherit version;
+  };
+}

From 16af058ff9d41416eab5937c1c4b534ba464f842 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 19 Mar 2014 12:57:49 +0100
Subject: [PATCH 0312/2033] chromium: Move plugins into its own Nix file.

We now no longer pass enablePepperFlash and enablePepperPDF to the
browser package itself and only use plugins.flagsEnabled from there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 74 +-----------------
 .../networking/browsers/chromium/default.nix  |  8 +-
 .../networking/browsers/chromium/plugins.nix  | 78 +++++++++++++++++++
 3 files changed, 87 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/plugins.nix

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index ee2d29065e6..94fa002ab20 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -25,12 +25,11 @@
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome_keyring3 ? null
 , proprietaryCodecs ? true
-, enablePepperFlash ? false
-, enablePepperPDF ? false
 , cupsSupport ? false
 , pulseSupport ? false, pulseaudio ? null
 
 , source
+, plugins
 }:
 
 with stdenv.lib;
@@ -88,68 +87,6 @@ let
     binary = "${packageName}_sandbox";
   };
 
-  binaryPlugins = stdenv.mkDerivation {
-    name = "chromium-binary-plugins";
-
-    # XXX: Only temporary and has to be version-specific
-    src = fetchurl {
-      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
-          + "google-chrome-unstable/google-chrome-unstable_"
-          + "35.0.1897.2-1_amd64.deb";
-      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
-    };
-
-    phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
-    outputs = [ "pdf" "flash" ];
-
-    unpackCmd = ''
-      ensureDir plugins
-      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/chrome-unstable/PepperFlash \
-        ./opt/google/chrome-unstable/libpdf.so
-    '';
-
-    doCheck = true;
-    checkPhase = ''
-      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
-    '';
-
-    patchPhase = let
-      rpaths = [ stdenv.gcc.gcc ];
-      mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
-    in ''
-      for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
-        chmod +x "$sofile"
-        patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
-      done
-    '';
-
-    installPhase = let
-      pdfName = "Chrome PDF Viewer";
-      pdfDescription = "Portable Document Format";
-      pdfMimeTypes = concatStringsSep ";" [
-        "application/pdf"
-        "application/x-google-chrome-print-preview-pdf"
-      ];
-      pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
-    in ''
-      install -vD libpdf.so "$pdf/lib/libpdf.so"
-      ensureDir "$pdf/nix-support"
-      echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
-        > "$pdf/nix-support/chromium-flags"
-
-      flashVersion="$(
-        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
-      )"
-
-      install -vD libpepflashplayer.so "$flash/lib/libpepflashplayer.so"
-      ensureDir "$flash/nix-support"
-      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
-           "--ppapi-flash-version=$flashVersion" \
-           > "$flash/nix-support/chromium-flags"
-    '';
-  };
-
   # build paths and release info
   packageName = "chromium";
   buildType = "Release";
@@ -249,12 +186,7 @@ in stdenv.mkDerivation rec {
         chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
   '';
 
-  installPhase = let
-    enabledPlugins = optional enablePepperFlash binaryPlugins.flash
-                  ++ optional enablePepperPDF   binaryPlugins.pdf;
-    getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
-    pluginArgs = concatStringsSep " " (map getFlags enabledPlugins);
-  in ''
+  installPhase = ''
     ensureDir "${libExecPath}"
     cp -v "${buildPath}/"*.pak "${libExecPath}/"
     ${optionalString (!versionOlder source.version "34.0.0.0") ''
@@ -267,7 +199,7 @@ in stdenv.mkDerivation rec {
 
     mkdir -vp "$out/bin"
     makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" \
-      --add-flags "${pluginArgs}"
+      --add-flags "${plugins.flagsEnabled}"
 
     mkdir -vp "$out/share/man/man1"
     cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c62de9859c3..be525aa3c8e 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -26,8 +26,12 @@ let
 
     browser = callPackage ./browser.nix {
       inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
-              gnomeKeyringSupport proprietaryCodecs enablePepperFlash
-              enablePepperPDF cupsSupport pulseSupport;
+              gnomeKeyringSupport proprietaryCodecs cupsSupport
+              pulseSupport;
+    };
+
+    plugins = callPackage ./plugins.nix {
+      inherit enablePepperFlash enablePepperPDF;
     };
   };
 
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
new file mode 100644
index 00000000000..04af90be128
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -0,0 +1,78 @@
+{ stdenv
+, enablePepperFlash ? false
+, enablePepperPDF ? false
+, fetchurl # XXX
+}:
+
+with stdenv.lib;
+
+let
+  plugins = stdenv.mkDerivation {
+    name = "chromium-binary-plugins";
+
+    # XXX: Only temporary and has to be version-specific
+    src = fetchurl {
+      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
+          + "google-chrome-unstable/google-chrome-unstable_"
+          + "35.0.1897.2-1_amd64.deb";
+      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
+    };
+
+    phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
+    outputs = [ "pdf" "flash" ];
+
+    unpackCmd = ''
+      ensureDir plugins
+      ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
+        ./opt/google/chrome-unstable/PepperFlash \
+        ./opt/google/chrome-unstable/libpdf.so
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      ! find -iname '*.so' -exec ldd {} + | grep 'not found'
+    '';
+
+    patchPhase = let
+      rpaths = [ stdenv.gcc.gcc ];
+      mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
+    in ''
+      for sofile in PepperFlash/libpepflashplayer.so libpdf.so; do
+        chmod +x "$sofile"
+        patchelf --set-rpath "${mkrpath rpaths}" "$sofile"
+      done
+    '';
+
+    installPhase = let
+      pdfName = "Chrome PDF Viewer";
+      pdfDescription = "Portable Document Format";
+      pdfMimeTypes = concatStringsSep ";" [
+        "application/pdf"
+        "application/x-google-chrome-print-preview-pdf"
+      ];
+      pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}";
+    in ''
+      install -vD libpdf.so "$pdf/lib/libpdf.so"
+      ensureDir "$pdf/nix-support"
+      echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \
+        > "$pdf/nix-support/chromium-flags"
+
+      flashVersion="$(
+        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
+      )"
+
+      install -vD PepperFlash/libpepflashplayer.so \
+        "$flash/lib/libpepflashplayer.so"
+      ensureDir "$flash/nix-support"
+      echo "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" \
+           "--ppapi-flash-version=$flashVersion" \
+           > "$flash/nix-support/chromium-flags"
+    '';
+
+    passthru.flagsEnabled = let
+      enabledPlugins = optional enablePepperFlash plugins.flash
+                    ++ optional enablePepperPDF   plugins.pdf;
+      getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)";
+    in concatStringsSep " " (map getFlags enabledPlugins);
+  };
+in plugins

From c86d376c82c33a8184bb74ea437732ee0b6e4492 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 22 Mar 2014 15:39:26 +0100
Subject: [PATCH 0313/2033] chromium: Selectively link bundled libraries.

So far we just copied everything from source.* into the build directory
during the prePatch. This somewhat defeated the purpose of the source
splitup because it involved more I/O than just unpacking the entire
source tree.

Now, we're selectively *symlinking* the bundled sources into the build
directory. Even that isn't perfect because in the end we'd just
reference foreign derivations and we're done. But for now, this gets us
at least prepared for a massive reduction of compile time.

Unfortunately, gyp's behaviour when it comes to symlinks is quite
painful to come by, so we need to fix a few references to use absolute
paths.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 116 ++++++++++++++++--
 1 file changed, 107 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 94fa002ab20..1954b392d17 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -117,14 +117,113 @@ in stdenv.mkDerivation rec {
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio;
 
-  prePatch = ''
-    # XXX: Figure out a way how to split these properly.
-    #cpflags="-dsr --no-preserve=mode"
-    cpflags="-dr"
-    cp $cpflags "${source.main}"/* .
-    cp $cpflags "${source.bundled}" third_party
-    cp $cpflags "${source.sandbox}" sandbox
-    chmod -R u+w . # XXX!
+  prePatch = let
+    lntree = [ "cp" "-dsr" "--no-preserve=mode" ];
+    lntreeList = concatStringsSep ", " (map (arg: "'${arg}'") lntree);
+    lntreeSh = concatStringsSep " " lntree;
+  in ''
+    ${lntreeSh} "${source.main}"/* .
+    ${lntreeSh} "${source.sandbox}" sandbox
+
+    ensureDir third_party
+
+    # ONLY the dependencies we can't use from nixpkgs!
+    for bundled in ${concatStringsSep " " [
+      # This is in preparation of splitting up the bundled sources into separate
+      # derivations so we some day can tremendously reduce build time.
+      "adobe"
+      "angle"
+      "cacheinvalidation"
+      "cld_2"
+      "codesighs"
+      "cros_dbus_cplusplus"
+      "cros_system_api"
+      "flot"
+      "freetype2"
+      "hunspell"
+      "iccjpeg"
+      "jinja2"
+      "JSON"
+      "jstemplate"
+      "khronos"
+      "leveldatabase"
+      "libaddressinput"
+      "libjingle"
+      "libmtp"
+      "libphonenumber"
+      "libsrtp"
+      "libXNVCtrl"
+      "libyuv"
+      "lss"
+      "lzma_sdk"
+      "markupsafe"
+      "mesa"
+      "modp_b64"
+      "mt19937ar"
+      "mtpd"
+      "npapi"
+      "ots"
+      "ply"
+      "protobuf"
+      "qcms"
+      "readability"
+      "safe_browsing"
+      "sfntly"
+      "skia"
+      "smhasher"
+      "speech-dispatcher"
+      "tcmalloc"
+      "trace-viewer"
+      "undoview"
+      "usb_ids"
+      "usrsctp"
+      "WebKit"
+      "webrtc"
+      "widevine"
+      "x86inc"
+      "yasm"
+    ]}; do
+      echo -n "Linking ${source.bundled}/$bundled to third_party/..." >&2
+      ${lntreeSh} "${source.bundled}/$bundled" third_party/
+      echo " done." >&2
+    done
+
+    # Everything else is decided based on gypFlags.
+    PYTHONPATH="build/linux/unbundle:$PYTHONPATH" python <<PYTHON
+    import os, sys, subprocess
+    from replace_gyp_files import REPLACEMENTS
+    for flag, path in REPLACEMENTS.items():
+      if path.startswith("v8/"):
+        continue
+      if "-D{0}=1".format(flag) in os.environ.get('gypFlags'):
+        target = os.path.join("build/linux/unbundle", os.path.basename(path))
+        dest = path
+      else:
+        target_base = os.path.basename(os.path.dirname(path))
+        target = os.path.join("${source.bundled}", target_base)
+        dest = os.path.join("third_party", target_base)
+      try:
+        os.makedirs(os.path.dirname(dest))
+      except:
+        pass
+      sys.stderr.write("Linking {0} to {1}...".format(target, dest))
+      subprocess.check_call([${lntreeList}, os.path.abspath(target), dest])
+      sys.stderr.write(" done.\n")
+    PYTHON
+
+    # Auxilliary files needed in unbundled trees
+    ${lntreeSh} "${source.bundled}/libxml/chromium" third_party/libxml/chromium
+    ${lntreeSh} "${source.bundled}/zlib/google" third_party/zlib/google
+
+    find -iname '*.gyp*' \( -type f -o -type l \) \
+      -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} +
+
+    # XXX: Really ugly workaround to fix improper symlink dereference.
+    sed -i -e '/args\['"'"'name'"'"'\] *= *parts\[0\]$/ {
+      s|$|.split("-bundled/WebKit/Source/", 1)[1] |;
+      s|$|if parts[0].startswith("../") else parts[0]|;
+    }' third_party/WebKit/Source/build/scripts/in_file.py \
+       third_party/WebKit/Source/build/scripts/make_event_factory.py
   '';
 
   postPatch = ''
@@ -170,7 +269,6 @@ in stdenv.mkDerivation rec {
   });
 
   configurePhase = ''
-    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
     python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
   '';
 

From 5021717099d7482ba4e68bb497b0a0868d0a185b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 22 Mar 2014 17:05:14 +0100
Subject: [PATCH 0314/2033] chromium: Split off sandbox from the browser.

Now, we no longer tie the sandbox directly to the browser derivation but
wrap everything together into one derivation at the entry point at
default.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 27 ++++---------------
 .../networking/browsers/chromium/default.nix  | 21 +++++++++++++--
 .../networking/browsers/chromium/sandbox.nix  |  8 +++---
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 1954b392d17..558054bba41 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, ninja, which
+{ stdenv, fetchurl, ninja, which
 
 # default dependencies
 , bzip2, flac, speex, icu, libopus
@@ -81,26 +81,19 @@ let
     libusb1 libexif
   ];
 
-  sandbox = import ./sandbox.nix {
-    inherit stdenv;
-    src = source.sandbox;
-    binary = "${packageName}_sandbox";
-  };
-
   # build paths and release info
   packageName = "chromium";
   buildType = "Release";
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";
-  sandboxPath = "${sandbox}/bin/${packageName}_sandbox";
 
 in stdenv.mkDerivation rec {
-  name = "${packageName}-${source.version}";
+  name = "${packageName}-browser-${source.version}";
   inherit packageName;
   src = source;
 
   buildInputs = defaultDependencies ++ [
-    which makeWrapper
+    which
     python perl pkgconfig
     nspr udev
     (if useOpenSSL then openssl else nss)
@@ -228,8 +221,7 @@ in stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
-      sandbox_binary = \
-        base::FilePath("'"${sandboxPath}"'");
+      sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
     ' content/browser/browser_main_loop.cc
   '';
 
@@ -245,7 +237,6 @@ in stdenv.mkDerivation rec {
     use_openssl = useOpenSSL;
     selinux = enableSELinux;
     use_cups = cupsSupport;
-    linux_sandbox_path="${sandboxPath}";
     linux_sandbox_chrome_path="${libExecPath}/${packageName}";
     werror = "";
 
@@ -281,7 +272,7 @@ in stdenv.mkDerivation rec {
     LINK_host="${CXX}"             \
       "${ninja}/bin/ninja" -C "${buildPath}"  \
         -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-        chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
+        chrome
   '';
 
   installPhase = ''
@@ -295,10 +286,6 @@ in stdenv.mkDerivation rec {
 
     cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
 
-    mkdir -vp "$out/bin"
-    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}" \
-      --add-flags "${plugins.flagsEnabled}"
-
     mkdir -vp "$out/share/man/man1"
     cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
 
@@ -313,10 +300,6 @@ in stdenv.mkDerivation rec {
     done
   '';
 
-  passthru = {
-    inherit sandbox;
-  };
-
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index be525aa3c8e..ca802770b6b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope
+{ newScope, stdenv, makeWrapper
 
 # package customization
 , channel ? "stable"
@@ -30,9 +30,26 @@ let
               pulseSupport;
     };
 
+    sandbox = callPackage ./sandbox.nix { };
+
     plugins = callPackage ./plugins.nix {
       inherit enablePepperFlash enablePepperPDF;
     };
   };
 
-in chromium.browser
+in stdenv.mkDerivation {
+  name = "chromium-${channel}-${chromium.source.version}";
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = let
+    browserBinary = "${chromium.browser}/libexec/chromium/chromium";
+    sandboxBinary = "${chromium.sandbox}/bin/chromium-sandbox";
+  in ''
+    ensureDir "$out/bin"
+    ln -s "${chromium.browser}/share" "$out/share"
+    makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \
+      --add-flags "${chromium.plugins.flagsEnabled}"
+  '';
+}
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox.nix b/pkgs/applications/networking/browsers/chromium/sandbox.nix
index b43385e8633..81ae49ebbb8 100644
--- a/pkgs/applications/networking/browsers/chromium/sandbox.nix
+++ b/pkgs/applications/networking/browsers/chromium/sandbox.nix
@@ -1,8 +1,8 @@
-{ stdenv, src, binary }:
+{ stdenv, source }:
 
 stdenv.mkDerivation {
-  name = "chromium-sandbox-${src.version}";
-  inherit src;
+  name = "chromium-sandbox-${source.version}";
+  src = source.sandbox;
 
   patchPhase = ''
     sed -i -e '/#include.*base_export/c \
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    install -svD sandbox "$out/bin/${binary}"
+    install -svD sandbox "$out/bin/chromium-sandbox"
   '';
 }

From d8ba5b3eff0075cf971315873696ab263ad5df48 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 22 Mar 2014 18:22:46 +0100
Subject: [PATCH 0315/2033] chromium: Add bundled dependencies for dev/beta.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix             | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 558054bba41..66e2522bf13 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -121,7 +121,7 @@ in stdenv.mkDerivation rec {
     ensureDir third_party
 
     # ONLY the dependencies we can't use from nixpkgs!
-    for bundled in ${concatStringsSep " " [
+    for bundled in ${concatStringsSep " " ([
       # This is in preparation of splitting up the bundled sources into separate
       # derivations so we some day can tremendously reduce build time.
       "adobe"
@@ -175,7 +175,12 @@ in stdenv.mkDerivation rec {
       "widevine"
       "x86inc"
       "yasm"
-    ]}; do
+    ] ++ optionals (!versionOlder source.version "34.0.0.0") [
+      "brotli"
+      "libwebm"
+      "nss.isolate"
+      "polymer"
+    ])}; do
       echo -n "Linking ${source.bundled}/$bundled to third_party/..." >&2
       ${lntreeSh} "${source.bundled}/$bundled" third_party/
       echo " done." >&2

From cce984b32464d3a579ac690c6bddb8541f0623c9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Mar 2014 16:29:07 +0100
Subject: [PATCH 0316/2033] chromium: Correct tools path in blink_idl_parser.

This is because of our symlink mess, as Chromium's build support scripts
are trying to resolve everything based on absolute paths and we split
off the bundled sources from the main derivation.

Yes, I'm refering to this as a mess, because in the end, we're going to
patch up the gyp files and use references someday.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/browser.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 66e2522bf13..321c03a3ede 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -222,6 +222,14 @@ in stdenv.mkDerivation rec {
       s|$|if parts[0].startswith("../") else parts[0]|;
     }' third_party/WebKit/Source/build/scripts/in_file.py \
        third_party/WebKit/Source/build/scripts/make_event_factory.py
+  '' + optionalString (!versionOlder source.version "35.0.0.0") ''
+    # Transform symlinks into plain files
+    sed -i -e "" third_party/jinja2/__init__.py \
+                 third_party/jinja2/environment.py \
+                 third_party/WebKit/Source/bindings/scripts/idl_compiler.py
+
+    sed -i -e '/tools_dir *=/s|=.*|= "'"$(pwd)"'/tools"|' \
+      third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
   '';
 
   postPatch = ''

From c6fa73b26c995c72aef0971f7b411ddb75f64308 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Mar 2014 19:48:53 +0100
Subject: [PATCH 0317/2033] chromium: Propagate browser's meta to the wrapper.

We obviously don't want the Hydra job of nixpkgs to fail, so we need to
make sure that we have a proper meta attribute on the outermost
derivation.

For builds based on the Chromium source tree (like for example libcef),
we can still move the wrapper elsewhere when we need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index ca802770b6b..2a2490555e5 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -52,4 +52,6 @@ in stdenv.mkDerivation {
       --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \
       --add-flags "${chromium.plugins.flagsEnabled}"
   '';
+
+  inherit (chromium.browser) meta;
 }

From eadbf855b0498ea8d75fd3a69e36f48271032a59 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Mar 2014 03:20:12 +0100
Subject: [PATCH 0318/2033] chromium: Revert back to copying bundled sources.

I'm giving up on this after several attempts to correctly unbundle the
largest part, namely Google's WebKit fork Blink. Right now it's so much
tied into the Chromium source it's going to be fairly hard to do if
you're not working full time on it.

Also, the intermediate steps needed to do this properly would introduce
uneccesary complexity on our side, so we really need to finish this
without leaving it in the "messy" state in order to not make Chromium
even more difficult to maintain than it is already.

However, anyone who wants to proceed on this messy step is free to
revert this commit and continue doing so. In my case I'm going to try
again once https://crbug.com/239107 and https://crbug.com/239181 are
fixed in _stable_ (I don't want to introduce *lots* of conditionals on
the version either).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 130 ++----------------
 1 file changed, 12 insertions(+), 118 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 321c03a3ede..34e8347b2d6 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -110,126 +110,19 @@ in stdenv.mkDerivation rec {
     ++ optional cupsSupport libgcrypt
     ++ optional pulseSupport pulseaudio;
 
-  prePatch = let
-    lntree = [ "cp" "-dsr" "--no-preserve=mode" ];
-    lntreeList = concatStringsSep ", " (map (arg: "'${arg}'") lntree);
-    lntreeSh = concatStringsSep " " lntree;
-  in ''
-    ${lntreeSh} "${source.main}"/* .
-    ${lntreeSh} "${source.sandbox}" sandbox
-
-    ensureDir third_party
-
-    # ONLY the dependencies we can't use from nixpkgs!
-    for bundled in ${concatStringsSep " " ([
-      # This is in preparation of splitting up the bundled sources into separate
-      # derivations so we some day can tremendously reduce build time.
-      "adobe"
-      "angle"
-      "cacheinvalidation"
-      "cld_2"
-      "codesighs"
-      "cros_dbus_cplusplus"
-      "cros_system_api"
-      "flot"
-      "freetype2"
-      "hunspell"
-      "iccjpeg"
-      "jinja2"
-      "JSON"
-      "jstemplate"
-      "khronos"
-      "leveldatabase"
-      "libaddressinput"
-      "libjingle"
-      "libmtp"
-      "libphonenumber"
-      "libsrtp"
-      "libXNVCtrl"
-      "libyuv"
-      "lss"
-      "lzma_sdk"
-      "markupsafe"
-      "mesa"
-      "modp_b64"
-      "mt19937ar"
-      "mtpd"
-      "npapi"
-      "ots"
-      "ply"
-      "protobuf"
-      "qcms"
-      "readability"
-      "safe_browsing"
-      "sfntly"
-      "skia"
-      "smhasher"
-      "speech-dispatcher"
-      "tcmalloc"
-      "trace-viewer"
-      "undoview"
-      "usb_ids"
-      "usrsctp"
-      "WebKit"
-      "webrtc"
-      "widevine"
-      "x86inc"
-      "yasm"
-    ] ++ optionals (!versionOlder source.version "34.0.0.0") [
-      "brotli"
-      "libwebm"
-      "nss.isolate"
-      "polymer"
-    ])}; do
-      echo -n "Linking ${source.bundled}/$bundled to third_party/..." >&2
-      ${lntreeSh} "${source.bundled}/$bundled" third_party/
-      echo " done." >&2
-    done
-
-    # Everything else is decided based on gypFlags.
-    PYTHONPATH="build/linux/unbundle:$PYTHONPATH" python <<PYTHON
-    import os, sys, subprocess
-    from replace_gyp_files import REPLACEMENTS
-    for flag, path in REPLACEMENTS.items():
-      if path.startswith("v8/"):
-        continue
-      if "-D{0}=1".format(flag) in os.environ.get('gypFlags'):
-        target = os.path.join("build/linux/unbundle", os.path.basename(path))
-        dest = path
-      else:
-        target_base = os.path.basename(os.path.dirname(path))
-        target = os.path.join("${source.bundled}", target_base)
-        dest = os.path.join("third_party", target_base)
-      try:
-        os.makedirs(os.path.dirname(dest))
-      except:
-        pass
-      sys.stderr.write("Linking {0} to {1}...".format(target, dest))
-      subprocess.check_call([${lntreeList}, os.path.abspath(target), dest])
-      sys.stderr.write(" done.\n")
-    PYTHON
-
-    # Auxilliary files needed in unbundled trees
-    ${lntreeSh} "${source.bundled}/libxml/chromium" third_party/libxml/chromium
-    ${lntreeSh} "${source.bundled}/zlib/google" third_party/zlib/google
+  # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
+  #      be fixed, then try again to unbundle everything into separate
+  #      derivations.
+  prePatch = ''
+    cp -dsr --no-preserve=mode "${source.main}"/* .
+    cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
+    cp -dr "${source.bundled}" third_party
+    chmod -R u+w third_party
 
+    # Hardcode source tree root in all gyp files
     find -iname '*.gyp*' \( -type f -o -type l \) \
-      -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} +
-
-    # XXX: Really ugly workaround to fix improper symlink dereference.
-    sed -i -e '/args\['"'"'name'"'"'\] *= *parts\[0\]$/ {
-      s|$|.split("-bundled/WebKit/Source/", 1)[1] |;
-      s|$|if parts[0].startswith("../") else parts[0]|;
-    }' third_party/WebKit/Source/build/scripts/in_file.py \
-       third_party/WebKit/Source/build/scripts/make_event_factory.py
-  '' + optionalString (!versionOlder source.version "35.0.0.0") ''
-    # Transform symlinks into plain files
-    sed -i -e "" third_party/jinja2/__init__.py \
-                 third_party/jinja2/environment.py \
-                 third_party/WebKit/Source/bindings/scripts/idl_compiler.py
-
-    sed -i -e '/tools_dir *=/s|=.*|= "'"$(pwd)"'/tools"|' \
-      third_party/WebKit/Source/bindings/scripts/blink_idl_parser.py
+      -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
+      -exec chmod u+w {} +
   '';
 
   postPatch = ''
@@ -273,6 +166,7 @@ in stdenv.mkDerivation rec {
   });
 
   configurePhase = ''
+    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
     python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
   '';
 

From 202755ca2f23889af8456286aea0b7f52b9f5175 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Mar 2014 12:02:49 +0100
Subject: [PATCH 0319/2033] chromium: Properly pass packageName and version.

We don't want ta have the source derivation in the runtime dependencies
of the browser itself. Also, we've broken the Firefox wrapper, because
we've no longer exposed the packageName attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 5 +++--
 pkgs/applications/networking/browsers/chromium/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 34e8347b2d6..3b45ff78206 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -88,7 +88,8 @@ let
   libExecPath = "$out/libexec/${packageName}";
 
 in stdenv.mkDerivation rec {
-  name = "${packageName}-browser-${source.version}";
+  name = "${packageName}-browser-${version}";
+  inherit (source) version;
   inherit packageName;
   src = source;
 
@@ -185,7 +186,7 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     ensureDir "${libExecPath}"
     cp -v "${buildPath}/"*.pak "${libExecPath}/"
-    ${optionalString (!versionOlder source.version "34.0.0.0") ''
+    ${optionalString (!versionOlder version "34.0.0.0") ''
     cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
     ''}
     cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 2a2490555e5..d47c9c89eb0 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -38,7 +38,7 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "chromium-${channel}-${chromium.source.version}";
+  name = "chromium-${channel}-${chromium.browser.version}";
 
   buildInputs = [ makeWrapper ];
 
@@ -53,5 +53,5 @@ in stdenv.mkDerivation {
       --add-flags "${chromium.plugins.flagsEnabled}"
   '';
 
-  inherit (chromium.browser) meta;
+  inherit (chromium.browser) meta packageName;
 }

From 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Mar 2014 13:45:21 +0100
Subject: [PATCH 0320/2033] v8: Bring back old version 3.14.

The current version of v8 breaks builds of nodejs, mongodb and
rethinkdb. So let's bring back the old package with annoying _3_14
version suffix so hopefully the corresponding maintainers will get rid
of that dependency :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/v8/3.14.nix   | 65 ++++++++++++++++++++++++
 pkgs/development/web/nodejs/default.nix  |  4 +-
 pkgs/servers/nosql/mongodb/default.nix   |  4 +-
 pkgs/servers/nosql/rethinkdb/default.nix |  4 +-
 pkgs/top-level/all-packages.nix          |  8 ++-
 5 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/v8/3.14.nix

diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
new file mode 100644
index 00000000000..0564e688795
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchsvn, gyp, readline, python, which }:
+
+assert readline != null;
+
+let
+  system = stdenv.system;
+  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
+  version = "3.14.5.9";
+in
+
+assert arch != "";
+
+stdenv.mkDerivation {
+    name = "v8-${version}";
+
+    src = fetchsvn {
+      url = "http://v8.googlecode.com/svn/tags/${version}";
+      sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr";
+      name = "v8-${version}-src";
+    };
+
+    patches = [ ./fix-GetLocalizedMessage-usage.patch ];
+
+    configurePhase = ''
+      mkdir build/gyp
+      ln -sv ${gyp}/bin/gyp build/gyp/gyp
+    '';
+
+    nativeBuildInputs = [ which ];
+    buildInputs = [ readline python ];
+
+    buildFlags = [
+      "library=shared"
+      "console=readline"
+      "${arch}.release"
+    ];
+
+    # http://code.google.com/p/v8/issues/detail?id=2149
+    NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs -Wno-aggressive-loop-optimizations";
+
+    enableParallelBuilding = true;
+
+    installPhase = ''
+      mkdir -p $out/bin
+      mkdir -p $out/lib
+      mv -v out/${arch}.release/d8 $out/bin
+
+      ${if stdenv.system == "x86_64-darwin" then
+        "mv -v out/${arch}.release/libv8.dylib $out/lib"
+      else
+        "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"}
+      mv -v include $out/
+    '';
+
+    postFixup = if stdenv.isDarwin then ''
+      install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
+      install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
+    '' else null;
+
+    meta = with stdenv.lib; {
+      description = "V8 is Google's open source JavaScript engine";
+      platforms = platforms.linux ++ platforms.darwin;
+      license = licenses.bsd3;
+    };
+}
diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 062d7f4ec06..3b1b6467972 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
+{ stdenv, fetchurl, openssl, python, zlib, v8_3_14, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -10,7 +10,7 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit v8 openssl zlib http-parser;
+    inherit v8_3_14 openssl zlib http-parser;
     cares = c-ares;
   };
 
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 6956271e992..a5a021b9354 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }:
+{ stdenv, fetchurl, scons, boost, v8_3_14, gperftools, pcre, snappy }:
 
 let version = "2.4.8"; in stdenv.mkDerivation rec {
   name = "mongodb-${version}";
@@ -8,7 +8,7 @@ let version = "2.4.8"; in stdenv.mkDerivation rec {
     sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
   };
 
-  nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ];
+  nativeBuildInputs = [ scons boost v8_3_14 gperftools pcre snappy ];
 
   postPatch = ''
     substituteInPlace SConstruct \
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index e81ccb39632..ec1dbd76364 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }:
+{ stdenv, fetchurl, which, protobuf, v8_3_14, ncurses, gperftools, boost, m4 }:
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-1.11.2";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--lib-path ${gperftools}/lib";
 
-  buildInputs = [ protobuf v8 ncurses boost ];
+  buildInputs = [ protobuf v8_3_14 ncurses boost ];
 
   nativeBuildInputs = [ which m4 ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79c1ce219da..8a498067d58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6147,7 +6147,13 @@ let
     inherit (gnome) libsoup;
   };
 
-  v8 = callPackage ../development/libraries/v8 { inherit (pythonPackages) gyp; };
+  v8 = callPackage ../development/libraries/v8 {
+    inherit (pythonPackages) gyp;
+  };
+
+  v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
+    inherit (pythonPackages) gyp;
+  };
 
   xmlsec = callPackage ../development/libraries/xmlsec { };
 

From 8bc8b51375669737f33b236d22821d7ed43e3f41 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Mar 2014 15:04:41 +0100
Subject: [PATCH 0321/2033] chromium: Move source package into own subdir.

Next, we're going to refactor update.sh and the first step is to ensure
that we keep everything related to sources into its own subdirectory to
not clutter up the main directory too much.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix      | 2 +-
 .../browsers/chromium/{source.nix => source/default.nix}        | 0
 .../browsers/chromium/{ => source}/sandbox_userns_31.patch      | 0
 .../networking/browsers/chromium/{ => source}/sources.nix       | 0
 .../networking/browsers/chromium/{ => source}/update.sh         | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/networking/browsers/chromium/{source.nix => source/default.nix} (100%)
 rename pkgs/applications/networking/browsers/chromium/{ => source}/sandbox_userns_31.patch (100%)
 rename pkgs/applications/networking/browsers/chromium/{ => source}/sources.nix (100%)
 rename pkgs/applications/networking/browsers/chromium/{ => source}/update.sh (100%)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d47c9c89eb0..950be9c1892 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -18,7 +18,7 @@ let
   callPackage = newScope chromium;
 
   chromium = {
-    source = callPackage ./source.nix {
+    source = callPackage ./source {
       inherit channel;
       # XXX: common config
       inherit useOpenSSL;
diff --git a/pkgs/applications/networking/browsers/chromium/source.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/source.nix
rename to pkgs/applications/networking/browsers/chromium/source/default.nix
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/sandbox_userns_31.patch
rename to pkgs/applications/networking/browsers/chromium/source/sandbox_userns_31.patch
diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/sources.nix
rename to pkgs/applications/networking/browsers/chromium/source/sources.nix
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/source/update.sh
similarity index 100%
rename from pkgs/applications/networking/browsers/chromium/update.sh
rename to pkgs/applications/networking/browsers/chromium/source/update.sh

From 27415239269acc0560bdb22ad32ace33293e0bd9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Mar 2014 07:20:20 +0100
Subject: [PATCH 0322/2033] chromium: Remove URL in sources.nix and updater.

The updater is now splitted between a shellscript and a Nix expression
file which contains helpers and lookup functions to reconstruct all
information needed in order to fetch the source tarballs.

This means, that the sources.nix now doesn't contain URLs and only
versions and the corresponding SHA256 hashes. Of course, right now this
sounds like it's unnecessary, but we're going to fetch binaries soon so
it's a good idea to not unnecessarily clutter up sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/default.nix      |  5 +-
 .../browsers/chromium/source/sources.nix      |  3 -
 .../browsers/chromium/source/update.nix       | 58 +++++++++++++++++
 .../browsers/chromium/source/update.sh        | 64 +++----------------
 4 files changed, 71 insertions(+), 59 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/update.nix

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 12a691db633..74cc692919e 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -4,7 +4,10 @@
 }:
 
 with stdenv.lib;
-with getAttr channel (import ./sources.nix);
+
+with (import ./update.nix {
+  inherit (stdenv) system;
+}).getChannel channel;
 
 stdenv.mkDerivation {
   name = "chromium-source-${version}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 49b5e2b4221..dceab16d38c 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -2,17 +2,14 @@
 {
   dev = {
     version = "35.0.1883.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-35.0.1883.0.tar.xz";
     sha256 = "0qbv6prxl18y5824pfd13ng9798g561gzb6nypwp502hqr45jvb6";
   };
   beta = {
     version = "34.0.1847.60";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.60.tar.xz";
     sha256 = "1na5d6z4a0wkabn7cj62vyiv3mmvcb6qdvrkyy6fj79h7gk2hb7k";
   };
   stable = {
     version = "34.0.1847.116";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-34.0.1847.116.tar.xz";
     sha256 = "04cpfav5rqa117igvzmrw0045r2ljxg5fqb46qgqvkgff30pjrfx";
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
new file mode 100644
index 00000000000..841dfcccb54
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -0,0 +1,58 @@
+{ system ? builtins.currentSystem }:
+
+let
+  inherit (import <nixpkgs> {}) lib writeText;
+
+  sources = if builtins.pathExists ./sources.nix
+            then import ./sources.nix
+            else null;
+
+  bucketURL = "http://commondatastorage.googleapis.com/"
+            + "chromium-browser-official";
+
+  tryChannel = channel: let
+    chanAttrs = builtins.getAttr channel sources;
+  in if sources != null then ''
+    oldver="${chanAttrs.version}";
+    echo -n "Checking if $oldver ($channel) is up to date..." >&2;
+    if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ];
+    then
+      echo " no, getting sha256 for new version $version:" >&2;
+      sha256="$(nix-prefetch-url "$url")" || return 1;
+    else
+      echo " yes, keeping old sha256." >&2;
+      sha256="${chanAttrs.sha256}";
+    fi;
+  '' else ''
+    sha256="$(nix-prefetch-url "$url")" || return 1;
+  '';
+
+  caseChannel = channel: ''
+    ${channel}) ${tryChannel channel};;
+  '';
+
+in rec {
+  getChannel = channel: let
+    chanAttrs = builtins.getAttr channel sources;
+  in {
+    url = "${bucketURL}/chromium-${chanAttrs.version}.tar.xz";
+    inherit (chanAttrs) version sha256;
+  };
+
+  updateHelpers = writeText "update-helpers.sh" ''
+    get_sha256()
+    {
+      channel="$1";
+      version="$2";
+      url="${bucketURL}/chromium-$version.tar.xz";
+
+      case "$channel" in
+        ${lib.concatMapStrings caseChannel [ "stable" "dev" "beta" ]}
+      esac;
+
+      sha_insert "$version" "$sha256";
+      echo "$sha256";
+      return 0;
+    }
+  '';
+}
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.sh b/pkgs/applications/networking/browsers/chromium/source/update.sh
index 0c4881bb396..a2e1e268f4f 100755
--- a/pkgs/applications/networking/browsers/chromium/source/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/source/update.sh
@@ -3,16 +3,9 @@
 channels_url="http://omahaproxy.appspot.com/all?csv=1";
 history_url="http://omahaproxy.appspot.com/history";
 bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
-output_file="$(cd "$(dirname "$0")" && pwd)/sources.nix";
+base_path="$(cd "$(dirname "$0")" && pwd)";
 
-nix_getattr()
-{
-    input_file="$1";
-    attr="$2";
-
-    var="$(nix-instantiate --eval-only -A "$attr" "$output_file")";
-    echo "$var" | tr -d '\\"';
-}
+source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
 
 ### poor mans key/value-store :-) ###
 
@@ -53,39 +46,6 @@ get_newest_ver()
     fi;
 }
 
-if [ -e "$output_file" ];
-then
-    get_sha256()
-    {
-        channel="$1";
-        version="$2";
-        url="$3";
-
-        oldver="$(nix_getattr "$output_file" "$channel.version")";
-
-        echo -n "Checking if $oldver ($channel) is up to date..." >&2;
-
-        if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ];
-        then
-            echo " no, getting sha256 for new version $version:" >&2;
-            sha256="$(nix-prefetch-url "$url")" || return 1;
-        else
-            echo " yes, keeping old sha256." >&2;
-            sha256="$(nix_getattr "$output_file" "$channel.sha256")" \
-                || return 1;
-        fi;
-
-        sha_insert "$version" "$sha256";
-        echo "$sha256";
-        return 0;
-    }
-else
-    get_sha256()
-    {
-        nix-prefetch-url "$3";
-    }
-fi;
-
 fetch_filtered_history()
 {
     curl -s "$history_url" | sed -nr 's/^'"linux,$1"',([^,]+).*$/\1/p';
@@ -99,9 +59,8 @@ get_prev_sha256()
     for version in $(fetch_filtered_history "$channel");
     do
         [ "x$version" = "x$current_version" ] && continue;
-        url="${bucket_url%/}/chromium-$version.tar.xz";
-        sha256="$(get_sha256 "$channel" "$version" "$url")" || continue;
-        echo "$sha256:$version:$url";
+        sha256="$(get_sha256 "$channel" "$version")" || continue;
+        echo "$sha256:$version";
         return 0;
     done;
 }
@@ -113,25 +72,21 @@ get_channel_exprs()
         channel="${chline%%,*}";
         version="${chline##*,}";
 
-        url="${bucket_url%/}/chromium-$version.tar.xz";
-
         echo -n "Checking if sha256 of version $version is cached..." >&2;
         if sha256="$(sha_lookup "$version")";
         then
             echo " yes: $sha256" >&2;
         else
             echo " no." >&2;
-            sha256="$(get_sha256 "$channel" "$version" "$url")";
+            sha256="$(get_sha256 "$channel" "$version")";
             if [ $? -ne 0 ];
             then
                 echo "Whoops, failed to fetch $version, trying previous" \
                      "versions:" >&2;
 
-                sha_ver_url="$(get_prev_sha256 "$channel" "$version")";
-                sha256="${sha_ver_url%%:*}";
-                ver_url="${sha_ver_url#*:}";
-                version="${ver_url%%:*}";
-                url="${ver_url#*:}";
+                sha_ver="$(get_prev_sha256 "$channel" "$version")";
+                sha256="${sha_ver%:*}";
+                version="${sha_ver#*:}";
             fi;
         fi;
 
@@ -139,7 +94,6 @@ get_channel_exprs()
 
         echo "  $channel = {";
         echo "    version = \"$version\";";
-        echo "    url = \"$url\";";
         echo "    sha256 = \"$sha256\";";
         echo "  };";
     done;
@@ -151,7 +105,7 @@ omaha="$(curl -s "$channels_url")";
 versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')";
 channel_exprs="$(get_channel_exprs "$versions")";
 
-cat > "$output_file" <<-EOF
+cat > "$base_path/sources.nix" <<-EOF
 # This file is autogenerated from update.sh in the same directory.
 {
 $channel_exprs

From 6184ee89fe4107a1e15f1473f50e4593f449f40c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Mar 2014 09:40:21 +0100
Subject: [PATCH 0323/2033] chromium/update: Update Debian binaries as well.

This cases the Debian binaries to be fetched from Google's official APT
repository. If we aren't able to find a package from the APT repository,
it's very likely that it already got deleted upstream and we need to
fallback to mirrors instead.

Unfortunately, we can't use mirrors for updating, because Google doesn't
sign the Debian packages themselves and only the release files.

We're going to hook it into a Chromium updater soon, making the sha256
hashes publicly available, so if it is missing, we can still put the
sha256 manually into sources.nix, without risking anything by blindly
fetching from one of the provided mirrors.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/update.nix       | 77 ++++++++++++++++---
 .../browsers/chromium/source/update.sh        | 12 ++-
 2 files changed, 79 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 841dfcccb54..7a8144314d5 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -1,7 +1,7 @@
 { system ? builtins.currentSystem }:
 
 let
-  inherit (import <nixpkgs> {}) lib writeText;
+  inherit (import <nixpkgs> {}) lib writeText stdenv;
 
   sources = if builtins.pathExists ./sources.nix
             then import ./sources.nix
@@ -10,21 +10,34 @@ let
   bucketURL = "http://commondatastorage.googleapis.com/"
             + "chromium-browser-official";
 
+  debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";
+
+  # Untrusted mirrors, don't try to update from them!
+  debMirrors = [
+    "http://95.31.35.30/chrome/pool/main/g"
+    "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g"
+  ];
+
   tryChannel = channel: let
-    chanAttrs = builtins.getAttr channel sources;
+    chan = builtins.getAttr channel sources;
   in if sources != null then ''
-    oldver="${chanAttrs.version}";
+    oldver="${chan.version}";
     echo -n "Checking if $oldver ($channel) is up to date..." >&2;
     if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ];
     then
       echo " no, getting sha256 for new version $version:" >&2;
-      sha256="$(nix-prefetch-url "$url")" || return 1;
+      sha256="$(prefetch_sha "$channel" "$version")" || return 1;
     else
       echo " yes, keeping old sha256." >&2;
-      sha256="${chanAttrs.sha256}";
+      sha256="${chan.sha256}";
+      ${if (chan ? sha256bin32 && chan ? sha256bin64) then ''
+        sha256="$sha256.${chan.sha256bin32}.${chan.sha256bin64}";
+      '' else ''
+        sha256="$sha256.$(prefetch_deb_sha "$channel" "$version")";
+      ''}
     fi;
   '' else ''
-    sha256="$(nix-prefetch-url "$url")" || return 1;
+    sha256="$(prefetch_sha "$channel" "$version")" || return 1;
   '';
 
   caseChannel = channel: ''
@@ -35,16 +48,62 @@ in rec {
   getChannel = channel: let
     chanAttrs = builtins.getAttr channel sources;
   in {
-    url = "${bucketURL}/chromium-${chanAttrs.version}.tar.xz";
-    inherit (chanAttrs) version sha256;
+    main = {
+      url = "${bucketURL}/chromium-${chanAttrs.version}.tar.xz";
+      inherit (chanAttrs) version sha256;
+    };
+
+    binary = let
+      pname = if channel == "dev"
+              then "google-chrome-unstable"
+              else "google-chrome-${channel}";
+      arch = if stdenv.is64bit then "amd64" else "i386";
+      relpath = "${pname}/${pname}_${chanAttrs.version}-1_${arch}.deb";
+    in lib.optionalAttrs (chanAttrs ? sha256bin64) {
+      urls = map (url: "${url}/${relpath}") ([ debURL ] ++ debMirrors);
+      sha256 = if stdenv.is64bit
+               then chanAttrs.sha256bin64
+               else chanAttrs.sha256bin32;
+      inherit (chanAttrs) version;
+    };
   };
 
   updateHelpers = writeText "update-helpers.sh" ''
+
+    prefetch_main_sha()
+    {
+      nix-prefetch-url "${bucketURL}/chromium-$2.tar.xz";
+    }
+
+    prefetch_deb_sha()
+    {
+      channel="$1";
+      version="$2";
+
+      case "$1" in
+        dev) pname="google-chrome-unstable";;
+        *)   pname="google-chrome-$channel";;
+      esac;
+
+      deb_pre="${debURL}/$pname/$pname";
+
+      deb32=$(nix-prefetch-url "''${deb_pre}_$version-1_i386.deb");
+      deb64=$(nix-prefetch-url "''${deb_pre}_$version-1_amd64.deb");
+
+      echo "$deb32.$deb64";
+      return 0;
+    }
+
+    prefetch_sha()
+    {
+      echo "$(prefetch_main_sha "$@").$(prefetch_deb_sha "$@")";
+      return 0;
+    }
+
     get_sha256()
     {
       channel="$1";
       version="$2";
-      url="${bucketURL}/chromium-$version.tar.xz";
 
       case "$channel" in
         ${lib.concatMapStrings caseChannel [ "stable" "dev" "beta" ]}
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.sh b/pkgs/applications/networking/browsers/chromium/source/update.sh
index a2e1e268f4f..806169f524c 100755
--- a/pkgs/applications/networking/browsers/chromium/source/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/source/update.sh
@@ -92,9 +92,19 @@ get_channel_exprs()
 
         sha_insert "$version" "$sha256";
 
+        main="${sha256%%.*}";
+        deb="${sha256#*.}";
+        deb32="${deb%.*}";
+        deb64="${deb#*.}";
+
         echo "  $channel = {";
         echo "    version = \"$version\";";
-        echo "    sha256 = \"$sha256\";";
+        echo "    sha256 = \"$main\";";
+        if [ "x${deb#*[a-z0-9].[a-z0-9]}" != "x$deb" ];
+        then
+            echo "    sha256bin32 = \"$deb32\";";
+            echo "    sha256bin64 = \"$deb64\";";
+        fi;
         echo "  };";
     done;
 }

From cad411f61d6b5179776b2c359d19464a21c19ea4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Mar 2014 09:49:46 +0100
Subject: [PATCH 0324/2033] chromium/plugins: Use Debian package from sources.

This now uses the Debian package from the sources derivation instead of
hardcoding it, so we finally should have proper PepperAPI plugin support
without crashing plugins and whatnot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/plugins.nix  | 20 +++++++++----------
 .../browsers/chromium/source/default.nix      |  7 +++----
 .../browsers/chromium/source/update.nix       |  5 +++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 04af90be128..f760b06fe24 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,7 +1,8 @@
 { stdenv
 , enablePepperFlash ? false
 , enablePepperPDF ? false
-, fetchurl # XXX
+
+, source
 }:
 
 with stdenv.lib;
@@ -11,21 +12,20 @@ let
     name = "chromium-binary-plugins";
 
     # XXX: Only temporary and has to be version-specific
-    src = fetchurl {
-      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/"
-          + "google-chrome-unstable/google-chrome-unstable_"
-          + "35.0.1897.2-1_amd64.deb";
-      sha1 = "b68683fc5321d10536e4135c266b14894b7668ed";
-    };
+    src = source.plugins;
 
     phases = [ "unpackPhase" "patchPhase" "checkPhase" "installPhase" ];
     outputs = [ "pdf" "flash" ];
 
-    unpackCmd = ''
+    unpackCmd = let
+      chan = if source.channel == "dev"    then "chrome-unstable"
+        else if source.channel == "stable" then "chrome"
+        else "chrome-${source.channel}";
+    in ''
       ensureDir plugins
       ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \
-        ./opt/google/chrome-unstable/PepperFlash \
-        ./opt/google/chrome-unstable/libpdf.so
+        ./opt/google/${chan}/PepperFlash \
+        ./opt/google/${chan}/libpdf.so
     '';
 
     doCheck = true;
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 74cc692919e..eca5767e8c0 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -12,9 +12,7 @@ with (import ./update.nix {
 stdenv.mkDerivation {
   name = "chromium-source-${version}";
 
-  src = fetchurl {
-    inherit url sha256;
-  };
+  src = fetchurl main;
 
   buildInputs = [ python ]; # cannot patch shebangs otherwise
 
@@ -72,6 +70,7 @@ stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit version;
+    inherit version channel;
+    plugins = fetchurl binary;
   };
 }
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 7a8144314d5..09f834a90c6 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -48,9 +48,11 @@ in rec {
   getChannel = channel: let
     chanAttrs = builtins.getAttr channel sources;
   in {
+    inherit (chanAttrs) version;
+
     main = {
       url = "${bucketURL}/chromium-${chanAttrs.version}.tar.xz";
-      inherit (chanAttrs) version sha256;
+      inherit (chanAttrs) sha256;
     };
 
     binary = let
@@ -64,7 +66,6 @@ in rec {
       sha256 = if stdenv.is64bit
                then chanAttrs.sha256bin64
                else chanAttrs.sha256bin32;
-      inherit (chanAttrs) version;
     };
   };
 

From a87208de5896e01e51933f2eede44bfc3b02a3c3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Mar 2014 15:41:56 +0100
Subject: [PATCH 0325/2033] libopus: Allow to enable custom modes.

The reason I'm not making this the default is because it seems to add
complexity and degrades performance of the library. For details have a
look at this lengthy discussion at:

https://bugs.debian.org/686777

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/libopus/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index b1bf65d0fe6..78b264506f0 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fixedPoint ? false }:
+{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? false }:
 
 let
   version = "1.1";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
   };
 
-  configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point";
+  configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"
+                ++ stdenv.lib.optional withCustomModes "--enable-custom-modes";
 
   doCheck = true;
 

From 111caaad539b738c54ecd60378de0f2a53249ad3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Apr 2014 07:36:26 +0200
Subject: [PATCH 0326/2033] chromium: Factor out common build attributes.

This results in a new function called mkChromiumDerivation, which can be
used to easily build packages that are based on the Chromium source
tree.

We pass through this function as mkDerivation in the chromium wrappre,
so in the end if you want to create such a package, something like:

chromium.mkDerivation (base: {
  name = "your-shiny-package-based-on-chromium";
  ...
})

will suffice.

Of course, this is only the first step towards this functionality,
because right now I'm not even sure the Chromium browser itself will
build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/browser.nix  | 205 ++----------------
 .../networking/browsers/chromium/common.nix   | 200 +++++++++++++++++
 .../networking/browsers/chromium/default.nix  |   7 +-
 3 files changed, 220 insertions(+), 192 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/common.nix

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 3b45ff78206..8c83dbb853a 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -1,201 +1,24 @@
-{ stdenv, fetchurl, ninja, which
-
-# default dependencies
-, bzip2, flac, speex, icu, libopus
-, libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt, v8
-, xdg_utils, yasm, minizip, libwebp
-, libusb1, libexif, pciutils
-
-, python, pythonPackages, perl, pkgconfig
-, nspr, udev, krb5
-, utillinux, alsaLib
-, gcc, bison, gperf
-, glib, gtk, dbus_glib
-, libXScrnSaver, libXcursor, libXtst, mesa
-, protobuf, speechd, libXdamage
-
-# optional dependencies
-, libgcrypt ? null # gnomeSupport || cupsSupport
-
-# package customization
-, enableSELinux ? false, libselinux ? null
-, enableNaCl ? false
-, useOpenSSL ? false, nss ? null, openssl ? null
-, gnomeSupport ? false, gnome ? null
-, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
-, proprietaryCodecs ? true
-, cupsSupport ? false
-, pulseSupport ? false, pulseaudio ? null
-
-, source
-, plugins
-}:
+{ stdenv, mkChromiumDerivation }:
 
 with stdenv.lib;
 
-let
-
-  mkGypFlags =
-    let
-      sanitize = value:
-        if value == true then "1"
-        else if value == false then "0"
-        else "${value}";
-      toFlag = key: value: "-D${key}=${sanitize value}";
-    in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
-
-  gypFlagsUseSystemLibs = {
-    use_system_bzip2 = true;
-    use_system_flac = true;
-    use_system_libevent = true;
-    use_system_libexpat = true;
-    use_system_libexif = true;
-    use_system_libjpeg = true;
-    use_system_libpng = true;
-    use_system_libwebp = true;
-    use_system_libxml = true;
-    use_system_opus = true;
-    use_system_snappy = true;
-    use_system_speex = true;
-    use_system_ssl = useOpenSSL;
-    use_system_stlport = true;
-    use_system_xdg_utils = true;
-    use_system_yasm = true;
-    use_system_zlib = true;
-    use_system_protobuf = true;
-
-    use_system_harfbuzz = false;
-    use_system_icu = false; # Doesn't support ICU 52 yet.
-    use_system_libusb = false; # http://crbug.com/266149
-    use_system_skia = false;
-    use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = !versionOlder source.version "34.0.0.0";
-  };
-
-  defaultDependencies = [
-    bzip2 flac speex icu libopus
-    libevent expat libjpeg snappy
-    libpng libxml2 libxslt v8
-    xdg_utils yasm minizip libwebp
-    libusb1 libexif
-  ];
-
-  # build paths and release info
-  packageName = "chromium";
-  buildType = "Release";
-  buildPath = "out/${buildType}";
-  libExecPath = "$out/libexec/${packageName}";
-
-in stdenv.mkDerivation rec {
-  name = "${packageName}-browser-${version}";
-  inherit (source) version;
-  inherit packageName;
-  src = source;
-
-  buildInputs = defaultDependencies ++ [
-    which
-    python perl pkgconfig
-    nspr udev
-    (if useOpenSSL then openssl else nss)
-    utillinux alsaLib
-    gcc bison gperf
-    gcc bison gperf krb5
-    glib gtk dbus_glib
-    libXScrnSaver libXcursor libXtst mesa
-    pciutils protobuf speechd libXdamage
-    pythonPackages.gyp
-  ] ++ optional gnomeKeyringSupport libgnome_keyring3
-    ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
-    ++ optional enableSELinux libselinux
-    ++ optional cupsSupport libgcrypt
-    ++ optional pulseSupport pulseaudio;
-
-  # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
-  #      be fixed, then try again to unbundle everything into separate
-  #      derivations.
-  prePatch = ''
-    cp -dsr --no-preserve=mode "${source.main}"/* .
-    cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
-    cp -dr "${source.bundled}" third_party
-    chmod -R u+w third_party
-
-    # Hardcode source tree root in all gyp files
-    find -iname '*.gyp*' \( -type f -o -type l \) \
-      -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
-      -exec chmod u+w {} +
-  '';
-
-  postPatch = ''
-    sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
-      sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
-    ' content/browser/browser_main_loop.cc
-  '';
-
-  gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
-    linux_use_gold_binary = false;
-    linux_use_gold_flags = false;
-    proprietary_codecs = false;
-    use_gnome_keyring = gnomeKeyringSupport;
-    use_gconf = gnomeSupport;
-    use_gio = gnomeSupport;
-    use_pulseaudio = pulseSupport;
-    disable_nacl = !enableNaCl;
-    use_openssl = useOpenSSL;
-    selinux = enableSELinux;
-    use_cups = cupsSupport;
-    linux_sandbox_chrome_path="${libExecPath}/${packageName}";
-    werror = "";
-
-    # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
-    # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
-    # please get your own set of keys.
-    google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
-    google_default_client_id = "404761575300.apps.googleusercontent.com";
-    google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
-
-  } // optionalAttrs proprietaryCodecs {
-    # enable support for the H.264 codec
-    proprietary_codecs = true;
-    ffmpeg_branding = "Chrome";
-  } // optionalAttrs (stdenv.system == "x86_64-linux") {
-    target_arch = "x64";
-    python_arch = "x86-64";
-  } // optionalAttrs (stdenv.system == "i686-linux") {
-    target_arch = "ia32";
-    python_arch = "ia32";
-  });
-
-  configurePhase = ''
-    python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
-    python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
-  '';
-
-  buildPhase = let
-    CC = "${gcc}/bin/gcc";
-    CXX = "${gcc}/bin/g++";
-  in ''
-    CC="${CC}" CC_host="${CC}"     \
-    CXX="${CXX}" CXX_host="${CXX}" \
-    LINK_host="${CXX}"             \
-      "${ninja}/bin/ninja" -C "${buildPath}"  \
-        -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
-        chrome
-  '';
+mkChromiumDerivation (base: rec {
+  name = "chromium-browser";
+  buildTargets = [ "chrome" ];
 
   installPhase = ''
-    ensureDir "${libExecPath}"
-    cp -v "${buildPath}/"*.pak "${libExecPath}/"
-    ${optionalString (!versionOlder version "34.0.0.0") ''
-    cp -v "${buildPath}/icudtl.dat" "${libExecPath}/"
+    ensureDir "$libExecPath"
+    cp -v "$buildPath/"*.pak "$libExecPath/"
+    ${optionalString (!versionOlder base.version "34.0.0.0") ''
+    cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     ''}
-    cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
-    cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/"
+    cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
+    cp -v $buildPath/libffmpegsumo.so "$libExecPath/"
 
-    cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
+    cp -v "$buildPath/chrome" "$libExecPath/$packageName"
 
     mkdir -vp "$out/share/man/man1"
-    cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
+    cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1"
 
     for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
       num_and_suffix="''${icon_file##*logo_}"
@@ -204,7 +27,7 @@ in stdenv.mkDerivation rec {
       logo_output_prefix="$out/share/icons/hicolor"
       logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
       mkdir -vp "$logo_output_path"
-      cp -v "$icon_file" "$logo_output_path/${packageName}.png"
+      cp -v "$icon_file" "$logo_output_path/$packageName.png"
     done
   '';
 
@@ -215,4 +38,4 @@ in stdenv.mkDerivation rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
new file mode 100644
index 00000000000..be1725345e7
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -0,0 +1,200 @@
+{ stdenv, fetchurl, ninja, which
+
+# default dependencies
+, bzip2, flac, speex, icu, libopus
+, libevent, expat, libjpeg, snappy
+, libpng, libxml2, libxslt, v8
+, xdg_utils, yasm, minizip, libwebp
+, libusb1, libexif, pciutils
+
+, python, pythonPackages, perl, pkgconfig
+, nspr, udev, krb5
+, utillinux, alsaLib
+, gcc, bison, gperf
+, glib, gtk, dbus_glib
+, libXScrnSaver, libXcursor, libXtst, mesa
+, protobuf, speechd, libXdamage
+
+# optional dependencies
+, libgcrypt ? null # gnomeSupport || cupsSupport
+
+# package customization
+, enableSELinux ? false, libselinux ? null
+, enableNaCl ? false
+, useOpenSSL ? false, nss ? null, openssl ? null
+, gnomeSupport ? false, gnome ? null
+, gnomeKeyringSupport ? false, libgnome_keyring3 ? null
+, proprietaryCodecs ? true
+, cupsSupport ? false
+, pulseSupport ? false, pulseaudio ? null
+
+, source
+, plugins
+}:
+
+buildFun:
+
+with stdenv.lib;
+
+let
+  # The additional attributes for creating derivations based on the chromium
+  # source tree.
+  extraAttrs = buildFun base;
+
+  mkGypFlags =
+    let
+      sanitize = value:
+        if value == true then "1"
+        else if value == false then "0"
+        else "${value}";
+      toFlag = key: value: "-D${key}=${sanitize value}";
+    in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
+
+  gypFlagsUseSystemLibs = {
+    use_system_bzip2 = true;
+    use_system_flac = true;
+    use_system_libevent = true;
+    use_system_libexpat = true;
+    use_system_libexif = true;
+    use_system_libjpeg = true;
+    use_system_libpng = true;
+    use_system_libwebp = true;
+    use_system_libxml = true;
+    use_system_opus = true;
+    use_system_snappy = true;
+    use_system_speex = true;
+    use_system_ssl = useOpenSSL;
+    use_system_stlport = true;
+    use_system_xdg_utils = true;
+    use_system_yasm = true;
+    use_system_zlib = true;
+    use_system_protobuf = true;
+
+    use_system_harfbuzz = false;
+    use_system_icu = false; # Doesn't support ICU 52 yet.
+    use_system_libusb = false; # http://crbug.com/266149
+    use_system_skia = false;
+    use_system_sqlite = false; # http://crbug.com/22208
+    use_system_v8 = !versionOlder source.version "34.0.0.0";
+  };
+
+  opusWithCustomModes = libopus.override {
+    withCustomModes = !versionOlder source.version "35.0.0.0";
+  };
+
+  defaultDependencies = [
+    bzip2 flac speex icu opusWithCustomModes
+    libevent expat libjpeg snappy
+    libpng libxml2 libxslt v8
+    xdg_utils yasm minizip libwebp
+    libusb1 libexif
+  ];
+
+  # build paths and release info
+  packageName = extraAttrs.name;
+  buildType = "Release";
+  buildPath = "out/${buildType}";
+  libExecPath = "$out/libexec/${packageName}";
+
+  base = rec {
+    name = "${packageName}-${version}";
+    inherit (source) version;
+    inherit packageName buildType buildPath;
+    src = source;
+
+    buildInputs = defaultDependencies ++ [
+      which
+      python perl pkgconfig
+      nspr udev
+      (if useOpenSSL then openssl else nss)
+      utillinux alsaLib
+      gcc bison gperf krb5
+      glib gtk dbus_glib
+      libXScrnSaver libXcursor libXtst mesa
+      pciutils protobuf speechd libXdamage
+      pythonPackages.gyp
+    ] ++ optional gnomeKeyringSupport libgnome_keyring3
+      ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
+      ++ optional enableSELinux libselinux
+      ++ optional cupsSupport libgcrypt
+      ++ optional pulseSupport pulseaudio;
+
+    # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to
+    #      be fixed, then try again to unbundle everything into separate
+    #      derivations.
+    prePatch = ''
+      cp -dsr --no-preserve=mode "${source.main}"/* .
+      cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
+      cp -dr "${source.bundled}" third_party
+      chmod -R u+w third_party
+
+      # Hardcode source tree root in all gyp files
+      find -iname '*.gyp*' \( -type f -o -type l \) \
+        -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
+        -exec chmod u+w {} +
+    '';
+
+    postPatch = ''
+      sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
+        sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
+      ' content/browser/browser_main_loop.cc
+    '';
+
+    gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
+      linux_use_gold_binary = false;
+      linux_use_gold_flags = false;
+      proprietary_codecs = false;
+      use_gnome_keyring = gnomeKeyringSupport;
+      use_gconf = gnomeSupport;
+      use_gio = gnomeSupport;
+      use_pulseaudio = pulseSupport;
+      disable_nacl = !enableNaCl;
+      use_openssl = useOpenSSL;
+      selinux = enableSELinux;
+      use_cups = cupsSupport;
+      linux_sandbox_chrome_path="${libExecPath}/${packageName}";
+      werror = "";
+
+      # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
+      # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
+      # please get your own set of keys.
+      google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";
+      google_default_client_id = "404761575300.apps.googleusercontent.com";
+      google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D";
+
+    } // optionalAttrs proprietaryCodecs {
+      # enable support for the H.264 codec
+      proprietary_codecs = true;
+      ffmpeg_branding = "Chrome";
+    } // optionalAttrs (stdenv.system == "x86_64-linux") {
+      target_arch = "x64";
+      python_arch = "x86-64";
+    } // optionalAttrs (stdenv.system == "i686-linux") {
+      target_arch = "ia32";
+      python_arch = "ia32";
+    } // (extraAttrs.gypFlags or {}));
+
+    configurePhase = ''
+      # This is to ensure expansion of $out.
+      libExecPath="${libExecPath}"
+      python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
+      python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
+    '';
+
+    buildPhase = let
+      CC = "${gcc}/bin/gcc";
+      CXX = "${gcc}/bin/g++";
+    in ''
+      CC="${CC}" CC_host="${CC}"     \
+      CXX="${CXX}" CXX_host="${CXX}" \
+      LINK_host="${CXX}"             \
+        "${ninja}/bin/ninja" -C "${buildPath}"  \
+          -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+          ${concatStringsSep " " (extraAttrs.buildTargets or [])}
+    '';
+  };
+
+# Remove some extraAttrs we supplied to the base attributes already.
+in stdenv.mkDerivation (base // removeAttrs extraAttrs [
+  "name" "gypFlags" "buildTargets"
+])
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 950be9c1892..0fd9e09accf 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -24,12 +24,13 @@ let
       inherit useOpenSSL;
     };
 
-    browser = callPackage ./browser.nix {
+    mkChromiumDerivation = callPackage ./common.nix {
       inherit enableSELinux enableNaCl useOpenSSL gnomeSupport
               gnomeKeyringSupport proprietaryCodecs cupsSupport
               pulseSupport;
     };
 
+    browser = callPackage ./browser.nix { };
     sandbox = callPackage ./sandbox.nix { };
 
     plugins = callPackage ./plugins.nix {
@@ -54,4 +55,8 @@ in stdenv.mkDerivation {
   '';
 
   inherit (chromium.browser) meta packageName;
+
+  passthru = {
+    mkDerivation = chromium.mkChromiumDerivation;
+  };
 }

From d0722342821d519ee2f07a4c377c80bf03421ea7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 08:05:16 +0200
Subject: [PATCH 0327/2033] chromium: Prefer local build on source derivation.

It doesn't make sense to do the splitting of the source code on a remote
machine, so don't try to do it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/default.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index eca5767e8c0..e80e05ca9e2 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -69,6 +69,8 @@ stdenv.mkDerivation {
     rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
   '';
 
+  preferLocalBuild = true;
+
   passthru = {
     inherit version channel;
     plugins = fetchurl binary;

From e7ab051cda36caefee79209be32d3f298ee0e6a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 10:13:46 +0200
Subject: [PATCH 0328/2033] Disable predictable interface names in tests

Apparently systemd is now smart enough to figure out predictable names
for QEMU network interfaces. But since our tests expect them to be
named eth0/eth1..., this is not desirable at the moment.

http://hydra.nixos.org/build/10418789
---
 nixos/modules/virtualisation/qemu-vm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3152a227418..6605b94439b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -402,6 +402,8 @@ in
     # Speed up booting by not waiting for ARP.
     networking.dhcpcd.extraConfig = "noarp";
 
+    networking.usePredictableInterfaceNames = false;
+
     system.requiredKernelConfig = with config.lib.kernelConfig;
       [ (isEnabled "VIRTIO_BLK")
         (isEnabled "VIRTIO_PCI")

From a8aa9f3fd4e6a6e53be4dc8429f4bf876715cda7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 10:53:05 +0200
Subject: [PATCH 0329/2033] setuid-wrapper.c: Remove tabs

---
 nixos/modules/security/setuid-wrapper.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c
index 007ffbc34fe..dd1ef51019f 100644
--- a/nixos/modules/security/setuid-wrapper.c
+++ b/nixos/modules/security/setuid-wrapper.c
@@ -31,7 +31,7 @@ int main(int argc, char * * argv)
        false `X.real' file, to allow arbitrary programs from being
        executed setuid.  */
     assert ((strncmp(self, wrapperDir, sizeof(wrapperDir)) == 0) &&
-	    (self[strlen(wrapperDir)] == '/'));
+            (self[strlen(wrapperDir)] == '/'));
 
     /* Make *really* *really* sure that we were executed as `self',
        and not, say, as some other setuid program.  That is, our
@@ -42,12 +42,12 @@ int main(int argc, char * * argv)
     assert (lstat(self, &st) != -1);
 
     //printf("%d %d\n", st.st_uid, st.st_gid);
-    
+
     assert ((st.st_mode & S_ISUID) == 0 ||
-	    (st.st_uid == geteuid()));
+            (st.st_uid == geteuid()));
 
     assert ((st.st_mode & S_ISGID) == 0 ||
-	    st.st_gid == getegid());
+            st.st_gid == getegid());
 
     /* And, of course, we shouldn't be writable. */
     assert (!(st.st_mode & (S_IWGRP | S_IWOTH)));
@@ -69,13 +69,13 @@ int main(int argc, char * * argv)
     real[len] = 0;
 
     close(fdSelf);
-    
+
     //printf("real = %s, len = %d\n", real, len);
 
     execve(real, argv, environ);
 
     fprintf(stderr, "%s: cannot run `%s': %s\n",
         argv[0], real, strerror(errno));
-    
+
     exit(1);
 }

From b80e6b27c78d5cf4177f8e30b4a3285598d93d59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 10:53:17 +0200
Subject: [PATCH 0330/2033] setuid-wrapper: Drop runtime dependency on
 setuid-wrapper.c

---
 nixos/modules/security/setuid-wrappers.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 109e61df79e..450fed73658 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -9,10 +9,11 @@ let
   setuidWrapper = pkgs.stdenv.mkDerivation {
     name = "setuid-wrapper";
     buildCommand = ''
-      ensureDir $out/bin
+      mkdir -p $out/bin
+      cp ${./setuid-wrapper.c} setuid-wrapper.c
       gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \
-          ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
-      strip -s $out/bin/setuid-wrapper
+          setuid-wrapper.c -o $out/bin/setuid-wrapper
+      strip -S $out/bin/setuid-wrapper
     '';
   };
 

From fa1a46a01cab1e6c0c594ced17dedf68b0cd39a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 10:58:30 +0200
Subject: [PATCH 0331/2033] setuid-wrapper: Fix broken string comparison

---
 nixos/modules/security/setuid-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c
index dd1ef51019f..ffd0b65b762 100644
--- a/nixos/modules/security/setuid-wrapper.c
+++ b/nixos/modules/security/setuid-wrapper.c
@@ -30,7 +30,7 @@ int main(int argc, char * * argv)
        creating hard link `X' from some other location, along with a
        false `X.real' file, to allow arbitrary programs from being
        executed setuid.  */
-    assert ((strncmp(self, wrapperDir, sizeof(wrapperDir)) == 0) &&
+    assert ((strncmp(self, wrapperDir, strlen(wrapperDir)) == 0) &&
             (self[strlen(wrapperDir)] == '/'));
 
     /* Make *really* *really* sure that we were executed as `self',

From a6a90cad1b84823c325085a2a62ab58f614be912 Mon Sep 17 00:00:00 2001
From: Roelof Wobben <r.wobben@home.nl>
Date: Sat, 19 Apr 2014 10:20:56 +0200
Subject: [PATCH 0332/2033] new package: muffin

---
 pkgs/desktops/cinnamon/gtkdoc.patch | 41 +++++++++++++++++++++++++
 pkgs/desktops/cinnamon/muffin.nix   | 46 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  4 ++-
 3 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/cinnamon/gtkdoc.patch
 create mode 100644 pkgs/desktops/cinnamon/muffin.nix

diff --git a/pkgs/desktops/cinnamon/gtkdoc.patch b/pkgs/desktops/cinnamon/gtkdoc.patch
new file mode 100644
index 00000000000..6398306a76a
--- /dev/null
+++ b/pkgs/desktops/cinnamon/gtkdoc.patch
@@ -0,0 +1,41 @@
+--- a/src/meta/prefs.h
++++ b/src/meta/prefs.h
+@@ -310,13 +310,13 @@ typedef struct
+    */
+   GSList *bindings;
+ 
+-  /** for keybindings that can have shift or not like Alt+Tab */
++  /* for keybindings that can have shift or not like Alt+Tab */
+   gboolean      add_shift:1;
+ 
+-  /** for keybindings that apply only to a window */
++  /* for keybindings that apply only to a window */
+   gboolean      per_window:1;
+ 
+-  /** for keybindings not added with meta_display_add_keybinding() */
++  /* for keybindings not added with meta_display_add_keybinding() */
+   gboolean      builtin:1;
+ } MetaKeyPref;
+ 
+@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
+ MetaPlacementMode meta_prefs_get_placement_mode (void);
+ 
+ #endif
+-
+-
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
+   return workspace;
+ }
+ 
+-/** Foreach function for workspace_free_struts() */
++/* Foreach function for workspace_free_struts() */
+ static void
+ free_this (gpointer candidate, gpointer dummy)
+ {
+@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
+ {
+   return workspace->screen;
+ }
+-
diff --git a/pkgs/desktops/cinnamon/muffin.nix b/pkgs/desktops/cinnamon/muffin.nix
new file mode 100644
index 00000000000..97796f32476
--- /dev/null
+++ b/pkgs/desktops/cinnamon/muffin.nix
@@ -0,0 +1,46 @@
+ 
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3,intltool,
+cinnamon-desktop, clutter, cogl, zenity, python, gnome_doc_utils, makeWrapper}:
+
+let
+  version = "2.0.5";
+in
+stdenv.mkDerivation {
+  name = "muffin-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/linuxmint/muffin/archive/${version}.tar.gz";
+    sha256 = "1vn7shxwyxsa6dd3zldrnc0095i1y0rq0944n8kak3m85r2pv9c1";
+  };
+
+
+  configureFlags = "--enable-compile-warnings=minium" ;
+
+  patches = [./gtkdoc.patch];
+
+  buildInputs = [
+    pkgconfig autoreconfHook
+    glib gettext gnome_common
+    gtk3 intltool cinnamon-desktop
+    clutter cogl zenity python
+    gnome_doc_utils makeWrapper];
+
+  preBuild = "patchShebangs ./scripts";
+
+
+  postFixup  = ''
+    
+    for f in "$out"/bin/*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = {
+    homepage = "http://cinnamon.linuxmint.com";
+    description = "The cinnamon session files" ;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.roelof ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 855176deeb5..106ce3bcc25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9889,7 +9889,9 @@ let
 
   cinnamon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common libgnomekbd gnome-menus;
+    inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
+    
+    muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
     
     cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
     

From d0c0132fb0af4a40598e24ccb96d195f373f4c01 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 19 Apr 2014 09:45:29 +0200
Subject: [PATCH 0333/2033] node_webkit: fix hash for i686-linux

---
 pkgs/development/tools/node-webkit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix
index 326e5322846..be125801bd5 100644
--- a/pkgs/development/tools/node-webkit/default.nix
+++ b/pkgs/development/tools/node-webkit/default.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
     url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
     sha256 = if bits == "x64" then
       "91229edfb03349306c5ce101fdab2de55f7473cc7c36367e9611a0527d2ef591" else
-      "b0b29b4e75cd4b1aaecf7f4716216edcfc5947516744e2eaeae38bec1d03cea1";
+      "12axppynangh0q72swzqcmz2blncgm2dw9n489313ybnp2p42hnp";
   };
 
   patchPhase = ''

From cf8459fecf5c468bb29c478d4226ad103acc9d49 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 17 Apr 2014 09:59:31 -0300
Subject: [PATCH 0334/2033] Dillo: new package

Dillo is a lightweight, fast web browser.
---
 .../networking/browsers/dillo/default.nix     | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/dillo/default.nix

diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
new file mode 100644
index 00000000000..0cf23f38b0f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl
+, fltk
+, openssl
+, libjpeg, libpng
+, perl
+, libXcursor, libXi, libXinerama
+}:
+
+stdenv.mkDerivation rec {
+  version = "3.0.4";
+  name = "dillo-${version}";
+
+  src = fetchurl {
+    url = "http://www.dillo.org/download/${name}.tar.bz2";
+    sha256 = "0ffz481vgl7f12f575pmbagm8swgxgv9s9c0p8c7plhd04jsnazf";
+  };
+
+  buildInputs = with stdenv.lib;
+    [ fltk openssl libjpeg libpng libXcursor libXi libXinerama ];
+
+  nativeBuildInputs = [ perl ];
+
+  configureFlags =  "--enable-ssl";
+
+  meta = {
+    homepage = http://www.dillo.org/;
+    description = "A fast graphical web browser with a small footprint";
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 106ce3bcc25..e5dab755b89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4199,6 +4199,10 @@ let
 
   dclib = callPackage ../development/libraries/dclib { };
 
+  dillo = callPackage ../applications/networking/browsers/dillo {
+    fltk = fltk13;  
+  };
+
   directfb = callPackage ../development/libraries/directfb { };
 
   dotconf = callPackage ../development/libraries/dotconf { };

From 599c2775dd02535256e0c0a87cba622b4435dd72 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 17 Apr 2014 21:40:11 -0500
Subject: [PATCH 0335/2033] Add expression for xml-lens

---
 .../libraries/haskell/xml-lens/default.nix         | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/xml-lens/default.nix

diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix
new file mode 100644
index 00000000000..7c4496f974f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/xml-lens/default.nix
@@ -0,0 +1,14 @@
+{ cabal, lens, text, xmlConduit }:
+
+cabal.mkDerivation (self: {
+  pname = "xml-lens";
+  version = "0.1.6.1";
+  sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h";
+  buildDepends = [ lens text xmlConduit ];
+  meta = {
+    homepage = "https://github.com/fumieval/xml-lens";
+    description = "Lenses, traversals, prisms for xml-conduit";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 217fce1312f..cacc9589325 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2792,6 +2792,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   xmlhtml = callPackage ../development/libraries/haskell/xmlhtml {};
 
+  xmlLens = callPackage ../development/libraries/haskell/xml-lens {};
+
   xmlTypes = callPackage ../development/libraries/haskell/xml-types {};
 
   xournalParser = callPackage ../development/libraries/haskell/xournal-parser {};

From ee79d43e40340a9c2f7c5b9afe39cbdc0d4497a2 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Wed, 16 Apr 2014 18:11:41 -0700
Subject: [PATCH 0336/2033] ImageMagick: update to 6.8.9-0

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 35659cbfe6f..64b1f5b3b2c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -18,14 +18,14 @@
 }:
 
 let
-  version = "6.8.8-7";
+  version = "6.8.9-0";
 in
 stdenv.mkDerivation rec {
   name = "ImageMagick-${version}";
 
   src = fetchurl {
     url = "mirror://imagemagick/${name}.tar.xz";
-    sha256 = "1x5jkbrlc10rx7vm344j7xrs74c80xk3n1akqx8w5c194fj56mza";
+    sha256 = "1lapn2798fkc2wn81slpms5p21kq4dsyg45khsk7n8p69cvrmw2b";
   };
 
   enableParallelBuilding = true;

From 2a64b0a91b34f37328e4d6138744eef979314d9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 12:34:59 +0200
Subject: [PATCH 0337/2033] Shut up warning about resolv.conf missing

---
 nixos/modules/system/boot/stage-2-init.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index cee9db091c1..57f85674c5b 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -144,6 +144,8 @@ fi
 # Use /etc/resolv.conf supplied by systemd-nspawn, if applicable.
 if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
     cat /etc/resolv.conf | resolvconf -m 1000 -a host
+else
+    touch /etc/resolv.conf
 fi
 
 

From 35aeac2939d92029ae0b535d1e996ab142b830c8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 Apr 2014 03:33:26 -0500
Subject: [PATCH 0338/2033] Allow multitail to build on Darwin

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

diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 805dbd3f17c..96d3764abd4 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ ncurses ];
 
+  makeFlags = stdenv.lib.optionalString stdenv.isDarwin "-f makefile.macosx";
+
   installPhase = ''
     ensureDir $out/bin
     cp multitail $out/bin

From 19db0f18f86d1c6e2b89ee103196143b20efed33 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 09:17:10 -0500
Subject: [PATCH 0339/2033] Update pdnsd to 1.2.9a, allow to build on any unix

---
 pkgs/tools/networking/pdnsd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index 14f57b61a2f..6058639e412 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pdnsd-1.2.8-par";
+  name = "pdnsd-1.2.9a-par";
 
   src = fetchurl {
-    url = http://www.phys.uu.nl/~rombouts/pdnsd/releases/pdnsd-1.2.8-par.tar.gz;
-    sha256 = "0ki4xkklc5lqs2qfmww63dc2zax48x8acfw661206ps4kvhasg2z";
+    url = http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz;
+    sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v";
   };
 
   patchPhase = ''

From 9f1c9404da858eb6347493190e40e59c7f81f2c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 12:40:09 +0200
Subject: [PATCH 0340/2033] Put /var/setuid-wrappers on a tmpfs

This allows all other filesystems to be mounted without the suid
option.
---
 nixos/modules/security/setuid-wrappers.nix | 3 +--
 nixos/modules/system/boot/stage-2-init.sh  | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 450fed73658..4cdc1023baa 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -117,8 +117,7 @@ in
           # programs to be wrapped.
           SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
-          if test -d ${wrapperDir}; then rm -f ${wrapperDir}/*; fi # */
-          mkdir -p ${wrapperDir}
+          rm -f ${wrapperDir}/* # */
 
           ${concatMapStrings makeSetuidWrapper setuidPrograms}
         '';
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 57f85674c5b..a64c6cdfa19 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -82,7 +82,7 @@ done
 
 # More special file systems, initialise required directories.
 mkdir -m 0755 /dev/shm
-mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
+mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" none /dev/shm
 mkdir -m 0755 -p /dev/pts
 [ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
@@ -149,6 +149,12 @@ else
 fi
 
 
+# Create /var/setuid-wrappers as a tmpfs.
+rm -rf /var/setuid-wrappers
+mkdir -m 0755 -p /var/setuid-wrappers
+mount -t tmpfs -o "mode=0755" none /var/setuid-wrappers
+
+
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 echo "running activation script..."

From b03a2f9e9022f3e56bcf935eaa8d385bd1e5b374 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 13:02:13 +0200
Subject: [PATCH 0341/2033] Set personality when running a 32-bit container on
 a 64-bit host

---
 nixos/modules/system/activation/top-level.nix |  1 +
 nixos/modules/virtualisation/containers.nix   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index a4a0d14df6a..7cdaecce198 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -68,6 +68,7 @@ let
       echo -n "$configurationName" > $out/configuration-name
       echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version
       echo -n "$nixosVersion" > $out/nixos-version
+      echo -n "$system" > $out/system
 
       mkdir $out/fine-tune
       childCount=0
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 4ce113f10ee..4fca872d72e 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -176,7 +176,6 @@ in
               "/nix/var/nix/profiles/per-container/$INSTANCE" \
               "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
-            SYSTEM_PATH=/nix/var/nix/profiles/system
             if [ -f "/etc/containers/$INSTANCE.conf" ]; then
               . "/etc/containers/$INSTANCE.conf"
             fi
@@ -212,14 +211,22 @@ in
               extraFlags="--capability=CAP_NET_ADMIN"
             fi
 
+            # If the host is 64-bit and the container is 32-bit, add a
+            # --personality flag.
+            ${optionalString (config.nixpkgs.system == "x86_64-linux") ''
+              if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
+                extraFlags+=" --personality=x86"
+              fi
+            ''}
+
             exec $runInNetNs ${config.systemd.package}/bin/systemd-nspawn \
-              -M "$INSTANCE" -D "/var/lib/containers/$INSTANCE" $extraFlags \
+              -M "$INSTANCE" -D "$root" $extraFlags \
               --bind-ro=/nix/store \
               --bind-ro=/nix/var/nix/db \
               --bind-ro=/nix/var/nix/daemon-socket \
               --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
               --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
-              "$SYSTEM_PATH/init"
+              "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
           '';
 
         postStart =

From 85c6634eb5330d348a792bb7caca556a75e62149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 13:03:50 +0200
Subject: [PATCH 0342/2033] mesa: major update 10.0.4 -> 10.1.1

---
 pkgs/development/libraries/mesa/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 9452ae0a7c2..6cf9af7ac3b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.0.4";
+  version = "10.1.1";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "0h2sq8h0l7415vsqfkb7mn1rxm62m2anpi9swlca69fbpr9bavpz";
+    sha256 = "1c4qcz7zi3qvdcxa56yxl6kps5amk4zq2xlhqlgcpzqzv0777bpk";
   };
 
   prePatch = "patchShebangs .";
@@ -88,7 +88,8 @@ stdenv.mkDerivation {
     ;
   buildInputs = with xorg; [
     autoreconfHook intltool expat libxml2Python llvm
-    libXfixes glproto dri2proto libX11 libXext libxcb libXt
+    glproto dri2proto dri3proto presentproto
+    libX11 libXext libxcb libXt libXfixes libxshmfence
     libffi wayland libvdpau libelf
   ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
     ++ optional stdenv.isLinux udev

From c8f633564e9a186f63d74e550d4ca6ae1ab2731d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 12:14:20 +0200
Subject: [PATCH 0343/2033] orc: bugfix update (mainly memory leaks), doCheck

---
 pkgs/development/compilers/orc/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index fd5a85967ed..ff091d03621 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.18";
+  name = "orc-0.4.19";
 
   src = fetchurl {
-    url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
-    sha256 = "093a7a495bsy3j6i4wxaxqbqxk6hwg2hdhgvvkabwhlz4nkwilrl";
+    url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.gz";
+    sha256 = "17mmgwll2waz44m908lcxc5fd6n44yysh7p4pdw33hr138r507z2";
   };
 
+  doCheck = true;
+
   meta = {
     description = "The Oil Runtime Compiler";
     homepage = "http://code.entropywave.com/orc/";

From fbc8424cc2c594888c66a25a76685550cc506ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 13:58:37 +0200
Subject: [PATCH 0344/2033] libstartup_notification: remove duplicate in gnome2

---
 pkgs/desktops/gnome-2/default.nix                     | 11 +++++------
 .../gnome-2/platform/startup-notification/default.nix | 10 ----------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/platform/startup-notification/default.nix

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 6a8f9d15778..54e397fd474 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,8 +1,11 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, overrides ? {} }:
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2
+, libstartup_notification, overrides ? {} }:
+
 let overridden = set // overrides; set = with overridden; {
   # Backward compatibility.
   gtkdoc = self.gtk_doc;
-  startupnotification = self.startup_notification;
+  startup_notification = libstartup_notification;
+  startupnotification = libstartup_notification;
   gnomedocutils = self.gnome_doc_utils;
   gnomeicontheme = self.gnome_icon_theme;
   gnomepanel = self.gnome_panel;
@@ -62,10 +65,6 @@ let overridden = set // overrides; set = with overridden; {
 
   gtkhtml = callPackage ./platform/gtkhtml { };
 
-
-  # Freedesktop library
-  startup_notification = callPackage ./platform/startup-notification { };
-
   # Required for nautilus
   inherit (libunique);
 
diff --git a/pkgs/desktops/gnome-2/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
deleted file mode 100644
index b82b8a50992..00000000000
--- a/pkgs/desktops/gnome-2/platform/startup-notification/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, xlibs }:
-
-stdenv.mkDerivation {
-  name = "startup-notification-0.9";
-  src = fetchurl {
-    url = mirror://gnome/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2;
-    sha256 = "03aqkgv8d29yx2vmv6bfdlxq3ahagrb7dbsvhd5d9acy6znimpk1";
-  };
-  buildInputs = [ pkgconfig xlibs.xlibs xlibs.xcbutil ];
-}

From 3378679ff9b14adc920372646d3a2a22b8144ef6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 09:56:48 +0200
Subject: [PATCH 0345/2033] chromium: Don't use v8 from <nixpkgs> anymore.

The version of v8 to use for Chromium is heavily tied to the specific
version of Chromium and thus it doesn't really make sense to use v8 from
<nixpkgs>, as we would need to have 3 different versions of v8, one for
each Chromium channel.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index be1725345e7..85964ee7687 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt, v8
+, libpng, libxml2, libxslt
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, libexif, pciutils
 
@@ -75,7 +75,7 @@ let
     use_system_libusb = false; # http://crbug.com/266149
     use_system_skia = false;
     use_system_sqlite = false; # http://crbug.com/22208
-    use_system_v8 = !versionOlder source.version "34.0.0.0";
+    use_system_v8 = false;
   };
 
   opusWithCustomModes = libopus.override {
@@ -85,7 +85,7 @@ let
   defaultDependencies = [
     bzip2 flac speex icu opusWithCustomModes
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt v8
+    libpng libxml2 libxslt
     xdg_utils yasm minizip libwebp
     libusb1 libexif
   ];

From 82535e0f8fc485db52ff976b9ef7d11096a8dfa3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 14:28:33 +0200
Subject: [PATCH 0346/2033] switch-to-configuration: Check overrides.conf for
 X-* options

---
 .../system/activation/switch-to-configuration.pl     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index f8c1ab12ebf..4cea0c5910c 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -96,18 +96,19 @@ sub parseFstab {
 
 sub parseUnit {
     my ($filename) = @_;
-    parseKeyValues(read_file($filename));
+    my $info = {};
+    parseKeyValues($info, read_file($filename));
+    parseKeyValues($info, read_file("${filename}.d/overrides.conf")) if -f "${filename}.d/overrides.conf";
+    return $info;
 }
 
 sub parseKeyValues {
-    my @lines = @_;
-    my $info = {};
+    my $info = shift;
     foreach my $line (@_) {
         # FIXME: not quite correct.
         $line =~ /^([^=]+)=(.*)$/ or next;
         $info->{$1} = $2;
     }
-    return $info;
 }
 
 sub boolIsTrue {
@@ -362,7 +363,8 @@ while (my ($unit, $state) = each %{$activeNew}) {
     elsif ($state->{state} eq "auto-restart") {
         # A unit in auto-restart state is a failure *if* it previously failed to start
         my $lines = `@systemd@/bin/systemctl show '$unit'`;
-        my $info = parseKeyValues(split "\n", $lines);
+        my $info = {};
+        parseKeyValues($info, split("\n", $lines));
 
         if ($info->{ExecMainStatus} ne '0') {
             push @failed, $unit;

From fa9ed04997cc07d0782b79ec1929af2ac24e0045 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 14:29:02 +0200
Subject: [PATCH 0347/2033] Restart polkit if its configuration may have
 changed

---
 nixos/modules/security/polkit.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 054d39c4785..5933cdc0cec 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -63,6 +63,9 @@ in
 
     systemd.packages = [ pkgs.polkit ];
 
+    systemd.services.polkit.restartTriggers = [ config.system.path ];
+    systemd.services.polkit.unitConfig.X-StopIfChanged = false;
+
     # The polkit daemon reads action/rule files
     environment.pathsToLink = [ "/share/polkit-1" ];
 

From 30ac332563318be4e445dc3335e803326df84d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 14:30:48 +0200
Subject: [PATCH 0348/2033] xorg: minor updates of three packages

---
 pkgs/servers/x11/xorg/default.nix       | 18 +++++++++---------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0ec14c8d62c..22ed05d2456 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -430,11 +430,11 @@ let
   })) // {inherit bdftopcf mkfontdir ;};
 
   fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
-    name = "fontsproto-2.1.2";
+    name = "fontsproto-2.1.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2;
-      sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
+      url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2;
+      sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -1140,11 +1140,11 @@ let
   })) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
   xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
-    name = "xauth-1.0.8";
+    name = "xauth-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xauth-1.0.8.tar.bz2;
-      sha256 = "1xylgy7qrf8w76gg1sa6x8ckv14q1nv0h554ndgrss8clpknlsd8";
+      url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2;
+      sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
   })) // {inherit libX11 libXau libXext libXmu xproto ;};
@@ -2000,11 +2000,11 @@ let
   })) // {inherit libX11 xproto ;};
 
   xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
-    name = "xproto-7.0.25";
+    name = "xproto-7.0.26";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2;
-      sha256 = "1zh977hrfxxdyhlxr9qjfa2xl8qrb4v43a2b708kdz2gvj2p894j";
+      url = mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2;
+      sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index a3faf256926..496ab72bdad 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
-mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
+mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
@@ -101,7 +101,7 @@ mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
-mirror://xorg/individual/app/xauth-1.0.8.tar.bz2
+mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
 mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
@@ -174,7 +174,7 @@ mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
-mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2
+mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2
 mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2
 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2

From f66e5664e03025dd25280408a2c66a5ba6a7e5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 14:31:14 +0200
Subject: [PATCH 0349/2033] xorg-server: major update 1.14.5 -> 1.15.1

---
 pkgs/servers/x11/xorg/default.nix       | 10 +++++-----
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 22ed05d2456..6708612a7ca 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1960,14 +1960,14 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.5";
+    name = "xorg-server-1.15.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2;
-      sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd";
+      url = mirror://xorg/individual/xserver/xorg-server-1.15.1.tar.bz2;
+      sha256 = "1qi1f9bf2jgp9fav7dgj698fnv6cghf2797ph7zy3sq24s4bcvb2";
     };
-    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ];
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;};
 
   xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 496ab72bdad..12e3ee64042 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.15.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 894e2dfb258bfefb4080c89f94ac6cf253174ec6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 14:37:05 +0200
Subject: [PATCH 0350/2033] Add a test for udisks2

---
 nixos/release-combined.nix |  1 +
 nixos/release.nix          |  1 +
 nixos/tests/udisks2.nix    | 56 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 nixos/tests/udisks2.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 741ab62bbc0..32f52375000 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -61,6 +61,7 @@ in rec {
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.udisks)
+        (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
 
         nixpkgs.tarball
diff --git a/nixos/release.nix b/nixos/release.nix
index 45c37570c1b..4a10ff39ed0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -245,6 +245,7 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks = callTest tests/udisks.nix {};
+  tests.udisks2 = callTest tests/udisks2.nix {};
   tests.xfce = callTest tests/xfce.nix {};
 
 }
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
new file mode 100644
index 00000000000..e0c57d7c34d
--- /dev/null
+++ b/nixos/tests/udisks2.nix
@@ -0,0 +1,56 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+let
+
+  stick = pkgs.fetchurl {
+    url = http://nixos.org/~eelco/nix/udisks-test.img.xz;
+    sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b";
+  };
+
+in
+
+{
+
+  machine =
+    { config, pkgs, ... }:
+    { services.udisks2.enable = true;
+      imports = [ ./common/user-account.nix ];
+
+      security.polkit.extraConfig =
+        ''
+          polkit.addRule(function(action, subject) {
+            if (subject.user == "alice") return "yes";
+          });
+        '';
+    };
+
+  testScript =
+    ''
+      my $stick = $machine->stateDir . "/usbstick.img";
+      system("xz -d < ${stick} > $stick") == 0 or die;
+
+      $machine->succeed("udisksctl info -b /dev/vda >&2");
+      $machine->fail("udisksctl info -b /dev/sda1");
+
+      # Attach a USB stick and wait for it to show up.
+      $machine->sendMonitorCommand("usb_add disk:$stick");
+      $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1");
+      $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'");
+
+      # Mount the stick as a non-root user and do some stuff with it.
+      $machine->succeed("su - alice -c 'udisksctl info -b /dev/sda1'");
+      $machine->succeed("su - alice -c 'udisksctl mount -b /dev/sda1'");
+      $machine->succeed("su - alice -c 'cat /run/media/alice/USBSTICK/test.txt'") =~ /Hello World/ or die;
+      $machine->succeed("su - alice -c 'echo foo > /run/media/alice/USBSTICK/bar.txt'");
+
+      # Unmounting the stick should make the mountpoint disappear.
+      $machine->succeed("su - alice -c 'udisksctl unmount -b /dev/sda1'");
+      $machine->fail("[ -d /run/media/alice/USBSTICK ]");
+
+      # Remove the USB stick.
+      $machine->sendMonitorCommand("usb_del 0.3"); # FIXME
+      $machine->waitUntilFails("udisksctl info -b /dev/sda1");
+      $machine->fail("[ -e /dev/sda ]");
+    '';
+
+})

From 18a7ce76fcf80389bc8db2dd3e961a74637b5162 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 14:41:21 +0200
Subject: [PATCH 0351/2033] Enable udisks2 by default

The ability for unprivileged users to mount external media is useful
regardless of the desktop environment. Also, since udisks2 is
activated on-demand, it doesn't add any overhead if you're not using it.
---
 nixos/modules/services/hardware/udisks2.nix       | 2 +-
 nixos/modules/virtualisation/container-config.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index 0f61f20c33c..f5b641c7378 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -14,7 +14,7 @@ with lib;
 
       enable = mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description = ''
           Whether to enable Udisks, a DBus service that allows
           applications to query and manipulate storage devices.
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 76e4b561218..195a8056bf8 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -6,7 +6,9 @@ with lib;
 
   config = mkIf config.boot.isContainer {
 
+    # Disable some features that are not useful in a container.
     sound.enable = mkDefault false;
+    services.udisks2.enable = mkDefault false;
 
     networking.useHostResolvConf = true;
 

From 1337f5f84cbdeb07e621eed913c661cc6ce5fa0f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 16 Apr 2014 00:15:30 -0500
Subject: [PATCH 0352/2033] Do not build CUPS support for ghostscript on Darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5dab755b89..2d76d68ef5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10440,7 +10440,7 @@ let
 
   ghostscript = callPackage ../misc/ghostscript {
     x11Support = false;
-    cupsSupport = config.ghostscript.cups or true;
+    cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
     gnuFork = config.ghostscript.gnu or false;
   };
 

From 6926d6c97df32e02aa9767b3d121a6480c968f52 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 14 Apr 2014 15:11:34 -0500
Subject: [PATCH 0353/2033] Do not use GTK when building pinentry on Darwin

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

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 81efd4841a6..4d1d55244c0 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib
-, useGtk ? true, gtk
+, useGtk ? !stdenv.isDarwin, gtk
 , useNcurses ? true, ncurses
 , useQt4 ? false, qt4 }:
 

From 3737ec7c746c7cdf7236793f07ac1d3d30978054 Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 14 Apr 2014 18:46:32 +0200
Subject: [PATCH 0354/2033] Enable compilation of MLton on darwin

---
 pkgs/development/compilers/mlton/default.nix | 41 ++++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 4bd05301ecf..44cbb5951f2 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -2,6 +2,8 @@
 
 let
   version = "20130715";
+
+  usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
 in
 stdenv.mkDerivation rec {
   name = "mlton-${version}";
@@ -15,6 +17,10 @@ stdenv.mkDerivation rec {
         url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz";
         sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
     })
+    else if stdenv.system == "x86_64-darwin" then (fetchurl {
+        url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+        sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
+    })
     else throw "Architecture not supported";
 
   codeSrc =
@@ -38,30 +44,31 @@ stdenv.mkDerivation rec {
     substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
 
     # Fix paths in the binary distribution.
-    BIN_DIST_DIR="$(pwd)/../usr"
+    BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
     for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
-      substituteInPlace "$BIN_DIST_DIR/$f" --replace '/usr/bin/env bash' $(type -p bash)
+      substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
     done
 
-    substituteInPlace $(pwd)/../usr/bin/mlton --replace '/usr/lib/mlton' $(pwd)/../usr/lib/mlton
+    substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
   '';
 
   preBuild = ''
     # To build the source we have to put the binary distribution in the $PATH.
-    export PATH="$PATH:$(pwd)/../usr/bin/"
+    export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
 
     # Let the builder execute the binary distribution.
-    chmod u+x $(pwd)/../usr/bin/mllex
-    chmod u+x $(pwd)/../usr/bin/mlyacc
-    chmod u+x $(pwd)/../usr/bin/mlton
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
+    chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
 
     # So the builder runs the binary compiler with gmp.
     export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH
 
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
     # Patch ELF interpreter.
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../usr/lib/mlton/mlton-compile
+    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
-      patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../usr/bin/$e
+      patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../${usr_prefix}/bin/$e
     done
   '';
 
@@ -71,21 +78,21 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     # Fix path to mlton libraries.
-    substituteInPlace $(pwd)/install/usr/bin/mlton --replace '/usr/lib/mlton' $out/lib/mlton
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
 
     # Path to libgmp.
-    substituteInPlace $(pwd)/install/usr/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'"
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'"
 
     # Path to gmp.h.
-    substituteInPlace $(pwd)/install/usr/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'"
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'"
 
     # Path to the same gcc used in the build; needed at runtime.
-    substituteInPlace $(pwd)/install/usr/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p gcc)"'"
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p gcc)"'"
 
     # Copy files to final positions.
-    cp -r $(pwd)/install/usr/bin $out
-    cp -r $(pwd)/install/usr/lib $out
-    cp -r $(pwd)/install/usr/man $out
+    cp -r $(pwd)/install/${usr_prefix}/bin $out
+    cp -r $(pwd)/install/${usr_prefix}/lib $out
+    cp -r $(pwd)/install/${usr_prefix}/man $out
   '';
 
   meta = {
@@ -101,6 +108,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://mlton.org/;
     license = "bsd";
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
   };
 }

From d6aee89fd73e59fc661e351a3829ef05401cc461 Mon Sep 17 00:00:00 2001
From: Marco <marco.maggesi@gmail.com>
Date: Tue, 15 Apr 2014 15:59:01 +0200
Subject: [PATCH 0355/2033] Fix build of MLton on Linux i686

---
 pkgs/development/compilers/mlton/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 44cbb5951f2..2fa986375ff 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -4,7 +4,12 @@ let
   version = "20130715";
 
   usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
+
+  dynamic_linker =
+    if stdenv.isx86_64 then "${stdenv.glibc}/lib/ld-linux-x86-64.so.2"
+                       else "${stdenv.glibc}/lib/ld-linux.so.2";
 in
+
 stdenv.mkDerivation rec {
   name = "mlton-${version}";
 
@@ -66,9 +71,9 @@ stdenv.mkDerivation rec {
 
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     # Patch ELF interpreter.
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
+    patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
     for e in mllex mlyacc ; do
-      patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $(pwd)/../${usr_prefix}/bin/$e
+      patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
     done
   '';
 

From 3ccf99037210bbd62b2fe597a43fa679c5e7c329 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 11 Apr 2014 21:58:21 -0500
Subject: [PATCH 0356/2033] pcscd: Refactor service and use socket activation

---
 nixos/modules/services/hardware/pcscd.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix
index 119761c7a44..6e30dfb752d 100644
--- a/nixos/modules/services/hardware/pcscd.nix
+++ b/nixos/modules/services/hardware/pcscd.nix
@@ -28,9 +28,15 @@ with lib;
 
   config = mkIf config.services.pcscd.enable {
 
+    systemd.sockets.pcscd = {
+      description = "PCSC-Lite Socket";
+      wantedBy = [ "sockets.target" ];
+      before = [ "multi-user.target" ];
+      socketConfig.ListenStream = "/run/pcscd/pcscd.comm";
+    };
+
     systemd.services.pcscd = {
       description = "PCSC-Lite daemon";
-      wantedBy = [ "multi-user.target" ];
       preStart = ''
           mkdir -p /var/lib/pcsc
           rm -Rf /var/lib/pcsc/drivers
@@ -38,7 +44,8 @@ with lib;
       '';
       serviceConfig = {
         Type = "forking";
-        ExecStart = "${pkgs.pcsclite}/sbin/pcscd -c ${cfgFile}";
+        ExecStart = "${pkgs.pcsclite}/sbin/pcscd --auto-exit -c ${cfgFile}";
+        ExecReload = "${pkgs.pcsclite}/sbin/pcscd --hotplug";
       };
     };
 

From 6da24700348fec9d78a86b58e5a306f0de5b76c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sat, 19 Apr 2014 23:21:51 +0800
Subject: [PATCH 0357/2033] drop my maintainship of orc and vala

---
 pkgs/development/compilers/orc/default.nix  | 1 -
 pkgs/development/compilers/vala/default.nix | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index fd5a85967ed..7802b40808e 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -15,6 +15,5 @@ stdenv.mkDerivation rec {
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = stdenv.lib.licenses.bsd3;
     platform = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.iyzsong ];
   };
 }
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 8cf5fb9afed..38c3ead7bff 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = "http://live.gnome.org/Vala";
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ antono iyzsong ];
+    maintainers = with stdenv.lib.maintainers; [ antono ];
   };
 
   src = fetchurl {

From 4160e659314ae7cff7534ddac3ab5fdb1483e18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 22:06:22 +0200
Subject: [PATCH 0358/2033] mediastreamer: fix build by updating

Probably broken by major ffmpeg update.
---
 pkgs/development/libraries/mediastreamer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 3b1fd9faa6b..d8a2ea6ee37 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -3,11 +3,11 @@ libv4l, libtheora, intltool, libvpx, gsm, mesa, libX11, libXv, libXext,
 glew, libopus, libupnp, vim }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.9.0";
+  name = "mediastreamer-2.10.0";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "1mdcaqkcdwzlj7hy3bz0ipkrrqiw1cgy01in8f24rfra9i2bjif2";
+    sha256 = "1sp1vjcz0rx518l7cfmkb4802xa5wyylr2b5hxlpjk3ygg28g3c0";
   };
 
 # TODO: make it load plugins from *_PLUGIN_PATH

From 5d850ba9d34c6d0097ca21f281c8b8fe38b918ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 22:14:54 +0200
Subject: [PATCH 0359/2033] xorg: revert fontsproto update, as it breaks
 libXfont

This partially reverts commit 30ac332563318be4e445dc3335e803326df84d3c.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6708612a7ca..ad3e8fa8ac8 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -430,11 +430,11 @@ let
   })) // {inherit bdftopcf mkfontdir ;};
 
   fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
-    name = "fontsproto-2.1.3";
+    name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2;
-      sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
+      url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2;
+      sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 12e3ee64042..6ae9725aa71 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
-mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2
+mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2

From 4fb50f071f18279048bfd67267146aaec379e01d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 22:59:25 +0200
Subject: [PATCH 0360/2033] Manual: Typo fixes

---
 nixos/doc/manual/configuration.xml                          | 2 +-
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 1dff9d2f21e..0ffee826dc4 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -935,7 +935,7 @@ environment.systemPackages = [ (import ./my-hello.nix) ];
 </programlisting>
 where <filename>my-hello.nix</filename> contains:
 <programlisting>
-with &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
+with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
 
 stdenv.mkDerivation rec {
   name = "hello-2.8";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index eced13444de..75ec6671d15 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -450,7 +450,7 @@ in
       extraModules = mkOption {
         type = types.listOf types.unspecified;
         default = [];
-        example = literalExample ''[ "proxy_connect" { name = "php5"; path = "''${php}/modules/libphp5.so"; } ]'';
+        example = literalExample ''[ "proxy_connect" { name = "php5"; path = "''${pkgs.php}/modules/libphp5.so"; } ]'';
         description = ''
           Additional Apache modules to be used.  These can be
           specified as a string in the case of modules distributed

From 0a256cc0ee45f3766e68ec29b03a50731ca64ae0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 23:02:59 +0200
Subject: [PATCH 0361/2033] Firewall: Only start if we have CAP_NET_ADMIN

---
 nixos/modules/services/networking/firewall.nix | 17 +++++++++++------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index e604ba23b87..42914bfe5d6 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -18,8 +18,6 @@
 
 */
 
-
-
 { config, lib, pkgs, ... }:
 
 with lib;
@@ -266,16 +264,23 @@ in
                      message = "This kernel does not support disabling conntrack helpers"; }
                  ];
 
-    jobs.firewall =
+    systemd.services.firewall =
       { description = "Firewall";
 
-        startOn = "started network-interfaces";
+        wantedBy = [ "network.target" ];
+        after = [ "network-interfaces.target" "systemd-modules-load.service" ];
 
         path = [ pkgs.iptables ];
 
-        after = [ "systemd-modules-load.service" ];
+        # FIXME: this module may also try to load kernel modules, but
+        # containers don't have CAP_SYS_MODULE. So the host system had
+        # better have all necessary modules already loaded.
+        unitConfig.ConditionCapability = "CAP_NET_ADMIN";
 
-        preStart =
+        serviceConfig.Type = "oneshot";
+        serviceConfig.RemainAfterExit = true;
+
+        script =
           ''
             ${helpers}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d81df6c31d..39da338126f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9927,7 +9927,7 @@ let
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
-  kde4 = recurseIntoAttrs pkgs.kde411;
+  kde4 = recurseIntoAttrs pkgs.kde412;
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 

From 9e9f2823092396659ec425121fff27110800544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 19 Apr 2014 23:42:54 +0200
Subject: [PATCH 0362/2033] xorg-server: go back to 1.14.6 due to intel
 problems

Again, stable releases not compiling together :-/
---
 pkgs/servers/x11/xorg/default.nix       | 10 +++++-----
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ad3e8fa8ac8..07a6282a085 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1960,14 +1960,14 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.15.1";
+    name = "xorg-server-1.14.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.15.1.tar.bz2;
-      sha256 = "1qi1f9bf2jgp9fav7dgj698fnv6cghf2797ph7zy3sq24s4bcvb2";
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
+      sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
     };
-    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ];
-  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;};
+    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
 
   xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 6ae9725aa71..a05241350fd 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.15.1.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 5c2bd5dffc0411fbee77ac7f0ce87627bb198498 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Apr 2014 23:50:16 +0200
Subject: [PATCH 0363/2033] Remove obsolete line

---
 pkgs/top-level/make-tarball.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 8e5bab29474..d9da72671c7 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -72,8 +72,6 @@ releaseTools.sourceTarball rec {
   '';
 
   distPhase = ''
-    find . -name "\.svn" -exec rm -rvf {} \; -prune
-
     mkdir -p $out/tarballs
     mkdir ../$releaseName
     cp -prd . ../$releaseName

From c95cea4bfd91d1ef6cda0da3e5604909ff7a05c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 00:07:14 +0200
Subject: [PATCH 0364/2033] Tarball: Check whether Nixpkgs evaluation doesn't
 depend on its path

---
 pkgs/top-level/make-tarball.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index d9da72671c7..70330f4304f 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -46,8 +46,18 @@ releaseTools.sourceTarball rec {
     export NIX_STATE_DIR=$TMPDIR
     nix-store --init
 
+    # Make sure that derivation paths do not depend on the Nixpkgs path.
+    mkdir $TMPDIR/foo
+    ln -s $(readlink -f .) $TMPDIR/foo/bar
+    p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox)
+    p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox)
+    if [ "$p1" != "$p2" ]; then
+        echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
+        exit 1
+    fi
+
     # Run the regression tests in `lib'.
-    res="$(nix-instantiate --eval-only --strict --show-trace lib/tests.nix)"
+    res="$(nix-instantiate --eval --strict --show-trace lib/tests.nix)"
     if test "$res" != "[ ]"; then
         echo "regression tests for lib failed, got: $res"
         exit 1
@@ -56,18 +66,18 @@ releaseTools.sourceTarball rec {
     # Check that all-packages.nix evaluates on a number of platforms.
     for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do
         header "checking pkgs/top-level/all-packages.nix on $platform"
-        nix-env --readonly-mode -f pkgs/top-level/all-packages.nix \
+        nix-env -f pkgs/top-level/all-packages.nix \
             --show-trace --argstr system "$platform" \
             -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null
         stopNest
     done
 
     header "checking eval-release.nix"
-    nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
+    nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
     stopNest
 
     header "checking find-tarballs.nix"
-    nix-instantiate --eval-only --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null
+    nix-instantiate --eval --strict --show-trace ./maintainers/scripts/find-tarballs.nix > /dev/null
     stopNest
   '';
 

From c49404547bc3315953baa563347beb9034bc7512 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 00:46:22 +0200
Subject: [PATCH 0365/2033] Use <nix/fetchurl.nix> to download the bootstrap
 tools

---
 pkgs/stdenv/linux/default.nix         | 15 +--------------
 pkgs/stdenv/linux/scripts/download.sh |  8 --------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/stdenv/linux/scripts/download.sh

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 3d424c904ba..0aa0a9a840b 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -40,19 +40,6 @@ rec {
   # of coreutils, GCC, etc.
 
 
-  # This function downloads a file.
-  download = {url, sha256}: derivation {
-    name = baseNameOf (toString url);
-    builder = bootstrapFiles.sh;
-    inherit system url;
-    inherit (bootstrapFiles) bzip2 mkdir curl cpio ln;
-    args = [ ./scripts/download.sh ];
-    outputHashAlgo = "sha256";
-    outputHash = sha256;
-    impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
-  };
-
-
   # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
   bootstrapTools = derivation {
     name = "bootstrap-tools";
@@ -67,7 +54,7 @@ rec {
 
     inherit (bootstrapFiles) bzip2 mkdir curl cpio;
 
-    tarball = download {
+    tarball = import <nix/fetchurl.nix> {
       inherit (bootstrapFiles.bootstrapTools) url sha256;
     };
 
diff --git a/pkgs/stdenv/linux/scripts/download.sh b/pkgs/stdenv/linux/scripts/download.sh
deleted file mode 100644
index e7594f208ea..00000000000
--- a/pkgs/stdenv/linux/scripts/download.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-set -e
-
-$ln -s $curl curl.bz2
-$bzip2 -d -f curl.bz2
-./curl --version
-
-echo "downloading $out from $url"
-./curl --fail --location --max-redirs 20 "$url" > "$out"

From d4f44d6db351bdfcd089a26fc9cc973254a48cae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 01:16:12 +0200
Subject: [PATCH 0366/2033] Move stdenv bootstrap binaries out of the tree

Commit 986f36194650e2a41451cbfb9f29ce1c66a62df3 started to use
<nix/fetchurl.nix> to "download" the bootstrap binaries from the
Nixpkgs tree, using the file:/// scheme. This has really bad
consequences:

* It makes any derivation depend on the path of the Nixpkgs tree. So
  evaluating a package will produce a different .drv file when run
  from different locations. No wonder Hydra evaluation has been so
  slow lately: for every Nixpkgs evaluation, it had to create tens of
  thousands of .drv files, even if nothing had changed.

* It requires the builder to have file system access to the Nixpkgs
  tree. So if your tree is in your home directory, the stdenv
  bootstrap would probably fail.

So now the binaries are downloaded from tarballs.nixos.org.

Also dropped PowerPC "support".
---
 pkgs/stdenv/linux/bootstrap/armv5tel/bzip2    | Bin 124936 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/armv5tel/cpio     | Bin 20280 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2 | Bin 151568 -> 0 bytes
 .../linux/bootstrap/armv5tel/default.nix      |  36 ++------
 pkgs/stdenv/linux/bootstrap/armv5tel/ln       | Bin 13728 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/armv5tel/mkdir    | Bin 15484 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/armv5tel/sh       | Bin 82672 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/bzip2        | Bin 73856 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/cpio         | Bin 13524 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/curl.bz2     | Bin 122036 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/default.nix  |  40 ++-------
 pkgs/stdenv/linux/bootstrap/i686/ln           | Bin 8176 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/mkdir        | Bin 9600 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/i686/sh           | Bin 63280 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/loongson2f/bzip2  | Bin 146364 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/loongson2f/cpio   | Bin 88564 -> 0 bytes
 .../linux/bootstrap/loongson2f/curl.bz2       | Bin 172614 -> 0 bytes
 .../linux/bootstrap/loongson2f/default.nix    |  35 ++------
 pkgs/stdenv/linux/bootstrap/loongson2f/ln     | Bin 59552 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/loongson2f/mkdir  | Bin 59548 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/loongson2f/sh     | Bin 155016 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/powerpc/bash      | Bin 624584 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/powerpc/bzip2     | Bin 85816 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/powerpc/cp        | Bin 64700 -> 0 bytes
 pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2  | Bin 148830 -> 0 bytes
 .../linux/bootstrap/powerpc/default.nix       |  79 ------------------
 pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2   | Bin 102939 -> 0 bytes
 pkgs/stdenv/linux/default.nix                 |   2 +-
 28 files changed, 17 insertions(+), 175 deletions(-)
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/bzip2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/cpio
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/ln
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/mkdir
 delete mode 100755 pkgs/stdenv/linux/bootstrap/armv5tel/sh
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/bzip2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/cpio
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/curl.bz2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/ln
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/mkdir
 delete mode 100755 pkgs/stdenv/linux/bootstrap/i686/sh
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/bzip2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/cpio
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/ln
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/mkdir
 delete mode 100755 pkgs/stdenv/linux/bootstrap/loongson2f/sh
 delete mode 100755 pkgs/stdenv/linux/bootstrap/powerpc/bash
 delete mode 100755 pkgs/stdenv/linux/bootstrap/powerpc/bzip2
 delete mode 100755 pkgs/stdenv/linux/bootstrap/powerpc/cp
 delete mode 100755 pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2
 delete mode 100644 pkgs/stdenv/linux/bootstrap/powerpc/default.nix
 delete mode 100755 pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/bzip2 b/pkgs/stdenv/linux/bootstrap/armv5tel/bzip2
deleted file mode 100755
index 5c9be292fe8b8aa9fc1778588dc5ed5a824b056c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 124936
zcmb<-^>JflWMqH=CI$@#5br_*1A_?z14F`7Mg}GZ1{M<r1qK!d4F*950g!w_#}!6~
zju0j=e!#%M0KzN`3=AL)(hoMTfq{Xcfq^0CDkB)Pf&?2FK>ES_oU2R>Ak4zYz!2fg
zz`zET4}4mZ0%D?LkUYqI-UACBez>pul4XO>qYvw)U!thnu;4Mng9VRS1m-^BRao$l
zMM3u|3xn=cfdliOvK-KT%EK`KDUZSYr^g}~UcC=vc<rIU#L%#kfnf{Ct?mchINT4o
z3Ai6{lW;%arr>_SO~d_wn}PcQHw*UzZVv7T+&tV5xCOW$aEow1;FjQiz%9f5fLj4b
zkAv<@4Tt$p84RvGWnc(?EYPr5LdIY|n9az*z$L;k|LOn#|6eg0EO^XdaO9~#!`>GK
zkD0(u&j@8=V0obX)W%@`Q<e+9k3jmF7#O$=80J4U5P;~@VE~yu0c;*K0|S==)NBR@
z1}@|O`VUzy^gd!}*!u!xAjrIu$4m?*S0UyXfZTS$_mP4_?<0nU1rIqC7CdHQSnyCf
zkm2=|2lJmY99Zy}H(<d-27v{S*%=l*W>C2DoKa-KLneX72lEu0A1pRp@Q}ga$n$2!
z1rHe+93C|rEO^Ld(ENarq2Mv2K=Ol6|Nl!F7&JcOF*y31QK07$gTaEw%pfxinjbMR
z1U=?rV36Wq2!8zY|9>eShSmp+3df!^8U#FHGC1~}QK9J(BSX-`U;qE_(zww3sGwo*
z3&sNr9^U@{|JB(uXU>4!&Ioc_!h(m&fef!192PueWmxb~0mNnqdC0)9U~@sk-W@Cq
z2@e<;+8(e9EO;mw$nctxq2Lh%!vbTFc{&R7pF+ZK(o;r(1&?1VEO>mykKwfpG)$Qo
zf*&&*EV#^I&~TN3VZzfpVGOTB9x*XQC@?V`5MgF8aL|3p5U}7OC~g=T7CdBhSn!Ym
zWCwS^V|E6HE*1fZn;5khJkA2S3lzsDN1uY?#GqmC3ms6rDlB-&z%co#iopD*jMfVt
z%XlK}2gNrdlKp$2_PZ!T?C&w0|Fi&<E)*s|1;rmTL(pSE1_rJQM^Ku8q&Id32Cf{#
z`A-=hOn%D15cimwf#FsHh<{-6Qyzx6hiVKAr$QJ(>L)y9W(a%8kkD`x<ky8^46hwP
z>J%nF1)2Nu|9>tMF#qyXP~1KJ|DQ{PasE>df!;^{?hLOP7y=$EGcZW~K}ze!p!fyp
zVF1}3@EDXPZ@V+R{=qQ+X^IC#&z1lGx!xGefBHrMlqV)XWl)&-^ohXyr?)&9UZ4H{
z|J4<P`A^S)<UoF8nD~_MK+Xdug9Q(d2!Qf!?^A{cy-&}3Fua}sjWc9F6ofInp5QS5
z>4bp!PiKJ5nEI4~Van6PAiEW&KJ5UBF-&>7AIh&0nEy1!0OXD-Pj`XD7^XaBP?-8O
zLty^XZ5|A-SN#9~%E4g%QwOj<h+9E%=p!)y={gUF*N6ZAf0e+(%&<a$nPG_lGeZv#
zGdP_Ta4<9EaWFH?;9+K%z{AW?%E8P4N=F?$%nUCSnHWAOF)^qpF)>6aF)>U~Vq(~!
z#Kf>ik%<9p7brZzexLHxLSX*WDIN^3O+ao`fW!kM1A`PJ!-B`v|Np-R`AtS({!<x+
z`A<P*Os5CK>+k>nzXI6<vM)iI3GB8GWhSs&K<@YePQw9@z-c&P!9!Mu1%e<mxfmE;
zf$|g!C=3_^9{>LTUy4m&!NX7g|G#EoXnD%&u;3x6tN^9u4-I=?a4<AHvI$~%%}@~V
zh=+lJizT4_DMLW}Q#OVL53K_jUb8YZJTeJlc+FrC@QB@E!9!44#bD6>6l7*-0K@Co
z|Np-_^#A|s5AM1z845t<$%2OuLLq77L;GHiD+%+TGB_-Fe4%0fQ*fSJu;3xvgar>-
z46Z(BVQ75-$}1ps3<qXB1(ida73MrtU=VuD5U_xelYxPYQQ*Q;#(;)LjRp%Ig5<zu
z1%uGzAOHVLF)#!^W^`D<`1=2UE|48e3=FR}8G!T)KV|`iuS3ft7K01VL3T7NEO_|+
z|9>e)?vTeU0t+@WN-tQ<ps?UElfi}OuyTuuArMq<onl;Y@;L*;^rsR6^PesO$4~oH
zWcObF|6l4u``#BD1(+E`9x*Yv2+V)#0*Y^g1rI^_02H5~I2Xqf=gbTX9{>A?8RtA`
zalQsioP+8VQ2GF+6;QlG?3(;kKw$pUKklG1a>3*0|Neu^I#Ak?QDI^LmA4x}abPg*
zDI-JhV?G83t|bQZpDuBj|8z;f{HF}iG&)CM{?pf>^1$FKxK83@V31;f>JemMkOH~;
z!oUBoGYsZG&2X6iGy_R*iopD*caZdc0L2Hxl&1j#^PdJN%zqkSF#qWlcZS!m{{Mf)
z05u<!R+$(UJl+io3xg@(a{PnBg2x&R^PeXALef7d|AG7g$^)Rhxka6c!AFIO0XZMc
z&}L!)g^2(tKR8T&`j&^`H7Gn7Ky3wv1rG%r_P*Ha&hQFkMvo2?xa`*emEWN9*I_a^
zO+MgZcnykckRDb8ME)>v*!yA`RPO>kCI*llAayH2esu_V1S%J&x`EPq$RkFE1;XGq
zfHA}lHr)lFv<a?b4hk%I{K^#+KLwz4{gA<70W&Bcf$EvtApH&jk3j7MSiS_+F`#t5
z(3Ro!&;S2lf$};yz5^CK4D)Ar?NR_L_oqK)W(WY)U7IZu=5J+UVA#b8%KHM-p6>Di
z<=X`hz5PM?cKTChgM<gn3?UB{7(i}ndGz)F|68#9zeWI3rl}ZAcnb0#D6cR$EO^Mz
zz`!M-FyX0$0jPcnddSAWpam+w85u4=5in?Z3Ua$3C>$6TfZ9ecZuvs|$HdUUB+#&z
z<J<rLul#*b#XkQ3|H{K*{!<Td+L`hcly4Xqraturn=|F<N;m9fq!B2MFid?4O82lb
z(!m{)Mqufq#2B-T1l98f4v;pOfWQ=RTt~Qq;w#`WD+7a+jKY+s5&~16g2EaU9-#P+
zb7gpS_5c6Z6CN`$eDK$O$$H!Ok<JC*M~npv9)jxX8{QE8%nS@t><kMYUV-vKY2o<)
z|F4gT%zt{sWd745TjoDy?e2ZVaA4w7k%o>(pnS%`0BU#5e#$Pe;330--lzP$46hj`
zEO^Ms)%!@q1kx5%1n0Zi;JgZ|^BYX&Kji|o;RGf>b@5?%oe|Lc$RNP=5vY8g2riof
z9vgznI)Md`BUI);Wix=ZU2=UOZ7Yzv)lfHH1DBa0ptA86i@}12Aop;B+Bymg9_|oj
zc+DsUa>qn){(tuWKNsuj-bWxmutxVjV)gEQq_UvvkwQbqBbk8KM-mP#k65{TAA$69
z87z1xz|ioBQDMPjhKAm!ECIbwIUIVQ-Vs5V$;MFpc-#N~T+9r`Ap5yE8Hyi++R-bR
z=RaNd@Bi!0zyDtw{QLhJWGBd7AiI$529?zydywr1*^O-90g!!KAU{k3`vK%%P#k50
z{O=I(Xxjh(;5cjYhNR0$|NnF87(>cHCWi2bD$4U&xfmF@Kzh!A^e_ZG?)?9MSI+<c
zuR&t7Kxs#L{!>spnZcpyX%ncNGg$B#6vhk&O-}=%dTKy*F2jO{eb78#0aiB~?56n)
z47V7qdLOBnfZA5Uj~Tssg>(#hpDJvbA__`Vj8VOh6t;lcJJFA)gX+Jm-bXSj)1GSc
zEO@BG(EC)0Wx+!YhTf;z5+MHEr!oS)Pg$jVAL%&EeJWux?Ws<}+^75u2cOC?%zdgB
zvf!c0n*|TGk1Tko;<4Z%AH%_?yax_G<=JrXDffeePq`cpKIIHJ_!Oj9IcLE`<%$Il
zm0K1(R9ds(q0)>64>=qTK4nih_>`^S;8WIygHKru4nAdGaPTS9go95t0_Hwt0F@^J
z2cI%19DEAuYZx%}J~aWkr@Hsioxu5^w(Vn3z06V2{)mm?`t#k646j)f7CZ!%u|FIc
zUW3Y8MuP<p4H$YKF*8hf!2uC_3^Qkr;ryqdG7;1Vc;m?MnlYj65eGvU$jpbJKE%ua
z|D{R-=Rf60aC-!@hhf2j#|#@5JO-s3HijF|=Ofv72V(X^kbPVX3m$R{EO_|F0qlmy
z3=0-KWZVEL_d#~47|wrs0f&A5xxJ4R651Yt@-Qgg{cC$4&HD5IHHW~0hoCev{m=i`
zF#jAmF#jo+!h(m~pmssSoTp(<Q2QJffZcz<0GzkMZrS3<@Y+D3_Yn`nq!&I;2sSfA
z?+ciF-5~nGegK7ig~0r$yP$rkFqr>zG1R{t482czK=A<0;|T)up9&=OJ{2kGefr6j
z;kC|%-bbvrdmnx1-}^#AVLrI-WiXiZ)P`aHQ&EKlj~l%iUVr`n|5XDIGs6@fW`-6X
zNFC83%)r27!o&cotw8Nz28Ivz3=9Ph3=9em3=EMD7mS%0b{IqYzM%Fs&jsH{0Sc3!
zdK{Silve=Mckg`)D)-!7AY~}14Zs8K=T`iKmbvb_FPBUO)o%+PGXw-Yx&f-E4Ng9F
zWMJT$Pzn;C{uI=|^I%}$VrB>i^<B6??HXGK1}+AJ>9BH>D}#0ZQz3A@5%9Q|fq^R~
z719o637GcWhjso_P&`Nf0ky*d9xE^~NU=DyJQ83CdHfAjMjA|i%4FdD2xP7)1H&wk
zxgfhh<}f6H><@dK4Yoh*u@fkdGK4)|%)r3)hh_fL>c9VA|8Rkr|Ab}!)8s$@UxVxd
zrQ?J@pf>n|hpD~{uWyKe`YSCDSQQpL*7aq0eg6OdS0_wBWf7!*(8j<ZwMPZyUr1S|
z%D`~z#)aNTpmt|R2}m5`*Ch-LQZ+2|pH2~(|J38p|JNXPkI4L|u7Cc&-u3_gE0EnW
zEc2f_{`vnpfo1;F0+IPo?f(3Kz4`zDS1usFK<}fo&J3>`4CX%Nw_<+8$Qk_j(EtBZ
zJ|^>@`heXC=`Tr`%zx@2GXH6kE5mCQBzN8X|Nj(Z45aDlwg3NLDTvH}`i6P_(*#$B
z*AgK83l=<l!94%z&cFX(Gc*J|x&(?RhN#C6K;Z=~dqMqD4v_zx=RbWTJpbt$Wl-2m
zdFt-U@OlCB{HOasdKsoX74c$teZhJDQ;>b2JORpc3=J($84ON76$Zt%!E{g^{}>ck
z3;``qYe9B_`tAlNpRWJ^|5c0d{HFoT^PgI}GQ92q*}Y)FLxzUQPeJuffEUB-WIsr{
ztO3=*3{j6k^@oe`{HHD;_XJFS%HS~RsSr5rPI&6$$MD)mc>YrckU0#!Pr>CH!-9uW
zt_-hPK<W)3@iy`Q|5Mxk|9_?842m;I-`<jef$Iv>{HIx9e+4|&1=(i+YR?5fP6MYu
zh&mSr2CfB6^Pj#En*TJ#8RE9M|Nptx{{8=YjnVw4YlJ}I1c{#tqxnxyfcOEuPk*{F
zyw3ms|J4ek`A>H!&3_8=Bg2A8V1J5vF}&7<`g7j@|6D0S^Pi?T&3`%tq*r0eQ&4;C
zCCHCZHmJ>4BQ*c%6BmZpIv}&4{$faIx*7#;&qLfA3JPnc`A=h97+#<L|NoT_)BLA9
z{``Oa06Nwn0(C#Aj+20<H73qrP}_y;0%)uO+Ante{~yf1Ac*iAs2*Stn*a2$3&U&6
z|Nme0K+XIQDi0X~9;<@vhKAp!|Npr}|Nnng!Z`owoqzvdM;Ok3dO{J@_dNWR!Qj$U
zR)*k*mH+=sc`(j@YUl!LCkH$%{r{gU;_v_05rOlcMmWxY+5xf~>i=a(VNoJD|0yUu
z7J|eWq8^L=|IY<Vhf|yxUJHZT>EQl7WZdP;zyDIL|Np;|F_`<5@qzOr&=}6u|Nn1&
zF_{1K3v?U;G%jOu5Y(QCd(3=b0VAkCx4~fkQx%Z?4|<=n9O!+T_5c4XP(5(~st2TI
z2B`lcIRB~i|NpPReK`e?{~+lz3mnc9o-Xl))U^x@y-)85%m=q|6Ab1*ErPoJ!vFtL
z&;I>?m0~deX$q45D5(A^NcutjJ5U>0#9;o@Bo~I)p!^c<%<%f!zyGg5<0GK46VMpR
zhpS8s7fhKT<0K}K_Bd#~&B26;!NY_JK6bLkgo&ZRn2BMDDHFJEd11-~9$x{~D={Wa
z4EY?)450RRg9#IZ&m$%VA5$iV22&;m4HG7Y3nokqyG588I&_#A6ik^IR7{x|{($T<
zg|yez??Bq?pfO7(t=>m6=1osQ_4_LiNdC!UV36|5?R~^#)%!@pq4$wSLfa$tn%+k{
zCe44kW7GVnGRG%BWoTINP{G0Fkwk*qBb9>oM+^qHpE4-Sd<v@HxdawG6cFfrv5b@9
zHK=|PU|`?^*`s0($?rU%ws=FwBSuhPj3M~33<HA{o5F&J2}bk5`a$LKB7TO~Fg>gc
z#gD)I|1YJ^)B6Y{r@+wgC=Fz`!Ax*_(G1CaPJ`x0Y@o5tkMpNTGcdfmGJ}C3W+nr}
zjTsCK7iKUpFwA6Nu$alf5HS-pZXf&@)IL(z>3yVb)B8w5q3Mx~LGvS!A3*ke=0Las
z)aQ$2V2}d2NrrvWQwed9U%-8&Tg(cevEhr)nGBAA$95T@W4j<TKxSEUqMG9lGRLa-
z5jY$fVji#m|6dA}N7A5mts_Vt6fegoJq3-+`54ZB>H|veps_}UiBDY&=Rb83od5KM
zGsEix|Np-#`t$#F)35)pRTSqxH2{xyLdJZ>6&5@W_XNf1g2$)t_deo;wr2#uWy$2H
zObk&ELH!Gm-D{jc?fr<y5)2Gnp!~-GEo;DW#jxP<yZ`@R9Z{J7^bU9|5@Nox!h*;4
zQ1hSt|Nn~f_y5-i80J51{{8>;42Ahmcc7^?@dVki;4x^NyFvjpz6$E=O?o<oVg6HH
zg$0jwpk`eL)k6&PpBDc9{~F{r7ihXX0u84|uv-fr9{~3mW`f%@pmIY6G>(E~C#c;Z
z4z+V1$V?t)h7AJD44^g|XsiR&F9zjF0W&5B2Qx@M0*#@_m@zS|F=JxrFk@nfFk@o)
zV9Lb6VFno|nqUMfM*<#!`dX0j>BCPOoaT$hFfee{FwK7ost5Fc{eR71Fa_KO^8>em
zf*<>U+d#qKwh&0p#|c!X1wR&LVBiAP0~>xr+F8Zma(W8bPoQxq113;7^*&nb$nY9g
zCxF@?)kx}Cz-BY-0@dk33=FpznC3rK`u+d)AJAAi!<45<9t^KbL493@fX560Q&`Oz
z7^I#gg6i67;QRw_S2)gpdP8vj(*vM-fMLp0LuZE9TNvj*T>*C2l&AmP8D8%JryI~*
zN%K=sS@#;$o?r-gyuxrkE2F{!W(I}BtQ=r>LCj@kV7S$wh-f>vFwTF<tgztmCJ%<!
z1<-kq0LJ-G3k2ssee@F&W+sl1a5?|~Ki3Xu+f0XX{?l7fc@e1m@&Et1HvIqpiUs6H
z(AXG5@MBP24H~z9{OkW~j==d(6&&Y3RRHB1Xg&1@R2M?oJkWaTyA#7}7LcEzb@mOU
zw%XPI|6grjnE&*J!2G9QL3#rM9&PylU+RRy{HH5G^_at?rwjp;pI!s?n;0fM74SjS
zCp)0^323YtlovpK4^Z0(r2Z6CJ&O;+>nY$m3(+<Ljf-D$Vt8Eus&Alf+Wi0jshj`*
zzcMkH{}ePH51LZ})p4M@CPHBTQ_x%jtd0SVd*3jFjDbg(L((*?Zvv}BN;sGqa?F_+
zKy}U$P&(&fW?(Rf)E}U_2vqNwm@_dv0ObP{>~#jH{0G$=;JKlM1rMXa<5K~TEkN@k
z3=1BHL-{74x}+AVE-7e#q`s#2QNk8zJu(4Wj}*9r$4)?PYEYgBj|G9ofDCRw1=S_O
z9FV%iAE~SdmC4?qx@1D<BW4DMSD>;PR>z2g#-2d)Pmr;phoG{Umk&`6gX$Cu&{#f0
z@M8vsU|}{;`;s95H12W>+~<bO3qAym6|s3Ryax4Sm7sol0%||~2K7^dA8Ru(NTJss
zAoqjpOJ+yd2XgC8Sh-F@{Q)v-HJUlcLFORU9~=Mwmjbmnu7S!OhJeSVAbDv0u?p1w
z1hv1R<#`auy-4-w6eP2e>rOTXhF1sXGcdT!XJA+XqUSL%_{?WuI5D4r;mCXjh7C;f
zpK|_!w6Q^P#l#Q+u1i4fkaT2tJp)uuDuC*kFt9i%{DeW{1q_jo85kBYgUT#WdmL8J
zfacdgb3MrQR74V}jJgIcqY6QOVp#C_$B+N7kN^1pI`8NI*EUA;pV~Ohe`*i}>Jx&-
zil#g@5Sss#36xi%W9T3M|L0NwxrJfMQyHQ8Pi2(mKm7&De^7bQ+#jes2F;Oz#@0b)
zXO}y}>&O59zj|N@DHCD&4a9#UIREJ@us;?&2Gvs_|5i9c+IwZt@D~N8Nr45ATNLL%
z<uHJZc?5ydjss*oaRO*On<3zFE~p>F5CTqfpuQ2PtpIWdD9vTML(*I;R4r(%vEtW%
zaJ#YrDi-_yzmx%J49Q?BczzQUrl4?s29*!}|9@8-RL>R%P~BVbIN<+(E|8jhs2U&W
zI9wZu?-20F1LP*Cd4B}vv$8TUfYmQ?V0aCh$ApaQH9ocb|DS6Ctc+4v@E9}>z@X6h
zwD<r2TPqaiKRtq051T^gUfMwQu*3YPEdleNE&-K&(DHaHC{7rrJpBk7t1*DYIcV$<
z)b<ATw?N}F2@3O{c7xPG<*UH;|J0|TFayP%3&Z@U((VkeOF(@q&>YFn|F1#yJ*fNx
z)%l<{vyTO&Oa!%~L3KT-4FGBj^q521<Q>rYL-3r51*FXls{8ktGcgpHL(0M_+dyrA
z1&<jV0v_D~jlBe%e(K4<z}3(OO0P4(^?n?*-d6|L&B2dd85p=g^NI`xGr)B_Xzn0{
zZT{0upn8oV;PF!i1}+CRkp4;Vag{INag`ZQLG?PQPpDxAO6QQV4_{C{%Mb#Z^X3vk
z66a(D%}GJ@d;+OS0J$gZaWL3DVUIU}-4phBDgy)81J?OZC4T;Y4VtGo!8-pb;|~b?
z4D0--|Gxi!ePZhTrze)qe+qIpOTf(MTT&roHlXx#^*f}!!cs8nxfs&e5U8CFlK%>t
zw-yEUPusxbH+wx8Uh_M+JOZ`DB3eQIgoJ|xBZCxZtSLiu{?muw|Gy4ko&PjJbpF$O
zAoCp-Jl^#G|0|Gr4?%4}=sJjdAhyAR$1DyB4_FM2J%^1mGCM4I_}+uz^-@r~Kw!bc
zFD&z)p85X&HE7I<M|A$vli&Zpp8Nm*t2-=^HkE}vsBIho3PUMa+X~d*Uh)4w*8!w)
zCPhXDsS8NsIeH8Xr@9yzUQJ<{|8$SY{HO067+&uHsV@k4#IRuU({Bt6Tx+I){0Qlv
zfZA6JT;@MrATs}H0>~VODNk=YFuV?7ng28Z9RE|EE^}pg-QqI;DPzEb#|#Tv!2KXl
zKZ+sX^iw%dJ1b$qV+K(BEurP9h|Bz^p!5SuOQ5uI4iwLzz7S|`0aTwUoPG*wd+Dek
z+Fm*=^Phs+!@+J0ukV1y$olub0O^-dnGa513;~CpGB6x@x{ZN>>j`LVhT+Il(0C^(
zUo(N%X*6AB0NKG1{J4{W;noGv7{35$UC*SaH<;%?6;fF6*v5_F_4EJ#U!5_Y|8xb&
zjDpEeL1QYQa_yii!|N;H_I<$P?f?ICO$eU<bcOT$rz=3?L(no{3MlVG*`P6m3BvQA
z_JhI+WEQk71R7I02O5_Xp8r&Y86uwpGNWL@LlFPPkN>Y376d$61PT*|@W*rh|CdrR
zp8wPaWCnD6DhnL%6P_;dM6}m*gdzR^14i?o7CA70`yJ`_46hsh|9|zwX#Uebpm80j
z{wS#aDV_|kzX;8L+5@g%5N)_52Zq-RK<c4xUWC-9od5s-s~D#FPYVQkAMLP19aCif
z|6dAJCr$v3GeP@$21fJ2<4(K`46jU>=09Bq@*hLMV`&BkE(wsm(0UzI=YZ<N5G1`U
zM)RM>2+e<L=fLn<0LeXd|No!5_5c4X9;5kBRfOh0y>k#$u1tIis^>uUC%Bz|p!cbP
z1H<dr|Ng()!#MxxdXS$DAmz%-fB&Vx<4sVzc^MeEIvD3a{UJF2X|o+9Pd)hepX<zz
z|F2gV&VPCU)CPz8C&6(3(<_4WpGrC~ypH+*{}rhH4_apv3e_h7nsY=N58`29xRqi!
z|7i`>43NEZ(8hy!4Cg=X0m(zhgXV$SJW#jZ`2U}4@4x@A3K-`<z5D(D>kka`pVol<
z!VvJ-<^O-K#XtVP2K8yBe*J$P0P5c)9C-?Aldv%aJ=FaFUkcRzFR%yI#Q_gh|NrNj
z{^S2^(7K&Bpt=v59<G7iKH;eVQhMSLgruhegZWRZ{{Mfqz+nE<9Y}gkLiI2s>A3;z
zGx!+He|iz@#_-3Wa0KO_BX$h0@BaJ$D#8Gic0lDSWK2^4v`#@_{?nuO46m=EjWvPl
zJ5U|B#{yEffySN~t}!t*SU}qTpz$VHdmmIEg6c_7T?p$ZT(Mwc*dxNsa0gmvg6c|G
zKLIo@1saC}jZ=ZfmO4OnC1^g_f(d2ZDZ>IX76s~0tT2U)O<l2utiNM8(ERj__57!x
zIZ@C&GK0e5rw6p>Kjj3EM>jp)VLkt;9H>lFXnwlEdj8W5+8}+0pRNJxZ+gmb;PBHW
z+Vh_-0rL-m`E#`AKb-^SL*%Du&wo0_dj8WXyFq%JpE4W(sq20!0-CQ*Snv?E-lj%+
z{!?y-1&?ol`lZs~F{sB^Js4hRc+Y>D!9D+JhV=ZWR^R@=PT`*aG)8*<Q}b`2wm)d?
z;IyYE-$4D=D^Gn+gW@FkF@r<TQ&1lm)ShExXnCX$E{_*5G8$ZX0_p?&`u|@_K^m0b
z8lMV))+U1LF$0yS0@9FqysuERS)}Jb{q*hsYet4p(0aRDj1CJPvj|Rm&ciVG=?RcH
zXx$D&=tCZc-lsqQ|3Af3F!$+|uK7>dL1709GluZT3<e!f85FvoE(Oik1}u2Un6Th6
z$ASe9L2H0m0zmVpp^v3N<)p*Zr*otr_WuX91Htvo0>-c4_SKcAx)47IgZucPxkXT4
zpCRZmW5NRAH{kZ-Z15Z;BWUfTLHE;dATtbRJO$YST7SX7&~=o7A@uPRs9I1s7-Y>C
zWj0tK%wW(aTFbz|#iKR<slqJK{L>`x+y#R{C)i8@srgTLg4)gu0go3kGH@}0{0Ei$
zAvyo)CaBy(M$p{W?59j%zXv~NG+4mQ1TtTt^C^Qt+fxRH@W-b?ZJz}TKr2vRu@p=P
zi}8Z=IZS^#M-t-y{UEn91UzO3i5o!t{u#6;3d)A8+X)7ZhjD@GYS4HFQ^SJCh6c`$
zJfY)`5ey8k6xK5^h^%K|;8@SV@M9eV!;5tc3^&#>Fq~M&z_4Q-1H%dsdo2UQ2`b<z
zM4CmcI%GHXtYctkftp_er4yhuNL>ID8^niU8>qO>ItB(6C|dwZ!_@p(%fO(K0hy};
z#ZfJ&-Nvxsp^C)(r?H@TC<u7;l#zi8G%xr^d_FjCJ3!(L0gsn5Fi71vKL6<-_4!Xh
z>ogb`CO!Qk4$4<^o;KMryxs$1GfaGX8kAQU7Ccq~jejlZe99Qm`iRxw3V6NS#Q*=L
zYX1L!l>t&~F!3oQ{Wd-Y&FeBKbUytIS`!J9TX66xgTwTv??H1F$3g8nP`l?0SnL&O
zJ`W_e0Kx~2gF2{#%7RHx*MQ0fh6RsVL3W$Zf6B1nFj&uBQ2o@<`4lt`%FxjE6g0NO
zqR{(vDoDM<^rtKebDv)M|Nqq%v-wXs4=i{LDkm?1<}r?e+N}#7GYIrNJ@fznt0`j8
z{BF?r^aQA1Wj6mQ8&v%f(EQFZaC;rB{=onLuTsRoVfC27pz-OR|Nmcw90P?{&(oct
zHAkR6L__ma&^(-t7|5-SPeJpaKF~f13q$Z@2ebJ{Srir=W>9E83Tg|2+J>`0<%hvc
za2v7*%$^4B|A5vOG8oJT_uXC0VB>?$tT25{p!vO{u(0fT3R*`8YRig%@|^-`OgHH9
z9?)11L(t<pP;-xf)PvSjfXX9=Gf&$<<py|-MJQw)NCGr(L(8^$kUod0PY;Mf^7aYP
z+7uGYwg{+R2Bh>+^XvcXr=a!|)b6eS|8sFJSn!y!0oDHXpz_mU>Qe`(87rXnul)ZX
zoTfcQ=RaKx6=O13z|3IK#`+#AXCONN=^PZfPSzJtISJAEPp3lV7#ccRA3?=gMCU*4
zhl)>7na|45aESFbRPK$){HGmIIcBh3ovfhs$)LP-MP&ZdMyOoK5s<z!tY<-eAQ4Eo
zRYB!UL_l%}S&u=@Tp}|6X)#oe1!Nz?A=dp+Inexi4onU_&bHuTjmZ3`=}@ud3=C2?
zze48NL2(aSuTb^>zZ8qf{HGD1IdO%_PZdCYDu&5V`)omD7YiO6do#S=a2S+k?ts%(
z0;nGWYWo{Z1gE+9|Nn1+%YTK&r;-2vzY_ZO|Mdh=yWijvSUqSxVGNS~SquzPJPx2W
zIw7DsmP?Ug$_sEGi-Cbl$cy1MC~O40Kx@Q8AA#1z8i2;p7$!dzf%cz3@*9NbKNW<Q
zN#XzgOGW(q{|Y2NM|l2IZm4*~zyDGou^!?1PuZYi!BDXp;rUM)p<;gj{!4}Y1Fipr
ztV4}PO5gYY|L0;#K&`t$W8@4DQ=dK%g2a;mG;A3Xh_AaVpn8$hciMMI`Ub^I2&mrx
z&vS>K$|1RF*Z==qpf&|^dqNzV=X{{%z6Q^w20SLkO-~L&{KH@{2U;fgJYDb`;--0^
zIVMnB-{2xRPW%4<=b8Z>zXz2^J%;nIGAS&$%%ISGwE@(gXPEqSsTad*3DCG8!-B{0
zZVaz^gh2i01&?Du;VuN4Z&>g+(v9Ku15nsAEO@N;{r~F<Xk7#v@7o3SgN7j}{Wr6+
zLDTpd!TC=&L*+nYAO#?IgVr%I%z0{aaQ@Q`Aa^Rvd3w)=;q}jd|6c_l&4tVW&3h;;
zc%1LV@EX+a2ZujH@MDnM84VU(1iAkJsK3B4>1io6EoKPLe>xp%A3JEgT5$f;E1*3-
zU^^#1Wl)&&)JAar(?d3pz5<91N_SmQJt+bp_cyX$`v)n1KyxF_P&p5U`K$~Jnpn?6
z<v{(H8mOG)zyDG$2SE7_5g$iEeG$<39mB+@pT7JDul@7(Vt5T&^91U1fYwBT)<%Km
zB|v=)&^R1uP8!rF0rfLLa}c1u1!x}uXg`5K2LnS23uGSwX#N5;j{)j$2v{;PNLVs4
zfY#tDSTZqy=FvfGo>eTF7)&gg7$U47bLJtIObi*8ObjKKObjiSObin&nHXkRGBGT$
zWMWuh$;7b1l8Ir5B@@FDkQr7?3_6xf3^tZb3@(;T3_g}j40qZY7%o^cF+8wjV)z2G
zQ-_H`!-|Q)#)^r-#fpi+#|pHs2(-^5P#C<9-(dlGeHv52f``lrpf&vrrx+O?JO-^j
z;$#SX%wVwKGNZwQ!^`X^KLoAA|HTmY_}l;gr&JDr*06>>mP=T`%)k)y_=w?r)+2)R
zpQ;!%u!7b%Xc$ZY_lH1j<PC=NSv3qASaldCJhl0+{}8k`h?&8G3A7iW)p)@}Rzv3p
ztOm^wm=!_u&&>~*1s6PIG-!SRTI1I&yx<|IU&Y|i@l;?z$5W979Zw||bUf8znDVrF
z(t?Nl4;DOB`7q_Fl0fGp0fvsJj3B+BIar1%PhoN<g7cq>faK7`1q5b1m0;+2%Eb`)
zP#?6<>%fesTnsS}H5nMVxEKN+g2p^S<*=}U=OY${j;9_59ZxwFI-WAxEO^YU;Pj{<
zsN-oyQO8q*gpQ{<i#ndBECQLe;GxWdmZuyGTAuPOXn88JpyjE`fsUsp1|3fmlscX&
z2y{Hv5a@WSv!LUtLPN__iv=A|T^4ja^;yvIG+;poc$^)yj*t<w#+E1GafHHQaM=Os
zZ{--xc*@A*@Cekt%Q5PB3W_68IDq`A@nOnS5rG*`LHi^?Z4zX02^``eHK27>F#Sx>
zcz<%3fnmc<28KU-L2C<G7(OuQzO-<d@YJLL6z3t284fIX_&<RC5hnw~ErZ1QPZNYd
z;tL)t+NeHYR-E=6>~;~Q2Mi1$4-<rX!2LRQgPsSVc@ZXtkjD`Who4$AfY$VdJk|h}
zvkV~*<rx^bTm<GkRZ*Dpl*ORuK?uX)r;GuIp1T;#d8#4+$*(R3Jx`ef4nB8LfQl(J
zJ#ta#dCCM5!=cUsWG2I$r=Y!RECP-Y^#TXL=7PczWabBky)Wec>pz6q53?604_e=j
zE=R1JU}k{YSzt2^<~;rM|Nkq2YmmJIpn4j#-k%9H*TV4NF?ely!`>GP4xlg%0qwiv
zVh8}O)e3zGTCWIR+s+UO>ico&FiZufag7gCpNfFiykijut$9bJ350r(UIhUJAGC%>
z!JzdiGsA+1pmsfIF9~Q~fDu$zgZkW1_ks50F){>!_8N7uFa(0!*QIh`3OGN4%7Ge#
z`K+KlS}F!D&~ji3yd20d0F?tRtl%<$A>c6+!vp4mhP@mhySYI78WkFzDi}08l`&{|
znqt%NRDq%8sf<C(Qx1ccr#uENPbCamo-#NzJT*vYc&ZU_;Ax0W!_xqphNnI@4Nr9p
z8o+J`xet_nOMXGquY>MW#xtNf4$vMxP=BZA!C`|151ADwK4)PFddSSM;3D&Z1qXQ)
z5*~p31rB3qdI0SyAT@q`WI%C+89xCy#6xh16O11Q-IojwfsdF1Amz3)0|OUmtr)Yy
z6p+8b?Ld&*84Ml>GZ-|8));{LNDm$}E3`Z>fclRCGzP*DD$HQ8Ko~U6zy_*|83G<N
zLiKnUfX1{SdO-U*7(jgvg9cF(h51iGbNEaQQ=T&)nDQL79$d$u`4O`~%X0>X)~5^y
z+Ma^aJ4ijutcRd=H^K}IQ-m29W(YGdFfh!23d(a!!1d9B#~?OnzXy}Sgy)CtnZb1d
zsDH-;s+$#(9x*XYd=64`M3{l0#gU1DoINZFR-iH61>ij_n&7!l&@NuY9+r9bp!PXJ
z4B=<c_)dc;C?A3L&4BihiZC#6f%Zo+D_jKo-vl&f#1Qlt6b7Jh1nq+Y?V|;)cjW=i
zD?#@s>A5q!0)-1KUO;Q785AI44BAr!mJ?_Y1+o2jTONrpG(3v=|Nk{;-O>bM28I*D
z3=E(!U|<M*B==vRQOcd+6?n`s0J1-j8MMyTV1cks!Q7_|2Cbru3{jvud@`fKf@YBW
z84a45L3J`XUr$)@P@`e)Q(mz9f*x}-Fmy2*RDkvX8-vD~7(o3ihG6ji8PM1@14G1P
zW`=M<28RWc866fhvxDaK7($`xrB#%HVF4&+r9kV|LFE`|%{gdY1siA#ctgM=&>9K_
z#`#aBLG3YzfJb(qI@fUiQxQ<R7c>XM5c-&5L#rsq!TC=?;m9O#<hhA~^CJNTr$@{J
zN1ihYv^)o;GY*BOM_~6Qv_RFhJm(Q;c@C<NK=$z%fYRg*NIj$g+Q%IJklCQ+0gJ%l
zr#uQR&p~+{6t<vx78Jgm0t+4<0?kb+1Uv%mf9o)q|FlB^<OWb)YI(!~O4|%AVEaMw
z3~G-sD;#+aYLkM-CqQF@tl&J;D$2sJKycsx|6HK?K??)W_(|wv1_iMALr~sZ2WqP`
zECB6~c?HtPgrpC&{$V|6FQ_mB!x?BigW|gfnrE=Zvqk|Vp22YoDythndx99a7!8~r
z{bC4z%)t;mnUwfqVTgMC_5c4aP&m#2jqOhec%;g}AoYM@{?oOf^`Z^|k3emuE1)(#
zXpDv-^f7qv?}S#-6C36~WjfIEoN>Z}$0iC+kNj;HJmz5tf5>>C<vG)YBhPgN8XxH>
zG(7@^Ju^t%ftKg&1`7n`Kx3Q-TAni`v_SSy960hE6fdB*Nib;Lv_ilm&_47WgZWRn
zCmeYW3P(`bUj&UmF@!!w4*S#p|8s%XB!kK)Q1~K;y+1VUL3@Bfa>!x7@Be=(&{z^I
z+(BUu3VTpl1rGNEL67|I`aV(t&69)L$r~0tWCrbR1(lhgF>Qtg4`1HzeZ+VRve$wE
zG^fP?T4Q$ksjyA&qsa`1pH5OZ{B#P#;ipp>4nLj7aQNwThQm*1FdTk5li~2wSqz7t
z&Sp6LltBPACJ^{Ai-CdbfFWocdBH;-(E1;S$xk^87CdHw#P6%k1`{4~FbF?3C~y>F
z6!-*g_ks5G7K8T5HY{NN`TsvxIYZ!M&|X?bhXu@_G4LXWz{ejzW56Kw4xoA1z{jBd
z{|ulunc#fZ2*LTH><bn!vM*R5$mp;@*e|yCkq~H{kzv6@Z%5Gj=>-oB9T{GO+S3dS
ztq(wL<Da0pPKHQOJ5CBzpMct)4A6BAp!^Opo5OIvC<my|88BItAz(5qDC{?a#*`RB
z9)sF_puEhuV8LZZ28LUl3{j6c7c5xp$J_fz?!bb_pgbzW&;VX93u-5T_LSIw_QHYo
z@iT-xUhx0F)EZDe1Fz8ueK-fyk4ECp0PSsKSnyEIg5mX4=sG-Zh6N8REI{k9AZHaQ
z9O!)nvQO-Q&m+)$2WYJe%uW^u$Uc^(pz^_C!9!3z23ivZn#)(RgqU#(bT)*;f`_2^
z5diIZZ&>h<eZhi<>;C_LRpH14-Z!jb!o;w{iiu&56=Y8hXst7&0;rz@8V7~6O;SMS
zfZ`f7Hz4rfal-%quO>1vJUH(JE#nyi9)sq4Kx-%%9Ug$sfq;$SC<K7oi=m*s(p;di
z6j0myD`*_bU@CZ>27|)`=1-up7lz=+puN_d48fo_+%3@hM?D$P7*POtuazPT0~d?I
zRPZ>|v;Y64G@$E?RG1jJ1fXmNhpDXK{V@(xpYB;d|EY)psLd1n_zxok7Y_qyJ|^Jt
zas~!24uh*t1r(+{opT=4=RWi_foJMdkQk4^)TatI$`6<o=R60yRYmCmqk!Y11fABW
zJOZsxB^ahW6#%b=YykIl7(o730EvOxgHu=;6`VlgOd<*`PbDC2L{?Cn)j)p!Q-_wR
zPZ<rSJ_ohCnHeG;UT0+B`pL|2N~K`xQ;USDPuq<bJY+X?e!z~UziBgJD!8rM%oO&J
zN1^p8$AqI#UokUiG0K42jg1cuA6W2EP_O3^6R4l6(E5PIU=nz}5|6-wjSL4CY-BXZ
zc>o%_;b8#p!IuiLnff$f&(x<32E9)i80J1@GhFa+nZkwVEC$SvjFcBVY~Y*!v<<vA
zaO(4o46`3HHgr7VS6~A9?GaN(!$Xk!EfQLvI<&MtHDqAm`mezAh?61cA!rW?K7WAR
z&m^$mF(@o|F*9g^>f?U`jgJ@%NcRJS!Q7`ec;`P|rf~T=$o(+46YFl!SS8He+n5-*
zY!q7I>7@WEz4ZV84^J;SXX%q(xD2K~hoqP0N1(9wVPxRSgQb-NM5Gmg1&^DVVjhCR
z8I)GynHjYH!@@ZMlvdi%(n`!jHc(ng0Hu{Qa9RPCBcL)kL}%(#9?)4W3cXL)2wVcE
z5kuhx4?*dt#{hI5!t944p#Gi!<0D3mriY+BVF5~`3=C2d22-EfoB_4fn;$V7&Uwzn
z6ZBXD9L}J;)XEC#(}Da7N?)*i!D!&{NW=h=w)jBfpA5l|*$fs4G8(8c{a0WHr!&x+
zdQg0^{r~?8TY9rNF!d>H%m%c-9~>48txsi{8MK%f93H{*4T)jFpfDF47Rceyqp;xN
zCIh4}uxN&afk7*1o*Enm7N?0114ac0aGZ-MK*HeczyDmI{vUc6fZ7Fw{0=%V0p|C6
zOblAg1K@X?Q{?--4~O6D|NoaF<adz27cxQ07_#G=0T$novJsT-iHUCyNtmA}Vomed
z+zvVeiIE}TF`K{wK}G>JCQ$kX)eE3Ak^Y17Rzb%j7J<e`pfVJcuSFPIpE{JZKFt96
z@xX$|j64e-^B6QdI1D<gNUsqse}_F}WLU5fTpt)Dg7Y`%JS0&52Bm2mf!3$X1TMkL
zQIJ2|h)CB7Ct&`>p0{m4b-aMXBSui$&p?@pQK9{j4JdD`v_2IPXniUMn#%$0dj|Ef
z9Hu^HIWYIBgu;}kJO)h<m<=)>Ff#-_1dXl87))tpG-z&;F=%P!*l_e|0uQ7<2CdcL
z5SaVaVM*&#n}XJ-pgPHir}e2wL(5YEftIH`)Is}2r#@wZ*SmoaEg2c4cnm;of#Anx
zj0{o<HdCJ(C`^6IZ1CVA6GPDB1e?~U>lhhMf$|*a?1L8b`A=g(?PY<<Pg!jkUMJ{G
zeHvi{S`Qrbkdui)D#d2%)5rEo5BL-oJWjD`eafQH`t<zY|F2+e5`6{+DHVmOPZ<tO
zecEKa;31Qt^8-+viZIN1Dxp6ADQHZYg`pQTmimB+Vd`@b-$!TaQ-K5EvBd|B3mP7Q
z+9jYiii6A4r#8^`0!zc(ryLuug2$S96ndX>901kjfscC`8E%34!=Uwxpm5)DY`!RH
z3~xFk!z&QKjuF)Unfp{hNBaTehQm)d40@kVF`NICu_59Slj7v(p!N;}i_!zonhcf&
z3m(n@^<^BUKF!&NXitIGZ^FV5v`!Axb^^7hd_eQv2DEQaaii6bE&u;>En|eXr5K2<
z9|Pd^<8(#_EuS@@vC64W84_nb2lZLiOcp$}Kq|vaj^aq`0<Emf0-*i%Q=c;)=m58o
z7#SQNF*C$G1n1Estxq?A>#+btJ!Sx^$AZD@_Cfgpv<D4anE);W1VHJx`9U*N;6qTq
z2Gst`W@OM}1i4cn;1Rkz&#=JUIRUloL2+jfR(H1HaOYJV<t@7VKx=hC?sEpYuW{CM
z27!P_8ff7NS|`h>0BR55abE(m`@$gMn9}+*4(dJ*aC<<5=|40a*Wz%Wg#e-*017`@
zkh=~-+@)iJ8oyJR@rN6>_yNT;sLbX8m)SayGW!4|zQAR6LL0QqhP1`N=^>@{>2C%G
zEgnONJCs!xJOudzln#*FO)Q6D?m;VCq45YQTOE<g);5%~6|@%^bRNa*KiJzypmGK@
zmj$X%n4xX*s|=9(@-M8dNMgSN)FyWUt)a!&CSQQmm*@cXC88c$G_-=taJj$#;e83I
zzu4<|gu5diu7tW5fBhbTvu(>DF!w2k;ev-N7%qa_wFb-!9=0nlc*w5k^nhKV=|P78
zsJveAkXfPW!Nvo#LFW-YViH{NkfEaI;eP|RM~n(h4;T}=9<dlSKWbtMf5>Cd`qZMJ
z^{GQj>(eHX+YS(_m&0+^%NC$I!(i@HP~E&p;PP`OL(q9;%#T2Ia}%^~<_EP4ESeuO
zDzrTUl~oQZtxwPX`Ty#I!u+QvK;zR4lb%NCOnoY53OdVU>Qm2u|6hUXO9dNH*?;f}
zsGrLr(EF6J!Q&CA%x7VUdKkjMu*(>{CnfS>AOpiJ9)-D2|8HP_#AZ0@Iio|%qyGZT
zj~E%kA1bFTc*t0=KoHcA0@XJ>|Ne9N9GL&~8F*el>LF;Hhm9ffp#uZMEH*`mUXb}p
zDGMHQIV@mgS6INvBmg;s>c0ZhBhcA5OacppL1zwv=6t>X{eR`~i-7?&A0=>$iQxcr
z9{P$E69dRxEs)zl>zEx{9<eD-ehxDmH2w`U59Bsb+6Jv51I-0I{R`Ub5cyCVr1t=*
z-#h0yDE~1rL_QQ_V3@_EIOjPiFM{02BGCMZ3FKb|rbnQ)-0TWqcRvJ~WdI$A0PO*o
zV<7)@j(|LPZFh{$)Tf~Kz%CPp*Dy8{L-500zyEVFJ3M&2<M;npA6#``g6bCrh5%s`
z*qB|wf`?2E3m!6q=DI=iS<o>Q6VN)C*1azR6y`n!wMQ5X7C^_#BOb%X%R%*Yh{D{b
zEDS-Q@pSN<_#*qs58wX(FU2IV;2|%=f`=gep!0oH40@kx81z2X1?`D&2zbQ1V8KJs
zno*X5-lq%(Q=fv=ih#xh8hXKJwX}owrWyo10_{-(txp4;O9WB_+6NN*^Z#qm{!I}B
z(E6TW(0QC(Ai40L|6j8?Ja`P+LjW>UL;*C8zu+OWLDB;TgVv}1KmWfz{{R0gkXoOg
z|6j8^Ja`Nm_XLk+1_V3;&0&D%`$2O*pm_q&I30K%QeeSDA<%hX;PK0#$DsYepz&7F
z+IS|0u!r0X47+|9g7&|H)*c2u76y%fGK4*r1k<6984_AWuYkra6+m<3Ezdc?d*hMk
z2tpojF`O^TsPI6TC1C+0vqFnFL&5@KP(K(pX8;->gv^h$igtj_g3OOFBrE{!pMO=O
zIR9yl;ryq5y)BO_7J|m<Tb?r|v^)o$y~P9?likqrh=qaS6$?YaW6*vkPSAV+L-1o0
z@Lcnhr;k8me+&U2z7!W!4m73)I?FEu6lV+pApdZI_QWZG;s(5*GC<e>?8kt|FF@;m
z8Kyi1#SN$*4%*WOGw1RD|5A4hK;bjxIcV+&ypD(=^f4QBoPUSG{HJWt`5useK<gPn
z`@Xh-#?uX^fYxt6tOSiKg3cggnDTTx)UBKh3{q1J=0D{sXnD?D(DEESC$XXBIVf#F
z!V5G<)hY_wmjU9##>7E$c&teFErIU81*u_RXcYyyftjJ@IcTqeiUD-Kf}vHESzyX@
z7KH_mLFWj7;-4)c@xfH+93E&MYK1TZ!xHGc1ZYnhXuMp&LHDH#$czJ^vm+-w=eXee
z2owjPv<BJ-!@}Ue1S)rUz~=*j&S2_&6a_k~(g2jNAp2Jt7#;|7T<CoSn*RdLbAi$;
zcrJXyg2x;NQ^05Ja!*+BkQ>yWVF(8A^9QZD1D$=zA~5BtKLf)n(EJRD&Ap-NArnL3
z<Hw-2Uf}&WL7=l}q)ZH^JpIoQ{P-6G!z|ER4$xeJ3Fw?V(0Uhv1;UI13z#hyv^-tU
z44MyI@R)<41$^ceD1AsWFuV#-nDW%eV9HZaziA%>!zvwvDNh9iCOl<QxcnS+K2`vD
zJah`Eukk1VG;b|1;i(8{Jq)P62lvrHb6OxV&|LQfR?yl6MuTQ134w;E0tz6p23Am-
z0O<kE)jj(EUkYX?=Y+<GAba;PFzf>Pk%b}f@j`IAe(>03LCaI01uahl7PLG~U}^!M
zQv*6j4K(J%$P@fHV!<KsIta*G5|H}?LFL<{9HSP{StpM{^Xv=2YgGdu^C(OaWl&ha
z4BGeaQZVJI$AKwNL3254|NmbF3I`Sg(0Ft3W6&B<P&x;ls|0FaTQq?7{6{<v1C3WQ
zgg#aQg|Wec$0i9aPb~~uo^mlvcnNY3$X^@=4NrLtCa^LnOaO%y6R1zbW6;3LBG3SK
zCxb%6Q;^*}3K082<Gvs_@F=uAZT<g$70eBw{gog$G=Sz53?@7^0j-xvxcrorA?)F;
z|No^dpz+OU&@5zO&?0&lG%n7t;GqX-Zyv)G@L5JMcZ1IB`OgsgSP9MD93cNf-1!LP
zb{2sNPhsu{$De>BsIAWgax=*NAb)_;A;|r(u!}?syHG6dy@SQQ_o42Ufx7nw=nPw-
zDNp|&V0~o5IRB}ljm`sR#R<<<7^XaBHE4OjsG{^BqT%q<1f`az><11!cQKgq6cqlT
zaCZT%p<tNubPkdkpuI%om;qXE4N8x&bO_qV3yLdHTtxl<56@?U3=CbMH~@uP$p8PR
zco`U8f#OksfdM5gfyxF@9_Ik9NrvXvcqDVU7#L=8Z<q->H=3D|VSzBLz5wN4P`l$W
z6T@rJc~PKrEcE~XE0~>r|No!*0B$cWcz7DLF9oz#2D%1^fg#{AsN4dbPX=1|1}b;J
z<qbo~<6ofoIRKj5hykA`3n~vmV|^^3xd{X3N1%1y%pd1ZXJue`HRmn^gU>w%28MeK
z3~TO!);Bx=uQLFRy@SjIl|$e&v=yd2WigloE;~T;GoZPGqoBDZhJeSQJ>ERvvI8>b
z4lAeBk-|@ff#DX&4Inc?;|!p71t`p6W<CI))4kx~hJXKGV>62f$t=)(IcVG#WEQBc
z1R7%inF*@XLFR$Z5C*NgIRx6@hE(Q#{QrL!X#Wa}LCaInnl6xjP<aR{qd;X7qrrm3
zECwx0Sr`^97HHVJ;?n>BuR#7^21>^UbDpv&K-TlD0mU=Jf`_e8|AWrG0JZxt+HPoT
z6hU=0Z2k+m?FO1hWMBvq{{H{}El#9%8mQg2NPqIfkN^KmMJUXDy2yUPLy#D#EysLd
z!9~Uc&4)p2mtKP84dy=m#Sr}X+5i8iK<O1UHyt1__bEs{s4b;)p!ccDf!?PY2YR2b
z`3l*i$=d*KvkHRB8kPh^8xJ%GBLJE|Ea-g-YVRfg|Noj9w1x(JE;DF9NWfz@1_p3@
zuKL^m*PwYskR27@AnmndpfMqXsZY_{c3ch%9_D}h{~EN$08~FR1Oz?;oxcY<vy=&R
zZgazehXxDgJ~f#z_o>B(xli*!XW@X`Y*)c;67ZT^kUPL_k_OQ`@HSTKbI=)mpmiGz
z3{#)ZFaxcZ33v=TX9d*vU|{GFWq_<F5oR#x5@i6LfdJZ@WY8(fzz_{;7Yj2Obc=%8
zlBNs{QY~ORr-JPS%~|>BwmuS3XnMqA(E13pPXshC20A;5g&`b#t{3S1t_a2XPeI|v
zWYGE?)X!y6aC!t{voOqkDhvug1JF2U@MF;V)6NVGT^b<u22-Cag48htKYacFf0v(c
z@*@t1mPepE6f~a;Y9E8<-`vbW{s{q{Yb^!xUjo#B_dxlaAq={XpiT6Q0cejgsLk2>
z9CWT8NNp%oEo8nr;_()P`J#Tjt&f-$riz2sDljNO!e)WNd{K}Xg90Rcroj1-FzSHw
zLE#hz4YM}U2m{diEKr-d_4$vl|6haVWx;XbzxRcr9dyl5K!fNsP?}(v`qT&Po~cju
z!F0gmoB#iFoduO?AalU$y4pmU8Csur{r~?8)LsL%r9ka8P`ho8Fl4398es;84Z;lI
zvyKHW_&$<2Fc*A&H|Q)f(3!3b4!uv){{Me10Bw)K)&zpog3hq-0ofHW<tc2P6X+ai
z&>nmqhTcaTzWsj<+A|6{QzP^tsBZ&40|7cu51Ly7`O(3E0c<{K-5#hd3OX|aq#tAs
z=qxRUgkDhn{F=vL?o&2~;D?}dF2H>Sfd$}o!65Y@HD~|-fBgvRSJ2!#XdfszZzKdf
z0`;RH{hT)N8ZJ;j2Xv+=sQ(M{M-C|cgUSnVpQZ6RXdML;L&!re28LZB;52*@oQC<q
z?SD|5f!5TuiGt2_gRI?Zd=5Hi1hoDEvfd43Pv~P2Xg`Npp;a7KS1~Y5e0s<flnw)+
zYbHWKX99A4P?-Ppg8`^d)B1?Hp!NBS1@oW20IjESXhrmE3R*#DN5A4U0OhG*aGn93
z;lo|f`kYIl6}%1&)MxSh2ik85IqMQM?*}@^0@OeLfRr~Fplxta-T>{(tp}$gMBbPQ
zb>m~Sya77bhZWqPXnlSXoEAZ6w6=+Y&e>)FhhOV+P(KqC7N9+mKR{(XD4igs$=yi(
z2+;Z((3(I{x&-wnKxwocnkGSI8K@7z2s+;zv^N0cW`^EJ9nd}lsC;H&Sip$fX8^6)
zbP0g0n*q5M6xTN3F`B91_V8K*hSvt5{ux6Ecw87%m->U&If3U;7Cd&+Tksfk--ops
z<jiT%K4Q=sMILJ=hWE@23@2=u7(nY#B8(cI#uzn#*Dw|^=)R0`ngBZU;2}Fh$Yap{
z7SLY4h(i;u3NSF-@)4NuG~&>Nr#cD~p6b|u)_fd#4pI*j=P+=2#3<1Ci026CjFsTW
zJ^~F-BMw2#2c_K)|Noy-Fi3vHY>@gu%(&+vt3u0z7^Q}%AUD9)avGqy0c^hz)cyk#
zo<;~k>{ql|@Q}v<YClvQZ2y6tN1%H{*cpN!`y6O^8X<&gzl1{aBUPIP4~2yqAA-tO
zkUzm{oEo0;f&6#?kNFNRj~L<Rhak*%YIyqb|Nm2}77HFqD5N|BjS11jd=uK5|KEW1
z5y<_*MvV_S1X>=&2tne;0J_dLMrp!R76;v@?4Z5I4xl{_3m)Q48%h(NBGQHv?zEw>
z;2|h&NEjqP5;5+12wE2jOBVuAyFq23i^GJcLHB$iZ3Kpp#|#@5JmeAXeJT#RXT)g2
z(-fr%Pji?iJY^Pm@DMc4&S0?Mu#Z9a(F~*6PamCE1kYn82z5VAIn@1>oq^#N2WbBo
zXq^(nWY8Yxhkrn4H5}-D3R)|5RiEKCXnoZNb%xh24zr(%7|ec}qcr;|3;52NpvO7}
z-A_SlEFpQQ`)Q0(_fsc<1&={`w*3DO)*B_T;PFN%J40Z><8}Z4zb+7(4IUdY5NLb^
z8uMTI|3BD#P+Oynjp3Fd)QrVYeU1VPKx@Om=0yrDcsv&>t|qYH@hm7iSYW~9=}<OE
z&6NNDUnfBA(fa@Yb&SyLr|b-Yk0YFBU*!j<@!3x!oMu1OF_`^SMF+Gl@9=Yw8lM9Y
zaSl))@IcQa78g)H4t(r$p!;crQ}@#tp>A+G2jy{)c_6+F!|bPw4;Ea6nX98P`>6^n
zZ$6s+6k(<xIPYLHlkov0{y7X19|;(@Jk(&A{S;INO9=EmQfQd{RAs?zu-zdF-A_#v
zdY@V_^gfL+>V9gmx%VkIXziIy_oE2to<b9YxuOw<heSbrWKe(B#GqF+#GqRgbiWU%
zpJL)L_bFq+lt&y43|^o!u0efUW`P#aJw1;>>Otx%n3_TH{0KC@U;^D!$_6^e&tSph
z-}=3em<<j+H%XWa>g$8fwglb3u?v(&Kyk>xu;4PIz=F%AYz()4&+mQ25U}7e<Acse
zte`W*4=i}7@Syi8tKp32Z-nnYWi$u|%>_6x8{B%%Y|#B6BJuK5MuxD5j0#OmPHYTZ
zp#G;O8v~bxz}%;xwKJe`17?QC2aFGT9&s};ys9yp{ge?jXJF9$Xv2X64{MCNpYk05
z<x3~feMXNNAM`ys3_1&wq2ZAj8^bL|0ij2rzC(r4?57(94uJM1J*t4}0j&`S)e%P=
znHabX(jFKx1V5G*Vvw>pJol-E!`!D0W_O;(JevKKS!BUO=A#Q9g6<}1V_5Lep<wRQ
zX2S&!Rhs95#yTGG7&JfFATZ@2Q$YIzcF-L_1sx9<8K*zzGg$DDQQ+!xP#Of+CD62n
zGrbrfrx#FJ4o!nb-A|dJ=><}kBt8&uZh_2c9GLqQG}pl=(D(p!rwT01g3>B;<Miju
z3|F5+%J|t&aoQ_@Y%gZoS1?F?1iG6-!nx%k6KEdg0mM#5frba04CXzgwVfb)m_hb3
zK<wRQFoEWFvViPsfY=AJf0Mxsn%l_=vJ)Dg5Ig74+)g%-odXb`>>zvT7@r&<`{*2>
zoFF^t9G_euI|m>>xk2{QF+O=f_R%>$c|ms4IX?M7b`C&%@`LQ9V|)sL?4xsh3WDsU
zb9@Sc>>Pmj6b9K#$M_Th*+=L26b0Ey=lB!@**O65DGsuij`1l0vX9R3DG9QZ&haS)
zvU339QyOG19ph65WFMX5Qx;?=o#RsuWaj|Hr##4BI>x60$UZv9ry|HsI>)CH$j$+X
zPi2t3bc|0GkbQKHPgRhebdFCokeve%pXwlc=@_3HAp7VXpPC>$=^US0AUg*jKD9yi
z(lI`DK=#o&K6OEM(m6i$Kz0s5eCmVjrDJ>=fb2^^9`BomI`)=G-LX_L=az>a4RfDb
z9GLsG12mq`02)h$j`uNv=4t{SGlT3DAY%NM0eSp305NyL1ev=~Fi3dBY>@as%osFg
z-0%Q2j}W8O{ZvGG?o$irxlc<#W9kWAptbssK<n2*bM+$1y-zKid!KsnFr1PJp8HfJ
z88n9<3Z8cr;Gh3=@{j+oL32!?^_!qI-aZPmpZ>7}osXLN0Ca};7rFUQ9W@zV^Av;D
zK8J(OJd*MTov{GD|4AG==cD!$GH+BQu;8&Wl<g|8;IRUfZ6UDWu`HAwAh6)E6qG$d
zV8LT?C_6=H_S3ac_ki|rvoJ8+DzKaXv_uZHCU)}E6s6fu<un;y#~959pVxQi|NmRC
zIT~W-gFx%6(C33d=Tv~^Gu|@aefn1T>{AAYu!jl?bHR62D1g?Y8+-!qFK1vl1U}mc
zG_S&>kojP~K+_{e!`aU*9?X5(!vI<b(F9t1_=wT4`#ETy^-c2GryCUd9)jkAK<C7=
zFoZr_|MUMY(7XtvKo3(7!vaRoS}zL*r1_Bt4G%zi;qxN`3&3kbHwc^q&yRrCsWBNq
z=SL3oK;}mt^gRO22cpi8oP*Dgfb@XoM;HYf9yKs5csNg?{SlMl?B^Llv!7Z(=Yg0Q
zLLW03c0b=x(DtxIsQW2sP1+Be`A<y>Kyf}9JZH~nu;AebnfXr{3VNUJ)nIrX(lGm}
zNki{blLd3Z>vEYEbUl(--20TDVZmdG#~^)ipmQ${GO8>%$YjubfZ3q?z+{`|Ln;Q%
zhZqzV90tX$#9{Ef%OfU+n1_rEhoAfcooz4B_=t@m@G)pjf5{|JJV%1k+^Gtl`A=Vb
z|Nj~!cANnuw&1b=bMIAd28LVH_#+=P3oO_yAl$o^oq=JOH(%sq7KH_y1(bWYGBYsj
zn#LFTnAKpxW;TNbiv^5(pGpMJeVXAk`zb@gg2#*ju8#y3&wc9S(EHS+xc8|_K<`sd
zh6N8n_a&@Xf~*l?OmKe`&%kg?r2&+8A|A#tFx;AF(Ef<o5VT*W`vC*=tX37!J`08z
z&^nu2;QI~|+8!}CbUff-2zbb%(DVp&W*_K06@kZdpYkz8J!E4D7i4E(SjET?1v=k{
z%Y+%U_d($CJcBkNX2sd!j0tW+j15TwJ_2)}g4XUSGBBKya0Z2K2<Wb_TU;s&9(Eak
z=FFNOfac&P%QQby0j+OVSnwFM#{@Ko%xJLSGHA~LgTaE$ptTwd0Skor4=iA23Um}@
zI_Ss>iYw6EArnK~L(tqPXf7M<js;$iKxfE-)|#0x_dZnuoeMG{;{jtq+au7qzMwTO
z4vf7o(p4E=Z&8NavwOp8{?mIPw!?ylB}}uyYcb+g8D6geiGj*S1JHW&1>pOW@>LjK
zPtgLMF#x(Jvlo1SF6f*Q&_4MoQsA?QA1Z4wfXgNygWjj0HTt0SrHl;=z-M}Z=0YdS
zbU)gt)BQ-*x*P281cjzY%nmJ&)C`&*fzH!*5a@lXq1^ja#{sez#2^^7E^xtPzr5Z@
zpt$ErXnQ2kJohPcVH^Ccitqpbp90+hBEbv_=YYqJh6@fdszTE6Mw{kC2?ouFm=(GY
zfX-tCm6tjTAakh<pmS0ff*-ORXnF!#V+x96P<S#j#DUhsoe~fRrJcaXmpK@?N}6Ur
z1+V2>u;8*wL+?|C#l2T$7WZB)Vqm!C0$TqyVZmd@13r(QZ0>!kFuC`s%;esu1_yed
zx-iUrYWSe@k%0inZE+869`u6duNT@p?gh^|3pmex+GMccVPIS@xDEiX<q80;R|<K!
zIiVGFcHJp9hLFeppfezf=RW0R2!ANaz_80AVD8gS(0ObQtq(XKEO@xV;L1agf52&q
zr}>cz1886Ff`@^5y^q)u+8%9GnD&s#@WK;;;<-;j<rQd;FK8|CMuWD8OahIMzWo1x
z$_6y2`k?O-A49}L(B7h#pmo;@3m)&0nE#aF!Gp&Ppgk!93myip>wN@rGuwi$N1GXD
zJrn?y2@C-bnI0_I2uhcX3=0;5%7@SY|DOty>wUx_(D;Z?vGIY8fzVSnh8S@9Xk)<i
zR6%*}(<jDrpE4*kJy1~YecJHs@KYJ*xlcj$pp0|xQ*#CeE}LMGpF<y7ESS5L&t$>E
zPJsmr`xF)|WPZ@JfKi}p0T%<qu1y9PAJ`n8`;^(B@4-gf=0_5sbEgz%KWCiK2@X?E
zhM0%Uirvq@{Qtko=JDL8PlV@!<ArfTA9#%jCqux)C&Il?C;$I{%0~f|Z-X9B=U_PH
zuwd>}4d=N}xdOoV+CK)Zy92GSlTe=fRM23-V^sx)*Pyfrx^tT`ru7k{cgrI-P}l{u
zg4a=g`v3ow0Vr$^^gLo^h<R*qxc6x!2Lo3IXr01?-lrb_|G%;U)$InE;Q8;vpf&6T
zka*p!F#RE)$byG`4;DORe9-rRNulonqe17RW`hL}H|jQl@2cD^F#RDD<Lu{*0(}pd
z4s?R^e$Rmg4>!s-K4N0*el8)<_-K#8^oNX!v!8>)hM55p9-uk}6i$qa-OoW`wLxL}
zLuSF*&p~#ufYb;yg6kcSJ<NjL&q4QMZZMeskVz0?4lA-6+vZ11AT^*h0Z8VsA*<1C
zdW6j!c4Rd;%;7**gTow7WHmU<;X+n}Yz`<44IyF34N_y!4DmZC3=JV+2=Y5D3_<A|
zIqY}@Iv+7B&VJq~u;AfFhUuWS6puh@je()>0WU1RcpDx`Ff=>@#VG?cocTcUCD8Z?
z9ACOkj~GB<sL%wCFIYJ9gWLm)3mpCuKvsk7FQoVqL{@{t93f;iILr}7R)fPF5o9$u
z%n?OagTov#WHrd<AjOwBNDYbcC4nctB=N+T6cO<y4RQ~G_>w_ZgX}M)_>x6dgCl(8
zkk#NYM;=)X4s#Tc)!;Bk5m^lmbCi(PAe(~}U&<ggB*vEtp7>J56JKgX#FskAJp|%Q
z16d8SzmVcf6Il(8@X<n6gTowcWHmU<(Lq*&!yH{?H8{-CLso-q4pMySgVbP)FNNt3
zLH#IDePMvCMi<n-Lai@s8X)yDs9n_os+*A9vqxb1Lr~cXs^7rn>f63Y5)b;o<tLxv
z?B}3*8npL{&#?PBsNM#(rO@l_Wq<#l68!i7)qZXU@ZH%ToR}E?I59D>I59Eo<Oc00
ziga*sVq*Aza+WoyeZv8*YghmMFJ%F42SV!9%?-02g2n@wp=oNf!JLOo3Z0J}jC-Gg
z`iq?c3m$^jda)XGKH69?>mjHf-n3xWLl%Y3N1F}iJ>(FA$Zt}Z^N^hhwDzp~!AYOS
zM+^+z4?K)}pE?-NeJbJD`_x6b_vy))hDV@&9GgPtBay(~r_7HadL<0!KHa1+?cvF~
z_D3R#bDz#IXnw?5(Edomu=go@(d_3I26LazNN9V+?$G&2B(e8ti^GD4TO1}o<S6ca
zdXlH%kx1d(r(A~?JoHiSeL97q;gO3nsLeUyDbIoK2LaB#PZ<iPKb3Ht`}AaA$D@-n
zjgL4RIv!0CXne#JwBX@Mot{S=Mzf#uDE2<x!w71dPJDWDUDqQ9fhkV~3VWaOIL>{_
zxuEM2*P_|aXE?Mx;&JSK%CflkDbK>WPd%FFK4n-i>nR7*f`=Rnd!M>2p8M3Hc`jK0
zk43#tITp`-dh$%qBQAsH2YVLIeLCep&m)EdbHMK4QfPW0uyF2EhUVU<d=I)G>^Ru_
zluMxT0Rw0q;DWhNIUPD5ovi751o7*vhnxp`9?byVH+~r6AB%>$Pa~XrpK>I0K4Ng5
z`}E|SzDF#Dy-(W`7Cih>H23M02YrvWCCqrp;xzj?!-IKGLE#ya-23#8Q}0us<hf6`
zJnVh?qp0_(2dJIb(D~@3U(2HpPQ6cAoaa96XaJpQ(EMPB<J_kKi|0ONQD}O=;W+mx
zYe4q{7J<eGpmmC%_}$Sk<>3dXxld!7d!PPjn){UP(1M2?O|ze$%xQh}rK$I+PxIWT
zT#pt!1cm#XrrxK2n&v(|S<?VIAN7HZLGRNoh9G~oJOZ8LAff<DAFYop6y`qVUeNgn
z6t5unObKXx1d98v1q&X6;uaJJyB17($N;+QBw^aq4@Qu<2E{Q;<J_kk0(+k_B=$ZH
z37-2jVR7%%HH^JanHSA|{->b#X@K(Fr!od}pPtlfdh|r8_vsg<xli8|&3y{$6M)>a
zL2>R=(7t(4Sb@Yqd$1S`L27!zX^BIi@d2yTf``lkjSo)7^gMcFH23L@fYwLMMzf!T
z+yinuPeSLT7e>8Le+2Y`?RpY47aS+s5+*$iQJ(vhYeDk^&VbfOe+=e6eG=3Qc1uL_
z+^2VxdY{TH=zY2d<c0-vpMvc;)AQ(w5hC3%E$DgxN^2l{Kz8yrbUp&bRZ4R2(-jAM
zpT;E5eJZk`_vwxWlO8@W>U|oaJQtj{K>ob~GT&hC(-%shIOv0<rGn{jzpnt<YcTie
zmxA7>cc5Vc3I|Xa{4kjN^iEOlQ;@wZ4&4tx@ywUd`RHU!%OkKmeOeyfF+%uribKnz
z80EQ7L2hJlm;&}AD1F{A>V3MvvG?g2rQWAkoaR1#pah8zP+A3rBPgAM!VwhqoDMCI
z5}M~eUGlK^X-0DI(+>e4J-ts;f<byf`{U+5U7|SmDaRwom;%V1Ukv7g-N@h233eAK
zY_1s1eY&Gz(!&Ipdl<SOfWiZm4lfw>K0N{rmm5lRpMugBC>??92c?Gv&@g#Z(EIcZ
zT9|w=nEUih5hPuJ!UZ{9oH3dUE|&yAVRWYF5h&e)@+Bz$gZv3f3k(bsAmMXh&Qp+|
zbDDdf&SC6*T9DlP^n_9G(-{YQpS}p_eVT%lX7?!dKE0qc_vw)!M4Fugbt5QEf!qxW
zhc^ZwHND_8bi@b}CZM<wgr*lzcpNb5eJZ0c_vr~ENE!j<K~Q;<kv#Y548yrkWfXeB
z;Q`u92nrLBJSg5lWico&g%Ua+Jt^n~mos~cAaM_hzikPVAA-^dC~bh#4=7*zv^;vD
zF!yOmbMMnB4||{HG|zpyr>OTSD4kR!_dd-4^@Sa#JY^DSd{Ce~_vuNy=0_WhdY?{k
z?0tH`Xzo)crv(o|ZrzhK_bJF7Ah%61oD1IP$d)wwIY<mtemqf_`;?1m0jOX9AO|$g
z3_b&+`vEA82sd;-+L6=?E`LDr4@w(58YVwn0geA1Xz>rK112cWeR`(=l#hF#ZYYA3
z4WRe~)d!$B1Jwzjatajgpg0Ek_d!7K)0*bqr&|{FJ}m*)4-=klC<3L|-lq?s=~E;D
zl0HFcVuR7#r=auz@;4}sKy?<VYyr7(fl}|&HAcNpw?Oj=$Zn9mAp1ad#tm>8)BAKq
z5X5bu_~U|>FQBx%A_$UaLGcGFH$Y{BXhY|tI}7H5%lH+bbb6-e5hy-Eb<dRoNZGNV
zXztSzWk|UL%A24%3*<IX{DS-la$8OF+@}r6y-#}%_CBphp8Ir(QSZ}^hrLf16!kux
z0S(hNN{~7M<X%vI>Vc+Jv4qY?ATdx{y#WmqP&on$j|I^1sDS2Ia9Yx90+%&&KxqPM
z_7YGz=F{>Bl!icM49Gl?9UV|RS{!?y&TxX{6Hr+Kvg-<{9pMBC6HuA}*(u)8`Dg~T
z9EYR{NZkVRZ%cCT(+dH;Pdl1>pEd-~eLBUc_h}8dZ2>7mI-qWu19D4E14fzJ0(Hxo
zg5IYSpydb19iTA0U@-UT1ZbHmfs`I5K>gnU^*=a0@H9LEl`o)h2c->AS_73IJx0Ax
z8=!8O0!qIDt&c$Iqk*v(T&|xy)AOi7aqiO-&~(xPO(&po2o$HFFawnvJ;}XKYYz54
zZAqT{v?B<TR?i^CONY_ir;?yD)oAu}SQvrQA1F_@81+8w0i~mwK5#t_N_U|2Rs$_V
zK;;Lh+yLd#BL%%rLFGq7(cGs}37wBX@eL|3K;h9)1lkYO{Qy*Mfb#MbP&ueD_h~~C
zq-}H3r{z(LF{E7sigR#YcrfoNDF1`vALMUP`OyO{KPEKyKCO5Nio3Z_Ym$1OmVnBV
zfL?G}QUWdeT8tp&1;}lnGNl4qrhwCiLem3~JB}#K1-lt!c8BuZr_v3b;I=I&E+Ans
z`5~w-0ktb~lzN}mfZ_qvPD83&OQ7jsPeJd~5@<RA`5BZJ4j9aRT7p!MfZ`XFE<xo_
ziP7ArGSE5%ROW!f3lw*t@&Z)$fYK-^9zkUgC{4@&`FT<A(+SXWXHIhO(*mR3rv(Rl
zpMt^#<VKLYQ<Qqa?Uo9qx!}47lny|7XGZ`i?&m(u2|~0}KxIZwQ18<{3n29fs2q`n
z)+0Hf@Dpf!uw%ibhZCUb6=Z&fQSZ|jXu2#=g48b{J3!^rl;pWj3lt%BI4G@v+FPLX
z0+I)%6Hr|WDv#t6Iv;I;)-Ne2^~<D(pm5t^Fc;jWozXn^Y0ksmrzu5{`ffpT@6!}e
zn+fV3Sosm6)cZ8SsP}0Gv@8XsGf<iWr6o}M0oe}<gB)mFWjOXejX^6vwiwKP8Urmq
zK<!^pI*|vpoogE4?Tr{CNP7e1w;513fcysv7f?J!81+6~Q_%a=N2&K|NYUJ<2~hWd
z(laOyLFpKjw?Xa!rI8H*y-$~b+6KXMpQbQ^^g!w(P`G6%&V8zYRF-Z)%Cn%f5&|tt
z=0M#6E=%;9z-38*5vaZ0^9YnCT$FmBMu5^SwEO_s4GN1CXjrTW=zZz~ZF7Li3sCs4
zF_`<*CkWDa0mm6A|AX4aXL=s_7|ngE2nv@seUCut6_igv^$4il0ZOmnbo*f5(-q0R
zPZJLIK3$MJ_vxDE-lra*bn_6>E(tK2`xF#+u)LW7&6}V!0uob7=zIh!OF(%P6qhR$
z<~{|*C&=HRG6fW`3y|6sp!iq;D!U7&gWDGoj=fJUj3DKK2PmH@%ze6~p!cau5u}Z=
zq<QYs7*PMDp#2f3Yyg#GE}%39>I*#rol!XV>4xOqr^*eTk6e-<{Q!_Z!R1lF)Tf}f
z1;}kn6y`p4Na}sM095t}G(OnU-1~G1s2{)tI>Q}Oj~GDniUW>%Bmx=_b3o-MTKTa6
z6z9--1RTHXx*n;3%8ZyEaGC^_8x}}yb5OYf3I|Yn1II(a)TcI!dLeD}Gd+(?KyA-}
z-lrN$y-y8-=03H7rcY2jg5nO8hC%5AlvY7$fnmXfr)!$$KHZVr`!wWW@6!#*bDtUn
zA<`%)ZE!7UegG;*KxN0A1#_ROLdy>Wr1E18G>wAl6>wgu>3gJO)caHc8a5`N^odrk
zhCst*N<r^a4YY8XVKDcp2DDBAxdD`JK<NZrw!Z0mq+vAosTwGpKy8Qzec-wXlx9HT
z0xDlYZ5?p<I7|VTkz1PQJ`H%-`*cro?^6|{-lsl}y-z0u^gi8y)IOI`>V2xCH20|j
zwA=vYp#Z2GL2VFFxPkJ{6a$bNL_0(sRJRH=J^-a31tUoLu>~3)ps<iJ>U}Bz4F?ra
zna$7*KC2c~@A%*-OF{7j^0!7p=c67_Im*!RNCH-lGE4xsIYDlj04+y%1kZhX0F(zA
zd!I^x(z!t6gCohkPbEO^fw~2pzVw<NaVYgZ6#><u(6j+=o5b`y0)-u@`~vwC<aZCK
z-#Y?&p9-LrA3X+hp9(<B4^X`TiWdP;JFK7`JO%&``-16DH9_SFw2cZ1A5a;>W7PY!
z1$0J=(cGsTMWDV4YFiZ?cM44pK;`G2<hf5>4)#7h(cJsg;bHI71I-{kpfaWx+<$N}
zM3gh2Gy*D9v=TZWf$}aWy>wtHSN0&4D@UO1jX#FH;Jycs(cGstj*xN%)II{$6QJ@6
z6ju(=HW8>S0+lDAdI2N{sz*Tfo=NU~s@>4}hy&E-S=aTbrT|h;|0#sD*Fkw1RIb3v
z7*JjYyOXEkQH#P{@Yol~&n!v3PaB}+&4uRPrwogFpMvt~pTgd!2awY17scMEEJ|~q
z>OkudP@LI7;|vtnpm+qOkp@s1qW~F`0F|$Q3?Y3MP+JA$e^6Y(;vSS<e;D>YeWM5}
z1Li(uP@4O+BB1x_mq2J+JfQUv$R1Gr^(7D#FOaqdsIB_N5E74|at4%kLFEOg+yI$h
zvtaI1U1+&+CAs&h#lhaEXOicF$IL+Oj}L~uPfs9?cRYdG|3eY`c!velpCtvoPu~<m
z-B!^42;|=igSk)N6hiVRs15?93q4R-fi&Ln#t_oy1(g+`a^nm%kAT_|pfCWnVO|*a
zJ~eRcefmJL_vsVIxlccU^D3kb3l6Ub^T1^bD4ap%!-eL#PfZ^7KD_~Iw*`Ro^gg|U
zG~Qu?G~S`#&<V~bAoqguMTr5V+_(U8hd|?lCx)PLF-ZLaN_%&jd!OD=?0w4IH2e7r
zs5?OE5R?W%_JiWY02(Ga1-(xnpoK|+!Q7`0K;xkYx*vez29)PPc@~rg9vDK#I}AW!
zMC5pf4rA}r2g$up?-=$z)i~JuG$R1y@3~KH6d--ZE5>u5HYGs%{h;vxj)tZO7Yuu!
z$}~XQs5*_1b|t9n;819O0P;%?sJ~w@9X##<3V%?ZN&%I95BeTmD4hFrTf^jspt9kP
zF{JHyBXI813x&N;RX}Zyg1O-F=sTb~A2g;{(Ei{?Af!(s1FByN=RO6M2R9NS?F@E>
zrU#&S2gM^OKVATZx5JdDp!^6b12aJRrD*o^D~Y|}aSa8>-lqv5KO*J76N<f0uP8$L
zAh0-4fyM!-+yIH4%xM6pNzfQ*3dny6)4=`%wc8#9&wUz`(EId6;@qd~1<emYdG?O-
z+@}hLbDx6Zhclt=5h#8@?iVST`}9O2q@D-4`G{gKIPEbjv_D7y$${c<UDqQ}K4ceY
zd=L@P`;@t8_VXiwbDur{h1Y^Ea9a*k=791isD6R90YLEss<+Q9?0qV85K`703G97(
z02E&VbDy38nVr-3h&iD30mvUR0liN_<KHm>bDtgoje#dj1CL*W+K8b1#wyVGAS9vp
zDOb?!=Q0VPG4^>+4?F~orMEm{H)sQofpR|Rdn8jh_vsAKm^wrEg98si_wLMjdh$)f
zBT(E#B+Pw!02F7S`rV=BQNV%Tr!yY(Jp$Pa8jl9KKV-q&r)&a^4?zB4Pn!K4bf+jo
z0jR#8_ms1t<59o^(D_Cao^l+T{Twtt0^0A+X3z{igBY~`9yBfvax1G(?;~Z71rL=@
zEO@B+V!^|0hDRRmU_A10&%q-PH#|D>aF^ndhx-JNJk0$5{}pHr1!!HJ#`piXPR4XU
z(r}pjbV5MuBhY=q3<s_}Wl{`z%JS&SQzpSHPdQkwJY_S!@)UG88)&Tsk4Do&K8ePM
z3>M7~*%`tfGAOh@<zi@k30gNI5YYPQ-T(hmLf`+tdSfyFsSNYnr_2li4?%Y%J>Z!C
z)aBj(*FoocL3g!1W;)RGh}q!Ga{*z<dLU+oK+xF=r({6wV}>B``9j<e7CdBf=zh?^
zcJHZ@=-sD`3;_>8=R1PV+yk!@RA_p{WN_y>lfaqhAbUV(t%KGQfzJ39w(ffbIuqfN
zLGvRPhPa0e3WuLcFfec_v7UVjI<HN^dG6DIi1|;CfbK70nEKR1V*XPD<+)EU$${>i
zhOBww0iDsUIPE#;EG-?0`A<*FF}wz^;c)<+)f)cr>;M0!cr4~W<$~S;z@ozNI^g^N
zS2J_E9~mUHJyJ>TeahCb;2~)36lm=p=)AUeg9QiKk=OXiK-Tv$1T46$kg(vgia_Hb
zrho+p6&w~E=4D{G#b|Kx321(fnIYsMv%`Xg%nYFqnFAJVlrRRZl?eu~Q4(YbeeA=?
zaEc)z<Pl540zo%M1}@OLH&%lM4?*kBKx^~B=TbTJK7Am@@LC`kbS_5wBgXEIM~rK_
z9<eioKICZVcm!ILcm;fh+=9ofHNB76KyBRvpfxZH9y1s%co+e?FYv(e=gb1#4?yA1
zU~us%$Zg<tau1G+3xLjw5omk_x^ow_7EXX60DN~BXw50;JPDqJ1rI@M()dAljTl^i
z4$`N{$RGteJ0ikq_EC_3ah}!i0C}x%9Ad5SBgk4`P+Z46>V68E>l9!J1f7K^B>+0x
zqye-h6k?Yw0|OT$)E~?N-47T*@dmvgN|M^{U}$&*@;_)T>r?RkWsQ$O?z;W|zZCNN
z;WMW5pYkZAf!7Y75uN|kNRHt(D7-*tQwu211)m=S3b#pbA?t<t1r|I8<&nO(|6j{M
z*Nyrdn9b_Iz`zB{Zy>$G)(ww9>0X$-`_UzahDXc=-48(P`xq21JO$<Zm`Af&L16)k
zlL*kdPJsoFL2&>&w*z#x3(hzo;+zhU9r6ark3>P|bO<zp^B@yLAY@JXqwc3q{{P<v
zwo72aL(usgAp40~iwru~1AQ$rD2*{1G(KWy2zUrOljj&(*cO-|!nQ<Y{?psCkg#<S
zm<v7=hiAfqhdRQbx?;g&rh)~JnHv^728D@^^4zB&H!?6>dI|~?kUJ>}6KR9wN1$^{
zKzWw+K_B=m)-Hnu2f2{Tftcn);PXTtbw5=JXg$P`u;6eX1H&x_g{z=Adnm=ga0}!n
zkb5YPqpMHl43Zy-gW`yx;Stk=zDG<90Vr_<;?u%T&{-;=`)sh-c?#@5@VVp+x5!Ns
z;Ptr)ZQ!+qYz%P^LFX2M@}M=SEPb%x;i~`tU*#~(f4cC^|JPgp{eP9hH2>+mH~(L+
z|M&kD*nWcr4?*YFfWjD@HgTPCL_}Ty<pa<eN1(C^y!YTy_tR@MvPS~6$KgTWBbYt+
z{{4TY!#wvXxPD#G^@x$D;Sm!<!z0kW;X2H{PhI~1KZRTlxfp`-3S<vMh~WIE0?@ny
z+9LtVC!n&LL1DpV5#`>iJ3jxv1zIaBlHB{$(4p;-MKGwI4|(X}(EAj0FATVjT;RN@
z!R+c&X3$-l3=F4O80SBAdGjB<W|NH};_-vG|GBsr!XD24{QneaO@Eugf`_2I2MTlM
zfQAPa!gHT)V7U6Q!R#V9FM`e@0<HT1-Alo&0IGkQ9xxa*KbWl3^k}AS^CKRE=0^&k
z^~{X3pR))+@+~M1LFFMOc^Bo}AyB${(D#6iAqt*Xm;zcKUH<=nRp#gauY%kd7<NO~
z!ZbKBF|2W7V%Xrs#Bj!miD54{1H&F}28KIMObq+D85lrkoG}C}c*w#q;c3qW-$z`a
zvrQeQg3mpDU_bxq1O53=nG2>u&P+F$`kYB&>T}Q;{b%gwKUGlZeadVw_4yI~`A<P-
z_k-m2*w25e0Tth(KmVzTLGM$L_!|59PYs~rOZ4YIwSkJyv7i6c0xCX5fBsV!sCbY4
z{HG33@fQ90Pdz~53#LA=v7i4GbXFVFhN;g%G{}CC`JlDt0SdiO6YS?dO#r#MVd`_H
z2@rQ9s|zvceHx+A`_utsK1dzZPca6)PZJb+pBjMNi6qV?;P5ELp!aEpLhn-z(D~yZ
z=TGP5V0cyG&B(yu!^qI#!^q&`#mMl&oROi%f{}s4l96GGB_o4^6(hqMD@KMKYet4Y
z){G22HjE51wu}sGY#AAB>=+r&*fBE1*fTO{I508@I5ILQI59G8abjdp31wtZ@MmP`
z@nmFp;K9fs5X8u^#*dNVK`0{wgC8Tqln_RS5MM@y7-vR?7tV|fB`%B%46cj}KU^6Z
zdfXTpWZW4U*0?h=*my89Wa!O*Dg)YsW3b>c=p0x^gVyH}3Qpj)*f2gQY&byce+*im
zgX9MrKlcCsS53kT9x@3!J^;--F@pAP2sA!m1l=Pk(D<NHc)>#*2FN|>{0|m9RQUip
zb2{L$4^QjU2P_O+d<F|1vlz5K6#=bVXPEjFcJBFeb_Om6feBA#6hL=gUVNf(p!F$}
zN%KP)(0xh@6Ts>~ZAwN1=SQHn3JdJKb<p|h2F*+y3ZV1X8(0+-rh?BV<T%ju=-L1O
zw`2^aKIKqwdSq+_xid$cA^5R^LhI9=OblG0^Uby}F-Y;_aMK|=xycdgrin}pQUW;K
zGM`RviG;c(kBLDFw4NSYT-DIYEoxA=cr!6b3E>ErNIJPC80r=cCI%^C9BwhAlUrbM
z#LC1VrDFiOiw?9V6LjB;jzQ~F(4H`6g#{1)Sk8a?M-sB<Pf42LHTaxL8_=Dl*z+J8
zwcIZN%7cNAISw=;@}Pj@BV)q_4?%YefzCz+<!uFl)~69RtxrX9gy$pB`G?df6G(KA
z7!LRB8zA?H<8aTc0dkK74)>H%%RQibtQdkGBbVWf&@voUb~73<KLU+22pAlFYNF8k
zR1$}Kf~e&lJn6?oVd_)l^lW0#`cw*sd-Mj#J<>Sb!$nW`ut4s(1?71YhSsOo7#Mbe
z?zlw0-x79D8|aQe(D-t*(SnCupnYQu0S`|xFq{I7m$4hPKDd_G{0KA#Cj+{x-T|{M
zafOw7Z3$3Y16w)-r9sf%Y6gY{!k{$Cz;H}-Co2ONV?p~PeunVJpfS<w|Nq|trBl$I
zT1*D555Vmgo}kA$GKZgn_CLe?lcRh2DaalJ(A_tnz1{-7PeFU8*^MCUN0|*;9~^`F
zSr&(%r_<5TVE-B%V^sj%r3UKz7&JfP2i1=Ty-z`YhK0d#kpB%9fc6wW%&=(%@B3yn
zXnl~QbNMNQLF)sMpBWh%glc3Di-N}IGI&}=8F>O9gU;w>U<i2Z3%<Xn;gJSI?^8J(
zX*iNv{uTh;6OUSFF+=Mtb_3=|ObX7AKzD3_`c<Gbtj565C6B{RCe(71!qlgHXyqV3
zv>a@<SnzPM1!$cH`2GlR8Z<EIeafz|K(LgBL5e#8bZ^yz$7fg=UTNWQCl?jn2|5oP
zIiDc6xr;z)L!tHQ&Hw+Uv~jrQIScjjEIzlmLfx|M|9>eR9Bw&6C%0HY-7@+Ae<@w4
zTl5(iUWxo-V37F5z@YMrfkELH1B1>l1_q5^3=Af}7#IwGF)-NtVqmcN#lYb5i-E!6
z7XyROF9wE?UknTpzZe)&elaj){9<6p`NhCc01|)1#Gv5J#PFY=f#E$r1H*ql28KOy
z3=E8n3=B1LpuISVK3E%_{2c)Gcj*8BQhHE-qxT1s>ExCPP`4O??!hxy@Hob%^{GA%
zH`!6kO?cW9pgSOu+Y=!77~pV^)Bw515QlrdF;giIlNdfmINWoI&hBAUSnwEBH-O@d
zMWOX6s0?OdSnxQTnc<Z(4mYl(mK*W3nHd>`ANw%OWd+sSj0_D-J`BCAJ_2(^83i1L
zd<1$$eGY);T74b~GXy^_`1ij{35Q$j=;T(AJ2(CRFQuX|_bJG2pmPnFR1j?;c7x^z
zt8JPeC4lE04?hL9HzFAsUhzWREeyIZ6MFYpAlS`Q5aUV=$m2?&`^!LMRiHCxVB<=l
z`@E*GG6=MQ&h}^GfZXrJssKxq42_ST!^V}M?Suae%#REe93F8n1cBpUg`xFn9|J>|
zhQZaR1_}<~c^wsn)~5!)|8wCRJ7W|Eoqx07F=+e@Hg=|BF!gBwPwUfW;RO$w1sxxN
z*0sRK+F)aEjY1H82L&KwZ!o<9I#Zv9@U(*4mY_R|Ky50y-~YjF115$CkB>4jyyC(V
zW-QbSGuT)hLlYv*pzRk>8RrBodz~2=q`0xT;}H|6JfT9|5pYKo)E$Zp3{pH;+;M<T
z?#O_;!{`5hE=bw&;BgES!z<7jCanJp>UV&~%t3jib3*e&5r&Az&42%&N>BjZOFij1
zGehLVnM@3~7#lhsX+r&iUbpsu{X?CxR!|!r*6zFV|35*uMxeR10_s+E9Bxe<K)33G
z+<E{Mu5-ZQ`WG};*wFDv6^C2RXy{f&9Ck`l(N0kR1{Rl~G{*|ftMUfSk3i`SG^YdV
zvuZGa*6)QsEco|-mx{n#@Y)I$f!?Q}@><6LH0Kxe@X~+K8C}7T84fJCta70DsvQHv
zt&Kdbk50<8K6<Fr`sk-k>!Z~*t&bQMEO?y5(C}!EK;xq`3Qdpx7&Jc;VCa1+BGCI(
z0yKYA(Eg~#p!X?P!h(ky3Ltxf9wX0@uZEr_#BgB2VFiZ;mqGS13$z{pt&`zVSa6U7
z6lVq(pMcy9>VG5F%fvinKCoaTXg(Wso|J$<?;}2ji7!C+#c6=gpK5%-CeZYNO`-V#
zJLtYHhu)_g2YR3C@iDxv5t#c_hhgqh#syuE7_-|RG1jy{VsU7E!o?8qutos1@44*}
zQ$hQqOaK3$0)+=?ehxI&k-;<dDWUNWQ22t@FM#IVOc;8fg4XJQ?hyyoag03Sj~x^c
z_tI4Pwmy1rTK?&SZ26}TR?9!N0PO)cXnpWpuK5uU=x!keo=5)~*d8&0&N@?YeDYs`
z89bj48ha2p;PZ&lpyv@6L(D@K1C}QO32u+x|Nk##06I5`A?EQPMuuAkHu6tFamH+L
z_4&gyt&buMdY}HZZGL128j}Id`xvx7U@@5d6cm4;`ML<uzEjZpEzt!Jn-v#4JZaPV
z2z1~598f(i0Gjh^e!#@g@PO$+&x4qTxlauh7Cg2P=zR*B&r4wFeVTEg_o<CS?^DJF
z3m&TANbj+XpgMs%Wfv1e#6xI$KLxsLRoG&|LmALGfI`Lt&^(jjB<2U8bpQL`|5qst
zbD!Gi%0J~Woba5}Ao&644m#C8|GP2-=00UMocP?qp!cbR!rZ4O(DeVBk%0>|9-q(1
zFv|tB_md&$q2!<cw;aG@CeDxe8NwbbGck1a*vda;Q)qnvnm1);2z#7k&<oy2TBCOf
zyw6pXfnk;dC_RGi!Zhf402&K=ey;fu&w-vtOa?JenH6H5vIxXHWpQu;ooDovnIYsc
zqk+#;CIz3T%mO}7Sr~Gje)<2u%Ygy3SKjRrtAWEKW`o0znG%v8fbO;9WMJUR0p($X
zHi+4J&5yVhnjSG2Tzblw5cY`C0Cdl?6Zjsa9EG`0We$MWBey=NId}M}jKJKd8VXmR
zg2r@ecp+n00s;+>7!9XB573zkx_{{rqhagwE`tSvn;Dt}ea=i}1+AgwV(eiD)f<co
zPC}qOWTVh4s>Hw`1zHmeN`Iia3}%LyhZY9CPtW}Re+%U2D%<8q7N9kI2A7|1^g*P>
z2!^>&Vd=3!aKS@{qo8}^TOT|Gl{Gr8pnUKk$D!rX8BiGmzOQpKXl>d9Mu(OMj0_DA
zKzD6{(ryZ<ta0dln!(Wf)JCB9DJXqv;7Egez~glEO@l1|{=Wi`2^zFMNX=<}#Fx<a
zNWo#jW6+#G3zjj^$y9VBD6XLS1U#RLXp0Dg>xG{T3|tBapk*R>&1=j<g#*1$Z~Xti
z3)GH@`ThSDh*m=m&jVARvM|hf3Tl%ogWWm@(MESbZlliu-!Tj-yFqyp<Q5i#o~Jwp
zb66P!dZ2A|5WfdJ_Y2O`4&b?8ym^{!!-9vm{{DY8gKPfNC6E8Vp29W%>7vK~UxVBU
zTK@;i*DYG}pSD=df664#`WzJYpt~$tKxLmo>vI)@xlePn=0DW|ohfM0`W#eeBv?V$
zLI|`zHvp}%KF|tTr=igL98@m2Xw83W162<?*Te!zJ*ezpMpEx$F!!m9*8Ha)ko@)>
zbatTtOg%^)XpO5t>vQG>t<M8MZ9kB^5)k&i(47C210*(~^?8WF+^0+pt>E<;pmhc@
z0&}09v4pra0%X2G>vK^15!wC?n)9E6)^vl^_gv_G1iD8T7B<^KcV!wJd+Pk_|Em<x
zd95J34Clbh#rwbhcV#eu%Ebxba&ZT!{5&xCX#$$Mt4QiVW9gtWv^!zJL^TG6Sr(e}
zpK1tPead7o^|=QqEJ5Sv3{8(}^g!iI;A19*)(17dm!1j;w1CSSW`l+Ypt5Ec_+Hb1
z$5M<8w?JXY#Sr{Zl9Az-2WU^=nW;~?6d_}#Ob$KIL2Fn*=ShOfAW+)s`}hBri@@Bc
zTnvHWHM}7IuKo4@6~loCk3A0bK4sjn0CXSbV^CQNO1B;Yb6L3s8W}tUdco(Mg5nTV
z=6f8N%i3+QfRXt?4}-^nURE0hP`f4IF(ZS6kPSnxs4}Rm6PWuHltw_~-k|&DK=t6H
zU;l4`(gmn|<1uJ`fL!LC)FH0S;}K{iySx(v#Vcs-tH6TCp!@Ye{%2uucmygBL3Og_
z|NpN*XC{L30=PW_TEnGq><MVD`Od%pyL6y!2hh2vpf%SW44`}R8Xm9-I6q}n0Nr)S
z^hgJM7VLtDptYah{{P=)0NOXe03O4>tWwZ>HTUoTTcA21m8bPls!h)$K7-~*e4w?e
z39Szp3@$wFQ0RTcEYS1-wC;@UK;To*ozv_Jflop4$EM);^uK}dBbXY{dSf>m&>hPS
zkAe)GAF+Yfi61!pwCTWE(bv%NK7)d}PeJW7|G)oVnHWq3pNFf$z_5#%A?hLMtWMCJ
z`3koAPhCt}pRyiU@DOx|ALuS-2ZKrAb}s`%;6o3SCeS%Fk3eh8866fp1l=RfDzM<8
zhsngJE-DkBg4%PS`79QOfQKF?jZaww8XtWJ*$=vRvS7hu76yh_Ap6)D7<Pfe6?En(
z=$>mAlQ~aWz~yQ1<8S}}uL89LKyhMnp!X>=!-L0H|NVajN{65`RYB)ng4%L%43M-A
z>ic&IK+^g~ho*<1v<^B`5|-94|NVapbaoS{%?ett4l?)C&;PH~m=-*&^lNy;2U^Px
zYvTz_e#)=F_NaiN_bC%Y;{ygz-qXAE6y$f%{!^9%&5t-47*>Jibe_Z74+3+Zg4+-b
zpz)8uhp=|UkN^L76@b!!K;xrIyQW9HpgLV~!9&m)u%J8*s_QGywmxDJXnM-R(EP{(
zbO)uu1aSO<*8H$22s{C)0jcelyY!R?)aI5u{1h~2#9})CDYL@V=b-utR8KG~v_1#z
zMPU+XeNg4w%2Z=_5Y$FydT?Yu>-oR`r9gS?IbZW5hJ-0kc^DcVf!0ui+A?eg%@083
z3?pcrI78uMMg@l_ptQ7xW&TrGyO{ynZU&vNyXWu!R~`(#PwSvGC@kmy{Qt@Tl%7Cm
z4>JTmW>Q%2n8Dz|V-A6%PZMlfpMu5*c?4RYg3dmTP?`TUf(3GhE2unRQ&{lWPlDmK
z2E$cw{RnC|F%&Fd^k!h-5|jmnP2-~qf!?PT3Ui+-%C>^nkAcp~Wr3zcP<aAs<Adt4
z0GX*z8$kCz8eDwN$RO}oF|YX%Q$pJ#wu4ijZ#vNUFhpl6YlzNN(E|pT*bf+766ZHK
z%*=1VEac;{;GvI2Gb4*pv)}=PL+l3(4vDiFPJIqa%b@ld14Gn9HpABEpu6Qw4orO-
zk~8%wkKuxcXB4hIXE9)YWTd>{VF1rm@ST;L1tvV?S73U?RMGhGxWcvP?1rE-oFHo2
zL1#1?K;<o(A2KqCKQ1xoeY){L!^7hS*VvC6T*K<7;|9mrj~g5l2jyAz1E9IC@P~m6
z3|u7zbDx6j1-a+(|NpPp74JM3)N6Xg1X`b_(E5OdVbW6u!#U5{O`0Dv81_785tsxX
zKLmw4J44h%P`U%%;|nrZfZ^&>X2m(r85|ZoR!RZorGUp439U~ZTw0$hGB9v~`g9@=
zt@!(NOkoct99o|WGcahe8P0hQDjSql7Cf|2Xa%nuNKpc<y=;Bzz|#7ZL0}TN4*^Pd
zpuELspv)w}(E8K{v|dgCKA!v#bpPqKzyDu>%o6|i{}sp`c>9%1VGlq5{|~kwlr};3
zgT~)L=7Rb?4koQnLH!btn?UPB_y7I>O27e>_7*&5U<i3=Q2=ot=<HXJT_88%w=evm
z2xyM~|9`Ct0nnQH1rN_(`~TWPVd~S6GgF`1Ftk2hByi_B6Eqzd3PaKg=qxwTU6u|<
zral#6nEI4ofbkI{C{2LNz<|dV2CYvWj<i1IU|^7vFqryOLvj97MuFx>%!ZSmGw}pI
zmJk4~ZEAfg!O+SII{(-PbPu)ysQeFl3<^t-e?=4^ek}o=<(07DA*lTf@-rx}H2x(f
zEW;lzK=Rj2kiP_`J`K@<_-i4<rRSh=Sx_D@U|#Sr;LOyg;B!a~<~(#znfjEUf#Fff
zfw@mXdksK)r9kaku)kDVpMu)Vp!i{7Sn$w9p!aF)-~X=`@-r|j;)l%Tf#wBekmdwo
zbAg~aK+ybO!Y|0YA8c+9H0KAJ?*rZGYU0eqAaIKbyuNrF^#0@t-gBRV?oS5w8F?If
zpE6EZ@DQ{|P{5$~X#f+$DF%ZDpmxur6v_EdSq}I-0@d@(3O&z3ZD2-*;D^8e|CbU7
z0JUvGAA`;hXJT0Jkip>Q^KE&(k2pYQb_=#WP|+5ADgf&9GBkk30zhNo4^^}oL4DFw
z;I$D3bDj(O_JYsmWin`a4sMTe2R#Orw>$z19x`(GJmO)P_ySyi8Y~3YIiRu)W-kwD
zF9fK~g3De7C-AwupmK|WAsB2o=nP~52avl%9?KiFJYq3eu<$Tstp&(^kHPo+DlB*m
zTDKt*F!w2wVC!>GJc0WBptIFMX@$`NRG!ayE|M_!>0zM-4;dAwJqL}Gi6}QcWC8h=
zJK!;+V%u|2y(9pdUkO<7*ukOakqD^m4LV;zapH4%1D;2s%1sX$1$rLI8!$c+HD2%#
zWZprc1rHe%+n$5WWHxy45WFW&f$0GY=zMp@w&$Qa2XyDJ#DU(YJfL<qL%`$fj0~p)
zz~@;9J{E$7$pKJ&&V72o2sC#v>AAcD!y{0B7ZwtHAOZ5f;q2!O2Nnpj7z95M2$<_C
z06NE>q2Up$L9+ws{C?(xozLHa_I(`yoin}QF(`eiFhJI(h=A@;W@vhJ0OWVWDG;**
z7CaUW5`F;6pRx=LuRviA@()DKG>Do53m(fH5`G{G>hm!Kf!BI4G8BWtTuOnV;gN{K
z+@}!rlb(abfByf^1$MW?g2y68!Vf@u{J`c0z|>8Jn47TRv6zwY15mpPoZb#NJmO&p
zekgOG_h}#_!!59TLH95lPI(S>BUd9Mk{dx`WQgHLDNs8C6o=sUCIbV+jRMdxHJk|E
ztA^r6C9oT%;BEw&D~RMqAwiHExxi@x+%}4NsKC(sRD+S>7HB*LRPHZ>p79Nes~eKN
zPdzw#!E5+IYxHdr=04rV*ZYVu!R-;-LC`+FhDSUG4G$EGg`Z9^6n?6c&<kGU&u)<X
zfRiEkF~@=4rvVHMr%b@*aNt8H1_mx>hTzBY3=Fqe4BQ`q_E*X<Fq~qCwZR&?A22I4
zK4MPje!vdehoAu32Q>}c_T_S%`5biaK6uX{!^EcopfmCfXFdmysWLFk0<~2^=a&mG
zG(7>eS6M)5B*66%i-FH0(7g@J3%j4QB)C0dY4CXT^8bG+(7oD>0`89(8A2bz+yE*&
znLutx0PjtE2paojSTOA=sB8h-udv`D+X2vi!AamYHzSh$pfG1(2!F^T&;z#L<iOmg
z;P!fe>mx=32hjM~Lu5C+`2YWw4rmWAL)har3=CX44s)N{IP^ZX37Gpdi6Qjy;{X3|
z{pMfrc+UO*uNVCP{|YpQ93wLSDT6X7e>yz?)q%_gN#Ok^pf(X~P0mE;rUx1Zy-yb@
zEO-c-yVL-cAqLG4m=!`FR5LJ0f$j}wGo1aLIdJB46Nb4@*&P-<WB|9dyB~no@GvfD
zcm(QyfzHooZdmY;2eejRVa8J?kY5c_!F?ZpP#-d3?o*IC3<e!f*%Z5<gVvl`B!I?G
zyB@JLbUb2A@B-Zd@$mis|Eoa#N*;!ghll?E-vzQ0v`?PrK*9qygQN$bu{P!d3l@U*
zp@Pa&HiMi8p!PU31IRsdpBjM5c!kMN89?pu13r&f3|gOn)EWfzK4np8cmnD_um_|(
zU@=I10NsbWkbxoeF=InJ=#KJR90sXi^VmRbumjx>K;|+ifcgg$o`UX;0I6j$=y?J%
z>&O59r$F(>q0sn%(ZJ^s=-zWsdz|S&$^#S7H~>T90|tSl2kam>G6X&}U|_hl&9C<n
zN5I^t91bmyK>35!pyh!AGxJlBKiL#p9)QAS0weQNg<__s6Am&xwMpoG+WP<hD@MZw
z2bmeV4=^5ZJjB7kaB9Q<|F2j;WuigDQx;HoI=DPyWC(i*>H~xB5m*Z<3l%0j1=UN)
zaq;p0e=Z(@1q(le@~y!Pusnl8$5RG_hNrVZ_AmrJHaRetmECZ*IFCU)!(q_afZ}X+
z=D?ZaOo21mYe8quJIsB`p)mL9Ht5;>puE9k(D;BwvGD<D54A!u^V10jnV%{!Gd-OU
z$OKNOA)xs-P@g;C!DAj!`eEpP0CF3H!i1*>4=s2Ia-+Nh<0DX<h$zezWe!;IkjHS6
zIAg*BVKI|tK_0^<anQIOsO`%L>d!DVfaU;JsW8k1kL@xVG=T5PVK(S_0O}(*{QLik
z2OI}Mk4-^$XavlCs^T#BDY)J+C;{!?Hf{}A@Q{rm6m)OOVNjVV5zzZI^xuCjo&%tH
zp_s?U3=F3PpyMG70t*f^9$0XYkzv6>X;3^u+YJl`Z4VUGg~9XIg1Ws-912ZL3<gaM
z%nS@tEDD>U{qCU0zyJT|0@dR@ptIr+fZ7Qm519o{J_ps`+dy|WFfMq=0ouQ=;PeR8
zH&sw)e){zP|5yJR0zu{9soVE^A2C7i-vO1q3Ie@P-T(c6Rbw#!X^jA6-8^VcE0~|*
z_2K{jU!@q#f0_Xmmr$7d)R&*(wc@}3uY43h?NCsAVA4|`hWSqw6&5_cC&KXh2xz<n
zNzQ~}{!?j%1&^<bFuY#=7gV0ie+qYl|K1l(_x`_PVPRlcy=v7eP@Ap5nTa97nTesp
znTf&1nTg>oGh~05@EzYrJQsW)F?#hrGI5^rlrgIJ5o1>GBZJ_nPc4$Cf#(2LIP^Z<
z!_fP5hd}SsEegF)HyHFjT?0C=E1?(M=bWK8|7i*ztk1dNG04puMHpT)S}b@BYL{&Q
zoe{0r@tn~h_|fnG|Fza^nEP}G=xpW<-jA3Vq8~FD+<Ll3VD43!jlEBqk1Tk|&9LAi
z<AkmYp#79Gfped(ahUsbjl$fgTN>s*Z53GXa7O}Y-oWV*%LbQ6j0-v*Fe^Ac+9ELb
zDa(Ym2cZ3XptgTE!-9v*4IK}d3K}0UBs4zY1eJ>l3m)%K@Or?g5b_k%9tEuf@lk1d
zxZ%Lur#lQh9xxfsc@Ek;4k~|{411n4F@!wbA>jUifn~u%CzghXpuQf+KOlKfe~(!p
z<mnCtw+D<O3m!U%G(KcBob!AG18DtA^CL!3e^8<1DNBIsBal6gN17h;7*2Q&y4MG!
zpU1G_`K|x|Pss>^&fz-!n8m>H5i>*51JD?Z00YCWEub?2LHB<MG(7;F0ms15{D9HH
z`4L0Fg2$Tz93L<m1U%W0F!w35$%2PIN17k<C{BA08WRGwEqN5%KzCtCt!bG1bjyOd
zPdmWobb<HN@7OT+Dd-*%CWG70nG8;X+oDPgL60{bI0$M>NUeaj0YPI42Xy8?oxp>L
zS5SJh7GZeZaAy9~4WM}*h6Rs7?P*Y532IY=#!pxb7Cr@yUF{H<`&348?o$SXi%*#t
zf*v!oEO^Kyu;8LG1H&zuM9{e;pmiqUPd7NseF_R61(l|UOd1OwDoHGO$Y?m_`JRTk
zPd5aB!qOQ$@57wf@tlbv{ON`TbDx6ZLy4#1Ap^&PhYA{?vT4?H#shATK;w2yhF#B@
z4|Y6f76^aJ<ly!Q6gLVojSm?m7Ccn6Sn!Zpan^I@0Jle=aUEvGuIEgS9nV<|%AbPT
z5}>eD<Y|7$pg8L}6GPZzkQxS%n!t|dm;e7i1xmLv2j@OzG4KY@d$B0^JYo_6&3y$v
z=3!viwF5L3b)e}1qe0A*Jr0n#QDA9)2s*EhL2)u<EJ?BXIg?<^b4Gzc(48z%pmZoC
z1Gz&5)F+x62daNsA2BN&e9mkL+PByIh><54+=saeEz_d=7d+-k=zaQU)%>Tkb{u|i
zqTl(!e};(1p#H?vbG?r^3>Q4)0L`5q=z*L+up#-8#KGRDA)s@=CuBU55S;rIbfy@C
zz(jEPgZ8(F1kQcR%sS;c$AP8?Q}cQsF{(~^4(fNE5a@l%YPjGbkKlrb3=2T@dmE?@
zd;q#DhWWsPhYSuAAZfv%<q@;$#OExc6Q6Siv_4=`NPNJ>5cH6vp!ESaL&F0egU$!c
z3=Ff_86qBXJG4D}|Ns9jkbVipxlcnD&V4HE)BA`g05q@I1n$3`NSOPS$FSuAXpE7S
zA?TrmV(-%pnaoc^7WO_p2RiG3A>#4A|No`dfa<Ib3m${~dt^iJQ<06mPel&&J{1w1
z`*bQ_?;{RS|A}G3b5J^CFa?bjH9uld1-1DWJZ4g8dBAMY^56hN?^6}Q-lsf@y-x)U
zd!MQV&V70S)E;68eRzq1fs3bc?o$R(n~6>6@o5GIDbRW5Oxq4UW-yrb^vs6dr%Yyt
zAA`~!Geh*l3kJPU4>2&TS^=%2z~k2kvLBRK&VPCY)K6lV{1kLQkBj8|r=YektHFYY
z0s_4+&hj$6K9ex_>4gSR*|y*@Bd8o+u;6ioZST{Hgx04o`g)(<S<w6R4#V81!aBW=
zK>OPn1Q$F6?dfDRXnL^0Rru+IAmOJ9Cc;no7(zhh?qx=W1&42d=70@SAAr{5F)B1&
z2K7NS7<->C5a@k+#i949PGIlTi;N6XItS-I-NP{V=?w)?xKDV_Bsk&u4u`o<c^H}=
z>`9pW^a`kt1S(SvS{^VcPJ7NM(DH!wz~$$x0vDfy&L{$fC8*v9r9D=KOV61Z+8!_(
zENJ8rSkTCPU_m2j9Fd8EL5qnY<{^*30!1c)1%^5s=RW0N=zV$v)Fy0L@Nmb0xlgZv
z%FhMekGLl+c*qJWvkQ72fbL!chrhw~=b*dxKy3jz1_mjRyEqM}JqNW}IYE6~(0xD)
z5baeKhOmbp{{O$l$`JWbi;>}$@R{C63mE1;y&^F8DJZ=#81y^<%_VG5Wqx|YVeV5M
z&^ePX%ugpMF+aT%F!!lOVDD3njdPzSGDJTPWM(*}ad7U_I|q87&i()Y)t(J=kFvnq
zd@hGL85mC8hloFAg|_=xLG3<Jp9QJicN^C3a{#SDMEK_esNLs))b0cM9op_Y2{PAV
zE;t`DZ)ka75jgkh5>Q_wp!+F<!8GtZ!+QpXT`U{tJ~d#R`}7Z}@2)ua=?zdCbm)Er
z8jl98;ot$ySu?~uG+^v~`bVJmDT89~(@sW)RW^-tpK>gm`;@W4;}OdOuSbjw6_0Hi
zd!K^N`j25`kXiz&GYmlYV+B9H%D}J-6ebJ|(T}(P|1Wjnz}%;280Lc0HjhEV10F$8
zncWP!^XmbF!o;UX9D1MffX+lSYkJIJ(E3y*aqd%4egfqoP+J<*w_pLSec=gvtdiLK
zl&7)xsldYCr?UV5O9}7keRKe{W@<zCBc6ut2MmT0V84RaA9AqGf9iSX|7*~AYEpdf
zqtLwGM+Ts<KCs{+sN6aLTBBeB8bfM+0ID+>6+rhG&3ewvIO{o+*ulr3b}$p$fybcn
zQAVDS$2<&e&v^t|pM(0HptUOpHq3nrN-v=L9F$hL7cO|nrO@+$+jPS74Y@*3nT{QP
z%*GJ&@V1`QBS{8^ReJ<L`DVdGW{1WHOa&l&r##&Os=pY5AFWZC>nfbn3pyLYfx+M^
zxLjpcXnVjQ81$4mu<Zfp4#W+*qO5y1%w=UXXkyx6%gV~c*v-z6FdbZ0@PN{fLkp;%
zdkW+)u)CmXn6aSY5tl*F19sJk&)s;P9~m$>JYrHi^q4_l!c#^E(7l8q59L7TdKfxA
z+5>8DgWC21O%E6rfZRCsDX2Zbcp&)E8iTp6!aTi?m=E+g@Ce*~4k|an<&0s&15g<Q
zG8<IRFenB;1=#^AM;H_)urh-BH3m*h3<eFXdkp5Xg4;U>o7ouzW<6zL2z>bT|NmW#
z25yf)V|<|bHPAW{CI$v68As5)dLf{5o46cU=0Cl5`~PcD+v@-*%v2UU1hs8g6`CF}
z8G_21#z#zM&5uF*d6*0#<6t5S=RW<<AN5#|fq{!vb=q@w(`nC{*bY4gmBn9#L31|=
z4?txOgTsQ$pgpXhyAnZZ1r+Z=EWr=|fZP=j^hkt(!3)%%XEtbhuxG>Er{KQof$j&O
zyTAfK=|^GC(=`c@b`+C9+XH5c1rHS&f*vbdEO-bSiv_hcHyLz2+-T5sk&z+b5om1l
z!~g$LCC2lghOz{M{I@EHdH&ORxBtHu**Nzp%ZBbpjNH+WLG{!NCI%^3J#mwX;nZQ!
z9iF!!^W&g0mCYdY0q21XtbJ<GImKYNGITxQ0O!vMPZ<<uKLzzISq!?teQJ&kkUlkN
zO&X{yU^Pg2z*CU=0CZjka{;K29{w0~9ujEn7O3oJHb_V6TQ@vlW@vZ-?^_qRKVo1A
zf6Ri^x7HDy`}7K^9dFR~;0CC^RA_m?bRhKsvqR<s#s-&1j0HW9*aFfYa4;l3U<IAg
zmC*HwgMncehXJVV2f1_bM#J2vI)%MYLFZI}>MBs)VPshFkjEh90qDFf4ub^?brk0=
z<!M;35InA6uwWtEf&~k89DA2uNtnBo$zj35D+}gs1@%ig7#LQu87z3nqp;v1=pMH#
z36L@nG$wMzp!eww(0Z_f1rP6RnEP~r!rZ6A&~_IiL-!+4{RZkIb1ODJU=VD4upyNB
z>4sFMryG_sJ_Y$r2UI>XG(4J6#Qanth56|OC#I(gN0^>YSj6~Lp@s439fsbgh5!D)
z0?i>XG6X)}_z!Y^iA`efQ&3yUMzQxPsGLn%IR7c5LdPQ}!&%Qk<7J>R3Y(2{pZXk}
z|CAe)Hw}6oa2WPJ<zSrq6coOoGm=4dGQ)(%2b>H+51%mfKArUM|1MDb5>)?lGJ@J*
zEf0P;^gjIo?iY1F+7mGM>5~PZIxg`Mi$Ws!PE1h!%yR(L-f4XR8dC<{kIAqg>k&gi
z;v+VJ#0Lz9pt0EAr!ow^PeEhBp#G9UV(-&G4ZTmNEa-g-T9avD2x$i}7)*Z30y^&z
z+_q?az?jhdh_Rs!)E9fixS{J2<ALr+j0`=G7zG+0fy+RJ#z&w#6&)7zKDF7<`}9e}
z+@~rF=05!c%5Mg(4?t@Z85x=$c_j2cwK&lG)Igy3sg6SL(=P_SPgxQ&9&jJ%dSDPZ
z_bF)ao)iPat2NL*EF%LWLs)2N=mlpchIh;i4DXp482<fdVEF$ZJPFRw<HE%7k{NPu
z5Q7U71B1bW$&3aInnCS{NCpP3DFSn!J^_s@CbT_ZSD5pR#h?u|&iRmCq4ik^1H&!_
zM^OJ|4mgd2%E>RFeyl;)17?NW&lv=6Je>k+t1tvTWMF7{pupJslxM>NP<bZ>N&}$#
zhe7=|Mup4IISej8XJ!a`c<=vzDNw%`G*=EDCsDZdoWbB0SnfJV&S36ShX%+RSY&+{
zKynM_J_W7)K-YH?BnLXT6pOw?Ah`u|!DCnG`gVil4CX#Hz@l#pNNxdi4HoEpEhKlY
z1<8TV9LAzAgb6er9P|)5oR|LpFU4ZG;2|izg4!-DiF2QV@;qZe+oJ~y=00U*h<M1b
zp!@0FzyEjrIWYI>j}4Ia8IM6Xcs-~Ls6Q&u_`t-l_bI5K!syWah%uoBCB4lM=zR*V
ze-#=Yz|tOQ?PG>R?^DqIGfWPR4?ycoQb6OG2@Q`z4)i`vXy|<!v!M5B#0JoqcJEW>
z15FQn5_&=Nfv=F=AHu-E#cnX?83#k;Lw19fXTb~%r#J!@JiG!fbLTwW(J=Sv4A4C`
z2Hg+11a3TMR=DvTmM&Nu8Xkbs#4AvLMWFdnP6BA00d&9a<>zeBH1QY|o(twa1+8&H
zkE1&vIfJ=RQ$TYm;CMjjy9$z9F!yN!C=G(;5NQe2KLVw_7%cjZL-j>q(RTnOXE66^
z2o`-iL2?V`J`KR45467qWS<WfeMXF!X=2s?|5Bjz0P0sFrwOKjwnrul5osdg@Bdv4
z8|OZ~0$QuRVfIrAhPh9<6+r##rbo!>0My=PT+s2zVk2l>6{!4acmOKXLFLaJP?@jL
z_^8LB_vr+K-lrW2y-!;jdY?8d=zUtVq4#M8L+{fPP+Qn>?$ZJV%=lOM`yU+toD5Om
z_?Q3te;4S!P*A<cU@+$?Xe??Dv|Qj2xb~b`;o9>l8$fNFpoiQGTH*1(gJJH|3E=Q)
ze#EG7;W?YZ1#rFx$A1IpzG_&$zww;G;09O@7XKY!eT|PmWdbbSfaAYm?$Z`{d?56}
z;=cilK5+au%zaveMIS8wE3oJT$A81zrzKeQ!Q#IFi#|}B4^;NS^3=-z|6k2vm46y_
z^Z)BrfBwHJXn^JkhQ>#X0v(SS6fQq!gyxMopfm?E6V!(X%?~MDd(LQZ4IDO8L3yg7
z;gJZ)JqeAEK7hw3LF3*RpR*ZU1gq)!|6dApmjUPw_%?wB4>vJPez?(K@<V2ZfQPMM
z{T+{d8hfAmFoOC%ZI3{4$)IrUIS15^n*aZ$d<5q{1)0&Pu;5__ni(Y^dB(X<L1SHv
z2@Q`x`()S@E<Wdg+MffpzYUAtRFL1mZf}F?yYQR?nkM4#=nDtATcG0+sN4bdpV$;`
zJZFTamjIByhPhAM3>G{Dxpy<ejE9>HW`O<M#mFE9N`oLhj17&C*c1@<If3*U%zcW@
zoz{5VX@W<eF36prvt=85p9X-!2vlEy)(R;g(y7Y-|55>lka1m*-Ob?eo$+uZ)Xg%W
z@f}bYHMBhf-Pau;IQJ<>L&Ah543P0)#)QU43<eXPeh>iN;~eymEg@+FXdH$^An?%#
zP@Xnucv|`Ye-x<S11W2o9_au1|4PC_9z34Rz%cpg5rer;RV3t}G95^M02%`~INb6S
z-VXQQ`y!o_;T34^l)=#BY3A?$uY49Dr`Il&^jh%mzZ579fyP5YWjQD<!P0ByzyDI8
zxj0yQeFIIeTndQvn(z;jUb_?)JVZ~gkzoB@k6b|a?}5_m0z`V{f~MDifB&UikkTt?
z%^q@^_W;R*;sP{w3repGx*mbjD;G4qIza6Q#Ra-vOOW3{aREA`0j%%Bb1rClHNvA$
z8{}?*u1BDD4=C-iDcpL_2yOGIfb=auPOq~bZZen!POrBZkkab{NP30YCkE07O|R(g
z<j3Pq4m|o8LGE18^~hsk?^6#@7=ijV;Pi^9SAYEdFXaJBuOK%oEO-b>ud^O*gu3~|
z-~Uo;Kw-3?4RqGtLk~gFneUkC^$nKv`UXdOHUIbjl?I+P=lS=)6u2yamyw9_!09hi
znrmo$^a3f(!OAGhzlb!4UcMQD%m(|X3tUEVA(a{0c=V~@(I<;XpBNr}{CM<nfcyz7
z6B$5x5)lTBAbktwK5c-Ni4Cwc7V*%NfkBF~q2Up@TwKujh(iI9ra%9IgbS$dKu=?D
z{``lOrJ#B71zjlmp5oDW?+++Gx*j<!?0xD0OJfZkk2sLp*H{1imjd0N0G_wOlE%*d
zfu*qya2j(!Ph$;`GVujyd<ZoD-he0*UqI7XEwoGowab||G(C{~`~MZFPK4Fb4ru&6
zV15L=UBB+n|5u>1B^wOqKXq9!;i=38-$$S|#|#Av9x60Uc&c(>!c&P26P{*Fn()*>
zV8T-`28LTo3|)^vYetnBx`aUEU7)k5*%=sar7#3Owo#mal~KU)(xiunFC4UYzA%fK
z^+K1?f`eQE%?Ee{7Ce+V(EErbK<6ogLgNE&=y}tiwI~b=dY`gP=zV(T$N$$%43Xfq
zN}#nl9}MO{Wpzk-09yOTkTChFGAqMt(D(uu!-9tjAhy7QhoJGDb*v1pvzQrPvnYVp
zeD=QJG62mtFL<~`VE)sW><q6#cQ=6gib4zwyIcgOKLxG11-V_up#3QqXkC=S4Dfg)
zgTew~(0nqeZ^~pi1H6t$1auBGXkP_G;KQH)|DQ@>nEzDv`v2Gb;I&MVk3sWm9t!iH
z1~4Gz*Gv@_JWl3icrCy%{i%q+^rzekpfigWJY<;A`&9Yc|JQdxbMy-BPi3HcC_wJ`
z{r~?fesu<LKNvL6tK-7N@EX+Tbzx#CV9<RDZhHkRc*vXpUQ7Ov2Q&vEu;4N;1H&l>
z&^*C`1&2X%+&l&so`cq;@d&oEgXSj~1sa(^Ydk>X6QDUoCWbK3c-O*@|NpNlVA%UY
z?!W%S5A3=xWhTshs?ad^DJbqieI&+!1rM1(=fyZIcnF&N=Tum5kwIX=Wgf770iZpc
zQ2VZc?PEOHhGbvBLxg=14?ls|KrDC+nim7DzXq)pj9~}{&DBeR=1D>OF_{j4#(S<j
z2fG;*-iA}3gXSSYbF55;t<S&z|9=X!)*iIZo`+%13sAkxWYGLToFVWri@}<wpt(xW
z92{tm0kc3mcs(M_4zPa~bRH69U^vCNpz{%@;(~`<h6^5o*5xxZv_4=;Xn(*Y(E5P$
zz=DS?3KO5O7)*EqatCM~4~s$b14aesM?4G>4_Or2o-{iw0PO==#l;ZukPGBy28Lan
zh6^5o_K+|$K+FN@2aTD7+zy(@hM5I6!=Mqo4(S6sH0=F#Uk2XweWY{27kq{#Xzi&A
z1L!W2-lw4TlZt11AA!cLL4IR$T=0-tVItUXpmAG9o&}GYSQZGfFa$qjVOaANw9ZXI
zU@rKaC<TYPPaR`>A2A9pc*vyS^oY@*<&i`{EBGEm#(>rb5(2$X1r&Op@)-0!6$$8l
zssNggHCXVN@l@|4Mgh>;zNp6@7QIg+40@h|_MzA_GTh22=zXNv+xy6%!2J<pz=Fr1
zbKo6ydmjb*_C7j#V8KHPg{DUup#7$XEe}`&o1P1Z2tQ>_objB|u;qb*j_^~41rHvB
z(jV)>_UEhz7AzECU|0p78v?CmI<Vkjpl$CX4e;9k<_BjO7CaOXVS377*!%!wPT<<!
zM;f5{1;Z||Sv(G)JRSs^7djOv+xtjEpz#rpA!K|&AcXlT=p1LzeB-tM|5rKk2R&wF
zVAus3pVqtf|26oGDu&?4T#O92Kx-aFHq3p>($MjMrJ((RK|}9TfrhzHO$vISGEZ3W
zkhx&NL&jCTj~D`GKaE*1>nS71@1V21PJzm@-ls7EJx?_j^gd+_Sa2D%?g-=-7KOP_
zLGED!xhF>$BnMhI`WRGZ2pkc43JNb+I4Rf&gZZGbQji!ML-4}}P`Req@&L5{jgcYz
zp}-L)@VKf31H&#@7%_tSSq$M185ElzFgi9r0IgdSI3n~^z(wRKEUb78yB@G8c0B;u
zp`au56jUy-99XcB$zZ`kkQ*2o7A!=!^U?qRw?O(?4$OTD3U5}!t_K1~n4dCg^*&+|
zkbWAYFzG2HL&Rf7D-a(tz853V4D#b;JqCtbECF-D{sEcG3W|3m|MN01yn^{3<TjAI
zaQT~qArRT$r$BB3xd-C!h=&Y{T@M%?yB@sy|Nj=;-@3hzG!&X1@fbEeU{P!$+25dj
zd!YT~aJvq6Jz#R|dcYdk^?+r;+@}gMB2N``WS$BvVSO41%3BjUAN^-wdi39b@zHV6
zUUblXbPU0u`gP-ffrF3P7+W9wS2*;TWdb*3e<^4mJBz?mg9US+g3<|7K=VUTI$<zu
ze83XW^%RsxSWo*rVqyq=$m;F#2(-4%;DFB~0|%E!;5utU&r|k<1q&G_v^-@oXnM-W
zz_1Fm&jB<p&6u#@At+8k;m)Jj^5B@jf`<YuOiw|1Pk=@EDR_M(C_Z$ApMuQ)1lnf>
z8dE$l7wi{}fYwKBhOG}kb9kV+Ge(B+#{yHBpR#Q5eq^wq_bF(95olh~8g!3^!Q7{f
z{K4Qn^?_mj)5xp;UxUgWP@QT7s!tg}_b4oQ%pkDfVIVY4m<^jAuv$AmG60>`YcLsB
z-)?3ySg?_cfngVDJr2zM%%JiENiC?}0@dH3^`rj{m>#JFfaWHTK9>Q-323h(L)1ei
z1JJlb<0D3f1)F&o0v|pA?WJM}c+3adhw3o*siJQ0BhdU8xUD46^nk@+(o<)X1rHb7
zH$ONGn#Ta`i!=ePD_HatG~e{?|9`2S|Ng(qxzPKF6}lb_RBjyj|NqrRb_Rw^?4Wb9
z0v|ITP<YS)TDL5a=)|ZH_^1HHHrVix!63njks<hDJ_ExnCI-QWg$xW_!ut6S1^M$I
zGATGbkXI;r)TGcP09rTB^sygAKWyX=e#pSE;6bCkvjQWO&1mne(8vcBw{uotgt8g!
zoD~{*q2jjA3XD)Tqph<-BM(&E##w<8%4W22R%qmgid#D?Fhbdk*3JrzTu^Z<X9Y$m
zo6*Wyp^+0RZt1MR2xT)`Ix94CK*cSb6&RsxMhj<!Ms}#Uxw8Tzl+9@FtkB2?6*qHM
zV1%+6&72h)S)t;l&I*iBHlwMtLL&=Q+{9Ud5z1yXaaL$#hKd_ID=<RYjK<CijZ9E+
zBWDFhD4Ws9S)q{;DsJekzzAhC8agX9g7PRRoDG~6Kyd^Lb4CMa1<?9c28IMDP@9N>
z!R8@?y}<Yk{{luvh6ZMkoS=UGLwSXyM<DgapmqCDJsb~opC&UiyavT7$A`I3m>qOq
zmj3_$n$2PFi%AU3510iUAAs~T2`WAU<yj^}<wph%x-T0Y7CdYY0JUXJ9x^c)FftsN
zBFJ=Ls^F1R9|Vt{`XE@zz`(V{Yr(^%Q6&!;0#Y}D+Ig%FEf1I!6do`eC_Z3dP<p^9
zpbY1mF@!!gXxQ7q#3=ZfQEb6O#$yW}D~k1i<}kS!7z!RS2t0hm#3=lj*=)f>WizO_
zLeV1zgU63p8B89AgW9|fE{_x*ls;l*VAv&eZoxw%)(H<71QtFL=9};!Sajn9HU@@Q
z3IVQ<6dv?FVq^$<EPQSOXitK2FzbW|hvhduU<zb>#Kgc5#c-hJ5d*^qu$_!-fuQ_o
z#l#i}TH9~6P+-Hu1cnU{b3pgTIJ7)!(OU43k+tY?C}@2NW6a|P2R1M=Fl>0lBDL@V
zt3cyJgND5?dJb%O$iT4S0i(de2aIfjk3sX+pTT+E5LDhUGB7M)7PQZQs9?~{#BJdG
zNI@a^5jz9JDjtPNk3jRsA_tlt@hBuc669I%&`=0;rar?f5rw8l3I~!d2?{NEXdu&g
zQGjW|MP`SP2P{&J3s?mj7aBC|UBTk;;Gw)j$Rl2mSq@V`;c`mEq2-Z+LdqipmIV(5
znHnA%inM~=$m5U#5ocQPP>`kJA*;Xwu(%-$WUdtC4+aL4$Bbsmj~K-inHU{fm>2_G
zg%<w*|LVx84-Y|c4!VB`6c?cMzzix=4orE-EU<u)iD3aFNIx@!A?SV_VbEEl1`T^9
zmYmw~5Y%^RVA$}GQDEZ(Cc#E!kUB=!DUTS%8jTDZ_F91Aq+X=;F~3;jV^A6e$%E`;
z7FZz2#IOLA))*NL76>vZED&ULoA8i1Y!V|ggCQf6c%v{#EdzrAD2zdQfDx2#8NC-g
zHgaeIuVn<y`GeNe;8MdBDDViBpFrv+|NsB0L1DwgLxKw)CJHQg$i%nc;eQh$q5mw#
z!hFJtLURB01sNEO9)tLD|MkIk@%b)z401n{;K9eup!L%V6CT3kKx-*M>5&mhj44p?
z5hE!5LDM_Tt%|2NJdFAOpNm;x!Q(XtH#}rkXcB_cpf-a+(j$Sx3mzJP;*PlioJN=&
zS|0fS|NpAMLHFhV0}CFrpXqt5=q2+&IZ8%=hrvXUhrv`ZpMilJlqZ=J6d&|R9emhh
zb@(A;7&r_C8O0hOGnzF&mSJGvnsBJ^0m!`*A1!^rq{#MY!sDe6K=)%z3|{ttfx+f6
z<AXlo{|+vXn0Ue-Gy5C?<sq%U2OA!;25f!6mayzWn`qO+rBaO#TUi%8T*uY$u<z-D
zhkp-*JYwgGY365O=wf1wd%WNQBHt7=?0vzM$o7a)pzR?OL&HO60mTPv96}!O1e6?L
zk!n0x(6ILe$bAeC7CdHj2zeC2z;Mcpp#+pZE;9)-UMgtVdxHU#o*hCSNkG#+Hv<DC
z?FXbh5-?rx5S;#58y+$#GCl&u&tm=w4-7>XJ!pO~@8M$p1B@Uyfb#@My~%=y2CR^L
z!6eA|2&5KNt{|&b0I7T0_t3y(!9zjQ=7*qs15#_qa^T@&{st6tLHP)@w}>f`@ew5L
z!^;JxU;qDeu?aLjWMD9T%=ck|AX6gqqb7w7519=XKVW1Ne#{u)3Q=Rw{E+VhXitU7
zL**!*2cY<5V_@KFOqlSnIbo6@=uRe3xPjaN$~PeYfaE}V5tJuEYWNu#xOf;$KxM2H
zW7>p=+@N#A7)-%=k~wYCLs0$#<ug_W1}T_X^&*Y%ya+NA#J3Y~d<<gaOKUOUwC3`F
z`GMjC=CDZ*L1nx*Xb+Fsf`^Pj3mz*QwLVm`X?_S=kE<Be`cNUJ^&vwF=za!1@Vb8{
zhA_sz4oe;}`?P@ah}L3*4G)t*`+*a}9xw+SeE{P#vMqSbbbP^MrUzjUm>*nyz?9&o
zz!$JUk%yr{5vB%RZVete9Y#F*7#kGX9!!163t9&hwBVsyT<b%&qy-O~4HrCIWY_$#
zNpZnLokJTQg6_lumHTX<GabNjyWla?!3B@6g31Io!N&{&jo>-}mM6Ua|L<Zx5c+`W
zKo|pZeF6$&riXlw6vg@;u5p-xGe21U|Nn~ZLF+?{|Nmb>(uT=H9tKm!$)I(93?>gj
z?f{jQ{r~?<@i3S^Z2$jX3bZc?G!D`A|NkqH7z-%Q!zMk<{r{f}CI>3RKxqh+c6|T;
zmuhsF@UY_lf2rnxNe`3%|Cg%%|Nj*eqXMLzAgK5VR9-e3Y!GB-FcNe+^Fh%0%m+am
z&>eL;3mz)l6g^;8Xga_spm2bJK@mb5ByW;r2!1U0U%!!wQQ$EXYs2IJEC(JlFeC_p
z+67FajgS9}9DK|mkSN5=VDu1l-U?`)bRhGD2cUaw1VQ(C7&3s;M-+oV;Ufly2alLo
z13-H^tr%GXK<5)!EnwIHF26zT^M8<g__UZ910OeWFL=PnaDbVap#fAzKWr2L)!7Rk
zFtG}N*J6YA&Iz2)f5>sb=Mj%W&;tRU1rM9J8x}AqByD15Xjo{#)VvYYP6E{dOrna9
zm{=8<7!{hB7!90-K=IsYu;8K7nGX*^VIT}j_Y6i4nLu?UgVAF~h6Riuy^IV7ptiIy
zs4n@>BJ>!vRt;1>FfleLgXEc1COu+eZ7`DiuW!g?$ndD1r5PMXAUP+U51{iJ1f6X@
zFfs@%5NuG{@UYQj10y4Y0V5-81ISEJ9}m?3dBtQ1t=A500Qr^C+oTy(M}q7I_xE9S
z5@`H}6*OiDt)rL>(ds8qyXL?GkbU6v8*S43n9<0YiOJOYk&J%+Lk@+YM@`nwpmx_T
zL8Ime0*65Rl#?DYF~&SLU|I|gZ;;zT_ZkU8<$4$<JTzol{9q0L0dSar>aGRaG7lD7
zgX%3KK^_KUK|4_Rf#%{t{TP-F4;w``2nsMTa4{J#c)WnA`QbvL=7$pu8y_$+@;qW<
z4Sd`vu)uJ!e4}Br!2&}@hK7gr3Wpy3We5WKwTp={7#{Z^w}9FLOb2-$HHs`?T)@)v
za3KpwebA%-21SROxEl`2{ntMTN|&IpVN?iu1lm6&$x!r|iIL%w+<*Ox3<^n)8U!|g
z>tF?iq(>k>Co+K3(xV=O$q!-v0;iLM438QZ7BDig3NSM&I5C0t0r4<2JY--ne#~@`
z@lhkF?Zhg`%xK^YkrQZq2<po%v<8*;Mh`(@!3y&C!3&R>4qg-n?L}l{P<X(^$nXg6
z7e)hNQ2JtEFcfBDG!zDvRXhwv;4&YSMmWJ`zA-2*N;R5n0H+~P-iMh}&(Z)-V<0v&
zYXc~MKExI;R^WJXdI0KQHi~R`*ub&?v>y_5C*fm7q2`AQM$HdFaRTbUfa0Q7VbLR|
zqYEB`_@KTFsEl675d3hVfwKarOjcwJeyC{ZtN<#57cvGvTxjU5u!gZgk=bYis9Y8N
z@c+LQC?4nj|K9~N1D1zDeh0-NDE{gdCgF^`e(*UlMvs}uhzHP~C|Epz>PJvmg3jXR
zVK9EU9yI^Vu;Ae)a9L^$u1`T>JN^HEF3{M~8c;b2jWf`?EGESZj~9W;V8e@#`~Lrz
zS^|=H(0$3lu;8%^H^XbDhP^Ku9CTl@6)bqnz`*dHk*nY_Xv~{|VZp?PhP^Y+GJx(x
zNq+>|r^mqX;BiC4-WQ-fCm=nF5(^&2q3Hwdg*bq$r{KY3c7_EHLHa;?&ZDV^*|Qm0
z57Zuz`V7z>E`tRRj}$C;%nLrN1>r^(28LNnk@Xck0F}ew^IkyZ8!y8GP#@u;Jp;pQ
zkQ*{C^gaT)gO5S?CCdZdrz`?<pE@WAKH^ZAE6OC%__#`l;Wf*Hxled5^n%kkvi*l~
z*xyQo{qkt`gX{*44KWxj5Ei-M`-sP&SCqw|SCqkEqA0Jz0zn2af1)U(!U9In{(26B
zUQtE{hSwq&dLJ=B<4dIgwD%4X7O-$kM0O7}9C;ZT7(neO(3luQzyeS|>2Zd_g2!wO
z3m$TEGQ5^xnEHZ8Vd_%}hPD?x3T;m<45mJn5SaQ@hGFVc3xl?&9tu;RCK$9nl3<wp
z!b73$X#kkt_B6!-#BO^Up)mES0#rUiq3x*;nBVqP#R0@_dn#Zs^=XL0)TaUlZBIiK
z+MXIf)fyPIJvDJ?dm5uK^{EKh&bFr_25nDe7}}mXK-D-Hv^{kJt7&@*YNLE`)O`t>
zi(vrmBM?~dI6`5;W6+$}bq<EtETHp@3#L5f0i6Y6Fy*O0!<46>yM81Lraawo;L1Y-
zgVv`q22-ByO1Sb6bO(uo!IY<a7_K}7oh_kZFy-k!fh!Lk3|gNWfXq=?@Yn;it{=oM
zfSfO)12XeK>r)ql)~6;0Q=W<>fX~r*DkISPRH32uDd_xS(3v$p2CYv&H12)DV=(_I
z55xSY%m)1rK>OT4WycOfMut0j3=ALKbziD1nDEr35EPG5j}<`k9SI8_vKRD&_U}t6
z7|wsH;n47iSz!8e0fyd3pt-z@{0y%_bAM;~8D4KNxc1P2K^W8?;R40ue>R5K3=N?E
z`?RNA|Np;!U;r{V;4$-r>CbN%%zw%$09wO8{W)mdl*OR!Dabr<{%BaRaW~Z5?O<~u
z`!tyqrauSCgU-wW-5bbY(DZa8SpM2W28O7|Y*x&V3=EndZ!kCpF5f|J1kFXQfU05S
z6b7{ixHuT5J<a81cpZY|29UWR`{zRKoypJe+QtCWUfzHO4`Fss;%9hW%Es^-bSJL@
zXr8cr?~5KoMg|QA28J941_mAm1_lEVc7UW07SP<Sz=Fr1bh2K6;WZ;e0l3WrTEoI}
zq4yD}{|*|5U;&+5s<7ZOSj=JXi!}@kuRb{FzAOot|CAvi;E~S--$$$g{SR0`?J0w6
z;Bnd*gZZM&1+4<0@r3{bQ2c`C%$gsu6)bq@0_IPB&fqZlY2E+-uQ>#IA31=|HDZ|X
zw2+hGwFY=^Z0}P>0nmEo1rI@cr9fw=HZw51_5t~;Veg9{`iu-dMgRYYFfcIq7ybVa
z%DW5+3m#_u2k#4c2#RlpfGJNi1VLkK0igcT3I<Sm1f5OZuvY>i-}1D;VegAMf(+n(
zx=O-?rx^;MG!gb#0F>51^O*{ev<8YBNLrf&j&o4lm_g&l2ppeR!DR-A!Qsan432{5
zm>CroJe&x&KMWkMpg0A^zXm_UYk>>Bk3e}<K_3!7pzu^FnD|sd5oCY(V^Em~%EL?w
z{h+@7Lv{uRDGqRYZ+rwYhgo3KbC4TEp>7ZanJF;!Dd;>KMuxJ-%nX5o+zbp_90pUL
zg4UXIFfhzwR0w?f-+=8AXkM66!ST@sgR6`J3azXx28Wq97#w8;okg_4;OawW2I0q`
zcmtIgW{i;VlVo6!0?9Ek2!rYmE=C67$0DFU3iN(sLC|^%hB8o_jtiuYLjZLDUh^Z+
zo(a%?2~e19P`LUKbnY~Z!lB2Yv$r-V9DN8n>z-NR=u^;{J4^|O!RzH25<qi_;V5Bt
zn~&i&D9%9T`-g_TFBa%Q!VS5e;!x;)WW<PCKY`{57!4jg{{R2~s}HWaFBuM8d|I$*
z{?j6cn8#cT`X8u(;yGc#L#BoWpnI<$g4(g=3^9)boaVEF<^d8JVjg=q&1dCiVBos^
z@BeGion8zK5syK2eH#M<*9L<d51F`xA2%~FaDnn&H4nq<2GHE3186?u;?pFC;K!i(
zbVh@VPqjg8gBE5+hh`>_8KAbG1H*#Hb2vfeQoy5PaQ<2Fn8TpsDU;QL#~TbzJk((5
zcr*!AUonI}7G_}Bb-)m`hoJ2dvjNKk&|EQ-0`mh<e6j>|JiYe+zZ9Fnk%x@j!jD1i
zQc(P{2rPKasJ-AZsN7;;2zY!J)XuSB1MSgz$N}nGFqA%K@@NqTg)L~`M2h14r;P%T
zIA>w#czW#r|6LmdZaidGV0pwO#rTNPngx9R4zq&NBSwSfhfES8kC;I1O3wwt3=RvJ
znH^dlZg4p9u;btV*Pwcog<-~1hJ>k4&u}ojW^jSXF(kA;<$$iA0EGb~*Mi5<pfF$v
zc)Y>jh9IL>gAk)-voHrk$5S4K4$%z;Cj@yII#|ybfc74P+%oGqSii!gr%YUek3|eR
zo~kHxJe4r$cq(Ji@l?Q|<Ea7z1J?qB`A-E3dLJ<-%z8e<VE$7!aQQy#IjEfj$~$g+
zkh;PNbQUv`JScyG<n5sHR(uSv6Ab1*1&K2&%z6&W!=N%BRQ4(ubUbBfXnJbQ2WdZn
z<P7*g;m7a_w9f*RCR9LWR_opuF1m~ij!X;;jw}oe%nVEn+ZY)bEEpKz<#Pf91A`6&
z0|Ti3w)pq|wMW4GrydFOpMuI(XnXVVHixMX85*WPt>6Ha*9ngpTvQ%xb7%$i8y>R-
zv_9D2a`j;$lH3NDqYoJx+QD`094$tMH#`gs0-$ga0F}x84;TfSA4n)HczlM9;gyRP
zBSS>d|NkKS&jieWdd2}__X&gfPgxvVAAr&aGsD#9AoT~>7+!AyiG#uvDz=-A;q?-b
z7$`3pOnuG>YR5WE2Ax&)>Lo8IOadN*&V2#t2c<XAco~Pml&1y<7Chc?;K)M}gO;Zf
z1}#rz3|gKF7_>Z9DQJ1RjE&*7g2R-j8VN0rKx<Y&`d<J4F9oU#L1!I<>JU&Ld4s_f
zP+bqMPeJv+3IjwRNDpX@1E{T`0QDazoI&*=D69n>bYE^TxbP5E2MRC<KW1lO;JW$u
z|7%VI&^ZhZPeJB_+VmXYdi=;kfrh;=9H8pB!TB-(eD)AX9f!h{rw#^(AIm7TJl$Y$
z<RM55H1@}cq!(l#hrooV0tOSFg6w2e2z~(C(<mU&@H9<;;Wa2c1Q<YfohCm3*#(LV
zm4XT2x%>{$dLf4J#|#Yp4?y)3V*_Np4XAD?FaWiMS|2eBOaRvlptRb@3rXKyyr8zw
zRdD!#`j((_;S)5EGdMgDhKYgV22|IYgZu?*J2Ie_!BtT6Ky?==JbN@CWiY5*1=Upz
z0)me~=ShI}7czm)nQmC{kTGBZBWPX%bdFj&8^ddsgaq(;(ctv#u;3zSEtmiU!>xJ)
z)<+xxy^k0TQlGMc&%R`M1sYq1m1CfM#ig*|VJ5hp67cvtXq+}6<pJo75YSjIXrC7-
zt{E5>TxMoqxCP30p!5pT69e*VKr47(AE@8*p>^*I&>FVj`@WAf5_%tj&P@WPE6~~=
zrho+xqZt`q2Z(~|;ef}C0{stU1bRVhzE){C%zX+<Tc)6Pq(HzUH%1075FfO^#2I9V
z!Gp)3^G%!>8D4?R1GSy<85v%K&bkJjDaoP=%5yyrBn*0={xO;V6f~~^Iuk|2p!ewq
zllfq?L444;X-`b%gZEv5_@MPR9H8@)46cCNR;moa!VCrrm>CTg2s1jg2!YNx1D&r2
zs-su}K;awun3-Y0MJ5J@TOc=p+$Sx-@EWuaPm+;A3UuZ$gF!R+EEWc+nWCU`#tp7K
zWn^f1qzbC192%G&{r}Gu<lp;9fl&qQwr!xgm0`g{FGhyfpmYBG6z+oE!)efTi1C2a
zqX34MOU;Ze2f%eM1H&s02F9nLy`(|*y^oj#n;(GA(FN62j0#Plb4z!5fcAEP?j>Vj
z0Iz!lozbHL+SAW4`6<5)<0H^szC-p49xf7Kc>RKb;T7mUt^@{#E*=5UKKaH6j0wR{
zxfsG8hdV3~28{uL&iz(k5C-v?bsQE5gYs#ELyIsgL(pS}gtR7B28J$XhM>ph4hxu>
zK=YLhL66x27BDj~FmQ1PEO@K~+JhwsI?pZmvCW3NTNO4eSPYt{4ASov;xTLz_+cO{
z%E-NdnV*MQ2$WC2=}KY2Lw|lyx&^HxY<R?w(EF6dq4#Nn0K;n!&|YlNUUmlX84<G>
z3@$tcotLD`5d4_Qpo!VSpqG_#LIV?1zyfAa+nI?$=rKdU0%1mQTT19LOTYqQ&^fmt
ze}UI-DJ<9wDx>`ELFeH%KVn{x`G5;F{=^Un^2cOmhQP<10SlNxXD_fY1WpFE;TQ~V
zJ~aTvr@{heMujdR7@v!QL5h_j^f7n9g2SLai!ugtSvd~OWo2EkfSG4PGpHWo0@=y5
zU;(2h0|OVxOs0mc215phE>#AGSNse?p#7s=ItIOuz~{w*&aF3``;<kX_bCs<<QEDI
zbDvHH<q3v>$2H(P8bRkMG(AvJ=zUts!0<|tA?R@#1H&v~hM>nK3=CbMHL;*JB*TOW
zPZ=1%Yb2#aK<f)PEC9LjF{mzOTd?4<AOpiI(3%@gh6N7~$~Qjz%*yauVZ(yQpfU#(
zhah#Jb`5B604N<EFgW}4pu*Xwp!VH?3B8X%YC-B47c6+p%@F#Si=pEIXs#3#7K{c9
zE;AV{I1JkR3OY|1k`{v>G8ZH?Fcd79%wy2-fE}7|KyhNg5dE0Fp@V^;U;#4+gD}W#
zQbGB>j}$;_;tbLt=W&7BSfI5y3?bmL1W-8!%8#J*2kJjCG6aCm<mF;FNO{1{5d6>(
zG)Gae;IRZ~4X*=ee!uYnXq`+b3&ZQ6_})hbV6#)f?PSnAHmJ-4mFLLjD)58a1`u;O
z3{oC&Fa$r82ARtc1#TCD!j4M-G!{JfDX9MdI=fexfk6snKE&;*7;Z<mgB{5ZnA<_)
zNw6~VGU!ZUg$Iv8@eNuF8hjtJw^>1*k)amUUn~0mzpUv0|3BCN{qHRL{~t6rJOk7R
z1eN`u^Ws45a)AYpSFtd>28~UC+GC*o9iaAsMnKaOQ2opSYTFtFgU<MU^5_45DbN{h
zp!H&^3;~Zp>6_8u(^F7c2CCB;6k5P#7<ep-A>c6s!-LIi;59^`x|ZP;s7zvD0G&k~
z@c12QZ9qWFQ*eK`Vebo&+av-eJO%ZaL1&DC>TMr^2GE(&w?O0290m<fWda(WN`TJ$
zGH7_p#K7=c0!hDw!Gx#a{we4jJ%tHReHa*|m>7dVaUtacY6mDxehOOO>SNIG6m<W1
zfI<WKp7MYL4Ua(M<Djw)T^)-;!&8tt(7dos;{2z^44^xhS|2eRPI%53(E5mjAsD<r
z-bY}<Q+5W1Q%nrOk0rrn1!(PW@MAFshE<B-GBp?!R<9VjgF)$+iv_gal_waq=7Nif
zC-|`h=uRaDhF477!Jz&a7ig^^D6N3b<zP2xe8g^W_%Vk<^CKUHhNqyhFA0X87oatZ
zptY<l291wEeqvDQdCCQ{3x|4U@I6~lwFVQPG8puL&*+dbnDCUDA@t#i|NnP^^n=1o
z#oz)fr$IAQv*84G4ub|(7J~^-L1CndB+g>czzS+(fyNID8uqRb0EMwY;v-NSj?v)o
zV+Dl;k3|$3o^l8@JQXl#0FRlmb3o3-0>vk&Pw3+^|0(l^1rIq4dY^*oUk6bA?9dNB
zGls>W_o;~q=-m4Sk3o0Kh$!?v1)U`WZqpd_K9yK7;VI}02GAL-+zp`fei>eY>S54%
zNTBwh7DMo3W`hUJ3JSeUlQonWSPYt(7y}jv@)$6&G6pm<aZLb?*D<`hqC6kGCKYtI
z%uEL63kC+xmv|VOFM!sHG90-26x0XlQCRSBlfmSNpz`MvXx!T%5S-?<85pEg7-B$Y
z!3Z-dfa<sa5F3033@50c$q@CJQK0qFH3<75!-54HLHFf=));~A(gC&Sz~v}I)Z??D
zG{F!GTAw`&<OfiF!n9z4pb!It)MwBbK4?!7X#JkT#U~5~SHWvW84}tU83S6GK<zY8
zpSuBcrYl1XxUI}+5c-r$feqZwSd?(=A?Pd-9+14j#iyXK5rCFept=oYo(e-S=v+nc
zy6;sC47U^vKxel<cs$WU`2i@cOE55l^4u%X9${9{`~^6FfyU}19)sG3AT#tpXTxt;
zAjr@FY43vcfzGUDXn62=I>-+V3m#?|&40=)(DHym;o?(}9?;rXkRL#0HKV~ta9an|
zmv8{7GiZ6hXpsB>bl(6d&oC%};^X2|Q2T~cppglr4<yEEa1ng|9O!JbYS0(~NH0SR
z_zZfG`LYZQQeO-~?Lv^f$qzvFA|vRoA#Rz+ObSjycMRu0RZwULr!PhU=SLuSfb975
z|Np52iu0d>#sfh6`xzCI9yEdWG8nWx_#`m-;TpsFPk96yAA-{5C(yn}0mcVChV!3-
z+Oo_HEf1JL^^(B{u%AHl;|u~<pRzEBJ?7WpdBkFH>@l-K(?ihNunGnXm<<dT2=fTE
zKV{%-e<@<n{!{?858*)jQ&4+`fg$*@D<lm)wqRhmWdZU_L(2mb!}(7oCUiVv-q7-Z
z!C}E;CWa8u9V3?n4CWqXF>JaZp%8qP$-wy#i$VJZ7KP>mDhh|Mg4-Aj47WHLf*u=y
z%B%$o9x4d*K4LL!e87_+{FKw6=@AD**kfkK>EQFU#26U3KxgrDFa!t-GB9v~*5ZT4
za6cIoJ_Mc73+h*a)&&0o%}*I*JUA?H`}rq>nunk=3?div5G2O~k~6psK9hlwf#DRF
zLDM7V#P;Vh2GgH{&I|#Kvw+sipZ))T73hq8wFAeWYB01vk^#9*VZr0SOboAO6sCjj
zuX!Y~02D6mPnj5+!1M5+z9YE*-@o^Th&&_193BRSM@9et|Kn$1m{9cp|JkDd|Bn>?
z|G%Z^|NkXL|Np-#`v0G)7&4v-8jlRYF&^mv?(c!dz7gY*LR^sk9v>H|uO0SygTqzu
zxHG6P2x=d2ae>B$SssD<Z=kWq2~v>$8>nt-0ofA}@Ceke1dTb0gU&z)kJEzgf(v~J
znlo2PnEDiSh6|{_83VQ-)Zawd|A`Y~|2s}lUt_^TW$@Tx7<hacwB`Zkju)H^uR-Y#
z)TWREsc`^}$uD>abC-@3BdGle9v1=Cy($J1p3VTdk0BU5E(#h~0=W@Xj)Ce{0R>P!
z5%iD=G{5X{*+jsg!Bm`q!KxH$Ht60uh<j1P>loC%hd}c?22-C3D1gRFk<Do}Wny5k
z0=Y8@Y8K27+o5_v<B_0o@(xKvSc2j$2JBwUabyp0xS_gZ3Dm3w&~WPm*~I_}H&B}j
zX6G!ZI#@W}kU+B2VB*sqU^_u~1VG0JK=W7$pfySiTmlCsK9w<;_!M+TD=Pzo)_(<t
zM?9c4%nFB}2pBXz1@+gZ85mwwf$Vlz@KAz*;Z+XUt*GP8l~6a7ax%OY0L_0v$Cn{y
zg6;?do$mrNvlVP6sBVY#g_EIX!~By5H4EmS9H@Ul;|VGYCO<7X0P2HBJ?1&k{{S=|
z4mx)fG=Bq{qXV5414@S)4$Y51^9vv|nFZ#6$36m}=K64g())skpm9IY`M;p^)+T`5
zzz_valgMG~4AldQPtf?l9C1k4QtB36sJWV0+;SX;TNI#rU~UnBxy4cUr9|NTrxJ#c
zaXIFMsm}#K^#f=g$6@MokUv4~WY9blKhz9vPKMW@J#pZ%GK0xaLG=}=Z2+44f{B63
za5V;oTNmJCpi`fN!V_fHU(lQ(!-9uDIUwVG3<aP)SyP{b&J$*Em;@f%1C4VjBuse<
z8jChy2zty?us{%8?=plx<}jGbu8`0!%8<~^3Q`9eD+iUmpmCE8Yz(hKV?Cfg3@E?6
z`Tt)EWG|?!y3YZb?*hBgq4}u}Xv`9H4~)Xp=OB4d+XvJi0L{5w;b3?Tp6_bh`=Ub(
z5^tdKJ=lB~XuJ<J)@RTFY2z&@od0xz;ryqdc|>M|>CeGw3v{PT0;mtqzy%s7XPmR(
zu^+e}&hQGf){<?)f`<i$&@tcz)1PM;&VLH(Loqu{f6fM)Qv|icpkcL+gW<IgXq;XE
z6jq2iLf#FCxw_>X46k*N%mDct6y6J=X3XVac>M=9=4>z>;^&0PPyYnWe>#JM;k7aY
z!z<|g=3{x#`Zt5=&p~JNfZF+N3=CWv4sGChB9I$F=5|BPZRY@u1zvl|Y|#0T)mHft
zFRw7TjReZ0*MI$g4f6X2gKLZ&3e#8}48UDsVHt%s)(r;77+I0*0JVugZU)6g2`Ky%
zrh)4Q(B14I|Np-Roiz;_S9LHDe#G3cfRTfNfonew^Fd~V>|g+^TksH^?)&$?a1lk+
z1F-l6#U*IW98@oW%6(Az&k#8ODX2{Z8Yc&jKZ4KKTVN>0z+eS(12cm#sP7`x47DHB
z$KIfD<soRi1>`P91Exoyb`q1o<)@6`GkzC5W;QtTbc4bX(75_THP9X;fhkW#45onc
z4`@9J7wAkeMuy8zK;zVM;Qq^$r%VjRk68?wm^T<4fsA?bfY*?5fzJB{jhn}V<~kKX
zbMGLv!JzpUE(vJAw3!=JX9qkMQJ5ksU@%2gLZL<U8E8HSWH!TshwK8qk3e%}C%|=k
zz+-lXyP^!>cJhPApfOEQ9aJI=2`|vv2^I!ee>DI!m$ypg2VzVc)FuJ-Z9(fKK;Z})
z_XN%P3kXbn3JO2ad?Bcgg_P;wv;H44g6oME@cHQm;Is!BZwHMrf%0-3)cqQuvy}}%
z{wsbAS|7-xFy$#|OdAwGpmAUUgDK#+g6Xq@#)%Z@Y)ykHPyY+BK4KI&`~(y~ps;1+
z5d!y1xflXLbBj_SyL6#?K;xYt^FaOqjc0<?bArYlL17h;2=4EL!fXOG%s}PNe+E`~
zy9^d?p!N@_zXR&m?*ol}CoFgfsw+Ttfzmg4td9XS{}}L)f#HELsO<z=n*iEZyTRb{
zL!U-a`V)T4(a;ZCr~MFg#}%kP1^E$_ub%#d<STb@d_{roLJ@WWx0xS22IbG&{GhlG
zd1%hS&^3#N^8qX93_*qkps_sATG3ZbpgR-;LLV_09Dlk&;MhZEhGS3FLF1PN?T<iZ
z03-N5PT|K)3T+QSeFRWHP(WbXQxSt{PeJnwpl|~1-(q!GV94aKKoK_o<<G$ITEJl1
zQ<i|x2cSKxptUDL3=CYLJ&ho9nRy`dh@iOzW`-Hh*Z=$fnh`X&84wCuf58PhR~|Ix
z0`j90G>jPv+8==SL4o^`0Sg{;GNe8L`Ee0H!|M<2dtZRe1@*&0Ya;5uL+4Ws8lHms
z#UObY{Y3zhmO=C4%nl14g2EXz{sJ1)1@*H*@de&%3`%bd3m)!++7FtO29MD&gn|16
zptJ$%dpCi@I1Ch?T~pZ@AArh4P&kBgF}w!JSMh`57gVNRc?faek%!@E?gQl+(A+a<
z7Z(g?@iM$(0QFsA7`#V42sFO3ixG4#v_vC#KAlnEun6d$O3+;=j0ZsXEr7>QcQFYp
ze!-#O1itf|lYs$+586kAEYBpccm;=o(<0D0{7ecPK<m#L*%gu=F?|HBomub@ly7ih
z&{}nnI~f%&JYh7r_=J%m=rJ=xkRoWkJ2QjR1DHIsz=6l0{mje;pf#$=p#3jg{}q}Z
zGa3Xx`mfV;7))z49sbWC^!PuIknn#FA>sclLc%Nz4MHpm6GcFC5g<86h6W*!JecMX
z5(d#=I}|{5;H4*^HV0_TjtRWa_#&9kXz=JMD11O`fWYT6DkMGtxfP_A$>88~m>g&f
zACxXYd5i&c_Zh>2$qWY;OtfNPn5B{k8gIGu6g1|*SkUx{#~=W77OgO-USl+9W(Jw1
z3$E8MJ!L#_@hM|KBUUvkU^UmDGJ@_U6=;9NgvA`t7y_tFVPHsl07@5(3>Tj=9su2A
z3OcW;8LPRB2Ca`kXT<S<%ufh=bou{(DP{*2(ESFlz~he~H-Yw}VzUoiX5>KZ0-cG(
z5CY!I1X_p5zyJ{kg$=koJK*pL96kx)HK4PUKxYLSTm;{r2MPm5gEvn>eP+<Q1jYbR
zUp4qKNQ?(mt|(jr_hmuj{~)(AD!c)Wb#gI6*Lr}|f$D$InU|n7ub@6Lqk_vL@O=*o
zlfd`3fW`-z6+|9^`e>jy1g+Ht=>yH@f$WFvy@!c|(gLU)0hO(waXV1G1ge8TYiA7_
z_Hr;fOnt!M@IV>V7h?yNK?WDVV;7(@7IgMG14HTr7KYRYP(27*zr@TS03K@s?I#rj
z)u9FxpD-yjKj1mQ^Z>L6546sM#USu0i-IHgt{%|743HSJLEux+d4wQ0g2Dn+_Cosd
z!Ju{$7qh{or_A8KeK2?(45*F(opmarF#oB@f%#9L{Qqx-?w<eu{{3rcXlMY<<uW9I
z#)HBhe`wsx!N}n7h!HvlV+bD02nLNuNHG>%d<r_J33TQrqrnAH#sdvPAoZX&6@$SY
z(0J}Eko#0Xab@u5DQG+cG=BsV1GNPip<<vl^B^{8UIBF15u?J5r;G-7o-#UgJOYh9
zf$j@pWbk>!53ZMj9)s)vrw4^A;CumAW6<)5QJ@uk<{D@m8k8o$>J%<N1*Hd&ns=b_
zGlrnYpmPjC^TOaVym9Xf&|EjDZ2?-B2?{6JeD({6`A=&Y0v@wC^gnO_jq`){@`2{E
z3qa@pGjxI0c`ye+#;8DkVq|atji)^V<zdjc960TO#`6*u2=Xy7NO1~0cnq5>WDw|m
zYR}O7h)baH5oj)I9w)==27&oc`2rjsfzPdGSn!ZfVZq}GptU>+pmEj(4-bOYs({w?
z6f9r{r5$#LfQRf33mO?57EDx10G$~Ln!91(0@WFyx&kz}-0<)JYZir$2cYp{Mgu2s
z+ZR+8ocj9zHA4buZeYPf2hh5Y#=S3&a56H;6#xIvSN#9Kg2DW!pm33K0FC+eKVWfa
z2Cu6yQdj^wQyIK=5fn~GI2ai^^cWaGZ8?_<z97FmVrBr%>l8d<U|3-60$t|{%Ig{+
z`Gnp_ps)tDRU!oDKTTx^oqH1S2sD-ox(@_2X9~J6L*&5Srz{4bv({UlatO3M<zZ-f
zDk#wQNEkHt0$O)*;K)-!hL%UlypVd4S7E_p&wu}4gYumQbj=!L2m=Gi51{svIy=K_
z&^)_<!`>Is?2vVITN36!Wn?IP%)k&J>~`N5wAT-`_u(*TevK`mA2i=~%YgyZE?sa@
z!2ohbZ_QUkTL5&HN(TeeQ&3&wcE0x!vtrMKU;qC{fzEH}5dh6aw>$#HgB+->2HCH@
z%Y|Y7Q;-+~L)!y>s5qn10%it-1;QZrf!xolu;3x+jCVuO{5^OMXzo%5(0!8(4<5VS
zhpflDz|P3vW6!_<IvaYS5$Mi<3D4yP7$NsvDGGtk)MsX7SODJ70akMebQcO#jlzP*
zLWa!`LH9d=@&LFV6L5UA5JSyj6g3JW3m!6Z1cJ^-c^J>I0JPUck<rHSk+KD7{(<=s
zXkQJZmg6HO4bWL5Opic&P8m5JA1QEv?muOCBq*@pA+JI5Bhc9+3)LSyR8(hrz-*B4
z0Cd&~n?my=8zsoSm<pi%>Y)1*8JfX+ia~22F07dUlp!GCk;w($N1*j^ptT^9U;n@6
zfv$f6owcFC#PDj3#r&rVp#HbRtmjKC=7ZP9G7HRl{*?tX=J%0>;k6<|DX2`G#fhY!
z!C}E;2_}YD+zhRc3M}S7<!1<Z%wBMynVDhMbAf^dlR<X~FfxdM`Y2MMae(&>3{rMX
z46omU%4~*k(7MO2<)Ai|f%79~g$BsIi=eo3SRlw@utn6CfkEm&LpZ2!&?R6o|LO9H
z3m!5X%zDmj(EdQ@K=UIWhB@H7Jrfx~XL&X}U{RR-lm~P^wnEcm7KP@g90wYo@(A=i
zeZ&A-U$Efe?Ej$ighU=QOjz&`bpGcab5PrU)^kZFhSvcgHyKQQ3bK#c;qYV7dT>z&
zhAuXSAkg@zl!3u)@O%|0&w=h!1Fgy61>I+*kp6%jeD84kV@83d#|8%7Pgxj1Yv9_R
z@))!|Wm0H<&LYtKlqaG2DF+BUv_3k)2y#!zLym-|r=a!bpt6?*bnm3Wq^BGXt)R7c
zpuXnQeT)pR{xgJt<`TP>FfMr50J{GH6jle?9&kLE^At4p2`YP2|NnoDF2}<V2f7oA
zi$?%-H#TT&FytZ6g9V0+3N6Zv2S9su7_>ljJI8~0PgxA+Jq7jQe*gb(#dBcZQvuNZ
zYM{IB1ZF)y14>tdjSpB1CO(x1-3`aE;IV*F^Fy8ktxq`~v_54qXne{O(D#%hpyw$o
z1H-EfwfRp44B8(tZJ6~OcAkt$LiZz{fN4)bV=16DJxl)o2gfVu4rfLK&qvLIZ4Y=3
zOa!g#d&Ob^iqknynH3H{W@iX`D8;~F#UU`~DUZR#r=YvqK;wEG1{1(+(AtibOboA?
z9;83uXNY?Yn)BmfXne|~&@+L9q302c!KA66a(>nS|FhT?dLA$ufa0hRbk_A#4h8V~
z!>4=?nw~Q;HofEtXnLB+$nc5*R9`W~JOrK5$tckINL~S2J{(%`ut#<N(}hl;^ZjQ%
z?-Xo(z+%|^z~u4dr;G+Q;CqeuKzHvMG=t9}2CXjz%`brFMnLN-m<(n;hpA^^hy$;2
zVle@g0nU$@1v(yp=3_wpFAjmmM?D7?Jmh1L0o|R*#ltZ1DI-GwsBa?$GK1&AxrY#Q
znxDed-UHo91qu_;Sh>OB$IJ&n;SuwgLjaV%8lN&NG)w@61&2e!q;ybN2sAtZrE?B}
zj;A~V9ZxwLKyldkbdAaUsmunmrW*(}PX&jSLeFE+eY!jc8lST$G(HtzV0hJGGXJRn
zL;EA<1GAn>F!VmvVVLt2bk7lJu9n&0@MBP$frEj;irFCj0lPp0XdUZgMuqmrpgC<F
zfgW&r;c#ep#10B;gE>!Qgy%eEdLRt$i-6_{L2HuP8QdS8`}hC#Uj~L(KE`vNGHw9f
zp%ebll!3u2M0w8B0OL8}c}PPBhE-hPdFSQ_+zy8yvNMD{)L~$l#m4|SCmgh=TM1Ow
zJ?MSP@}T$WBo=TT3m&^*R}gr_VUQ%m@L&NWlR*nJvq6J6i$NbNi$byh^MeL~1;+EA
zGAT3(gUUe`g+5URg+A5*<B3lrlqZ7jlLxo4B8(f41{gO!1)T}c!O#Z|lN94QPYaai
zfae-xKxQxmJ}eOKX-yICc?t@%4C6UZOThAt4?y=@mk9T?9%f*8Wnc_yGt7Ff!!Y@2
zg7W029>$ZOvVhkTHa}uy5PA$+o5DQd;A3WkOaX3%2M@UonjbJFFoW0IiGa?BQs{lk
z20k-_;TEW^y_OZ?S5Q3;8rP6vV30Zknx8b7^*q5CG*&G9nA@OJK!#ziD62uU07C+^
z03%!2W5%=v#_SAX4`(qj%wjmO;4vspKx5DFusqQFl;uG0Q+sGwg3Rw{VBjh+n*WrI
zq2U2&4Q+z)q^F>{_ypsor;H3GkJ}j-xB`skKLy>}2ntWm15FPyj6wMsbWcD5GqXY4
zgAC)wr<?|D44{4-i$N1>3<CpKg7QT0dLhVqI3^)bdlA$(0i9pQXmH3l!MM@%hvEFE
z%ncwv&3MWfApA%b+>eTUoS{5Jl*J%NfXSd)Aj7yrlwCmN5r;sc5Mx7&0H;9X12%=m
z2cWrC&^grH22Bqb445A<3M4&X4rm0gC1hz>z!(D!Lr}d5YCCd()=dU1co@dY@ETI~
z20Y|&SfD7#z@P;hKW1ZS0s9}M4ipBU^&7Bo0L{09_F#bK%0TTES5}7C8Ok%BGJwv*
zH%J55=NZNwPeE#A!DGG+4`dWUX(HtTQ^Kt0pmnA!1}#rBj6q|uk>EA<8OCi-bsXBj
zeLYav@)&r6*KB~!B4rk6dce;R{Fqe%v{t<toR2va8lQslF)IVZEEnf#;B)UlYxrD@
z+nyd_V0i7~-1c+@XkJiZ*7FSENl$Z(CxQ1DOfi`MG)K6p6;!XM7*BXwqCDX#vjHgm
z20tt@ZfGqrm=7)kK<OJ)9*|TPfbMN)V0iWU6QW%LYF~lU6{t-D8l$_+!~kwPn}FKf
z{d-@SurV??K-X5QfYwzTOneF&GXT~9G0qd8GAA5*ENI~J2y`bP3uylw=$t%;1aMpY
zI~OQlI6Rud!2ST#2NQ>$PxO$5;k6FvE^g2{VxW5%83I821*8}l(jVPo0gd4;czgqz
z=D}+h7(zgOVXh40sZZGy5+3LXOnnM!moX|dJ<c$0eG0mF85Gvwu`&k8{u<CY0;pZa
zpa2`c4Fb<qf%Y<+9B5#22d&{zIP`dtA*haVe#C6p@BlO(W}?vkgk?kXBbJ7SM+^d>
zvk3!1^YL7u{t4)g91f<5FBt<4KV}8phX~rkv0&0u&=>?m0;sG?d%$sEGHBi2Q&3v~
zH2y0F+HV57r;#BT+_vF3(C`$rzMO}l=P7897jwcX(D>0q(3&DP1JKz>lb^CAfbz01
zXur1<#{rP}lb-SzK+0iQoeV1bL3J`HEg_r90hvF4%puVJlt-ZHDQiIEb5Oehlpc8s
z8lQsa5kYMz15i3`e5xbR@{~a!^3jR^|E0JYB0%fgxIp*G?EnA&RTH!g1X|MtT0a{P
zT4QR^{FKL_8Fb#=Ee3@tPZNZvfbW50R$zL>$i4uyN8_=FLepap<Cdq47R`@bm|LFu
zFt<DnF>ZO9Al&j4w0=zIK+97(h6Rtc85v&3Fhkadedyo&0+g;k1VZ*gf##Ax^AKeW
z3|tRj^F<C*pWiTqwV9_r*MO!~6()w)N5JA@PnjP~ea<X!=rIGsyr&!o+#Z4MZ{=WM
z=voMm=RR=Tm06(SF^59WQwD*)rz{7WpGJb#W-$mo_63b688kd*Fz9;<stXt&^gLiG
zm<Nty4hFHOJO&95I2<NF<pH&S4}iwtV?cAfQXB@LcnW?f3W{%srl$-7jSqMfTAqUD
zrkEX$KW0{#`dr5Vl*i-1dx=>L`W~==?tpLr*#nJhhIvnU6y`nUF_`d_k0BVm<^W_a
zhz*KsPX^FDY|~Q~u-OeyLGz4^3XP9Jb9*cbJx@&xnjdk1+yz?qrO@+~QK08J&w-|=
z90!`g@eb0*Xwdjr=Rng_7K5IrOdNrar5PBkIzZ(R!_?=XwVt4TNg%uQ|Nnmt8LtMp
zd%{x}<q1zg?uE5Gco`V1Kx0B4%oCpe{P+Jgc)ox^>}i1Vyr(I~^T7TG%>jY#n&M$d
zc#vY;_cTDc@973+hS#w9t{se!eWswi`sNn{N;v}>x6)CV51y|Ctx;fhnDiVpjs+@X
zK<#k$|B${ks80$SPd0Ga`{Me)|F53>U|;~1Qx<{qpIR`^e+o)Ng7-k@JGMTU#mMkl
z0n|Si0Ij28cqPc!`-sV~;X#7{^Hb3H8K`eO!J+pN$b2@?e$PLU`3BI~7-)PHWEZHc
zIm^uO`hmjyr%VP@pM&a2@ZKAP=0{8ht<R4*K=*hsEO=PQ2pS7t@R;?_e{h)!S`)AW
zs*g#a6};vNlwLsVVnBL9>)3lh`vVzzAKCr-4|OZ(+(v|3IRp`I1(ivHa=nju3>BY(
z&i7<vSn#;Rp!caa6T|B}puN|i_0iz;-28~apz-O>|NmcWK<x+JISld_%<g)I1&_Bg
zF}&XJ|Nra1|Np;Q@q>Zk2rmP}9z6yIP&z130M(EE4?ua8Nn!GHP&_aMOah--3YsSX
zjrlo(=957CN*Nel%>wOH0*y^EFi5c(TzPH_T03pf#>C9f!T_3AWpJ4K6f|$ZAQ18h
zG}gir(E8{jXuT*>`5p6}fkA<RfuSH^{!@?}Kyk_JF!gzc!ThJ7^)<`_Q^D&L7!npd
z1f?kz=(>6ZMuyj*^&y~q0g4~ccoL|cX8d0ttPWJqNis6L{=vZTS_PE$4O+o>_=3{C
z;OGC~{c$CrF#N{A5CN_G4(Ks3oVoh%KWH2Y<oBtdzVpZa3DX%EUQJ<Ocy)w<;nfTV
zhF3E|erI5Kb%=rC)odtzkb&XV0S1Ow`xzKs?PFkgwU>e6)gA_hSGyS)UhQIFc(s#(
z;nfZXhF9Ae7+!5-V0g8af#KB_28LIg85mxzV_<l-7Rm>SuVP?$)ddxAg^Dj_V0g8J
zf#KC+28LIgp!z`iH!?81YGhz|wUUA1)f^}dGH*TT{uc&@S977_Aa{cNFd6Cxke?<n
zFudw#V0hKX!0@V<f#FpT1H-FssNJ2Qz6k@vt9Ay4S8WUouR!i-VPJUGjKoLQ57GxR
ze<}mRt9S;6S0H<87#LnvgVxC~FubZ{V0cx*!0@V^f#Fpd1H&uOy7mGFhFAGe@el@v
zSD{ez^B5Rj<$~7KFfhEzhSI4F46jlc7+$3_FuY1*V0Z=Mdqd?xG)NpoXM+073=FTL
z85mwAK+SPyV0h)h!0;*yO2;uUyb5Gscm*1xaARP21(Hu>V0aY<bpyyP!Jxhp1H&tj
znIJW;P`x0vP7DmMguv_a8D4?<aG*83d<+b)K<lYN<IbS*e9#(PNO=hwn*i-`VR!}V
z&x6JYK=m_dO_w&PKH^yL*b@}a9}r`DT428}c<c;XcgV5eu_I_K<wEZx&{+caAp2z=
z+aQUtGcmkk;#~09oPpuhFa8CfdxBpvaxMVf`}+#CU(k?&;Z-gFg2(!x`Cf(vk99$F
z0-(AXWIyAA$C?ZbuRvvkI+%X&7_?_$2E+WPpmh^dKzHjhFudYqSO8i(@d{Kng37QB
z;Pp5Gps|!ypm{^k8YlsV1&=}V2Ou?|_IwP({HLIB5&?~IfbDt!S}XnPKlnaWhF1y<
z3n1&Mc@}`?3tlBNfX)yAt)E^18XJ41z%U=YR+WVTv_6&L6(cvK-3OYBXK48U|Nnmm
zh7G*T4FBsP=Mh9G%zqjYF#l-;=v?an(E8(~2hNV5eP5t*nBf)wg9Q&+K2CcM8ao5+
z2LO%p8-U9ONEr_*8$jg;XxtfAt`s!v<p7C+=30LI|Nno=CkBQ;|NsBLpvS;)MGrKy
zxd42|2x$BgRG)#yl|f|(sQdxdWuWp3v>u0%q2MuS-#)0n0`eEAo&oLQ|Hueh{}=EO
zWVaV+oE*BBoZ%A#Ls{Mb|Ddts5Qq6sLl{7HPX7Z2gDK$pNT6Y_1bA<_!j$Kr^^Ksp
z24;aN&%t*v7_>ZRv;ytPYXt3m-~#REh4`rjTm}j>?BxKBL9hS#|J8wy3=B8)7#K_#
z7#Lz07#Mu6{`=2(pz)DO(EO)72b&%+JeUOD52B$2sb?7%fbOTA`dmh7{?m#JzK@t3
zrao^_nEMnoR>Pps__Ri0?o$?_`QWpCxePlP7!_KdGaP7n3SK{K(83BT!$Ik%LSez<
zx*z{vUoiyLIiPk4=*&{^9TMO(HdqWMg6BCwaRdre-UQHj#0;<a7=l6LpIyz2ZQ%X~
zhr)u#89)BN2Hisr+OrO-3qW%@AbaZB8D6jZ|NnJ`;ryqdvtB`UNsIw#&r;B1MlI0%
zMe$>hn?ZGZ1SmZ_EO;mbq8UOSg62w8L2QQw54k}!L&!srx){*iwG2g|F;uP;1JM22
zL7+7*QY8v=pXM0M1&^bE*2yq1EO^W$x!`f-f6zLB1&@CS%zs)29xq++_>I8)r^TSX
z_X0DXJ~5d8^a;cKr%yn2uR!bb2Lkh-R)EY=NO-_#(E8k|aKS?chXs!r5?aCQkYQ;U
zG!_OLpZWFwzZGZ?5Gegv{?~uFL}C6@(7sZT9?%%Kb0H-CgUTChdO`PY!_qovEFks$
z|JR^42WZbWcr6aJ{R5H%r6ZV}jKTb;pgoWvy`b~r85AZzwf?XFkmuk3*A5>U7(^H#
z^*ShzfYKFH0|UbsUIvCQ|Ns97VNm`7(V#q)!N9=a!N9<<!9n+>NWk2utfv+{)Hwy3
zn~njM16&U85oIH&tl7}8_l0WMf`_1c$Pa+_&BD%^0qvt?V3=hB_CpHfj2Q>e87>PR
zg7kpeHFq39WB7rOK=Wztp!t>pQ1~o(2wEQvniBz~J2(E`M?D4#Pa70K<24PBE`0z0
zx<z5?Q$}W?#~lV!MJFiqKAmFFD+<cXEDS=Adkp4__881(1?NBGrpHqRdck)nf!a(x
z0=+`uwMU?{BN)OSgU(}NQ&_;rVX)vasBPp9ntw3}dj#5_$N*|@7%bQfO2eT3IwxrC
z#Q=0?3+UY3h9^7%y^la{TJ!z?YtXz@i$U8{4g=7=)otMQJMN%;Lk)Xhl)PhL2w-4f
zZ~+xh3=1BXL&FHPreQ6V4LS<|bRG?;tOCz>f$p<4a0HFRf%XM=@i8!f+xzBF^{{h%
zK<Dw?c?U`(&@+6X=kb8r=M4^fUx3yLfyzQ;^Fia^AUp12G3z7|W`W$f4oxrYe43re
z`WYbS34y{6)V>GrsfMMEf(4-a1!k>9QvVfnPNswIOQ(8p{ep2;(IO<ZpmYa1>j%^}
z1g-l5ogKu^u;8&BDE=4%9y9WQ;%)9ykpDsT6Ufb{aJab#i@6~6Cvm86z@h#G4)rBi
z)JuTJlt5)|{{v9lo`GS~Q&4(i<XXTCim#g2kn$ho4iOyY#$hoRq<%k|dQch(Mpg?=
zBcSjDsXvaU9u}8w$a<i0i7g$Oq3H+NXO65FY9D%<1lg^MMXv@Hy)d^%qp63vRT^0j
z7Po@ZJ8Qv$$Ds3|1VHCOf$nVA0F`NoGnPQ^=0r9Jhr2;%qc8}}fBNkI|5uJo3=AND
zXy9<y*SAP{6Y4HdyClY8{!`Gpeo(o`Y%m4Vw*##U0FUJ{NP+g89|Ya`!4Lpyi|sOC
z0Ieqveazr6g&n*O#bL^GR)&@bJD_U7bHUKE6%@{(wInq!85o{`+eCqnnHU0uLGA>d
zsdeEkYWWQcTTuD89?cJ+@HmR>erR}r)Pv08LQ@Zmiyg>%pnitsQwH$8b_*VY_C|x&
zR>1Nns4kGX;QPoRVeZop0-$zg7<m6WsLcj)^I~K-J3IjGv3UhLTL3f%Ct}e16g1We
zT2sFRyzU>gM`0p-9eDL$$XG!6-~X>c=evN`;X(GzE_iqnR5vjMfZEAYj0|C*`b`Qn
zek~x-`zQ`tmhdw$>;m<dVd4zn_D8^D(3&@pc^nE;pSpw3PH24!Ix9v%q4lYVLhDlr
zg;vlx37~V=UNJaeo(mHSbr<+vl!m=85?(;g(*UIp(Ar;cxfvk*2vjG4&OHX5u?lKe
zGATaT%)&6`X$my%Ss55kf!3$9GAs~eF=%GyFlZJAt>fKba6}N67C_+(+IIjp3$#xa
zbZ!i2j|D^MW6;?-ATwDN7AyqKg@DYCgqqEe(6)dzAYs9m|NmEk?BEcX@)WWzw)rum
zLeK-ySrMRd2v&xmhpY+<6d4SzJq6vD#RW>s1_wd?1u2j|MjpsIX3&@q=q{5l|Nl#Y
z*47FLv^)ikS1|{)K433MeE_P1L2d?(Pl3Zh;R5I!hKI}sLXVgaEMR0j;4I|8AoLit
zFOoxHf~bhX1Xdn{<Oj?SO%IqECca=%2zYSB{vc?a=OM_iJPfTbm_YlnAnSxc?fO}u
z^L;^m4kiYMRlINizxD>rp&2xQ>uiwSpu7VLuMGy5z-BP{2tNXytpFOU2JPRl1FhRM
znDkVDVG?-VG>^fgr=YedvqQoI(0VFHhXsb9^){e2rc1y6e+@bx4YEeH^{FZ7idTb#
z2cU6k70~><0%(2of`_xA>OkiVfyVVgYlj64TAzaUuY<ybOJKocP#P=&kJSf&=lDSB
zQ4*SdL2IW#`^gv_78tTQEKp<v&ASw|gToV~7vvr}s9w+=KVUa0v_D`{NO%BhmxAnK
zOGtVE>NA7JKSB2@f!1X)f!2mX?O;h*APAbv2iXhq8^}GN@cQ7e_eC1$+*r`OBxnw!
z0kVDyw2zfX0diIdlS1MH59k_l27{&tpz~4$6k48w)(e69R2u{!=a?uk2!hWsS^fsG
z<{OlLK=nOrZ7WC*GlL)~&vLOa2!i(VONl5z&LsiO^MlSHV1k;%$SwGoNnrtaA1SB}
z0_yAB2Ctb4c>Lo3e{k9aoqYltV+EyU5rvkgpmpsaw}I?+Flc_v%p?2=B*$Ygg%y+!
zWei$aL2dxKn*+2440NvyDD5$T?k->OFclomfsYv&T9&d1v@B&{Sg@GmLhmDx9#H;e
zFj(-ANt*$*ZgLlh56ah!JfMBu6QBNPU|<5Z?LqsO87vksDswDg1dW4&+WDZd43K)z
z*cuPR#24T>Hyrw$q544OEa+@rP&|U#6`;Gw859n%g3c0W;s)I%)W8a{FYxgO1@O74
zj0_45PeE!yb2*^4l|jMWr=Yz{pfZ*T)TR$u09xC!3fwL(NC(YruL7-AXK*Na#1QcG
z5euk{2aRbMEO^WUDw`8P{iPF6L1_jQkA5r+ufgmMp!)a0<71$CrwNUZ*cl=pvQ1dP
z$he`KiFLt(hb##o`6%$&10eOF`5I8)W)};?YY+|Uhl0edVCF3V^+^{z+{D80dL|3&
z1JL**=<Xko8bcO_*Rxqz9)Q>k4lUq0P#u`Q1PFf#$Q|Hw3m9H4WC4#OgYQfN=}`p5
zX~KespnfYSL&#$$ftCjb1}%^N3ouXmFTmKu*x>Pq%V63=27wb#FM{q4hMo_i3p(e-
zAVU<i?haJff#+QObzg3|;QQzX=)4e#`A<0x+<D3&(EC(DpyzQSL*V07fd!9e37ma;
zLtySx(0x1%0u!II8T2syH(+K0-El1<(EC)vpqKTA!Q7`J2j)KIVd#B&gJJGdjt6s}
zg4UIT=1D+%C_rmP*$yn&3`#qE5BeW~_l!K~eY(ov>{HNwX^{iHPqhu2g+TLL;CUC&
z-5~}G9)sjTbK{_M>p)=$@;@lAgYLLqec<fViJ-6mwMz^ZfX@NZ2Cx5wlw%B_v3`RE
zk2|1hK<h+6dO>D^`rsns^Pe)m1ht74fcA7hZicD@h0`j7v!ZMc3m&qA>ZJt_9)rds
zVfMq!Er+USQfwE3>0v4WpW**_j~Qr=9^wxF7yn;_@(pOO3(SmUs9w;1P*B){&Wixu
z%`0Hg_%y(v`B4Hxz+(gO-QWuzn;7&ywJ?}F6}0}4#h`hTg+cGs1he^1Z5%-7moz;9
zorMBgqh?{y`!tY|;gyFOC?4lN<$M6zf79~-v=)ec0;r$Z`;=qBg2yrsdY>}xS@0MX
zmLR{#K;7!h0@{B&_bJN*(EZ9z;B}(lIY7|aodOFU%7FIgALs+0l>)j4OcLU+#}7>B
zgW4A0y3q*gFRlgI0-$jc(0C_EEhx=__7pFN>RExLM<1$(dqI}~sJsNt>2n5v)?3eg
zdK#QB10J(9EO^K|VZlRidS-y!<p6Sfis}5P@=*Pt^C?)6<a|u$Kka_;|25-+u1BEu
z3uv!H`vlOrrVAc}`|}J79!i1q7A$zU>^UNiU}k)M1{QnFU^@Tlz32a5b57`ln*-X*
z2CEBqGBdmewKEJ9K=%fwJ%WidE1Z08#tfRX3j?2X`|1DxTcG=GL3cRa`~ROyLI8C4
zbRcM)v}=~Z-KPo)jgJ%zoFDyHV0tvm;OtWgg<kMnKPX?NgU;Ro=U>nn1Tl{p3>I7l
zm3fQ@e1t>}^osI4SRlyDz#t{@VD8g2hPcNf59W%3+5w>T2@DUq9xyW0f$Uk;%Fz4B
zKw!aRK~UaU@Zj;1&;MU@Jy`J2z+k~+0fsox`Pq-#49-4nHRyfRDsc9x@PXz-Y@l-s
zK=WG)eUF#~E<a~F(EPxJArPc?GNZtPW=4Y=&^nz5{|%TQS%TVH3JWGPDlBLQoo~RX
z(8LU?Cm0OQJO#D0S`|QN{4_lR?VkntpZUOoi98AmCUP+>Xk=1oYGP#Qngl8%(is9D
zGa8(E3c9}ybOs3@XkVeh0`S^b7KQ?l|G{G+d=C-?L>}~trX@hmE;_@&@Jhk}6b8YM
znG+TWo&<$S0%%+hl%E!CW;96J3YxbBjfHM-faI-p2EC7%Kw;nj%4eWE((gS1t(^z0
zDOqQ5_UZb7vrl;r<UO!)=-nj4z_6>p05tX!_|V3n_o>T+UeMmnU5o-b4?ucU6nY;y
z9O!+j;?M-Trs&oVBS>EKZ~&cc(er@Wp!t!HK=0E4gWjhG4o#0(4}j_k(B79o&>1g}
zBpjNUcn%~AI0*ELGCt@NP;qDyVi0)n_y%|kX3|rE0%6elH)hC~P|RaSgJxk+IsmPk
z0r?xWHYFVt2Mj^N9H8^N6y`oP0k1`BdQbq0b5J|S0Cayg$PX<qc^q0EF$PS0#KFK2
z#Q{1i$7uf34GN%gqY>;@27%N^pgDUk28dcvISyKbR$#C|n8Bb$l;c5*D9eEsQ67gD
zAy66x<zG<U3_711boV2VKq|O>$;rU53UrnNs9pf2XJ&)G2Rs6aU^_teA={D05C)o0
z0Pi0KrG;4w?t;#3Td3WzU@=2L!Y18@1)EnIoPD}7q4yC}0c7nts9nkU?Eh;6gT_ao
zHX)dAkoL6X>HpV^1?`WRLFc^%EO_|&|9`N#pt(jy1Gh(v4Q@|CcMLKvaDEDk*A9l3
z7aR&LPeI{gqR{(@$6(SE(0XqchM<QG49O2bb=A-R|E*RT+<m$LH20to4BAg9EC9L#
znW6V7vp^C!9jr3weWYX1`&2`r_o*lY!!1z#%40C+Dd>C=P&oxUQxOyv3=E(?M;|yG
zz+s%w@(46P1gb*?3?@L%oHA$<&@ku~H8GgW%95~vk<p-;!Nj1K6*R63ZkGfsc&y^k
z`-qQW$_vnX**gd3KDGI;{}6meaX{+>Q2QC=ABKPj;4`t<7(zhd0N#(k1=L3F-}^!W
zlt%;>JO<shAOh-{Fnq9QV7Or4Q1}1;jJp5-Tdq%cOg($nk%2)4v>b>5w60<T1A`Uc
zhXss`4!SQ{6oMWpFfi<5J|OT2w0DvDfZ!t|&{_zEphuv)KSdORz->$x2i>O<0UKXP
z1T1&~qZJf_9{v3Pf0Y13(PN2#jVmMq7OW6Za9YITF!zaw!lXwW0UK9v1T0v=qY$*{
z_y7N^I20y<?f}{avXjMN;uaQzhAkWd8&_}$ELgz;(x))#5o5z%4km`6$KX9P1_wZU
zwU#g%99Y6=aPbJE!GR-;4SQd(9LRaZ!~n`e7oRX<Q3JXk;r0LjyFh+91G=|H;NWAH
z2NR!w^q4U)oRR|HI}-F*fPrBbkAl-90|wofdZ0U20ye&2v1xv&;<Df&t53^A)sO`b
zd16{0>Ks|{knc>-LkocgF9Z~V9)14*f0Y5l-WQ<zkwAOY^o}fe2r?g}hUGxR6OjKv
z;leE7_~<0~40bfTEEYU80NG{H{7}VX!9!M$mWQel3m)=Bv_8~1vEU)!2|RY4fZBDU
z=OMCPOahLN)?u^D25Of{^FtM%1rJ$WS{|y#EO^Kh()v*6%z}q}NATEn25Q$4RJ%ay
z{z3N<F$sXyw}IA_2R)L9rXh9EnYaf89~nT?kRSuYE>Ir_l#W1QB@tlwQX)X%C5%Q*
zLxw9Q0u)w)(hwy57_Q_9P*};M;Is%dw}qO147aivC~V~rFkHzYps*5_en9COl70%G
zG8!a2Wi%*U%4m?Vl+mE@D5F8bQP3VdP&!~Vz%CC;J8z(A=NvTcFc?gH3esc7z_1G=
z?KtSZWPY;Xp@o3qOPx1;4|$F(c&K`&=OJszf`=+Gtq)mT7Ccn;X?bW6pzso&c0gn5
z(7XUT7l*~b@Tu|{P#7ybMWmg^N2k!^6J*y5s9i7m9`c-6@KE(c&qLOT1rJpsS|74_
zEO@BwfyXXT+5y=GPCE#@m;@Rht;c598>n4R`X2I}S@2NxNY6vom<112LRufP_$+v+
z?1INGP}%|61x`B%yFlYMQ^5PBK>ae%Ss6i~{XEWm9~L+=9cXv}+n>q65c3e*{!Gw*
zpZ@}k;JtmId3Oeb3r|7wzM%UTK=ZnwHK?F*8BqTgv<D8f7njkb@gZmokU66nv`+37
zi^0?<EDkP@m<`k(@EmA<z-;i~A&&v*E;!Iy;ULgm%3Lf4p-)*DTpz*AWi|+X3Sxum
zNst|&xnm}f-3-CtyDXR(8o=jSGb4#H!^9Xu9-ABh%~#HUdjJ3bE>JxOb33Rn3^EtR
z?FufS^C7`|y+QW;|M#zsfswHhG?oSO2S^WSTuS~UXiT#80ciXLG~NV~XJTl0@ZW(E
zv{&jCqd@_9KR@W~9?%{_P<sv*E}(OqSWH?TGDkFn_7A*bF)(<_qTuw1*+3N~Oc(_~
zVG;=5gAVc=$ShD8fcyrs6BGt8F;EzQ#25`OJcWsY!U`k?iYJg5$Q__PnmPyOKh+VK
z|MUUqt|8Ex2(Vj0=imf`?tS9`yH&vH5okXxXxss01}q#@6y`q#t^Wb9FB6#b9CS_^
zXq}V@Xx?97(sLcqd1nTV;PHo+OAHJ)3=9k@3=9kw3iF?W#+*U=K;tL6(6MJwJqw;o
zXJ~rPz_38Mp<%Cv#0%uLwvag}pG%Oj@CgpOFF|7(pfM59UAVjk3m*1B%>vJ<Ie_;i
zb%Ew$Ky3!l+7K2{|H%M4f64Fw)DC`l*dLS!7+y&*%zXh`I{+H52lekKK<{s0Mm7_&
zCmwv?#z#<}#{fE42OS#+`HKaI`lndbgYMk~jo*|oFj#^1PGm#x+{|HM;1aOUe+as-
zk=elMfxJQSqh`?BcTn5%Bka!2fQL*9iyk!cJ18*nL)eV`4hoHY5OyP<g90Oz&B*7V
z(8voF=XFqEgt8fV9TXaQpyE6Z3XD)TBaeeZBR5o>+d+X5%4XztP-x_WigP(AFhbdk
zTn-A2oKSI22L(nbn~~E&p^*bB&f%cI2xT*JI4Cr-L&e!06d0jwMs^2<MmDH8n}Y%)
zl+DQIpwP$)6=!u&V1%+6SsfG_S)k%94hoD=HY1CJLL)O&oY_Hv5z1y{c2H<!f{HUa
zC@@0Vj7$y+jf_xnMh68(D4UVdL7|ZWD$d}b0E#0}m@_gsD1h<<Xl#v<0o132?8O7c
z7wCRX&>egrInceDy`X+D!-B`Kdo>%e+^flO0J2UIw6_Md4jV+X9N>N0cwoW9Gp9a0
zY=+RFJ}Ot^fe8<r4}kAC6a?L|2)Z{Cl!h2U>tGlRA2Krp1~M@OFdpV#pm>=70qCwH
z@H!fpS)g)*@z{iipgs@O+=rn3)6B;vJ$(NEKNkywEI7|H9027X(B0+>KxeRl*N%YB
zY67iQ0JT}Kg4S7p=G7SroI&kDkY9g5)?_e)##TZ81&Muzh#7<OG)(LrL~Jqx!-8g*
z*dr`rcOhbMy^RVR9&&;1*i@SYYUgXQGcZKi**$oCNGlk$#@(yYbiqR=!{)~etePJh
zGc5q!YX!c~3KSQNY!kqB1Zdn6#0QOGL1^%uo>HK*WEmKOCo>2vU}h9pAPib($;1Fz
zgTw;rPctl-Ecai3B20|Q5VXe+)b5)6l)+#wXdV4S28Cuw*n!T%WnduLOojt<pMuO~
zP?+<S*#KmAGuT{^J6#wifXxQ6L33~%2C%jHkTWsC{c?r{k3nmyKy?vlt{gP(>vLe@
zQ^tY?5AO)ie+s&*9W*`(>hprmlLW1CU=f(}1hjsNc>@EeANvS&)+Ez}1rKEo^gadc
z*Qo&C4K?>EqsfAYpuIJqbE6d$&OTLSIQulfVER)ghUmu@2d1+!8VEmP5Lh5AV9?7N
zq0r8xV$jPZAkZtyqR`9AV9?8|3Yxbum;>G~uLN%U&wc8l0MZ}um_=X?>n4Fag3JyJ
z7#$d9K4mmG_?Std`2j~m57P#RJAy0?JwgoNKIDRC76yhcMuQ`dnL&GDAot-;W@K2<
z%n089#`361q4^=`TnRk}1};ek1}z4LXiz!N%xJ&>-j_24H0N`m;}HYYEuj5#ptEQt
z1bQER0^flf0G@{s0FCJ~#60F;XkY^Equ^ke`*e=d{HG2EGoLaEOn7c%(D~Fspz|qc
ztpXEh4IV=f=zJe8(0V={XulA$2O|10)53#~9YABU3e%rj7|eVMn%e;F8v>1aa40NT
z$fD4(iP50z5i=-F9cX&61>81^2F(qD&zlqlorfYY<0%JdzJa0eF^j_FCr?0m^#CZ{
z6+Tuu&<mQk;sTk+C@@)^TVMg>B7M-<{(^^~v<b?ypn6b+p%*+ypaMD*nj!G9H>iJb
zpySbu|NmbpYAkpN8ao5s8O6j1+SdU(|F`$4g2CCR3<r81C@P$N+VubbD+MG!y#N1S
zO2c6KQ)Y&UhoEz_7z}2B!-J7g_%V}VvoMq4VP<9n(EaqCPaO<8pY8zrE8y{g|Npr}
z7(nAnpmS&fg!h2gE=N7K2Kh6f;}Pi0QgD6E5Cxt)0IhH40qye=nEDiSzdOXAQ^i4J
zg`javkRL%|0P`oKL))YGptIQ>7Chu)2zdzJYb7w_>7xJtU%}ivA8hA>$1DmRk3jcR
zXe?-ds>9I!)Igy9sfhyU{6x_HmEec63=FFn4Hi5Gorga4|NmE@_yesK*Jx;es$kIm
zR7Id294=75KLq>Tv00eO@h~%sLB}HtgZ8H|cd;0B2sjvYin22-5H9`yU#b{np2Ezh
zptI1y<|(v4RWWFP3Nk+zbT1?*O(@QI4oVk{j6#n=`!AUcn}nGR4>5!GHL(;x!WEPT
z6aW8zb>IvGg9HNu1Czmm$N&HRe+6>)U(gxI1`8hl{`dbCs65b7n*US>w8ss!#!#XE
z0cakdSz*$176#DVd(dO12FFJgpff@l7CZ#4i$b`4E-PppSb(9Km6M@?33PT44|vUA
zFlaq37vl!!N8Ae*fZF(vSq-`#fbS<~Sn#mn;FRZ}J->_-Wgaml_6Rd2o?&KSh<?ai
z(DHym-~lseO&_B{!=q-wDbGQ7W->AgK4w;EdB9}YD9mJdkQtQELFWmv8MHqDr88Y{
zo(=__hsDLXz~RwjaGHvI%w*Uj%w%|mnFTc0V$lA;!=Ujg3+U`j@Y;E2CIN#+R#t`u
z%%JsXpz;sYR|dzGVzV%l;$db`x?%zC2R3Ma07_Fn20c#$6ndVrFwA}G1Dg9Z0Ill*
zpGCY2tPh&LA@(&r0L?vs>J-?yVIX~=@i)-fzMwMU2Pi%nA|77;|9=)^K*OW0puMo5
zHJt|Sk9-V3drCm_1`8esC^SEP2)eV=X2C;#24TqAB@6+N!RLT5K;}9@>-kv(=Dq-h
z4HJXIBLRaRP#gXgXdMb014z8_fq+5N)7$_5zw$Ad{}fcOK-}5$fDx>|@#&TS|6iGa
z&T2d`_o)GBorb}j=Zp$-o`dF)4;wCc2&x}IeVo?+|6iRr!NB0dz`(#^{{O#(`Tzd{
zAk4tPAOl(lXD|VLmIUZ79#HxKwJSjTU_j?Rc`!6Q`UhHLVKC(>3j=tc4i^W5FlenZ
zmjHwCW6)Y#Wxke2pm7B`CeT{)hDYy^)PwHFzQEA(2(*?Lv<4NV7j({yG+)c34^VY5
zbKZdN)^XH*X=5<y>9YI2j~qZ@`k?6%%K`A5#Y0dX$j`9v1wX@@7nt<C7yJx8FF<#0
zamMyO0<DQ<0G%Z-F!w2_pJ)JW>wxBbK<i&YXT+NX^ggxtum6yNA>c7+J_K~G1L&?k
z(0Ds&J!rrukY3Q*k^o^)xPa~p0qNcJAJku5@NgMuO=08S7n}|Y9)r>bC~tb+^98RF
znQGq)u7^QmoGb?#!Dm;1>STU~Jumnf*1bTdc_8}%AA8n;#$0=!N^F?=l%HYF3(&j|
zKSSROfd##f9Guj_`=T2-dcpl1&{}fPxmm0R3m)=7$2>uP0oT(EVUIy)4}r>8(79Qh
zx(gnszWx82gCPR6=Lx*7W`fY%r?0^C?~#u=9TqTiIV=!nn6LnR#!-jSTv5=z5&?%6
z;VDMFq7VQ7mzrQS7d&q)V$k{&WF8m8f`<WbAz=XuKhPZ+pl}oTF!iYis9b4S@NkMz
z@6${F|G#2qhybnU;o?jHtz%#CaLR?=M~t^2XSsvw<rqeW*E|9ZPbCx@p4uo(ehTUn
zIw&+h1?A%v|Np-N^~phT0P3%U=CMF?R1N}DpY8&?A97B+gTYi#TkA1sJp-s82nrjB
zd!{_)U<i2p@&A7=c5r)_fot0*kh@zS*)cM_2CXl#F_`#tA~?-8K4p2(`v??gp!5bB
zCqR!Y7@sq@_Yo+LK=A`gcMe8s;I!r-F!$*cBzJ+rhF4+1Lx@|Zg53i03ur7Jl%C{3
z{Rz-KHt6hOh6Rr&g3?vP-WQ;B3res1|AYF_p!*EK>$|x?ZUu#lgF)j{P@Qq^|NmE@
zH5Z^Ta!_al@1FyO6R3;?*#inM&|D-FXm63g0?^tZs9UBy1%(G_4I3zYK;!8J;BbM=
zFD?Y9^VUaSLFdINEO_kp|NrZZPyb(o&N2msOZt6Z@c0p^zs&+_Uw`bM09qFT+9P4b
z!0-yR=K|Ch0*&W`_FIA0t1x9Oc&L`K;GvQSXg;>>fdE7B;~C&S^Mc3eAb+>+eIWpv
z>thI>3_hO+be=AQ@Z&8E3{pw?y^lci$DE7|uPp?og3|^l4+t2EfX<8%VKQtJ2kq5l
zVF-E*(hE{+A<+61w9g4tu7lPHg2Lo6=<X_w1rIF_OnnME3k8(c7#$Wo7BLihzzAx;
zF|<BlF_<F)8e?NIXb=@(2n3y>AjQNb^vL2sE9({T9Lj>npmYtg|HA+OuUG|wAA$ND
zpmR}K8G?mRf$Ydw@DRiY`?q4jLji*Y%nAkzgxM9^9)R|*9{m3wG-d$0b3&ML!2)J}
zhHy|jcQT{Ff@Wq0sfRnk?VI4oYz+$pGePT}L1znr?`vTMw}UtS|1Sm7!^ObR#Q;wG
zkb8$16%IdU1*LO^)~Ai2yIc)G`~?p^3>uzvg4fYSfZDmYKzcxBdI6|i&k*&v7~J0p
zf1C+wr!ho44g~F8JFwuP1;f;*pm{G)TH;|~xYe!*x!01(q4xpk{0Q(GOoK_!LE**2
z5crVEpyfG>LKA3CLkb+84h;`L_ml}TFx(Pg2!G6Ous~73V1coKf%79!djS+TPWru%
zm=&5HbQ}Pi{gBaM%5%_|7Y{?gLq>z9=PUw^VDlJ2@#6s6s}c3sk^$5|3x90k0NMl1
z&;`m%!BGEA`~Uxz6Myd`2!FxjbWj_^0F?KHAFDAiNOctSg6F9d7#LoI(m~sU4G%$m
zV^BY#1!RXp`vcI~4xlwkJO&e=gU%>}xdXKCf)Av|pa;CB3v{QYE!f@#kA46De+5dv
z%nb`BPXGUZmOz8kqY3~2zXG|%2&^XJvA}`!Lo5IPKeZgB78*AOMh#CuZgu_t{}t%&
zKTzJ^VA$})f`Q@nWl%fApapymE66S}usI7J8~y+P3gl-A28P#@z-l1ze8HgMi8uqp
z>rSXV4+F#N2cZ3s22J4mJ3;9HbmvqJsQn<&@W_H;;tLA~-IxFQC%j;IF!zNb_k=f~
zKB^*j1DIBT@)h9x3sCU`V48{X!y6{S4{w+hKfGZw{P2d!@xvRYzz=Vj5<k3QD*W(<
zsqw=brimZkFfIJ>hH2x6H%tdVykWZd;SJNn4{w-0et??s;0=@DgEvfy58f~tK6u0A
z_}~pw;Da|zi4Wc|6+U>w)cD{H)5HgFm=->G!?f|i8>WK~-Y{K!@P_H(gEvecAArqZ
zY~1jNapHzQj0-pXVcfXk56BOUjSK!TPF(PZap8hLj2jn##TXvwzWgt*`x4Z);{n}I
zE71F>7PL3x!Q7`F(EDhysaZ;d8c@0KfX^I*-bXHk%u(olwCC^t*U08@K+mZIoe9J#
zaN#Ma|FnStygr=~bOr)wE{Rj%z*A7a60~Lv)X(QoIPes_{~vUhhzY14+3-|}2Rf#r
zFySfa++z-d15cUI<UnH+p!(zOhySl(>{n1WC_jMqrt>H)c+7O5_W@{455s}pr*nUU
z>L^e<d-79uhD%RD`5%;j89?U+GBiB^wW&el86fkJ%>d~KnFBJT2Wo}~!{nzh^`JHt
z$Ug9TPtaPVh6RtACoFi(v!M6U|9zl44zGg8BeX#0w?WSpoCNBFg7%~sI6vYvIQo=D
zVA2zg2}hr@F|@v5V3_(;!Dqq4{|8teF|aInxB+yx1w-r8Rt5&H1_6;r(hLk-9}HL?
zH82D}2Hk@_fg$)YXfBRlf#nfse2JGK2-Fr7W^`D<tPiqB0921b`{@gMpGN=w4?f2X
z<S$U$3v})o!-C$YS-=0k=772nRDVFi{^-+Np!uSMptCGNZsGx#NgzEe2|bTM`rLp2
zf9=2^@|ee9t|*VeTvld-Gyyh)W(Lqb#yp@oaDfGnLH(x%kb7FBcnlsqWH(@b6m1MT
z8&u@+e?8_$jG9ftpfCry2jnh3Xxn7{|Nr2z4p3Nw*22Nur-u}l8w3_GgZA36;0RC9
zJ=hH3^wauOL1w{29+Ad}Oq_wB^_*NAROUZrbOM*>kC_x$z-1-K{&#;N`^xWw>PSwJ
z$BYdNgnRz~f3<-j7(8cmfFT&PKa=Z+0n4Kc48f1D{{Jt<t^m0&l1aS@yf+B6hw!w4
z^P}5PvudDzISuNg88|=UFgW`3#{d7XHiGWmWMJUh#1Qisbau>UhM31u3=CX<3|Jm*
z0qvJl;9+7{;1L3yi@~VSB*X+7J5+B1j~_CrHwkY9)f=FCmtleMmjC~ycpQ2kf%bNR
z&i(_9<$%JJ!J+r*-CzH~_g;hK_!U6u60|q1_vxEopf>k{hfDwee|3x@=5aU!1J`ke
zn8ybh7{LAm`PG+!f$IcA%;Osj3|uD}Vjj-~ug8X@>kCM6k)k}G6|}AdUtB1F`kV^P
zk3j7p29X61KNv7SVi0J3%B<G(5ad=+xUm{6c-#vOH$7;$)q?9Ch@I1s>?{L~QQ?Vu
zg)<8tg5v+bg3KcZgVv{6|NnD+5RiG43^f;2@50j6BqVcZC{gAYkUzZs|9{1=zytOx
zv%rGKTpCS}A@wK3A9YCfX;5e%$b3CeS`dKjO#|goP+A7%(Kt{XKLFVo_c#v8&PY)C
zfFtZcZ7*e=1rM1`7CdYK-PdN&`V=&F$MN8*C=<g1W}X9cS+zi8tf28^h6Ru74VWGY
zALw}iI?s#Iz)y(hK<`s_h6YeN2d{JEG`RW{yp9MoRwCg1=o2X345mKi6gUd56F}u3
zX#G9RUXYz2yFqaVvX`HMfeU5_$Ahb2vytuMFgPmu6x8lDnEDjtZgl;iaYT^*#`8T8
zccO(8$i1Mj()jiN^+fQv79@}6f!fXt3m&>b%cNWX{&RgW5O{Rs-+w94no-cW9w^;D
z`~xX7n*Kq`tcyrylz_?(g$0i{gY&*0C`_I%1G6D^bRe<Kp!R9~`~R9>f#J~y28Krh
z3=QBk#Guyn&=fQV@t=W#k%1e0W~R@92~R=w59q8oP@M`2GaiMrPeE&`*%j`9`kN0q
z4)lP})#NzP`;=GV?9;%1|Kaz?^B!36@WXxGmn<869(`CZ{W7U4v%tto!Bag~Auqo~
zAvr%UEi=8eC^bbPIlrhVHMu0GQXwtBNTDPnvsj@ZC$S_gzbIFci_=q~D7COOvnW-;
zGq1$hNC!k2nkgjar6@ROBo--@<SS$(mZd5bXI7;ab8+UUDVXRe7=h&t6_P4TQj0-K
zic0eo3X1XzQj2mbb-<D(8L5>DDfxNoC3;+(0Y&*qiAgz?3YGb#3dxCi3Tc@Y5SJuX
zDx{>QW#(n(r7M(Vq~;=AtHZ?!azs&Ta(-?>W=>{ax}Ji9Q)Q|m7X#F<X_+~x3VDgS
zsay%F#p+y{#R|ox#RZwknfax~Ih6_;x%ow@3MCndc?zm23dtFXMa7y5Ir(|%dR!qz
zl?tWBAUhKkic%Ac^Yapua#9uG1}bFc6_=zYrsyds1m_nORVpf2>1uK@s1{o(xTNN!
zmVk8TmzETimO%8V7V9WvrYU5WD5O?o7MB$3LDYsj2KjmVxmziufHmdkDdeXqAnVge
zEGS4UO3f?Dsnk?ROU%qkP0{0G0NX=QZ*gfsK~ZXPacT+|0|P{lf`USEW?pitLS`P^
zX?gizKc^PKoTi}Qk8nA}oeByHpb%8ZO{`Q%0_g??c}{9cD%2ke3JRVI#ii-#sl_D<
zDfuAZC*~<+=9Q$T7iE@IDwKf4HNdf=pj%R=3G!xU3CJf9cftKqoSzE`<zh&p0;SZX
z)KqZVNe27HiVGCT3JRboD=tV)&P>ZpO;O0tQ%KIw%>|{0oXosb9gr+YZ$VK$M4Lio
zYKa~fC?LT4lk-b+Qu5SG6cTfC@{<!wQWaA3@=Mb*6mnB@^NT7$>Nq_SVPvZSia_Lu
z0f}%ifXxbU^z(F9(A5R|w<s?$2b8ypGmA@7^O7qSQj3c6i>$afRg1YeLqJ(8vsfWf
z!70>TPeCCdCpED+RiP-gAit;tlsHQA6>?J*5=*SOIJ1gV%M*)I96*7lmtT|)auUQo
z=lr~qqWm0PXNCMCh2qTI%$&p`h2+H2^o$Z6g~HOz5>V=cge};8&R{8pM1^2a_h47|
zFp#!jPj{!#V1@FG%$#CSS&$1(DWELG#igL25RhM7oC!+s$%&=Ksl^J3MX8|NQe2{t
zlbM|gDkw6Gic2)DKx#D%H5I@f1Eq=5lGGxFjKpGv(!8S7oJ?@0fdnbY*5t(Gj8uh;
z#G;h)#G+J?W(5TW1&u_7;?kmmqD)YJ%c%rMWIi~?lX6mXtrbd&DisnHQZm!hQb9RE
zAvZBOBQq~mPZMN-hLNU%qe4<?x<Y0isC)qFF38MDEm9~gPEAoL$yZ1&N(IF)xL8ZA
zNKGy+0l5mK7i@WH9>h!F{0S<3QZm5_1LPY}@c{~dBT%taRGgZV2DQ`}WNA@qVh+q^
zh$>xO1y6;H`~py+0xE1WK&eb2FSRVS2$XF~GEx<i6N^*zK$eGOq=KASq+YC$o0wOc
zn4_Z*oSIycnV+X%qGzlF4n%PIl$n>74@%#la0aDs4I@pk0U$#>(?Bi*mujiWC6EFW
zoW7s|0(O=TDCj{kSejQ{T9m4gn3P{yqM%_24!`^&1q~xj9fh>i)EtGhqSRDSkYP!X
z3h3z(>;@zkgR(TpgQdl(2tO&Lq!uR^WhQ~@fDBN%k(RHJ2=aDXX%5K!AZJ1?D~1FX
zs4CG@Q1DCxM<yg>6hK}oOU%pxMI0z7D)UQ=K-!Bdi%U{-brcF9`3Rg)@=`zrb_ysr
zC8ef;3i#YaaOI$on+h=)9Lb=12V?}uK4h!%L0Jh@FeIfaB;}W6q=G8Ql6;t%Itn1u
zz?n3!vOKX8QlvohCBb}_0<Nk+WikahEft)^L58HJD5NBoB!YqmRE3uol%%FW>Q->P
zs~0Pj7MFsGqm0z#>|&5_K`9<mi-4jzCA9>WYV;HoKvf=CAE<;bQ^>812i10ZNmWMR
zs0L-U0nFy$90y7+^vvca1Ch;*G{May4P)wLb0c^*Hy+LAsnD_(R3auPl9tW6JWD`1
ztpHXvmSiM?N?ere2+A=U#hQ?|OA;uzgQSa!z*$p|D-zncEiDGs5UG%imR|ra^h@#~
ztt3RFDL+l2xHLHf+<+|B<HFFL0M4zT=5JYQkvgb#onDlf3(DAuB_*l31tlORRGJH1
zP^1;*=PH!ur6lGirl+PT6hrEpVo=cyFF@edf!d5<8*~&B6_RrDle2Y;^NT=j3$PM+
zDU@HNr=Sp)T2u_Gx>Sq7g$1aran3KOEXqvJC{fUG)>JUGv^3K-GB7Y#NUBuuD$U7E
z%u@&kw{YMZz@<w;Q9jrgnZ=OWs5n2Z1k_lt23K^To<UJ+N@j6MQD#zUNh+w6Ps~fv
z&o5HQ%}>cps{~n`SpxE7DyS!us!)<zlv}J&oLT~ER>Rr|KAz65e!;F_f9NQbXJjU4
zfTA`tFFB_)B{c<X2&6Ru4gg(4Jp(;ch2s3uqU2Nsxb2zwc{tq;SCpCpvlQAcNCY?Z
z$}@9vKuv<u;?%U#937C2Nu?zU;hrHL{-GfXj((8};f_H;j(#DL)(YjBB^jV9JGCqo
z;;PKtf*eq*w>+_^C^4_3QXxMLWP-12kh6!QUx=fVr;leyBq)))d4~A81_vv+`3EUD
zDg-zNg?KuL`ZxwD1cU|!_y@a!`Y)h5KLgwvLk<^kUl7~?Nl7h9%*=sCECZx(MQWM=
zIj^)hF+J5vLA6*RIxQzLy%=1~Avz+(pnyuut5nD@N=Yq>1-C<WGZb`nGg5O3Kou7h
z7ZhdYfihlZu|jTYG004i;kqdby1Iz^6|6Qb9~@txYzS%I=I4QxRw?M}f|_@rIuxu>
z0p!_aP*#PugP{tu6?Ap8Q&W*`2Xi&R-Bw7aEmae#GgS;WKTSbb7h*TmbOnX{vecsT
zqD)Xf1JwTmb&!yH6A*1B3c9-BjuKoKq(p!@H8lmCV8PuCaJLF<S+atzZgEKpD1E^6
zK}{~nS12w?%u7iuN&zK)u<AkuUERXc%+wN?S_K7IH&G!kKQFl`vm`S)F$dCXfrT%`
zd1VT^x@D<FN%_U8FwIG+3NR6kL<OU~6b0Qfh4jp_)M5ot$^q9rx;_fJx;dH2sd)%}
zDVfCuIf<1Du*?lI1zdcnDL_?%9UBI*5iA3>l1QD!pg_q@%*lajQ&0dkIu&wKi$RG7
z)WcKINGwsv%`YxdFfuhT$c8x8P(e>mLDv$YNda7PfD1qH_y(v%H8e2D2C1_&Fvtcw
zQ#UQK7%4nKx)XCU6N^EKN<r5Uq9zH{0|rUKF_IcfaANmNQ^?FK%g;_tQAjLSfRyg)
zI-t>y#L}D+g+xf_AQL>C0!tI%0tjxT0z_kJ9%!gXT}J`CUPLazs=F#Vu>_a32(6%y
zfFwITnB(*EA?Xt|-~#C~f|5d>jsmz4h1VCU#h`)-VNxnMd4a1Ycyfi53TO$qptM9!
zK>=2WCg<lSW#)m4t>O$&_ZeKK=qMEDD<tTaDd?K0E99mo<`sh*_r-~zZgsJOZkY+l
za$S=$9R;;yNaMXIi2>4n_tf_XNrD^wkPM)skOb{J<b&;ocZ(rILJDd5IXU^|purr_
zxoUa&kmfinZXiQ7460^&#%WfDItpNhLQ-Z)u|8;6Oh-Z0RL>|)RaK!lu?*C3R|S=T
zI-v3qWE;4@4>QWDG%vNHAT_xpH3i}_1_lPWoI+A!3aI)^Ee7k+C@x9K%+q85(fOq%
znxJ|d)QShuprI3IaJwhJAQdz~10Mwf$$%<v$aoCW(1&WVLSjx)YGO(yxJ#-E8beD<
z%d7woFo1NSss(k`6jCxl<B9o2l^{h})quuk5*70Di*gflz^MkL5@I*f;1eh;V3xzj
z&5EI8S*Z4c#vD{r6d;k8lbM$d_6*o=g>q15PXSW=!a@z!cPasONI{K+%)G=Lup>Zv
z-13VQK-G?pLP=#osugJP3tADWgVmHLLEH)nOXvs#wAcl;0Tn=ofL(wdPsK&azWFJs
zp!5P(#J~V5@~x7pf>IMx+*3<J^FZSkptu5+8=y0IAx2q&m<-@n9HND&;T+_w2}uy3
z$`d5Z#Q?THH7^A;1_MhpIh9-t;8c>Bo|&wWSDKrYTBM)>Rtbs;hzC+YO*3#_)dVG^
zk|Jo@PfsjLN=#2xNK69_?zsB9DP*SS<rjg56~S)Dk~Tr&X;!ESQzI`wFI5vc+>p{B
z#FOB#1u;FLaRy3vh=K#!-31pFiQtwUEYd)FAaQ|YCfIwb#a7UGKynj267sXT7!V~9
zW-Nfm&s@NLZ1`9vctB5~JR>zv0ihM#pNEzs&iRm51gyTshzn~j&VtmUjKqRsQ2RBr
z7(Ap6?jqPLC}_b787<J5Lvel{aw!9L56H8`L=I@r6uj+&S%Q@2!SVuXMCs+1mVnY9
z$QnqPrk8^1&HSRwbWnJM2h_oJn<}W9g$|Ref(svXGhqRplAo6fN>iZ3mI$p6K+yw=
zaF9KqqOTY{ErBk}z~B_+8DPW!p+WA_)n#A+*KiCB455Beo}e=otBjHpL5_|xa&`=1
zU|;~%VIZ|p5H5JU+$k|d0aQnTGP61t0|Ttt1X73GbcFC>VFOYJZp$%18fPFrs0|3B
zi$N_6255td0o*zQwN)5Ea?o}Rn4MZtke`>DSCW|sx&v5Ow<xtBwIs77vn*8?)GUCO
zXOJ)`N=+%vOG(Tt0cGeiNUy3`!9dSa&lKEVPE5)#0|zAoiaDSr2-q$NLl<f=*iE1o
z8(0ohqCxVXZZg;~-4f7T3n)^Oz=M&X@zV5E(4dzd7lU3>6@y+$QWYrdK{O~_^hy$o
zKs2~Rq@!SHpzD&F4DQx3FqAVeFeHJ>wQ7S3RRfC(9R&zo3tHR<YN9}E>=Xs(Am?H$
zh2j!W8KPhdRi*>Z=cS+;4kpCFz{LeFkMwgglfVosaN`#|#tzAb(4tH=MUM;IeFRrO
z&|xC54!BlO#j3}Jd&C`cfD<|jnF*STC@4tHOHJVd=X%iiVR>p1D8xYRc<_`3tlJ9d
zOM=JDVQvPs$r8Ch=?R<&bif^1=xAqRPBCa`5j^}49-sy}9W)Y<k*bhbT9T1pq*1KN
zl@A&WO)P=+@DURSxry1S3W<3NscC7T77%!t62&ZQu9D1L(0Dy);5ackxwHs06b`Zk
zGU{5a0P0hglqTlnR4U}8CV~=xLPlnKMrsjPVQFFxXzm8qNCyoOW+dii7wajYcHlwj
zK*1$7ITc*1fcp60h835VmX?B}0(g!lF$a{nVMEWL3Jfz24MBqgT3T9MT&@)bsYRKo
zpm{3joD!%Nmsp~Z2udTlpt&B<v;=6_B2zC_PXVM8G`WX$&H>UQfXz98J&_95p^#Wy
zoLU4Ld*R9|EiO^WNCZVPq;*}CUtFx43>r2CHy?{qi%WA#z~dwtrRk~A3KYcWf=+IL
zDym|Aa1)~#G6Y+k4{EU&D`=GFf&817l9~dV!%GCs{uGyhx}IF18VTeH&~P?%;z<EA
zq^-xrg_utRjjBUhnwfd&R^aInP-+4h0ZM;hY0ykXVtQg`o(>mufT~g<H$N}4B)<rx
z2An)Wg?J{Y(gJno!Gj85&*_$xfy+fbE-o$DxH}|sB`4-V%Z8%Vf};GC(qvFG6*}Gm
z3$DZx#MBIzf<i%lW?l)XAq$EsSg#wB=0TH(;NkW}kbT*e=w5~lK_^0mAzfjx!xM8s
z1NV?YHBjqF!8bJ*6m}M7TnY*r<>lpixiA5}<osMsJp~0v&<H`Q0x0!^LKqY=pm4|p
z58;8QIW*h@d{V$etZ>u7-EDXWF&8xUmJ6Cd0OiB{()654$Xqcvx|}@ygNwobEl(}d
z&Cdhtg~U9_pJ|zSDd73q(jxHO2Xv?qq)Q<sKeZS<>y0J6L1RLo>LC#{NmU7&8H9&>
z34HPplz%fpLmA)_4q_>&#Z;P;0_sUuDuA61n$`mK(lSyLi=cBpnV=37qzL3vP{>Iw
z0Zn9N=jE4!&CpTEOi2Zm1Uldz2{^YEfX0@<$plnggJu~)lXM^fkl%~)K{Ip;y1L-h
z1R8>Xlz*NI@bN9kym?7JsB4>AT#}g%Du6&!zo6y-gTFTeL$GULsH>l|YrJbvkbe*Z
zLx5wDqc4=>>k4BrFt|8|I6{Sy*zvxO?w-z|I?2-?CJSm8xJCrHI)}Kr#Jl>tF);Xt
zhB$?~xy8GM`hd2gFgW}Bxp}%H)Z5$JgN%UVHx5h;9~_t%7#x`xcpRA+BpjI-R2-QY
zEF75_TpXDgLL8YGQXH8WN^oFMbq5(WP))H?NG?i7t>%(4^HRapAd)a>`GkV4f+~2j
z9;6>U!=0H28F~dzXhRy{z9DW3Y6^zBMheOKDVcfcASrDlh2qLwaJDNgPUT{N=+Df{
z1hqL7(u?v-3lvmSbQGdhQ$Rx(swuIM2}acvh&~Nf6FtK;RaH>KAELJ)vA9?P<an^V
zGC^z|h4i8V&^QXDa}NqE)f5G&U7#Lqv6Vt@VnG2Yqk$}AU|=Xt%}Grz$uELv2la(g
zQWbJi^U_N)U_uPZ`6;O&4k$r@>`ntWGLah#@K6GEi5Nfx$Rkz?8Kr4y+PNiZ3JgUh
z+C@1j3{bZyC?u68XQ!4Zz{acf^z>k10vZ!3D9KPzHA?~aXBikkEKto+oS#z$8Wb-9
zm6*i{^`H^-yyB9g(q!=1HzZoYCL-+1P0Y*#+ok{w^UUH@1vE8<AlE2F8&s%5nno3|
z3JRe0FR7rl3JQ?9TTtwS!T^L-Qy_(DYEdyLiowQ%%3n~Nfl6jj{|lrJoKDK~i?YG0
zz|PZAC`v5J%!dpxz{0g8AKcV{wmhw&?e?_9oSdY@<ZQ6<pqNX{NzX6JEXl|P>0@MI
zU|?ZjVBm$`#Zt+@z>vepz~IWlz;J<wfuT^1fgz-rf#Gi?Bf}3~7KWFaJPdnkLAL;b
zQpX6!OblpHfmwkG0?}o#@e>#iu;7C?I4~iq`l}oWc$9-Uh-|_&4g@^LK^%nXXJ8t^
zF%R~-l>&omF$jV(5m*F5fbtWB#lWDEmzkr<ppjRalcUL?&7jMmz+h0pU=YC|ARxfO
z#l@A8<C9fYQW(X+#KOVBz`()4z{tTM&&t5S&(6Wbz{0@Dz|6oP06L0{odM2gWak$U
z6cQH6E2xObFHOlzb4zticTaS54o)s+P|!BeRaW<8;9y{7U<R82jwu!f4kiY626hex
zMn*;!CPpv_%>%Uy@}PrD!KKNdWmF9Q1*zbYB@fh`S13p=%FQe(Nljt!%STLAg2qtc
z1AuUu0?0xv2G6{bROoytw5_X<oS2it03OZLhYq2Eo1bv4DXC?d$*CY?6H`(^tzHJl
zqV&?-)I88?q+-x4Cu9X1gKI@<GH75TH?aibZU%6lAJjI6tV1a%$u9yKo1BrElLG2a
zfjpI3%n+0co!bLVo8}iK7G>sCDwO6W!q%KHI73>(@Wo<~RzE`kC;*B<eSU?M)V$2p
z6tIObS2}^_OckK6hpwSaVQ_)_rU+(hQfYA|gB!@1kU>rc&%Cn4oXix3WN<$OY656b
z6XbaCoG?U;!7m@wDMEy{C#ZLU#D$uZ2n{cWko<hm40xpic$f^-qyx7ZAe|0uvJ9Si
zi3Ol_n?;%6hFgAeNe(E8q26K$Nv(jca71_lRMF%l7Nw_xU0aZt465?eN<a&Dpw9Np
z$w^I5%uy&#P0eNi4See6=YbcM<)lIr1;Q;LZx=H-73F8A<|!0p7Nj!xmFA`vfoG{;
z{sK*JftvX#`JjpzNdcte29qvI%u7#2M0QGQVhT8l63g;4Q&LkPQ2?5~Pyl-&KQA5R
z1CWwp1w>kKE6sz<#DMxnpqbcIP*O}yVQ_(sdV@0uXac?x$s4I<sX3q?BdEcZl%JEC
ztN`&D$O`B@CfEz9#hKtGN0kMs44x^VQKPiX)FOqV)ZF~C)D#BijKsXW)EsCR6xC-w
zAUhO{z}6R6<|Sto<>zHqrKT`IB#ad@5_3Sg6~-+}Elw?A@X5@}#%f$ZQGQ8&a(<3N
zN>L_g1slk}i6teVHGJS4?;Px@0BIM2SCzpt3&eOMm~F7coLZ5b0geEe04Pg<X2p>5
zrYls9LRx7~4k%<2^FV{;=sG}6MtCME&dD!f0B5|k{5)u41T9@oEP>@Uu){%4O-;-N
z844OFM~cvp%v|u|*8)($Gx(R5fZ_qvMNiBvR)A&FVg_HxvO~~90g!>9E?-8fLSAYK
zsO`lNkeHke8YBlvfz}2m=H#TNF!(2BfmT>$g3QUyFG+<2HfXK_yr{Jpv@$R?g~2hU
z3^Wo^oC+<rf{SwVOY>lbm~(z^ZfRa-GN?%hE0FW^6pB;xQW)TI1Sv9oOLIyxGx7@*
zpesO9Qy7BWf+1rtX_?7T<3Xh&G|4f9CFYc-Lee`Z%R=*Z8n}Z34kyqA2!kJJ{tV=`
z(!9*V(o|4ZhIt%ZZXu!&G;9f)X(%p9ECJ;;kgpY>B_e2vbzV9s5hp?_kVJ5;qL8SN
zmztUaYI|oSg3^9YW>QgNQ6+;TSQ^|YMGTQE6r(EA%gIcFtz-dNo(LMhMkr@+gsg=D
znNpGu&T}ADpbVZ1T5Nz~T4ri7tf&XA6jew>vkW@1l~V~%eECHRnc#7B&|+wXTu|_X
zdP1Pesys6#73AZh#N?9HB3u=p0(2xW3A7BjxFoR%ltF__ic&#|4^-Si;|yMMgVt9T
zGX&>@J2;^A^pIqc4+_yd-D0pfgA1suod=PD1wJUdfm66IWYq*D(m{nBJQ0-_<%3q)
zR~Dp#(*e{lxHKpMAj&}$VbCIie2Ck@E&$J)K?<VM0??2oC^Mim9uPX<2BjtDf+}8+
zH3(TpNS&{MO%gO=RRAre7+?xv6NZ_2puQ?BJ`;<JGt=|HTNzS|L4(ZDU}5lsWMELX
zPRTFNL*|2eg^9@-pjD@E;gq8Mf&%cKiM%|>@+nYefRv=c(6vh7VG>j|iAniIB@E8_
za7|zxVE3n{g4-lXrJ(iA3dP|15)sNFMTvREpa4`z%}W6fu7O+%^J6l^z|<55?CL;4
ziBJP=#efP9=wx0Ars>5Qr6u5ifTy^kRPe&<<kVs-*mOa00cd^$**~C>wiHlxge+K;
zng$xLWAFg2v&bw~0GsQVuTYc^TDt|>IFesng4C#lc`FmV`a2!m)<bS`mV>e`ct|j{
zxR@chBrzvd!OtxiJb|o`k(if~lgbbb?x}-nBv7GJtdN|Onh4rF0&OcrxcYfUfTyrh
zAZZlT2m)0K5Q*Z{+{A*6e9)jBA`ZZ<Dp0!sSxZnVxM%|{8i16&E}6yI3WcTlC5Z~D
z70KWN4P<U^YD#8lu0mRVX<iCLI5>krg}^1NeoAVYKBy1CkeQdp;OXbake8Up;OFSa
zpvRyC>nboXz|a1Tgq#7~aTrXuT%Yd9(D1;#^01?`cpmH4tve>Wef??wlG)$F*GSgj
zr$>2Hl+FI)`n&$3r5o898#ny#=LZ?OQ60fvvWc;A!-n<Xu8F-Gh#lVoQWG=zfBl*N
z|LYSb|F6IB|9`#6=Ku8@Hf(4}fYNKw=oOp)*E6&*G@Jm5ujgvmu^plwE4`kjfn^s+
zenmsauK)FGR5vx)?EYV0^8bH*$sUmShK3Fhy^^8f&Yu7Es|7YSRP2R_PXN&?85+Lq
z{a+sda^GQy_>sd<`=Rt1FwN4yaRemJ(qM4pfBlB_EDcLeLHHm)b~G|Dcr=1osQAZY
zCWeeqCI%Z8X0Sv@2or+?3p0a@C^Li0V@8IAM@$TVKqnc1?#O$@#IQ$#nL*_-6T^$=
z;9vyn`SP5RA><Jg_;d{y7G?&CM@$R{B$ydCEM{adc!cO8hnO%ibXYMl^jI-5OtE5O
z=+J@SIaW*zAPh2WyX--hJnJUTn`+Lycgk3Vv$KziZ}M%EVhwPY+wqn|jsL?*rEAx^
z^b=2eYp2ZSF}>V&){tvKpUvLA{uTwd1$~YmyWk=BV6yAVzd?>`){4eUZ@3bDXxj9!
z((bUJ6K0ZG_1ZV`mhsL`78Hm|7jclSTpW9+wyJu5!P&I9k_X$AXN0eQG^ek3;Y7;`
z2~%wjsCReYebyiJduh|tXDMwF(c1goyS>_FmauYrV{OLf7G3?d#s=?Jz7kuzB$hj8
z!Gv6+E9wQGFZ>JJaM#nj@TQNn+40|O-w!J(Y&kd8w)B)ngVm?`bANwx+r8uW$7PlO
zzkIWM==}Qs(^+TtywJT+`=-30&E!C?yMd%Pi|x9wqn4}Ln$%^aot2N;GUyd49Mn2L
zw@;{|!C!3QG9GEM-Dl;6Uw1Js`R2`9dx3-F)Y+3f?5n3&Y}gi7lQ}`O@Lung(%W|@
zXXhLU%HR4-Fp25+g|z){^W!+8<DxFs%7&*U+zC!LnC*K-H_DTjThe8h*bRs2$Cj>9
zxSg`%=U?@ueh;24^xm*=|DUx9yH&fDw@sS%Xp_G7+O8R9Iem@-`pw^X-?e{^T{+Xm
zA!F{`H0=pm)vu;Jm)-IpfT8qBr<&PIJL~Unt+O|L?kOw$9vWcu>yhv0fAJso9DDJ$
z_K@LeyYp?={-17c+i}%ocICyld#&z7E%<%o-2<M?$iHWE8*cX{m>=^`F`C9v)!Kcs
zE@o|4@#_uV<zc)m{tpF?dRv&ax%F$iJ9Skv#Mq`CjCkVE6dD}s95~NfR#j8&j^YP~
z`8w{haT-p(l4f56ZW!s5&9<MN9c8U{O_X`!=_~9WZ>Mwp{}9IaYk{DE@7@a{Q)W+=
zRBj8B<qOmQxYPUH*M!`)Kdu+#{JEr{{V3J;)w4a)D_?W7WxU_ETm3rYvS*iXG%UTB
zKR4x8)>-8vcP~6T!18V3+0CyLPS*9>?L9f+|4xBzd$ufJUAtk?Z>x2p&wj5ub705v
z>bsSTk0qGRF0B1Ne?|0`N%C%`)1<_VI@WT3?kUmT(0JIOuyy8yu2{WZ@5t|~IYJz^
zoeXe&*5~)>x4)P6T^{#22hKVx);3j7OK`6DcVj5}5q+@iFLzspmzaCbWCNB&72Tt$
zFTH0A#)U<RwiifB806lNF}0n~)T9u{7R@Hh{YLr@f8eso=FfHq8QaelwCiZNVAXqJ
zx{B4=FonmjMRh~IUD2#mTY2=Hb;dz)S?x0m7+#%N8nE`7kZ;bV)7kp>Ys%i;K6rZJ
z<FacB&)0uYekJkt(L33_OFyhykn*LtP5tMQ+0XuR{@u~J??Gj6`Z2493%7r_T<zX7
zD`{Hoyxkk@CiATQKYgRXhV^W`g{$vt8!gK)`@ASOZOfip)ulU_W6id1arnM5n~8zp
z0uuv6Jp%&+=n%@q%nS?$%nS^=%nS@K85kJMm>3woGcYjRWM*Kv!o<LEmVtrc7$XBi
zJTvI<90mr^<y)T^7#OxPGca6ZU|_h*#J~{E%)sE!$iQ%fiGd-PiGjh6iGjhBfq|iq
ziGkr369dByMh1q(j0_B07#SGE7#SEoFfuSCGczz;VqjqCXJlYl!NkDufRTa0n1O*I
zkC}ntA|nHXHZudmN(KgoRAvT-#Y_wg$xI9kJ3%xv1A`$G14A4$1H*bI28Q2^3=GnY
z3=EGL85lrCuR6#rOb~bFGchnsV_;x-$H2f~&A`A=&B(y82INL&28Kc=i22P-3=EkJ
z3=FFn7#QN27(jzp3`>|97_KuhFx+8eVAu*$$H>62j)8%p9qO+t28e$_m)z`PWMBwo
zW?<OP#K7>Afq`K!BLf3769YppGXsMn69dD3CI*J-%nS@!%nS^-7#SFfm>C$pFfuR%
zF)=WtFflMRGBGeHGBYsTVPIfb#K6E{%*?=WgPDQBmx+OakqLCMB?E&zGXujy(A~XE
z3=I3285l%C{$pTZn83)u&;$+32qp#wK4u1nIz|SD5GDqOd5jDUt3l)KObiU=j0_B`
zm>3wIGBPmqGcz!VFhbT=XfiP{EC#K!U<4mr#ITf^fnf#6Ka3DN(wG?-Ko`w{;_x;j
z1H&!`1_pLUNH|C`F)*xSVqgH-`+$Lg;VL8KE>b3Dh=2DnFff!dGBBtyGBB7iGcaf{
zGccTEU|`t6z`(GcnSnu?nSr5!k%6I}k%8eXBLl+}Mh1p&ObiU}%nS_W%nS^tnHU&A
z6LDEg5ci&8U|^WW%)pSz%)r3O%)k)C#K2&{#K5o}biylWJr5HD!zCsL27gfNhM9pO
zfq{WxCL;sGNhSt{HOveQJxmM?%a|D$PBAku>}O<Puw!IkNMwYh-33ex3<V4f41&xI
z46RI%w64s|z!1mCz|hUWzz_=!qhtmK1{083%nS^PObiU5>U<Uh1A`FA?@SQCf$T40
zVqhp^Vqka%N(YdOkQjb3F))DABPgv0GB7aAXJ%jksS{;pU;wRYna#++zzMoMj+uc$
zhmnE7l$n9SkAZ<9oRNWHJp%(n0|NuYFK9YtV`gAD!_2?{x&-1mGXq0CG@XFdConQF
z)G;tHL^3ll>|thLNMmGR0OffXCI*HYP@ZRkq`ke+^fwpk_cjIwhHXp?4B3nf3=fzY
z7&Ms~7@jjRFsxu;U^vIjz_0-nFN_QfZ<rwWNQ2`2H4_6v6B7f&HU>z31o<n1k%2)K
zl%7FphlzpVKPb&HF)-+X{KE*zBcS}z$jrd7o0)-O1``9rRb~c;P9_G1La1G*85tOA
znHd<KFfcG|1kDeD+{47cz{AMEFprsm;R6E$LmISv0jUL*8=$oKiHU(hjhTVr2NMIs
zTSf+k$&3sP^BF;hv_i^?JxmM?o0u6G<}ooaOkiSQNMd4O05zRD7$JH<`3#iydO>N4
znSsHPk%0j;ZJWsiiK}m*uw`aoSkA=2@EMerp=DP-GXujR1_lNj(7l~Zka82`P74MG
z22i>M*?SmN4lpn<oMdERILOGrAj{0aaF~ICL7bU^L63=nVI$OBO-4vr6%IO|oEegS
zr!z4y%z>6gVT=q6aZC&hp!fo<|FUL+%%PQo>}7zIQ=l@<fRTa0lM#}B5<%jO3=Hp?
z7#Kb>f)Ds+xX#SLPzKGLpi`rJKw-}SDYrp+{0cJz!vm1n%nS_oK;<7J1A`%`908r_
z2@(gD=S&O?wxC;qK<Sj3fng^z1H%#~28M483=D;gkh})U|L>R>7(nH+H8Z3<7Gq{$
zP+(+Wn9a<<pu)_+P{qi=a2*tW%nS?xObiT?p!Cngz@W{<z;FzdUP0-fnSsHcnSnu>
ziGhKYk%57SiGkr9D6KI<>I+cZfWmt!6D03kU}j*r&&<Fui3w7NbTUKAmzPWo3<p7t
zU}gpeH6{jz1SSS>xd(EC9Mm0`nHd-)m>C!jGBYsPg6^yaxrv#9p#@Z*F+<W-7O1Xb
zWMBZ93lcA3WMD7{r5i>DhE0r+as*VrwSvk(P~0;!Ftjr;Fz_%lFt9Q+FjO-!Fo5Jh
z=>l{XJ*X@ImF-Iz7#MyqGBC^l<v9k3TR~+QC_i&DGBBKGU|;~Pp_>DW0|tma_n>9T
zQ3eKve~b(asf>_(AH>YS5XB5hA1gq00}}(o5mzQK1_c2OBYGJy5eSVe4(ef~JYr&4
z@`#Dy$s;BP7#l=`;u5Um2@?au7bXS<5RHUEdO-TYYM=zN*`Uk9z<iKiP@xK<kub<U
zy!x3Kz*A39qp?!>^doBky8~GO$|gqqoI9ujb9S~;&~Wz))l@LnGuAUwFfuSOHZ(9W
zRnTxrP0CCJ4MwCErGobuYcepnBb1xy8S9x0LlGi^!BLNafgv$9F)5RQ5j5Y=>KNo}
zXb|G!>&d{z!okSND8wSdD9R|#EWs$rD8<B}SDaB?QdE+d#GnUSBEg_nl3G#1pa(kG
zgF&w-A2ig=pywFmtCv~<Rs>;Yrc^NKrDnvZ6(#1TLUhK1_PkX>bi&wK$wdr$>G>rL
zdJuDxii;UQE5Se$GZ0e~OQ1UjLAwW_34{Q}%>X)!g@J*Mfq`L50|Ubr1_lNJBt4*Y
z5g@K0lDZ2G3=9_-7#J!*l^948Nsl;^Iu8XV29E`dSk04#ssp9}2n8mFhy{$03LI)4
z2b5MtRu{s=5OIZ(!2l`;qG0X=i7_%T6f`j~Fo4D}I<7D>fZBf`^O4no+S{N!0}=;~
zePmo^1h4%7sR3b_d9Dl$415d>pxI}JoU2R>IXKjT+7_U}CeR2<!Br-P0vzf<Z8ea+
zAax~InHWlNr~|DnhN-K#%EVA{l@Z(q1i1}_LGA<LbZEGM%zJT_iQ&anMura10v3=W
zQ2QE6=Yq~8hWex6F%v_<V@8G$Q>Y|V4#Wd3cm~-EVuLV9of(n<j9Cpa3)CzHDPvgn
ggpolX%z_Xwbs!q#Hi#$#!__B@;5I9a50VG50X}%-Z~y=R

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/cpio b/pkgs/stdenv/linux/bootstrap/armv5tel/cpio
deleted file mode 100755
index 3d69f9e5bd86c54a7286d3004b2f766a8271c722..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20280
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
LhyleQc@Pr-oI$Z*

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2 b/pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2
deleted file mode 100755
index 1f2985bd347b0967278c5ca3046a0115c8c79c91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151568
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%0AF(Y@Q?4(TR
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%0A9HQO4yf;v(zeJh>0C~>1y
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
R$^X-P(p9if@lvC65&-ThTpIuY

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
index e8f04497bd9..6d18b3bd8cb 100644
--- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
@@ -1,35 +1,11 @@
-let fetch = { file, sha256 }:
-    let
-      nixFetchurl = import <nix/fetchurl.nix>;
-      args = {
-        url = "file://${builtins.toString ./.}/${file}";
-        inherit sha256;
-        executable = true;
-      };
-    in if (builtins.functionArgs nixFetchurl) ? executable
-      then nixFetchurl args
-      else derivation {
-        name = file;
-        builder = "/bin/sh";
+let
 
-        system = builtins.currentSystem;
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        args = [ "-c" "echo $message; exit 1" ];
-
-        message = ''
-          Sorry, this version of nix cannot download all of the bootstrap tools.
-          Please download ${args.url}, make it executable, add it to the store
-          with `nix-store --add', and try again.
-        '';
-
-        outputHashAlgo = "sha256";
-
-        outputHash = args.sha256;
-
-        outputHashMode = "recursive";
-
-        preferLocalBuild = true;
-      };
 in {
   sh = fetch {
     file = "sh";
diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/ln b/pkgs/stdenv/linux/bootstrap/armv5tel/ln
deleted file mode 100755
index f2c0db16401088c1f466617b6c1cf33ed358f716..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13728
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
OnlLa}!Z=Vjfw%zw;k@kt

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/mkdir b/pkgs/stdenv/linux/bootstrap/armv5tel/mkdir
deleted file mode 100755
index c551673d32a52559d3075c7ab9e384c81cff1716..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15484
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
BMacjF

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/sh b/pkgs/stdenv/linux/bootstrap/armv5tel/sh
deleted file mode 100755
index 74d82aa94f202bf2c6b5cafebd1d70c9af8b9428..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82672
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

diff --git a/pkgs/stdenv/linux/bootstrap/i686/bzip2 b/pkgs/stdenv/linux/bootstrap/i686/bzip2
deleted file mode 100755
index 6cd5273c3336f1fca1f4ab1554f5ae08cbfca490..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73856
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
P{6UtHAs)nlVwgGr8UAEz

diff --git a/pkgs/stdenv/linux/bootstrap/i686/cpio b/pkgs/stdenv/linux/bootstrap/i686/cpio
deleted file mode 100755
index 387b67664f6c67a51ec8f93925acdaaf515f5210..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13524
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

diff --git a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2
deleted file mode 100755
index a6dd7502b5a34a17910afb78e3b01e71c924a044..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 122036
zcmZ>Y%CIzaj8qGbT)c+2f>Fr+KSA(tM+$G|_t_<t@2hw7?JD?vhw1g@hVbZ`-HlJf
z?takf-*-B%IG3yPeR0D3iqb7V*zc{^+Pn4Y?tN!(hhB|b9LaAJojWy9D@SUzk#6q!
z>hm)4)o1T>{ha-Nb-BmQyJ0oIC)U3Ey}j}k1H-zT4h#VdOS#|ue$?Ec!YaZX`L?yH
z>ec3|R}PG>%hzpRlfA0b>{RLd(gR;N-F<s~iPSRw;_zMN{Ly>v<QjZB9iF&%lhWMk
zO*zM2eBV=^SAMM5`%>F4zt=^djr6W>-ELmO%v$rVrub3C`5n7$ZlB+``rX?V_oH`~
z_ir!XzUIj9?qpxr)t;Nng%_~BpKSQ`()-<)=8NBZ^SgNCyV9q6pP%Q~PEQYWj=El3
z`u5d#n|s^7-M*%u$9&!2WqHcmrB>OFD;gIVoqBus)!y8j-cN$2ieFl97hXC)@8>7|
zxgYYk?|obQ_50%Mcl#$kU-tb3v$eClvUc9h^P5xOm&;`zy`8e{*7xA5?<SplQ_qBk
z&3=3D``zl}>&w%3p0C}#cir#Fx390;`}KVO-n}2vcAfkBeebt#=i_V6^M<voI1^uc
zt=wSJ^y+)H`N@wXujNm-=xF^`%ku7?rtMnUoU-!u<vWru?<}{<JKgs_*W-Ntst3Q{
z<o$m4Hr~3qseQfeck8*65AU-3_3rzT1Nq7G&b=?3AN%?6wfWHnzbkFe_?1WB=?IFu
zdC~S<!?urHMXTOdKXi<bme1=wH1p=&O}4j}-kW*$>$l&vcXrpl_P+QcT7TcKRr_jp
z1%Btx?Z}+{y7Kt3mUVNhZz|tN3JtW~DzH>DFTv{hzI%Hot!k1lEx%(}9Wd#;`}XVQ
zRiDCdd#!rA>E5?@Id{HZ4%EE&gRi{$?P*`9<@cFi_3z!9Uu*Y!XYIM#^6HYp)h}-D
z-SKT}<%{*(bFWA)%R78;n$EA<FO`g%vfuRQJ1{UXRL^~Cwtk(g%IkM|w@)O$&+lLQ
zyk_0|ns<dutjo83`I_x_>)`#`*KcOuoflEQ`Na>r8~0W()4h2jBYMdsYxVopb3d4!
z&9{3#A!y&v9o2VU=&ahd!R33N>Grkmes3;3x*YR1w(Z)zd*!9G_~Ujm+%mjWynEg2
z(pgvM{eE%x``OL6%~$VQ`F?Y(bVhHq$=jVJ={jGkXFT=yuiSe1)VlBY`lGY6U&QNg
z+;N+4#rxg8+kQQ}`|a!9+p$kyGXxc{cP}aX@HD-)e0L4o=WX%jd%l$y-`bj3cJ1Tc
za=)!{cih%}<@=uBc2~Z7$M0J!@7jKEUT1YKdmZ=to%d@ew_o~w_k~<#)d2=ZrzIDi
zwq!>qy*<(t>KZ1yX4lo5=WaRgs1CgMX-f6e+O^-V?|yZA`@Q#ZQ*CdgZ=Cb?`t|$y
zakp*n{oJQseS5|YW=@x;28Q3SU(fwM`~7;^2~T%@nVFljwD<s{1NS>yzlb<l9<T1a
zEw-PZ@40^O2cz|x=EU0A<(I8x<81HOzK?PJ`sKlu3k?lS3?RVSav>!pBXi-h1`v;d
zfwRGf<HThaUMaR&85s-=nFb6DEK)OB7&sU>E-*06n8m>Ih0)~V!o?0u2}h(@4y9ad
zXj7cHaGB3631tUKHQ!~k)EI=F8ANS6C#5whT>0X_;h?}Ez`&Go;lzm(SH5sIB`9-t
zb}n<ZZS?V#Yj$9qWNWg#slBVp(ARcl=YlI=E@iegd%j%OvuyG$U-cI(RkPY#*=BMy
zF*GnSa2&bpz`(fB&?qHy8Ovp#rpy;6jLVt>Um476$_@Ez>!W<Z<*ccVucW`)<P(=e
z?RnXjcUAeSFJIQO{N<Fto{tv3ak;f%vZs=O!bwA>gl1nUwkD~}Wx@*XD{f`<%wYNG
zGvlh6u#>UpE1SiaDot%VzM533`De{re9G2jw&tULM}}MToQ$fnOfH+6Et{2OD{v%<
zQAvq~iJ`}VK@A*sj7AwJGAFwnIWVs!<<$Jn$-cfTUnFpxO7k`1We)by+;VGHmG6=x
z$Ck~Q@~2I!eyQM=kL;`5{~Y(y+bbLRP*Avj@xK3eb^jmS`sUvMW8Lh&R&T54wVQ5{
zmt8V_+2VD3SX{i9Fe!`n>9U=exOwTuj^LGYOFkR*cc@tKd)qE=o%H!<_q|2GHF!_g
zzdyL=d#aq@-+wKg)yvgF%A3xpX{IfcQu{C6DeoPU6!~tM(r*|4v!1>+TT>GLZ|&a5
zX}|dLhxjg;XWw2G)izXKZu^-X)qDTn-<wT=DT~(K@=D$OI_lT|)3T?#zrPBd5!q6C
z`ht(3RIOC!Z}XtlGd8I&{hm^4F7|AD$YrU6m(=b|_$IQg-p)qSwqxDH<m3L#PUnA|
zOltpoc=ohE=5E>bF0Gack>?*Jm|Sr>skD%Hnc>rmHZvV|POM$KFYcUA&e6!qTQ7f^
zyb?WExcjVj{-f*Hc9dK=-Wl=Pa&~X4>(Snxzk9Fno3`f5J->WB<k5{&d3UFtd?jd9
zDr5b6RotJ~f=|R0Wt7fMxZ!YerRmR_Ge3CM+5EG^GEH8sDzw{YyVPR2l|Xy*j<7oZ
zsnX83^S21eZsJQxRaM<@s{13#YZ+I!gkQo>WqGEkJQ1m;30yNg9vU6cIHVZ-yNU0C
zW_sAnUWP-9n;CL<N;xzHG@0{0P&0CA|6rUSxy#sWV^%_<mXP0*&+o4<6uQ*5HM2AO
z*r97ldOc4r9650{ZvO<s2mQQ`87rBNsqdI~jpg-s=lpMJreAp+ZPz+&_|DZ3usi>l
z_3ERY_Y9^OE^KyYQ=64Od$+yS_bmPeGS)`~Yu83~umvgcy$OlX<acCIciFqm#$j^G
ziCIgI2r*1ly2|+QglW|gD;MpIlbtHRC)za5nw8@#w*Iw&PKxRD=e#`EbnH0%7T7My
zYF_@_qE4+$>7DPtrL(Jk{EFT@Uul7o-`NSblATk}96PGZV6V)~z+-=j;eZ5F%!B;R
z=Sz02Ejyh*=hU;f<Ig#-<m6;29zOqH=3|1}_XQu9M6B<9ZE>bqU70KN>zZkb8$MRQ
z5Uao1@H^&wyZW6U`?~yo*xgr8k5Z1FGdW)NrAAUm^VOJ#jLR;pIN&7_p%*3*ASS27
zu+@C8%lf1<QtQ^NbTF@<)==QzeXpg8EiokI_=~vt2MQiL=Uw4l`EkGO-bmj5tz5f9
zR<5*}@>p&k=f1Na6mB$GznR_oH+;$e;)}{rE%S~VwdF73++Fc&$J2`{%xic3uRi{6
z?d6yI3*Ssh{ZjvTU#3QF(wx8NBgN{)TT?>JqMj^Us`-ZJ>Xu0v7cMGaSM>IFTqyL>
zE&TES?|;?`o&GB<@8mJDfTK1&ZK3YE{nc>~B}|p=!Y#_~-`2XeM6qOcML^SIhlZ7c
z5?fZA+~1*cL43iB9lx{>=ovQk@kd@-`SNGDdCJR`Dw85NxVs;p@qbQHd-cuC{n9JW
z7fL_bzx?FMM43Bxsy0doUI<SM%v#H2dnKaAxKClB&)oliZmr0_VtVoYrnV%$A0{_K
zpB2dO-FNT(-#Vc$x=)Mde!QnHwfM<$kE2FRzFD>E+g3H2E?A<qd42F_(J4pTzf7C1
z`aNse)6n2M-^}(eKmTXN)@S#4=Rfm`zTc*1zoPrh*W*&t?4PgisZILSZ#pyj-x?;Z
z|My~x8kg{!@?ZbE&*^^L<9*X3SEiqRU;1{gRp&;B`87pdx1F|%KRRlCM{ru_rjs7u
z?e5?ITA@?<{rRO}<85y@6s!&WKDWoL#eI4;`-kFrvRT*tID=P5ZQ3XH(cn(%%$+}e
zryYFeHv22@ROa?0|2NvOmgFYh+t!lxU~!sky4ab7X%AFB+E0%(so0trRQc)Q^wdxD
zQn%%Deb>6^(7yG)Moxs6A}hax)2AJ)|JwXF+qxv=#j|od=eGS%{xwz34oS0k9NuMj
zbju=R^DLc*=M0R#zP*?5?9*a4k-Ke=6VB*tz5XWdqsU|C+Pba?9+s>~W}#Ci_NCKr
z%&~b_F7?#e^svk$pXC{e2JRtK)IA*AnvB_mCe3}mXZb#BFV~lMh37HNOAKAb5oCH-
zN>NskzwLR*0>4I<Lw3O@rYL#YC`UB8|DV`;uz%t4?!tIS=4)>6SPunrC^NTyJtJut
z^sQxqf?(MHy*D2S@^!YbbceF6DEF^7X5MaW&r^0+cf+-bK?aH}6T)IQ%}HL^B>MLK
z8q<Pvl9R(->t0&tuTML!l&Ns&a?F~^lGB&uPo8tiJ$rN1MgFsXFBZL-wegKj_P2RG
z&pZ~*tT(=J#rFSdk%s?y)7_40FZwI^&nhhWxU)f5dcKs~|9iJYGX*QoDSW!>v99ml
zn_KpcOU@iVaetM~kBHpzkE%2FnKW+*T6bD`(xmLp(-+o?GJK8<6?Zn-8Z~vd=(@>o
z6?RB_cRe|Ie(tP)W*?RWukGk5nN{;eNS}AlnLX~J(yU@9UVU8f>CN%%={pj>1!TAe
z`wNG!x_;U@Y36@#CExt#eab1p73G4`x>H?BMAj`U^ZHy7db(bk@8uDfx^-G>!#ujH
zKCBac>!-7-`jC)TfyAd<d~^P@Z=2@3HRs}w6WP~F-Mo7)PA+_C;ZpbhSD5Y8Rj~@6
z%6r?og0{Qt4cXS|wMW|5=|ko6h}x4c3cRKNdP^U<zk7w3@7v1V@lQlmPsr*V<viDE
zwKha&KQrsvlaGGbXxM+RSB-m8AG375N#zQ|ZPOO2E`B_<r|<Z^<?CmJZ=39I`0=~S
z3q}>G4IJyAmvU~43YGK`ylB_TZ?uqG<f?#Q_X0nibJ=(JZy(xzechw?wG;kKkGK`P
zCg%3F|DRWW$+&WHLAj&nOQZ0_3<;G#O65y;UC!5=$Q-lQ#7f(6`u#GySIoz_15~C&
z3Ekhd+n2TDgqcS{%lQxQMVNQEC4Q`kdhO(<VCAxVk86hY!hK1%EM{JBxWc#L%IEpH
zQmMS6V&(c`XWV;ltU0G!#W^?lXua+0tzW&01Bxs(dbR4fLLK+oan0RUGWn{&=ff)&
zp3yM5t88C*LDyekpTgfcOLsqz?CU-IY;E7$Yqjq}?=jyvYy0B7-OIPqx^dHrE#?S6
zo0@rV&n}t6J9Qri-VJ719PBvjYKo}jB0-t7z+$`3Bk#7IGu@irlN7F1YiyyCXPano
zWbxIPGuQ5a9kQ&na+(*Tm*~mzLiMV3mppfOotS#0UhTQrw0*OaryX)CE6wMOFn>8;
z_gwLcjt$P8OD(tG?1)|a@IY8a@7ezvI<4PkXEz`EWPfe;nz`Il9z9$kf6gWL<GWp!
zZFB5GW0a=8y0)S+oJU#d7w_LP#W%~8yJze^@?d6OaC*eVq-rnmbL-#hY~bGHru}(U
zweJ7UIkP9Fox5+m$EWquHQjalzO&uD)_&mFy~hcU*H#&PwJEL1+9N#kpKGZYyKu*{
z9ou_OUlN;mS9qeR=i1D!=~puLc<o+!w|L9<Q?s5=l&O&~{3{$;bnU5O(Ty9SZreUf
z8CjS|L|nfvYRUhbe@%huhwaC$R=)_bI+XSL@r?ubU*A}<!0ytjWBiP*R_E?Ky=|Ah
zHk&a@HR|nl_1Li6)-K!ARBPop9!6FjDJe9sk-iyMk+xf}=6dDk!{6<W{@Z?bXK>+6
z5fheTH9fcc?w4ohJig#@TX4-jrrk{*u@C2$Bz7+<<5{9unr~w9b!}~Ky2$2vD%_<%
zPGl|aIXdapr%M|SoN>vknjKf1w$!HZ|FOyafd?nPw_~m8V7lb|weQED`Go>y=lid!
zHI!{%dBWz8I!n}{RGHV?j=tLP%bvBcZ))zbyv1MM-+r*}N2O2b*L!j1{{6XscQ*WR
z(dpBk-nHymoP5GO@rQGtdQJH<n<4(S=~f$~4JQ->lw7tx^6Fr4X)Bm~wQOGf-agA0
zxm<H*FJE#m<7Ogj@7MBmU(FtDF`wWn*~xzMU(Dj;U4=T$Cx5Um^s!oR)OD@P_`!ya
z^Sh3OF21zyefHB6vgK>LZ{K*Pa<Fg0M4ks5zC;%u%V=Ecx9z^rJJI>Z+ng?2Wq+P`
zhkFz2rr=wbk9WQaWv(;4rC>7uq738wV&j|gyOTJj?!RwqnYHZ7GsoT<i$3LOm8uFI
zp_%%L%fC$4<0$MmyfgFg!QETtq-dS%yXt>uuXmSR--=6njJkI>y9#dQd-;5B6~ja3
z>%#i6xwGd6zKfm}Zna9-?2oXznEJDnI9ERHUCuk_vl<B|$ox!>n(}he_D?H3=kk1B
z?;mq-LGz3#o-pkmQPZo+FJ_#d_jtkLz40CE78ZBbw8ix?pDvg<`N->#FU4!V_wE(W
z7ms9e58mk?wr=^G)n`f))s}21n{)E%)1z!Be{K96Q+g%5U<TKRJzswc-duOb{EpqO
zeujPO$6i02d3j;L-&xDOR{BPDYsMK?^y(RjajsdrJXS^a>s#Hfo$Go2UC%WSG?}o%
z<L26{Y;5;eD$PoKD)IQt_NjN*uBv9a^m5X&pVI8BmX)0kJlkZ<aPi~Mj{Q~ZJO1`X
z9q0%)&)->cP0MKC)OV?Swas|MEiHxiubjGb_xAp1o^F+g3U6~|t**cM@-z6)VcE}h
z-&wQ!&lnt4)>S%`ex~qu$(NNGg6zNlz7>sgJ{fzUYYiK>&fCB_<>w!~^$z<LRi|@#
zTiwzq!<gBMAxnO|JJWcwEJxoo>}c<{=~J15SAKb`Cvy3&UuBP!>B@Lv36}mPKE`4#
z6XWLXiv0ZCTs{2Q+y7+`<0>s<uYMOY&2#<X(Gk(^YB*J)_cHs5Yw?>Fn5163eAw)c
zMw&o@?!8dST}isxiYiyPPg`)&l~?Y`m$X&gPZz1KInNg5x7$emP%pEs(>udj$<MdL
z-s^G5Z4s09cg^rkv6a2#Cc?uIpu+1Yr#?sV>#mz?m`=G!G_82&a*@-*r7zpw|52XK
zueSV+>$pBY5}EVsa>Jj~;eXAIayKtHx+mv+V_w;{Pj?>WFFd_m#I0a+yY$j_o}GJ-
z=_yCf2<SK{^5B_p4)40#Y5UWC|6G}4w(VWPj+g7g^{m!~?B1?s@>(KW!}?L=+S2!H
zB5%EY-=0)->;zv>$|;>zuSPKjO_lqN6%RvP7=1iMXZk#;7oPTD)~u_}rm2U237znj
zVR`q!WRg=C`=%pLVtPMU9*-4wjJxcec;W2boc8=jZ*p`d+-&a;VijlI8UE(H;f2^E
z=S`JntP|%-3i<ttOCcuUpHYLW>&)z}GiJ_zeA^^SH%V!g)~ZK&v(;vrWlX#ENOQ8@
z9i3U$nig-@&Xe{!Yua;qrq8x}d@{LLcfH;*FIb!P(w0fR;#QW)sZnhvmuEkD^}Rs$
zUR_;@t<B9h&(iF@Jkv~A#25=11vzKR|6Adsxpbl0@^Am6kFcx|Nc_)Oz22+#mneJY
z<I9Xi1sVyf6pvnArq>?(HodH!XHmDshQ;c^k2^Q_%=)zAn8VCRv$++%h)K)zG|D$y
zvaWR#l6*XGQTv{^>KlZG>OQ{s8C8F{H_q0a|5TM<uaxNtd8xF>|BmM;OG|C{6b-a6
zo%ZIrtxe7?wJgSfHPP1(JFl%+Q6KxTwC-+-v7d^jCtK(`xrhlJO)~EeD0qr2@NHFB
z3~AmWcJ*YV?deT?95yN24H{0$l|F9gD`@y*wuEK=_VY{Pl`cj3Rd@7#7drRKMm5Ok
z;jW_+mL1XELVm&9Ua1^-kkkKm#o=BfUg5&9ImyNB-}r*e3)3DtINE<MJN8S-?@?y(
ziIO+JjD*aOzuIeMv9k3|>0vL9rRyFXVx8bLnP1eeDZ-1*W!2Hv9jQy6PYpBnc~>g4
zNl|U4j@z`W%=cE$4P-T2BVsBRHBq4_>-(wKIwJGi4?88hL`&+-VrAIkl)zcMYtbv^
zOFP^ZMN5}+@#yq*zYF`f;frSfHuHUoOBznsvQ=z1n{qh$;aQ~|Z-)nq8X}@jChG{W
z2pw8l^z<IDh0v1^91^j{1)_Z{ImtC@Z@MkFM!dUmH#OqZ-pdY;L?SvOICM&`O?Uh-
z(`Wi5OY6u^D;3tds*TBxg&oW6_KTQB-Cr1<siVsJc%teTL5`c#6f)H~wrO7zQfNA=
zy0mS*#?v0*B}d9qH^%j;=qe<zF!!o?2e`kV{!OKB-*Hc4o5IlF_xEhQ>;CUk#ip}*
z?t9lxf9;|D|Kj(e5I^=nvD=@VPkfcXc5FhW2#0rHMn%Jx5Z-CN9_|tox-YoIOY`Km
zn0~V?Gu=?3vtIXtM*jSQO-C5MpP#hc<8jf$qzbi=ExX_5uiEX{z4-2P-fagRJKi4L
z9(8c3Y14*=1^quPx)ZFYact20YO(OCVDj#1Ie*@3`-nc*5;OVUdhr?CiI<6f+HOZb
zut_^#Pb)amT>K%W_La3|xAm@&l!kwPZ(7zpwT@Y^^)pX^v8hqOhBbm5mu*+fO30bL
zTjlO0wp&YGg_F+wI?Wufy3Nz3DvqaJq+CbK&$B}*z3#D1`1Vs@6gLUaWXN54Tx0Xh
zDV`lJDen!|oZq-Gj)(hjK3lWX+mu~fXIz<>x-E=bE%jKa>x8cyW-a$_XsX8c)&1*T
zs+lIt*naX5%W0{dX0we?iRDV{TFv)RXVH_*Ek?|fq`W@6-ds6-aog$ZhhO<}Px`oE
z-_P!YhDs8$S;5kA4na2#9y%r~GJA=Z6L)0b*Z9y2DmSeH-c7S9X>w`ka?a>pBoq46
zW4l8{?CKCsmnD8i@;2514t}S;2TXeur*AG65+E*eljY1+Mb%Da!5e00+SOJHWd(Yy
zlV1K%Yx=7zcLMiqd3CilJ|<-0qtBIlers=ayl?1g^W^fwU46FalGXjLEOptK>C?%o
zvOt@INzqtw>Ib*l>9r3tFR%SRQT^U^53a0LPc8*2T2FjAk5i%PNYPX?X%7{lGk1Kh
zZ4MK;?k2G@&|mw=GMn2M-k0yOd3O6fAK%TQj>fBNLYPB#3N~kEudY3@o0D<Yvvd>N
z2ycs!19v^O|I~Sh2yn7Y%ed9(=wxQQwmkE%eB4*_U&7Nb%7<=PZ)QE&VXl<nf(>D;
z%y$$OzOK^lnkdjD@b$x&FY&Sa&cFLEQTJYG-E8eU_xhK&e*HOZ*NbcaQ*C35CGD4H
z_wavi>AqZ=w(h&6je5Oq)9<7ew%Zi%m*0CoRkUH&i&A4bv*MShru@IH9{#_~-b3_1
z@2C2&=Wl#2sor+|$dA1@T3%=6uKgIN+y60a*F|CJd8>`{vyXo~@@q<YddS`S-|nep
ze!UZC{MU@~tt%6~J#9WC&osNeb|33vdBlUYWre3)sISnCof4khUi#TS@KbWK%Hkz|
z{BJE<wAZWEuu^9Ix}zT_PoKDQ?b$FxR(8j(&ib8aul>9K)Ozg__OH>CXLR~L>ihKS
z_5FFrjS9Qk=O2sR-1Yf&VZdcc_K4ocY?CLqZ259|;lrDcq?n``UO&m{D6gEOqa&ho
zukFX>z^aAcf|5Clo`?lq_^0VJv0b6ZWa+&L#+!OhXT00=_-}aZev8<3(oasA%k2Il
zGClZj(=@TI^FIshkvi+(uNWhHJT5r)^%)1hr2VI7tTg+*<No(r_S0L7cJY5Yx+T|a
zhVkRAN3+69k4`Oqsj&X^q2-T)_9h&dG{I3KDW+z#(-Xeu_pZKHmMnPk*oRFxGx%TT
zrezlM=cYAI$w_!=Xm7;jaXaGF^Lge|ZoGNJ{_#*`&E^$```Z()%+8N6%B%jFb~M|J
zA!Z}XGfVCa2PdoDd|GWm>+YW2y6VxhbMGd9opwgoxyJj^r?(&OC&q~tUd#NIyEBz(
zX^3|=@2A==4D*~17{oNC2&uGB7mS$jrK~9Clyl8lZL^f!x1{#>{EROA@acB{*`R9n
zW?rps*DiC><W;-a#Adl=Jeg>zc*L+p@Rr{T8J8J9Igg*XJn4OQQixmOk1gg`tv-MK
z`GvF7;<Q^;?uS4Br!D^X?dz2^CezOoCWwf!C{C3Lak~6uUSPUs{j>eGy{5CYCB-Le
zXg&(GF)CG2Sn-K>*UFZ;FJt_2K3yu_@Z59Pp1%?a((%SBJF}l#&+nKX*z$OKQ*O*#
zXZ0f+tQKxr;84Qy!H0XsMJ10-(=R=n()0Fay7CWw{S{FcZtg3)|Mq#$+m+0#8)nBa
z{Wvw1@yI!i9hbJI#4HSEQV@6{D##*uN#a4Wh4Iff`Z}RgBD0rF`LMTct=MZhJLmsz
z?iJ)(?P~hUUv$xxmp@B+%lfuQU-BpV?%Unwd~?DP7PbQJzLk<Kl_~kY%F!x@7B=>$
z>t|hjxbN5Gl;hUMrA#bMDlJj60{liztn=jF@^Re>{>nAC_uTJ=Hl?c$ziBhm?QL_E
zno||EVHK~}9PXeaM^(ySb7?&d)G+YT^ELG;j83f!I<{@=F{k1w7Zs8%eM3KVSqZJ}
zT@vKCW==ZWCEcHY|D+$QeZlGDuxNJQk#z-)g;|^TD0*x+Si|wsz%J<K+#rGFoC*m&
zEtZLGTz4mPh&6bv__lUJy!AJcIp^j**5@-imQy`<t4-}YZp#zCCmTbKt>*dh+Jv1u
zz@+cwO0l!9->pnn<ODrCdb7JF$JkdpaaSmx)%~t~qcuhbIS0aGH>~2$i<=g0bvC)}
z{{FgRE2Ft7nysr&JzG#Kox5lIX7PtLX)&uBJ(bx7&#$SUmudgczt5zp$z_%9M{YCD
z3zjP~_tl=1j*0Dm{Y^aks!_)2n7Cp#=F&^Sf9^k6EF<{k@`jT;Y6O?5yqahrq9ohe
z>A<`wqil-y=~JI}UXAWZt32Nr=WnRA%4hZw4^J`aLrZ?Bg^Otg%dVTfx!W#jv9ij6
zD6^F_^Lj3>U!?f-R-=Dw+PcfT79TJ3$UTsrvS*Wz-liDUO@CfbS<)(&)Ba1S#OP+8
z=npQ#P4n`Z4qnaF>UI-Je=V@@?WwI>R-7pDx6rHVk~C#{Gu30(S(T{oeOs-!r@bgF
zj@C94{=?0)q<_=Xjhcof%C)C+rfv>SxS$&H<!9sd?a{o~S+_PRacay-m^A6S-;>wQ
zyA2a}B`aL%u+j+?U#obKt)tL8_Jm{D^>vMrs#gwd>1m((swsW#$C=%%nF5uGVRtyD
zPmT&allxeASAz1hw2}?)EW``@?(PZhIkxNk%HAhWwSUP6G%4~t2(>*Zq@}}ea49O1
z<*ZOclZooy`Ap9zCpij+OfC6da{1ENxLvkKV)QR;u9uGZyeHl3YeCQMKSHm14Q3qF
z;F(qCdSi7a^NT#!YkC$3m=gEy-RH8jPREF|VMEuH=j{QfgJ&$*C0ZAq?HHL9WFWI6
z@%xkrv3*>pQ#W{)tqo#PVq|%%(Yu_ltoVbu_Q{%}Ns|;;w43uSo+snG>bZ&I)__Sz
zySCqth!36Vb=9PB@tQYf(%yozp5}ire)cSeOW=#Ef^f(EEa{&df%7+3D+Ju0y|t`!
zI^(6H2V(DYr>p<+-M#9K?CgffEbWXB^Bj}~m#hlwJJD$$u|Y(^pouMC)JSRVoYmP8
z4Y%{lzTI4Qw_K2+S}*f`V~e$Afydnzv96=bR(`&)_*Z+~<E^1Bn$-<Yaz#rl<lnvg
z#Xo2F3I{=jh=5yrr|(~Ip@e&e(y_AV#%I3B$SWPH49JRKsbadtHuIdn$+bT|(>k+v
zBoyrUu_NN|K0VnhS<$i+d5_3M^k|uA=LX$cbSpG$>8iLMy)Boo@9ML%TDipEKgA+<
z4YP#5?GcmjLUO!sz9ls7er)iyGUC*n;wQH!9b6m7YkcHXkml(u+t`$8VT$SklFI})
zS=DH8+Zp~S>h`^(|L>jC63;1Z({`WX{%-WBb(Ve5n#VDJX0D!eIHZTQv*+QWHZ=wQ
z(-+o!3V0s(m3iee?VUj(Tf{dq-|Q=F54+mSU0iq8=xJqRVs=I{hxQ?l_9^FFITrRM
zYWfwI3Z|x=6>49vbHO<|@zwl8-(w}u&H2_<n)21sR95Y-$=CHiCd_^}jWMZY+V0nC
zUdJCkb2AK*xBC0<YRT1f)`r?I7EN=W&bXn|)uVc#nQ#3RS?`_Yj%RLLY+5&M)~#8o
zWv3R-j#Uhf$<ezV<H{5&r^>08w4vKGv1fCD({hc}Bi*q!s;k}fX6=gl9J_Yc;^1Rt
zmbvW{uKet-5?qn5vGt>cf@k`xppu(+JzZDcu)ZvM?$lRvMJLV#$Al-ZuioR5ig+!U
zdFo|Sc}r`Hl3AZ;=TXfI94!-E136oGSh`gsk9!%HnuwOT1|6-Hu9thw*BA3U<I(MV
z57%nVl}kO^eeK+tC2y)LtJhhqynb=U?t;y-TDL8VZ<H1X=Y4j$s@yMP!`)Hj$oS33
zCeV!g(dU$1(^DemaRnbYt`#x5dHdE`jk#-AJQp{7xwC2a&EtHQrj3aW97>1#EHj(3
zoI+}^Y0OBOtaRj2X;nZpXYr${Q<kv^r3PMpc5Qk`C$r==WtR;iI@e614a1r3ey+OD
z=DxZl?wv&N+e@kvF%B_rrytj<b>_7@Yo559ufEpvsO3G2*ja7cpPyV;CFLhOt<e9K
z+O`cgB}e90P5x@RZo*5SgdI)iVsZ?R{P|*NcRl*i`>n^s(+*trpR)9A!HKjhJ1bJB
z?@Uvh5b^F}nRE0XpW_YfC1vF)?-tqyPYyr1{iL71%8}X2a-Dy^;ESBo<>|=0Q}El%
zjs~AKdY2s3tgJPabKf16x_DelHG6eboX>UHoV*j++ddq4pdzN7B$RL?a`|mFudOYM
zK6x5ADCaC)(Xia4L0q^X)9u&Y%_m-+U0t>D^ab<IgTgC2nkMaxb9U&QI7#NF3+M6v
zmN;GxjvmJMjXZC><HfH&($y4m@VTujH~-?ly?+Jv>hEoo|B>~hK{zq}=F#iFc;Xqh
zyU%I0zx}q<KIDII(c`{{u~lw5)1JIe*PXxTw99mbBqRTwo&n*f7RXmkIOfT!@_8oL
zfqB`SL5xq0LL!-$|1h8V@9Xq^hZrhWIG0^qn*Kw6tJUnyiPwyROt(ZXK7EYwVB#%9
z<(eaT`_3L`NLw4UnZwO&-)e_CVegg$I#RkntWTaO`2TC&t$hcgo$a)}q^#38jw^k=
ze6CV<_1_bl?@UbkFv~`8>0_%kzg6sJ+Q0Z~-#L5v=f8Um8-JX!oh0z<depMIVu#Yy
zX62pAEs?vdEozpO92I2Pe#bV&|A%v2_CapOw~sHRG+5W3emS}PU&_kADSyp>Yp&}O
zZJM`p{y*b$)j6Lg?0jjxa$e|^_B;P$+W$WbS|@hAkYk$U9?L12HyKxd*mAceC45)4
zp4}(WRqf{mCBrSx*ebg;beo;?wXvJ!zFb*Sf_Lfc-NL3Tjzu`h)~wB4?Yh)kE^G2u
zDV+r#;uG}qgx4x?Oc0V>Eu6^o#^XdpkGPlCF^~JpCoD4X-v8ZJcfx)Z--&-Uwd6j{
z?&_I%Ine%?=`!{v2Oc8_-k|sPR@c%pZpK&cwOOdW{J<-%qYeL+8sB`ooo~zh?(z+L
z)pgvSWxoBcit-gdw@L1NcPjGx;n?M?zx>J3eH9Yi?)oQp1K-4^XW#gaMf1GjOql+~
z;%{93)~|n`E7$(8<(EEpzr-RgwR6|x`X#^3vcK&M$h)ve`qc#K8M?Qo71=mHzW(z6
zHr=gE4wH1UKG@xr@|;re?eB5rpPBM2XW!$G$oekxgDr2aUti6Y36?CLMW+h)hIKDy
z6~DOn!j`LEnpcj;FR}~0CAaAP{C_*&FeEiO`(K)VM_2yg-+LloDnknQpW3!b^y(f1
zKbGr8Ush?^x2HOOyQV2BpLa^rbY_!)h_`8-d)@Zq@2%LXR=wa=s@_o0ovo8S>BCVY
zi4?(0lm8V9-3hs|G<3#3(Tp&I!%peZ2a~f(b?;l=>b#YDOe0-lm%rb{MUEWzru=?+
z((FjZ@(-P>cb}Cx{hX;F%ks<Vs~vntCTKPtU7j>+V)SH{1_7py6P@ngSAWP`*0piT
z?Wsj;XBfZQ_T-pJc2cH6&+?hprq-N_J(qG5%_o}QSo^K<RQDFIucx;h+nROZg891)
z2QI;eIV{O+Gg(zWU-+i1n!=yb(wa6QQvJh>%&kvMnrvqLT7N8k!gZrF1}!_zJTSI*
z=ajhhWzF8jlTYt|IVE21^p7dt)*jp+cQ{P#SGMUt@TD&D-A|=i+c~!9Ph72FD*dc!
z&vS;0DhzAqS2S9(O>$VgXCddauL%*0qIlk15jOhP&%K@F((4(4d8WE%QheMm1Joy6
zT#><%B6IAZ@pd1#d5`ae&bHXO<Xgtu>ly3yCA-4cUT%GJ^QK1UObrjQz)01ktAeZc
z+nh~E=f4+PqAVJ0+PV1RgsSbcRz3H9ucs;WrNk?#Z{_|)=XTCaH<Ue7&>gjS>-{%d
z*W0qSxcj(R9XdZd?A7*33$(3&UR)y<sQPpIhG}g#SDO1C`|$jP%%ql_6-M`aH(&cQ
zJw>2-QAo+$&7!-t_*clDNSMD{vqE&;&aH{tPx~#{#D6cg^@OVG>Gd58#g87@=Ub#3
zpn1AQ?vBCD#EhQJ<tIBoUgBQYv%B9tNi6Pram>B&l@a{R_KC~x>`ddi(YMRRD=l?;
zF!M`6XYW;yfA*ML{_@&=WO+*Ww@<GxNA;B?-k-Z!#$Va#-960>4VyxDeKP1wW4GdP
zdYm%*Z|{|F#>{6w*KYZK^vyYT#-L~|y-c0y2Lm^5OR)BQIFosym-o)##HmV!Y8vsD
z3nOoYo|-t(SEnoV?X1r{JFTpHqx^a&zirwV*?+S0bXC_6i)r^A??(w%9XkF+z?FI5
zf!`{V<i0Z4iED*4bt~Vz`{tth%?+0KZZ>9nY?f>1_ZH>2w!b>J@cDzvHOp+8FI+KT
z+@ce@D8zD-y!|f|#U)mgHc2nxJ@0jKTfgYjZA{HMuXgV4HG3iFI^m<kw9Q`GTQfIz
z&ARo+d-Ept16gO!-g)e1d%gP6>AOva9T8Ts+_#Jm8l7eJTAfm*>?Bjv`cJe>Aw;2z
z@6lu4Lq{GxSNB`<^wa9tz*)P`Pf!t6-E-e<vvG9p*=^1ZT87r!I*zzXbZvNd=$hN|
zcovQ-HUFhMSKWTJQ}Jdx#}$zk&r?e_u6_1Sxc8~xncF2ypF*pSc1lOS?K3*HBd5;t
ztfhUvz(ePRi93uPCr;oH7E<q7%_^He+3xXTM$c)jb-WttuU;Pca^<oi^ZxU9zwMg5
zaSmhrO0UDGA6I*9^!I<Wrdvs|<F*x>gu%~k**Y5;uJ8Y{fw}qm*4Yz#Hn@l}v^KBQ
zk(vJRTg3E5w!A;q8TpiKjb=|f%=dXB@0wGKU#{iWbJ#P7_f+%I%ILC*lZ|9&MFrSw
z+&7ykddZ$Q0q0e_e3<k0sD&=86xla7BF$IIbZ?vU`3|LfUX5$gn9`^5ad<h2IPX!N
z#QV>BKF6IENf()tC64emXFQj&-CHrOk2z*-&3kv|hb413PqGHEsdTfpNKD?+>hQJf
zi`B<{mzVzC@4j-{(=UboOm}uhC+9A^a4Xw5U^Zhy6SJVCfQYih5)l#UMbf!u2V38&
z6i=FJofDS7dpC>pJG<O#_vW*guRN1@{sqs1B&&qpb8`)!YUZzRnUku=sM>1evy4-0
z_sS1yPu5&+zxHx@!9w0DHa7R9S2qK64gGA7wym^jkU5!ou+c76a)Yk%gH>n#*sWA7
z_~)vdzT~d^l#l0EoVcd!!f~7LS}*s7lM0uO54@Vtknm7}$?QtoV}*j_XNt|E7D_yw
z)SGA!-p}&TX_qg*T<_N4*w4=-mA=(p;Yo^Gur^4ha?73@iiRp#vJn|o-(SCbwXplc
z@AEgiH-EYJC-2J-%bdgeo<H}v-22;Y%2J7fZ_lMyo6cC+`O+cL*5^&xe(|X0O}uYE
z*!O-~vf{h>W{tP@TbiQmocH-=#(z$mxP58j=HMGM%_MCkF3b;ibYpG1B{%2a$!xnN
zJ2Fme>pi+w`DA<5sXR;Gr7K#*M1E+yUz!({JH<%kj*9qkrT4cTVxlGfT|L#ul<jfE
z;Y@t0xbIHg<8xmYsu~_mdU<s-)8!X;3$(>zc^55L6PH|T)>S*VQsw!>eD$JN>2DMa
zf6DI9zZbsc`ANC0i-a9dKMT^l;;8TNrb<=5IFaq*UpBtYTlVQ6DGgg})Uoo>grB#r
zX`Qeaj_qtXaLuvTE=|JvU26l&ghPitPG=WRxhBb*Cm*<`^p7aRlIzp58*}ZlG-c+#
zTDUneac}1DE#?>3HZGoHuhDyaWx#`fT{6{M-qc*Vf9Jm7<c;qvzV*cz`mn4zFi}jb
zNo2FhJ;e`4m-QY?-QxF8^ZFEPqqD}jU-oBlN%Seb_K{HB;;r;6W8yTk`<4P3=|SK5
zFW!0QXO~_*FJRNQ|BmwvU!@lC`o1#Iie3B7>JI0Go<&+N+Jbl2_bg^umU=1h-RjSt
z&+Vl+rRwf!9NU#Eq#W9$`yuJs+Jv|ZokbT<q!>peUOl4UzyE3erz;P?l>6@KSb3!R
zW}bjv?%b(g{?0Oaedx8xOqbOkWZt~DJW;!;LV$Pj&4tzOo05(l@pgV@zsd7dk;<!k
zi#=jf%Tje;v+OJ6{HAxp`L>Zqn3J?ootE#7+Kxs$-!Bnt3J%XaoSXa?rr3Ramcr;T
zdsEIzMo*=-2UE4UO|EIIHjFsdvs!oC)op<aTek&7EnQ`{W$U(PW$w&Cp-rbXbVI}f
zmag%-af@3kaN4ctz|@|MrPAI}rc<=Uw%rT}$XXTR?X^hhqK<c1VA8gWu8jfPxO%qa
zc;`sFt;zA$GS#?tWyPwitGYu3vo*bQqi#!wrfyxcG1X0nO=GRbrfW+?rZ$-cdgqE=
z*qXFub=0J&pea&I*RIhL$;|5Z4h+%=4NX}Vw3$tG#$-`8_4koF9*ZT#bWC+yBK&J6
zKaF7QR4AL_QJBa-FF{yRL1tF_3sp%L364YDisoBHIPW@%HWVANz3@DgVZ6a*3uE%f
zjqV{ARvo>znXmT1tsBRg6XhR7TD440(=a}{Db#iH@BLK~vQO0h<S|vTFqf@ctFHBu
z*YW1vzyrJMwkoo@ZgIS*tG?pNGVy<r$$Ssjyw&l|`2M79{oKmgiOr&G6}KqQ7GhU(
zIDaRitYF!xQz~W&D`s8WED<J@q#3}sP5AzjpG$b0D^BiTzmTizn(Flpum8HRC)UXP
zc5gc<bVM()v+!P>jldEAltcbK2bjtxZ<(#QD@4t%N%mOPmN}Ey-n3Y3p39)kyp~s`
zeT`Sk{9um1zjq0jIn1@b$-HmQxsx`JvxLh8)7dH{%{+ID31yn6bP2quWl=k6-Q;k$
zvFLz#%6yX(5r^+C@KrmbZsmD!@=V3eDz81yedd`YZF8m}Zz^A4kiRWo%4DC04N4Qb
zEoX9wPOwl^S936Vsd$iM?S@H7Ql}MVHcXx9xy(s&nvUX8{^f-Yb>++Uh(8E;?x7(c
zGGR?XU`oUSrS`lN)!Ss+cR#to?xoWn#8u$vA<Lt#!oT0C$U{QeTAwYUMO$f#v*)?9
z^9A23b+IRH;NRjqBXjaa5B7JH=g(`5WInx3%b?a&Tl}ZV6#D~{x3ovJN~*6)U@ep2
zX65JdZdE!|HD&V6zgrt}=AHZWWvk-*__EKX24-RgQET*)eA_l0%$wzI@cY`H=*L^W
ziJd%XcAMWK{iy$<^lJ;RtYFV%I=nUYtFCC^gf6z3(#|^$>m8qyxJX(>L?DIb=PB`v
z3&g9cr%b-^YN6Vhf2ONnMk`IeQL*K>S*G1d?(<c1k{Ve#78x`dm^*Jvh-CCh(Mf6l
zqq)Ro{u<{qDM9ip8Z8#yN<7N^WG3@PQ4WoTy&fAX%_?4+95|-2L`11!!=JE?9t#%Q
zS^0OIaTVz}+Qqdg=VU0O>*QCG5n2;H{2r^!ORDJkCGsMrZI>ozz;~U-fW`-&%yYkM
zGOY0YZ6*`EkfV~vWRl+$bLW%^yf?U+4^67+ayaJsSf%Zy)g;k*3mfBam?ZtXJHMl4
z>)eIz@Be0c%$a%8<ZYw!(ge|@97juKV|6hRPg|7<4_A47SZJ0YaUjC;mE{`sJznRT
zN;e$oR#=+CpI}!cf3!y9pZJS^vf^9*X{Xjr_LPz`F>sH%c>G2|dHX-XKgYult&qxJ
zYpdw_^VTMLr9;9u6*~L`tuHE+OL8tTS;;>oqgyR%pZ(md80(#(U0j+XHrqD#bS>K0
z(&eEoA-aO=AZv$~lHmk5ZV|Cx>)qem74I~k@Q+#Wxg)RqOxgFFeom@)wN+Q2AN|(o
zuD-I(l+?%1B4j4-cko)Uhx@CbyvyaN<Ldjv?jHz}zmUXSJpZBGxzfYe>z=ziKHAa5
zWYF_QP;iS>;=e;OU)o-Je4qdE+s?X{zUAd>HeXP`R^@p#Jv?K{6NQcyaX+?xaQ$`h
z%_HmOn*{rgAK`vq`gi-|H^sLmXxaYrmtKFS?bQo`?OU&8T1>fq!EWx90_|@--+SLk
zi>UM&eJo`;6LsNU#Ick;`x~z<<I*>McPFaii+*say;b|ln7Tz5bT;kymYk(iZ6Q#8
zHu;T*S(CQDs!9jvpItvVm(PoJ{ii0D9Uc%UIqUF=!?O}On-yF%l(_%K*1jn<y|*M<
z?Cp)bzdvU4?CBELl4AC+iDSO)>fR`|nDx_w9}nJn&GcR`X{Fcp$3^JS<)7z|b8F7Z
z+qlx9#j)a&loKa&nw$UEEi0?9N8JwEe?=!(+u@Fh#4(x8ufA%PbgbunGM9&$t0v1Q
zY{9ad<p)fHLR6ki|8{A?Mb-%h22(N;8Os$uSYP;87UunWw<7cQD2s~1H}C&lOtERq
z4__VUnDi>O&|k89&usHZy$$MLE8kzcZnU%deC)S<b!Pu<H||X93f-`Bc|zip(w-lj
zuS7cS*>*Ain!~yzURiG4+CP<d9oO$&b3J|cWbxGcJMRnL`4`H3JwI{5uhJ_Ylr#d|
zT-bIo?<m+Nb-;DUy}K7r?5hpj@~-@Fd!f+kMJqokDyVMy@@YPMaQo~3k!|zUo*sEp
zy(>50Q|WE^>j#Ew@;7>iYfinX`!D#ekzM@Ud)ehX&1&^tZmu_Cm40*hp?vlEUjmY+
zTguAzy0>xvW8b18GBt9=Y1{hn6Z1AU^(|Vm;-X{X1~I)~Ci?P>QNAfRPVYTmA1gC?
z^%3UXuhR{#d%5Q2EPAl>=)%aZCy)5&o!fjcaxLeBc@K^_bjd9(Ytz3i<YnQy{#MC`
zh+8?|%=m?N=iKLJ{qbx{ulkW!FBz{TMJ>Nvd-2;Z$vkc^ccXbPWd6)KGR-G&PV?@0
zV%NHV&g0+3K5@dtvjKUV=4kwWb98_6?D_2-U3<&t&QJSazpLcK{B?`^9{0Ze@FT46
z+0uFU^QR}6Z!>ZHJI!Rx`d26a8Qbk&@A^3?D}8qL^lW9d{<m+pzwoFn*m6|=$D<8v
zcg@@UruL@qi__1gE3So!-g)W9+w(-?&-vemiGPyyUl-2_c=nXZqqw6^WO}{d<Msvr
zS7zNj9kTbBd+Nfk7cYo&eayDFW?bCdw~vc+b;S4l%~P#+{@w6p#m?(8bF1%k|Lg9o
zT)*_)bldfMyR^<E-C;G?WGc-17S-G3rpGu>?4LxE>#NN_>}tyO=I_~j!&BsU(d|j6
zrrHOVhn@>s{le$8MwMIa7T#5}T~|3}1^qnma@$)c*M|5na`nBp4_i$B^yIeP&Rkvg
zci)VKidr`C%!w}bzklH9tj|k6t$3%9`qTL0r(OT`ztt?;zvPgWXdT=9pI86YuHIwN
zzw3bA)8GSZePtP^t>0g>FKyPT)aUmn?k!rg%ruU5>g&P}Z$D1k*CQftC)a(W`Q@i8
z3qNkEw2V4#^R8ZNzxkVzPnS29Z=1FAzI}0GN%zfz56gG2nRiS$ll$(?BeO(OSvbz!
z@l!R}8N1Hi^yVAaV8^X<rHeQ}X8sD;?#un-{bs{=mM<Qzp1XF&<xtlr`up#kQ8@PY
z^wXSIx9VrS`?bp2xa>#0WZ+4w|Ev~#Wk+u*o>t~(nS1+}UE2Q1^2hew|89KgPUP!t
z;`Sf!R8;fj#UHuxUus`^cHxWkn%w8}o0}eU&6=J4;eKKbkI^y-UDfwTlQ!=@wmz|y
z&qC`#ady%{U4wnQAJ%U8VDH}$TPwkrn(#;7D)#%Us|F!=-*V4gc`SBy*t>+C`P+jx
zNQ*tXy6o}>(<fW^JW_q3SY>AN%)>l!QTUWbUA@o^kM3ISYUf?Bpwe0+BIardf2(A+
ztR%Oxpw2fV`Hk|Htm5^(CnGQX5?@)<*YEoH`0o%S$#l^>>n)ehzmn_t^w@_LnHGU%
z)^Gk^e;oUSCG~ss+cYWDMcFeRRs~9Um1}Q5=e%dZ+yaf*OV@R$b(B<Z&D!d%)VL>Y
znpJ0H5^Kk)y??t-=p}Io3JL`X%)P4hBizu*Uhnj)W5@4bw`&)XGLA32J^$p{vTu*l
zqu&4c-4|VWE!Xtw(U=-3|M&X!cB|i9RrAR^ykiRU`@=1Nzf7`Kd;CH&uk4j{mEmvW
zGmewB%&puQ{Uz7FJGFVwA=isxE?a*aTXn=Yehd4&uW7}e`Mk_O)7j&`{@1I$^Ydf0
zq$i7Q-ung5A4SK9rzZRVS^lC&V|C~K*lXTT_s_H5S9PcE!lyX3HaCuPhvmN}C_l}(
z{_&B&<$=G`{i`!ORz=l>yZJnMw?6r+D`UX_iHU}Wa;H}_{n&cEph-!7?eDd}57q_n
za9-R$<K<s_*L0)Fub#U6_*w2f#isdSu+^*8FK^#-b<q>{)joXbCs&g1M@~(-IsEH?
ze3j08otE|FPJ-oxvbUvo-w5pfRwkowyQS#<Z!OuCb9eius1<kh*p!&fn#&dQeCa=H
zy({_mEdF*c|MzYi@7<J_f)W>u6FH{dk$z{lw8-M?+#}1E{s}GrGU4sViEq?vSMi^`
zRKWMo`DFE6#u>}v-o1W3_s8F>Zg=zVPFZ})i_OsBUr2eSLHWVTc^~p$WIPj!{CW2K
z?t`z5A52g;blDO#(_+`0xHq|}0{?5*cQ0=LH($<WvWZIKaos7N|B?diBuZTV$!E%c
zE1a~nFXpeGGxrpM_y03@DM*^Wi_nW+%(o;(Xm{@4+m0T8B9F<v%u(g=`@Qu-*u~oA
z6^W^Z9U}KllDRC5|4UtaKXHA)!~aX{jtd*tB|XaAmpo%lhHUm?rl%@d5d}G!W+t5t
zCs(S>jNhI1=6KfBk87<s9oZ+Q#Z~|Kzy9!B)BgU;|H{@pJ!PQ8;4|mJfewi)PZE;v
zzq9Q7u)8B$`i$sv!9d4anViys$ld?4V~m+6=e&?rbMd<H`}qpJkn1<6$1Lr88X44K
z*R}MydM>vU!;hb#bBaIeZYfefeRJlIU%r1X<k%(OI^A6{h56dD+gDOQ`>7sS_4&oR
zAgQtqav3Rcrx%C3`uRER#k_+ovOnW4Jy#XWvvZ%x`pkqWNod*zkF!oKsvrJaUOA){
zsdR12Zv7W~_w7i#cGJ<LVUf)*3H=)Gnssli%U-PdTe6!|u)}Qbk%QB8mF>5OEYR?G
zWY6;zuPta&oNvEtt?QG-JlV|*d>3DP#Q)}&HAuWI^KNr-XE~FmCC~NiMR8^m?;U$q
zcCd2M6!+EjqM!4Bsyoh|E%;`I+eI<YE#G(jnd<gs=KteooRe(}-Txi<QOzB&P4TQ^
zjB<$e6C3yF%&B$Zj%HyWj+tbi7UVGq4E*xNNHN>@+Aiau4f7SQK8Q$OKCj_cY*?j!
zNd|AtvEGdOJ?Tfj$LU|1edyXpp3gjI&U}sT`Qv+dCiClwg6B^DJo)>A#M&3F2RU6_
ze#Go&-}ka+e(E%(^iQIpg2G8WI(Oseo>d6gfBTi_A5QDO^WEzvHaL0I32pES&8u8J
z`OKN~7H4gH{eEYjt+ScIAU8#|FaAxf{`AI#V~yR)9m4IE*JRfBJxrVF&CB;wsO`W7
zLEg>_1uYvZ`YWWKMqaq1;$ruB!TZIwZ5LN<*dDOo$1q#)`&7*)V`JULH>{^y?g<fE
zu;fjm(mtQ#rApT_0;jF+;bd2Cva-w1J#lhf_J?D^cP~h<RA{)IwI=;t(bo90*;~(U
zo*mG!^}oUEkDu6Xo9+o~&vFXtnt9@4$G(|8E=|@e)GOxR`tZM*-|ZTwK#84Gi&cn&
zSnpT!e;395&poJ~aapo=?x+6!1vh?ApQFBRHvhpz4TUlCzkQU~Dt`$O@cJ!#Pr~as
z>#foq8`rMvy?5ovsSDb*D|uqLZbh$-oyWy+|J;62@dC}zl1Cf|Vmrbn1a{=g>}ZhY
zf4t%36OPrtV)swyk57&&lgTeRU0xl(_{j7BYFdAyU#(l?e}3uD`STkOD~F}dclf?D
zUGLK7Jn?>kiJ@W@hAqWH3ZL&!yx(z&QDHx?{kt_+%~=0@cDu3q&71Albw2*vcGL1-
zNnYL2f0_T;claEO+;?KN(x)S9uNh@IoKh-1_oO)giuk0*M+_9^mh9uaRCM>7U7l*|
zEn5LY15S=_D`#}4&bZLCEY0Kl!@hkM%fj;)_^I7`{)=VF;`wv9o4mM<Ba`pW(VEM&
zU-!|9b!VH-?Ag4w=G-*a&BakcxAPuad~>dvGL@zGo|4^vW}W@_r~H+_)Gx=GXS0;&
z`b}ScYgyj%bI!q+gF-HaU%7nAchAJNtKJ2l(hXE@n0@*G+y6}I|MRczd9rTpwuqTk
zoKx>DKRoL~Z0Jwx|4#+x?*BU>^|<%{>Pr39`o7X<A6)-`hsS*3%c_r(TJ9F}T~8dn
z`%$C$ZKhJ;2Ho}DoIAUA6mLJiZ_dnf?B&MOjd%R|E%p7+mX+IYJd>{QoB29NcgNI=
z(x>c?&5NGj^KL_3i%wX(z2?^{i|l7h4|~sD!q)BZUcAnHa@&WJPg7^!%5|UrFvD!h
zw#aYu{S17LUM-f56$qcnsS?QjHcqVJ{nLY*Sy!vLkD9-fk9m3a=d{g_g!Z#r_Vvf!
zo|Yt~HTzl5uU#?T5?ek?`5x=j+rE<VRbq974vX{6YJT4xPjB5h{KGyr?DDnyKkHt9
zzVgRP?zQHb=v@;g*Q*}P{<~-Pzgw^NL|>oy$?0*u#Vwt;*BR|^-l!G6_vFWht1j-<
zRr21J7mvPuSHgE?PkzOvdwuoiu7{thDY_nX;j;g-Q_sHi{5v#JUi65MbiYt}s`P;?
zSL=+es}rj?&wA%q(;HlW{J`(HH>K>AcMcx^Tx%0@&oq4YdRDH~ulbV~D^7X-Y=fmQ
zd-JA!Ca3ovFIux$NvA5T<oc^MEVJLRe=VDG<#6V&JC2<<;%jtm-#dJ=etPk6MyYN0
z)9=a4XU*Gwaj%Ox(`>g#O=-a&*In>C&we;j>Am8E1cjFALA`I2&*ZOf+i)sGn)B_x
z2q9ArX_@ofRdvgbIf~ujsWzy+e8lpToJD%q^{F)vcYl7pbKT>#g{v2Q3;hsKsb}<+
zcUC~Mi9PdPem`D^yFTID_9gD08D0F!YlVf>yIC){^cJjdZw?M$TzBU1ao*6I^6J8N
zo$M#;rL|32KQ80lWmjyy$9lfh`Q!5@pPpMg+iv=k>XZ83Z-jgfihh6BFYDOY!XYTd
zaiH<Bw(@6_=&EObtvQo_)Ga<?UU2JXRi#Cau&I8T(I%nW#<7c1)~(araxbUQ>(JC_
z$94IZnu~Vc(=p#N*-)l6tWMnYpVsBuyENqOW?$X@wrXBQ%*~tijEt^a8QVI3MnqK`
zTrN45kjWvIbKse>fbztHJa6P%cHNuCnbCCUwV>(MV=uRC`4^nDd&<hiL1E=xE^k9@
z_Sih<c3ky;-u2ImJ?rJ{CViVfcZYZb=M}|Xfup>8{@XEMGX2fNb(6dPW5UVrx57Sb
zDcl{aQ@>@;{lIsVY-}QXivm_2)&A-7|4R6LnYgOtGf~YB?Lv#YR%~c~y~M-GL!d#-
zw@x?APeoDUNsChXm2BO_H~Y8EdVH`${i}+}gvBY>D;awpuPdxuz3K1F0(~99{X)+Z
zJ5!gw-aGrK`kfzX?u!=PREqz*oAZ-~@5z(gOHbJE{;qZ1sp8H2BKeG}IUOrglU28M
z-=5VW$Z&SzzWEK)zS%!C)8I%KnaMPzVVcM?j=SbYOB_!$_sl!>?^Vs~)|aQ0wyN+*
z`9F@=uwPw1^HQ<x(nqm3cBXEaw(Yy0-VQ}QlX>5n%GJ)AnoY@>cY5>7GUHz*C+?=(
zFIVne-rD)_VX(`Mj>^>c=dP`q9kF0)=C0%XXFMJ@8RzGH@~wQjq4boOduwCoyS0x!
zvXYPb)a3svHsAM5SUs}qKa1dYqcmQfsDJg<cQ-$|cq!!JtCw*vTc1=2?_U1-!fBcI
zLyBv)`I_Zj&c`iT)|os};NGO4J0{63{B1sG($}9RKj)oko#(hw=gO89ewp3^yJI;R
zK9|?U?s@#-@1`qZr`{}n`u#umq1o+D*Y!^({wz=`(7eLdQ*X|>teL0j{oi~Qz9SZg
zyzBe6I!PQ@HT}BEGO-;W<tDEF<)c;dw5;{*#9E7rglpDX|F}bszAMqrQ_(E;6OD0S
zxpIc)iW$B7CI_X}*ChlU=V@b9Now-;$Y^kC@9qC>VZB4_+kumFj%`p7ko$A|?i;x`
zF|!@sK9b$~%7k~l-@~0V<E<60`G|A>Ii-9p`<2JC|MmXY^=GH<%g_#5eDSvH$xmlo
z-R2%s<=&$msFrT@anh2#1v4fWiO$U3+*vML+2X$A#=Jgn>HDu=Dp*?2{E>F^-2GP1
zh38XK%x+6~y?SqXyfyW9^z$c2e;Li*pL{y$QR2hD_V>@-J~nBJW%!kjTVY|h-kTo%
zU|O?(B5OoXi`1GYC%#4aE&ILT)7rJpWu4c|xC|LSO}?0MN6+!<_pt4$|3Ck8j`%Z2
zqCAExqbugG{MVPYB9?2O=qH7%Pgwl4?Bb)y)Ws`SSpVd>FZTZ3sf7CZQ@`{5%+K>J
zHhk&$>hq>;G39mhrk_}}an0WA*YB;{xozF?%M!mEyc``K=@^?uL`1&Os8CyT>O|6%
z#uH22-d(FQI%ogZ-S+g2xbKBs&+@hH7oU3&n-G8h+uq}n+MBI*mA|$*sk*3bMq;L2
z+SJldTkNjPxpJng%=dli#GhK9XYJcGP3KqUq@~`xQ@KQR(!@kRU-M{C;#irma|>U=
z#$UJRdoMhAKqAcanzE>?(9`c5+$^)c-WRW9{WFdA{rkR!ew)3Nwk>g8=`-uxu@A4G
zEbWs#e!S$1+?idkEhk<n@X`_W;F$LE!YcKNW%*Mr*?I*ec=Wa<&JcKMre86kgd<$x
z%U$+AQ!g+2sG1hAYKPGVd&z^7FaMJKv&DBk_jjA_Q=fVYy(ixJDcw>a_hnt_Ng*-Q
z=r^Y94u*YA&aVvCoUl+c?8)5rFs(>tu@T#>Shmm^x!L|br$QuGrR4jG-CfTee*UVh
zas1MZt2|ScSMTlo{cHJ`nH|D4l6U%_J>s8Lt5>;S(x&y*Q-vc(HlOG;3-Fn7U||>k
zQ+>&0lROR|I=ZlS+d?LP>989m%5$vj{=KT@l2xlWiJIg-$sw@jq`OZXXUVIC3mbBh
zm)_QrQA=GPT3+Hm_1&k4o;hr#kJso5KQXx;TG`n%x5>F~vXZxpo9Gi>ef@p+!&uL9
zaBqIPeRl)9@um8J9c-^IAGc0mWj=Y7p^)R6(boCWfk*dN@ns2eE@}1ai{Q6-WnQ-Y
zCC9;rgQfmqlQ(P(>^4_iVgK*Dg6YIb!alV-#rvkMURId2;i5-Tja;3P;yvFVy4Q_t
zg1L6Ze0#W3XZC4k+fDYbW9;fa^T%0OUNY>zRyyae)35wP$xT0Ii*&KLx&95ilfp7_
zyNf^1`sLXnObgig6s#?D<<w_-d{?NRFKsF3Q(zx+;`rqI)!M(`r73R;v)j~SYguBF
z`0(EDWtmnpE>sw8d@DGkE49L5<FvqF?QiwL_FuDKCsfIaAKmMB?y%2m)>*5n>?ER>
zFkjrVXYt<Sb8fl0FO>T3HpA0SYJX0(pT2nX&2L72TYR_p-RXCZcK)*>ll%Gh#k)%P
zS=gL6&J~rrHEolDLQQ$`rIuq1E=^KD4^Q4xwdX1S&RahBSIjz<xzqN3(RIc5nR=<N
z*PW+s+>&O@{>?_-lttINr>^(HuSZ2!_dO4Dl;J)<=lQ;+tA6|}whLj|KJmw)eX_Oh
z&)=&uDdN6bpZ(4H*{VakuN`yI)L36A(JxmJ+cRUa*E0j&DNkG7rutjob?M)t6M5RC
zcAo9s%$$2_*Bff)UAHeexx9CW%<JmgD?Ea94{VSR@?ucG7xZmcOO&tN#MjR!?3nja
zQU5^M3+u1m4h`?F`>$;6tdVQkWfzlRFOqTizjSDl*p!7QbqlJ^53*nA%iFH{xSn6R
ze&?f{c7sJs9`*bCYdO|FX4YG#x%PGb1KoVj|7ADho-yuH;1DkDOO|-g$CIq(+?C4n
zXrs&iZ$^&S?b*MjB=48`{);oQO=j!qd9q^n?Q|~fTp7l2j6F4^Uu;_Z^#7izWp{H_
zn&f;m<u)oZoTxo9XWcPh*OKLlk0ayfYhIl2uu0|8_EMW&+hZ5<Y)M~Lx%L;IVSz=V
zW8oX+zTzc%*Vc&YuRG0h-#hJg;mz3g?eQX+xdzedcZ=4{ZruLj$D8aI*Q{%&o!#Ab
z{;q@5uBIsNE@Pod4;C+3_HswLnRkBZLB+S<{+RydJ#y*J68UwLyOQ?CwYwcC{i%NT
z%O&;aW;^PSJ03CW+GFYc&rj}HgLrZ5M32tje@|G=*>YjxXTDv`<%*ICKaPJq;y-I&
z#}%~|-7*I+xEZi-+FA7WkEX|@1CpQbdF8jBea7p5X_b}4WR}FV2u8NkYn0wFbN_X}
zu|!hw*MljRbv)4zR(!Y2l-L`}c68yVhiA<Kc*Ktwed4jtZub9jEKxTq=_X6hCPii8
z^quaL*%WjdqF7TWF{NMn8_|1f@tWkxQg)ggp<1t9j&pR1-~VVEzDuckZe-M^>))nv
zs91Ecr3<vIJW$MIY3}%0eCMO<H^NtbyeB1EwRT}?d)0)O+yYlb568=W-gVmDD&?%4
ziP@F)nbVy;-Z4z;`0;2-YT~kms{YweugbB!R=U)2=-2`8*QVl?1>xC@pVc*k7j3nE
zenax7&$2}sMU&pf1(`g(wrsiLwnp0px2knaeDhkDaC}`lCEa1dADIUGyRy~%7nZdh
zU1GnfqIvn}N6R$cZ=M(0eab?jd-1X*lgl1^i>Plb&3g1LXVs&ZLfd9&#upSV*c9ci
zz%ijoX@>K*nvLs~cJlHlw%5w4ISQY?6LWsQ$lapS-L}WVWDftGCh+v?jjmr+A2g&H
zx!7B?U7u+j`IfY}=Bt@b>ZiWz>LMN%ojlyySFW$DU6IW+*<VR}$}Gw1T}PLxd}U8(
z=(#?HqvfA~dvBcdy6$_zH9dK=7+9S?CIsnf-Evrctah88PudKnh=4C$N^!=X%hw**
zz29v`waE-m<&=u{i*bib4Bm!kZC)PD=J<3<`gMV@`KO;;HrVuKRhQ8dZ<QG?hVm)%
zxBjjOoo@HY+t$yDL#b!d`w7x27V4a=dhRn%3H*!MH|ul{U(u%XuXaCKGI{5@6OvmQ
z?x)_l`$qoMv72w>dG=-d>t~m;R+WW%maA30eNl7T*|6Mwf>G)Qn+-bGZ%x#kaWTMP
z=aRE*`s%iYUI%win&xBmRPXe&j*KEE*Rbhr^N;`ichH*Ez2fT8E}>6nV^^D%YRELd
z_i9y-*6vBt?|e`-`_8-7#~)VO+84{~T+*L8<=v}_4OZ_??cCviUGDw;u+vlX&s?Ys
zo_p<oGq>}W%NcVof9HQ)KU4SlLZ(mKf=``rC|;-gc$<}+c=?j|`@f&xGVM?888+YZ
z-4n09+<%t6NdN8CU)SHNr(ZaoSTJjCN&bza@z-CO{EYkc!)ITNi>Ud|Y_2)E?>{}Y
zs9iDn#ivDoS@gX#SC+)JG^#yxSQWI+G;QXr>a0tde&xp-Wy}Bme<`;A&p*KxHasC~
zd6&MLvg!0|mfsTpg^vIC?e>2wKTk|Cr1Ifbv+CKF%dXVFeJ8p8RKpYL8pdz!VN&Vc
zydjf3RfNv6?BZJ5yEl9NeNKfhmnM~_GcAq!8sM&BaWvx2N_L@LD`WdSCo(=bxN7Ph
zgYP*Hcip|$?iqd|dj66vA1_W`ct0qla_{|#v;S!r$W9da+;Cj*{k&d*i$}}PZCanv
z`}yC!h=*6}(&ujy`TNR+rMYdbC|mZknum;OT?(Fm(()2cEN_?NWXapL@#T%<1rlBs
zt||X-yR%P}R{ABEFI*LHv-w=Wf<+ds4tYUSJOzcE6>l%I3fVRPh)aLQ2IkGv#MT5h
zXZ3a;i<r(S5XSsbsk}MO;`|HKW#5;)K6=z%nEA_ofq%=BxFw`~CH7ts_$C!_abbL3
zrsi}B-5t9cW7If*@jR5_|MtPRH|Ok6&F4k#JO0mZdLVhC$9#K4v-`8YW|8D{Lzc+C
zZrM9xJ@1URUu2!@XmY*(a?!Cny^1XNJ5qQbU3bxl@v~})+p@lFm7`wqWSxWm>RHcc
z{gyf6e7!DQbKl{`_wU-p%M1RjkcifMrahnc_Mc?+`f?s|@qPcdO4rZ+b*S>!&WPK4
z&Wca_|K$27`!9KQ#on857JQrOT_bxzuuZS4gXL-L)P<%y*L$6o4ZZEQ`g3%ds7&!y
z(?13uC)dRO*+2hkaPR6*6TS$R?f2?YKVBPoJNd=0{ZTV~qug7J1H{A+$8R?%(2v|a
z#e2Q`#ic@g+EM>_Uf56WU*f;$#NI3s&s^V4NqYakPGDxbU>^~@Yw?%5-~Cc)obue6
z3jZ{hEUEc$A>DV5?((ghLW&EFXZakMX{Wa1oQTf3CC{UZ!=`3&U#q-dm~N1^c+c16
z_x4O%T>0`6lj?$|))|XWY}E)nQ1baa_qK1(@9w{T>3rXxN;3`bIlrzfKcBuYE5hXT
z1)lBS&CjLOy_7$?j-lz^$0(HtU%m9_b~MT_*3*=8ShnT&c2QHU&5nFRoE<GmYBF0k
zroHrdDE)fPW6$mEhpq)^ZjU=4Ez>gZ97kH|+^3xnw4XVhGF+lCLBp(MdEt}td$+eT
z<iBC_nG-SVc#7LhWo0h$JBwM$ICNHZOGor9%Z@kuEIaXhX!*9iA2-Y|H?QV@R2^w`
z@ASU)an5_+)Xje`U-bRM<S&m*?7xS<I#*TQ`uYA9w)EOhDGT=c-f@lBUw$dO_01*U
z!#{8HvR;y&%02PtCqqlUTHBwFISyCb-u~IV@}=Ya*NRPwb+c0r_hs&3ua|WG<8H%$
z<Myx2m*<x+XHv9`*IKCY%|-dKSCtmigg<;89rjZ#TitD*9?;r;cfq%dyl+lFx%d75
zyw76kZ#La(aw)G6Hrc{-#PHda<l|GKC%>)_tv{!BEUNKsc_536!vB{KV{6q;9n+k-
zWOe$T*{p4$eXRVu8zmo=Z?JFD-)8D>yYP2i_ld$%lMPpWcHN3OR>fr*9?^ck^52}3
zcZC0!|0(<H!>RjfzwAY`zx!L)8yb7G9x+d2NzJSId^m3T^lAUD{i(3sVj*}ccmhxL
zbB^!l*#(NGd|Qw<sp8r3laJ5uQ7!8Yw0&C<my~u!YTvTj&Q;|z_7`d;_+7r2_4LfC
zIYDo#cJJ0u)lAA*_^$sUk3osQ(D~@<wvCrvljd%=y>}$`cDd0WsS_t&c>l>Q<C9$@
zz5DpQ^b~nlt?j2bMYl^_IpQ?AIYHBl?|#9y>-TpRC(W5DAp7RmOupA!r>3@-hH5Tf
zy;@Xq<NZZXf7;x2zp>}%Os`jckK|=vTYmj}VQc>Pb0_8|y^RXhNUi-~_bxrL^VB=<
z2S-mOS~dOL@lJm&kJIl{Z!)wJ(sMV($9w<#mOIbEWWkv&!Tfy(S?@b;`);}FjYt%q
zV2mbvbL`*W7H;~IHUF76eW|*=;Qenq;dw$c=l?v)$`Zz^>G<dB+No=`k}^$<y&|$x
zr$we_2MZ@Ho$NKU!k9l*<ibkXu=WiPDhl*cvNlKh^hg#hSugNusl?uEms%rLXR4*u
zxkl?eTr_8@L}utSCB^8cE~o3N#2Z(pMkc7**G_gf`h6#V(wA$!^KSLVr4}BwpFBbB
z`?T_c(4Y6F*F9snaxW>cG;ZtS&ml|nkMC}ObF!}c;XT9fr*d0F+vQkSiHAn9t^Ma3
z@o;ImU+Jk6Tg$$cmR)C?^7pS=>T_%BjFwc}{MA2xOt>5Rf6@Glj(1brI<GA`IXBq)
z;l(-2BUY-oip+D3J^xlUrMUL1p%=r=s(Xjcc6ao({mLrod0PH&{_Oms$~pDvueVm#
zw5|H<c0J#Cxp)5J>DxB*9awkuxqv+H8mV1x%eLkFXc%i}PVT*W*kb7g_e@=l)pPD%
zF4ZjV(mv;Jtf-vWc!?`ckV(ZW{BnKN+@*%*g;lxQ_2y1OiES~>dyDe8(sMT?g|#u&
zUg1-^x_GM*TZTvX?lp5*A1Wo;^Y$LB^*(imdlGk^_O{)#bw$i>%L-_J3EMbzw}e9P
zs-K!3Q+>1;h1v@$pC&)$tKxso$i9Ak%WmG=Y2gp_?AiCf+x-5m;cNSUt9M;_EwSce
z>CCC+celDnX2e`>G|*%?$-$P^qTt&wKY!1o@EgDXDeWk|`)=1c{s(^C5AN)gaOMAU
zym0BYoEuW{u77_gax<sw>E&L`uA<I&Cq#dNN65M0%2+j_6y2~}kuoQR{1O5f4`u6R
z{t1jPe*Apv#QsF(7KfD|?C%Dphk6_ie9v>D$#~v;_w~`7{6Zi5<1Q}bN_nQKqR$ii
z<&+aElY8?!1G7EnnX6Y8{aV}8*xLB+$?Jt5yw{w1bI8tM#)+J7QJ<8K2np`U-6@zA
z%XTSmV%zSrwVg-r>3yBJ?`Ce1^y;;9k7a9b-1jEw&ixH*ZomJ0bIq+sbLX-NvGXTq
z?@kW2?z?dHymo#j<DyAH(vG~c6EAoshu=H;Vxef^q}}(7rgoj(d&)I_@$-d6GcBh3
zKQuDp{kpyT7mv<{YvOC)?K`*W&pGS)&rGC`op`-%yX>`d&yF0oOc1?Z@J8pcYjXI7
z&$hnX40mt3a^cXKfYT|v-NX94gKK8%f4tzytUvGJ62I9}(?ty(`)-+SpLAc^^X;-V
ztE~5ax88p%>OzyR%iAX+Yv1XfyPscPovU7$+&1;uso!hXWfb#Iyz77WUAgtM*Edf-
zNe`;#@V{%ds?~71<!uXAgBiL;$}2wZ*y|geD77QfB_!kJ$7?(yp;f;)*tdPq-c`(K
zxS~dA(jE7=E8mAJ$0@$+nl%0GbskAwk1NmboqDnDpi11w)!Y0J&RJdXZt8<GD_3p5
zES_ny@#XZ`xO05p)|@{y`K0B|(mj?J!ZVFLRO?(WtiKxE`|E>vy!W-Yugfei+p}Gg
zz1q7=`sN?0d-r*dw`%U2^zrpf-i~}x<tK6Jn?Kjhe{|Q+TU6a^{ZFMs)=O@GyRdv$
zrRQ6p2gZAh^=$Xd&Fa~`=gEJ0rkbZEr~mBLEnOThljHv2wc^()HTLB>W#=DSSx3F!
zc~{PQ<#9W?tSSz_?OS8^x)fiWA<a>l$Ma=s*|G1Hb5927>lP>5T$6m2A+=>mZisyQ
z`)AVZZy#7x2P&Gqe)zIN%JspU73Vd%(&w?wV#x~Fut?_?Pcqy0+P)i0_sqMU^m0zG
z=$iE9rv7!c+qT{DUmp_vcKMzsp^r^<MU4y1d)7S*zTs{2^ynVZg97ItW`Bx`4U6t?
zX}S68>zk(~k$1wpqt{3NY?^U9b{eZ|=Jv`AGmD?4QEz4h&f;FU?s{^Iyvn1bJ4ycW
z!I{an>05(4mYQDK@msAh;L($NwM#-0kM7*WRplt3cD%jrSYAi$@~T(W`~e?}f^V!>
zUAg1D1bdo=6r(`I+ZTc-<Kk1=ms-jxw_f{@*CC+TQLA##e&Wdq`;CpZ_8v5go95c5
zu=v`O^Bdl5pS9ZV*Q;00`Tp!W{jR2@W|PH<xMlm<`kjya?fkRNh1=oTZrPHb2hJRn
zx9d@|`ZH@{P@QO6WWY7%-SrmDb8k=4xX$m*Qxc&pCg>NK6c-_waAcje`edbQu@)v}
zHzkukhvlu4S6IAwk(01?d((NogcrZq^~x9DtGw?Q{AyW->|6f(7nWW5X?!h8uD7A_
z<X0~5d4{W&Jj?6pR(Z5Qgo|-+=o(Sga|_!UE;?VgVUPI6E}#9=J~4UXbd5uG*O>n-
zVs4UM{MatTm$m(b<;-~5oHI;{Kf8Y~s`ve&wD`>I?l13KH=gotlw=HW*>NIC^t{#A
z(-TdX%ywG*gjM*J<E%gN=ewAUFP`3{YIMMRZ`KS;ag~4t+%H9$&!yBJ*?0Yq@OxuZ
zho3ffe9LmHKQvwpf8WOZ^TZpD8!slv2wjv5u`viKG}xuJ_IO)ZZ4PJgS^f9>IM#YE
z7X2@DMeL=Me&)5)wqY?lVxkilBo_B~v@xi*Oq68ykuTXbcVS(3n8-D;EthX?d)2gU
z3tNuZCl!(HT_M7@@*V$D<oh2!c~ksNu54<U<QDhl8=Hb3{oBjyVy^k<P@tvOmi{|y
z)eKB$>z(J?Kl4YdNx-?kvF7Efg32pyRFu~pWq(|Avm)Qd?!5Myw{J^+_8hUz&d<BJ
z{`SKw=PXZ`d@}dkczoKVoa#4|_U_F0@4x?eV}1Lc`>E>|ZZ7&7UYTTBCKnqpwIN2w
zXvOm%T(MQW`ZjOVg9Mx}Ce^NAwa5Ck!3GwYjxUXOXJ0z8kn`l19X^|SJd8~$?=533
z7JL=aAN(rf#4=|WFW1M-x;^{!kNq>yuIkoXG^f;zyO_fy^I-m~o5wCZi(4fU<FaAK
ziGm_6hCu7nnQNDw5Lhatb2zo^-J~6rclU>0^nc90?4xPPB+aBVb0n{<KK@+TMK9W4
zX2qqctN-np{p5RR<&+I4xU$zqe$Y79D5y|h8L(u^?H9N923hm5{uWvOy=p_$!THxx
zp4IbeO*SukVZA6o|GD+{LQd7r3q_~8GZTX6`j$wU<d$vyylzfl+jW`1oYdTfF=g3n
zdAW{qPdej}SrUBlPpR?sn*ZkU@owMuKfE6-xns^t^Dxh40#VYYk27_he{#MQ-fjOW
z?|gCMy?d&=xn5o~)Z$QdVQr0wnrPGYt}*J$x4L<M8t=SMXR%;Du32nw=H(8li(V)8
z9W@k>+OX3n)tl$An%!bO<B&Z2+}*YQaW^fD)049b(oXeE=-kcNb%cj^Y0&v&|JbYh
z_zp=2ys9lPENqYEGjQ$yJuN@KP1MqQ%8@hEMYR?@$?yF1=H1scsaJmULY`O@y<hNH
zb&BezOz$}NwOSc^9)X8nNgQbXuV_)wzxzTJgQM}hI|hPBy?iu%`M!0?Xr6hqC?<QF
zfP?Ag6f@!Y$ElN>FU)=BSN=fppR?7Byq4$bB0cAL%y!0}<vbCq{_ggdr)uXluRc94
zp6Pn#C%?A9t*cM>RJ`(V?p{B0zsr@guWWCXE_&|FV14pT3$H;pAKOv6pXnB#WamYc
zK4B_VnKM!P_u>zc%`Bk{*bc`o{vmaI{?_ec*&=BL-I?s}v9k?hyK)R}WV_6fNXj`Z
zJ2xs|;+g}6rQYjvUS2$Y-t4^YtJllbguBXAp3Tx+(w*sdHS@!TYfDWgukX7X^(b|*
zYKrKqowxVy+pTpkcNg!r6e||Blb6m&Y@WY*;mq0k7iT#*bSZROhA%G(a><l&-k`-D
zyzA4Zw2QTm4t#X!yI1pkUs-V7tWD}{EG7N3w{I6dx~%4}@PmvJF(<VXYN88XPwYJJ
z(VFuy-athvMwrX#n1k!wQxa3vIEz)kb6xa3Ia!!%;jxp&>!(^uHF=-5X!^fCxor0W
zjfZ|>*QV(0dfJfXDK~9v+FG4bcaG4?r5tA#uQ?ISrWNsQoyPWa|HQvtciX<^`hwV*
zTUZq$G>!@}?k=|!eRo$dD)HBvUGA(eLNhL0*}(hZaNzN6&C@Q0W+)v{&*W<HQ+E?i
zW1FdXW%AtF#&eG{?^4*rq{KaA(%y^zMgKZ)FAkUb{<~z)CG9CHPtvyawsNcpDW36D
zkwvb1gNo$MXbq8Pp;A2GUl`OV|D1hM`o&iJ!Urt3Vpy1#JiL<;G}|Nn=C*04H!iri
zm33E#r)|z-k4Yvu&bhyQJ7ky?a@StG^g4^vufgttpi_MK)kjy)RK3jNmAq#qvt;V2
zGd#+D4tuoCZ)<F9x?wn*acTt*%Ym={!EwhEo=xiX4svvjSnFcoyCeOSuT6=euan}3
z`8`^9C(m)3H*;B%iSwLidqbFeK3(nLl91UxzmwbVQHGV4LP#QG?x#0FNmGOl>zg<<
zi=J&|U(5Tod&bMudk@#$WxuOjySCRt^g!Pw>6V5w4>q}ET;yWnzN}Uqy{N<TP=|_J
zpJSGFrK2jxkyYLXojsdw*d9*I*U+4>=AmHa0WqgUKi$eW#zTT)sX=_d!~%|9Q~T&V
zHLODFa?;DIM#XR1=H765s3sFLdBIPikNvtFF#(I7r_0Iwl8*eaPi@zy=AI^w_LHW?
z!794X(x;?sOuE56-JH)zY9foJ_PRpfvz>=#CAM%UF<-ZS<7_G1)49oX-t2R`)>Pzr
zxiNBwu5g<fU^Yjmhh^i$bfJSbvvVs<Hl6;e=CMp?-NiFpOJ!_ACrtC?63iCcT3)1j
zW@c&Ojz;0`{E9y^+k3SmH%vTr_v(cVo8H-JEa}OtVq#lt-#px1s@vAHV@rHghkjOM
z&<o~y9Vag8N!YwpouTEDl^oM^TzqHY=M86q54^L;JtUldrK9_tjo5B(FA+gO4wk1I
zrU|^6$&~acaNhPP*^I-Id1;=%qL$5#j%@m|{d(P8!M!(|u9;^$yg6+t7V*VrLt<z5
z^wvuf#@2_FbWVP?lbE28x<Ws*p<VdskERSp5xe|s>-l2N-TQ<j6IGr#9g0}ax|pr=
z3hSm5J3sO-`+2}6a~c=-o1PuUd}ccem&y2R3%BoAyy3vIfJH$gP-jbGL|$H>KvP&o
zv&tov9wy_1UEXpgYh6z)h%KB~Xlq%pr?=u#@#ge;wX^Nsx-woXPHYs8(v(>yd-KMM
zlsmzmLNc$GMC3oc!>K5+T(sFK!eh;yycIih3{D4Se%rV2+ufjpJvC)ro9Eu=+FF~p
zE_Yf{c^Ef~Pwvj?A-A>fIc@CdxpmPsa&w<g#`>n~VNIQ<uI1c*Q}JAPX_&Q9)9Sr1
z68pY=mprVk+jMAm$z{pIv(8TTiQT?gutRIr))i~+u4)&PDvWuWZIHBchF)xp;3ZL6
z%UMMi=1u-DBx6@~@?hjGC#ghriz_CFCo?UHSa^3|d{_qW&IR5rZ<F*gOY<U^T-cc_
zZhAdGAuR3L(}E~gw~2c*8RvVKg*DuCcbh6B>#zJrqsuf}Ww&n4-?h(-Vz=rwvF~rm
z{qVigA~kQ*yO=3qo2DI7nkD|OS3Yq;e=)<0h=q&y?Y?q<+HR`}+}>d<y|V7tZp?LN
ze*Wg(>5ENjH|_78+{9BO&Ye2red{caX+lSO%nIh&mTqe=Ymi>Z*ky3@3w!Ri*Vhc5
zB_5n8aLH-!0+kHcX7NRLb^qmT{r-GY$_Met$Hy1e?f6|DvwY&|TUGMkq`q(Y^1>=s
zS6*+g-?Fygh0i_f!e-rEy^npz^7kj)4{8g_pUi*z%G%Q3idkFA{8we|^7w2qCzH3&
zK5dxA7a^j}%XVMugUYRlSc5A9jmpVP%eHMaKjf6-@j2CB-7S3IEvF3TX`*V3U;C_H
zI2^ZT+8eU>%lyhI)$>08t~wg*QMYmto2<>F`N=tnAGmX^e&zKaxN1|LyZYAmv+rNe
zxEPalOsR9J*hN8=dozDqc|~=~-~Zt*(4<>;t<~Oa$y=8q6Sw%=6FM|qI1jT~CoFz?
z(#6FkKDlwn&pX9`6Ru?$n_P+&Ftv$~+RU_1Pv%e=8?V9-Ipf{~wr^u*cx?J(cX{6{
zDY@0(7BRo6lAAIA`y<g`{=wHS?7MQw`bR_UTOVz$slGB9UwuPTnICO0xub5`vYy4r
zQY7)JTWw10b(`6e%AL2unuLwB|MXqozv=(}P`#}uW`C}?vf9gf$=dz-B?JA#YxkY_
z!@lMB=dhoy8p|)0b*Dr)s2!W+%6fF~d%x%ZEZrq0wEWhN&Yp4dfQHNOaxd|oh|~uW
z*DlOha`@sE!{UfV@-COp>&=;d)5mx3-)+YnKQ>JL|Fk08r*M7O%lLzBpEuap9P3(J
z{6AdtLKn}bo2BBL7jqxl{bru^oi%)Gn4%W$nta08;o<8gI(x)oO7rjc72jL%V_h+W
zjt<8;yXLk>Z!@i<Dtc1mKTU{ZotJ44VYa*?T~J9%=Tg<rh(rGt_%pFLJ#K0aDL8-E
z%&cCfa$e-w6=nar=e#}m^Ujf5cQ!syEs*}Z>(|fJlU=zQy4PplbzM87{?&_D84~IH
z|4!cb@b@`Aae*Fp?NcAl=6;y4EthLsr1FKcUjoC$L~dopAGs(zvGCdv))`YoF7oc5
zwSxCZ)!W+3TbDk*p0lm}U7xJ6*(ceJNx{btH63`eWusUBB@Lek3-j)3Y}vXqYJtyl
z<2gE^jcI*8ePXWLt{qZ4Ilu5hR(-k#@8`#xcN%O@3gv7{X*Oz~C~)9wRsZd~%VVoo
zyt>ZJH+$px$!F!XUAXRFvt*HFpR{o%@5Gg-74Lu7c&l4u-}cql|E=j4!^*$=gp{X0
zmv8tkKUM5|{_O6r#Wz`&vOl(X#<)LN<y4z;S;MLO=MoLuHJ|O-Wi#3Pyg|>VcboDA
zT&iZ?tnz;FN%qQIy;YtkEw)EDx~<N=mv&EebyQE?MoY0b(-m!M58vL9o%^wesZ%-l
zV#V3AyX$^k*7)(flI`gd(fAc747ZDxMb#fV-L&&h-)vphFN%An%l<r5?dj{_CA&ZQ
zrAyYi$qP5_dDm|Cw&uO*B2yKUj+fmtm}Oo#Uot#Yquel8O0mG&xNX`?4wHkzTgvO?
zuK%z7BiSc6ZPNTd<#U%$&b+y`c|zObpEfex>vw&*zV&N%ZA8tpg2dh+$vIxZM!zpR
zo>W<2DY>A3ZL$#0G;U#sl@Z5JgnQb*eHb6}yZK!DD#O=V-gm2+&-a9^a9Xa#n*Ps~
zt6tk<Ud+)`J1@B&``TKy>*)L?p{J*72P$>1T^6?JSlKK8gn9AXz6R}o@nYVe@-MCW
z0xe5_Zqj_A^Qbm?VfR|)6?ax?y_f#BPi#xkx~_&a4(2Gq-i$LgB~xY}5y_qZqvM8H
zz>x&|86W%>*VQOW#4{hr-E5J@o)r+lGt*W1fJsS9vyxl(l2>!i+LzD!R@UtKiSfAp
zo7>%iyg9#Ps>78M6P~Yg<Bs{<eziR4ln%?UNWL#;Hq7V}{IIloE_=Bm^PWjME!`X&
zCW&**Z1T+s_$SIE$CI=0>s^`GTh?aeS{`mLcZ?QEXJ5U1b&^!#rAbm1Ut%Y`@LpAB
zl*H7#WZq;g&&Co~iRqjE<orMISI$7M>@8ab^T`a$OY$Mtq^H0B9d+fMsgm!6hm%g8
z>D|Q5#IsUDi^Zt!?Wfu;EhWG7`o7;#dir_olpThbnC|Y<Oga(9)GN&>6qfcw%&X8Z
zDXi*X>hEo>bx&2|Gneq5?_$Y)_RP(KN9XEVMv+W~T&3HEw^vSXaox2gDk`Sg)W~$t
z=FM;Z8@#l(4NkE7raGa^sLj!L$%+XQ9xnF_cgapzp`B2rwM3gK>+}<+#S;T<@}8|<
zJXa=c^X6VYTN9zZzkgbUOmjIcbb5Au$+o@Q%FgwcAJ**Lr1Ls-aaYL2iM$h){JZKt
zu|9h6D!wwqezlR4h<@BWcR{u8I|~I2bsT%87O$8m+t%}9!Ddg>A5&u|?CZ$Ya@ds-
zB0PI@Mw`hVgIm`+@8~3LIM#JaY`f6j8{sRh&p!P-VWX<T)Ws<xU0*bl^(3ZvZVWUs
zP;UKhnd{LbuyxIr$1zXtw{B|ce^}|3Gu32sv>=Ofv+(IH4w6zQP8nU_thjW>rkl}f
z$5)?<D$`&NS#;iM^9=7t38&duz3Y^nwB}}W$3BjU2sb#LA~8#I=G9fDwadM46|K|X
ze={$yIVs#|vBhRiX6BEUnYHg#dr}vkY_jog+jB%AGH_=eLx4bvb8YBWxvdxZVp(@D
zzq0G7WA1XMDJQyGzVf);w+>RQ5(u5e(L9wsM?E||#4q;Vg0uYW(w{dQUX@gu?V-Lo
z(Ivc9+;vNrvn`Kd&ACStzCAnT$8E7|gWlKQmdbKn97j(bX?ZuZ>DF{!zE+Rdo+5M1
zo>;5;<_BbLG~8^p=Xgl}2ZpK>2fd~Wbtm=2si*EUzd1$m-A_v=lLb+kGj3gZloiKn
zd5qmH()zf-=XJ}biUbCPS{NA5pUqIVSwcfc<a<Y0vLMHn#D8L469rf$w9nq&lyD;F
z;)HHN=Jor({qygB=<EJ{dVlK|`Hs&V-{;?dvs!7%FSEGD_fhNCPqle;|J{>X;UK&B
z$8Q{t)!Z;$^5V>5pKyD3tv$^4&;QShw(ZV!`hVrmrme2^6OYzB4*q*Zk#~aAADQ{W
zOJ7fEd79r9v%I-WSN2l=uH7EDi(g9%-4wEP=2tnZ#Z^%-{SXH~-^JPgi`Rdf`~U2}
zYx~s?)vu{z-}3H@hJGyj>)b=G6WH#3Jak#vufFc72wQ+3Kj$I64)!zF(>_<tHQR9W
z?12rg;c`J7i&YjTtEmTFdiwCoxj+Twrjy+IHXDWAY^!c2SJqd){rg4BdsFNVTjLdP
zmJ8WkH#ooW>yzA-dLL}#)7MV;SGDcb>ez?n|8<||etlOcKUYVjT&}Bk>5cr2o9kTf
zuUxkOPSfq`3FRH<C2nab8(1C^dVNMv!=LB8(^S`Aj7K8)?IqRt9o&8120RpqiU_PW
zD3;26SpLacy}EVX$<A8$x(iz@l^MRgE+|p$ln`s-wl;Qn+cc|qvGd8dLP}wEC#NZk
zz4%%7Xyw@|#XFg{tGwq|T4wA`nJ2EV`>MK5&i(14>JNUmf2{pl8lz_$e)I6(T>`gb
z&TpT6{+HCuSeFQXz2hr|uSah?9(RYWzFssrVguI;<$THJE0<Qta@|^U?GIPXQj0I{
zn#Vdr*(;)XI^Q47X^C~JDLOs#QNskjxV7JZdHj=(tl-$*u|~p+qxL_W_OH`ZKc70Y
z{Nw#&X6dmL7bux9)i3ztA>hgO<>by8r{d=CXu7)f-o^az2S={+O7qTOjke86Xy}mL
zQ`7t@R)~LVj+CM0!dcs_e;l-*)udj!<)rTI4S)DWH0u@yt`q4I@Hfn8pK(pcvL%H7
zcw~=h>+-q5b2){?=ZL1hKfICi{r*LNWjd<D<DV)m;bh3~VAgvkHO;1M(zHALJ7V{<
zhpax@Xa4fQ2DOSAjNjN~K9$}q$vgDX)5SI>|5Ju;;-Ztw_6U0&JIwz~b$@*LVZUWt
z=RYhn?|)XV^tHSAciGk&)}UQW+2_rxpYgS<-EQ%l2{LtCPj1#_shM<8HfDa9a{IFl
z(~tbFtY5_Pvufq(nCS5I6(5%`S++3m+}$-@;!iU~F8ptDE96l55Fcb0wX4ERcgrR7
zqrK|KzQ3B#>^jZiS@XTslN)|+YcQ97xRgu(b2#VZu+p{tXG&Gi{u0$o-%#~4{g(8M
z3p!o4D`#37d#gqmWE?e~bISJenz(GKf3BLzM}0L4w)~X;eADvyPv1iAM>*2<kA79Z
z{jvRO{IC1gz7L;G_<e7s>OA?p*r@B5<R-eW@8bXR`SIZlkC~IVPxlN_;Xkv_&}LsI
zYwz^kcVjhc{#+|F{S|p>$7*@Gu4OIXc{w&py7w~YeD$2a;8StrmZP?v#?zOdP$|te
zat!+OBy(<d*-Wt%egD7SuOv2IT~xNa^yCjQi&y8AOZd(npZIX?`Lfl|rmZ)YYtrAd
zCR6_3<~$L7o5zVty?IiB7X<_+8WgLh^xo0-nj>=SPq;#6(vOy-bDZRR^SFP`<vPag
zeqKBL_=4+GZ>^j1>(aHv#m_!kY?LZ3PyF&+{p7^WUMHWa7b{=c;hsO|ABX5OQP#zq
zpM6oP(fL|nc4k(}boKQ=R?Ut3S$jez*!<sLGk(729f$YLS>`F$r1Ea1u*9Zkm+Utx
zPMjCIc>O;Ab<0iecnUXcv0rymTl>(21+_-27vD}@_OtEfTziB56Iq%c7B%~uvUL16
zV!i8Sxc$=6t0AT@e`wkIU-3QJ&i}8=a+6h<@$0Ni<BJ-5KF@R9loGr?IqJRt5%o@=
zd6_S_-sE&);oKIRwr|y6z9yl>J-;*7xeKq^zHnEB*z{dbg{<GIB)@1EiJf?e-Sgt=
zZ-V=FYu2wSw7cfPXTwvm*ypQDp=##rx-V%nAMX;^d})93P>Sj2t@ZOKmq_k0O%ZOX
zne!y?m6oE5ugu<7arx)<JYQ6J<I{R-1$db^ly>YZkrLoxiB+jQuuu2PlU>K;1Mm4p
zxk=r7pka~GQdF`!BJ-qNn!+TuM<y{9|87q`&-O?5=+An;#no}zi_eEGy~XwJ-?Y!`
zzYA}UmD0T*`7qpR%dK0%68CpKIC6~XTFw-vDbL<}Zl89oG&ugmJ;%;nhc8waAGKY!
ziKUNoj#aZ)a4XM&8JnKu{7bL?T~cj6UnbAYr1E=T;#-rc1qs`XdXnuw%!vEOthxB4
z$@Dqq)9$@V)Lay|sdoRCzvrsHv`l2571`;;?NQ#>yjj`8;OqX&7qs0r{*+z+><_p0
zjB6IM`7?j@DT#ZrKXY)|<uJk1vD~s=xVa(or+ZnX&_9uI{T+Wd^2Kn@jj2Alaz5*s
zce`RaHg|B<2HtR)rC6=me6KRyTsfj5ZM*M^+DWgod{@2-YtR3~=bt*y<VVy;uLV#0
zCEA&KuUY+*pKTv?S@pAJ`HOugL)MEopH-iu<?QqLTG2L<4+;&N7@4N&%*cA*$)ZtP
z^4}^y!6W-`O2&Vmm4-We^YWO#fBaa!?#A7!zL@AIl`gJR+r4GOMfmT2ekGT`wcpTp
zN9vVrojIO2Uuu7t?p3;b>1NYjHrW+(S53HkCB|7ttW43r=<e0oPhL$DRS!DzLa5~T
zi6B!47qKQ2SE<{Rjy?S>Cx6F&zRLeKD(AOdR{uBmtoHAU<!=oy%zE>AuIHs=f6jM5
zefw+ui#=!U{DLy46`f$PY<@gVvrOgLW}~O4XUd)R-0IjmcjBZKg<cg7&J_*^U8G;>
zPR{RK{qP?9&o8~d4m^_zt9YUwA{^LpZBoPB4GA%yjL)dJiMh4z_?gVIxcZ|;piS~#
z{Y`}}tQ#agckQ!zwQTc8zSFf^cD_?=Zqz@T9n0KTJ~4Lpi9_A3{Je!W8W)O|bssh7
zdVYszzm$*c#K7)emg|cQ<@WTsRh~F{(QSkDil%KJd*|2$U#(%9C3EP_i36u&r%hwB
zyt}B_zoc;aRS{M*KF!CPEtP_-Q^N16eY=wEzwXK$_L2t=wzr#4YA){D?Ecg>_4Iyr
zcA*O!Csf+9r(gNyvE_S#F1M?1w$S427oTq%zUrOhJjLixoS9UT>yPCdHeb-4cgBQQ
zZ-Us#ER9o4(sAB;o?PNH@7LZsbI&}_%r;u@<B^D2x8Ba#C2Kpy#?tBN(c<V})0Xf5
zGWy#~_TRd8w#PN&zw(+t)^8U7w1_y=^+RLAO7Fd1_ZKM%OHTBdr~j}(G&k%D-@nf%
z9L{Lf{gCcFX?66<Zq=zwUF!rc^!dm%wXlA;!*hQ1>z}gvTD#qTIn430y5Dg0%PQeZ
zat6Y6^B*qU^7he-q^+#t6F%;7nz=(Q|NgRY!874OCJ&-QN|}7sh05lKez1F>UOmC#
zpj>=Gf_0+vhl%&fCLfO}|1sbFMai^}_Oma&-+FP?Jh3Bh_`MTPeF<fLw%`2P&mE^%
zf4_fFMtW1gg1Sk$i@xtK4RZ=JICA)R)cr8#D-9+M|EK@XFusy}Vy|WXjAFTz4N{U5
z_A4cp<rmxUG>=-LcmF_!+QScf<rrD+x!?EoUV3Clfpg0nxBt;6XUsBmx3e+Ru$mLj
zbnNH632FQcDPoKED}3SApUx5#pFKlq(o&s1!~CQ7wSQ$j_N{GLe)>^HN(tAGu$Ww?
z{><w<uXiuHmyj5`&s5zf>ev#MeOwjCB$Z>%d|4<cz~Zo@C*WOH<s}~TkAAkBLg%ht
zY>>5H-?o3|f`p?JyUqj%927T@Ru}g?xURVB`}Cwce|~Ciyc9cQ*FiHjVNS;1g`z12
z;?WTT+t}aywp)B%aCJbGgu>h<3d*-qxJ)_uRTY*@VpEy$JV82FMP*ytwE1FtUDdrf
zV$RxLEe}&n%eZf%xBq~H>A%0l&G~BE-X%2XOIexL-kP}3ulIr8*27;kH}<?RxV~HL
zwc49q(-s@we6{B3SJvOVotGv|Q)|gKh<f9woBedn#JnZBBIfc!CnwMER*_@dGs)nQ
z@zY(KrEli8NM*e#wGMx>B7sSA>*hT?F6=qKe%@1`y4i%`x{SJ{^U<Y(i)xLh>&GZg
z(FvHOa$(`61It$|+|JbUO4H{PV^deB+6`@Hv#1X#Z+qLMKbHsu?6@^4sKRw-zvG;c
z4VpnJ^%GZ19?Z-PGnun%OSX|@?}|(*`I!HiPtuOhe|64krQ4>3ygM%C9g5e_PyYG4
z!sYJGSHHS{92WPx?oe7TS@KG%D?~AH$wrgFU2jgEyY%p-Q*@4gMwIN;#*B;;w;62D
zAJ|{-_x<0FFKeEE`FXOVdG+(1QeRf?Ui0qxmfLx2)4nU@9g?3mdE;k^*f(a0_g*c~
zJ=P;JO)Y2B-yKX+YcDu|E@<gfW<8nq%zOXSS<64{s6LY}6<GN5|Lwo#?)z1(cQRjG
zeNHQhX?L`A+l>^imI)>|nOVi6)I?oobR6}FUtVCfDtE`t=s(KLZQqvK{@=WN$NO51
zRqJ=L*Dn6`V9PC;U-}mB>dN07uD6#Lw)|OBeSX!gN5;Z`zgNkJM`o<p_3De=EuF0i
z5p^}QUInabPddG8|5ee319~4HO+VUi5w!lCsN}XVmG2#n6N)5rgYz9ftl6cqXpfI*
z<E;C+Z)?}BHcsEiA9p^|Kw6J$MH`FV+xNM#>rJ24Ufg2%ZTipO$HY}$SWog^clDOe
zl17#;#re<jY8MD?bDr>(W9Gt(0q;|Ou+%+`lK1<6>(KS*(n|b$Vn5r))k;~eZTlw2
z-t(K~z2d_MuXKO>oqgH+n*N(3Man-*-pe2ATJ-r})Cc=@@dry|^lpD;Up{|wn9aLQ
zzmMlNImY-o^qGgfo)uA<di<HrquIZV&xL4zu-+y)t(k${R($s}?<<qsoKssSbLx3=
zOuE@~CPl+B=&{0un6?y^$Ss?E+)goiDqPZ<U^4g0%ylnPZ{Ge{{<qzB-J_rXx!O1V
zvH$Pu{^EV4c~Y2~ojU8JTYvYT|NXh@qU?V2rH690-7k7LGZh@XwKC%6k~x2cjh3!?
zbJc?Dk@4p}?;dY^bMLtO9F;SlGv4h#D9`#%;op4c1F!$Mbvc)$WW9;FcW=K%y}9`0
zI~NMhNw+)P@k^F*V6hPD%-3MLs~&S<*Oqm6bCg$k%;qpmsuJ*+wIK3Azg^YdH5t}?
z8(MEqR*@3nJra3D>fe*N<%tcq6Q)@4Z?l|oc&>)ky_nE<=e3$c&poJnH#1iJX!-y7
zt(#uCS4s7lx0gS?%Wi$)Q~llTrGHcO@7N27?iD<0<!8C#sKSGX94_nqU!J_Hv|~dI
zuhHcA1ex2fBZ~hm+&JC#=>5>#@|m|1H~Ze&rZ4HTlCdm%&%G^g=C&sa`OMdU{#E(y
zH~U4)%*v)bEb!;w>|UM99eSg(=->MKhudx|Ok-k?-FKhk?9^*Vtd=cf*}nJS)(z}(
zXStM%{>qns$=j1G_qR(dB}Sw{Ht@!Rdkv3o+*E5{e}8h6lQF0BwXg}<FQYUb{V%<C
z&@Nx!>TTf({eZykLxxd|OT2{?dV|!elY@^nPcu_K+Hd?PTPJ&gl-d#({^e5^UzxEX
zAk{S`=GftLD_b+Ce)`J1@5GY?myZsOGtW#aa{ByN!d39>2HACAzu!~zo&G8;@{0bX
z+n$pj&ym0VbZNSR<(Y3hf>#Z<m;8!cFV)3<c1cWEk5`S$)ougT8S1>AhxJMqEXmN_
zZ1QzV{-)1r>I^BtRo~gB`!zXTdiFD>*HpF5pkB7tqr_q6LMx9gt5($-s0*}2?%K#%
zcI02wmR06!{1<*_{@PM>N^hCth1Atw!)%?@?>F=9`kj{SwzB2?F2}NM&vKcVuWN@g
zmsJPPGx_xTMb3wB*0UV?{9kVna=*kX{8C5t)`w)@!aRnX68=Vxr_41Lb}LLMvDi|w
z*F1H;xv<*(iH5$j*xP^njF~+rY@Ofy-ybb~t*m15clxc1S6?*$&wC?T{>}Rr{@QhE
zySYrJq3gW+yX$8${p{?%dG`F0ZAr&Ct|%^j`i5VYyRvbq7w?-}Ta}o3rXEz?G{2Ws
zu*Xrzsp^@-#6-0=0qY)>$48e;?s~ds>-X7y65c^eB_nFZ{@z`BW54r`gr}<mI-Hoi
zmE)tXb{<SlHsAS3S3~xa0`G$pbNj9T?_0in`J}v-7ZVxEmUcT_&wII6|I9m+30L)P
z<3;z1cQ-xoypm*pwtVsLtmP@sk1R~ceUjPm^F|M^=)3*0kuz=PcZ*fe+^z1@@q1Bb
z<hz*$X9Uihq_i`e=$f5jUR+pw^T8!<Czl7ST{8MAqe~)gEKzb<q7|5z#<%O-ZK1xX
zi8r`6l`i<i;m|aDS)+~E-aDIE6@F%w%I&W|^z`iCS^L6v#uwlGlV~xqNa)gK1?La@
zqVvVKs<)l052#o5ou790sm@*>ma}_4M4V;n=CZu`;mFT(o(l77?rKcvDc7_7ogSEa
zCpNlDhVScEOHVcq=Ig7)=PK^djkx!<``Gjlp6)=2z-bC`4c&#O4*b~oUX@8s-fqSO
z@w0;R9$h`M;Y<H5f1ca*QBn7Qw(j@vGb)>Zf3!buxAf5K`w0O#{wKe_{E-w^wXZBH
zV$s!zhbk)P+^nl_ta+B*U)pg^zx?_KW2RNlzkc2K+)#4nUXN$f=B1zhF?m`o|MQmT
zm!`FqUget~bTz**qrjSjt?7s7qb)Dqa6Z_;v@JO=n<4ZS&rGS;$0G0SyuQUG<Kue!
zr4#bgp1OH-JQr5Hy=1q--R5UMi<9o$xBnorsd$PVi`%n`o5y7j+uhl<X*2JA_9eML
zKV0nf=hgRMf61xMTyRLQcfs|CUrgV;`~K>@*1{>P*wlmEEWZ5Lue|uFT|JlMVPfK?
zfZ4nABn@gzInFk|{e0-@xmD6%qZS@Ib2|L)&)*)7cNZ<3^o+?__01&yKm0nI?^u@{
z{TM&(lg#{c*Jr9ppInjniTSi^u;@L5?V(Q`k~}`|@=m$$by#>=%va&$1P{OErCn>J
z>v@m*@~z(1%@?b1?m>K@oUd!!DFOS=!gWic)|?5;lUdrRnSUuy!ie?BR9Cl+C7~5-
zmj8^HTIo}`SLyiL?M<Oe?Zo~>s7R)~x#eQh@|jcm|8(_f3o9HiJr&ulVVv&rN`Gdd
zYVP;?Ei<D0&T0R?TydpHQoTR4<x9iC@89DUzsOJh#lK>2N!4<3|36D!>@E6qj3GqC
z%uVxRqTs{@0<xUyvs6<i{t?(RF<prHK-~P?a<ShlJ^3EJtBg)`;NnZ?J)3>McJYLS
zsDpQt1p`!kH=ePX79(3|An;Tm<Kh=y59cK^P0i~yYNnZ41s-}UIq86T!L9|3{ayKe
zy%Xf#Z%GX0`tXQFMIz$k*EG4;VFKw-*cUlQ#c%%<AXVk#@iRs7%&z%sE;KNo3OKqn
zlh1N`V^_~(-KYQjlMB;iRJO9~mu_yc@QR7b);?#wLq$wUr@e{GV^X`(qubxNPV3xo
zT<~E`<xPX|S0;bA&hOrJs(Nkv)j3`IrQMS?zWZo-W^(ohS|7?(Jms-sqek0D+w+ru
z?7#WZo=rD@`Q=X*b7apQn98s;(OyTrJ^0M4vTM&?@BFxSNp{YK8Im(Iu0J!;lnhnv
z*<i`<@FJ+@asSJ`@9(tro0mQ_RLef$W9=cx(quc+S1m?Sy~kZaU~|x>?-#s}{bvYS
zF{9sm4QmDaSFhB~&1V%B-kKmUzwoQg{KnI(*T3Jfw!3{=oZ^|V=YN09{qx^cHLPmF
zde*~=NA9Gy_ykDx2D143Ro&Zl_2##I$IYid$aOd}Lt#nr{%v~`PDCxwDZLjzH=;Rm
z?O~3#<%gR(9d_-Cs|{ldH?gp6bWBs7r^({3J1_2se(I;!%Mv6X2Zm-Ja<ncGa&c7A
zv#7f4Bv7Nw$o@`pN5;{sFW(-lJ=(it<=R5)_MShylXCWQuZiETcKl<K>4)=P<-3AY
zxkMMuI609!wykWRwEmupwfeQ6)8iWEeQM6^ai6nCzO4JT>BY(QTTg6yagm#Szk+Lc
zdALK(#=}1?LvO~t=<xMr-~ae)gn?keD~VNchpl*Hj@LPu$4*SkTWqN1;iNp_ftqx4
zd-?m-v#X+7dZsnBu`vDUY?7C5jwu)NoK@redews7``WutuKIlH<Elj2zwf_m%E<D!
zPB&X8_$@&(aM6>KK1n%0^~C=1xtn`i+fVvzp``pI%dWh->&u1{<t>{{5_$j3ywAOF
z%lQWzHd|z$NzE>7R-Pc`WW0vM#*jr}$1RqbY%fap-0Yv&B4a1`JXq~-OyArC-@0zs
z78E<Lf4$}XQ?Ub=bKZpOI8R9Iw~FDFxjsiC%7<ZQQm$*E^sVCS%U>BkzwmZ<v>r>y
zwxa9K7n+|x-5z(WNGV9=0jGw<=U2k*FaBzJ_*gBN*3F)1sCdhd^D~c<-m@>voHi{R
zezo3xz?|6qu(zw_(V621&6GATo61<T;L)T|!&N<#-Wc9^u=zx}MxW%_?w@~`f7@PR
z`L3JI*xW8G#G)vroue@(G{pbM%j8cMomyfpCP_)lyBaox+vu)|Uv$BB{Wdp&Wrca)
z=9_;uJt^K7vMNet$>!wNgurFDLO4D#rMIl)T$Oo}^Uf>pjCud>@u{krwe5Z;F!iVS
zI}NKT0qI}nn*LuWc{9fCKkq5gG)KcM>!UwvmOWY;5_+BeQ2mS`=JTd@9G#O-N(!#>
z`&j)idH)#&X{MRxC%?r%Vk&oGIPEv*2**<Wqnvj><-XD0KJTsimz6y{Oshq$UKal`
zjZIi!JlRuG+PyNp-C*y8oTc3#F1mU=Gv|F)Xc*<oxBawEXzK0A4cC^c>n*!{ak{{a
zOKe-qOqMMD7r3eB+K-g)I#;)zH8(E*qou)i!C*q-X*GuhmyRvGK5yI1-S^+#o4AkF
zGlOl-i6gv94m^9mO8h!DZ}~K7z3}XlNB6zT(cD&gXaC9Vp=)d1ms>fp==3<*?-S6M
zTp%7@w)~)ipWLJ#^*@S_qgH+o_@&i#Exh=nxpm{uHY;AK)jcmZx_oE2`ag;7Ba2r4
zoNlT1RI5UkrkI(Viv5D4ik{C{EAUKHr;y3lRZsU)+1qqCkADdt?ZZ8Ic3t{wHDN)i
zLZUHix}ae9>3^>uX(ZJ?eKRk5fmM{N+}o|eGWWkf6?`8f&H2<WYD-kWu`1u63pib;
z^SpX!vUbg`n{PHV8dS1wTg=8)`SH!(mg;tQvvXH#wrhW|aOgMs`sVHAHOH$3FO~Y=
zQqFSLFxdD+Sx=cWb6UlPjtjlHy=Oc!tWy_E5Ls|ToqNs7o}^bT%bJ1$7AVdPty%T*
zWZ#5k0<V>NGwfHbwaS~(bK%tvwyqr!E*mW3m%oaX=Q6TdJL#Lw*B%FBv%mv6EBTV;
zgu7-$+AcrcdA?ctf#AmUwk3<6>7KOXXK$5G(wh+{u=8@=J>A2~Q})PjK6al$>c!)N
zub*=AHm%uh{_J?)i%TmQdDX5)nfGv=)tfiXC~WsP+dcU^TwSu1cid^`owuND0Z%e_
zghlYtSDSWz*~Hgreo^!MnoV=WIAoVi<TDq!GXJ-{?;?et7thumK3cx9Hey|pz?Eea
zOI~c6aO*<ORQ1Q_M7He6ySuIb=89uYPj7qd?@X%RY+kkdd+yYZ51BUCveMfZWNtT`
z{_{3_eNE(|-f5kjGjk73INIZ4A}sJh;mbq2@W2m$mn^xRy6%9U;+aRU>(Z7^Pd($Z
z*`!BYczW-TMT)ZFYaY5PW%L}J_3eQ`%$^hXV%8P9aa-iA)xEN7qF4d*E}Or{TQ0CO
z%y>OfbS6JTsL+{@=63TP7u`MO_M^;omh*}VA#Eq^h|4EfE>`NM`s`e(Zenuarm%aw
zy_Tnk(S7@h?h{FoGZeq>$Xs*OcmhY$s*XiD0ZZ=++3eQ*kkRz1>-n5Rto5b!%1fL@
zCR99Y$Q3Yse}pl$sc237cAsr|%_ny4S!(<9kxs~^RI9@ru}+<f`GmcckJUc*;$5a9
zSg6oelyl$fgTRwliziR7^^ux+P<juOa`|HS)yrl-W3e)kxf1b8Al6(zB3$NM+n(x;
zBGTvd{lz(NuXvql7JtX>+8xoKnvoIu=l!#!w0i>M!<a%j5AR<Pp#5N%Aj|If=9BwV
zSQp*U7F+Omb`VQy%d4fTj!ZifU+TBFZTdRH?dWFbgp%^rs_)yyyfxgkx(kFlS5BMx
z=%w3(b6W*ht3*m~vGkBMcoY_S!)n)!Y8~U<5yFx=3o_Vlh;0?S?JjlS=yCQU!+6i7
ztu}m(QgTIip0gAlob=~xTVY**?&`UYnvUyqf;|KjY~H<8aol%dt2V#+s@*(iCiiN#
zMU>BBD!g<|<JuOlpuUU=x!F!P`ed(e;CwV+taO>UvbaI_$NdR=E{TcXco9+f)^$~Z
zvf^Q*mDBwDC$hD^J|7XW{hC?8)FRQ+6E`+rxfosJ&^<+ZbC+Y4%n82*H$qKj$1n2w
z@SQ6?YUi`-HgRHy&3<$r^@?wO%XVtvYVUIg19Z(8vL(&rWJRM`8EW#X-zLTPwjNls
z=vbfIk<bi*=_V~2T)U>ai7w@;43P<Wwoq8F<Qii@*sbQX$7P)}3!T{{&p15veJF0q
zx$oVQsP2d~?dascStm~1t75s_)oJljytqc;z+s=10L$gFUuWiqp1sui%iKM;D%w}l
zaqE^Ck*K>Ts^YSXveahry!KvlamnqB>W&_kv}-e$9TIbu_s)yj8ErZ%<w}%psEMbf
z<0-jAAJ@-VbXa2FwhRT!z5<8S56`pM&t7x#R8g$4dDfgG%X?x>x`dPb0+wViSS6xi
zkyWR%!R&C{CBZ}iOSYIFw*==ZDn`HExM<M{<te-T_?sMGvnM`2ku*hBQ#JII;7P+P
z%SE<rztP6qdhTXx)7f~ojY6yJe>@j$+Vf(|AMchqrXEeq+LkvA-`d7%U2C2_Ys1MM
zTX*_cEZ)CY=1H>mNtGvFeiAW%IUE-4jdHr^(Czwh!=?OZH`z8W?GInFG3R(BcVUat
zzl(XNH?XXm+qgX`A}>+g@%O}KO0$v{o>-Zod&GWz->yIpr)7z5RWXILx&<~JwTRPS
zQ?x+f5ToGhb6dOn`c*VjC-y87eYw@**dtDzfIUwS?l0{~J=pbKK=(9L&&Q;l5876=
zFLs=BR?+tAzFprgelXZ}TlL6f2A81H4E<i8Ewj4g-u%oAh!XQLo%=C0Go^6Zsa^Y`
zD}5JNo-khB=Tmf6;>f!*#aef|PV>rcOZVx$YRTXGaf{_P(@T<7>8!W-nF33KIMo+T
zlHU4UUVNv)jF!(5#mx!FdsrtbZ8ME~G4pufdP&*et1jv={eIpsAwuV2>7U>3Qqi`P
zJGSQfRJ=W2lX*EyM#`nr>>wXoqN%V$XL7HZiY7Oc2S=yOG{+ldE31C)<*?}OY}xdw
zyP;x-Wd4=66>m=;k7*Bkvx!AYrcFGya@r}S>F=k9icZ|{;ls{?&bAys*ULxiF4a6b
zZhN)&(6P_g4{y%f!*#3gs?qI`4cmI+Hkq5AT=wUnI;UF7qZG%Ot<j$+3H*w9a5}6i
z;Fx5SX+hM3<FjuhZVjHF9Jzk;g0`tbGd9IdjSrKq;7>T<5@7Zz;3!+{*NkH-mojz<
zMozQY_)E`gH+S(C(Z?(^mM8d4+pXQ?I?>GP)3dmJyCP;9$*-Rtdy8jHj=)-x_oofS
zjKU9bOy%PEv^($m$uIW}`mJ~W&5yrsHP!s>o=avGC6et4>CSU{R+<`Sy_&JtM4A1i
z>3LJ7fY5?PZv4?g7jAOg);MwIz&?XwhmtdEmW1TE6=hjzTov8;HlyaOQ~GRG#)@v0
zt5be*9aML`wbbSEyeIdsNwhW@dU-BfQp`0uiTfFgiuEGbVAKARI~f|?VitEzX0Z0^
zm>)B?oFo#mAVA1(j>X0MySp=*AFb>#zqtAGx}`eHIt_EbyG*nGv(x2z>5NSiisJU?
zbYyHh{)ad5o~*3yy!*xPwWnog#3aNS$7F=uRN-q-npJn|Tw74H<6^<sV?1Hz?~WEL
z?C?-Ms_SSRZMbQFczNXUc=3MbjKvZnpB{=b8ht%v@Hb13L+<*Pt)6*4oo1&_X+)p6
zz9ykCvt!3JpXX=StWwauY0#DWF#Oqk9d+pkemRy*s|+T6T6W*O@{vJ^;?Ad>9PX`m
zZ-1J)ep^OPWBq=~bL9c@ue2gBe_X1tXXT6E?~S%sNbGz4UW>!XMCtWk>nQhjff=#&
z&7UpG-M{~Sbz#E<PPs0*;wbiMO)eI<E81VltYnVfaP!`o-CVPd1ztI@W0J>Oi*sjI
zv^P9#ZD?^@$lEY=<z)x<S2I6vDl=R6b6Hr$dl%bF@s9D66#iXazO5u$*2u(Ca(42p
zl66nHjyRWo@!F}w^yjU?d+#~L%oAAz|Cts4bhKBww)fZjkSz<izu#A>n`|Q(&R28S
z+<9(z^pQi`OmDqrNy$9;w0XkElkAJwnWz6O{eAD362IKpzGCiw7vsZU%UuiBX6F=9
z?h{DTS@}p%fa`38<K$&mvMcRaKYz5`;Px$l-}f6Y_^k>O#TU+9s&n(%v*nFb{!CEl
zJd|<5p}%2<q}yXTZR@|;PN!|->Tku*{SuJ)_54?_AEJt4vf+PE@>Fk-($fttn6ROP
zZ7aX3RJ&i|u6tRZR{Y+z;M4gjE8>3r|MVp35i`SyX9lSo&%`$d*4pj+T>j_97MZSH
z5*lF#ui7)sZ{$)5&sDs8;9d4?$>Kx16r?hwW4>=&+bJtLqc7U%;ID~%7r%UryqNR;
z&dJAi%Ocv}@5*2P<J5irn8;>1U8m+2A;BN-6#vHTWnX5}EBWo?ThsPKEEkI+*%BH5
zcymqE@M7p-Jn`S^zKH$$ef$2@>s?oQ=F+2PsZx-+q_%F|`im2P700gks191YO!Y<m
z&Pg*T_1)d%RCu%FXy2sfh)+K9Kj#-+byz7G^15xYs&Ng^xA56t_%m4-#C12{R}d`P
z_5AUtH^uDBHaH#OGcw;IDJc*+>9WGLy+Ze1{ypz3J>^r{7vDvRJ}u_Pljkr0sV^UB
zxHCTWw4LJe_9yDMT0ZXW{vfd4cp`7@dbxwYeU5KzaZdJa2!G)A?!*D3HPXco?}{8v
z722QacE$J61^?a?tPEAHe_Z7pkEJlbJ=N&FX6E#3c^R>an?fa~9DB;P>B@pRn^l*+
zx%jij?2gh)?TYBbtuoWy=4N|4dp2k?T7_r|>OJvn`N+f5%ER$*(=+u)VbYr>wEy_I
zYlon>tbp(x=8hI+K6X*1R;~q66C-C#2$=9jp<~A4Jq~JZ4EOdu-d^cpYw?A-p`ZKs
z#T^rU?&MCNubG=#WNPs`((IuN$37WrjwN9X-Li~{{#^`9+LmqzKBT3);n0#GM??26
zQ7r*OlUd%oCOhjybqcGVHaXduCG9Bt?&gx&FLv#)N?sc|S@yJx^O;#v&NeP0XPhQ2
zo!G=skr=fqA~Ue{B4bNSW>%A{@N_{{?-kRPSXXE{DFiOh?KZd~oyXdD<4DtyPEkRQ
zNr(8q88P|XczCZ%XhTa(r<S6lm`&R(=L;FzV!xkWwC%3%&hIA57G`crzDw8d@-l3j
zbtL}o=O@pu^E~T0E_1kg*2Ty(YJc)Jgo&A(-!|3rS~zQS<%VZc_f2QHr@LjeOqrys
zqSo@xWK;1^HvZz|_@ZrJc;C3#a5}Eb>h{+6s0_)doYJ&p)}foxcmMBh{LLp;x98Bk
zjE&nurnYpndImIJSUN2*bZyVlUJa>7yc-@n2)@`Fw%}EIe7M+DH=((Agl7u|Ow-iJ
zN<Q(8$(K=KVaQjl1yi@GxICV2_mHz_>yKxTO}4(-bZoWOjUDWo6BHG_-%fT67kABB
z^hP)BScK<-ld~s%5Bl5lXfnHQ)$S1HyEDsd%GFGh7VJ9SJUj4J(UFFULZ?}M7f+Xn
z+4mu42G<{sG?p}ji)NvRb(Ad^L{FQL6c)8`MN%styU9N3I~%z<Bkms6%j|V=QrT&I
z==<Hc@7q@Tz7n~9<K9M9=5|J=rAe>(yo}i<hP8+}GUzw;@Rt|$Zkyd<^-)_tb^TfC
z4GcRQI#SwC{nX6<AkH(<Rb&bOMbTHKcDF3d+wb{2h)-Vr^7+)sQIDC8J|&$_E-Jg3
zC$Dkp+QiaNrdRHB*BmHt6f-MTNS)sETWOAZGB;P+cA<ZFH?wmJwjDU?r5tpqTvwX2
zQ;1ho@|&wbk+Id*>uyoII9CU>F0s6N!Fl3zf3p~=L(|!=nD((wpEq@pv|-P+j?Z%6
zZg3>7HkvUd=z@v)RWTc1p_L`VEwgo%KJvPH9A0ykrJIX&$Fh8(ORgV+k9!yiT^A28
z(m$OX$~D{4+ib<jQcayb&+F@hxBg%a6m9RDs-yozqf*6Y(&JzTH<!?!bHdB}YnEQ!
zb=mBijr`laEk35A*>cRD!oP1<&RcKy@r}Hr;)!JoD|gg-%E=4NaIP;>`?^83QilD3
z<$Ct_fm|KyBcHfG4GDOceE#HwnFfkWZ!DOgz{GC;`~F0uN6`=D4zyWyoH$V5$*sb1
z(8+vz!u^u{K?eERBKIdWe-aF5{r&IGGt>RmJNJJ7Bfcc~?V5F4V(RW)o>lz)4L@6?
z7`N>9i>qd+O<K6b-n{Ybe%{I1*#Rq@cIat!Z`x`q!g2S|nuW)r4L*5`UegusnUMVV
zo4A^?Qes{9(``A2zHd*TtU3F?QU9I9<~tox9dTFZ7o3{&a1}S_8RIQ?7H(Ws^6KO*
z$FTCXq21F$gT!v^pUY8v=B(^@ajxhJgM8f#|6`NN*lx_)T6s*weYdl>p~0=D1jRRn
zJN55Bt*I=lI^9s?{eAc0S{A`)@y2cvFFg)<M0prj#B(1LWMxa6&2zBE@$tFbOOp3z
zSU&%-egE1YoC^Q?F27vmqU`OF%eyywk;qCrO}+O*%bdT&-ero?)?cG=VD{3bJ>2j7
zw#Ycl(7WjRVXlFcqv<4tg_(MMas0yTe$4;z#O-U=CZnI$`kOBtJn>7Ue%|(Lw@#P-
zJG-4*GJ41J`)_|l{eJrS_T){^{+q`28D(9L&8&Nt@P6*K_Jyb47ykM0-x%z4ZIb8e
zl@&KSce0&(v0$Zwe6X{-w@aXlzw4QE?p_zppA8E1J{5SeIMwCPnJ-7V<33GZ`LRqj
zCg4lXS(~$;eg!>^5@pobx%=*GQRdi7HaB~+zwBZy+UDUV>z2(Y${QKbxAfPuZ}(d^
zOuPNXflcC!Mty#xb^F4L)*K4%R<bJ`IfJJ-1_;lvQCo8OV(0y<iRvZh=C$jzYoum9
zd3nV$>~Uc8gP*+b`Ddkzx=qTGnZ`CJQc8$dQTg7#^Q!S){;N&uMC|&#l@G@}nY7sC
znc<b&Pcv7)-L}nk-CP?Dl`SGX7S0X(!ls{@wQcT<?vIB|n#C8dYg_s*#caj~hnwM%
zm%bz^f1jwUcVJb3WylxD#+g+YVtJA!W}G`!_4)2sIsd7Q1)qaXdnIp-I9IwvHkf64
zc!~-`Wo=bP$@vm{uGIal1_!Lt`F|aI&b@1nUbbaRbjl+s&XiBLzyCbF;BqfRMnzZn
zq^<)^oLU=V`<Kt`o;WRHdH?JQ_GM~ji!a)(JH2ae>&lyZbBjNjE6OkW?(==yyC-H#
zei?OHmY97?UbK!|@<E2u>&)_YcNsDH`%@oSzi99d+52X-TX6DKFDb>gNS;M^S^GYF
z+aJ9CD8HV4=eyM3{h!Zl;*5<onItbCxq9u?q$}PmP6~(oHE#&tUMbAD-E7-y{pXS1
z1@=`o$78?Q#n1f`@n`-&d*>hbCvn=G_GaYvy5)cBnuJwu&6SlRC$xV3y}jdYmCrnr
zF3XeFyEH6s%`jTiUZ?*2QSj;h%=QA=2?CWFTd!qk{@?ybFJJR-!=(Q9=RZ52+|RGk
zdSPCE;--q;`~@#<YXy(k)aacsTH$Pb?Y_d(8$Z63N;>Y`z3Gx})SZV{J@)L5Tv)+e
zsnV-2EUlZeP(XP@i(uw5=_M))IYZRnSL|ZmRC&2I+`sUmyW`}92}hK7zrXadU?WpI
zx2^l7g%1|}viR}od5y4z{>k}yGI<J``{O>|PMr}D`%rpU=j2b@w^fM8Pt!c^dxXo+
zbM61tZ+_PwU3X4?Zp8(qH!I%;oieWFKPt^;x8yVb!(&s~H%R=KTDJS=&b!@z6DEot
zZIUo<K6$!wzq0I$5WT3&FAa_s&2F+fJpIr{fuQm^HXIohFJCgcI#|mUF0g2LE+pV8
zdGU|!-Tt0=0XZD5o)gvQbM3x$va_rIjO4F7JHj_VjefLe{qOj?e`oohrAj&}UtjRF
zt>BBwY+3fr9=5lleVU!imQOTdzjpZVmu&$eyZAOSGTE#<=UVs9^US^jk8+M=&YU@S
zLr3hNnX4DES4^#$)#3GPd-#p%wieQ>TvHQ|PHlhuDPG{1=EnshAAeV|uD{`7@xn@w
z$6NkU1;4}mz?1VA?dSOTHj{OUn}qjKmz6yUy*ie^Cp*qsd41Kb{ePP#Y4tj})cpLn
zdF{DG)}7C^=bhEwvy`Lc&UbUpqb;AGNgY#dP08l8EYg{uKKq=q>I=n*?;nW<Y}#gO
z%G4YlR~7Y-N8F0(i}evDDH#!qc6Iac<Tl+eS@Nv143?`IzVvNjVJ@sp(73pSc_)8*
zNyxHu7MVx+b$@X7-mg*Wvd-JHXMOcsr?ao`Oi;Lcq|M;gBc0<HrJuaMdR#Xwq&k9y
zhyOz9_w;>9K?18*q%vOWRCl-E8nIZ4N0YbNh}(zf--o0y{lE1Z-~ASpR)i?M)H!--
zVUOR9?v%snc6%49O*s0~oLQ0YQ}hRC4x0r5KYgpb4n#iQlBlrvWYwDM*_QvppRc`Z
zJ9V?rVr%a;58iEm{O;h*OaAMUo=Bz6)V);V-IjcDmMWuZf8dsdTX#>Dnk2sURgn4i
z)iZgEj50PYWWAsN*#AuRagVK69`R5A^nb^nC+v@ZocM92qvzO6zyEi38J;}N9o{2m
z_TlG8SD}taL5IS&X#M&0C_aAq!HOrUNqfAee^=`3iJ8V_*Z0t6o`IKK@U_#oSF3!@
zVVl)8(Qsq7;oDR8%<1=jgthH=y<Z;x?E3REtBn22zH^!7ENiR&=G-<rv$xZ~)yq|x
zXRCLP$EroEnvNu_TGeGJ;3$wKDyd^F{LJFKS-oQFZ=)jL9m(^bPC91A-gT1wW1@T2
ziI>68mc=Z5&(2h4RdO%nRq@3QS+gcDOZ)gm_%YAbtvl^?w+Y2=bB*<y%Q`jQMe5*{
zWQ&x5G-DC-%zqv19mk&DTNt{6Z_CWhiRL|%)`&(b&MVFA$lfIBt8p{C>o3E}bwLSN
z8oD%2@lTo&xR&=}&&r?=Yx`ddbh9h}(>5@WeY{sJ^p5<Utq+P?mqz4lk(+U7>BQe_
zBl1?ReA#QwCA~s~BU|j`i+<OxWj$vu=T2~%^zcH`fw^J#H+|V5cY5hR3ETbUF;{!C
zBQEvanmKz?-XpKJ%mbxT?y~#5o7fJoxB78Ubal-Y0jsQuPc|=~X4u2KG~#E>Y7eJ?
zrWwE0HXC}~5Sa1J@X@u+N?m{R+ka&~PVZc+bA{#0z4XH#+;f93lzh%wsIHulJMX1@
zeEwqQ&K(E%_zh!(%IwcAV|QlfW#<iBd|l&}(ALn^ufJLCoo4qvguVB=&l|%9ac`c_
zh}27%GUaW~w_@vOcPiyWo2*=K-hXjc$9b!M*Hy{8OV5?bFAr;(-g=(N^Xx&XlPqqz
zOR^^$u5&mrEhqWm`xh2ZgPwAiE#|mt7kcu?%MVhFPR?wv3~q%<as8N4^v;`qu8kaf
z)3%>;G9J$3{ql*g|G;eNO-90!(_a>(+&pf%V(y)@8Xc3?zWWs#&7+ZMXz`u1Jp0_Y
ze_O9DpL?_T@lS!fpZ@Ay$=e=PG}mj(ueG~w{RpgVS*dGWdm{5`-p)2hU4___UDdfl
zoF>f&PV6cboMfvm_kG@pkR5#|Q)RPsYxAm4>qo_XPj)VUn)4?A*PHeGOFtRMJ-zk!
z=E+(s&U&-2-yh~wFbnpaxRsFS_E@^jz+_`fMuZ!G=~IDTp3Z>Iu(*&VmmY~koMKht
zW4SSvU4gU7j3qcPx#iOO7hP*)w(4Ee5tM2z*&QpgqEYaYzp;`}!$-kQb1U}#yms&F
zJT}J{i#`}|7d%#P+{bwPfOgC|CWT&=&TkPb%#|2Cm&hkYZ!EmA|I52o&PCSo)yH4G
zmyq;PD@d}<-u$D}Si<6D+sr2mdJ>Lp_cK)YV{cnl^6Evlyrr^vHS<CrAs#JzyT$Pn
z3a-eAF08gGzo7E*bQ8-CK?|3umj(Mbh-coZvv)Z7aE@5jqE0qpCXZWAO#jsvJ0Cmr
z&x~8iQQ_~?OF1{hwpJT`I{bS<#93Kp7Vb^V-n-H^KM~!Y`1{|HT;^(}u*1B+pOruB
zt83q<x%S4PJ;_NCz5*I)?ejzo+H>9)woK_hebm1G!C`le=}*tUm>RcUN!<6G$`=On
zdz|&L*YEOejlJ8yLThjR>}lfj>y5r`;FEBCyfF2$JAc8!S%*#Iw3vBj2~7Qb<l-dd
zcVQRW6&WSHN`xbwZGOf2{w_a}{%2m{bDn;C<FuKH^VOI9TF$`MxKOKk+b&CGG3R?V
zjo<xGE=zj2Na>~g0+!C@3r}yH@{EIHk>KT5Jo6{BJf3#vowroWqcvY;SU+~h=JUrs
zeV4Uy#w6w}mnS#w7+*QuKl7yQee2kdOBY<~Rlfc`?*3gtp~by&t&=Lm6&t^|ai;D+
zboAI0qle9RBi<i>u};V1SNp8jdXt{X3cWfJ{_de$UrU|b^Yi8nktUjlYVP#h;hJG<
z$$9Xr>HmV|$LD`2Dyctacrc}I={$4&(@g!b?#1b+a(;*Xk!SnO@m=nNSHJFtzA`si
z1NUo76j_Q)q~mYOoqgrWR<Qru%Hu~IpH=VM&zRJ7u=D?eIY$0(Vw`O=jJ{5(oAT<M
zO>SG=<{VL-x+!&{50W;Ad#_LYQ_|zON%hgMCs)H$*B{MQ?(^8c(bMkC!MU<53^Qzf
zue@Ei(9y+3$A0sp4<E(DR<C}W_VJ*7p2oo)|EAi7u)9TZYd4&ow@a%rwL9VF569QW
zr9#?IuQfUeO6#jVzvAj+kyvb5&3@6TVih~fuKrrL(v!Atn(e=J8Z_83XwPq8mo=K*
zvO0`)!>?sMx8i=AFU>8<J2Uld*6#!U3@JAv7H>{|pMB%i>*X)+@0h>$<?cx5-zo?B
zIoWJh=tpzCu#ft)N8DKZK$-9Aou#2R=F4SdeJ=f0J{iZp+RgmW>MaRx{;j^bmaFK}
zAM@A$e#E~j@?8?h<@_s@=|aYLy=UKl)#qlIUE`?P^~)pN%D1K7<d~3{=Yd_DCYU=2
zhzEQ+yLI6K{p&ON7p}U0OU!7}^ydP`OTVT(f1?pG{ZHwOBHiECbJs6BI&t;R&9Z71
zTjxzqUBuq(7^V=gfzO#Kic4i1r&^_k+11=!eO;+Y1Kq9buOD^{4pMV?DsW10MZ_$Q
z6B9P>nPc+byzuPpPlgO-o4(GSd;i6A=gL!RTS`;{1-dFE5;$)d#VnB)$$!kqZxQWy
z>T2aFd%w?<qQq^aCZ!6gr*ViZ@85gVY#q~4ou}V*BJQsUxOj4U)MmMbW?Pr+-#xpa
z_Kesu7ySm|g$v4KstyaS&6!oB^1`(CU8dWb`{&IgR6CbVTRZPmD%Z?|*Js=HygjI3
zyMFPa7YnCNyMO<p<de9{OSj|e!kRYS4zS!OKcjbFdiI=eA0B%@E6BL?^uWcWLuPka
zblhG_Xzp-iaCFpK*tB0=;IV1rO6i#jg;jU|1TdWM`KJ27Guw_$RJz~OJJ;Scu+FJ7
z^c-(y{_OaOOClzYTFqK-H9dQ~UoSF!z-G8>ci;d09}?BF=AQNYa{j~<%`0=AT3#=`
zY??mp>t?~N1{rqSj_a&^<tgMnYgU2V@#BAaVs4p-eYBZByJgeX`Q?ZBT)!Sa&34$f
zduHOPP21R&W?BZ^DofivHRkBt*drC?58mpny&Uu<Bk59drbOO@-M@alVte?gY{t&_
zZ~pS#^V9$EX~nNXqqxZvO)YI7_zQXX-Cg%IOT(A*y5$-{@5jNiZ8ee>ViSC$%(q<4
z3lewGkDKD+w@u3HQ~Mcy*}pA$Ti)=5q*m{rJ!|>7j~A<Ib~x-`kn9|8F0i+(W^R&D
z%<PmC<sCmvUVhnk;D@Yy<n@xMWea(@HkMd6&u|P_KI<tLleF=?I4hSjL52Qp1)opJ
zcrGZnZCU4Z?)tl5_fCFm_B(XhFZCR=QX%&pRSm7DHKq9#Grk{mm}T`l_(0^&s-q5@
z+<*RSmYgKla;#cr%Z3k^7`oVxiB;z+uB~#GUiv^KML+PDee$W#*)~TMzh04bS*pPn
z(34%NG3SNB+%WOP-|WuL^S530yz$f0eDjZ~i=JO?O*6CLe*2~Kbx2T<)9)=d@51-K
zdhpNhNwCGCiAKu$5o{}}?esqsY?(Kap@>neBPD(7+`EdG9ZJkk<v-Z#@M3}j^Q0zC
zW9}#u&7D^-C@G~)TlM#^)U|BJ$;!0>*MyBeUA8wcKF7V?G5gZ&xU@;zPkJ#g@MbFf
zsgQLmx9Q`))iRP>mBc>ON66|wP2*hpSjlmXf@0(0-33dvqr9#KWJg5WUz`#;)5uQ9
z?zwx1k((6zGv|$h@y+Yz2(K~Rd}vcMYqRAH89fu1{YG9V-xb`x|K#4?S&6a2mMS~B
zPZe86zNraakhhbOd%`lgW9Nl`m>t|<{W<mYT>ZvNSvA*!6z+*<lw7UevY}f4y^7HG
z{e`V_Z3FwJ7w(b1vvmin4f7SB=Sv+n-(G#9IOF5%6R#{o!(xn{&s(x-Wq~Mf(-U5`
zt8R<Es!#3Zcpbmnb<&ELr_TwjwY*y>XuAG>l1$+<4~{Q0oDw*Tx{cUZg?(bNDb4Ph
z-ViRoXSrF4!Rgos(pxhg)&D!4{`r<p#iBel6Xuw<hwB%zpH`fca7WGVc*B{!CWjN!
z9A<^BxVN!2z^I{a^+A2!olh6d;y4qOC9`F@a@q5@&iV=Gm^S5JITn!k$iHiy)x_Ng
z-v0U%pMJOfc0@qHVf&0*n@aXBS!0x59}u~+-0#ulJKwc0{fODy^tVnw*0uUf^RCLp
zu_Y08$ww#G`~T3r!=t!e_+Q1}`wzZr=BaFW{OkNald8{G0^iK53MrO-UhTB$^Td1K
z6He?tvQ)*PQ^T&;L1MujFU4gCQq_MxJ9XGS{iXFhe&0`D_o{bJ=R0qD-0RHE_NV2O
zW3#Jy1hig#>s-^c>fIt6_V9UIW*$#m-M(?hH3eG>FZY9unu{*XIKeY{!r6IiwKHtL
z?-yydG5TsFbH!KP*Vf=e&MK+*CWfL@m#ouCyJZ@hem3FT?2vbJIK4jYGI%uq$I45&
zwbN6JMW@?8t4}@tZT9TYZ2RI5p$QSKO5Jf6G*#kfPEuO%Hu8!N-^@i#6ArGP{rU9V
zovJ(Tu5J3s)Hk`Qxo)w-;t!wKI48~wR9t@8WoGZK!+Sb-xEKQZn${c(xG%P8!L9e#
zX8z9HnOt<f=W#IGrU^$si#?CXUheAPar|M)sme!s^7GGDKWEu*{xqsM{Eo@|_Mf*d
zZ?!AFeDeJI=-K{~`9T3ID$P^$-#nT<^Ic;7>GM%%s{b$IIq?4Uwc6C^*P0G@y_Prb
zoa-F7v&xqzl>fQ2+JaPNX5n+9b816PH1vZfuU=gK-jvr>#gaAGukz`eO^=`Mmpm@N
z{@4Ceo7z63%a?bDZ#$9Dqq}F0`1J*QtBbUbt@~=a+-j~9hg*kU_sv`8d>n!d#+7IO
zC2?g}Y@h!9gMqillbO;CVJ*vC{%^G_H)mxQFf7=}#XL{vk<w9*O}Y8^|BFkQeASAt
z%{4s#-~KSG|I1Bhj(c$Gls&D9>Fj-|b?FNq3u~6VOGoV25*DS_Z9A6wG0Za5y~fUH
z%j_j^vEBd6`Sz@pztWsOd4~P5|NK3srH0|_`R$4S&6t##zSpgubL-%1gL=h=kMHNX
zwoP|^aYpB+>r6}bUjGuu6HEV>>aB5_UfPow<=p1Td;5qg%S0|weplx(mlLUMk;Q!`
zii@q{zh}+Okn2_d@GYHliO#<XTh9vTBq#G7Q)c;}yfHSFzj*#n`%U-N=kD%|v$gAA
z?jN6hKx^{>k@d@;Ycexh&0G5S@bPtSYyY2KzAi*ORnQ{xNN1(xi=SCy?4OGlKU#6n
z_SherNyV85J^nj-{CIWTMkag3;e9*KHcm7>QgAUV@U^AR<JL7sM)Q?UwJ)AmDfL5(
zF(f@8%Hip<`Q9~mpC>iH7hTNq&fi?Qwp4Ulnc<B&>VlndwX6CK-#nL`q|VUA`{xnk
zk4uwu_l1TBJZ4*_*sd{OC(pO9*}!hkEhFQjpC3MWqHt}(ahY=`-@N$vX0u_}ci)0v
zDc8)qj|DvzFW^+OFxgbX_lB#Y{ci2&Y>p+Ciq}|-|IJ(CS$nr7!P4+g;>qm)WxL*S
zncmsqBf2c-#rrEq4woO=C_7)=bLpE$4{XBM8E*I1iAj<C-_$VaxzUd>$GydUpDwGs
ziw}s-Kl*Tc$fs>dYa6EA*6pl{ue<N_cb&==@x->d*WY~nswuNby4q<uw?TN*tC`&=
zAFZ5H&F=8+&kK8nBf^i@D%IUgouFzNv?2L$&C(;Kv5gH@E{p{?#mrrk*kt|ff4JTZ
zY&591lFspZ`_2AO;Zl=VDwCJl=sI#%?B4zN`mQRyqkF@oP2AV~5ZS(e{Z}>@<{0zM
zS&LVyy1gxazdqV5;_3?-N5LLm0XODj3a=%S>$2U0uQ*-GSaGg%R?PdErm5{4=giEs
zeq$k3zx*ZNG_~xX+9@8s!Myp4t9EYNvHgfJV~_6t3qOLc#(QVKS!!`8@5NkYt_k^}
z=a)a&7J9q&wsEJ#_nzhTp}e_r{H~L2)`=M(_Dx8$T<j^QnicL5SvYgj=Fo)!Z&w$j
z9(!o~I(f^AuOYLl8XY+;4<~rH<USGSe=Q`y$-=_M@K~^8^|YAfPdM*5O9VXjO}%o^
z`SFkX`isB&UzTk!e;w8<wO#FTcIVf6JNvteW#%gnnDfu)ca98oimdVYK5O0XCq5US
z)Rk;L^GW=8(5AyP%IwvT{a0W4(ej<`;!h9s>weC9TW@~rpQf#J)-{d$KTltE_*%SI
zh5zcaf4_GqR%#?K*FMyLdQ0_(x~o<7{ZU7x_vI!o5WFCJG2ct&hPO=4<JOD|y0d<-
z*}GC#ex~L64`MgDj>b*gG~v|rwGlHbH+~Ibahnmm{r37VmDYczzTTT+InyOWX`?8I
zYthM@3G;2rA3QQ!SlwOo^XLO7y@U#j?q_Xp51siRdRpte*p;gSP24ODl?OJ=ZuR~q
zVAA}#ZvN*V^UAr`Z#Isdm-YYghhKBg{r5hf=JMS{sI5VXg=35KnXOASTkpT^NOH;H
z>`rK3?(H`HX#d6wAMOMf{^~2Se4D<~+Qx7B*Rq;<+n@h+f3<q|ubEFD{A@aSt~J11
zVAE6w`Hd+C`?wNSIz>AJ4o%bL`F(1)>Y3s>(i{(d?GSl(w3F$Ziff*jlZeT6-@oy%
zRz7{p$6O+(^xN^|_n1?O$1d@3Y~I5*TT=S}x??6cOOi`GzsvTi2EHnanjO9<fp6s}
zv0lFH)+=sozSVsnzEr(`cKq4<1BQp#eXZwSf1&&3)XKlBi=MpHoVu^1W;tW^*WlOf
zVb;ldr@mDh$?rXJ>+8;*m6a!FNo<XnvZd61rrg2v?r)xL{e5T7`2#m)55}#plVW?}
ze{;pmC$iZ$FRXi)pOq?c`|V{v-VMrPyR-Zkt=*vBZy6Y~>DO*8iOIh?+3rm{duz-8
z0DYccYiotJzNo*&q_H9I-}z}CQWx3`eE-GA{IrYS|9Ix(iD#0;Jtugtdi3!XTjEud
z&s(Hz-mi819DhAi?)$Uj#r&W5#U-yhedxn?hI1mmCYRHNczr$mrvJ;^a;3x}!oa!D
z{-UCYEdTzewffV$BpvT-+kV*}t9s{G{09e_>+a$wv)}IjQnO8uv1{$37Xg<0A}5+g
zHS>ReTPw3@VH(fNDNcN4!H51n>=yWbPv=j>yJzP`ZfH3uFNqVf^563)`tbqTuaYqb
z4myZ%-w8f+(yBo19Se`<hor~+`Sa@-qdJrS+|gTpSn~>V^R`P1K5{A4%y3`4%_uv~
zv?cV7-_ndKe$UM-IHFeRd-+Ce=)M*C*xNnQ|6Weud6R7i%+9QTw9_Iwv(r0ZY1E$;
zoAy6k8n|0v@6uoM*EV0}pHY`(<uM^*@q>n!M^t1EuG^B_y*TRf>Y#^HcWn-cIdhG(
zPwKG8PqxHFhsx+{w=*{x987RxtXh>b_uRqlzw2A;tqqi}Z>^QGE^n4pSZq<UVoPP~
zcGq&xM`lS^9&|K2&)HzMuk1}vrc(2-`oa|w8!l8k{!HE}wk>hLr4|RbOaGMDf38fk
zWxD<)rq9OwvZ;<PC;z|h(D@&<^}JcOb<A!SKQOyXSVG@SO8da=V(}1;ni-EiEECbW
z>agdgO;*FkX|lenb{fSWGiX}rx%C6{cY!4wRWE)j%C5fp-Er?{-_0*}v|Hy+{j0Gj
z?8^eB{reZPc^%_e%rN8E%_Uq_>X*;V;kKXp=|WeANa9>a=~o=F8j~7?RaQ7JYW9he
zTkRP$<@;mhtn`Bc>&rLB-B#NXu_ilknMve{Q2EKiFV<{|KR)BAig>_rr3W*9uxcwV
z%y4<KT};C^GEnn{Ku9y^;}=aQ65<*KqK_*VDLmBcW^D-R(aF}dmYZ_*quZ<#YCb2F
zrJlcboLFP{YvX~io{gR}E;%G;Sb4bc>|7Q9a)<nj{s*6J-nSl#e;D6sU%#a9wOLD@
zaAU;hOFH~a(`4Tsd*A35U$f~(Kz8tPyX)l#?#3j)+c440=7~;5zFdo?#SYCIYrjr5
zp2cov?A-q><bC?NW126{=U#lyVODtX(7P#Rr<~@8uZ+-mzEtVaav{n5?b-DKw_|<?
zY|Xp2|H_Rxr|bV6%GkP3_7_jLw_bg+WbNz5*_$>!3z(8{+c@pz7U61jpZ!s@v;O9*
zf4g5SX2WS@%-H&Ewe7me3G3rKO{6B@@ZeE;p4k!OVVQ4PeSHp#(Gi8*6z0azDGUnB
zCMQkyl3lN@&a58xyxHxAx=o7g7vU40#;=WhBXt*wT?vW_k=pli8OItv-q}Z=FRhYz
zx<pI;rM6};)0;VlVtfqgEComJe@fc#)xUW|Xwr4*31@we*heUDbY8S#ceR6s>nuek
zHwBIb9Zy_5ET4#9C|k}KbK2p>%$Dpg)#V@Ty=MGksXdp!d}rg&)#^E7yKlZWFL-ym
zBkf6`QgoO`)F*$v1eZl!rxlW%mCBEGKCkvW`9JuC&CUJH6B7ce%qBf*_Bi&@($(r%
zPoD2%tz&I7EhP#+PDt$8cFj@a%wcnZ{I=G0<|az#<P6;(B<1w8_9^sfs=avUWU|Ci
z{3?4(<L8ZG8#?88?>X(kbg*ap?ay<U2X6jSs=WE}xdsj=!y9uhiLB^&l(d3XyQW{E
zG5^z=c@^sCn>?SC3wfomm#|DNTvM^*ZSMRc$>J$z-|%p+dCUGH??w07Yuh#*-nT01
zrGmcAv#V3`dmS!!a<FtMCX1_mpQzq_aQ6B~S*3fk$|ZER?5*AQrEE{!^J%H<x~cDM
zJm<_4Ds&KOX`X#)%Khh8{LFedHH?l-?KSV?2%eR0-PZ8T@0H4=GhPboRe!e&y*Z<I
ze{QEh{%;SL<GX8i?cTh7<p$gGMUx9mSRXm)e)#b3sGDNgA#06tr`HM%qOsSxtN&UC
z{@DKQ!-v9GpV|#R7kqxSVa7g%)cK~9mc*nAw|)@jez<A%oW`fQd^x4-w@XaD%dLD(
zfg`fd>*^VI*H3@n*eRS%x<141!o|{QqDNX+JE|F5X8zdo@SgFm&BYvHAATK(O$lLi
z{F(n}v4X14tA}hE3xDn{GC26?@%jsLWvco+@@%@7NABsXneFiPr`*p^Ssg~F^&(~`
z{0^y%kSTj+eThfQnVapF@4<C`6_Xn{T$N_3g);ndRyfgCdVbH+tBWQt{2eP*%RkrO
z@m!fjS+Cru<Pg{RjT?(ASDN2+ns~>sU~aRoNqo)3MTWkIHlJ7{+%hTR!F0w4X45%C
zI&Efdkx0^8r57yZD$~$?b1_qaBv;NtR-49yycgxp6>q*7&2{I3xDSiUt?-0{j}Ol-
z4!9f~wmnPWMd|y=T`6X-IA2F{uX0^4X8Jtrwf~{i2w~<05hk0$CiSQPJIruNCvwKw
zUtJd+?slB}#;tMwohWyWgoE|&8+<-50+Ofin#%WVlH!f0^;sWSe47rgO%7~0n#AsN
z*uvw|(<Y~h?ADfZ`eK_4dlv5HR9TZ)`@}2#siNBY>%V(Gh&L&F><nP_?d84LZGNxh
zMa-#?$sY_0I{EE(G99&#S2+COhW+IH$@T}!PaU|J-DcQ%?!+nK$yN$hB`+9RO`S>v
zbSfXanP+SWb=nmivGmf<eJM9vmZ<S2C-nY!R_Q*$ieJe6*Ch_ggKV?!Ouct|aov^q
z0UPe+nwWV^dzIqx;Ea;^;;nvfE^qSY-mvLQS97FIgp-ZjbWV>;8M|4wM+d)J6uB}f
z-EQ>@eiJ{(53vuFoH(qO7Im{<|8wrU^UFVZb?dsmiWCbLUCg>Fc--jTlCxQxRalnt
z1>BZ)PWGF*%l5wGjk<i}NB{j()6cv$cx+ivB=>oht;=E#m2eh4H7yaJTPs-0BU3*F
z9@4rb7ZGqskyWVv;{Ko4eeSVE^!a(J%=bB9?IbYQBP5{d#KI*_*X<76eYbv3s^H@z
zvVZTHEa~xylT}ofxTI6_Uij-v*N4*<bU$L{QJrY8=!JJ_&(TS*r(XNvv`>0tgM?Uy
zLn1?pRK}&Sr<!@eyLMVVJ>BoLcO%d7_dA|6E#p=^Q?icFR@bBUxW|?!+cczBT&T!0
zyd%+lY-d~it@5uMw=YaMRnn00B|wamXGdi8_lF|EFIgh5v!2^H{gL_%H6xz4lUFZ!
z(K6wfqt%sM!NlYD52dsFv8izIDSNYY<q93w%N4BHu~BmM^qCVb_JuFFaeSGSeznB?
zdFduQ56^j^H=FB0blzVZ&6N$=rvK9K?>T>T-Gw=gH#U~ck>CHMSjOxJd+vsxQ^QZz
zR807!;G%xQwf}j%Yp_t;+57Eh;?7L>_dKMo9UnMpXI%5VvzbwL#{*1f|Ge3>tGu^Q
zaoVx-)Ak2siHfxCUQrdN%)M>rJAa=KZCnQfZC@IwAGy}CKtpp@&$U>Glodq}7YFpO
zNi|$|L1?aG=HeMUc<;QqK7Zkrs-yc|4>)W&%$acXkEr?4UtAtahkAQlEe@{SJ2jcN
z=6TH@mBtU39XI6_M_*iUuJ^nB#KlTYr?drJFCJ>}d0{8;*kh~K)hEjja4_jcsH@~<
z9S**eC;7_MvLg3(rk_^#JhQ&Ej62=BTt}uRXL(NDC>c1LF)AkE^xI%nY3Wcl!$i~k
zy*Iuud?e#}=KZZlvbJlBCTyFvX|Ynqc9Ag0(_GII&i>k`Ce!Qikip#Xf!Gr69IMQT
z72FbS`}bZ5N?7l9v}lhaPvZ1FGjBiL!)y0G=a|Ni?*;`9bNHT0pUnuBv)NGpJ}dN2
z+Tugg7`*4KeY{|awAAY6jgz}GMHN%0Ou6Zu>9YBP)1ibzS7pEWdYt&NyXw4L+Zj2Z
zse$S9Chd`$<9Tb@#1Ct4KYg8jx`$<Bp6%_UE5d^2ESQ`qRTVPTaY2&VG4;CX=NI}K
z^s2MIOLv{d=V11t%5uj%S=KiTx9(~3)sS&G8E{fkYx$%L&XN&1r;dxYZdzG#>4#C;
z=lKO!PPa)ME`6ZZ8FhtcQ4d?&BgIP_)B>{uxNm*Pc+h>Oq4~%ThdmsDH{Tuqx0n6W
z7u)%j``@j7v4`((Qm)cr_eFDUpDh==9Ok$~G4@$y{Ov=3-dk6t?C(B&@`x0lwAR%g
zXMWx_pDr9(aWyLV@`o>L8RHM_lPp;O^rW)iQI02P822PNB`<zFTV!G^TQ<wenJ;Ed
z-nlKpLoijKWV#=7<)R}kf95S?HG4L%^{buuDgUTDrM!Et`&i}KzwWJ)7KrWGeUEAD
z=Igyv#T6WHhc(5B&S>A?bZ<pIACIMDs$;?jHoa?#YqgbGu8Un`ySQ8a{JneM_}0GK
zYLHRXKXayl)`3e69*oB>6j;ca_vf8w`xEDQHzDzM)>DU`Gcy!<Tb0{R#-1*lpW(YI
zy!K%o|D?Q(aFsxPcIFwavfKIXrmud)7Nd4AX+yyZ&8{HhOqB@&3yvp;*L>?-Vybp^
zb5Kq}b<QRGo5gKU<lGV?_T5V6XnX$j*Jiup2Q(Va>|lsYjNG?llgVF(m_EMJKf2a_
zM%La{^(WV~H?TPM&K68%a7tJBx_FE3@eYL_ai@<gSj)=SR#_plk$>F|z24@aRn1#J
zyjdP!nBN)kZYAS;gP*si-Ok-n`q}1$%C38l50~6JVOagTMCo2p(JLK&tJ%{FuQz#Z
zKCs*0QhV+3v}^Mhp60&wU(agSYwZhX`<PNAW~7VURZG}$M!R;3>wdLE>sVj69hjq4
zv~Tf)_fun*E9Yk(U&^+-c|*<e+N#vo+B!NBSz*QE{r=nqiKnD&|K(3Sb#UJC-P!D%
z^DihqovA%b!6kZ<Ma&B$^9fNWwJ%ra3V8XQ`8d6C(fO%1&)lVBfBv_2{v8qg==089
ztG6{<2bNy<35!U0kWi|2;Ia#c{x+v2f?_LWzNqW`UD#`+e8=K&7+0F+q1UW)8nVoe
z+%Qw#@=0NX@&EeQ54+vBoW61HV0!!u+wGf{3Eo`2((B{>(EG1;7uq}6Zpc-+!E16k
z@519Fx=C}l&3jo{yiL*d#KGtp{*Uc<I=mF@Og^%+&7tp3aD2j|7Aejzk$H1-1-3PP
ziWhv7vu^u|=&etZqwBj|E-pz~aQH{hBIPYNYPDQ;>UsTGRPn-FPeIXNPv>I#v;~`H
z)}EiN`rlAra^dj^hb!LG-&pJL%Qc>=J?~#2+-$&jy>j;JjMsbjJh3s@!`3^mLTJ0=
zt3)&B19#^L+^drDJ==B9>%+$9O*)+x8x&YXM2;K@HIuUXZ(g1LXPuYBC;eNsH&+-Y
zhinduGm%os<Xy@m@up)|aLv<%zRlH3s>FKC<E<~<dDFD9>#c3*tiRIJUZtuwOG$sp
zDvH(is%|*tVz=janDbJP24STG3OD^0aUBqyuxi=P_vIh@Iq!TBd|AJ{zI#%~qO<qs
zoD5@XsMX*1mv{g3^OwKHu61LXd@1Lj=ba9b;}18tWp4hZHNS0sar%c(pFaG%o3bbN
z#`XVC<c_^cysUI?$KG4TMiRHGuPH>_n{OWWaz;+UwbQ;!KYx>X```6Zx!i&CW_(<s
z!s$*Poi~p-ztOF&oj7Tshgaf}-Bp>P&o5<H3T!kwd3N@U<DViHC$;u%n|61iLHm?l
z-cFa?mqt&W{db4|oW09Gn3s#y?!Er3S1&^SM!`Ov<uBxTuhmQJSs=9R_G$U$KW@|q
zM3xj-{qVi&zTp3({Z+bK<a>%g{IJsu(x~cWSaI2Rb2^{As^s>)8*|_MzMb*FM)S*_
zt<h)74=?*5wf9w0{L%kUKN$X~{BubCrJa?EU4jC;6*mt*XZnQoK0;!%<k<toUxi;$
zyt%C<ZQax*9L~GA%>wtoTJGwTb@hdi=_Lo(s*O@TH5<;vUzsda<SLQzbkd@m&nJma
z6Fsj}UDM6{sY|RmUGzf!%G%k^9`5_@zCZTi(A@ntkJkL%_i^1LY0ar0p5CgMw4=uU
z`td(&jON|na=W$m^X&GftZ7cxYt0!}9b)?Jq`_b)py1-d`g-T1Zy#j$sePYp(h@T5
zrGcqX=W31k$3Dx9j;H*Mn3l<^_q}xc_nn>FE-}A6V$RdXd-hc19I^8HcBbo#J_ya*
zB6(Z3_=D8K_kSlzywPpFWc{W*zJA4)=fYiT^DD~RelNercz%)K_7m#u)hhaB7Zo`i
z+#7f0I9Y}p*sK%~uRl0nK5W@K_qDsO?0Fxi)qIgVKy|j`BIcQ`><hlzUFOnidad|d
zb8ePGg4g2?-5b6O_C?+A&sgJh;S(n>OXvCG`PQwc-W+(rlvubTYmWtQg4u!-Voy0d
z4)cB!$@%8N>EsaVeOG<^mEAfF#w=;3K341{C$C5H#j-N8@8w%O`G36fk$>|4>dqJ2
zClpt*bGL6{S^Q|XW|>Xi^Ulw;e`0N}|841fl=U&b%`N}=)QW^;sek?*2QIlV7<ROH
zi%P{T)B4Q9TW*`VU-9eT`E})UWv$x+K4#xrG}oy1e&~H}&v?Q6>9g;Ce-;+|<HqLb
z&rXk5y~)x3C?U$0#T@tW{cpSVabN2sQX+DSg?W{fCS=~4_icX8zBdiCiyvDs9%K?e
z;UT~1W%;*b()nqJI3K-V%T@mE*Bs47hgPP}Tg<gVJl-|6y1MQ-bH&6IWdS!!-=MXM
z_ga6;s!wJVZdq0mwL+1@Eu)=@Q-GakfzYD27I9+E?JwSktn158d%ynTKZW}E%X3|i
zem%5m#i1@YkB6IU_WWHw(e2NHtEx4UhnnZl-uOF1<tfjem}mMq`=pp#zgl0(*j2lh
zJvrat%OUPYR>y$F)wcZM&Kv)5_pzt%ca%L-`aDnnnWE@vzjqlg&Sy+~8{=P5zC(m3
zSDf#YNKN#nfNcRA?{)s<;`>!Qzao9x?VX!7%al${m^n>zMzPvF2hX6;*;z})ww@A?
zzf-H}q+!gOfBs_DN*%WkwkHCW=QeR$a^z-}a_Mp^p7PQOSN><>JoTBn=c54swQjfH
zeiPbKdSp#skke-?>)GqJneFuwmk+f&Bz)!nn(JTwoLiS|dM`y<_d}r#-xSyF_bR+I
z#MAH2Wwi^8JearjRa<V}yPdl<vK=<<6)^j7%s@C)*i5TYf2TR~_M`Qc%Tiv5a;<wP
zcx$gsl=0IS8)8q1x#t@B&di!<FLl!Etj@d`<;&medaj);^5jl9zkYk<Nr~Mb_BLN>
zX}o!V(LFx4_od6y_&$9wcZ<2U{=EO=hn!L|<!@8V<8+Iv*vi)jH?s4;Og(q|cbvnK
z28Tslf1VZG|NS6%{pUl^cbWwze#!BcIDAIi=)!j6CO^5JxFWL|M}FVjAopsa6T{<z
zY4=pP_D}wDzTne*+ZA6MC602HtK@JtZ%;g8{^?@{?{$~<O;=bW_s(Rx^rcDhOvc^i
zua5U$e*05=-rDQz-qTCc{rM^$&wBMsGFD}G?A1Frr=D?P>|mR|<;(l6JC^T#6#QB6
zu&>MPi1rW6haw)bO<L*nGGb@nB7ttHX>z^Y8Jgt>KK#p@UwrQV?XueW?u!<kJ2*l2
zb?I+w;TH=W&OI~CKVmGvb7{|kxesEO6c<1Ac9pzYtW({yXh+z&1D5A_(i5_tmi<y^
zypevWpd~i@#zmF#0_h{V((kKZKAn=tchI!5>T+O)DD#~+6%(@g%d)l2O;#^!v()97
zqUK++sIF~QW#+7gH*ZZ}*{n@e(pB#Nv1ek!?!!@0@9!NsxM-Ey_1#*Xxf(~8)aUDI
zBq@4M=kSWVH?f56XVUGxsjD^_9Dnz`eCnC%HM&9b+y8bw_HwdF>{zR#W6E`#_1Zk%
zImbel$xN$n>i@a4sdav$=<Uy6g&$g2s^y-rzi-9IG4Y&DV#U)ZKJw8gEH-IeI>I)$
zY9%LYaZC2`jw+2)bE<qT?Mo-ET^|xTvArxPu=vmlr9yrEtlS4P9v!s55v%N>ZSwGl
zZ%nD*vD!p)n~MiirdV=qe)qo9v19!V?=HJnJ3f8?b4=t^OrlrSZKhZE;&+NpJ<a~H
zj`g{q(UbQaIu1_+oK|@=POa1CuzvT;{+NH+<9!#OF$b}mx9Xn1wOhJcVf7QwlXr53
z<MJhzTON^?@yb--x}L)%wDYWK|IIArFD4PsSK7}An(&{iXz^#GD497oe2?GS8O46n
zK4$yH>Rrl<A2JC&^L==Dzuae)XAve}eq8%j!aO-v=~`)S;oOfB@*4^d@_L%-ozpWa
zPkqGE$It$?pi-&l=n=P@o4uIMtdDO#yes<GN>|%OPnP`t81C?l$)rbd&kBi&o9{?4
zz1mX{;nx)A%@yUbV)mQ;mS5l0@AjXXw&!42;lBOM2?4olrt$nP$+@)TqMaN|r}e9c
z+suCotle7n(QMb0w<rE>F%moEw%mK-@gD-0G$y{kKBqo*YUSgfcXkPeTzlxC?zsI(
zMj*3{)7#BA)g~WUU;gRrub+0`*ac)2LenZ8%4+R+-n8rH%$_ao6t+$v^|@0Cx5qUh
zMgbP5C++W^JhYqfG~oKys4aJR(mquB{wlhvTX`bu;@-kSbz?u-REbNA{BnFRCvXeS
z?W&w@(W~o_vwPQ_14qRQzvT26Hyk@|<q%)`_{Lfn+hY3^lly0{>3!J|_~qokPtz0G
zCWh=X(41t@$;7rwh3jy1d!2~kLGkZj%}=>}J8>bZZrNk=;3GU+nVXh-#RTnoEoRKQ
zSMgiy+D%0(BD!^EWgnQ+7Fv2e)_xsd{3nmVEaL?Yxh@_&RV(IAKN#aZ@x{O34L_GH
zs_4Ag$uL3t^Mt7Cpy$&oj}&E1+@iT^azmnixs@ivW}_(HV&{jCR>|G2+jGvd@ciA-
zCkyt4>p%Q{zrsmFW%;ie;nNtWo{s0*wQB3cja%RETK4Vs^HPBqpRH`K|9zBsY1MSL
zN19ir?AUTMP{sGx@_TvbE_7*g&pl+(zO1A9`Yxl1&X;-??tPf^@?QJLxu@N`%rYKi
zoU~N46FF{~IAMl)$|uqFNtrDQ{eLn_U+Pxg^}M0K+H<nSBun;nPxe1^o#FK{$7_>w
zT>saE3!C;`4v`S};<>=ZlI`Pj!RWijFRCA3opp7-kH%!bC{CRp>?UW_IMa7Y9zJ&F
z?{*)1S<|}sm%puU-*WceabTNz$M%}jFF!rrQ@Tm{srACzEVC_kj@$Hd7q=}ly%{KQ
z;CSTWWs&L9U$)g%JB2yEE3aG1^tQwK)uXsw%Ow__`4%1FwDI=0m(t?rw=cPq_5NXo
zTBpI5Ao-vL)1!9Xyc=~%L#>t1bK6V%rOzgPk(>E5&Nsop-8RX6>sAK&{<*a&hiz;x
zJ^Eo6d*MaF;Rhe{OUrYgGQPfN@;_2aGwI=#X%<Gyx9RCH&+2PqJAXjKY--=;RNk*=
zAMNBkmp3O$;CcDv$bWWcT`X2;m2@4PeCI&J&-?xd&Wc@{ud~QPq9D{kbkXy!{x5ej
ze3#V~NprDpJ)?OtV@J$ADVKxkHnTLD`kP{_GCb>@)Qj$w@Nl<pI8kpNw{xqRVF>F&
z!JUdr9((j{7E;T29+_FSwPUuG%ImG-Jnp#*j9zU>F?%edJF(f$dghISxmnvETz;_s
zcT3{K9{~m?8_w7`bWMm*IcBnuK`-xy*o>om&lZ~Q>#n%>>#p6pJ*)q>&H38#WATpq
z_H(DccU<0gPQy$`&My2_ukV-L)1L3=@0}rTWH9M-iRIC=ZFRgNO$!fCoMlk1d}T)U
zwLjGsb5ozmZcVj6@$}7O&bw0uwZB;=na<8%nR@)d8XLw*)$`A7F(_Z-mh$pE-(oYF
zsfYh~S4?AB95A_HqU+C>?Sb`4YoGLddVgMcpL*NltQY}~vnOKaGOFy5`y+7j=udGW
z!MkxYLeeHSe>%awq$gs!y+boo)wxY>yB~LXep6Ii^WJb>)v0&RZbia!0gtSuA6FbH
zNHRR(xZnhb<&~v>E$5z*oqmwpd-lB}6~EtyefUr&CnY7hEpe&SvKT>$rVA(B*&Jk9
zTQ3DIHn3K=y3xxTTxt0{?vaS@o~NSvdn2~U{)#(aI(J`~%ADAlk{ZIxS)x8I*qfmL
zQD8S$#57?$*WJwrm)ESCs-?AR`n|T@Y^(cZgI2Fw8qcqo^jz3YHF+EVm8MB$OJ4F%
za58ceUzBur@wb!>PU{mtZ%+IW+3+xN!ra5+MaiF5WGvQ+YuJ5sl^wg`q`j6Y)g2XH
zm!xLcR9{=sTh4lJC5v5XskLpLq3p@|XEOX1CI-LQ>DK5rch2i;Ke^2V9C{9YS6C$=
z<zr+#;cCyV8|ITr`-S;R=kw0Lbt-x0_B<22{B`|De^>>bsQK2*ELHWfs`=qYfp4-x
zhZ<z`kCbf@<A2`cwmaH8tTJ=gney=B_<O4>gl?C<+sh?(b5Z!q&1RoHj$KuWow0sL
zOsnyPTdSG=9=U3CM?&lT&n+sxEj(=BL#MXiS^rq`z#ltN|H_ju%-H69{rxBM$JVIG
zxp&kvrp2hTUHiMddvaZSgqoa1iKuzMpi*<t&ZGbDr9LR^a1&g6Vj-K0MvskgLxRYO
zI5YdDI<eu?l|R;Qxxeo0?A^=VHnTY1v7LHi@-yzK(>1Is3Y;GlpHV#e&_DS6{^^&w
zzAJtE(|+iy?DLadEw8G-8h&Q){ZzU8;NNAZ4g3FE_}6@lO|<%Z++^CmZhwzW|BiP2
z70KGtR(yfONs7@c$)ZQ{paygN_R1*Nty@plI-byFQmn|EmMZ-Ci*0H~h264n%avI?
zU%!7^_BPVa-Q(W#)a~n^S-e>3HQm>F*RF%#KJ7L-`}|B{FB9jisoffjHlB#sx<tYG
zqQZ%l#}~NIRP<%3$$jfsyLr<oi^iQ%TQ~kF)n4Xra$>oziM)=>;w`zIh3)63yewOJ
zIPlBUXK&B!6AOGR`qjdHjlN!F>7qxv35(iU?UTdP1!i#{wB0zNr15RXK_*Wj<H%Rv
zZt9t@6#jMXcip4?wtm~UzOC$4KFE`J)9h0AiWUudk%Gz3{%*;9awVmzcSj(D+Dop)
zBMw<#rcAsfX!YuU%D%!a{Zm7)J}Xq7Jug1(|JS>22j|5GTYq}}Dg5aq!95C3-^`Y1
znVI@<`!=PP)Zn)-_Wjknc}qLk%)8I-w&UuGy(Xb`#rOL7v)3%s5I&apMKku+R@bnT
zm3Mw_4LlR<xYSvGTE&Bf-mKk0ve%uHb{w*>n32N6Rxq>b%NEI%#}~ET_S5{b%IJI@
zYeVzaBcVTfY&AsJZmaVCBmFV!|3c^0E)y;6wS=|aacJmWQ{QFS=Cm$ILBpx{s^y`m
zdRd+D-=_E78rSwcO^Dw8DD8sNMhihtO)aSz8U5K4pA`NrKE(5~cQ?z)gBOaKC!3nr
z*FQNM^5FgYLK)SR?`0ZAs~7K5czySPcgPpn<<IX1*sM;>J;J}b`tHY<d)-+q56!O@
z*&9<iVa-dC`S0ZY!kFY`G$eLkla=LjUv770>g_X3iYkiC&F#v{*RmhErM=}_-a41t
zagtnSkDbu-ty3h9ifrJF(Oz^fXHw4QIa{JW9MNoAp=D-bW^ySpTu#q?wHfPO-Cfh_
zVtxufGMQR3Wna$|!<)qg3FW0_2Ep6-?!BG4EBkoPt4@zy`yQq(42k7?67F`_W7`q4
z*}hXf4GuK~B&wA8cQ2pheB!Bl=j&f{%JeV3shn1}Hs^M!&-3Y($DciT<a4iS<LSPA
ztu}G8oQvXaKfSVz`<ls%tliQ7UVYzH9^2$Ew&g;GW7feI_m)JRAg9k4s_wYz@T}$W
z{^63WdpIZAr}nyf*GoTj?n{}K^LI|4(%f?}XTv8cLxY8{7H}S74O3d<xkc^6%f;$*
z?X&wg{p!8)t5{RAOkMBIy6fzgI~^DH&uejO6I?od`(?LWcgYzQ8{Jc_EN7Z1Nk{cw
zUA1RFd(^u;CpIai>i^;H-S>Cu&7Zqy-{qo{rBm6&({!|7hCe-iD{xK8oy99x@k}l@
z%&^Q?`Ss!7irT#UN!w&+<*X4s_$#!hB6fA#IW_<Nx#|1ME?evnk@)T7$HHJa^;!3S
zFNenSS7Xm?4*oUk<BZnR2{*zgpWd)*!;F6}0t^>!*xj{AH&+gbC@3-Vf3e|t`Zt@{
z9*K!_dD~72uMsl1lE}*{5qHToB6RWg>NB+_r)^d37Zh5~E9n1kc}SvZ#-Zso*In=G
z6&>TVmda1JHE9p@<j_4WkjP@Xd-jznc1!A<1<#spd^`8w)lFyT7tZ9Fa9vRD;>@F)
zPIvfpB-(sQ*|V~G|8%)J>89Up*KSyzOy_t~@ZF_k{!WjxcP_0J$P@qDzfjD5V@1|i
z5Bt8pA6Jw6|6E+%_bZ~vzM}Yqlfmv;flXKLSsQLU{m_B`&avhn9pApO^jw^zpt~jT
z!ffS(_dKi)>7Uf#@-Et{xR$GM3&)?hm%ak2u~sv8PPWh%XI`_{+WF}JRX_gA@f1pZ
z64Bds?+`Qh`;NuRMw(npRAwZ}a&?F$2p#iecN9-(aJwhUw{q{CnzAD~CGz5*%9|Zt
z{M{KRWa24n>&zg&XS4Xpy_>HIS0``%amV|3cf9zcWwJSX>4)3o7R54uU8it*)$66U
z+^KST=f56)x5J@8pF1nnCqt>=$KE4uxjWlmf2&!~RM$WC$L@chHCr}Iv3%@G_;9Gz
zZpA|VfK?H-vwqyD-(NYQdfq#mD*v>bTLmi4XDuoSy~DBU&>gFHo@ZPh3zR?q<8S<>
z`u_H#SM$F*#k1f4WisPldgtc5UV*cc|MS~yf0=*m=GAv1;iq~&D6>Si%SYL3YJ3vh
z<HPje?6*y6f6k=Na}}8!*0uFiV9+Un)hq$$-@dQwNa2Z$Xqezr-^#kCtv7^umF!fP
z+V81X6~zBP{Vgx`cZY;iLE@ED#&eZgg(S{TN>iw}nx6W{r|RdN_w!Y@)g4uuy3BOa
zhFvB-Gv=v!H`b(fEH+PD=gK0PS<+|3oOR;6;>9T&buKS?b-1(n*nZi&Ga}bT@I6?+
zlIQNi3ww^aPgjdS;Kb3TBihBu?=~sWfBTj)p#?YoeObC)*Zaie*UxU<x_WI&W6<Ag
zTVF>9+q$oA{nwsw?xAH#geGUe>`gK+IST$2$+Z4{t^IsK@%P{-LCk{UoQeuf7A-Xs
zyDxOF4?C~iedzn_+5>l{T{lb1HkjXjXk*in!lLJ|Hh*UMqSLoS&3yiHsi$tQKb*e0
z@|{QF;(wl>*!kaVxzT1eyD&rU-cMnpbx-GIR!v(gH{shIi8%>EeDjWqcM7~MJu%Dn
z7r&rLLbj5Dk=SX6-QPBE;NlT{P$^LUa@rPI`3fg@lWS?p0Yb52^EcZWY+WRAaObOY
z`D@?pifgf&!BabRTS?OPjc<3KzIa!DZe{qD;>lCXdZpIbrv<Sr4pyC3$!Far74avT
zKlt9=W!u6hzUrN_BJ+7vbak%bHX8*6iQ5vliZ7S!7LO9mNc(16a-e*|j+w9TU0d3J
z)mk{ntng>W{_Wc?Wa{mWJZP^trFxH1!Gl%5p8VU~QMxoFc&XZ{8Nc0n%pF$RD;laP
zZgSf2S1l=7Weuy+fq<2f%h*%|c^vld-qEJ&)e_pxd0b=3B~Sa5858R!SBoZf|HugK
z5sA=gpLlz3?Y#&4cAx$7zjWi~M1J;XU#^HxPYpY7`XjZgw^s46?}ESfTRHVvMVg<c
zoEP2_oW5-8uP1xeC*E({aXBYzGVhv?6J)oA$n8%pe3o%Fn|0d{X;%5aa&fQSxTJr-
zul>5q?9Ouc`K2rgb9~=Ph@Du_)3@nKPtr-QMmN!iPKm#tJ9cE(W?u9bHdI*clczU>
zd2ZD~$rCQZOV3rm`m(R8&sFc8E$^j6O4EAkKR88x{dOej$J)84r29CtGn3Mky#$<s
zOuVudE!=Z}spQ|qn|p*0U+Vw+J>X!6{r*3%4zRteU=LsU{rtL)JzD?OgQc#qoS((y
zvDGPS?sfTY;T@4remHnPK62J}(~+kspW7=s1@gW>u;Nb3l$bG>MOOFg(^Xyf8=Pd8
z*%ak(PVjN?|C6W38M(N>Zl<X5Ui+hU`S#tbW0g45CI4->Qqz+8ZOW!ej2+I*rUwO%
zRjybvc_C+z^W|OMduK@qds^Grm({;s5Io60=+OIoQ_Bk{IOl9NxNy{7eM`OYqA8jl
zUeDrlcm94Gx|HKtTbTJu%MABj-OE?MTz^Vs`qrnymf7aTeWHr<*4f^wE#0G^qE@$K
zNx({%9Trpie#lFQDkSm>g+5Vk_G((SBxvbTzy5Wd>Q~ZZCV8Hi_{2xnTw7A~@iZZG
zGY?589?>5wCp?w@G_|B;x0BexGkK3!FJbdhPS|!lz^ta$?MhV#zcWi4ms;Q>p4UsH
z6xNvv&uH27Ca0|V$?**@u3Y2O&gcAU7E##Sn8PV8;OSv(ahWB{StP^z^bdhRp_-!)
z)e>F_Mod`b=&t<d`Gg&R`;@gNta1M8+kQ8!TJE<yU+CNE7J8}gGI&DI_e^3@%!_Kh
zD|YbJ(dGA=qcxTK<~pr%(eGPz!R*}8bK7gryZ+ZanJRPPvUB>2X@5`bkXX=Cm!qsG
zFL3EZfv3^JNM4pmlZJ<nI0SE~cg^?reJdys+A+l<gN6UBa^9569h&-FL4E=gyaL<m
z)aGUfw%CcU+;aG=uF?JNu70xX7xG6e^nD{%^dZpXxW~)`nv#o)nPi#_i!<M7rYzpW
zQJou7QT?co^MuavDa%8q2&Wjky4_y&q*i9Vd)%92MZO)@9Oh{?=CxUC7(|M9bDO&8
z6h8U;cAw4!Q@_=H;wN<$t}xHN=uuLBEK^(PX!4@JX4!9L)4jKxsTRDUmG#RfT-}!c
z*tw!T8fWd#-P?6?L9gk_Ei(UiKWzNF*1C4R^EG?p$oI!9=Ehq;E#F@CW8$VcvNtBZ
zzY;E2@m%udl2sg6qB*{B-br43X=B5YHJ2rI4jqx_T=U>e+?DWRhw@*=_bfb@Z23B;
zdq$k3<K*(C#am5Z&-iAac<PkN1%bm;o6C8Y^2b;7?^)k=&i(x35BpBO;&X~yH(}HM
zAD38e%s3!%`QqtTW!Aun{;C|MPfeyy5GlI0Kyo9e_kts`uh&L8<Zkl0{r}|dWAVMw
zEV0L*s?W3d#j{FMsP{f=qW<0krN_0FAKv)D(EHwuLm#ZStaEzzu9UYrmaqHmuH{y&
zX$qXtch)`RivRTfO0edwi@AT<%HM2iGya)A+hXTuZRZ3&7GWbbo-jGTfESCj3d}4E
z6`C7O*Uip2y}mr*y<Ud=l>GYqA2-Yv1n@Sg9oYD+y{GU>A@h0Dm$qwG<{ACp;~;0r
z^JrRn+UA$e^WvXZ-@3|OF~{28eeva8zk07<<IwEu`upBkBhKaH*$<yy+?6<IJ8{>F
zbK*OmuI{*|P~9W8w)Kf&QedEjrRW;*mIv34-!XmHz1_!2IW@9Y+wB>zzu3{Ip$vr!
z)!J@vIuf)}Qo%)UXKIy|_}tBf{XbUkdpDoYUhSOP`A@%>UazQ^{j@ooIrl$%&CMfP
zC6eqvRw{^uJmuEd);?=PsPz|fl?e)W-gYTJIbX-GbM3xE_5b^e4?fM=TmSgi<+s-H
z^&4(iF6oF}HZ5|>{B;lQr(`h4uAV2*{`Tenp6qE|d7RJxoi@MthHZNkXTrbgcU_-$
z{Lr#(6Wk{Cw*TYrqP_Lyi}!7PAlmM(J^!|A_#gW>ORlf}{aZd~`QM+F^3UIXeX(uM
z4)$eBj?Adsare#oW&hUq8)xR++TL`B(KqPTynjV24T9(JwXa#AY}BQ2jnU`YX8DET
zRbL&i#)mKmF$?5<N#FfURQ};P)5s+({387uwT)b(4Lc2<PTb_x{A_3F`vj*AryRsp
zW^I3O(E7aehf|oAHG9tynKrE_H!6~Q!W2*YY=64F<E&8MLO+Ljjxs-vmdwuF-~6IC
zEaLMa?@O~!@mF1bP$gwhaj*UC9j2PwrJMeD1zcQzZ_9_5-ZE^=%~D6Uv?!hnGtej(
zJO1d54R6)C%vQ}Wg&fijw<Tu$?0>oc<=_6lX%}AQJ+M|%Vq>k${O?j3ZS<W_Z>zLQ
z-1^|dBCi)Lob&9G*}v=ETNj>xe#^Tu;^q2PkHoKTIkacyuGp=2`_7s-U!DIg=ku@o
z?oO6F_KCTRJ}BEH{zm=p_jL6S``50!uK)3q?4G?Tf-?-3t;}p%w?=G-5^q8HpR><G
z^p^fKaNon<eLDWKC$nO;Qq<k0!fqT|D^9mb?0okpp8rR<s_d>?IvhXbRqqH+7XGqq
z+1A(Zm@e9NM=6=f&e^a{SjhG0<n+U@RzEm1d(!oF2M(GsEb7tQC9B%{MWp#J^P-O%
zoa7i97i#`o#gVI_{ABm^ly^6e{d#_Shvoa-%{`ap|NMJ>$tC`)e^u~&mUCY22U|aU
zQTh}AezT?QymyQC=bIln_51#Pj^%Z?d6v!QzZkLeO}S?2_I1;rHnd&*o*QMR@WP+R
z@Pp|}*TnOI+k)zRvLCFfp3#u^Z9xR<m6Y8#)~DBJ-}&7!wK})qQcldt2j~9T$bHlP
zv?>0`U(fYL4n?z=ITIHja6X$pXCwdDwKB(!ra$ZSyFTsp`Sjbr)eqm6aXrDe(OkOZ
zZcjvW=KXVjOwL@=<7BAcADqIfysG4yi+t=?`%CBcl>A@%Fkv76)5yb;yUOe4-g|rN
z{1-D`i<|n(1>Q&Ac$cy9Z&uE}I&aQb5sukU>o_8Ep4Ck&PF+^Hchjf8YvlLd`+eD}
z!@m9a;kfP9{N}Nr(>~bn_Ix$$|91WMk~oix@BO2`tWuMHaQNQ=h13s!u1(y2F+|r-
zde3&QsHL+Lr*mBI&wa_;x#kd?&A*KbXCEHe(s<|98mqfD4ysGU_?!=wG-U*EF27uN
zr*ZKsQ6|}Svx@YqVhuH#ob+PuIbUVfT(EJ<lZd>~H8Eu+XSZDo+f*Le{PFJfR@s*a
zwJtaaaEK_L<}})HNu&A^+nirgw#o;zZhci3eo(B`Slw}cUGW(q!N&b1wl;AuPZ@b^
z4CK8qZ|jYPTuuFrn_QOY-mh57(ZTmm?pbEgPqtS+i+YS!e|fCcxXR0X%l+m#bA@+D
zWZI<3^_)1%BibH(qoVWe^*-wWXJN@N9E{1VB^IlCS(cucov;4!QJTajf%K;0IcgJn
z<%Nnef>>T<Et^)wZMXFI!qq1n=fC)noA)Q`-rR{BFUK#>4b`_^`bXY=ljxoL*u8Rd
zsz3AF-Cw?E%Cq$Og@1ekKTe+|U!_$1pz-vb&Hj(Vo$l||ZP)I8QMAeQr-k3Q*X}3&
z+r9Ix_YbbS{ib%k|EXm+tLo-0zWn6%d--3_ZH<*{1VuG_AFVX*+J4e^S;H}7uTR~D
zht56fS>f5SHKpiTpbVd93CF=8N3ocf8cEA$#6LUb7p2kh%k0hFY@TDzv;Xby{<@F<
z^~1v(U%gIv(Cql)$)}Tk!Uvwr7bt#v;FI^(mz<Sp>u)P^rCgF_Uw<$`t})kX`iU(M
z_QkOjR2$A<a5$?{P<LR$kxUm)A+1Lh=P$}gaf`AXu;x*Hc&pV*FFx|owcKq>Uy4|o
z%0B!3_tl^B&i`4-1}6@<n4PshaVKZH`n{hP_oCdk>`$8gssGRPYtgIU-j11H|H1z7
z{d*ISYQKKJ-EjNQl<oWK<WFq)BJcM0_MFpO>ogx9@(42Uk@84p_&TqodYhTT)hFNB
zr*>=!jQYe@Ct=xB8@_pYZtPmmg2K2<$7lUpn{P99*4@v`wx*~VFtMmRf7#pc%=<|9
zR3pc!6F)ocGWl;LqkXCTfrK5?+FvYui%-bko8`4svdylUx5lDA@$u@X?rRrzOjPCD
zy+T%D;pxKYOMmXYe&JE|glksSWxnJ;6@DDqZ**4FrAu#;3V$LQ5X7;@KICNN(sZ3g
zD>OFgotfeuBApT`#wAnXA#S-=^3=<_mkRD2y-@w_<K3;r6DJEXo#efx<+1Q6L($ou
z6v<L!w@lkV7J3N{jp6M@@%v(~E&Da+tm8GM>z09S6&L?Sxy-9^Rbo4K>CVH9lRd}y
z!kkp6i0TQgS|S>v>XYQd*n4Ms){TQFI~;qDem|S}w(_6<(UogOZxqhB`Q`JCryDOM
zgnYQ0DQ&j&TzuXsm!rp+tp2yyZmU{+{b5<2x|CE8Q{(i4MweI9dd+o>Y;V6RTdlt#
z<HTWc|M0UpVmH4^FkQ=FnVfJVV2NU2>n_8x?Z-ZEIN4H{|MbZ$Rx8e}_iNw(HtN{g
z(;?oKcj~qe*X18>tt-C%G-WT=H(vPQ<otiSi{FO7c&mJ1+P3^7Cu48e#_O*BxV-j8
zYQc-2`aAa7e|lZFUwnyO`~&-I?t4pYXEWPrCG>j8ALpnQvY&e>|HG<3!K^c)pQz=#
zMY}xSkhn>3=P`x)B6%6cy=%mo6%V_arBuwCrpImmrt7AfWQov*%+SSROT@N@hi%-%
z7U!bpXTIy1M;!zEq6}th2ELg~6sAdkTiAHPK=9J}C4cO%UH$+1dU5`N{2L|xFMs%4
zn(*Swm7B#o(?37Ge|+nEqc@S<cDFTT{n*2Pm45#|k8OG8md$G32}h@BEp~Vkx`B^V
zHj=@TIq%)3ZBzZ{G6eLPzPwVs@3=Sbvi+N1y?B57?=|)Qx-Sup@11U(ojc#?-p#EV
zZe_oUZ~u5}lWLpz_j9sbPgqj2b&XNehG(W*R(H<+TJo1~VM>K-+xFG$ETvxlc2mO-
z^se@QrCP99>X`R+zC}0kHx&NwoXzt6>$h0XYlXR~MT#FHb~1)|n7%ylX<F*7I~}*o
zmFDG#KkfLoa{i?w4fYzDEQ>!Z@M2Re7OCtIl>8Iy`*nWB!YhA*a~e!$<V<mR?rz?k
z|1pNKrKQA1B4?Ua?M{)o{hf-dKkJ=#I`hiz|NW<dJI>zI=j1S9Fl1`7Y&;<-A&_ve
zTPx}!OTwy}$^0E>eyzUk$5Ac%+)<{=pZU&ux2lw=A7zf;i<a&PkSm$U%Tkw?A~8d<
zulq{E!+pldUJ{m{M1D2NNiE;plcv^I^~Pzr=FP9sd+tkwBnx&a{jvHSlqRy$i1XgI
zglS*qo->lK|G2B1x3D2Z<WXY_-*?&k$t(Y=JeNIPeSGP=1DnJQ853C?Sp;;$H77rf
z-f%TKQG1<trB%+&wD()@+&<f}Skw2&qa7!ui<(*@Q$ljXWK}kY9nwE=YpsBI;`UWn
z-8}0=R~J|>cq0+g6Y8zFX`#;JJ-d}Y-)*{{b>`B=SF_kRbE+zC=(_x(Y?i*>@5*&K
zK9`JzITpFTo6%KYG-<)P=*g?NmP9PS<+#SsvGis0?$E0d4Q4Z&W;x9Mm9}a2RGZ(g
z59v(1_vS(Fe!=Ix|AL&3<ay3_Ey%st618`;X^Pd_hxKx01%L0`KbY-2!&Q#GZ~3y-
z@BQW(Z!y&t3(@wfnA|06WA$U-M#<9)zJyxd=;XVvx3kgVuJoS?6@rDzxw_w4h0+Ay
z-g2_E3i0pxesT38Wm7eg7J=qvuDi~r9QE0;@g!eGz_sZ@xjt=W(m9c3mcjWa_iFa|
znJp0rnbXb9J4NzLevV1^WJ9SR|6YIjshQ+{clC7sa)$X29AtPG`+9Dk%Y41<mTcI$
z11~O0KWjUC-PFM8qwjW$<lj}gZ+7-<V$>_lEd5!sGiIHW?Xe%W-CG;yZvDHl`1|}z
zHy*!!m-M+Tx#^c^QLSV7&Cf}XjvMD5wYXTWsF&Ph81+s%^w{<lnOZ8lp6yJCdNcKQ
z=|}Gq5xo0$GoQGSerlqdN;2aVUvcf(UfRxftlmDMTiHTZRi4@7UwP;8QP(4q`ZJSQ
zql=!+$>Vd^yckvfK;rUhv8^R)0y0YFkLoY{4K@sAd$;($k-DFDqNvjomY1G|_rkRG
zmN{u(Joxqhp3pPbzn{t!7I$=b)1%c~5uuU9B+$foj?K$cdleH~Y4BaKmwfHamDY24
zT6n%#Rzz&jS4fV%;%H~|e4&U$1UGZk&%F(1N!^T2%93|@e;qFP`tL?ZRoEhp5A89Q
z88z-33udgGaq7l2C4ut}5|=nDCTaG|NG31XwkSp?VrB8krikvi-tBK5-<F=~+ONCa
z^2v(XQBr$779O6*c!$~a)*dV21snEgIwq~^I+)G5{`!&!2cD_tEWMcO{Cxgx3z-Px
z4*&cWGPx68Jj>qg<s5Zw;n^o!)TW1tDjFWNSsSA*bY=TVA3lvt>tnXHIzRpPK9@LE
zcxFy@Y{^eI*&ZfiR~5^vB1$JGbKmih{j1izDogp{9~G;(*5p6Sy6^VQ7dpJ>t@ZAQ
zjStUd9zB}5X5%s!|Az(P=O2G4PiGV1{qXsgfV7y9-Hd|zNritO&J*E(P|DFBbh<*L
z;lJX?m%Hp{y;8~V;r<kSOt3D~!+ciO{U@7K6PJZgHtb4$+V+T_+vH4AhvS7KyJ|ja
zb$RB^i~aGXDx)}Ne)0P{mhAuQ54=-8@ny@MpYK%V&-m|I&iI=@bou6GrKK~)ua*}%
zw{xCk5Mhip558)1R;!=A{y^3F=zTU40zQlMviJlV6`9TBJ}E3O)3AQrxW~76T6V&!
z#fOb@^JZ`5sW>9DfqV0-f0G`ph~9U5d+S}*qEj{NuDNFiytwuBUdBV;Ew_D~7aHq)
zktqv|jW)Y3Gx^S&*xY^3cIG`gEPK|NKW0{nyRhS?SW^KmW5sCCRV^=Pol;Xe!6)dc
zJ@?LrtO+xi)<kaRja%%tKx%gQ-~S2U)l20X9u+KSQQew2nP*+$vYskwzSsUU?q(?E
zX)My8B;;(e`qaT6j)mSH&U%7{Ow*%d1uyK|@q8C|q4|u%>?yK_(|cDdEN%R*tD3Uy
ze!{N{3m<>_UT5xme0s^xc|STuBCQs_li28(&}sSTqVEZXMTb0VI}>L8F6_L$aEDm(
zTkA_v!U0{vPh0L<*Q_W~TWay#^VFpU8y}{+D{j2Z#_h-S?Dp&vc}(nAVnW`1m?9yy
z&P8-<O4<v9rw%VWmY?olEBEc;y@te^y6SUtbLJT{)CEg8&3n}$%%C9l>*O&jpS|mE
zT>lsI@p{(QTV9U~f8;-Y>=8YcsXUaIeXW6TG(*9jm)WaVJ4$PD+`7=D+_+Zp{KKEC
zR1UiD=Ix49Sz1=4<*`ZSzy9a{k0%~~CGJ)D`TdUK%bRST`vxR@y`;2ctMl%H=T_a4
zPW**>O9CCj_j+>uG>tkjeU@LAf{W#gYqnE6z7!UnITcfPs_CTac8T!rDjU#N@v{9-
ze*AuW<>P&J)n^kcuSMVCUG?|~o6Ob4k!Hcl_gOM{tBX|MoVnn}d1}H6<E&kAM>a0M
z+~xRVZL?bMwiA}q+BqX0xGvH-t<aEQ(j(r?u#4q@nF41)w@otNqfV!#-!#>-I9MJ<
z=C`P7-kCmaefQfnQ@Mip!+aKsaj>^mM>Jhnq5mn!)G;@x^&$t?qH}GUX&ipODw0f6
z5tAHM%`HDpxizsxxlp)ynZTA9&wX;At{pk&88yr0YS(M$d(UR<Jj=~xD|ChNDhKmi
zbt|WUwHu?hT#3wzYgwV4d^0+CtKh-&ynMwu!kd^1UBVYNxWo&bP0=as(Mo4z<>7ho
zSZp89wQCC^v}7E;WaIQ>t`-OsxSv~bGg`weur!AG&D`rzGRkb8I$O818~e08NZ!;t
z{kG`Fu%$dDl2e+zy;d_bF*R&5bPAkzLiv$ghpX>YKc9>5*^DRc;VEsCXsuX#<!Eq5
zdz<9bBc?y*@=WKB5fpfkx}vGu^04@|)`<BVu3P?V{;G0i!>KQA^X3TN%xpWiB-8Im
zi=j|w=R#xcvl#&*5)&7Fxu!UMnejH!AlsAg*3}*?JN6)ITF5Plye<W!=@(OXxTJT7
zY)Fn%&uimRozrt@<%+;<w-s^@$;WP)wB~{It;NN8JC|t5s^6&f4D41C)0n$9e2HI1
zb51MIHHAgLElr;`v4`n3pYFQ&VV~0Pli58@v!lLln4}dMpE}`*az|rjA`91SP02F~
z-@}-vt?up?mf%^OV8NOx=#VpSn}9$@#usIdB*7hmTx-rZDtfItoKzwavRQ~hKXTTU
zj;<R~os22hX20FK^ZsqK;3?B9TXppqSMs?R+uh$*vcy_d`jjr)!4=hvOS3HATxKqx
znX`76?qwda`D+s1?wKg}dEMi1uikAZ-fusyU%GnNgEvdWRd+||KF&zK%v-xTLvPsw
zNz=1G;(~M6mYGiyG1lz*yUHnKV(-Q!q3OCC?{AV=FthD;pmA4MC|l6N<NB=yB{{dB
zrUW*NZ4%XEpHTDn<JCFplREZhOkE;&UG!tCY1)xHx>3=~RD!%t=CMqi<EZ*Q-(uU6
zjLRPT&Zf04k({J(G>B!@<xJismy_ILKTNjr6P&)KBWk9o`Oc<ohvr6du5D{baA1iP
zX=-U-+QhoqOj&ou2OfqFmy~ml^tC=kTcj*#I_MZYag%}>yTTN;pPs#3Cyu^a6A)>d
z7yV4j^;+JsNe?b+e^N5EWD*pOOb9vY^&z1}$8(j<&8gejW;tEUU3xI#mUM1Z>}2-b
zC$>6@_gN=DGE7<XsG{Pe2y5e<-FkOoci&Foi+UL#;+z|{WnGi(nmtTenJ&j|OCHW?
z)zfLrjO`U$Bc+vM5Y&6)KrUy(u`?SS3_Iuf@)^JVl9G0$YL~)BK^G@wUW1p3Paj(L
zJ(s(yrO#)sm4AIEcS%aL?}FFD>8y^IWUg#Fv@Koxp;8Is4B>9kZK_>t2YX_o<_n$T
zxTdR<bN|Az>=|1fr(eu8dlSBV;@)#%=ilTmiQe&0aE<?^)=kqH%3YL0UlqQwk=>Vn
zVVBt%-K|e`1ExIg`scPz!Qq&J;kpHXssd{MK6$Y0al+me{`=+S6KBs)(um!(LB%iq
z<P;nKhs)kyb5}p`RVx1Cr=Q0Ur^(9I&UR?mIVi^a(pzYu|6f~iuIl+}hu8kOJFoof
zma;uIHM_I7Pc6xqQ{&Q+xxw{i&|Z^(AlKkevdL^e=G;uVzM1d$)y1#xF0U_Q?5S~R
zOp^>-*l<~(@5bvJy25K-S+n2SdV8m-0jH-@=(V#xN>g-Ib!5-xsTaG(ZFVSax3n`<
z{$w?m<BQg+wOd0&BPXPnDzM5*u!;U#e^+JW&Z*xgR4nd@-L|VVl>h(6m)^SWB0oH)
zHm#mAeb#CBZwUhJe}CR!ohWE(e^#X?cH5CRl7ao3Sy;|`%3i;bbMN6#zuAggb{xIz
zd_VHgf1bZ=3C53^<W`!oG#~u3tE;xRFE#1BiCf098w+G2CtP&VpZp^HVY>CN0I3PA
zX@&MG>r!=M4@SHb5O96|c8%SY*86L8rPq3t8cc}bvimkE%=3;%?w9$-PhQx*-sODh
zLB+Y64HYf6uP@D-dZj1qQcs{%Yf8Z6J1aGMR_Gng43oES4V_@ET4Y#ucYDSr)mdi}
zmel#_T;&cgTaXnxcgGvU1lB7OTYmQ>S$Uf>E3jN`PyBURH#mS}irQrkkBMF!DgrYO
z%=iBCW2K+>tEX3Qr_X9n-KJ2V|7&Ho^q04m?Rhgde!Gx+ZA<+T=a>)ia)&IAJ!(3n
zx9#FG^R>32As_!<_njQNQSfWVa+X%jj@u#?9d>KkLz4{F-<FZM$t1q~;TIA2DFFul
z?K86*o;%00uaWnkd{pey)MxK1S~pEQ!pZJ;b^19U?N|C&yzF%ECtr_UQ=D=$%qDZ{
z?F7NjPx3t%SI;!}7U-LH>J|IMeIMrUQ8sYoN?x2>zVZ3)mmVhV(^Tgr%${q$Xu_5I
z_clM@mr{I8FTT%BTE)uF_B8+7|F^bh1U>ywqO23B<#3Znd6)Cqso%;fee41*i7EAT
zxw`s27y3A(c6xgK>92cZmdW1@I$8dCCP&LQ5sMmAW8rze^B+#ve$6lPcdGc^#G3~e
z%{%(=k`T*Z>qG{}i?a1y3-7o{KKQp!{ekb%_1UU__b-^%DD{i?M3S2N6mCE9{?rx@
z?MG8n!WLS-du+Ew>Tbf+yY;$}r8(xAmeK#GuVNPMzOl;u-<HNDYj-zZ+1R6P)0Pvs
z{ejoz)yqA%UF@lO=qOehomJes#^7FE?jN!JmqV^DIFtDOiQ-CceP!#(ig(iH@?Vk6
z`5o}A=dhD>V71x8_1CA@T&q5-8>27b{Pe$V$>XA9cbJZuHlNpBYt_{m_MM$E{Kv;c
z{j^ePpE=>3?7T~ueKpcIJXika>2R-9?bhY*HNjivbja^adzSSoYhT96`bYm)n{DUX
zCRM|2Dqogv^ksFB&l9y37nfa@5X}42%{X&upH_Qw<=2c0IlU@%?e1k9hxOux7yt4J
zzbVxq`zZaycHWff8^u2K1l~Crnvmd}Eh6z-uWC;DuWPxdPo!<nk5_v-{r<k)&z>*3
zucx`<gnrceP?LyV@n=q5HD2%}SaRdS9N*?x$ID^9D~;G&Z0fc~Zd{}+^?zA)!ZQsg
zN2P6+A>B{rKR4!c&%AQ;|4!3-<JYCJ;%@2e3N^2mcZ&IJtCI?x*ua1C(n{A2@3S{9
z`SzmLdh@K){%6<aUt)K9-le?g;-V<dPM<!9t!`J@rl0CM)Z}^D^*t|(-MpvH8D9eu
zr~k}-p=fz0M#blCe$=hm7v%5!So6?biK9>Lk)-sS)TT}~YniM?OF1pKE1xgcxVQgX
z3itFWU-l-Ju9cJFd~5JnR_4|PHyy+2Vq90(uPU8-{FUcl`^A&*B>mEro3@RscXiBz
zOKOdb-+x?tvFMstVeL}cbL`%W1a~o>+4TLUZaBM{?)`@zGWu2bC&m5MUwb3sbLqsX
zjapq#GP&Z`@vlEwy}#f5lZuSW?ADVWtGL;A+OE!4@h-eCSWuXJimC0Ni@4n?)4gF8
z>IcNaHoQNx;`X{j|JZCqB-B3j*iWx6P)XE_C_0iPIzRc_&hyrRS7STB<^@i0Dw(Uc
z_?fxagh_LgcFwQ9p~%1(5iys?()Dl)$24V=yYnB;IJ&@>Q!$ol!BmaxJG~malx8nx
zy_t3K%Cs#v*0Koix__ZA+QqkE%I?#?w=X{Eu{+p&)+)xZ#a?`tJooLK0*gyaJ9OP_
zt?OrHWVB@qxv0;`i#hkirQ=`WzVtiQvzM%Bh~~e3t;*VN`f9@?C+6p_yt$>2E%{ES
zn$4Sn_)8xwa?j>@J-h$pPFnLv$?GZ62~VmwO${t?I2Qc3lX=PCg(->OIFB<|i8k(u
zQcV5yN$B9t_!l|cJ<Ct6%uI^6oFXCqtJ#lPZutt<%EK$Tqfbudx#M+io{gBs+{N>X
ze(NoAxuxlyF@sa$J-?dvTZ!B8E0)aZR;&3Qx3Tiafph!pmDiPaNPRfxGQZ<Mm|<Wy
zYfF8pS1Vg%C<ohS+2BpB!XJA37QTE_opD1qGODGb#QIX*)6j+`L9R+0<2JnU%fIFM
zq}Zq1R8q%0L@_zjS?iGY+l9Hg+J&!Yv(?ldGkS2No;{6I+018IE4#y_^K*Z#uFO5P
zSuN&wN$Hja{`>SEhOK)d<1mFu;^0cYS6jTl`MmGA;~^+g*_M>6b<>GcBYc1JZ2qc6
zCtaVNj-PY0byL%kNF$Xgl12_PAK(6eyGrM`?pE&noShzmtIrs%SGhK|zv#;LwX1qW
zUb^?6Iolz-jmt?%Cm^7k!KFDVBS}~)>X`KE#Zi$<6LLO9J#O{MN%Ova^WnSRhxGzQ
zj3<+3=FW=tQz;SU%{8;hwcwCgwODD@p)J=1971dSURxD!-OltNUoc(p?UsVn)I$dj
zK0Ud0=d|6IUdU_nab&&J%yeJ6C}x_%jZ`;rE-^!6+p}wRs;+7!w_3GnFPV5`MUh6Z
zMxZ$R!;O)tlj2QWJH!;`-_^fYG1soj)-QI+%!@|?m+$^Rt5K=DYRmHpU&`jHez|dY
z#r@_d<qzlOEpL|BIh<=-Q>^0_eEZTo<(ad0O}cVbV-ZIOFaP`b?sunu-^}@Po<`oM
z*slL`OKep;H{=-Y3ojBr7IS8wh|xlw)88*{R^e8;ey{!c(KAUcEGGmaoE8ZwPLKR?
zZkMIb*5eT!O}6`Y^)9LL)k@phU@h-o`+s`<wu|R}TP%!u;~U^`GEAd*e{SSI)h0o2
z_Cx-xZmd`JCR~{NXQyB~+d4<V;^{X6IkY#~u4OLV*L!|<<Oxr!{^{(($CR1GOe>b$
z_H|i3Dff(;Th9Ue`YT0uj9cF{%i8_luwm9^AI5OumVc{jCcP<h&6~yZn4v=RXxOcK
z<tJGVHu3UdXP$K?-Fe*8FWVKh`#4iGZ^u;6Q}y>nt9ZILD9C?uYEBBvnKXaDex``r
zw>iZVPMz7JDD>x&Oz-<|(i+R%1uqnIzgZ)&_(EOS+#6?gu748VzDwLTIbaW`RCug$
z+tQRD>)94c+{`%eq(M<@=04>kf)A4WN);N8zOL6>S@mV1eNUNK-Tecl%&lT!+m@~6
zKb^<-=;Y@58_mB2gw*4<t#db<K4ae_!z-Kj9J=%89RJsZceWfZM{XI+)DvZ{XJoHl
zdQO(d_$;>q_lW~`OsuEQgch-!_lmjd^vUuwA5WR{xsB)V&7L2-N;xZ8f6D6_h8s%S
zm6Mc`cVr4q6mh*-(f&4*@8q!y`&n;P)o%8=Ut!;P?N63(@VBxRYZuqQk><UsxxjeN
zeS@cO<zDBA%*ZnAx%c6f#w8=SvL(%T-t5(jKK#}=l6hZg+>zp@K!&TTD_mbINE<CF
zyK_5A-Pu83WqVzLkemIha;8p3k(FGhiyZtkTkF<2?i6S#Sh3n@&hqd%7TR;<h1|oB
ze!aJK*2l+@!H+i{FMILic%;FJPm2@Jt@$s!?6Fek9J{;DUF^ThR)-(SdK9>38s`f~
zDGmus#u>~FiYFdwE1VaYyx?Eo?88nD-=BV~`+nd*Yv=VSu?3%uGo`Za{%zyi{(0`x
z=bz#OZ&$r@+LWK-WO%|)^XZL1PDeheo(Vf&2X!#<%(?ko#_zH~j@`eUC2u`<f3n<n
z!|;sZ_AFgV0k5=a#^&}>Dy*C3S!zuWap)Sn_{um<ON48q_WP3QB@U7TAGWPpI_JS3
zUFGoge|?ifrw9eeC;$Cz`uT6nx~w^M?2FEAtogxS61qdzsqf^;a~X@cAKbFo9DJT%
zT~4QK>CwuZlRAY?Eb1yh-+4TK$Fjdsc*?AULaR>s-{t$3Asf1U#e`i;`Bv^yzW(>+
z8i77TnR}<&Ute8$@9x1~$J$TZjROCrCH*e{cuzR5*7I(y|AyJY4kr7ubY>lGm6-d`
z<IvHQQ+hg&v`pd&Yhpd<d_HFRb}6eX8}mY^>#6!~O<SwC;p(Ncimtn#ZF*Zf{j(kS
zlc_E%|7y?RTKM~u{V`{D--j13*t)zBcKi_VuH=W2xJmjhYdhUZla6*v$oFmh-f{4s
zo#URy1gp5|$?aR7*|7%pOr6Wn@Hs2M;N{6Pi2(;E>2*k_*d@QrT@)JPwzN9Lu<6Wc
zm+mXZK1UP996PzTOf{OSP`6_~|Mm;=EjfPe5(No;ima1-7kZ@3iMjH69<y?r*;=U$
zsVj7Byt@PMrH8ul>eXL4uvqBQ5!M%M)waq~OOG*DH(xN;Q=NHAYwfw9#?sskf7zx@
zo}=(x@=SlusqKc1|Kjib;HcQha8UT|euLl-*`8Yt|6RLr+k(b6W$l(T3Qx9WJElKb
z%aFH?Q{{)}Rv9COT*ftKOJ~Q&XT@HMdbls{Nr=sY8(#M~?tQR`n7ZV^0@Ko<t7fKW
zzpduWoVrn<?dY9%AJaqwlMX8wL~9Eq_blG%<2Oh2$`Pkc(|V)cHl|29{XaMD)1Jah
zdRMaqjAfVnFtW4J^E%R3{)O*U12=QmCI=;1Z;NkNz8qgA6f3__$ne>_qSUVDUmIoi
zU6=PiwzluPc%iCLmBylcP0gerCim7qr4@J1nJ}94ttvEoc8>f1<wf_r^i~P}y72#S
z+-<c!oxGa;zShgrr(d>yQFvsR&@#TYF{e$8T_g8@{3G4k9IE%)(m0j-5ciMxwXP3y
zN_U)-lyuxI$@KEApyUjZt!$AmRg{^I9THPnTNVG}<*DzsfiW+)&GJn+_#k3!z^XNZ
zO=2fPQf}G&Ds9=>*7DTz{M9XUXU8duw>-RbVT+hodu`Hpwd$b0<CouGPFp0lZPm$!
zn-6T$(j7KGzBbwE$g0gw+!DTlUwvntbbS5rOKEwK#H1TNMtOf6O!uZ`i|u<Oy-juN
z_U|9>{VopwKjU{z{>N9}rhQ#kp2Q=!;hd(&oy^lh{7TGU;`3)b^?&u5|4;jlyT9)%
zP2X_vafP+HM=qB_@kUQYn|o(1c3VqSTBo(Poysp%Iv#o<de3SNmCMQ6*?B8;y}GqG
z^W082oGfGTOWU<HG1u%ii^#!HS6<TzG3B?TvpR~t>=XOo5*#+O=)%$DjGnc3b0T;b
zB{65-JAF)xhtJSs`qrcCg?{gx-?Q%A7l$7Gr;=_9+jk{>abB2KSy0?4D{dZIZ!LIk
z)~avDs`+OFveUL$K3Z}2lqt(AEf=$Bt{7>-f~Ia+ao@9>&R$sLdeJ+(d`5WY&TRtj
z;at9cU)v5Y5>HySNSjsS_VMod0?mqRBV3FcS9EoKI$U1v#QaG&OS#i(*Lr^y$vaM~
z7B~b<Ofra&d38p`OkfI+`<|8N5ux%N+m;ob@a;OwC9*YT&ZAY`UfCxmPO85>JCQ@=
z(Q3xCRcWD}NAjK(FUxzk(DCx}Cdt%_Q`6F!4rXt;wCI4S$0py)yXDm!KJ8Y|kG)my
zr?g2pGf_=3#rmdMx_U^|dB0OTy)9w{6E;e6epy+3(!f%)!C$@Y&zZo8MZGsBgz{UZ
zuuhD%o}%n@Z9(j^bf(*35>pIvd71(;w>aNRt-HVUVgA3oqefR&y7FfKSMUD$=WXQ0
zI`wD8b1v;$`eBjU^8@n=f3CfJM4eZ)uh8u8LLnZR84czJ4I(Thf@io4qr-HTZVC(Y
zw~E$K@;Uyxci-lU&~04ndNne_j3#P&a6R62KPF1lQaE)E$Ajok3jSFeBx*k^9Y|ly
zGn4tL;@70xBJ2vf61(hDCLBqb%aHV<>q}CbBMZZ^1^v%+y<$(qU)Z{kLnV8q&x?{T
zTV-D>#hwq|{>pjZy~qbUgk(=CI!K+?+tz)3TE6J+jOewQM|Yg*6_L7==^$U2(zH@N
zgZEO!37M13+a+8Z4o+}$h%n-Cac+-QpK#zZ!@^_L>uk?(u03k;@o>NgzX_Gyhr249
zdS;)zV$j5)E!wq6p@+ry$t{oaViy*ruKiZ=HM6A_EjZY#<7lz@Pi&ROgH+~*w<((p
zkDAYLj@`}At2JN$0Pju3+qRE#3=J0@I_jly^qO~XhuK7@jc)9{&%2!?zUe&Nl(?3+
z;Dl&rh-cJB38_ct4%k-jJgu57A}Dd-hUJ5%qnhR)%><j+*s^Ay(El2l=rk$!;;Uc%
zPp1WX_=IxWtzKtvJNnKQiCf-LPYWa)i}>dr$Q9N2ytX#?qgI$>$OnH>8@62&;xeDM
zmHj!qtK5I$yr7P~YeawUwmHaCRemp>Z#S<|=Eo`>8}s8IXP&qI(sJpr&?3>Z&Y>+U
z8nySYb~=0gsKuW$S^bsEOaIokKduXVmwBy<ch(N!U0uo3J0HI@W4{o0tG$)M;n0qz
zP76UZ@q(=P0e=E_-FR`j`V-&xX9a)s3y<)=6G{<s-Lj*8>Gvx8`QAD{_AcAm6q+82
zJ^I$Y^`$6xR@WvKJH6nSA9e;Gkx4&hdE~=tKZ8Qe4GAJ0RW`A)-+SAbEf-GfVP2YI
z65qaW-jw6aNB>*STOGz+SAADZVZpAZs|UnpY?>groZG>;bvb*Y?V0^cIXblDWNnRe
ztT#@HJ)gGGM9h)l7`K7GKyHO*#Da<9st=_+v_!kAI;3-#U7Rps-yLRAlO7J9q{}9$
z+ydLDb!7|fx!Ae=P5|Ely|8z)JdX4_b8zTRyr8Kc5ir3i$h7zMt$Vq#EOK9(SQje`
zDXrQr$-`W_)>}<L;^VO}tsBm3o|vV~3=Itp`)E@)Z(UW!qZJyZSvLiqGTper?ZtXy
zW0E2Faw%zU=lohL8@~U~E^mHi`}2mU+qz4vJ(;pHe?9xZojSdwp-IQ^Z`<Em#_4@w
zG9mXrRy8oLPfyS}6r!ZnG-2(g8><%WSYP~QO5c|a*)z)=ZYeZ7w=jLE)2&Op_bl!?
zceCTENB!#T0o>NjdxVc4@ArSd<+Fz!yGG)L1sP9H*f~V*-G9R1==1zGe!kx`gHLj)
z?s;OpBu(y+&Ay(+3_J~L7P))B@>d?^mp%HTFd&s-_v1UO6jv-{Q2ery>1V`&#O6Ec
zD<3`heP_D<<wb!%1zjd=)%G#GG$~XtdF!HI-7cXW-HUIhuS;B39j||@%--Y;=b!S7
z_g-NVzT68Bub+@x_;2|`x0?l5e}6XVp7F(M?Tke%CNoZG75P7TeW3QZzRJS~PcB`u
zusPGR?AQe#f%{U4LYJL0B_^&2Rq9{0FeJoHYh`bfmX;w)Qk&_vMGF@3L{3p)Gc&s_
zwe#S{2hXpajh}O&_|5V9<-cP6-@J;-w01jGnDMV}#=QC6>7l79=NsGaU)VT(e%V2r
ztotI%@BOZ7yPi}T`&xv5gID2%Co4D>3qC0>p1k?Vj*n)0R`xF07=FK~o;5N-(sr^~
z>8e)?L)%`ia-Md_TdlNjs_>m`VdiX&>94DUG-TrwJ<qcm&3P%s?{!<GX{$|l-9hn(
zoO>d*Jr_EpY<;a8D|T+<=@jnJ%<ZB}W*FSMs*rQS)OF_EpI5t6A7^UcQ2NIZ@y+cR
zvy4`9#+u`AjtIRi<UKHb^%9*G2ivDF<ksJnB6e+-qi@23xz956E;p?^sT8$OIb_%Q
zFY~y4^rU3JKQj!JZuVNqnGm<&xrVpECiXjyuX7eBu{A9#?J?YT^i5O@zrBxHi&Ry%
zchFn+9+u7dDyMjty?yY|u;G}aV@J>AEqN7dURN*jkl!yD(yiDeH)H9xi;=<6r<~od
z`F0+?RMo%t8rzich65|t9M;M5JGSANfR{sob;3*zxyX`SrCy!r+Q2l)3?C;4fyooh
zqODF;%)5LeP59V5D-~1r4@Lj94}MDgf9~<Ja7msdyO&;V+Upd%Cx1JdTUeFXE?jXS
zP0I1%W04hV9BfB6PE{yKZWRy{yW0_U#E4ChMa`u|ZNo~N^q+OL#n(fRdcLeo6<QqD
z(ImE5vLJba#G!pp^bQ&QeCEDH!aXixQ~2uV3H2+txh0tWRlk(0w)NuYl7-wA_bxXq
z$VohZhjI6|D{Tk9Px*2)_R}gRM)@`QrlqDyn+2Ag>V7N!CZYH6e_lyL5AHj`3>(jK
zh%gFYVS6gf{>jXBnUv%~o23_4&2l&UEcnU!YeM9)T_;TwCTyP3E-1#6dWBJB-xM|%
zMFYh(vAf#4U741u{bFA|V-d?$EwutK&56a?n-dL1rY~XEiCCzn{!1a~7PlP7%r4(;
zPs?|`ah<9+dn1R)>2M=~Nv0A^|BwC3cKvXVKRJ)}(W|t{e}71<yMNZ#b*Yq3&yl3l
zZ0>%uyW3vK+cL^<o6NiV%rZcAw?x!0clX6MTlp<re@FbbxgQ+8y=Usad$H`TpZH_h
zel9r8x&Fup5$3Wd44b*PT-cD;H&c_zY3IxddyS7oJyN~rYd(`*_S&P=mEQa}++^qc
z_n33|!-CoFTaQLZvQH`$J-FnS_x=o{wQt15w@6O7;I-Q0LDRd&t7mtv<=p(mhBvS^
zZNj-sze&QUPS1P0npG$Kp_I>wn5j2}oo*-kxgFg0#q3hovkM+aZd|O)%<%AA_HD_B
z2UCuFbToaqeROV$MotoI#=&PB&QA<_7V}ZSJ9oQ_wl?Et?$AZwrfxeZc(lp8y@2b$
z<maA`H%oi=2#1K3-ey`9yUZmq<eB2>Jy*ZB?VYW7xaHB&HO8Fhj5#!vW?jC2JGSlN
zrrLFja(x;m=*|%D?)z-FY)brct}`F^B<~1Iljuv8RD2S$U1Y-gq~y3ehg-X*-?}-s
zB80ibriDjZhmR+a)o*{;$`{hJSom%(Fy43am92Swv4BNUMt8>JX*Tbce9}nloDyfR
zD{|I7Ussy*;J=*g?Rzw4nk6PXC`vhO&)*j@PxaoZYg?aRGz)e6`ZU_?hgpGIu9#+r
zpJSL+7s~=!jRc_rUB0bWZ{kme^6Z!K%4zRCY<Fc(_PN^~6Q}R`R{CVd*GU^PE=RPs
z%`&&Slzd#m_S(_ICv(+*y16s#wwWQkr%mtl{I_j09>34!W1PhQGU3od@m80A8~y|d
znJ{&-yl=U8@T_<9huKCGcb~4RZ)$XrU3O*Wy?<Nxcz@DcxoSdj<$dSaj=3?eCN^{K
z*KXv|aW0uA6gY9BfA#A<dso#PZ=d|+;k2Hk<_WLQG--E~UH!<v??&jg|HpF|Gd*@w
z_AHy<{&Ua2*MCwObz2<G76dU|J+bd(+JfjN2KSE_FMXFuyPg!qJ7=9$!M?=YmmN3%
z^7s7M`hN2(F`@f+0+p9atnc8-vs-NYS^VJrodL;HY<6-U?N3~7Ig@4MnIdID-`oj}
zzaOoA=ijm8kmka5fjLG$-PgsQllfjbUte;rQ^3P)_syTbX~jNF6aBSrQoh^lrK($_
z0t^e@SGUbQ^S!$2Q>x*DiTp;2x4$P?PX2b`ZzcO<_FsHD2Qyu@1%K`ko|esf@9Mh;
zUPpOvXo{GncT5)0&$xbKMQ1~ffWxPWY5`523MagICJJtu^N0WG`+I-vbIY%_<c3e|
z&`9Hvd2apT?eqG%Umwp~`b$FH=jZ)xZ5zdeUE_YqaVppGOM6+~<GQ(Nx!z|#h2DjM
zcb)F-@4s|y|AyWBQ;VCpRX52l+gIKEb`|UNxCcvaJh04WUUenu)uIXgU)OrP*_Ctu
z>@&M$;}G?WlYH$z7A(8(_fYoZM3(gd4Vp};y=N{(3a)mqirHPxAvpVfMZ8h^zbHM1
z+GEb^Z}@Dp`XTs4(yDSV569{GqQ>_xc%5JMbC1!|M#f9JAu7#{<qvnS$rsG<;;nB!
zd81wHz3ail$_p-hT7G0+#96l$#S@&4a=UfxFFv|f!*#{0)i%nflARigqqfKDESXYb
zcJ;vlkAU_B&SUSluQj^3{C(gOS9YrvYH2Gtlnl8}FkO=kNeL8>xP33_N9eAc)x~Z;
zGyd=RYc6AVUfej6xgbz=C-;ggflJ(HU1_U`xSz9UiKBALCaKdQJ1#`b%UPf9_0Y#a
zY`R#@t>Sm4#io%$N2V4x&%L?qUFcssU%l&_MKj{6lbAPeVpU<^&ltmAts#}py}p;*
z?D<C7<AslN$^{?q;POcJdr|s9W$O#g08!Jci};ijpKO*r^H96lU~iMF$CggMlV?_n
zHecfmh~C+ns$=fE^i8oF%avx;kDcX9lO{cg6m4`rzO~wE*F*;qryN&z$NZf!ksma6
zsNdTc%<-`}JMGzrvW01L5*{}8a7%=olYW+&8=7_C!qsIi9OaBM&OssJ#o0Wv-|}uA
zP7atoJ1g?|q7NoPjm(QSslMCOsX3XwojXm+<z%VBgL8gM{)?^4b9?q+Ged##Dcw^m
zZnWpI*WZ2Xvt7h3FOBKJg<`=al@Xg8_SSVXonN(o<%Hkg5{%5|%t`*=t;v6|%HZya
z+wAEEEPtzKhKfmfymo8$oAu9~r!TpwWm5R6K+l9Hp=R7Wb1UWbT;}E(y;$euc<rjV
zjWpA2iAc5|ZCn1Ag&ldCUbyw`ZEfw9KcgS+@ik9Y^y%x_opyJx--P$;W*Wcezo6)|
zP;e5z%GM<^@o$s1$Gy3;{qjah5uUWHT9wzH_gogK%=os&SF-KU?c8>Um8%tbBFiVN
zii*njxGy7gKKJXV+Bnf&N6gnfJ@qiaUFqoV{+&w;ibSVPo>KYe&24sx*%3dcCAnCw
z`z^QCcf;;~lN{D9Gtb-d$6CO~H^Kb8sPddE(<Qirw>a%tC-1Y&BHYtu!t(2(vKJe!
zIc{^b$@%j2>54fevy8rpJC;7znOPZjkN3z-R*n159&~ko7Lq^4f4whm@^=&I$j>Qr
z^C!%aO?~RUqAG3T-Xn)+cdz}Rxc%U?mF_pLwSNqB*eN+-)$G&E-*gIsZ_jWLyK%SZ
z!_54}HudT1-2FYdTjDCx)#onu6e#r*sJrg?v6^$&)Zf<aOpjlScRkSOjXwKZ=ED_@
z*5B6se1@+I=O^^c+FseMQzfQ6&rMjU_{y)S51~&z);z7=eNxouSoGaPr4|o)yi57I
ztDnvYQi^UAnN_{=>eG_D%eq7RuNF6SZSdUJx@gXv8AaB5E3SQ0t+LK(N|#95-kHOk
zm>o7Z%{OXMo)K?9H{Z>+?>{%_ADO=XeZkjQS%DW}+#-+Jje3`cMyv>At9cZ2SarIg
zkkCwyJ)xJPW?Nc+j@p`<+g@VrV;j&i_fTe;s<rhQmJ6DmOFCHsF3wqHnrK-XxLk7T
zi-S>2r=9nx%S0UNnYbdA^?H<(Tgb)P#sUc!D<|J7o9Qig?jI{p)w6HA{@qs8H&*N}
zW@eE&V`y|E>G2fdc`S3>Cah3ccThz#Wdf%u!-@s!qPyfQR^5<#!d}w2*k#)HM~$br
z)W!bEdCp*3`QYh2>vHKwK_S=MV?La<J=^<nmFkvc=ZKirtOcu%WNRHv5seg7(lX+l
zDLf<KNzs(8Jx0+{)0~>+lI{20UU;uQbs5*JV0BAB{WUJ)kFJ>9zjHn9Z;47aGlN@j
zis&W5FYit6y#1%mx&KYg``8C>E2Sog33iJ;HB4Cf$arDO+P3=0t6rBPmDnEem^g(<
zxu|xs@i8R|UB1B)80~H2o*lNuoOxx|h5Yhum)gqr<^;0_23~hQCOdEKJ^2ee3*0>9
z9yBjvV7oCv=}_GkBbnD94OTUW>M#qNn0|e2yKmAf55`rZxBJ!IHeWk?Q^+GWv4Lx1
zUlQZD5a$+)h->Ocmg$R3P28t$dP(};`+mJ^?ak*4uV-nnZzy=>lX7oCz!?qU`}dNs
zTsg{o+j#nJp-(eKd6bQeU&snI^d(H<K9m<1+2H)?Sf1e-`xghMA1G$>cM16UYV{fg
zJ^^>tzPP5Jn=Cq1e16@{p1+StylTp-MOUuRa?4tHym`_a?>)wUCEbt2uK!|k(a2lp
z!Xv92kGvy|JLk_*&HVnO%<j0JUd)E<mD20}?qb?`daw3kix9S_%fvqHI(hUiBZI@~
zKEuZK{UwTS;ap<tJO8*Is@d@>LVm*<>76I{6g*kYp>V@fd7YzzK<%fkZbjk#^~ts7
zDOU`nWll{l;w&n;x#Y9yq*W_l2pntwyj@7kWc!_7mCj2^9Jz}ZT$$Q%J?mWX)1-zM
zb&@T6Blb>_2tDn+D!I(z>1~gciOilVHPtCo+CQKAP$qiu!@iO)rhFB953)C|+opB7
z&H3#Galh<pcI%$_eS)>jkK2-d%nq2gPiVUEM739%pQ}@(MH}Myo^rh1{_ru|;xA8I
zo#R$rJ)r%!?sJk*-;7Cy7q&@0%AfG{%ZEMIb<3VS{d6Pq_<fu0VN>5lcQb9e7~Pot
zweqd%jOZx~4nLp9W3&6{g3l)kH$<Phpk%T_c=5AuXZCX|96W8+`{(Mp&srN@mfzX4
z?nbpiVBc9?)&BoBzQ_9yCja|6@xRoUMazYx)cv`RMU|yyhdOQ$5=n`3WQjkq(50C%
z{_{!3l|8BNLOSoho4tAVp>Me@6P8C@5R!1Xz$7}WtXSK|)abP|>*8B?Ixm0kJ)hC`
zOsl*?Fm6U)<D+a5{>JI{+s|j#F80&@_#o)ZA@1xK*Yz@Q)Mhrui0$UFpWS-Hymavf
zEta{HG|woUvH2<RTDg0w9`DVdYrjtXsr##8eooeCq3#VWsSCkg)}^%xt50QnZkJIw
zpDn&NZSfPcQ|yipHnvo@M=_W>3DzHNTDU*s(uMiAb<Ne9s{R~TnJjuUyd?a<RJo~B
zdYyTU1y-nT_V9CV`}aBTM|`x~<;R^}$K4uu7M(tnA?x`=E?#QANBYif;*IRrI-O?s
z@K5o2dFiFW0?R*(S37m5cBf{^b!baAif;&MY|e7}6t&LPYRaaf>1utk#)X0Lr=KpJ
zv1P{cIqCv46iwFl>G;;4^SV7zNLu^S{k*kHPrNSLWbtpo60cd8*M>D;j{kMj_>HNF
zE32fywCO!NYkoxM<#d{zzF4?@e!1S?jaRgOwA6TA{@xw&(Ri+8XvK=7A+4rYEfQ>$
zPq-D@7NtpU_N;5|D(73}*tWiJ>iPd|aZxWn)V>b7d-~(tbd^uCOm3P=v7b-!Uw9h&
zLakb)WyadXYEg?hVq3xwtf@6FllgvO_NuJo`Dt@1mv3fTb+x4UbKz~?U$<{r-slf^
zyPlY*bEC~zV`tokY?u5(*@gXHO#A(^o$hqbl=ky)PyR5&(RQc6ov&tFzH}be*|>6!
z!y)AlHQzXk0uv%OFWcpA@`>w04tLjKr^G!kE_DVmypLsFRly}u6WYB>bbhdI=FDhT
zI}caRwxAQ9Y`-_U{^ehK+<(H)dslSV*Is!g=bF6Yh5E@On-^S4Wxi7Ixj6EYcWh0{
z`;UzK1?*;X=v{prU}x?3P%fGKz_EQ^dFiL`OU3Zo%=MdGKkcl8&h^j>=Njxz9AfQ$
zZt-b_zmddhg&VIs_~yUJQ(u4foB4-YJ+<SzUT@3%%$_gBoU2mo=-2yw_R|%6%A}=A
z6q@HAnqV|N$>_q#X_GVyE+@H%n5@YRG`iB?SyOLb+#jG&`$?{8!K`OrZkbLENjA-Q
zIGOf|p`>~F(}FUeKg!}CZH{~KZsebtqPWd!v!Bn&uaCHU+$82VexCh2Wxm2O6+y>M
ze*asGFBF6~pL)6S&P##IPjX(V`n|qV_Qj(;<?4T1uB|_GR<2}|ovM1q{Q1_Y3(IBi
zzr33tegF2;8ILv86w*9HrUZ6}uG!2db$sQlEy<qcvkG)$0%X5ub8KChQD^-zlTAsP
z?dqOcT>Q~~>sWZXCkq{VRn5_6q9AhSR&dlm^;+=_UJjD47HypJX7Ls81ydw8Zrx`*
zgC**B;|)#sH4*o|N;fX)StjMP!dJn;P{YSD_jqF8KJ$~O%gmd@w>aq>n3nwBpXZ@&
zZMC1@XUQ*D54_sJmg$nI`F65-*~7dU**sS-{<_?Hwrhq<v(u6Ti|u}i@B6;-MedGW
z{f;WfTK?A^%3@$tYMl}L`I>I`*SQ7nzU{h}{2=17pxA`Al@4DV4!#X#ke>c4M)0N9
zvzNzJLyv6jQNEUI@-cPSOnZ@8yo}8E_t=}>*v~a<_meu^*cIP*#nnph2v;dDTW(a_
z)cJp*O~sza){7ju+>Wy_Fl5M0x5*Bi;AHfrUd(0vmJ4^vJA=)5O$1K}&3t(~d;;g`
z6B8p&q`Zk(=3<ohcH-VG*JIZkt=eF?qp?%ql!no@Zhp>}2j96>ev}coyz1X2ix2wt
z9#>ZxSStMFyI<5{EUI<d(oH1dFdxJ5j-J1Pt(+bzo99*SW<F`N%P%4<rdZj`^V1q0
z=Zslm3~d+o>dujm;5)5%q(72l+o_bKYK!%r_xpZuiKSWZcNHz>WIxAs;{CgSe6B@`
zF$aI8a(J1TpY#YWDnEHvAT2^gs5af==<gpdyrrZU8?-1t@Dcj!e)wkGvi%d)vs>=g
zUtjL$EAUFsyzI)gKYHSwzEW$ZTAndj6!uAV)2UkV>0V0?aF{=v;}RF~!Mu9+m7X&W
zQyexdGbz3>Bd1O6+kg2T6}(C;51SRQ?XbS&#^R^O<Z$tI&7A0`jhr{`KbBw1z1r9B
zu3oOOLS^1u`_&KIYv21YKG@gR^HtC*^yU@jaMOc_+Lpaq(w@c^HX*M|LV7)WhW~~7
zb*HyEGpTlbzqKL%(9sGn&-4!&45_QMt}(Ut3$<@CYGBg5dwBICBXj>S0mm<@mt_~$
z*-mTkP>$Usps%Fw_EGok)+n3f#~E+FZU25{%g4R*)~|m3qw<RP_wH6t2glIs=azG%
z9+1~RX}PGk^*jGtbCoTIt@jx<H@~f!y<dFK7pqut&!!T#UmF{3mbHj}s|v6F(Y_(x
z%`aN+W01j$+?=cH-Z@sy`lQC(D{;>5=}z(VHx`OM$#V`{#1&3kn}6@7ZSLGX!hPYM
zOP`fq*sf*!ujAyZ!*3@2nJXyxdYj@bhF9zM-+i5VM@w?UWyw!$`;-mYYZ~?5=IdI=
z+u!wfoxkF;#<xHJ<s<He?OwKMf5yG9^=H~<F1~u&$$oF5gYDO_;Pd{I>*jOL(q(3m
zURQs5n@G_i<J01P)AqeQ{Jp8~VIZ@+i}jM&lHi#?V<c`DSxM%rrC&Sj7Vxw{H)2uY
z)G~+uaF3S>?=(${-d{VjEy4R*SoA@z6~Rl6NU|`w*6ckdE4ow4@y6!4wwDUbCqKSz
ztQhfDUL{hWOZMynMaH*oybVq7-k2X^5_DF4v-YyH*&W>ut_WLux46@cl}ooQ@ns0q
zQka}IqpDlu6wB@0%JPV`%gJj$U5GR6(U<uA^;5`|+dtkH?AcSb>#p#I{Zdz7Zrf^-
zGvnUos8xTHXKfT+Z56)snZhZ?FE=h+%m`X>=@!fSo1)8Bp3S$Ge|q)ix}%rv`IcrL
zdR$rG{Qqd?H;dYOtKPp-7a#aePF~2w<KAEX{Yt^_|3{NKCz<QZHf>h9*y_i5kzI^M
zV;6I2?9C(3e%P?Z9<u7v{v#OwaDvJ{#k!@eSM3|?8)t9N*2-d5VObMyeQy4rcZ+QQ
ze&Q07k@9Gn#A4WDk$!&lPxa}k-<F?v@m&Axfv<bdSt{P17yf>eY|gAy|ATTLk4IFB
ztynDQ+_{L4ucMV;!Pg<kWcA+C$2ly`Z4r5VY;4-`uTv%|r);wNFV8&lfb07}7Pg#p
zm5q;`7ye`^bMKW~?EO0a=$_MW<FXsCOj~{V&c*lJXM5&XPk;3GQOc?=CGLZbulSd&
zc)Fu(!*}tr#aq*UxcvH)|M>FM^G<&Q-ld2ZNNH$$I3HfsXym{q$R1f!CddBzZbotU
z7QN;j^KPtVkK$dy8L(}4Id`Rt+m$)RWs)N7l5H97=T+9sew}$dV1CBQJ%3_*FX_2)
zz3}l;d%QUEo9zC|yY|z6$M?_8@BW|}cj!c*REx&SL%DlI7%dz21lTc7JSwi){Y>V!
z#2e>1uTI~#OWb@?RVGGcsvOI`a7G)QWRctD9}3<H`IOHynYaAHtm!kS+pIV+sZr{k
zpQ5<cmH9qza?U)~oW*mpO`PqKWl_?hEj!aqPG?G3`M9h|xG^`<*ZHq~<vF=+XZXrD
zHa&ft?*I0i?Y+zYH~;$n`JcU_a_XA1OSs<{Sfz0VUwl#Ho7JJ!p4=ebXR0&d!LRx0
z=OkY>9p03rz_*XJe%H2Dm(OhcT&zCxL;L!t--C}mEs=Lz&%JDM&)wu?LFR_9nijlA
zbVFv;T;@H=FBQ4(*QB&19g)+#?|u1o@NwCSG-;0A5zfgIRo68-ozr9F&R?2w?4jeK
z>k~D7T2^ZP5?w3GuuMej;;raB@AiU-E(5XKOtArp?rCNR8hJgfX9}HFGFa%&#nK&Y
za$xp_X`;I>MyXvjbZWd?`a@JZBkl<A+-)M9OPE@YzTE$E#yoBNh1^b0w;3*wo+s#Z
z<gJMLTF2@~hA-=?`&;LEyIt6{aZ1uzudmG<O+UHUe7!X9(Srl`HLv+AIx`<XWXfqg
zM@&`QWmQ$beN#*Cp-VfL&RCIjUE%1CBA3fC3i&<HI~e9S<bLXVSbJ@Ydrz*xzc<~N
zuCjN``Elxv)DCCY>Lo2dT#h-+JL-_|HCFn`rG>#+=cYJUoGlhB3R`Pg7Q8ub+n2oj
z$Ft{O|M2q1qVPW-e;e$P(UUi-ow&sIY`yaBoZq)TD=q$d({=ZYIk|oJTyE`rWs$Y{
z%tQa1C+B2&_;p`?tTEej&6-J3zrT0{C%1N;KD<IK?{D`pp2x<l53D@CudRK;9pB~n
zXkFZMh6DG*ixZZ6rPS3Qx4r*)(Xqcd(;c!`8(jE$OQ7S*iwzY)7f+hsem(bRHe;RI
zFM)!^%?8cgO<J3HH<*2F-QsYFtzCGfqqoB|->Ej2w*^Y;OYSdR>@7Mw@!j=J<^B)(
zgYU`LPI2Ws98|b^-LJdNEBVz{uMm8`cCGu*=8tx33Vs%z)W3Ev=yF@l|4I2~-*o;j
zn;mdgY<=^}FN;fe>+QZerTp$J=kjT{xdaR+++^xVI5c5D%L0d%rn)Cpec`QJ9=`i^
z<(1^Q6WYI9&ner)$?)&ZtC?wZ;=j)Q)hC1QzV3H*PVx4)n)=2&{_EoO^*3)8hNNXr
zQ{Bs}c<<X63A1l?S3AF-YIwBa;pWHp@7xfHeym@xEzmQ7`NaL{+jqosa$j&UjQnJ*
zAziU^BWKI4eV6ZfWqz_hE#?~DvPzjF^!A2z>P2(Cq9)Ad+^t)>&&Zy0q1?>_C${{3
zyJ_y8HS(K<=N;_t*6nL|`fZ&z*@ma*T-wBXF53kcpDxhobd{TaN}&3l&GEBqckZd4
zI8XNfm9zS#7tg%7$hW-e^7^+w%b%upMEcCFy?DOqz#@^2@oBtFoButT*ZBAF*2P^}
z7BAFd846ftD6Uhk{^1|acE0z{)$bo-db{f<o^F52&%Vy#x=5mLQ~9GgUarRrLd_#<
za>Dk`m?8SQ++vHP!wsDa)+*hb1M9`g&*w~7>Q~47KAvOOLt%DH!Gu*zfnPsext>t0
zbh2RC$1l8+A733js4#(JLVmWy)VjN6UK8@Ap6i%ab?koOxxDaE4*#iBB}E%nT+T|?
zwLknaxco2Y$rvG(f0>-(EkAlW4(+(Czp?&Q!@;}HI-WgM=ll@lmi}3F(N3H7-m}$0
zZl~r~+t#g4R*i}?{{PtUeo*gG%SW@<o@I{N$8~Fw-?ZyI2TSj=tF0;us=85O|E;0=
zpSr_#vA25uIrlCGlsp%@plNosTCBf!YMZ=v|BL#vQ(;M0CUwUw{!sk(%2OxVFIVG#
zX_@a<{QU8D&*^VzR_ABWzjfm=N2}TmQ(K`h%~Q9QTu~^Sps$h~J^jnQiiz=pb6n3v
zty{Lb?@?{F%VY5$A-?Rfj4biex8HP}DY>O=<0H7<{bYpPhetE!8&#Y7`RE3;BrTY5
z`_`fNd6o+TgR2*O+G!+gKWX;{+v{H^2}&xocz$3$@W<aZ>;1g^c^y%9{d=STOyO65
zwYC4sk(w);OlsS|&T`XwWb{t>)qd-{$;*~c-+1Uj)q2B}YwI$cZVNL{)O-{C==K`F
zO*u6lqO+Fn$m5^<G3>1BE3UOu?ia55{p8h?|BGv{X6@WBH@EnEfx*>N2kwULJh%CC
znfYYq^Y4zhD8`+wxxD4XFJ_VDaRPA$8_&;_-x&AkoS4F6p?aG(i~Wmu{N{d6Q8<=s
zpVzUM>x5L2$kI30MeiNjzB2XkM|Z|hE~C>~LL9UD?rv9)oE%ZfJ@4vD54((uD{ZWJ
zwyC_nsj<oNgd0Pd_y4Fu;p~6c-btNUa-BW;P0swv|Cwtd9h)x9y_EM+{=(v%`VF%a
zv()zF9qK8ZBoN@fkG&$c;BQ}i|Fw@*5wUf*9WRtT$w>P3eu49mty`zNPW+p*$>!2a
zjz9VrcG*3<Tis;0yt;4ss|6l^iqsFkx9zFvtGfP~MNcbINM%x~QOXUbyIs|<KGgL$
zow_=KDV0S#UU^GG;J#OPYgeu=*?P|LPVs%VXE{L=Z}FGDapp~PGu*s{CrxJkJj-vl
zTh0Hbq$W=3^00Wf(!b%POwHxn-2cy~Dm!jCU>q*pc34kDDyUK8&9n5r?VMo>!d#Q@
z1@_-w(Qu<@Ww?rrxyS6O`%W*<m7Wqe*^{rm_w!LNr|+fH;w!FR*rrvlv+VDhyRr<+
zly)99;nC!Ck_a+pc_ANneiO&rsjhREnjg)uH;6IZx!~%%$h`r!@2X<1DzS?5y;nK3
zMwwxw=8W4$)i*egH}iXDEmyRPe7tQ2>wyDr<{NH4Upaf8qT<2jZI6zxp6zO$xgh%c
zr+RsJqj#EDAH^ShvF@8;+Vwu~8B@>A%{Za6pGW8E${7(~&&3F8Iw>+WMd*FHe4o+p
zqCyLYia_z{E`@~w*847P>G&c4@#DYsp<6rV-;LbDcK1!gGWV;y@-*+>=c?cFWBMKc
z{POGj{?Dw8l{)cUr`M^bM1;9PGL`i<XPo8g-0semo+W`N7AbON-1)<&s_j&1Y<)s^
z!iHm)U$L=HHrS$7{jWAZ>qF+B^5}>K$+v{~c#kA#pVaZ4n(|53z`=FPvx;SGn+m5G
zMDzt3#JfHVE}!vyh0`paBc1!UXB{}o_ji};<AXnE=P!Ks!q$BAlBofUT0~Xc>ZPg<
znYOT&O>C6kzT&SW@9EzrYM$SeZ}3jpIXN%j(R$gS$g)S<qW0M^H$M=TDSw-sufX~0
zf~#+dU=-(~MUPn}vcpy;ZD5Kx(Y-0|$MQ>;UtIoVYrp;33iE5~BK=*Cb*n$Dm}P$W
znQd48ZQEj>C)`_q@Ly|8T*aQh&EEfB!B^#mjg@a|?%c2|zZe~Kb4Im%u3xLe&+J|C
zFFv&|WwJ?XdU5xH@q4j9qC#IRZQpnuXI8t{FzK?&s~>YR!~R{WyZpF%|H7vSFGuQ{
zY3?oWd-r7eohj9M%{%UeY`WH0+IL8_F>1rV&R@PIm$aDJv#!otJ>|_z_Dhc+CuAwq
z+iQng<`>DC_x-OszQO-?d3$8F<QMUrt;=sc-M;VE_ptWPUC-zLdnEJGTJmm9*Hz<X
zEAHnSUT6J$-mG})qeD5*FBx{-x6gXMo;&7m@;9kn7wei#7b`8DzhsU6ox1POZl7M9
zk!bQ)_~e8~`UfW8wn=>VwdT<Nuzf!@9-m&5zpwhQ@cDkh1rL74GAt4?oOUxl`1zY7
zk6ceEEuQr~`iDtSCD(7UzEa1kzwU1<`5wGBUy!%3)m}GNKKMr8iOGGo@ACTF*(B`R
z*S?SWKE-eGQOWr59cSfcEnYuY=j*!-rn62q1vww^5Aj^!S=wmxYWm`!lhwbC7J2+m
z<T1E9?Hk+vD<)T7DijA_YjcQT)Ojc};h3P8h+1J$TjwHfwzkj3rzJM#+w?QV_dhE9
zQt|DTYIw#?W2^hDE(&)aPWu+1`_D9BIltU_)x+<8iS^C$TM)5Hn)~-(jvY1|pBe5+
zdSdq1`NhkX+oTrAC2#-5sD55<+3^?qODkujnHKk{%-3_MJsY>utfW8wV`)ie$O)z^
z;d?#SD_NWMSY_Xl>`Q67;9GU&rv2uGOouIf1)`I8B&+94GOx*T-@N#jgzncE4fT~r
z)LgY6`A7Wg+wi75)AqlnixAhDhuJ>I=V?Wj_CJ)aE&U=;a;hWS>qPRxEvwz+MYV6`
z-W7K1?fTI6N~O!d>GsDtDz;k>%GLMoI~Xi+gI$=%*=@=Rn@=)b<u!%dzOO02ZsM<(
zvVVq#vz0h+cg4@M_qQ7CIpnW(wdKUdF1e<6?rj|=DWRg?JKf}WzWud*rR()gZVOi2
z+P$o-?%RoZ&sO!mO=0gyyUlBuX7i<Ylly+JV}bMQVojHS{GGhuc8q`cEiD1PcTAn1
zau|3fME<M!TDoenRY8%VM8~n`$CanbRjBQ0GB3S8D|ErHzS1s*uhlx|r`<P5kNr^*
z&~e1Z{%`F6JJ*i2>Ae5A=htU>_iQtf_~qH}^yQ0v{np1%W>a?&68Sx&?bwqP`F%An
zCYNt#ZRJRgTed`h<DSbp+%-Qo_G@{>c7-+_WOZy(;?g^_IJoAsaj;-}XV#h4BxSE-
z7p+U|3tnf}vPtjEyOF!vR3u@MR{w{ng%g73PLWwGW_IbAS(o41gp3lUqt5r#zxi-=
z^+fU=JCb%S%*8e+Olgm48qbzhT?&gfDI8=g@a}0{8{%<bMc_}iRr{VtNaj2%lx%jp
z5z5AOBvNE`#`0OGjjlGWns#bYQ^&{e;wqP-E{cVEg-uC}=!xi1+IDDB=2XFCISzJ_
zOPL+re0%>_&9YtmU2-?y^2m@4y1J{jERBrQJrQEQX@^m#F5^notvUf)Lfxh=nwoIw
zl)@707fFteZd|Ea7rk}83`2LPxvOpqI=U@7<LJcH<go6b8>e_b+wA++t9Jcini_vP
zGtaE7{%#+!q`Ggv1!q_-3|(EnJfqmk*l0%Qi$rbpNztFh+D_(fSo(Xq!KM|*wuM*;
z%gfCQJTz6RwC3*7Yd>q&mT$XJW-a4#t5q~WNH=MVmljW6!GRYwb632tEX}^Q?D#y@
z+f^xhpYLA%BDXC<Xv504w|jHE&$jY-&zzx{e|VYgx6eOAc2>RqIm_7l?5XFcgLxL_
z`@XrT&8uJ|)K@y4(c}2Z{W){W&CZs;Ta>XiHAy?yB{jd<@W|AuUTZ^jwEeTw3wf1R
z=}m|-+p_xQzxB*~zc>G0-hc4z3>o2S@0por7d!1Ld9)+uU|#roo(SzHmm{|xdRSf+
z<D53{)Lp9>jVtY2j2I(&COTEgy_>}5V#lmsx?rEWYnz|Xzw54-4!YEKAFlG_RG)G7
zLdT|>Re@c{wAkKks@$?tBw3k7<kKW}<9C(;pT95Po|+_N#^Ic^s>C}#TKjTC^s$E}
zyd~xeZ>0TxJ!n*zAEmUDN84><#BsKzX+9E1>|e2$En<6Pe1pR^PT2UD&-t!(oPnG6
zI^Izev}WIOsf7Qahsfq_#ix(>$!WYZUwR^UWy6y9`Zu@!zBNZ%Gjdm7qSUmY&pnf*
zFHTXe>sNesr}g5qYp0)v#8oejk~7WSyKQZt^R=?ehc<CrS;T*xA<a|lAitr(h>er!
z!-T$siQl)lhdZe+J$HWoJ=>1fiwh>-4)Pb+pTl_Q-}{(16C}^NuRX$j{K7?P0n7Qy
zQuT?U*Eg6<mT@URl6|m)@07no)?&?oSAvN<^H<34`29O{O>L})-m*jc8zLW1Jnv$5
zJ1cyunNaQdm2dQ$lWSjYRh{c=w$h>@`TV-e33eMNeKb5c?fu2iPG8Gb@4bC}d2)m_
zciY}6-aNl2Zu~fVk;mQlp%#lu?tf*ASG24;=)?YqXIjXU81KX<2Rc0}6sAS(yZC<M
zl)a~ae7VT5WWD*aBN8l4Y#K`9MVH*ZDJ+e#U4P}>MEB%12h2>2@8tc<Tl8T@-TB0w
zF0seX@-v^mz<-zV($pV*;;K<cXDb9Jr=8jywP5O(Q2%IwuBYvrH%^y$zx4FSZQGyK
zI37!}m;JWiPV>Hd)_J`%r3;t+a}KuiS^KqiOM7^)QsIREyxOv-j)(2IC0VPa$-DT?
zf##3R7m95~_ibFX?b5NAlNVI|+#Z(vYa08`#O5nss|-%2&b&GK$>ZBU=A>x<TcfCB
zTN09*(ZsWHeon}19y8V-uXfsrMKe~fUGiU#voI<4J=f<u+n3J2TJdUUIG2t_-)EsW
z%Fi{vR`Fk*{cB^m=F*mP{<Ap0r5M{W?zm?!R=U$qXsLUJZp`7^{tLHj=Knahm0!sA
z(etBUgCC15W>&Otnf4-Gwkqa&F!#i>2G_2yzU#|Z82;$#vUrhi_bgxjvdMBbc)Iq}
zY>D7EOI+X9F;&*L2k*|!dc(y~e__o_)##^TxdPRm0!566Yn7PhX}o=*tR7z4eM;%-
z66s+5pxU6X?_TQ%`_2)Y+1s)?X#2jGRd@H7TLd_Y*dAOuq4%anIXB14gXZh!Ox*r+
zwO6-7|E#yFjoc2>pAFx5JTlZxX0TgyV^!02@hR6n2ITFi6!^UF_}vn%icLq#wyfya
zu1n`W?5D*!$z{#dRqWO8))+8`UJ#Y>?owg-xU_h~&dB$xzOPQ4q`m8p3cD(o=!9xR
znPpr@^mg*j<omQO()D_X(@n0^Gkgx8obiS`B5(IR=1sRBHp;|ZT2~gbMU!)vGMC)%
zUcRERcPHy*Jtd>xa&1e<$Q5nY+Br?`lk8dhSKIh^$LfY!JN{bP(aiPkSB*{W_QQ*Q
z+N2tmvDk<_m#Mk<?uz=lMt`2~cE`=N{LH>}wPw`B+Rt76>coZL7i5m!)bqN%@5{ZV
zlZ?1$$?_{5o2AL_>fEaT)?YDm_w`MCjbvmuJSb(GqM%XGaZre3!C~E``EKV^7d7bc
zH?QA)_RjXdA^TM;jPDxVWZ$gJP^8Cr=0Z=Rjl&a$+q36<%QoD3PtfUha^k_Q^UD7I
z<?@`u+%<z!ZLRK^T(ee}4sYJJ_JjSq&hQ+0_^BoLbYfNKj9aT-?(WUHmn3vXn!`u;
z{`B=GZ+m4+7tgIQ?VBMdba_fvxZzFJNfo;MOyB0z``0`Vv7PZ(F|MZT@>7k6oOy12
zOQuxD-9EJbj<Wsg)?R7*C2QI4v)lgp;nDUkq<X5TMWWwbO$H8bf7x}%6T9R>u1uae
zt)uE>r@{v#^?hFwHKxyB(b`@ZV>7GvhyUh>y3eN1X<GU%{e5-Y+O%ypL0cSMtc=9(
z>U#VsZImupc(Hx@-ah#==RB@YJ-+W&TUy{*qohTjmgc{0cVeD=BWmN#gk$zTZ@=tP
z+I7L%;_lQ>-U?Y}`}&i2ADdp=?*FR&kJe1VLh<}{;ajT?re)Wz)_nM&rt_VJ#+Or~
z`?#4jC#+k{x?0EYpP``bzSnjYJHA|ylgu+L$k1|YnLcCZ8Q$G|?ZMMCva8bmp0(<`
zvpamc=+)ONz2AOO77|;>)hv7Q|7yeYadNd+@7O+b{k^txkKMc}Gqa!R|Bm*Jx!t|h
zU~alW!15CBefg_e!izTKlr-Pq7I2CB&GfqNo9KG&?MZjfSLjA16;wq(-<`E}2Cv!i
zUhSP6lL8(wvVH#Z%*61cpxUy__wSp?DRTZcyT0Y@l+MJDF)GY?_fI?zTIq3AMpvy~
zPoAgom9GAQOI|bn=`C8kOX%5t=IOz&?6hxev%j=zfB1?;`zEKb)jj8{Q&&2ZJzeS9
zNu~Ir&!2u@iM+S6{Y|K&*7=GIbE#d21wPr`sP*-^;kzyED2L*&(hc%K(<1`gUu@l9
z`+D()#C?kLpML#!Keefo$J+d6md2iZuNzMO{I#d6HcvZtIc@9Q6`5@p{&=kNyQ8?^
z)|rV}y=7Y`^=Zs|q5R=n?fvgf=O!;W`(oDCk7{!obuN`MvZPnp^_={3{pbAD-zw*`
zP88icQ8Pcb@oihqyhmH6@=mIY5?&he@>RyleF-V{#dg=HxeCAVk~f*Xp>3XI;gN0I
zZXQ^cQd+jlWW}mDoBQ3lIUDAmSrn3!QO~#dgvzEZYL{|^9&Ygd8#d9uYf{ZGO_ew0
zPV!X~)?c~(d0UY52JXwr67|}7*4!(nEac6;lBm6Hn~9ZTplWAF!08f)37bvWqb`ZQ
z@jB5MVX{Y_dC%Lw|IP)!UbOVc-2Hh|GIh18f}j2?KGE2AyS^@^OM}-sulc9kLZPqk
zV}CbYHr+2V<4Z@?<;?dYTbsq(-?jhy@GmuUiO!W1s^$rE%MwG5Ff)4y^eVb6Eq-_E
zr%T4f{tt6gn*(^%I1c(Q(LR*Frl)*q@U3dAos;etSp4MMrPLrgRX*di*WT9|Eef$r
zA}6`(Uv~UTm)mDnC3LmuwRG5B-*vaWowugXdVguFsX(JolU)EyL!%I*g3>|;mxKrg
zzGQ|XhEk3&mCq@>mk!?e{eRXQ9cfefIq9BT{%J|ouT}hf>9p$7gIBVD*t~bWP-2mt
zZ)`6wYI$;^?Tw%r22y!hdHOSQ)N39G&T;;J`b}$@_s3Uiy>f5g`q)mERC)6@DnoO#
z+TIV9Z*r=Vo@<Bj-&$g}@rIsR*MW&?+x1u0r#IExyE)sirW}izpIlu2?e6Wl@rtJ&
zE?Ki?k*I*B`jjtk^0&`!JKD(LkTj$I%528gOTLqSa!<^+w-a`0F$fNKd##$5G0Ujw
zPGDa|TkRK#G|sjsJktAa`j?*7*!)O=^AXFl#v>65N;g@>^)-)vYS`Iu^<Hv!&=OBg
z|K*)YYLhQGE$AqeRdGzbFk@!$p=o&$8wwNx7R+1Pd_=%`(LqxWgHDFUY!Vr#k7q40
zc%zo|Wu9ZX-r=@}OH7tF2l-!ZuG`66!h1|P)_HUF#!XDe-xe8NP7ju3ZHT}9>N{Ju
zT28jz=Gf%5+(vKmx4pMCad67eNZY;pSxj15l2J+II@jyF#c%GnpDeQB>aOQz6HOgA
zMMkwoZxYc~xAu8;dfUqTSI)5SnG*B+%#znE4=cN-YlIlwchSA6>zh`4?Arg?`#SfU
z=RMtQaPI8v-U=??5Z9Jg)|H+Ms*VYSoI5P}{Lu66Y0TS<kN(tkPdU^0rZj&C+iijH
zOIwmwXc=yq)3|<~XlCFk*Xv=kCI`Hpk#ja^dUBAL*^HGYMVk#JJ(n!metF5;mHXC2
z+{k=wp}0;kYh@|RTL#^LRZJ^Z9AtBNFl7nL)@8@Gu&s!Cu4i=G&U6}Icish~gh;hg
z@5Lc}iDnm<Hn+UKC9<j4#8H7!;7m``Wut@#Aq~l<4&u{0T~s8z7>+DAcKRP*Dyh@|
zEd1ZQ;tea;zLQ~NjJPh*(de*uQBRB6uD#p4-(P+iX`^X=-keXvX6Gl3{l@FJ9WeW|
zD#|r*?;E=<9c$N}-qn7}b(6s!u~Y8v1+E3g1+txp<vh63;-y-ZM1PV?B>Mw{`{@fj
zc$@33e#El!gfN>N$tc-Ud3xsx0k=qI&yQ9rjqT_69*%Q3y?dtW=6|+Q9N(_#{ER(*
za%-WjmRQnxk3C;c=lq=M`>i|m;ktrOg?Qy<rnWZGSDjZ>NR{2RzNMdP)AqjGL&ap7
z%HH|29&X;?`E`}vs%|%<mge0(*H?eMz$KmQbmiKUh6fQ7gq-^(nTmE_dKMeJP}bv1
zb;!1bEF0n{m$}Y(Z#q+2M^c2H;l82l*^8+qk}Kq$PPnzLFe#jWxtzDZlr?Iy{(H|o
z7aV`FWF~jKTk>G%&e^S-|G&`TGv2Dm@$=yJD`l^m+_g28Z6`NuovaahQs3fBeC-a$
zB7+?(Q(Vuld7$Gt?J;+w*_+yLZJL$0CdgLmPuyo@&(hnxHYWM{w3qAJv}IquWi;Yv
zjO;dWl@sV!@_cfUO~|-DQ`u?qBo3y7-PVC?I~2-nc`TI<Uyrt4qs>?C`eL!`8k?5G
zArln3e@uF`%6Spz{x7ZX*?ARgkDm2gd8Q;a^1A*Ow`xcC*&d<=4riSfY+dZNbmcm;
zZ?FI4Ys7DhT#|TGP){()Q{DABi-xRWp>nEzY*yKArsGBV(o*_M(#|P<l$Y(cjowsl
z`F{GUR|ldFe695JQJXK@Ho@+0`^DX+msKn;tzDXs$+j)o<ZxJ9Z@l!mGd14Km-7>E
z-I|~NG2bd9{k?=}(_%H%9ueWQJ05X-OgYAM#$(S+ZJ90prq4|-Rm@wm^s2d2VS3yb
zLyc2gyr+3{89cbgcG0&&^xgC|pLSh;Y5HbPewpJgev8kkFZC7{PPchqpL6NRu>%t~
zBs8wQG?l@_*^O;o=bdx&?=&qwJA3mT_UAXv#11Z1k*vwyvU#Vi+?<6EcI9=chH;+0
z@@Dt>s68(1)+>C!ZjWB$vYuu7QmrWUJ*G+gi#ATa;CQyup1a0;zy7UYvsFBbr-V+J
zgj?=zwA`Lo9riNEdh6=PvyR@$EGoDi@AM+s>Hn49t9;Bix@zq&|5^Xne%0EhuQ6)^
zihrCB{no)&aqQ`&%SA?uuk3I-mtQfT?ZBKl&$R8f+lj4~yJF62&QWl>?uz26j{JnV
zM_DEYbU5FBJkhJ@8iyl?$`wu>@1*k!?^Mb1Mc>cesr$<BPubt6nvcY!o*$3Av#<Vj
z*X>Q`XM7V{xSj80zS9dMDY<ajI>G77zU(mY-~6PmXRqSj-_Ev&YqogjxV(7K^RVb*
zEbESxvP~<>FX&7ES^wy3)Gekpk1~p<JwMJIXFTUK&(f5Kx+Z`A%z6H~*vY}O+2gRI
z4)a-sW){A!RvMe{Y-N^rjr#g!WmcF{YM;Z^&ZUdhvQG93-g}wlu%DH+*)HRc?D|Hj
z;tL_wv!iF})`|Vzanq_LQm~1oWl1k1n}|r`frr-iNBi^+zmB}})939EsS~T)XI^zJ
zEPOrV=8N!$+j!^YZPX7+?Th2(;;z0Dr!-Yx>%ZB;@Q8~RclJ0X3wRsvsf&K~dS%f0
zIae&V9>1{gPQ(Fa;YZr9UW7l`$jB)0fRn*Z*}?bhlFP>oo7%1kEeuWH+Qpo(H>Qi_
z3}=GOuBzk}?iJ2w7P_UTPAut7ZRY-awe$V?xc~BI-e<2AIqhRmdEqcod`bzYpx9b<
z`{t_$dHUoJhdkV2%y;R>y8J(d|5D}mAAD5&$MD1BAA96DK0WTUUElQVR_xTT7O%8F
zb>9nZSR!!Qr0wFoY=H@fPpyuZsmnAJXz*)m-1eWl-%}v!aBz)hrcOd@`=i}9M&{QP
zF4jDhytjp&E9VQByX3OtosNo=svEg3wX}a#2=V9Zc{=Negu~&4N_OX_K(47xt2__K
zo?5K8QPAMt7LOl))IS%+_KU9AacZ%+bf90zthMI8KLw-qulwk3`~9f5)|Q%@^+&6B
z?EPCmf9v+#$B&M#o%nROzjk!*!7U+OKj!@oNo)1#_I<P9iz)wVtto44x~v13*YYv?
z$es?cT*5wMdgs|w1+z5xIW9D;7N2F{<L4}_*_ZP(FWx%GwAS~`!-6=u1?T*<{!GvM
zWy&J$v}6Hi#=lRk6Xu-Sq*dt3a`=DMOo8-uv(;oGau3b2oAn?vB}Oyl>c+Dr+|tKh
zb?sOkq$Xp%ZOP`22D>c3e9iNpEG`R{G!@$%*t4?a^hD*djn(&#$DMU@JXZbk#gXIF
z#rI5%blz3Xz5Cn0YinbLo@rj$dUJ)s*O|B7%O^b7Kf1v~iGQAh{>P*bHzR&<c%KeT
zOnc2xZyaVGI^)ryOJU^&fvpF8&bcXF?Kry8YQ@Q2zjU@deo;2%y~q#dssHjzK36{1
zGr7EftL6gRNcA69a>ikMT=fn4HP08RtzSFWAk|^1lKwg0OX`WL7p2&1KP_gpwBNq)
zeTmSkbh*zSCMq52HA`e{_MX>EkKAE!;nti-i}XD^{L)X&GiEY=Y$Kg7_(rQ_Z~BUI
zwKESduF*~OOl<RzSYXkct-Iuz3X=l&W#fRhUhTz}G4t=&t(*OA&s8_Wo=@e|GUXz+
zrJpI>U0t*8r*~e+Wq(uVs4dl5{(r4yzkXop-k{K>Q1RN-=&yLR%l?3cvgT7YS$C}6
zb@knoaE%|v`!?*IZW(P-S(hjy|M9-6mYeR~YxCxb*)*p7@nLp9`ebq1ou7{awodm^
z`mMXid)B)3=}}h?YJIEo+syiF_mV?j@=s(OxnI|_=E;_iX&bn9Z`l^Ic;&_E8%pgn
z4Mi@tn_s<UQ7$ahx^d5o5T^jfz8dR~r*dvjcx314czow!&V~igd^E293a{B`(p&aC
zwJvA&l}CGD&XMiB<}cFL^HH>|z#uCp_u<l<mgIGR{gUr{pXAHGX*culDdo45KAp?>
z82-}yph(fll%<ir7j-$c1x*=eI@?bA#oolV@L|x38^8CwzrFcq=7#N$KYU&~RX$>y
zyAi*XUH;2e6I@#qbY2ViXn2;kI=*D~*)#9TsWmE3FK3Bb9L}@(e7EL&`J@&16awXc
zCHTxuSv$Gj@VQQk$=;$Ey;QSr=ig5J{`VOBs)NhZRyAu+`}t+ESMcnomG#N(%(ecf
z4<9ei@0{D1om#(bj*^OhSq+zS(#1d9W(X;6j|^S4QRjl8P0;7r1@l%E?Z2!Zes@*&
zT`8?O!Fy}_kA=L@kjQFzm45u6{DW0e9Wief9;*l~%Uay<)Y4zkWOG2;^aDBk7w4JZ
zuQt5XowL8<&5@kbYZh&)7U|pg_4O?!POE5{+U5P;%Acp5PxLvTpLk~8{Mh!=-J2hV
zU$0?V{rzT|@@C0jvk&f{cf=r`aY;Upx5x&e7?Z6tCq%CK`;2qtlxr@(_Dr8Y(a&^-
zeQe9RV;hb>J^e=_=%&Jj<d8i_-p!0vi`!pecm7Dwx%b`fmwx<Bz9M&i(i>I|JGK8N
zQtLhT`a3e!@qL=7xBS8SUM-{g!$M64yIxzXi9OKr+$C~ndH2nkF^i^cUfx*u?AxIu
zOL875cWr7)WSrxz=Ctkk%FeKFyoRcRH~ijAthnvC>h%Nd@6MYh2feYre)vFF+qaTc
zFN62ZSJ5$HkM&zxak4w8YS9kYCEr{3TED+`ZNJ_$`5&o{U$T$&W+giRnsHWro33S~
zbzGe4?Uzf~rYx;pkYm3_>gDQPeV6pA9`GjbSh288Zm!7F1=6qhPW3)#6tFyMJuiRm
z*)t3G%NTJ_^wJEtmz%ry(BI#})0uA?sCBMp4z!PWt@+J&?$ygbw?w~CzxiQy)#YuA
z4nEjm&l1Np>$~&c8D*Z_`XAnZtIIPs?(XH<CV6c=+osq)y=9h}*SEa&xh?gJY4Mh<
zLo-dLY@c(;U*mWo|I(Pe`9_h4SlEr0=IO87${qM9^!d!tkNVPTCl;s)pAMWkb7P-O
z+w8+jC*Can<5#<Ve__OuuMwuH8}Gfet#Q7)-za_Fhj&`5d{RDZ3mHsX=PI>RD|+YK
z)z`vR?mhoEt!&TSNeXFlGwi3>ajp5`dHL8?54#zG!jn>`tO}fW@Z6$Qw&pg&<#M~r
zJLcA@oGW-8yX(#;OV!sQlZ4)~&dU$k+Zpmi$5HERG)I=e(RIi5S_~>gKV)7mGJ2Sv
zz15nRT{<r{N+ESmK>z&3XWm_(YVrU2nteVJ_a0izO9@%^Nu;u9*>Qc(5dY=-5;oQ+
zuRa<3gn#=RujWbH0(RY%>zx$0cBPETE1lZz6<>Hv^sD`uimKMmZ(Q2IAHDwDSDAm_
zZFxC=JWp-A*i{?Yq`9F@Rk+l}xyxpjaI?ZTX_rkQ){4?yK5470bkoaP6P~;^HTik>
z%yi?{8&6*pe&w??y4e);d4;3SOxA@<yFN5BpH}dAxh#9{)vu2Z&I{f5K{e~kxz;1m
zQSAGACwx8fI(fyE<bz4alKR`yY-eqeP)txu;_2k*u-tY&bXAP<f+N+9wn{9IH}ng>
z&_Afe@%hbu(-qP0FR(9H_%S!?jcm-m-j8CFk6U@BdUHyvm(Dj4WN81JTEFRe+~)&p
zo0c4Ywq)N!&udTi?dzE4A0)xo^}4k-HK8?O^1HQLZ*5ZAs3hvdBU8%Vd(Sx`Myo;f
z7N`0tlSt1AS~ZJyo@_ngIx&=0Zq4kNCz)l&hqO2s^9xta^PJjgxMFsZYGe7mKB?)P
z8++Kx8PB=9B)>O1oW5XI=)~aOceg{1#{GQwvLupmIaA9HRxXVr0cu<#9^!@iC9e{`
z2{-@Dunk{!{#U}QS6^P&=&-3u&+L);cp>)F^4%YmytKWRowQ5Ko__wCtN7m8S8~<s
z54|n$KXqwJwA`s<FZLKH%1w`VbUu+*ZKV{HedE}|BQqo??0mlGo;vHnzibcl6l_~!
zZ|E5Rj{C*T$g?LwU!n8pjD?35WxV`bw{^M0ITgN!hI)>^x0+?U){86*h%Ag)w>eB_
zD}$`il35FEcfUTSzWC3)RfmmU_#4IS$w>M)udBRF>6+k-zLqb`=4kDE{($|=hwBdU
z-bdogm%fY_4UQ0>UGi(?4LjbCk91{cv+Yr-yc+HG^i{=5@ulnvvoAPCJdu82+1|8t
zf_7!Zy81ZH>8yKd|9C7gOVJC@7Q5?q@!7X$Ei4N<-PoRO6P3B$cH8;X6H%@&DN6I)
zQv?0-_dod}8e#wNY}x5^Es_#SuS4(H<lVRZKkH%mq)OEdioK4moR15PXPv0~bW`DV
z^v)ShGCy{-P5E$IhS|kEvRrYYQ3Ch(57&8xwmwh3_|3EC*SoD2TF>LFHr+V%#-H>1
zpVFK)Nw*HpYvC{VUis~=&G$zfE{+FUid+~Lc>GwxxMeY0+f=cl^{V@pESF)Q7JB-r
zb<~5l&2mTT4qZFYSo=qCg8P={(A76|ne`OXJWXw0EZ=fz`^_I$jctE?-1tgq$&7+0
zk7s!McAT(U@|d%zx4OU5@0$K1rRQ4>czrE%4zX0~-j_FcUvH}GX;Eb*@$B1X#>3Ss
z-{h6wW0RhHuk?#__4Mdf7cX`QuK(t`^5(ODr6CeK>}}7!3XI5dnR%o(^fcRFn>V5_
zu4lMMuh6_JRiv`9<wMO1$&cHn`e}NePf`}&`_*PwjqSXY47r|bn{J&+%2_%8N;iX@
z?7kBWlUTQJzuuL;v0u>SF@HnAmCFvlPapF$`>phSckGeJB?bA*&$HhMX#Z_f@%{Z-
z-EO`wAD;JKFTXG6fAM=!<<IJ?7ys$Z7U?|8ztXnt#5ZTR3kKp`$t9~5?tQ!0S1opK
zNpI3#7Ki-}E6=~WdhWUYtIe~#--_*f8X!2$I^l23*2>L`e{s3|kp8k$g|i}z+3?ow
z_kq%E|IQSd%#LUJw94Y2oz~B#$M@g=w40y5`On?XyRSCOM+BDZMEf|ZB!o&IPhP7t
zwaYqrZtG=^8T{&t-~G(LweEO_n~UMhs;3XHOtF}AFL-UvX2;gNHkNy@xysIp-V~Yi
z!|&(q(%+Hq_O9C<z395%ovl6dkL;}oYT>U~yrBMUVCp8ueV2vZL+ZH8eu->9-&gv^
z!S~{Vmu*SkYJ+3htKND}YyVWWc8{e$&o|E8)>ldl??TQNO7*$PhNoVS6L!>i^tC0l
zO^fgMas#t!zpW2$xV0ty6}w%vu_Ac+*S&n-h1NT_o}LzbyICrk?KKM*n@ZN!cQZUq
z8d)284a5ZAF1b0|T4Bj=HkKzXW?K?k{g<bmnXII{^_yj*p@h(xZl+Z+K}Sy7PhR}S
zYWJ?!AB%4JzuEKsaO2y4%`dy}`rGPn7xIlNe*gAISFq|E8C!9ukJ9H-3S$^+4@)ro
zo)}QInq4ieOXL3<zMDUemL#x;{`J}Y#Po{rlsnVp8cSJ~E*^cpvc1ROw@rNRxz$H?
zuO+EgPPNzgoqyeB%e&Ug2C@Czss;~jX0H#qeeQ?tJKM9fL*JzIvE6W47FWFebyvCa
zy9FyQR4(`x^Y+{B8vW&|LR)O2H0GXPI4duWPr8d?XIao&t^Lxm^|eajhApqZdQ4S_
zaF`_&lP;04<n-(*a~TwxouoEdaLnEp@Z;Jful-uS(|MN|t=<>6&PjilFU!s=YNC^t
z`FHnOxAqlI_#VTO{5opAjN0bz6&Hf{+f2)!wN3G;jgPG9(*K9M^7-})%|G<J&S!t+
zk&@e0vA0ZK*a!LZOMMKVYU^#^>>>Mnk<Oj(_hhTJl3e@TrWYno;g3G<v-qf=vi~eL
z*_%?LUaAL{eD=J;(HVVIF4pm^)h+&A57#$GUH136_3;q{TkU1TJEDEciv-pLM(*`n
z;^?cWc2*|4%Vztf_R?^b{$%Z@tGka*t$OjL=<m)W8Pm_4TDdsBx?tT>ag~=|XRn;w
z`e>?O&Y$@ug}FStPJZ}#szS{8)ok8{*Y4`BJKnu#NBiPTeXZ%9A5J+%CGxB(6mzd`
zyO>wJR;=yOy*~^7zFV2&$oA9Uevjugg#;IdwF>-)FE8%8F3K~RQ7B;U@}Nx;sfLQY
z3YIPt4!NyAu<@gX<Gzc{H69Nh<ua+w<?}mM_d8hm9P6<yM+@T}SwgjxoR56WvYH;1
z9<Jx?XL;sIc6{?z-HJCt8yK5e%{IRa+kG|nC0}6M>>t{1CTZJA1ut}}eZ5skR<HS<
zdr*0F-L@UidsAPg?R_S7cJuUm*SW5{={LU9JePJTuU3EgnX+5%?I~Mo#G3D#aNjnp
z@KxTpr}c}Gd&!kDTe-N+_U?X@S8v!`a6jeJ%Nc?HL+ah@g*2<8XPTGm&+$E5;pd{p
zdFVC2(!RZg8mmvX=FeEV=M2}1_$g0i84`8eZv2-~?U?(;%$xsz>^&c?(zDX{nfDkc
zo1gs{d{E*2uA(<{W}Mmkjs1p4&MGzEaB20_-@j%_huAbeV4B-#wn-zrKR_^`c(dl~
z?I$X?YuFfeXS}<z)6}XV&Tg69L*JBwpuYNTJG(?zJeFD|@j-6g<R29hVpYLc4d-=5
zOLH$?5x(nk|J2aHqcIXH@1n&@dMoAzcm52C;f?Ha@)XEPT{iE`*~Co`wQpXLxw)z9
z!``L41p1eMn1AX=)DLZoFq65q`>i)NF7u0BaXwMnL;vaj`}5~r-rI2Z2<wOR{i1E}
z`(I3%zxl_~jRDW+t?12Hd66sL6fU;LN!xR!^dp;fT8vXq=A7i&s5D`@g@#n<RfC-=
zGCcd%9%8jtk9PRp<fkCFW>JD{RN(dxu0P&~DNYja?YUoZ_`YvB-^SWHE9E=exQk~T
zj>=uNBCcHd+BbgFrE!a5SXbD*ke=xE$Yl1?r>7H(?!~E9?Wukv6+G+Y^VA9VxHsJ9
zh|05CzkvHx+x@rNURU=TOC|AM)2#gV-pgL%cj1a8c4gI^h6krOov&~E>glTgD<-|^
zYB2k2H!s(7J3@Ar&b!Pr`|<t_yV`14XWcm2`%b9HGkTh&%esXc1{&-uL|>N#=p8Nh
z;9le}RO$0;MT6Q>yWne=|KF_<nP=0;<sy^lxwB?c2Zxef;IG=wsfOo{&i<9+;K`Qr
zakB5NXMdliMMQ?EPg(RTDOx?-zJ(*~^uaB)m39Zb&-P3eI%{M9In*>t_3A41;-}`^
z$+c}}r&Rko=0u)8`|0b|+Q@&*F@f1}C-~CyPyev=U!R*O^HagnYr4qQr~Cib%1-aF
z{m;uV{lfkQ7GhQJ%2&i~IPseKfu#J4-=ftqJ#Q~J+$_>Rwu0?^>^}2ZFK#f_-F|Yt
zaPHO;)u5VCPVrTac47k2@7B&X-Wt4S>xEKZ+0{S!T)v0oZrdao$EUsiPw!uwa+Xj&
ziJsI6>OC1T6K$QRzx(v(@n^f3>93?MJN~+S*F5ndaOwHY^RoKR{$k=2FZ#W`-(i3B
z&+=}|jW1b0Tk*yB=P#Lg;I4!0{++j$FH6$iruTj>Z)W&9&P}iX<_oEs%d55(-rzTJ
zm*T8H{dDcS(_S~ae#~6W{cpKZyQcc(<B~V{nj}i>gOAqR%-McL>Z#yEyVai`8DEY4
z@@Z*hR&!}I^Ur^#EWeqT#HKGivw_n~#&oHC>B-N1o2D~0dhP#s)>E3l>gvsPW?_3m
zvQ9b9()Due-83_B>!Mft`*uIP^4@qAyL*z~S>M?7AG>?ZqpdFeJMw0St^54{+2@~U
za+%J3KlSvND#0GN(9PRdZCvZQYU}a8iP2`cueL=gxH(TUG>=zP`m}`gX~lwvJ~k5h
znKG}B{+M1ClzOK;rdoXdhcgxpHpT37vsyVnoISg(#mRy9q#}=k-1Vq!folqHByg}r
zemCxA`n^*5efk5QzQ)4SQXcB=bKY2n`F{Mo=iuq^T`dLgUj#1<>zFIg5*z&Qhvs=+
zfm{DpKV;kb;dkTK&H9(44}NQ$q;`K&h*3|`8>5HWLTx+c_v>0bxm~^X!)oVAbvOOq
zF4;eQ^M~_M{>F#gW;LI(DtN9Uaa`uD_P3ep&nxZ1Wa@%uggAzOmibdDRd-13?_8E`
zYn8pKgHGix-MGJ`(L`~^qP{B{b8bv&o4EPms&uBGHw&GadB0ux^~!i+%-f?=Ri57C
z<eFyjdUu;!z%09W7rty*s(8oRN${!bgbf=xPfT7bY0&*AbV8s$U-{PVMK)Vq7i+oj
zFew^N@Qu7Gx5mP=vaCzhaCruY!`|t&L2FK3%vF6~`NICT$BDVxN256t6@RJ(IlNgj
z^=KLE@^9z*?)&fQ7AohoUsoTvc8>nb*N@+P-%)CCMVBx1jkmkzPtL0AO_3Y@#S7I>
z>q{1%Dc^Het$C?_;Z2p}rfWSSo7x2gW?Z(KAFDJ^H9cpE{Px`{uXWm=JXz`c^g{I!
z>56BE^NN*km&SOSXi6=bB@z8+$}2Oehwlv8H$LB8KlT0=yG^$o&3n9FEYzN;@M5EG
zO!2Hp)AP@MoPMx1_{sOemv7{+UAEvh<2$hLuCi10<E`H^3N(&vuMpexhWW17DvM{w
z1N{<Xzs$*N;k_(z>0^)Iw!o{Rw`2DCozmRDRIBLeof1=h@y@2*{;y`O-9NW$!s37f
z4k`y&dz@ZOR(i{ID0RV?{J-BsJ08W&SMRybJ}qf&`7O>cx9#Fn99Al&>3nW2OUTt1
zpC+MnSYkm`%|6qx?@WL5o;hvy%|5;G%<<RdHG8MLC`^CHtaIv}s{He(>^W|>;WqEn
zAEmLXpYqi9?bbST+Tp>{!X0zhlv&RHYss_FUvTB3+8I-m-4xwVguFF$Sek$5^^}K2
zua>Q1{k?V>s|=4qyx8nVTHU#imBhn;dah3Py0mEe5*glDj;O3RrK^~}hq@e@v+nuf
z_lx6K%#2rhdNx-=WD=)}>_WGw3xCVn@(xdA+TfUY?VXPJ<$KpZ^D%z1KF90woc(Rp
z)xJ6Ag$F%enq}U<SF@tvk*!nvpRjL2PG##QOdn7Dm_KQg*!~kaPg9uwU!U^r=IgTe
zSvL-ReDArx=tn}}r{0wMYhPCh7^s&dyFTBceb?p2q)C-;4(z$Ul}&xtJFeQDU$4({
z4t~AXU_t(E<@863jebwz`LwI=Y^r@xmrdSYamJ^DVt4w(qo(hEv~!E*|MNXxe@AFa
zy<L{}V#-C^Jr=K0KAj3QnBbg|SaDtalHQ~K$|I(K7rTBhvV9eBW1}6nflUKb)wH9x
z0(W{Y*#7U#QSY;-p7gafXWU5A*>lfvndZX1^DnB0nTVV^8~gH!-6iHNKfGQjl`T1^
z7CJLeYgH`Q-gSQql+6<jU(1DjuwUiGFuQ>(;Kh`aP0hWn6L;26n%W*C7i}2SD*A>^
zZTq?WYimTjrmbCLZ~f*{<)()%?2L?MLLWc<2-?5nqDtOf&!Xqtt}GUtKF!_!NUA62
z=f6+Qr;H`?{XOTdWXTTVE6!rs>rj+3;f+ukqj|=}Jdp}RZ$l3ii-)JOm%I?Dw%S@Y
z;f&Q~84ssf%68A4A3ReQ+49@v+QEy7U$S)c_f49^<CZDh_t#B2DWaxt;q8Ai+s_x6
z$E?2f)*(gz9Z!es=a+7o=}qn*gI<+o?z{KxpLp$yqUsEW)B05&d#9acjSa9)$r5i4
z6ArDKvGB3>3)i?(8FkZ;5|_@fJ1vLItY#m~s`_KY_~DJ@+DBzxEmrqKmZttXSXiqs
zy8ht|g9|@wosTcNlxygbwtVWhJ6qz7y8kZ|QCoLBvc61{UA$q|O7o(lQTr`-R4<I+
zxO+&Y^}5!c#*@OF`$PL4?|9p`W~Gk8x-&%rjv^Tj2hPSw-Sx^kxuNpyS?O(4Cgsmx
z*s+k$S*kea$m_-4e^ze4b-|%j#b6Kf^(otbWXhR2FZ@0&$}Lm=@g?me+!xnxjp`1#
z^o)60z%0{knV%##rW!1n;ystud23zkX{H&Se|E2^WG|a8yW9J4X{*xbPScW=Xa0Cf
zvaxN{R<-TvJbb#0WmO($(LOJkryIN1B?~Qmu=u0Tg4j>TmnE&+@jm%nk8amjp*IRo
zwDOMCO6o_ah;zO+RMzir{2pU^*{(I^#mZYJ@8rJrUvMZx@Z3AD-3rFfLOm6V*RI%m
zy83tWyty)xvz}diK3PNJMC3;S**~TwMmmCmKhAAB{o=;Y-Xp92<{!EBd4f^efgkt2
z?e4AnZDaEG%B`#XUKQ7tpHq3^k*V=CP&3llH)wa^u2;Ep^+K+{IN0)NQMgvVSRmtt
zcW1oU+3J~nRQfI6@~>8my+d@*l_%RPE7{+@-1l|!z5MEouv=^6gmor%Y>$|~BskFP
z_`R=My?IQA3~U~@5=@3YW#V(@`!}mQei8W|lWw-wLiJI`y}+<X6Th;Y7nhdR_rLr^
zW%G$W8mkj+O*_4nMC?}l=bL5t`}qp<{OO<KguNSME<c@SQJJWD^Sfsr2WNiy^yit?
zsRcplFPpFYOuc*1ZGP{LFI^Y1;+}mwy1QHC^M@d=srowh;*SnLQ5I#g`>=Y&lWD9S
zyEpt?_arNK@BA&h^Os+ZoUwRG;-{9rVu_>t4o@=<20Jd!J~`>gzsWljHf~B6K3*Fp
zC8Pb>>E*2C6887&IlOZOX7mZUm!JJ<V4w5t%7)2zX3l&Y!gt``{5<WiT|7$sqFe_%
zZ)CZ>pBgx=@4?O~U-ZBFT|E<Q)KPxTKr_O9tD5n}W`_mu%c?w%%1q*NNs=*ito{(;
z^=eHoZ`s4dy-OR@Q-w~6xAO#u2yJ<oA@%jk%(oY^6}D$oUS6#b<2)hqT=kXON)At%
z#h>5V)=AHec6!X@P;t`G?xo_LZ%3mUg-`D)%WF}6zrNtbxfD*0m!D!^EdBE&`=-c`
z7o1N|v(!woy4!MZLd&%euWowG{&(*D&ezYH4&CgKzq{{Bq3@LK-LK}|5>S|SaDCpd
z@}hY=X8XAA4v(EZWm+S9s`V#n>3J<Otfxahb{*ttVh;7YRrvJPiphyyi?}a6I2Pd&
z8@Bm~NotVL#X|07^WJkzTpz5rr`h*%+iGc^lLsv==cmhRa6OHEY_84!C;#U?ts`r`
zFX^*C70;B+Ki%J4)bzLW;$D`o5_;#a{@wm#t|;5@S--YqsP0!j`0z;Gq3G1yAIV|T
zJ<AWix$Iq?{91;8Z*Y_AubajZ2UaOPRt}n^5L~$=!^|h;fo$;WrysmI%x13fOZILE
ziriq`@H6KN|25z6=9MR2y}g^%yg9x4`a|8S<2myKPn=7P=bdDBr1^&6e#QO&eu}(V
zZKo+Udqqz5)~msnVi|AB$GkS^m;P{k&AGit60a_HKjLt;sYP{iqTQZ9u^pPvvJ$$b
z*FU-Bm+pJXj<;gDq0@A6{ix+3a_9SX7RxJHTP}Yi{_d~S#xp<9-3V*kWPYOT_`(_f
z-XVur-$%7il$=_qrdYPuZbi${J(;FqZJA|zG+kF&b%%*OiG0z~dgY@=OkMoJ>+gTs
ztP_hdKRb5|yRS;xWA_)A%N2Uf1TN%k+4i*6BmLeomx=EtIQ;OKJL!MG;wpz<sotgY
z=j(2s8vDlRg!ezTEi-lNnWKW4`R^9Kow@E;-!rS{H*T{ZJ#KsXefP?fkMz}EI2j#g
z`_EUS^P$~A+9{#gt9aAO==kk#ueW#FeVn_AC%NH<;J4!vN)AUn<{f-dqAq0dH0{cx
zP1}t-&RQ02WUSShWUXO&&g$-BzG|K0iya>;eM!lwwyd5M&z<|v-v7om0}=Q4t3COb
zq#FMB(&s#;WSDAnX_IG+An!{D_jh`)F05LkdE{|-`=w&{lw(=WWrtpz`r`28f>E^U
zf_yJOf4PZAF0uWY@v(+SsOqUWM`e)YB0;{gkDTw{S)TKm*xu{rv$;w%>5`R)+v$nE
z?Llh<8n4fB-eHmDrZ`*w+^a&Th}hj%obUFDtg?H#`oo>3tjBy!7g7z)!;Dy5tS?37
z#P{hGrHjwhlGc9ua_P^fLM)8&KelWLsJt4{Q~vzb|FzYnhn8Dh3|wBmv^93q#~sXX
zzn`1sAm*`!<;?1~h$9wuieGMj=AD^!*OZ;Hy_VO;X4my9zR;spOwUecv`(^mdD<p&
zW$0lQ7ta`lC!6xrFEcY#L}>0f{X^0ELm9)nSi7$Ui$DH+p}ncs{`<fCyB~WlX8iy9
zrT35NAFZy1g_WEBVgH}^uVc}b==4Jy%CDAg*IKye<CChq@Fe;0{-W1E%O@L{KXROZ
z^?LG;#^__gmj%=kj6QQpeUZ3uB!NSt!L`Rk$bL#*W%%=bKNl1|k-uku@Q`5sl3g}C
zw=pTkyv^g8f9I3BlhOPqNtQ`M<#iVR3>s}k3HMwkvM6r<daf~Y*O_J;j@hLw0$%fz
zf2hrS`1Q}8-K&~IJ0lXmC#OGtKSw!W>+Zt-vl9RK_Jx1mVo_cB%)D*Zqp1GgxeR;H
zWc;k)J7;J7ZfQ*hQ<<u|pIoP%OThiFk4g{EUG}SBZI+nC^}CCBIr7sLeq8#Xb@H$7
zgM^Mh!gG4HS%1CRd}rC|b;-tC^BE$)$mK0GFSA&`Dq8v~Z$i(5V+Ju(q<g+@&)viL
zz|Vvw^%eWtkBL_U&(GL)Xq{)!a*NX5Wm38ip8cqkh-LL{u()M%;Nq9N+0S;1-s@N}
zxwYhhv61Io_a$EXt2%BK-MFQD=lyL32l2?QyKA`C%K3V)a+}5X=j4iGv&B80)O;-8
z=lpGD!F%R28RBliYfgDs>Kp7}+@|=(O>4!0i$@Z_AF^3i%l2EKQQ~FNarwGd@2)Aj
zI|J*z3;AxdakvFV<x87z-Srm#@Pi|F%U-LB#TRAV?PE`!UfUccE+%^0v+q<%$ios7
zS=n_9Z$?_In`9!u63TjL`k7k!M}^6ClfLFZnAOP6<n(y2f@I5|&p-JdWg48`X35oL
z<<27hK=!8g%DE|azxRco`f0Dac*TXaxxZi8&AgVeZ@1|+<-8}yT$^9Gf84maE+)mv
z;kD`?-|wOCx{s`XvrwH&km1X@7=fn;)TP;0ZR!&&mNu|aI(zc>v%@?)Dr!P_|FE$!
zf8ReN!r&zL9~MQQ=FUepB2Jyz4a=SD@49z3ev&$vkiV_qMSOm>MT1UcXukP+TT5P%
zhbL@HnWvqZHQ#y@pMG20u{~Tr1!VOnAO0h|KJ`Wu@4<QYA+8e|l_%|*BJUi2yZfrP
z-H&A<lY^Y354yZ4UZSlp&DXEmEO>Td1K+|08<xm^mAhB*b&c^d=gz&0@AA&R8~*%B
z#hpBhmEliz&oWxL&ZY0VP|~?Y+jsxpwy-%nu}qjRMV)s;W}Fz0&_x~NXok)Fj?zq9
zT4!dg-*WRB)5P|@k#06NzN+d|AMVMVXw%t!BCnwHZ%~TZZaL2@myMS(?45DDHt?)+
zc}UK>DAOE~Il2YMs+VkjGecRAv*Ld4mM-?cLFI;%CO`dsZe}rW--HE|6!UJ&EolC?
z_qNjBof}O}AN>tg<)87VvnFHLmZx>fiL9A3_ph|`db_?SXz%^6yx-5*#$N5%@PM61
zX-|dYQMRSZJLc6~ahhKG^oZ@MJ8WCj%^h!5#U8je^~SZ+KhJk1o@$uAnBDcx%etJf
zjJ)6H{wv+vUorb@pIz0C+XhQ_tS#v%T4<9i|Dc42<I@-0q)o|2eMx^;pSrW7ZV%@Y
z4x@w<^Yo|atlev1(RsK$dWW}q?@LYD$UL(H-)6S=1Q@n!Kk|?ems($*wC$pgW8zoM
zC$(GKk3KpsoUb3&v2*R5sHDE=e_<*UvKD`Pxm|qu**{hS$DOmge(FqnYEqN3_THB(
z<zCOS&uMvuxCk=vl>eDMol~rZiSu`T+S%hr7vDc;A5gMqQ^3dFytljk{_H!%tne@>
zp-J_NoC%M3I<N39g{+BFXISOFPS84Lls;ijIlt$GPY;Dp{`9_ctbEpzrb*%xPt-N1
zI8?r?H!|3I>D{CMLTsE1MEbWj-!BPN-SETh%*vZ5j<g<WsakPX?&{jSCod;I|MR@N
z<dWRB<gKeRjLtvolv^hvC=nuff@@vl8Rx377#pSIOV$}`)gRP58@FHh<Fn{Ek$ja6
z`|L9;g`9XMT=et4m~i*t7SXBZ<(xehE-eZ{ic(kHO($P6E^u4Ba&vp}v|olx7?fDT
z3cehTSF;az&2UO8VMD;%i-+EJJNh-hn3d0Z=tIP$+N%L`j1FZtt$p&(y{%%2CCi58
zvzOUTU;6F7y`CAfxoO6q;(Kwq8OM~SYsV&EyM6w@T=@FFf`#QDuBsh*q8V#vmULWe
z*@~GtpDrEnn{X>Hz0R23>fQpIT@5}<HN4wvZ#tgk_V<#g75gRU=r@-`x$j=}$GGI3
z(uT&Gf%2TGcaEL@C2BQCMWjVMy|AUz$I!K=-<Lz_(QCtn+y5l`Kh#=d({w+H<#yx8
zE<VX@{}(eq8KgaY{^{<%Z~Vz0?K!5z801Lg+%GKec)v&f@21|XN56fGu8V)E^?QEf
zt^+Qf&c~zXI0*{$_qO@3a1V5zshkw{A#8$qmx)Q5xwpZp`1Zfceyh0tNNP@tQn6=$
zc<aH9xOuzww*KRPb<0z*wEo-qBPSEHZ*sn8&cC(#aO>?ASHBuA<>uOJePx!Vl1Tji
zdCgA?GF@gre)PrU(Ur$f_}iy(<QqKfNzRdYdN}weudBGwlIX0LsxDF6!jwfeHf;<|
z_P^zCb};Pv4HJbw!u41F$Gpt!=zEeJGo!=E|J9tQcRknle!jVFR@dE}j4NFl8pkxE
z9bDyoXCzF!#<9lZT3|AFLaB<@23LRQgFol%FOpW8+>*5Edv&o}(XF1HIn!L!E_k<1
zHC5Yb9{Tm~+F8~8&3FFFf1i_lv;NL+%UpZ;$0apuzNvN#1}fIu?EB`roTt%ZLZY?m
zWii(HFJ>2)o&Tr&tgn}!{oV@uU3DKHP5k!I{iXxY9lmncj2vr~hxHdP@CiM0@9GiQ
z)b6Gcw8GG3rIt{W)k2{^Q&eNQbHe|;{<WbpEhc@V+paC0FXFu}AN%)rzyH^UyDtC4
z*YCVgw4tpc*n`8cr&+*CJ5b6?Q!4l71xFSAtI_IlY$ZF_`ub1$C2>>uPH;)(zTbhz
zf5~iL|Cwv~{wm$VBc86jGtR_4T=M^9z>K!CXLIGA=O12BbnndN?W@0bvZ*-j$rsR>
zv5?ts)y9_Jl9S@kK1wpE^ETRXP<a9?U#RAcg?2Yj?X2nO`R{dG<xZ21+C}3E+cOD_
zD<w{E%jCJlUzq*qNdM_4&o3-KAbn^5VII2^^{qVpeX%nHMV{rUKgxZ5B+<>ITB4)d
zz-v|0`P?_Q%4eEOd-{b115YkE$hnyBj`5C7*ZzHG=+4`v$JktXKKgju;^3#u$2ek-
zEI8SkAZGu0a$?CF`^bh(UA4deR~`#=Z%gRt*mtiay7BbPT5r)ubwz(F6)v84n*Qve
z_{%RPo0uP;HI8Oy4oK%xdFRB@!F<C-mW|23`R^WsIFUsY?pJAca(-C%^Nq{d73_zu
zJoJw_EqVTk(ermRkH0R8bU7pOc;DfpPHHQsI=38QWqdhd+X)^1{NpYrE3f8XtvhvC
zeahEh_W4|r&q`$?7aUC#U^Y`|t=pHPy7F1rk+W)Qsxz)9TD0sJRQ&q2R7ql1#>>Np
zV%5Zp5_Atb-nMxo+1UK&zhC%$PTuCDhdhFdJRd6md^}gaCW>wPr&p=<mEE=FYXv(q
zc^+y0{yL?v*YepU#rn6;KP_RstSZKMnytNczaD#mbG85cyOrzwVz0)@G$!0nnXRD7
zvG;R^mukTpN%<$ivX4ri7Tc}wc>CBh?ppe#NxL#nn%T|cWqvPXRpItK<*m5~ceT62
z^9R;^oPviQSzjpm+IO-<q)l&zR*CCEZ38bArAvD`RJqijuKxR3f6LF=$Dis~zD`XN
zu2Meo=tn|?#*#~qlh2+x{xE7yt=_`6pm*ynoU}OIdZ!4nDDT+Q<M#b>xa?!O?f|~L
zgz7bW;=kAP|NURd?|-X)$^ov@m+3Q^Cwp6Z*)jIbch{JHz1@NB(3ROOi{rNxyuG5m
zg#Y)6OqQ)e%jZ2Pe5Jc(-%G2@<>%M0o>Q|weU){P0H@-P(0z&tYa4S;JiWU-q2Xd|
z>F3%<ch-u%on@|jbxq`5^~OgX+>2iST$rZ(SSsaXy#m`G4vD+n#r<W|SD$;Bzrlh_
zB3)lijeGX=S>aq>6Hib7usZR`>36r(&KP9zov+#d?Q3FTz4<$zH{yra2hEN@<?T23
ziM0gl|ED<xFLmOL-d<5<k=k(Fil->fc>24GFFqH&RZvg9XwkNP-5i;=(@S4h?X)WW
z7o$5xzPbDI&)D}h2Qtf-EW5yeBE~Oaf~T}Z!k#amjRFP#-oN|TcG(R>_ihV2r#BsU
z79LN%eMI1;qgnR5Z`)^nGn-k{GrjW1%6(VmSld&1#Lmkp2po@6d1R{Iq_M$U!;#&p
zB}HL@o*D1$nDa3)tzTw2$`+kt^j<yh+JsEoxp_G`-Z5|Qi=O6qc=$)8ZCtat>$mJo
zAzmdn<~vhm>N9U=9$$4>U-S#7lwd;5-s!Dx>y&2*?ClFkxp>8^`mvK}K-YJ@NBrAN
z_cgzs^>z|ls{i`F)$Jy(@w~AKhKH}6RPJ14^kl;v_Qzqp*ZNBTq-;8KX4~Q;pKat7
zwRNN&Xa9X=)v=(wwuS$z<r~p&FQbK((r;>VE_Yk?dE)xZ!F4e=$}YaOS-I}`zCX7s
zZn4B!to<(Ad~dP=n|+}D(F1SKUYe(0zoU<FY31Z<;ptlz_e}~Eb2d)Vc{D%q&YU@_
zU(799l_UPWZe+Y7qj{@KN$|%))-FMX_X<IR4F(2=EC0wo-}5v-KlJ9O-S@&vdY^g}
zPkH=)fBmy01M~j-)06N1o4)YG>X(<yE<cPk%W?O0a691{f2Kvy#i`@S`JAf`{+%VU
zj(Uq!H#vHK;*oT9V$~`tQn>f!)A?YnB8|HEiKSjkes}Zha$Ht5ReLqP^T#S_z5geA
zY-9?#iaMv?S-|fvu))Qe!)<Prr^vB2L9JB_mfSz$$+q((|0D%t|38ll_D;)v;T(5+
zw_S+e<NN)57eDwXTRcxtsh;`uwc(9|dp#Lf4t=n92{>q_k**=guwajWwdx-?=f47M
zhBp%)bag8<UTMuaI(6BG&(94sRNX=^U9+0DMDR;;?&SAzKgAEN^pJIsDeU~TMZnv<
zvi8>D!%r04S4P-c?#T|@x>2l1_~yek_TigXO9n;AdanOrd&y@zUy9#C6G!>n@>$L|
z?s&X*IF)bx|F!0hk8@3LD&A7Aiu|dv=R~CMZ1q{G3=8`$+!EEEF6cg{q+EIH^Y&S>
z6$esh@gFQcUKd}+dd||un0w|yL;0<Zixq|3wV(gsly~g*E}Jrc&+B{cfd$GRZoPVM
zAjWTcV6pq2xU}q<7k1puS^ZncLcXkV^XUjf9f!^$L1Bi!&y1E8HKtCpWIFrz%Kj^X
zYuPv-aoDhye|R?KZmHHovo%I<D|as}O-x)@6KW}tGdG|@)TY$cNu4*M*C1v8R<+D8
z8eco!p1ZmCB~yja{lqW!yamUXdi<-*?)bka%Cb>K%0^oz?sV6sn`Mhlp7n2AmLY%S
zbJct44wZS<v4<}wMK-UIi%++S-D&gR{IB-4YfpAx|Ns2=!ACE$OMdBIzq#vNzIJI{
z@cY&K|J7UH`SU`zU^?GXjwPO#<4dHrMDJpMpR~qOGw61ZcHII2&V2EP8I}vv5`*sK
z@E*5tFu2tCXWKTN(2wnpgDdV&)cwiU$?Re9uPpW4m9~DvxUR-3<GDXC#O<}^Us!kP
zkLCU7ADc}Xv(Kd+QdyLov_Oz)%0d<g_g}7oLPsQpBr8k!LmWKj?U{0<##;J#gHwd}
zK_(+zm&yxw1Y#b_>hCvx{y+Mu%hOk;m!}=c(LC2={&qp~)2f<~4@p0M9!{Bal3UYl
zIWu!hVB(qHy=EV8-pX)ONek<qUo&w{verayjl{nP_AYp}v2WhNqNV@$%G{aW+IZNq
zUo^g<+lPgPGeF6A(y^yqjXqLuF7Mvkntb)Qz~V{uohtLi&HJ0yr*Y>TV1DC#+L~jA
zkWi<=qY$5kLcgys;WXy3Tyln4SV3hTyGX67SIq0%$<KPvFic*y+ps4~`CedDz$~jJ
zE$=UioLhhGSf$y2Rt=qva>xJd3Vg~Ww~~e5)4KFq&8z<pdli|xen0y5;!Vf<y8K1F
z;r5|_Uus^HvTT_<Rigg>-@UtBH$E?SReb;baQm-IvzI+vE&s}X`}4=Y1NQD)TRm~%
zqLZ2PJ{;^TQsbXgtmSt3vr5kM6vg?|yW@GeCseO<dRX}E&D{F>xPATS%vyR=VvYE?
z-@cxB##U$I(MZOtiqrIUdJ=Z{Z|P#~J9gK$<-14tq6v8uCC})HO*r6Ow8u>5FxQ5s
zbz4*~Y*~|PwOlM}_DhvmovD|~QqtG#Y+NvjO{nTN-^(h-Cv#a&zB;j5fai$drFk!2
z#n+~KTQ5Gl$&2BK$<FgFTi5Sd;VC@LKK}eykyZEC<VJ4WsQCI+rfW&@&D1AqCI%Du
zX4h=DeINaC%3rCzDVDYFXJ_$$d2f4lv-8EP8yxdvmTuW=HupYjnTgorZ>etsnNPUg
z)m-^X!{Mf|QiDmuC5yfu)=%oTXXn&Bd}5*edu3m5+zUpAZ!VLQ7n-c{Q+*cWa>n`0
zu{ix@azB5FY+ZZVA@1Dz%69P;N~+GgtvpW!>^j^mr=R{X;phClwKI?ZE8<BDb9xcn
zllI(e^Vu_QA%}fR#O8=7C@)ao@OLxghNWxw|F`o0JK@=eC+-f<AI}JSz2u4O|2ubk
z)9#q3FI=$TS#in6@bxFY#qK|RnrHUuhh+~G?#X2SW*2Tq?qhjb$C9_OQLydYL2eyh
z+qdDhG2Z@K?t0IsKigjO=jiLapPQ=x2k-s(a?8%B{|h~S3EOXfsreyq_3K*yyMHs+
z?c2UU;j+&k3!#Ub_a-g4<apG4!qS$5&$ntS+7(|AepJ){>C?NP)1TkB6TI;Kq~4PS
zueqX}uRr@-?_gl&`swSX{2LP-#LmAxlQcbLrt0gkDHndNPgvb3*pjEg)OuLc&on7&
z<+BTd{?7Sot?H9i4>}b5u!*?$U;fGWZj1Tp=QE$x2HGy4+0?2rAt>pfx`ynvlx#<t
z+~5B_-?ivmP5m2t?L@}u9}AC9Xj_uo{kSqH?*4lA1KU@ga&EoaT&Q<<nrN7u=&!}f
zTP`h-{<%Zc>GH1i?&m|-9(Y#H-}nD-z7VSjLsUxYqY&nl)t?SYEYq94+dENEHT%O2
z-WE5{9HChuD>qutKD4~3^hDpP6>aN}egCwZ{lEX&xi9`k+A;UKmuCH*`zq?u19ms<
z&N=VxZ2i&?byW&o`Fg{XWBI|9phcb&KW^Szx9Z8XV}?s3IE-DNhBQgmo#^EHckboc
zDHFGdci4r#+9!61b-~wu@hcPZr*J&$5a1MuYU?ytOZ{n?zuSKI*Mz!hzuVqe{ri3M
z&2-Bw?w1`Q9M#uFjU*<#zZ>zz$aA8H0i#msY>m@XZ*P5HB6BWXemV2H_qU{W3ybF{
z=^f$xIdNI=xpR|FwXU1goxc8l&P>PTOSSK=CfCn?`}XaF`%O9urB0u0_4%Ja*m{Uz
z`j%=>^Sw>yJ5-K*QjfCAo+Efy;kcpj`{4f>757E%9sT2zdHmR#$#au$sQ6tk7YWUe
zTy$gK{%cLAS{3iwz0ZB3egF3Xy<Z={9RB_C!`=88Cr{P1FBcn5Et?{sCa`uxkc*cL
z>xt6~ISl(YRs|YOoOWm3xhDC|3!hz1Jv`y-pYJ=LuiT;C6#Ag;{JT}!!GCVXZ`q|A
zZ(@I0zD7kzcINXRWglOvNSvC$X35^t_MC0k;#&?OiEGXoPs{N!<BHs7zbldFsp)z5
zRMnfw()w?nEM>^mi)KtXneDA2{CC3QlTR1Vnq3`V{B`f@KXu{9|E!l!KmYO9bcL%u
z-1g?xs!oemSSFrZRLuYF)%2<Rv^GgEe)2@xW#j(mTZ?D@+7uwHe`Ism^EZNP%Y0R`
zGXMX)y@e^+%7f8a;^*9`&kgc#-g*SQxYslPv&y-wuN8COE6C*L&v;jE^FvzWpv<$G
z9~XB>#0YH-IIxIOP(tFjo4_$so!2*O`j7RV(>40~txRb1H+4PVrx)UC-+j<9?@krh
zcF0;ZsqKik$E<5+dsHqQyzswQWvg{^vcc@C>kls5Z&kmwA#&XW+trmVR|;lzDT+L_
zN=nvlTRd~d*@Em=>7VN#9z3x;-RWQW-8%a(_U0e!+yBYOzuz|Jj!(_h294tj`fAj|
zjBHYl)U++Wy5{U@Rk`~U>bT=(m+UD>;91DPeBB}PMfpmOq$<xZYm95}sFdxT=235`
z=)`51#I3BLQKeBn!FJu6iJeLfvzFY|^6#4U^sSLo>?yyr?4$`cIx<`WVH`>uqRuld
zxo~L3#~Gok%P**Su`#JUyEs$jMO9FU!ZM=`Q&rkd<aio0Jdh7_S7Oxu^-KTbTID-B
z--P`)<t00wbZSz6Qhw_J^GTBh_A48I_g^T!U;5|Y`uG3iwk<f4(p;$fk&BJtmQ%iQ
zOKw9(vDPZ3BU@T@SZsFry$N&^jL@3Ucu8@|iI!z%DbebYE!y?V-&E9Ze^zzxy?*tA
zXRmJM{#oOaXVAh@a8AJOQqj7fE&mN{&Z&QNxxetP;qx~xD|(GLI7pTRex0)5=O+zs
zubuzGPgmV}xa+@rqs!z!V%7iH7KsXburd5_{?h3nVqwV?7|V0>vPI*(=1c$dY;Hes
z+4k$F`NqGSChhurJ$df=e}#VUR_6OhxvENvdxxHzF48z%BJugG4jwzBOScXuDww_%
z3iab@Ry5qc@tKear%WAx^y&#G(!wn)TH0oQ31|_?Epgv-=;+(RZE@MYm(DnLtjYVB
znlf|#v+N@i3fG4H`TSqu!iFDW7voP9AJU()$7-AJQom(MLCO5VF--@>&pWy($Xi(a
zn&VZ=-G4XCcK<5hPMMm@>25`A6An!bRlKLAUtbfhz~wIP_1$2`Q7w6P?Fr9ZKkh%$
zT)pF7t#7*D@wUGwKD?3R4>gaPG2t5<*LA+b2e&>eZk`+eqUzHYap!+h;g+|;_T1tv
zX<VfJ@L`HALo`#ZZ2rfHgmb4)YiW1-On4vLE`03C=SbE+^V8#+CZ@V6s-0c9^Z1#&
z$A0K^sB8|}xqa4I!??E&`-}s!znXH-7MOJO|5V0zj=f^iM{7Ns4fcv12{wGd9J5CK
zZD~3iW7lCGtIM1JO~{s*a_m)0kLRh^m3uZFHrn{SzH>+Xi}aM%N8ts(5_)rEZT}zJ
zu|&-3sjK-m<<uU>WS$k9{Z*~KO=c<gxFm+y&wY`$by-i*qyNpzKACk1vsrfkGW=!a
zs8F?rgXz0je%Jw{^=ls)oqsYx{6Im+-rG@%85W5=#h11!*dJ&W_&i5??dR<l{&uGG
z&-!Z4{&dh@`@fBB<gpiiU(>B7&Ua)_;1rm}AK7!%{lm?+8>UOHF^U8i?7#p0|M~Md
z1|CO5Vzbk~rV0ewrpHuQu9yD)bKl+VdE%mfuDc!d4QO5vw{atf`<8{9WTXDGM0r>4
z;bvn=^WD$q)ohil^CsbN!lDFq$wbxHbN8L<&wsPFF6(ORo8FoQ4;j_YA1pm!B49P`
z#JodwKUeo2c_!cet@8eEud9<5?OA_$^T!O|Q<VmLre0!_ddw+%u*?6s$&vKGE4?$%
z|KLq7oqz1!w<`~W|2mgj9xs1!arVNDnXbyecbMt2uXHQo7P`3b&5iR`yDstyiAFBg
z7had_>hj8H@*DGyK7uOD`c2NRiT7^1EIPBbgV*%-hXpC-2U-u^i~mxzPv)bS{+E9<
z=c+4z_<!?TY-Ww$x1V2MWKBI>UTe8ejJJO89zm(R88v&qFBMd^o{;T(M1;{n-N&HL
zNx+lOS#aMWz0Bmapc7L!mI!Y9dYNTQ!ls`O>gvyKH#}CyUgx)Wx8?l$`O?mu_hPN(
z-48Cg;1I^Wd4cS7^UaI5e17-ys!QmbM<301P73k48~A;r|KmBYHD#u3%Ho*6R_l(A
zh{N$y9dh3mFSSs=wmam}hN!H`#V3P~R(=;<yy^bOB<UHQ!nsow7e>yzc=(g~w$1fB
z(-S58q_#wS*V-c0HFZkrg*DvQs(V_Sj_i7Fu;)|S@7Y0jo2B+_%@q~>+vPf;>d`4)
z?|HmjZxa|feN>%TuNMEaueSQT-+2GcoQ>aNzO7eGZ<Ome_w&-e5S|AUXHWh5NJF~j
zQ1SE|9?K)I#80mYuRE>U?Z>~Fr8Vl*p_1zM$b;Aao;#>_F*Rtr>95D9uAeyn_wQc5
z)!ZKrggpGP@BMDmfLj*(boJw#r&XSMCja9|jOY1ZU+vSpm;SE#dr#c7`po&nXXRfP
z7uGKoIV)RkDf_+Te(7P~^}m(%LyuK0x_N%>s>q|;_wnz$!G6Me`=YxgSG*RoFKwE8
zEYh1NpkP+G%~|%2t2JxBCk8J}|6%l)!zym!Bj)msoJ%ra7pK48+psOgH0<aE@oP&0
zJ$8Lv%pt&Nz*l>dLy1G#VZTL&g5QEulQTI^?{{|Jx#nx=KFvoj_b^Mu|Lr#}<ooi_
z=fKye(yLeXR7~9~l^tj2x4(`{qkYc9OFLKaU)z2);hdDp>)H1o%XzQVfADk1zisjx
z|NbxD`BzTt=DA%#CQgTwWZjodThJBq<+-IGlLC)J$B{HcqpBdI$eLWCvI&m;e+%`t
z<P?69v~7I#iQT^ZRg}^SXCAH>J@*qnzw}|f)KHRfW<{j2W1ReJ^*_bl4!7HuTRhou
zuyV)W_6^6Swm!7n75DM&?cQ*Awmm6Di!6TBaCV4?ZaunxPLpP9)wg-4{R-D5M@;eg
z@H9<k^M|`mZj~Q7*0M4SNL4dO@n&eU{5!0ny!yzt{2d}|WnIr)+QQYW73;;auc*=V
z)7)PHF{f`B_H1Am+pBhSk`k-*5A%PoXG~Br&B)>H%P*Awx+1Vn%CskQ@{FB}m^=)&
z)P-;;xHXB*NEC^W{#?PN=5#pdQ(AEN{Y?ue%{q}dL-noYlsjgtq;7L28fYzl8l)n<
zWs~%@Lnm*@+)(H`fAo#jzs0}mr(IgV^mp(X_o-{@+)fp13eRn8ojEV3Sz42)up&f;
zcWJJU>3WgfcXlM-@K)UC$NJL$jfzNc{i?^o^{f9}t8NMs=Pld$UE#Rtjf@(}t^Jy6
z+c}hZCS+~Qo8iCZqHQ;?u5P;e*5?maWT&=XdC~eehv#xe<P~d9<^@q{O-(TyWS-CW
zKUcNJ?BJ&U;`K`Zd++}1`Foo6*2aSJJ)T?}H>yj_HU08vvEGaKz4tRsH!WxWcX$1d
z|7HEFAAH&;UzU+_cjNs9|I5ULUrw`Qlk1xvZ_cc<qT<<XuG?O#PHnSgX?*lpf11Fo
zzx(>P|9ZUg({+2c<K0f}Tcv(}ob+O<m!$YJJ?->6tF{Hsj8w7k_|@eV_^pHWMXbRL
zXP(&bg*{V3l@(S6Sif3k+j=8;sa@^4`8ST;U=Nm9C(*a@&Q@Nh<;>p|B%4A*<~(eX
zXgkEW+x~F0j_HnS!O9cczHB{REWCD#Z{o*G6E-Z$ICeto^V@(6KcmAHWaN(BEx#p_
zQGQe8u$aVe&!FWB`+`3TlpLt76A8G@G2w!VM)a{pUB_PbZMPMql&4<qJX~|Z`)W!g
z!*#Z=3Sa);vA_3U{`LoZ@!xi@z7%_QSIv5U?}a<-w&sVHNz*3WFcjl*ZE<PX<oV20
zRD%0P%L<*9Vqs#_goXUrf9i<U*WH@x-(L3V#FgY7ImvY;UGMqz4&M2m|Kyza!Wm2T
zpDw(4VzHWHkadW~l+FJIC;OHhU$c4D_bC2szDk))fmkC>p{^$OF3(dhr*VHi`C}%p
zZkME9YwQl5H%!eMhy6@$w><lp$gd#K#jO&-p%Tf-=%K;Icyft{vVw-PN)Y?gTUsX!
zCwgoMOwe!^m>Qv@q^+>%1e3ysNQDg%9!r8hznu`Fqp+GuHmv2etHJ`N_S!}_O{H#*
zRjW6N-8!JoS5aml_cg$(QN?i0B=1KLWcT`hyZSR$N`CUY|GB{@o|~<C=Eu1#%x@;&
zG=+*431#LI>@1U;7%w$iY-szxt@PBlTy>ENUCzgX7F=l2o-vVA-d?8q*hDwsrF~f+
z_a1ANj65#EGnc1}`N`e+@@M9kR{yb>mH22=8NZN@;DMz!>pBk@x?FvpE%$X#<tK?L
zpZ?9h@p`Y|twRRstB$Kz`z}*;Q_U^<9yPPh;@5^J29oRKA6>M66Tjo4oBhds2UETN
zK4<R=RzJM?Y|Mq4xu>QC&oe!`*TUMU!C?P)n@!2Sk9lLCb8Xsnt);nHZ{Gcu1v>?9
z`8~h={${<%PVdM6VtlhN{1CVkHj}+`qQb&$%@&obLLV%jwMa#0PX)({>|&>@y{TT$
zc-5E}$+~rj30l5uTpVJ2V`Jm>)T`(16&mAWL+(U}G@ap}KHov4^1d?1rfZ7F-}Q7y
z-Fn|<U)g&4)%KWW@#zQLR5{;Rd<<^068_6@>WscjQQ4&bA&xA9@n6^ao<HzMz;KF&
z>6wMEF0WZqaqHmQmwf!Y+owO>zw2AE`?D+Z`NxIMgb03oXY=HHwDU{3N+$i{O`inP
zPBYqy9yHIc+P?Dby||UEY#W86w4c5|+_$Xc3>V{)A3;I8O8J(E@4u}7{Fb-)bdN4!
znT_)fRAsq$eALi9`^1^^)2F3nGd3rk@7wUm;k)XGB%L-Dy<!P1n}^3{U;A0TcuivS
zF&R^dB9<z@jGUOa>q@_@dmy3E);!&0S5}g=i&0g5a+_6bsZQ+YThki?ehR**mI^+9
z-1Nc&lhSTBIgbN}JvJ)tk@5UA<#48T#M`DwzLy7Q#!sFrKIODr?39rC>%DL0t!ZDj
zY%%v;A?d7RqDu|*ze)D&74DW?s>U(vlK;X!$&^URe`hYHrJ1cM=}&yUX4$hZxjo;z
zPZh7oYYodY>Hd9w!gbl2Mo-P|*NKjd9J^%&?>1V*SLAtq*4@@yqkd=QD$}DuMX#IX
z{jWaWa(8l>^R!)QUiq)>Uw)myJSUk&e&cCf@s^tFmv0pOE!NOjbaX!BBCV!|1xl-2
zJ5K0y=>)iXEOGTvR?rD$bPRLxf3aypmq3t)eQeSxYkP;Z4fe7}Sbv7BFpNBRYDKsD
z+HLEyH@8hYDw<|0_CNS!Et~F}9I=m5Ilj$Fu_{jHZ=IRDj?5NnZ0k<Bz3BAvi^smr
z(KNL`q&d&ZuWQo5l+Tv$jW4K7wb{b=`FWYl&ab?jf6Z*gQ=ea(+U>{u@2yr``jv$y
zt*aZQ=hzfiu^DdKcqV_PpYQ}u_OhClck&*tvsTsGyiuq6jFECwkbdyyl&q;5Z&|Jh
zxu#p*w+Yx%_RQzOQk#e3@-s4@Urx|D@=M12#sZfl%Skp@s{&R{b=xPidZB{P_KC+s
zHE%vxq5oHomnkxCnTQ(8@%T84FBdAdEmb*qN^z>rt+NbT4SOQG&Hnm(T#Imiyw<+i
z|JBK-DK$>gdS=_tD9p9U{HgkE`Tn<mY@Y~vGkQMBG`Z5k;pU^qJb&u;lp9IbW$g3U
zc3=2mn_d{VWM@(aOP}mdrGOR{-=GPTN;YUKs)z|~Vw*cRZG*9GK%JZ6j^;~}oJxuh
zjZVnVa?w2RHsA2XYoTNZ>nHgagtc#nFN;l;TqwHrPyf&QDR0|q=DrcAnYM0;uH;U8
z?bdge=Ni|p-QvO}#mA(u-}}pw?2`rutORG==jY&^w>|b-?cA0*wG}?Mb)zlR7r9DY
zIk+%-P1Z5Jnc)oELS5a|3tBi&E@PVRX}@NZmX+eS|8uovpKZQ+@WrRNw621zrKi+`
zr=97py(%4eMW^q$%s$_otmEMyk1sVyH(PHq+3~}gt*3o<*#td!X?dEX-MM|`duD#`
zOL_&5mo8@KWxKFlA^1#D<_&>xA>N$o-ppk;-YaaD(Fjzy?p)ULRW#${4)^4{dAn{E
zZi+6OfA#XTi)X)Wkh$}7^(@sSp(|2%c&?WU3cP#}^F4w$qu@JRjokd1H>wN^;tzMM
z)Xsdp!azoxkwsvu7fTJ(R(W0?rny_^SWKM|sU;jzV9VpyeCfYYMC-OV?{`PseSc3c
znDBs+Ta}+hJ2hz5p+yn1*!=$;{@K3#ho4mV(e&TZbuNmhAFRE<MsUW7;tL^-hmCG7
zw+Xq`+^{E~-P-xZZ>LL>CV9{9*z>G@)%7p?HM_Koh0jQ`2rAzXKDO|;xZ~zue6nx7
zJtbd9hOU3Iwx?$QdRynuHR`jg%c=_J3a6yU+N^!;`z~tNoI3waKYpJSdcGw-zcP4b
zd^=OXr7%-lIa`0`Vq3$Ws`!r&j_vN0pZD*w$rg6LCd;>{y275GS882m;9<Tdu)}kg
zP~)AGdONOH<mwoyEi6s0x_Rx-x~C_9-oN{+Z`quUpItSy1N7f(`LS+J+GnWxNuX9#
z^-}ep#r}Vfetcu;QGLeEv-$ZOO~<J^ottg1Og?tV)<gGIbHn7T`JXJ$UnxHDcky{w
zshOvzr@vv%O%Qi^=XFYJ_B*Q+8=h`#H!J9FeUh)ged;2iXpx=aN7#J?k9IG;^7!oD
zORl>u3X7NSFT5T6*#6b?1shIFs=3?v&+m_C+a|Hp*^%kj`M!gEj8Cq5u=hJEYFMyD
zO+0=k`OOrGuATPwk&Fzk=5b9OT1Py2RPX!03Yfb5%*juyf`6{vDjVU;(B9>@;tCh<
z?A(vj_Duiz-O^0@M%$dVUn`g%ZoISo$FdiJzAMjhbbf!#b9`0(w@cpL`rq`@UwECA
zpVxB8d5dPqy$PYL9Q@Hgb2Aj;7g;L@Onnt&eEreisOVJ!8g5K4inkoQqHue@xYE)m
zi?ybm(0|mztFC*sIX-vE=Iv>xWG-eLe*OAhon_YL#p1uRlzIC^9~^quaG|f!?m_dS
zdjb|6tV@-hy#4PA%}IRL*|wASh>ZB84c^jrkC^!Od(T!s@cHkSb-UZ#`gM=To;{GJ
zc<Sk~i5F%z-JVlE>qH2vPTQC3K4n}P*^b4t%7uEbH<rC>_;B)ozhCo(4+%?VDBN1a
zx8eSVdzY4NU(sxpxkoSVdhX?YpI?9DsxRX{Rr=>G_tEL;4%Vz)Q)g^nG@-h~Z~nT;
zZpU}OEHdGLIi)_S@7~4aGaDvus$Kbb@B5o!+dKXlo>egTzi5)O(PY)?63a{WCiN5M
z30ptQ3~v{gU6mbv)s!i)G`-#NaPG=ZImtqa`a0ti1(%;Zneg${4~wH3*+<%%x~J_5
zdB(>tW;tW`9krL6)FjR=I`hVOH|vh5fRxe|Z$d=>eR%%2eP;REC-K+U7|i*@zq}y+
z>O`LfFDBfcb9LH6QN4(&vW1_!GdezBy7%eR{nXI1iJ_ToKgF-#um6=59kC{2I^#c`
zti>Oy|MtC#+okZ^U$B3xhKcDj3AUhTze9btdp>aJ;7@Z9j9>Eczqz9PD<fM&=Em~P
zfkyG`QePA$eU~oVk=7y^_E*0B(R|0ar)=z##2Xxryqv+#%&WiWD=YJw+xv=aj+}f~
zv@p83V%k}s2|q+FV$3@qPd~t!)NtGBxWt;SdMVd=m$iPXJ<8b^nt5;^`<B-Q98+z-
z?l0DPzL9sa^qu=pf5~~=llm5W&sSpk;fPN4@b|VXp=In*!jjT4s~V$z*#tkjV05tT
z1h37TL(-pbtySEr<P_wn@IAtK`NNc(-={L|zR)6V!Flx>&xGxL!I3+RJdgdbOS$OW
z*T(%}`Sz@ywhDiJEv>EH%H48LuUKDw+&u4kKl6&v8(ZIhw$pp3{QlJy_xNSsosRbV
zok-s5D}HnOj0v6U+mD-{KHKIlU?6&sb<2*m0b3<_CmJ65eNIkrYmm*A$J0KiryT4y
z|5fg>@=TR7i|s6K>HFQ<fA&hfczH|VRYH@%!VT^H6F=+|>w2Q)|1nTD|8Q&4@{m_7
zEp12gQyQ{cU%n2zzjVRn7Y3`-rTBczHr?Z%dA<I`MczZv1&j3m`)%L)A^PV%DXG<u
zekR}iRwW*OdaD@+!w>ns|Hm5r`gf;k3ARSFvoqRmb>gVr_hxte;)&CqB>bA&(VyRZ
zz{zyt^v5>r2@wtd;?!>zUkWIUWa@2p=y3eF%^`xR@xp)J!}Z5<)n32r2s-T{!LGqI
zCHv8}Z1-PJjc%+Lf0yk%Cp5mmFH8KAZqV5)v!sM;Ln8mQi(Ggvp~CJp|65GOga|%k
zRr5_tn08Eh@L>JDM$bbh4mJqw+`sAf{wMvH?tfUaNsHzD_22uCzg@fO$BSg6Q~6G8
zlWdngU;8_z&d2xp@%N=t`_9N!yS_Q`>xT4S);9|@_$v0_ySl`b=l=1ZzNY;G59}=k
zJ7kzG&i>gq>GHfaEOj=;J(HPJ7YklE6kw3!`J(kw&(^|^hjkV#N?dj<H_<d=xrn3Z
z{ImAC>#RThOVP>I;N}x@vb&Y&>CyNyXZ36i;q4YtH-luB1mF0+B>lvh`IT!7r`_N?
zF+;4jezMh{`=^#&a&v3c@$7JZaW7Eg5>MCNgc4D?a9vfKX=>ZH_a0ks(spS9+YyHK
zOU&YVZa(;a^u?zg+h<3AKRbE9qDHjN&R#<ormz3sy{mZs*~WFkMt{lk!cP3M%@RRt
z#V>`KF^RMpa4PXnx^T9mZ2h*&_szK;zrJOl6eYW+!i>x0_TB#Nw{Jd(Z+P>-ZgXUS
z#d7{*^LEWYn`$w8TjIiFsmsiLyQA3Iu04M7Rs6oyw*?X^vI?>j-`aZ>naJi{_rF$Z
z<N7Fm6JL#;!u7hI^D}#-SzqrG^66#2Qq;uWpnkq+@%9@p&b=r;cZaz$KdIPqisBW<
zACpu*@C!bj;VjU&$x2Xp#xlOHWA`%~R#)tO8^{;MrO7gRr)-SD<44}&pMoSpWDoqG
zJC$|Ws|IcME58nIe|E{;X-?#_*}UH3a_$e-IAm}riOx6v{r}h9|2miTiVofH{5`+_
z`Of?6&Ch0iusk<+3*!|r)4)c)Z{M8WDooK@Wmi1=uZQKHumv9@Wcj+2@9ccC?nj0E
zV;8j+GseFgn(9yAu(++aHG&~Qs=H{Rpqd}c3*(G1g95#2y9HZ9rQWn1@4d2cmq_Gd
zu37&d{q<kX*kbVL)ZhPy=kY`&ZsXscUp4)oQt=_DxgsJTy^ctQmgFjk?m8xU)o{(p
z9qZb)KiA#-uY4#|`KRFa6KpqA49ws1|ICc!<vPh=bnU{#=O2?2R;3+|ooRA3<x`|g
zo7=<LN2i&}hlcIwlyG5MmF;eQe!ln288d=TzIwi4-YvTuGs`XQkAJskt6g{VUEczR
zxP_6~b3WcL+$x<m#YT*?LoY+p{qmLPTxmOW+$Fm%FJrHpFyrxufAc3iD_r@E`*YgH
z;$x9Jx{uCin`5-#(VJ=xxg+}%I~~_atL$O#lBvr+x{)Q~KC{o{Ll<K&E_UtlX^0MZ
z!k~T8M&{<7`wtEtkaM)3G~@ot7>o5g4ekfr`Z?X<#G~)0G=0umF+5AZIDO5c*aH3T
zv#HJ;(jGHUt6bRIRQ~gb`SPs2Z5vahBvd}8ZYbQy#%=#|%SUw&@q1g$F8n^XdX{_Y
znXhFPEi9?O9ttv~m^&{Pbh)!ygw?{o#J1n|N0eU7Sp|l|M`{1(UD+3Z?Ba{mR|={O
zW$zzPGCmrjEfQb;ZxaKTi<eyQ#2q27mhM854f9{$eEx9zk!d2EV&_kLeEz+^Ug5;1
zBX?4QW<1|G#Wl!r@39?`@p^|XUw^)PnB&LX{|mot6a5oAcb4O-6v4eGGbH?H`UF?9
z{hucna%q|1g=uOQ9@dkLi={U>YZ*QN?wx!5srzGxtlLXklTP#mFAtvD@_BYe`o8n(
ze4MrcM<r99G#Ny2>2x$K*rc^$k&?2QVM59qkE&x4zmGXwySi4ZHT_WG#4g6OnYL^T
z-unGE?Dq|Les1nB?a8_+Yy2mkoaZNDckR<Ng~d)6WLu{EdoJA^rXT-lTS>b1{(I9L
z>?8KyzM{aPG(G71lM6vQixwp5`ZN4#<>KhuyJ>}wXaC#|=_}?|=L0YG{{Q~sw2#=s
zUwUHcEq6?=9*dG}lbNyfpOs<h8VxbIDV)cZxA$?FuU+(hj^06j<xAF0pTaJ_b}gKE
zrQB>f@4Xo(LZ)WzW$5QU$Cr4@edW6Qwhy0g4)J~FxKN$rmf=E?C(iLU<v}}kxrTm{
zeduJ8_43PxxvA0YQgeMZp4!!>lt!C4cTV@c#GCT_=ej7tf6U*{uNHK3Jp8C}$A_==
z0pE`PsyO?9Tln1Q;G4b1U-Fl`*V<^i=lVL!m}RPHL?l?PO89SGbMwM_`NU@n-(Q}e
zT==B@v4!#EKrw4IE1}nu3Z{iDw*4Q_a%e+iUGuTiZ~Kz(O0rHAh)ZN?Vz)ft$=CYW
z`g+yQsmeNzr`uT)T=LglKDYS){og;<|H@i&`*`1)a?^fm^T^Uff4)Vl{)OGUe*Zzv
zm5bktXN#tOd1~%1r*<ga!;eR5Q({%<G>-QiA2sbw7FOw|Ju;A8v$X!H`;Yu==SAIn
zw{Zk{YkhpS|E}-GO}qTRpZsLmbF6)WqI!bg`yJP>J+WY`_|5!h_T%4&K065?yS<<?
zCqP;E<MnrPE^|sx1SI-IIj%TSxhCp>>Hd8STK49>{$&2~fBui(z5RFpZ8H76mXW>M
zfuZ1~&lVQ{hiCmG_S!F=pMC82K8<|~s$@MqS0<#aO1$AQowFxYjl-?b!gb4u1h$Zk
zUr(N>ICkU5^+t~q9S?gZXZk3<%9(NOMCOFku|*D+J&D#<9LF6_|9AgvQ)%aYAv5RQ
zdh14Jzhx6XX<U9jX~i-BRkt@c7+$L0R{P-DlKd|&8?KhxePE1v^l^DyPoYaW%kjtD
zbzCBbNd-!2`*`hpU*4*lA3v#5%2C73?)B@}SFHFvR&<!BsJ?!D|6xd8+H=9BK3AnY
zKFBbv;C&nRZ|?nL-+#-qa8G-)UvXL8r-g2(Rxl{BI83=}F{i<OckvvCL-)F}JtfN6
zdPDgp=K3-59o_mSqSt*_NXK$dvt9FLU5u(W{gmBh$kCA^aW1xeZs&m)Jf23XeO(?0
zR>@8(){<d<G2w<Ci(;B?&aM3tiAOUMLf2f0NVP2OJ7vln^xEc<)FYj;6_;;jW{A!9
zeYWYH;qLtCy5a`D=K>)~JxS%#0uQFFc=Jg=<gsSj`_24SJiqEU|CQ#tw{c0qx;^_u
z<k!43xGU*VGVzw5z`_X}OdO7y+ahl++Eza`ynVyArN95TO(>ZhvFNb-iOBsX+}i$v
zPZX2v&K!BVb^X_MziTV&U2iY<Ed6`7J+-K0{<%M%I~T53>GHb76BZhDSf@07cE4al
zvG>(El7DqKPEEh{@Q;u_<J2aW3kP<^UbbTI+Ntw=+j{AfkxN)2`*hYwbQjJKd&GM>
zaN0X7&xR<UO+^!KZq=~dcKl<py)aYU>v#LVnoiBSwj=R{{M7R+z5o6C|9D-6%g0{_
zw;ESm6f!*5UpIT6ldx{Dm&z>(hl$g?I2&G+_n)7Bh$E%iFEmnn%CTwkx6bTjbB+s?
zl5_k2XCLpDy7trkA5^CC3ZI<0cH6YZvdv#oqfA1hE@tH{Jg2O!s=xo5{G}Z~Z|_uQ
zd&1G#u&9fvi}mfVS$<o-{9E-WA#I0$t$yc<n$}w~FPavLF-?e+=$M$o+PFyO{7T6H
z3&qWw1w$OS#jf@2=}>HlyU^!7-%6-wj!fWBncrP&WH<KREIIZx^rmTI&$&Z&%Vg!}
zJCz#Av$i^a+Pr;Im8V!q>9-}y`zuU)*qkqIe^Ioln*aLsJ9pRCe*T}U_GP!{M<sWK
z^u1SV7d^=FkSgaY$P>(sb8gr&Ig!V#VX<ey>bXnK+yA)o>ejxM7KXi(c3iW4mu<1z
zD0az%vnw8lIR?$+v1~nGQK{|G|8Z@P$HX(%Yi(cOy0Z7ClAz8xNz*6^_nlwA6l5H0
zSZJ_=Jtyz%*KSrP&juc*6Pjln3Z`9m*Il;l+R+WWw#B76O?Y9|Sm<Ig(@D|H@!dwQ
z<J}%hj3?xUTg<-M=>5*nLbWwQ*kEpdL-pGqB}MywZ(Vcm)d^MoV#75FheQ<mW8Z!c
znZz+E+D<32;TW68Py59e>+ZJ-h8<4$aDCH51v!(X#Jahe0-Ey=2L;>kUHtstZ>7!7
zkVvlkXIJe|d-h9h9#d2AiT9s_ty6o~@!T-kW|*nu8YFJ0n!=LHF-vOU$tANgu3w%e
z{`UW#ck?<IKRsNw;0e!<cdbn=T!D5%Y3e81=6|%&ua&E}{_|fYjOW|w(*<9jd|`fd
z%W(O}b4?k`g8zKplfQU==Y`)|<<oUDPPF$F#(Hpw$gBUJc&hxq?A*NdXSwyvrcIui
zelP1l#%JYsZ5c~Tcw|5CnQznRba{e<8eiPS<RF&oB_+J}CQAEN{|DCkUg5TOIQ6|i
z>Rj=9-<G>+@&}|3$;WA2FN=F1)hP0)LBKq-*e^pM{o|j&mxkhZa-ZG4Qzt!JC&vG7
z*_+J^3y!Bv_S4~76Zl~->#GBn>m3$Vzj@D<E5CK==F4UGTc57l@Z~7uhTo44&V1sn
zGg)@d>4k<#)$e`Q-}raUcW!*Ns=II=qZFT&qJPKxNBmCGOHL>-`g<}IG$uS||L}i`
zoz#6@wfVe9zwWy!pL_n`jBgKn^zFK4MxF9FyY9mjhkJ8Xcf>L?Hdm=uKVuS-|JGW+
zzkTwZW=8wnZHM=_t9dB@o*U*PQO~#1Om42zF}qrg__N!y-rDZ{X0Q2j^Nc^zQ|_Lt
zI+k?fuz!D<Ma%5WR<_25=PNrlFQ4f%|8d}RftJ>z4+C~t#FV{z&Y~AyIVG>--ixlV
zPdB@HglEl2<2d9Zn)vUf(6f^Zm6p!<tFvF|T2x%XiUx<PS<81ER#lJ|-u&Xr9{wZO
zE}Wiw)SL0fu`VHxlg(;Y{zpUB^ol7dPX4%8|JKqoJ4&Ty7plJ9xA%YX;lJ`{-|p_3
zF<ZCQie2q9v-!PNrnjGN*Is-7XTq|=2Vd4tGLJbu*@~Zi(;MGKK5kAcSXCv@a@1US
zc2TI|fnLFaor+8i(^h0HoHWI?H@^14znjnN-<uWo8-1xbsV<bRk&?M8Hf86nzkeU!
zx&B>ulhHaKRn?vs?;eG43OX7bcj_?ooMmuIQnC4@Xs1j|OGo0u@Qo@PZ?mnMBa%Mj
z_}OE7kLP@PR~-9%>c#fo25Uqb=06Bf{ieOuy>0)_lW)HL^)K!GW-8x)t%;*%N5{Dj
z@7^=q=Q4jXw?cK9c8L3m#zOPb$Z1b9+j=JPiWJNd-RqaGv3>XNivQs|mR~+}@XWi~
z`_Ah8LL1L0EZZEpQpBQf%hcl+*ru4DSYmRTzjt-_Vs`QO`V|R1R~eT-$t<i--mh%<
z#qh)h$(=4KcbzZX)8Y2jRbX(~9L;9DQ*>pwUw!t<%EV=}m=0~dD&4qzvk+6c!klNT
zgjUV>*(eorzO5s=o~cdf(*Bs3i_F`;{>+}e=>CQqFMftBywvo5rQm7zb^TeZ<N8j`
zx~0qMbTamZiD1(1Z~Ln)S4S^<&fL)~?l1Ua`PJCmOUC!_Zr$wP_VwPs(t>~ShwCN^
zJa2tiB%<KKm%gNh%c|P`wR6`c!R6;1&znrrG5BQQ<krij9^u<LNzT*yO0|8z{!Yuk
z@s^?c_e}Vjxlb%NE<t3@hZ((VPyU>8Uw(c4W8LrdSL3-8O`qjFQ+}Juc;w1KL5<GH
zB?}fd>D^5`$vLZ3=$OmuDOtM%UQBJ+U2R>zz54mT`@a=iZoaMeIddkxf5nkmqW*uL
ze$`l1SpMC5iFk!f%@x`DRaHN~>AW+F=nK4bbb`y3l@})Ka6C2J`17=m(Q6q+=XJrR
z`XBzKp6%Xu-|2Dk+v4>*bxlp4<ZMfw5&N#V;lS&Oja&C}o_)fwU(?B0w(q#`$w^Mj
z0@`n^_cpwpqrYi(oZ6(w)9!lwFH=_uw70%aUb1jX^4SBO&r5!{-4OSCbg=PIu$$!F
z2R%!};*Bfsu3@_K!ARyKPiCF6!`mnI2QSG;U8%|WJ<-2H(pcrg-^H6YE;v46diE9j
z4?8Y9B<;DL;!|<Lw3YeiTz<w459575t*8|Ke{){n=7_JBcYKyTe6U~s<A=n1=c44^
zY;5vBUzyvnVVP*=tEc-V_c^aWyS?B0!K29E>?h35scn_HvGHAq#KzsJ6F2>zRHW?J
z^UQIt@XD*dD(~G1ax2__OLs%mm-i8~Y}>yT<{tc;IWyL1%cP>C0pkDcew<oum#^4R
zli{i+Rm1SHanX-emYH00a@n7?+}v@X&-;77_s`2Kw|_HoO;0Y(@j4mo$GK*zb^M%V
zi>_>2soh>GA2>DR&vVttbC=RTRTiHAnq1oIc01$XqTiqT?bL&1ERE;p^<6VQ__kO2
z#<AxaOX7rGk4juS9$NC?s{!}_nMdQw1Wglmw<Wk)mHC{RZrT0n;#%us4#oBVHtxJ&
zJYn&&wNu}*>`>2UIWBo8C_;Soy~k5u?+iV#O`+am!v4s+FT5m$>mKrNPG|jbY>{oc
z;8D4a+a9<dIi7JfKKGzcbeo5F+(pf;r&`yx6d&68P>A)EbFoO?Qw`U^c$w=p?Z?+o
z+9g!+LSwgqHv@;x<jZO6ZJb~3*e4rrE6g2xah1Tgdl_0E&+ky(^F&!@d#`=;(t~qU
z+^zP6X77<>&RP4;C+tt$ec@-^>JvZDs^QGiG3pLG%6Z6lzM*-Z?Ebf3LbhL0(biT|
zoW%9^M4Rdj-5d2k{5?Oeu8BFZ??}<ji>9Y9*ayB3wBFvC%68_VY5Iy)`^0Uuog=nz
zh^}3+Gy1|8j$)VR^KMVEIhJHK(|+FsaVN{qg?qPzYfU|KCA_ayKg?_Dt7Y{k6KBd?
zX7~Q^ODkcGOL5KTV@r&M0(-d6UAuewxYoD-3nv_XrSR=W<>}IOdAXq?ACrU`m(Dg_
z?sj!kLCE76v)S*m-f~1LFKpagtS$ZO$D(;kiWjCVt>p>MaknyTF!2z!%;-s2ZB<h5
zVi@&#>!!5_p0DC4m?QdGa8BB@{Ke^ur~J~1bvS7my<(qk(#L}CPggf)Tb*mQoV9(C
ztI@>xgInF?l;7rV*qO2Lp!$);-|T$N1B&*?Cq_vL>|}cSCiI%}rpL80JUy0AGNKMH
zXU^Tr_+wr6JuAPuQ<BQO50+f5a$BzXR_IEV`^K<*g{wQ=o$k6vgr3?rl{IwBEq$TS
zp=YLToo0Fa&xzQa!@rWH4y>9U#Gf5>=+2UM_Q~}dZ?WIpv(`j<&JE2Kdv4_4FFo6K
zyL3k|<35XD{EaI!vb&1^?=Rkb+Pwa@T(+s&=?huriu1J0^d#=?n~+iHm)FrHo_QkT
zg=&l2uI0=2yvh|!GvEF`Y)?k#gN+yVJWNbHHnTBHJydl2x_harrRzREs#Wq(DLu1x
zif`MhdAnWi$Sj-db}&g|Q^MXuhs2Fm&(8X=^V`0H-ep}YTD?wiOI_D)W4Da^CwcYq
z$(d3|9K)jd#MnQ-TwZ0)x3AH1<<7N{OV*p@{O5k3?)mA&&b@nQUM}&8db2#n$n3mc
zQsU=L#Y-M~<T*dtlYXxM)*+!iA3aX(;kXoBR%lVaXl=6D>O*n)&-(8#y%Tu)!=duz
zS9bsQxT!r@v~uH1w#lDo+&ST@Rvi+|yIy6l*c54Iw_oZKpX05Yk|Nd%{Z4Pz+PY}h
zv4eW|7ad&V+-)mj`qFLhzNzQmAJ=&}FY!z9QN2@~6M|h@_aD~EJ<Rcp>n2B6(;0@X
zXWK*_bY^>b*hFkIR+yDn=jYe7wdDVgNBetBa%Rj}TBRve-Ztax)6MZ!Te!DHF5Fbv
z@4d0Xl8Nuu$M?!>7TgS7&U5XYNz>ehH=m^}|H}Wbc*v9fRk^XCXH{a%S=k4#p8fC)
z&^Vq^7#*|w_@Z61DrNHAK1nmr?XNt|q389h{o1d}TkGysKi_vI=y!2ji|_kZ?{{BC
zl|q9Ltz9atZn@}7ww&nn`Lj3X9Ni?wS`_4ZyzllbX;#6kK$-7FuPv?_7*0Cl7x=t#
zXPLBneaNa)(n0!JL1zlx_T=eJ3_q8o@qDkmVB_I}m%>Vh-=eRI&Xx;hy2N^soqK+A
zq*PeU(i?SpL4D;c5jQ3rG_H~IIVL^z+tn>Twk99rji)Vi@03t0I(PN8$_5`T&Rct>
zQmwx)<xUXRUHERw!a3`CL;ZZ8^A#SN+_3NG1K%%p#_P|n`gZrrT(AAx_r1G4ua#rn
zi#N}DA1HslYm~QlDVHyE<HL-=k~y0j&(_USyL5Ms>R<7N6Ze(|F?r;)iY^hiv3wG`
zYn38PlSbK|{8CH*oXtlzP3za3a%#Qhm9^h@E!Xo9K61=-<IM!~2tzAH=QA(Ps&&5f
zT-K_|6}$4BnpvLt#fpqAMa8+hr2Hq|JSSDgaeLddkG{XZc&ah&y<R(gBm3)9MKgD5
z9=r7Etlgo6pS3Z^F1dPr?w)fzZqK4TbG^c)pJtxS)x5Q_??~L%NoQl%{3t2k@L>k~
z&4)p!3Jtbhw_ahk_4>r<R@uYHdH?+{l%8+p(;4~vb(H+J`nwOF|IWO0GBaaA&gb1J
z`<L`hN)GXUsdl~VW)b&8#-Q)DY|0yawf;5tH3>akn>6W>4hwT>+*MxdA4gQ<_|n(S
zlj+ZGn>X{qxfY+a^V8?8oo$x(=#IX!VV_v*?Z7#ILJsdc9Qpq36cf=yAHCz%_QsTK
z&5$>@xyPy-Ew`ciRNB?nDN-tli+CroEwnIR6`UMsa_;2&=2gihDL!>yjz4Kua#!1A
zbz-g2p0+;8%nvepW@eQpX6Fhe+YM7vm#bcG;k)%GZ>Nx>?nn2VmBPVYh4%#)KKQrG
zzAt8e(ZpHV_ZRMYQW|o2c2mQ{qfhI96mqhhy{h4qQ*?D2cQ|u^<hIjd>t`h_xRc(t
zy)e$_rLFinQDxON*G^ehoXfu46?ftKn(5`+tW&>i+C2BgD|HvqV>eHjYbNY$(_G7Y
z^7h*V?QoTu29NCRZ#_NWcIEU9j|tyf(#?YEm!F(>>-^<y>x`#-G~E~8|7z*m3muPV
zxl4SNFaA+*!EgE%(Vtr4981jSGORrm^J&rP3%4$Ht}Z?%CB3%a^}E7}4_iJ}?2(z6
zzU9WE4Lhr+U$|T{f7KPkUkg>#&--{NnVo2QVJY~H^`oEPiag8u`|lo|zkfUR+RAS0
z70174C&_s5xX*jx#35!qslVN4;rx?d%XBinxA@1Z{^ng>yr$A@>%@E~MV=i;HF+FA
zFMZJ-5aqw*o`Oo$?ECT|>3`l;d&n?do1FQ5*#yl8{09Hx9a?(Ca{lM+d=aD`vTDIL
z*&`Y2OI>#<8?UO_b5Y*mj{DyriKoJoWPUDw_w3TWN8MBYKjbTy&-rlADLF7mt}>%1
zJnduXowG+@?B3*QZs=YW?60M}^Q1tO4U6>Ygm1@7)lQzsd@I1(F1{!KsG)LYt<Hz{
z_fD0n2<|r7GVhUb(Z_cE<C}Po%z1y^{?Xp&&kp@~#j)eIM$M%=!e9KHodf48-I|y8
z;Oo`@@ozir)_wVR=jGg=ooD`DJF}CyS?^y(W85~ovYu_%mpEO%FxM|K`h4Y_k1shm
z9$PJ)D5@j6e&3~;2BosLt=UVe{2Shye9ND`eEw|aZx$U~zW@1bKg!?BvoNgca`<J|
zVl=^9PiWVTf|B{Z4{Btx`T4dVSNy#@dGA(cZMMJF$=jkmU#Lclze}rJWpY0CvBF-5
zCSivqnhW_fpH<9Typ2zKg<9RRN4e6kg`~TuA1M{FzqkCc?=#gsPPc_r=WeQx>Tmhi
z<PmlHMB|?)_f7uxC;xlfA@<aHw(=j2ebwe!*Z)rDb?RGIUMTWuPW9yv91qewBR@Wy
zyHNUKi1Jf`KBYrS+-#e+?swGxX6H7!beYtDzV*urgi_`tzq3w~eUstVCwhH~!~MIT
zPH#ObsP3|TX$Z^t3ICt0nP=|GFZk=vV~6Lwh07l5&W%%xWz(;@dg%v;T*kMWey!**
zhjmBi9kMnK@C^{Pec1EA<1v5pw>4{~-b*_2Z|nOt6YOtul(5}&`L}ps-l~5baf@#&
zJby2+YWAk<;Rik5OxP;wue|XJf6pXyGsUZH+io<-w5==>aewU7-&l7=s%ZX9b9VLM
z>syyT`Q<3EH}d10-!JdfFMF<M+*e!^?qPlKyKkp$l~CootkcW$y|#T`wQSWoZ&tq|
z>z#75!Z#@7@wV`vTJ+QIan_m*lYCu8%UBL6KJOR!=u;M*^3AB2?e2cP;}#jyQva3a
zt@-h~b{gAWCwAKzW@`8Ta<p7k_*VGzu=|Vm```C%fAIL<^ozH@=KK=ub<P)F>$qBG
zQp3H&fB%=SUirV``?T`&sxnJ059wP~$BWA-i*9)zt+yfWa+l$eJfrCW-V@~BEZ&h^
zyX#G{_o_Soo8SKZIV-onw{_Z-AHPooHPrt~-}d{)o1VsFa`V=&II!l)yBn_sCO+Ko
z)bz>Ehj+H-?8@1@`@~AYhfZ#~8V*W63uPWm5b&P!?DxOPD|ZICFXKM8CAcf%R=Tgz
zwpVuzKkz#}*!AK3^&RR8mBJhUI6vNQy|5th(|g8Xxleby&a`du|FKW<<f{Gqf?f2x
z@7GGiYsS1NSGGIxasP4W^Le&xg2|lbPg0t9l(WoH{GxJ7Zk2J)ugWV67Vq<6zEZyH
zitO3YwkdYoAABmYRsFs+&6(pPBaip3Sx=oUw_aR#eBb``M%`D=fA`kjJGv(&FZ2f6
z;?h)BmEDUbwAkeqx{H4}!ZIP}-rSyBJ1@DujE?+PDqUIQ@3{EQSA!rqxsHgFdzNIZ
z^a<G)x^v3B*J%qUtyma$^H<}migzm7-}_(ejFWj-zv;-XXpadmJvf~f@@GWe%VsyZ
z5#wT3dw$Whoop*r_kEeU;r4;w&l+EUcCq@u@yimc6W_Ic+KyMw?f&^Zu}0|9nlIs*
z+T|?=QiPaqO=A-(zsmNo`g#;=weZZdhWsa7PQ6`|xTWa(G5yeEMY4L_T<h)zudNTf
zWc%}M*16<)X7dm0Oczml`*@Lk&8?L;)>r+j{B?ix;g<YA+C1!$n&&(@eN`qs+hLJ^
zy7%j?8_!Q1Wn{Z>+<uc`S=<`)xni5bXVn-8W_HZzoE_jfv6*FO-0G!LD?iKTw(Wk|
z?KQnbUSQt3x~+oeI@WKV=w(#x{7}TT;^c%UC8dqqFX?wxB_}M~yun3QZevN|YwqK2
z#@8ONFL}FDa*c}ImkW09p2wXqoUJxxu4~D%qQ@Qwl)b*_`!e(Q?n`KT{7`T5oyD6c
ziAu(%@$$uPefc}@SKoEnIkA;*OMN{*g%uR+D?Sw~!Ej^w@0c@vj?TP$wm-LC(jwd|
z`j1z)c5!w6oXJ}ydPHx$SoNUqkN3UwTkEXUR4<3i{+2nXp0U$l=S&WPZ+D{)oxQUv
zFU0EZw3=oq<(^$%4YSUxN842I%{{Ts*OuMB;irdF9`nXFo9p)1!_>Liw(gqb%OB2~
zAO7!6%AUC6tAf6LU#sb;ys_tM-{kmZxlS=ztFCBnY3I$nqIxfB>AAYI$KDm{oW6g7
z?fZ#``rfrsKT3QPVtar8FVgFB2>830&n@|L)MKU3<&#6&Emzg2ANF+;4ES?#VXPqc
zT49bG%lGZ%`uSkGu>Rv?|GHO5m>DhmnBDH#70~{A+gi7n+`^6jy4?23Km95l<9bxX
z)Mo$T9s90xo?ShM-^=2u^|h(pRri_~y_Zis>d|cT)O|1aFT1WY`_1!y91pqv;?|l<
znU&vPSv;Tmn`7C_g4GG7o9r}?U2?blaWR(ZUbyp--=97uUao%EE~Z|-(XHZdnauRb
zXHWa2e_Z-luw3j+!L9Our~7|(AIwka5D^pJVHf+Zx7a*-Wi`9?=11X`{kxhIRlo9b
zY>2D;$F%eR7pqj~;H9sZ>*fE`=YP0l#kNhq*KmB|=i8dkc7OlfUz#!pXRWTkdwIE~
z$j61pUmAX`y8A5g-^+!H>AoVBZ+)~44)-}e(|dl$=Vj$Au_mjjh04nVUpl|rxcsJj
zU|!gs)f|o`Z6_^1EaCq>_e|$Q$A72i3a5$PDqZ{_CUNoOt-H0&8d+nP7oRwvve0tA
z-?C4JbKd2=kr80KUEub`PDRR0R#7WardiMWUH1~{@5^L=O|N@n9@V>3+$Fg-_|4u=
z9GuG29!!5F#d3_zWUcuAi5u!wbUyx$bDw(iT#5}xe)nAQFthyKXG@P}DyJkU2z{xG
zmAigNR7fwOJIa@b;mBs26EAt%CP?^t&Rnx)PuUA@yS-cU=Bmwm$WXGm+BrGHP14Ax
z=ZK`i?2MN|+iy7D2%FfVt#zf)AxG?1<HB7N9Zi?EGzMkNbL0!TIERt(z{}Xx(TN;P
zr*;Uts7xqOYTl{QC8~LM5u=Nf+7T&_mm63kpF{~vx@54VP;JMJ=<{~06<sb`&A+sC
z7?12xmQYv`*_s#e_VVuhefQq&`=)4h_ZJt#8TTpmPo-tPJxS2rlyhmW%=<ros*X+Z
z&Gvn+5iF#j-2AM}plsi_NiVJyKPf!C@!ecIlVz{ce)8rhiW*j>=w1=XG<u=D+Gs<-
z5uTZwTUT7R*m8+y(Q}5zNd+yeYXY}V2wvN6`ftm(6VGS8zp9d6^Uv|```x?GzpYFA
z`EdDj8K1wk_Cj^++5bacTzsWfJi*0guI&9oU&L-Q@e9e-S-dY}3BT`E^=4wN#KS4f
z2}c&Th4{<P$vpDF=kCo`o0p$w?7H)r#o*w9%-QQM*>Z8|et&(xV$bX)cJCHf^FOM(
z!ME(a{l>f3&pkD_cwyOfi0jBiCO>QGqyIv>W;eX5x__zHdsn>o8%LGfD$ZiQXF{G>
z&GL|}SsW6!G_A6Eb?B=dnwcL0Bw21os@vLYY<9Po*33ycaO}q`CBt9#o&4<eA20o!
zy6u0O{pQ`@Yxgtn+kW-gQvP2@4>Yipl)dwDUf?4&Wr4C9W23O?%LjMPr@swLG2knf
z)?lzd_Hp+HuU!QdEGKyLR#*H{>8&f$a&p_6I*oh6oaQG5#fBjwwfRl=)_vzcm!q|9
zZvNk0{nNkKsjdGbn7-IB=YEJ;=laJYzaECCaPS}3E?zusb<#2muh6v%1B9mJZe2Ac
zI@hUNaP^GML6UBFlOmolDKkv$G~2!UQ&4N)O*b|P&%mC$LB=Kvr$|=Zd9kx)#fIF)
z5}A#$``Bd4%=WCv)RV~ex^jWFG-c*Amx&ezx#l0X{dk*IF55rh5xeEFdY_zR)|Af&
zRe1h<NNk=rT_w(-|InJ;;FA4JKeZ0*Y;xw-^|_oGmLpw#$4C9Y*~1+S7tLN5$@%G+
zUOFaJQqp<w?c<Hxir+4|;qc(yhlp<Gb8qjs-kzk&d#00DXTy!}jpB{r{o()m5+WRQ
zI8->VuH_C=yx5e=b|iAq%84yYcFF|`@thLkuq;tL%eU=*-?7^_mz+Iftn1Z!b!wpa
zR2H9%<=?q9vm|(x|KHvz@+8ipZgtpN>1g+pYRsJe@-z1Sy1iIcjZ5%MYrsn3X9ssm
zp1ixb%lD04wr<Am3wg_exNc_%p8u$7IsfaoNeh+>&OdtLN7+9X`I9Lt{b%>oD}QWH
zsktT4T+Dy*=3}|L?|GO^%BN<8%zGP=IA7*RLf7oWf4BWsVd0&2^#7LEWt+V$0<;5G
zeR}D%T5QwVh^5(9FAkgW)J;lVWz;&+D(G;`g&&=f>f70-K6AKVdQrY_=hu)6Rjh9p
zCMt9?8Ljh;n5yW*%WBNXYGh<^ApG0o7YTV>g;mTyoKLjB%)j7J7P#ig60PMq-+#DX
zIq2}<QFMZsQ>#?Nv<DL&EZDYty@8cVlV|IX4LOU?J^8v%sjqb<%QMCm63uID<M~%7
z?`?k|e*em;&px3#PY%54Sj={`UBJ=tv+H|}Qs*D8u0EQ2+unTYTPbz_Q<3JMcbh*|
z9_!8UNSMld;l<~h+eJ=2-Q0BOz{4j(xu-q}1U%Suq^<Z`SSL@WWx%d~n_^mHL|Px1
z-i|*Nn|i0l^`heCkSAFTh6aW2=WkNtWl}d>(3rty=wWzORbk@lilajB&T%^)I$(Bv
z(eHV?Pd+Z!J9Vj7;C0Qd&*`&F7Cf(2;raYK<ddF#WYVvFfBt#>aDTXkSzTq8^ovWH
zTLUY4cUJSU^>g{|=q}KDcx~;W9JL_bhAo%aSAV%be{I;=BGa35pWT02AC>l+fB92C
zF=eUrPs(pArc~X0*>iQx@}<&u{r`lvYDc|$6~<oI613{cGlmYP@DJYtS8jAOi@G=E
ztz1iij#)s`A|buWR?KB09xRN_3t}uKBzWJHs2(s?SaNmqmisFN0z#r<mTP|b9cS#>
zQn4#0?onY(KkF0+&6ZSIm3h<o13R9s`Mm1mf}9HqZ$iV&J*RpJ#(A#3y}E2d*5iF!
z=g6(;-*12QYMy)W)oU{UgI~`+b8h;k>5qEl%n}bj=u~jm_Snp&<tF_1W#+|Y(f%D)
z4*LXGuUq$B>t6lW>9bx$-0kM?+-<jP_m8rsW{cB)`_0SDW`}EQJukoWLMET{^YiQW
zqI#*%+P#-td|B(0p1gA9=Dn}WcYDPyDO(@iHjg3q^K^|kpEvss9bnnDYLBhRwwKI;
z|8y1QdYhJUyl|YVe)CGB$c7(TC(a!#+S?_#C~kh*IoA{XF8PI`YnUI*Xq>8SkX#-w
zy8ZT%A4=N$YU8D^P5f_B;v{<e<Mx*_7rQ!HBtusnbePbmkv#E;*Ynd482Vz=JNP!U
zcnTg_#V2)J#;r8w>Va={>zAIto%-Nc{Jq_upIx=S=Ka(_;>Q1I*Nw*?JlZzlSl92$
zzj?nRT~j6+Okk*6C>!iGvC;c+kAYm}Eau8xE}9Hp=2yN=YVthjow7~mL76D;X33-*
zY%8<7wDb3W4UzuzvE*N!2EX^7I}G<E*?j&US-=!E%P#!6>rVxZqhF%l$ZubN`{#tf
z_}9hng0+%;=LGS|U+yfCQuwUsG9j}#Z3@%n-4EXxr+hFu_hnb#kN@%AGTsZNn0y*L
z-ZC?UD=_xOe05TJc~r8%MWgbRl<*?wldRKEzr7T7`2*MD_3~f;ewf#u#x#A#)ysPx
z&7J?d@WSW6`=)R3+4BB*<;%d=zpj5|Y}OTgGdVgmV1?z0#`iN5vs66ge<{y?7CV(|
zD`R!kyk#dHk1w3QVBVTdK|OV=xDtA_nGfx*%-F@c@%e|fwx!Ndf?u2y{w0P_`Q5(h
z^}3uerMdI==v`UAWxmU`dG!~v|CmiXcI#JJe&8v70lNuxLD`>0Loz~dZJGa@{jSyS
zs(9XlR~7f_*5BmcaqH%fw|m?lhMdu1Ruhrr<>^Z}e91jH=Ntc@3XSuBy(V_If1J2;
zqa?2m*AlkV=6vEQiVvPIVsc+<f7w@c{nUS^O}tL(B}Kbk*1q>HzO+w{cb3S%9*_8!
z20RY#AxnNNXXJ`YjVWIFA!pZj(FMZ!oN9TWrab-lcFB!Z-`oqfRr5`;-?^|-H*3Gi
zn`^)0I^NnXk5AL;t~YLeb>aSY`}*xGr>+0`bJFZn(g$SZmLB}_;&)$#P*VU~gJ9!6
z7N7gerWmj&7T5l>J$L@ZU;TH#&qx1f?7v$V;!?fmfYQId+un1RZfmkF@?gLC+o@%~
z`!|s_jTa^PTHf4$yJ6MK_K*Jk`=>|?iW%PIo%r}b-8-4;%=ZyVp4trxpB5P;8|el;
z-8ebI@j!&yukIH!<3*M(a=G+@@o$M__Wii;29txfEmdib&zZA7{*Tf>?jQHRJrcQc
z@6J|7A%|nqe{`P8{n|8l7yk;`Bp3ane-$&D1Pp$4+}2C~Yu*3%y=Q|#wm`AO#b4Y{
zu6t)b+PeQj$xqu;$NqHu$n6iZlY4veMnT0)_Ss9y>a2L*Y@hG=_VmvBednF*-j_9{
ze%}6mNBzW~cE|pAU0dw*f63#T({HpEu5b|&RkJ(yCo3h=t|ZZPrfW*A%JzFH_QH3o
zr;2h|YcuS(biHDg;FIh6{{Hdjp&@J%%*P&f%uT<4^v#L4Rn`BU@878Lla)@t-WSfs
z{Ab?bA1XTp|GsZCF1w_c-DdZ5@t%b0HhsrO=T|<SvCI3|xnhmK{C0Ukuk_A5x}zz-
z_{@ySoqL<ksz<i%`5*aW_8gz3Zq{Pwmlt-fdUQ`oUgxIpr-#R{>9Qp3JyF=ca1S?2
zfJ%pg{^9laH4ZikHqH?cHjR4sckAbyS6a)n@~?gudAzAUxc!^XUFXeHI8<xDCJPE_
zD@q)(K2lTnzx0aJ{#3T0q>~fx@B9^ElqsM((aP-R(ee+|udV!7=$AS5-`bX?_b$Fa
zsVmm*`|Rx5u<lde_oe=|=C^ZwC?-@NeeYrYlX#=Iugr3%%$8pMBd|`(>(P!}o3PgE
zHc#uN99On3UHj1c|K{&DC$AqlHedMLT_@Kmsu3G{ciot9MDRWP?O&&Av>A>%NUzBa
zyyI9N_$Ib6XV%e+XFfEadp&=i>ISphZx*lqoEUX^h3m!%Q*U{61&OlRT~V1n{a(^H
zlMOmI6IDN~mwoGF!PC?CD@-IT{Mu#ly@$DP#;oHNNZy$0_Q>y8)XL)5D;#buKhv|r
z=JPL=10hyMEiQ4-)r6G7@6Mn9Ikx)rni$zV(s7eQCVQr>aTmP0D8~GRb?UxvxAwm|
zkvvUr^>^9N$IpsB?_aZlJNxgk^LM9S61d<i6Jv4y%9=ME8OA?3n5?gSxmvHCawpR7
zoXn=4Pu)x}>w5hzcpW^pZNHZ@gYwpSsk^fdMc7B>96Mt+Q%zmY^L8U^%(QIv?vo2L
z#It6fwqNr*zTCau$FgGX@#1}PCG|q*<d>}rTBG@?eRZy$)<!-Vo88PDrCr+>r8#cc
zcj)bp(mh9S_w+}fUbBnWOUKyc{-#rDKW?k#zApOrGP_xj^A4x&!c+5)eaU>JRoU&z
z7T;DN9&+i#t#Wsdyg2XOw<hjabzwE1I{)goB}L-x%F;{oV`fa+Q#8-cbJn7Mul?-@
z_UHwjV(~C2nsocv1r^<df{oHl1(H*B9yrbjdak}aNap0??adDktUbD^=#105LWil%
zk|`~h7u3kaCTFoUIqB^<ZvR(v*M&&M#U^nJJ-4itEGuLAd&Z7=#k;C5{c9Tge}CJY
zoBest<5hn5r)*S?6&Es9j;uBIQexWXV)pUv<E^$e-hA7IjMO@vSk@YvZPi}n;my-6
z()3bPK-aM>JNm4O*w<bw%~>Dq-mU&^I`4daYFQq~)ty#VYKrkOE?&YP*?Df5|9C8#
z$hUrd(Z6#!8T(IGf9u=tb!<Y_PWxS}@BZEOviW@Cq_X~+_LZMbAJDK3SZHzeQs7J{
zZfVx}0?TE7Oe<Y^P5pV$T6Y##cNVEfzqizT?qA6oG;wyJ`VOgZKlUR_mDvo~0`Kzq
zy!&-at#Q7HK=ThF*;)GL(Q}PI9i2Bj*fsidgq}fa^wV1l5;QbS!n`7Gye~8`H=buA
zHD!0fv{efqh5RV+G7UT^$fVnOxxvh)S7gz<w#lph+AXM(=iO7$cO^!9Pg}{RQ%a}f
zweBRmFST4_z3s|19jRqAjbDm#B^6aYW!Q1(&KvnHGbZ#WByjwV_&-gHB~LYf=2f+#
zxGiT~Hr)7Oz)^Gmx$}MN3w!>Y&&oFY#P@K)?I4~@*Qd?y+56vA-l;eDo`HYbqgQfg
z)0eE$DBTo2N5=B{Bv%{P%S#?jymE`3H%&o5bZ6J}4<+HRw{HEe^g{AUafiwMmwXAV
zzw$mWpTA+(3vmOnUsh5om%NU~Y5a3_5DA%oMPz1AvLHim`}HG-POi%<{;^Im#o^B{
z%UL}!_m6kZZWg|5x>&?DV$Oxe-Uo)aLJGrncHF5udvwX%z1NmoF-w{8r7NF08gWnb
z&qgzm3OCKevF4RwmzNw~UiWzwi}#VzsE!Et$-%0Xo9!m4d!(s*HyxaEf<tsG%httO
z8&j>feg09^E0&p6YV&Hb#OIhU*JcINt=HStvLt6NJU@GheU))bRQ49J1#=HLp8YHQ
zcV1eDL`YYc)|6&;7wtwHg+&L%L<D2cS1~s_)-J!TvFpGa=KaQP=Y&~huYRsMH8ZsJ
z-f!>h#Nhg)tg=0UpMJVdi#E++E_%+RnttWoR_V?C9UB%HvVC6M99kp$+u?DR#A41o
zu33A({any@efJ-`jC#+%|G9HYBwugLKUKCo=-ry$y9d8b&lQrfZJ##raG+QC{`R74
zmL4a*^@si5Y`Qx<D=vM(o$eVwIxPHDo;enW|BC-z`0~%q$zNxu{9k|Vr+if<+Y2s^
zT^-8Ff9jpuUmd(~!{^kZ*9KqQ&-#b&-mST0?vcoCt7ZyLSf2jD`rYG`?<alrd1~XL
z^v2xu#`NZ&7nLRnADz3_{nn4!OCH?PnEUXqU(uBE%G_u7@0Hq^uk6!QZ%{C>;JA|%
zrE`;eb>yK-C)G~~-s-uuzxw{CtRu7ZqPMjBJ=tm6aL=yAecy?P%g<lgm&E$XTx81v
z=2>;`1Ql1SOB)$Z;85gn6nJv4`Y6*Xp%sP`jF^tE6Wn>SDsBtYJSD}%6MDWf%k`Sy
zTn*X3<2j$rhLuzAEjGKVo7j_fV!y!w{)H1(9SK#v{#krR#KY8w3pZ`Llly(@%2*8>
zfAJeXk8h|?yRtueTl4PO)%>qZ^lx<OU7Eu0V=7<1)+cm_TuVyd&G^rEwe~N1lRxkH
zSN~@rQYVg=7w*|pxO<(xPS{^_!~5T(Cv4d|&FIbPck${i=krBh6)dUAIm-R#^TwSI
zBOL0cga+U3;$Fjk<d=-~{qn!&lfLC&m#K(Vw0M$UFyU^(F8Lqx|L>c;>mqZj@#?mj
zmyH_h#MoXdzudfZ=8s>0KkK_IynJ=(|Er6_qGz`j3s${&a{uf>XU9voqy2xa{hPJN
z#J_#(o*PwP;?Hr1_SG9kKel^bZYf%KZ~v{za^-2?WtVOHz0Y60<$tm7{o65R_w{$o
z*#6|@wKr8WV$}2Z{Q8r>{Qif+kGE!TJHB?+<tLx)&Gf2W_VtFuYORir|2(g+)cbjV
z`GG%0E;o-JRezg5|Jzmz@lW%=Wc}?=dTqCP&!(OJzkU0fuV%f?)0_A9dSd&x6y1*-
zx6cZVS+)ND=Jm(Q**TZpdi&vV-j`pFC*IXx_rAY4bK9>~fz@9=T@ki<|GxO*$F)<A
zxtxDjGGkAA)c>jXeN66!FXyQ^n$i~;skL7(|M20D8)o~7ZI-Ng$GzJ;U)4#UTd*rI
zWB<k4VBV?0bzUzv$y_+v{j4wA__dh}$K74A{*N1eZCz{`ox`=Hf@6oiLW|Rk>9^xs
zri6UlA-c)8^cT<X9J{GuiuqM{mz<w!`qW2cf{=p?<F&lfrKw9hF3!lWJ-F<|sRjKT
z9B%t+a;!;|N-tad|MI?Y9zVA7hdY;_Jbl09#=UuIV!FF`ceq@Tni_ffNqUN|X;u5A
z$y)pV*WUiheddVeuRXW-_kTF|^ue4DR+AR_o?*H2!2Ngs$HmvLmRs(OJ^#D;=Eu)>
z^Uu4U>Z)#9{r~oshxxmz<zDYu{A>4}r^lD4Pkd3n&p*%k*V^MZMXR&3HzgiXO?h<V
z^yaH!Pis7m9*LWgcdxqa(R016`>)UXQ<$%l|JJ7WczgMWU3d80tM(O1F8y!U*sEeC
zzpdV*_5aMU4)5C)CoQcrBJ2O=mam(iuPVwsY0lR@ald4>kNhaK%-(m7$DAj(czT`x
zNAb#-hzl3~S*nFfO!zyaCuEkA*9(sz)#62+jxoNvfr|a#|Gke(itnlJ+)zJvwdc&D
zu=;oWz8#%5T1{Q8t}l;B9}ntUP{DBEK-l(u*=25~yKL5OkltG|>1UeM3Bg;giu|7K
zL3K~3w*NcHsWziFie>WYpY`4fo1Xo*SyHbo6tDmBVa>6I)p5!U|7Y82dN_T_Id}2v
zi%o&^Wwqbl|GoR0%(+uPY!dd#Ka4xzf2dmduS;H|is#`XY4=vI(q)@_wjAEa^!DO{
z4wXJ9o^_iQXU?=Rs@wV{_FkLUL<!-U;(zZQI`CJ0|I_&HbvjxXo?6N=9<S#9pvCk`
z{LtSmpS2D4NU{h7Gc6MSu)tg+kez#1-1%na6<?!zv##sSS3JC~$DlGYVvC@}sR<DR
zmPI>{f1Sg;<^6oc0*9X6^G=mlZ7uqA;Ko^v-Nk-qMZ<l#a~IoQT^Ib?b;sBHclH_g
zJ-4!WCiB<I;-uWUxF(nS5Bf@0=T045x6N+7*|K?Q(M$GuCBOJ+mwR-l@$<4&Kjua!
zBSD3x$$7miCren~vFB4cDjE=a&!*{GecJTxN9+tFGLOFdvUjT%FQ2&o{XbSgm1`G>
z`@eIZKkx9X{d-UTy^(un*Op_us~7M2w}SJ?ztwH~F29<g#As{T!uzr8sHvE>!{$!$
zwJ8flmA6dG{n*bK*7xhD(r%{X6Yi#bt^E6cfxdbEeLI7r-TVoM>Xp==sCusUI^Uad
zh*8L<KP}^5ODBhkgGxgUSL=gdRpphMpXTM2m6gtQO*^<xKKEjHL(#dF4Ox*t(v3V`
zbTl+4+L{-KPdrk6Ex-Ey`=`&o3LWmwy8m{yj&=BP?x}138$4OOYX?V3q~F{w>&GVw
zcm*7tPA&h@>Gkb2`_Js?dHE9;xHj^A+g|wCPq=jd&3|TIX7UFbi`?fVo-H-Z*N-bU
zP;KvhTqPeMa^!l<xm*9f1!OK?{CnSW@weBbRfVr>GF}kz5aZsYtfZLp|L0=ME%K^s
zHavKoe>3CJ-nW)*N7G*U-1qcdo2zwv-#j+1^T{5E0`JT)QgT=?*;se{K=iBs(-^<+
zco)0!gwA5;d07rtG8?8xU2@!)Fm1Avd5`<;jDRD%%eS1L6OnggTPFXu#3lMp2Xb?6
zWPBGhleo3FO?BnP<OO<D7l-d|tbf|RG3oTCg$nN<yIQVZBbVWkn`<MP7XAMHs%`f;
zlK7a7dzqzjc{{q~l7uRR{G(1to7}$puxG+CXWuOoZe3!OzZX%qB<*CF)`D^YE)^DG
z39~&O(dTq@`o2z_(X(cG&6bz^{{DsjO7qSaHFh6e+p7`LICr1X?P5;-e}D4-?uu9t
zcxS>SQ8`ZcGZN7q|5piXxr;8jVt3dqGPX_pch}#}XR=!#JUzA}cdPl+MKeM#y1AW5
zsang)70-WZdFig+4L409StkBnRL8c!`tALM9g@#4&2L!6dfy@CdE(>?Ci9Mz^j-)#
zS+rN~TTTl{CRgl4X^*l?jVgzw<9Rsrk2or(t?+nny2YOV)HC_(0_EJV53o5!I&Qle
z8xatz6x3jTCbc;Hcc%P{C)RK5p8S6<QZBbT!e)cZq*nhod?Fv&{4Pv?BW=_BJUDuH
z>@_|$xsV)B8LNu&DGNiM8@W8aANoTw^o?awYqRn6@c6EW{WI?6t4NB=>6aUD{Jb3D
zuJ>O0PmhVdd+asw8wb><e$A7)m!p@^DbF^!c)p0Me^rnsOQ?|R<4EzHr&if+<o^9h
zy<)GA%=M`$T^oA63!W>)a)nD@Zpeseo9lUTnLEQjy%K2+sZ;Z&YizNd<IZ&Q*qci^
zGs|jb9OJxu>GY>xs~p~J>Ac=z9dzALurTD{?Sn?WV!NM<Tx?40xaxIdzD?5homb8+
zUDNpTY|GE>v7ax*-h04oA80n?;nUkm=N0a&{Vk1Z>hD_J#8zS@F~w%%4c3TBjaTQX
zD+>7Lt)J>$zMPTimFT_&t#NZr&i`Fjyn5$?Re5o|##`KXzgYhH(Zl;c)-jjf()u5~
z;Nj^kF^*@;d}dae`WGiSxXk;>uB05|?38SrKR^7<5~l_Y_vzKUAO0%;b=#xk53eZi
z0jv1L-7>sR%|>wsc44iDexBK<D|7hV_KByD&bhMb?h~G^S{y1lf|;9yeD(Con#;bL
zJ@%8o`1R_Gv%jQMc<v>-e2LyF_asT~z1-$6I}CU3xhJv0<dns`<123-32`(oiVnWF
zwS0H?#fllRJ7b%_$6E!LZ{b|kH{&N?sM<+2Cuz&W&HdU|lLY%0$A8&0eOuLZy*{>W
zLdv#lS07x?ck-0P(Yo`>a(7L0nlCs>rE=`pbYiszTi?m5<jxh3y1B1cS=9etp0=dc
zRjB=|*wGJD0{31j6WhJu?c8^-FP!)HI-Hzwq(biZ!TC2{7gfvMpFQE&LDi=`Y)6`l
zZyh{mpK|eS<jHSx&%C9)zRhv^w*I}uEgLsR9jB#<%8XpIJq$%0nuQFKS%ZuOyVgjY
zP!?pJ;KrrYw4z5aG^J}5w_s0FlUApwn_-h<leVCUgwhemZb22709TKWje$xlHi!fS
zX>5qlVeRHnT9eXb#L*Mj(X_%P#Wks^qg$z4kd-kcv}=*Vq7zCwp<Oxw5gHp^g5SIp
zb1?Vt>=E<5Wze;ui<>1xFk&_9L^mDBBqKwYiy4ayF1$JL{ZY;#|65BFv^dyrsb9a%
z$MfXK*R^vd--)VhV)<ehdi0xyRMNR^9l!hj)kd!H`>gUo$=GB<(rHPlZ@#QwUo8nu
zTK=Nk%4XHK|3*SLZ8|(cLio8dEw9hdO<ZZ~B<Ik+aO<!3m-j1Ab-r2oPmR6(@Ph;G
zb53#|<k<5@tNOkqw~#^eXEFb_15f{W+h)((nDcBx;yFX-vqfC?&oXvQaOG!oUhg_d
zXO6yI$ej>|1&91DyU%*fQ`mGcL6c9Ta?PYA2N_o0cB*)1Akuhd65E+>MvtnxYz2um
zKYE?#vZ|(tbjfaMJlYV#%<2%aXrfP|s)GwZlapv@kYj@H1Z`HP5LM4JS9ly&O$u9d
zG)Tvyhkte=PkQOfH$u+MZiUZ}a<s9fG1*@`BHwlPGh=!5Is5z-)i+)z@pNShlyb<h
zF|Op`xPIw`$YO))1)H3@5?DWr{cM`&bXs+qX2G?B+xrBS@5LU;cK4YWvh+jfqHkVP
z@>o3HT)t#$nR<Guso0$Qqa4M8hedPtJ!DQ1m|V5)*|AHmA9ci4rpd)l4s1D8z~$Ad
zEs__ZYS!W?wdq{f2A7?j;!b9E0-esnA^|)Oe%%{1#Q3K5t!bZnardL+f43y|@9RoZ
zHWj+OsUWUz)$@(@=bT+k!u#fJaMPF>{`jV;_SC7WPAWy+OuNq8S4~V>DsQSZfg>t2
zFKy@M=pqH3RhRcT-`Lf`xxMY>*1Mk`>k1hDjpcq4?arRMt|wW|RV*q(>8aJmCkyRj
zeungBvtE31;95_*(h*B#<2f@w$8s%mY<VK9ar&gzsw1I`cRxO|`%Lkb*Qp1NM^Ce=
zI_{seY1Xx1cMgZ7a}y<dJvzg3R_DK7BeB_??W&mADL3`yGX=foXlSeU%Jl8H_GQW{
z&en!-rM*I8mfVUK%U-e>{p759lCw7X$${&N0;|J0Yu%&Ow_cpk9Ad#T`~F_V`98lT
z_I`izP4CRFu#4Uuj>#dhmG`nQ>kHiX){mP#=cQq+>4$Y<XBWm@%{(M5r1WTx^E-FV
znC&5ZTt%O`PT#GOl#=wIOE4f<xG-$OG;Q<0D%>98#bxH#&sH~hKF^lCc6aUfXTPVM
zm;GU@_)btnuwxCIL4fC<Ypm|GCav<nR&y==xxvcs#}6&_H1~Wr^NISb$&Z&!uoH4x
zu;l6IR-VLT2A7xnXSOX+KUgx&h<&wFMw4d`*BUF~lOJTSpWJ=S`*wBlQtM?)-zLu9
z(;{)p@y(+b=Po7lY>j`KF^S7Tsb#{iHkSFE%xk+j1-n_hHYF<t1VnJJj;rQhmojO`
zgcTKX-(USb-SX1+hMzp|9@pCB?QYwyDJ;F1V14ubB#F<tvtKvcJI=OVnjZb@Ue_eK
zw+a!J37tA;gDZ1V1$2$vU*-JPefRrG@IUrl?`-yT9+6S&<cM3Kvf>brYl=o=fHxQC
zBo4=i;=u;*4PE_Ty^Y`GT=#IzuIJmXd&M3;ynmvQf^d^Sp;0TV=O(FJSFiOd^PJs!
z;f?D3a<$uvz6oj)F*<4Ab4(42qfGARFSv5=<(V_v`81Doih69E^dLg+V5*|mq{|u{
zM$6<FT<5G#-f@9zPidF+Tl0Hovok~)ZiR<yD+wsHa1^9Eu9Z0uCa@|~#W6r}k(Q66
zsN#X<z;M$kbC*dpEpstYG4)t0urMXjdrN27lnf0gUsaBZ#V*=&0vr~%7hSjK%e5A{
zdTeKiX~t%$sjc_Z^E7?uO#E7Z_kaJJ-}m4D`@xm6n>k#~t7o-zl6lUVwN0A@E;}f7
z9ud))fBCQy^M!)>my7p4e_Xe|a^d}(#c^&*=QbR(b)6B%X?J+X?@gEf&hQKUekAZ3
z`^mK%53XfhAHe^8;+NCTzMPA?d(SJJ5ixIxbK#c#u>R$y$xd$*e7=-VkCe^v5=?4b
z>GbuVO2w8vDTj953VO6sGLElnT8E3P6c_6<V;>ij%_}NIW-uvubGEp6@1D%3_+jP*
z{^Lr|Dn!g8R`7^ibDmhj@MxLLGTq~ft3D>VooESKefrd-7NPh;xo38(Pk&Xf;z?rP
zx2U^KAjVRqOWc4*WT(er54HK;d+%4ov0s?KKK}5O@^FUfRyBW^Ula*{KfyeqiZ6sk
zPbizELa(fJQtagnj?;V6kE%cJjOhP*d(jkuxO3<JFLRIb@)bT8&GKzoT*5l}_U|$O
zm+Nn@wy3CkwdG3cSuNhje|En6e?;E*qV+F(*=d2FG6HvJh3@w}AHID)Z_I3gtJB$6
zWHP%5_nh@SucUMM?En2QWY3pgJ-qL8PRq@MPrbU<O<KEI#_hCszHwmFij~ukl&%(W
zk6V7bIBm~5yY_N!ZZl<BN%@_T*=n=cObS#Tj(2J5Jz_0-_l#$wyV;bJN3AWkO$&`k
ze$bk%)gAj<*rROMr3R6iOLb;$;A(PlY2Wz3g+1MI&hOP4IYti|LVY!suAKdJb7Wzk
zF2AAq%^Q!`=FOV7JI0Ge!-MItNWg`NVw)5t(|g+^&Uq|}S@zXq@m`H4KE|V-T3#%A
zL5eyz`uzT0c%j-hX+?|F$ACv6ixjf*#V-84f82__z+Yc_g89=;&)UQ$9F!Ekqs91(
z`S$On(N&?fuT}?{gdD8sIP}4K_7VvRjrGhQN<Qzr`=#K%&FxioKVSDWN8jo1-8DII
zcg)>S`gW^Y|NURiB^A3RMXKY&j!*;B*er8qiTg>}wT%By&OYB!m>hlcWbC$!nrCDG
zsdau@f4}g7VeW00193|4GtFN<vAjOB{@&Ayb^dpj#Tt5LOF5PaKl?r}Es<kc_15g;
zjni+=@k~<;Y_sLhGv9vKZP%ipCON*J%J(hLrbt$-zP#$gZP~olr<V3j(BANEhN*nC
z)`gY)i%!Ogc>YOak6F*};$?A)eUfhc#f{l(FRDKetTEXovLs3Ob*k~*Ev2_S9F6`d
z{hS&YuJ)}e(zHM;S1!qpqeDkUe9Gs5-w)4uz1Vzwo5r`B_vS7C+po#+T=%wv``MRf
zK8Bnck56sw|87`kRXfX_Ct}<F;7gjZ3*zz>Ej9m6(dG^;_ed)}|L=I!h9AeeHX3}j
z3Rxt*>&xZM`o~_DxU<EscbqQmE$RE}ZnU=0qwLN9)6J`{o&UXR|Az_3o!_mG>hEVR
zSzY|s=V)SA6}zKGMnTep;=g`u?+<P~vP5IeZKsD0J9E{oG$T4Q4}N<;d;7!fUzjI+
z-p9jxX+oy5VBc{;m-j*qjwLcv1rO^ezqPfPTWoypq*p7)qIT!bCz@}5nXcfwU>L68
z9`p6MOz!TR+TrWW?Z5xO{rg?q-6Lv~-fDmQynK2~$xHs~?>$+v$9`R~m^Jlvch0i<
zrFW0(y<4uFc<K6VtL-(9pOn-a+inktD0f>nt4qLs{qAr2zEVn+58miBtNhMvWPQ-S
zA~Wf?hoQ!IhmBJ$6&fxXX1rS}&$m}b@llhGnpNM`!;uGd?q)ssHzRV{+-saIN4qRd
z1?t>ds{Vg_b+h{JyuIxw-&k_EXMU1->|dXM>%tOu>(j~qPA{sx&Gxm*blL_T&8wnE
zR<OLi#K-yec7aaztf^`Twp=w?efSe^_y6-7p0B@CA#S#V?@z=o@5@WJ3iP!9-y!3-
z?|h=K(BX{x1q+I|3q9gA5Lmn<EY37;(t8&fw=)WJpG=XvS?nd$xR_H>eA0}AO9ito
zglVjLC2L{$`I$>+iKff%UFCIpvY(V+*0<Ru3)rvie1G%!+5e~K%(-e7Cii(>iL26v
z#0%4WgPbSY=W<=1yR<#-p8mG)A=`pHlw0i!v&@|@GaNm!x=-IRYPNb#4_nC2oev}}
zqt0DEBv-vhQ|<gqwWC58k61@9S>Sy2;j{}|AFAoUT7UEN-{rsd)qnVtd->QC!v&4s
zljbh|YgfARcF?iztUagp{o;>0ulO#c?KzjhnT8!3E(uKH-cg=<vj6`^*@}+6_VSbT
z;|w_sM3<bql4|s5u@76s#Q(pS-F<c?M}b*|-Joc*rsw+A3-?VAUp4=Kz=vS>wYgF}
zQj+uZH@($+dUCds_K5`1j@G=43#?5}T?g%At>zTSRkC#d{gd-&?i#1WsjVC}69iYi
zKYwB6majJ_N-(xQ3GfzV5^z+Q_|;H%e{$Qu%^m&E&F4Ow6lK2Qz11qc^|P9VW48Za
zwzYJ_#JsFS^R<}cZhY;Tws*D3jnE0kI$!5)Jr~ipGm87W_|2BK#PYa=sKn{>5AFQ7
z=)}Je!Ks_%nxo~}x38I1C1Y*3Od#)#V)~}^inA`(j>~rO$M%){JipzG>wAadgzB1z
zZs{KWPgk#R3Ar6ysUkQ>;hE3>Df|q7+uAj~`C7kQPG^_=F*&0^GNavD|Ig#eAM;|l
zPEH8Cqq-!(`9kool2wOxESd0N)+DFZH%o%M_P@)_zhxe^_;q$TpH%zLRkwMJciELq
zcM&%^&Y<|lDB3~ghRha4rcRSz^`VDL-h2%?d;4`|&&drdMOjssotqbTszY)8qF=5J
z3KJp>WOX#|y<fYLLzpo(qIA#nnIATP*kkdgo3}_;_b-2g-NX2X@*gV{4n)2A>1VCk
z=&&jyA)rNwL*tv4{`v66aP|uO8?&Z<vt8$Bn`p$p@n>gpWWr(g*g645PX*TetiO35
ze#tbmdnle>9P&u!T|#wxWwB)Ly|CJk(e1sxYL^50uBjLpCURa<=CC@sW@?e6m~@Nt
z@(JH;xNLQdLtP^lw4^we%v#0kVsoJ2=}Uu)Au}d>mWme01sWQ>H7?9n@@{qyZFzVv
zNlnITvcNNzl}b8(4xNkJiw;LmH^|Gb&E4E<m^<y&blF>rKJHvm*<rw?>D00;_0g6N
z0VjSnnGV%%2~7jxaDzk7cugy^z1ud;k=}N&;Kpf}4O66)S*$O;H~V)`*Ld4hzr+g9
zhiB?y++BVZcZHtok9_mJeDbQD7Y}|{IMCrPbK$uC@3f6~Po4@{Dcy43NRaDeUE$Z3
z%QZi(7YC)SxE!`h-Qwyy(}%9B%5;Pez6p9Kt#U(6<I#`&ttmUMZwQyUyE>v^s*Xy>
z!`d5S8@|MOmC672Dq4JHvg|F3H1p{x{IlQKi>4{h+QV>dwm;*ETdEH(fAW73zVh^=
zyK}BxSSlEO@56};i_STC1%$BFzg~ax^Im@a^KZUvG>WSZd@}t?tP-1{V2@1`L+AvC
z6h>wV{*Bfhxsv@`*Tl5${_*?Fm7wEm-bC3Q)Bba2_H7qw{`9X4wpVOloYLqLE7_0{
zzU;%FC1w}Cggq^~f9t2--NV-cduqQw-}j91_r51blg`L&JX$>KlI#T2*OTSEO+UFl
z(K~j!=;^c&mO19eg%Y*=tH14gV_(jFZ~4om-b`YiiXUyiUO(|lJnFTCWzg~c@3Ysq
zMDa`t{ki>SiBbB}WsBmLYe{OcE%WR-xJYX4lP7^o<8D-PIkP`W_#+@Gy!WR)SA{F%
zymM8jccd;bI%2~mqWm;bUd7hyb=>;8FL(Y#+*!>k{vcz{uAFyM?TkYWbN=Ue9WB1j
zv(c#E(R3TT@ZYU2?wP(@6c!s~)$~h!mHhlm{wW*VTc3n$;pxhzzPu{mn(tLCQM$IN
zaPpqG6G_|uOm3Q;zgOv}o%h@Kuilha{Jgw1N!oCFyVTMXDcf$xbc^hW(RYnK{pEYm
zzyDIp%<pfV|7U;ti={zpwN<T*-`kyR`@HTKtGU;oOD<hUYo4yj6Z!ur_~%-^CijQ`
zBMdHix!dMns`}2gSM6ibLbWyP6jH_Pj5ap2)(d@-U`tAzSui!>PSl^(yS%yg<!Bz7
zzFMYOq9bx{x8c0(|L2dsjeV)4%Uu?!b4;6u^~bi=@m)WT&Hie!a+7G7ea6%KhBt24
zJI~(RX=5mHSooEbtMRS7*N<;-ah1E*ywvU0*+ioQyeF=x@MtawnLDFF@z3=_ezu2G
zo^)GFWE_95mT9u3{eq)|$BeKNju7v_Q+{nN4%0)mmUO(@5z4ft*>&Ih;&Z?A`tJO5
z-Oza?-qv06>Bjn$C(@55Op>s0%Urhb$uax=)3SSdmi%A8b7P!7AM0!Oim<Z33@3!&
zDE+$Xw)Z>xRj)IL{#*|eKWINY#@a{H<MN(m%OWr6{^(wy8(387)P7!W>a2O~r@#L$
omlG7yDUkPONvmis-g4AKVUn*_Nwoa`?wv|=G&};YvF%|10H0RxjQ{`u

diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix
index 9c78dcc7b2f..7b6b3ee8034 100644
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@@ -1,36 +1,11 @@
 let
-  fetch = { file, sha256 }:
-    let
-      nixFetchurl = import <nix/fetchurl.nix>;
-      args = {
-        url = "file://${builtins.toString ./.}/${file}";
-        inherit sha256;
-        executable = true;
-      };
-    in if (builtins.functionArgs nixFetchurl) ? executable
-      then nixFetchurl args
-      else derivation {
-        name = file;
-        builder = "/bin/sh";
 
-        system = builtins.currentSystem;
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/i686/r24519/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        args = [ "-c" "echo $message; exit 1" ];
-
-        message = ''
-          Sorry, this version of nix cannot download all of the bootstrap tools.
-          Please download ${args.url}, make it executable, add it to the store
-          with `nix-store --add', and try again.
-        '';
-
-        outputHashAlgo = "sha256";
-
-        outputHash = args.sha256;
-
-        outputHashMode = "recursive";
-
-        preferLocalBuild = true;
-      };
 in {
   sh = fetch {
     file = "sh";
@@ -52,11 +27,6 @@ in {
     sha256 = "046if3aqqramyhrn2yxrjf4bfkl8x1bcqxhvi7ml9nrv9smx8irg";
   };
 
-  ln = fetch {
-    file = "ln";
-    sha256 = "06vr474i3x55p0rnqa87yx7dzf4qdfpfg201mks39id43cjm9f8j";
-  };
-
   curl = fetch {
     file = "curl.bz2";
     sha256 = "1v0yfb4gcdyqpl2fxlxjh337r28c23iqm7vwck4p4643xd55di7q";
diff --git a/pkgs/stdenv/linux/bootstrap/i686/ln b/pkgs/stdenv/linux/bootstrap/i686/ln
deleted file mode 100755
index 57ddcf8dcf735128f65181da0a08842064db535f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8176
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
b20$@P9cX+Dqy{R?08*y{<1j$n4&nj;$v&q#

diff --git a/pkgs/stdenv/linux/bootstrap/i686/mkdir b/pkgs/stdenv/linux/bootstrap/i686/mkdir
deleted file mode 100755
index 18c35db0aff1cceee355c393d09ead99f85ada8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9600
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
UPLLX?Fat;(c+d_i0FnnW0f6W55&!@I

diff --git a/pkgs/stdenv/linux/bootstrap/i686/sh b/pkgs/stdenv/linux/bootstrap/i686/sh
deleted file mode 100755
index 13e681ed1a9e2833d6c33405ff2cd362b72b74ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63280
zcmb<-^>JflWMqH=CI)5(5N}EY3x^2<1B1gih>Qt?0s}LH1_K)dD_9;Z+Q7oW(7?j+
z<O>4>2(y9&1sK5cApVmURt^xhU}Ru8Bf-GH29*zdT9N`{qGNUj1_l-e28PZDhHpbd
zU#PBOVE7W;{D!0RaJK`;i&ZfU3_$_^i&-*0xUzD*xZTab(0oK9`f%EW@UY<KHv*l<
z`L{829z6JvrSsQoHpYWa{M(pX50rk}tqwBsgyE&{pL<QFR&=m(ycXyVX6gL#V#;m?
zhSmcm9G&;N<yvo-zUutYd_*8RF8*+D83Wkf%P$uG|Np;Rp!If%VC$t4Uc&?5oOl@d
zryTfxL-A1Og~;gW!yv0!I*)Zb@T_1g;b=a=)al0aTDn`V+l}Rg%QgmvZa0n>Hrp5&
zIzPNH1yT1pKg31H9i9*hb~I0ChziSb7ZnarP<ZgS{$pTZF#OgnvlZ-2&dwVz{`~v@
zzgxQXcIjug=6~v?Phg5)K4V~D=yhY<Wy`?8@M7C8kWWf&J3qX557NNUdZ1J-EQ8yP
zl_TT3D=Wu;Q-@Yoju(f!7#NPbs7Qb!xcP{{%YKmFS^xh3f7!~wz;KL#p*MrE^TUfZ
z|Nj5)Jl-wwpH-rhm811`iQG459>!9RZfA}c1zQ;yI$yjv8OXrU>CDlb%=7oP{tf|<
zIp07+hdV#KSPNn}vvj_Au^7zaIPS~?^51c05ZNie5M-*yVi4JSpp<W+2*{EHC9E%=
zurn|;yQr|Rbi1gqbQ`pO<8PG$g};jmNAnS$=(zaU!=Si^IBP#Bh&umu%fA-vW_wWz
zax$Cc;Zi1OWWH`b&eHfFWOV5*R0{=R7IH+##lI|IXJ7zDIViqgZ2tTIf9K&H;NY=l
zDA9x1)Xn@t3}iersyRpw*Jfv6Fgy?y8GU#H$eh=F&A$^%IbQ_)|Nr0M_UphMB0;Pi
zFJ?tCFmxVnJy81SwaJU#|NsBD9w<>+xMwyi$A5ziPPCYk>||ir4R*&7fo4{aA{MaH
zZcxk~?7R^j1+}YNwq-6WM;Eh=K7UIqBLhQyhK(A3izkR>W~0F0GKYbIp<ddCfxo4Z
zfq{X)XA%PgL-Pwx8%F;2b_NE9*Y!4v{4F|+3=B4^rIjzeKnyMZ788(uUK@>)FdNO%
zq?d9aVQu~vBM_}y8u-!x#IWISSqn0q&Bn6c?zNvy9Dj=%NFSGtZAq++U8&aVbekIf
zmemXl3^sM8GB24JL80`LgOPz@2QwoB!^^)63=GaM9sd9S9~}JOv}P_VM~0vqE60l?
ztPBi>CwGB7)_LQ_rHu>>iyP*$a_j&Z@bWxJ(++M%28IS}+tOn%cYyd^!VSM{OC)yi
zfrNkA@wYB!U|`rG0J3BTh{X$H^}$ryl<@4}2dlI#t$oeDLy(by;dSv29uSq|yn`Ji
zWnEL6w1X8S66L&u6D*=u8nA;6B;w(`1C)h8_S@~?0*RRIU;$D3JH$Yg#tu;srMN=`
zL`m%s22sL0gg_L}4sj60x&ssp&Yj@c10|fsH#`Ci481NYJi8bK7#Lps+0MYQYtC#|
zj@APu>@TAH7#KPabzW#Z0#XGkpCIMV;cin<0o!`1L~ti4wRC>kp$!Vbx|s|Nki@(2
zMGGs3Ey$n}VapFCtS{DYWMDYX3K9hgw%+ES;-bQAd9Q@Mp+<$7p+xjW(f|Md7lY(G
z4?~0$UV{pv>%O4mYk99ku<;*AX9;`fhZjj385lb6b%Gs%Gk5T^FfhPer{~7X5gi@(
z^6m@<22fsxxZm*hejiX`<h1-z!rJ_qvGe#2Bak=J!@<Sc%huZ^(v7wtH-T&}<utt1
z`QgPcP(f!35)2Oy%lP8O%JJfOE2vHoFgyUt(P_{!wgy&Y?grbzZF!@Fy}3k%gR%24
z#1=+~EzhADtkXq>rS(85&khl9R*n}6QyCau%Yh1{1`FL%jfM(FhEgR+AhS+oU}*MH
z;a~#kXs%IVVJPJ|?xMm1a$|Rh3QHFgC{s=WC4aqAr7kB%8@&=fkPs**wj3y_eJu%A
z=EP*9SNi-lPs;&_ep5GAjveM8|1X}xz|iTUQqg*#B%n7(rJ}b)MWWk9rJ_p$q_OkG
zi*=$544ub2KfQRk6BJVX9f^z#4Baj&8mbH*7#M6B92gk*TYVWB7+P+Za5en4Dq)2<
z`1fm;?idvoND}$xqQb$*-}(?#P2PAR9?HPbd9+*fPYWwYgSCE%_(D($1E(PVmc5{Y
z{wpXY95Ou6eDZ(i{ZH$@-|Rf`Vj@WF_(G7T-U3FDKADF4|N12?$Jq7VEx(tkH&ig{
z^G`XzzwH3yvDcCyQP+lQM*UL0hH57L5)QCHZvoRTJ2zI2&KIw(8Z7im6}ti$8-D4P
ziZ)a*F_a3wX7>l1DQ@|_{OfDMmP;kPoxfhB`+{mN{oV>juwKIhFJ^85g+=LJ%YV)H
z8IG|tblZZQ)%maWe<@4neZy~^KVHn*0ZPoR2TBEZfwRqr7i<3f|Np{TkbwbbGInER
zU}(KvBKw-Vxkjaefxorr-~ays0sl)>crqM7u>~q*Kw-&LA{rX{ADky3$<m-1nk<`-
z)Ie&n2@{%sFqLpM{}3r*eVMq4fnkTg8!N}RLyV>TJ7U~eIT{`@m9p;0@nYow<@NBe
z;LhWn*Scjvm3TMrjoGXm3k^D1Id&DfLCS~DgS*PzK(+jX*{mFaLBTI>H8C)Be(e0!
zdE>?7MzH0bw{~zbfUCNfsZ9(F6Pn-f^oFR2bi1esyqNR<|NrJAJcpa#@IX?;Vg-=t
zppaQ8)5*&5LU<bk1FTJSxbs5isTZ05|NnoH)4;&cdE>>=|NsAk&GS(KrAvsJ7eHpd
z;pz2J5$O(55dhbzFLwX`|G&44A-wsG#Bo+o-3)3F^oFPi>|_Epd=7M8|Gatw(~CcA
z7#JFCW#_VTFqD`#+bYaq<zOh)Yqp&+6U5*)JkVgfd^U(FZ+K}3Nau@nYZw?Hte!QX
zO6E1|4p3wCg%-$Z6Bep;vT__wn*esi;j{^c2O#xy=VgyNwPUPcvyQQ@02%q>LL>u2
zw`ff(D@XGo)?Q~8!;>$zN`Z_771F(B49&I*ZLA!Ok_Va}urwcFS*+8^%F*q_(t4nT
z^<_&C1H(cKh+Uv|0LXmlZYP!(*+HNbSuYY82x`7EfXbBz|Nj36yQf>!q?47y@<KgJ
z=b_gut(WS=yO|p-k|BA;0c?J!s7xCxhv5NGr4MO0%5)y@ynLML|NsC0k2`^y%nZk!
zz-`FmPT;0i>jD0j4Gatn-MSpDtQ^N#K_p0VuZxPvi=|sZuBqg0e#4W|07|$a|Nj4n
z<bxkCG;A0cI*)<lqx08`T~;8ar2)smEkRIh!5UAjFU&yYFUY)&Tft?HMDq{E5@E18
zFP1@tUQFG}z;KLp2`Fg6GMztOOar;gMMdI8B}9=(Cv#^pPbb)=%|~Rw86<52sD2aa
zJltEN!t*-1vqVLpo4NUiK#gzn50N_d<{x79&ab7roq2YG5_RXN7lyiEH}G^juyi^L
zyjJUW7HB<CBEJ*V<m~+PLI@@uzyhg>ZoD`Tis)#T*4w2En~#V@$3glLoyR(_g96VK
zRE{z<|KKZE`>)bE#f_E2@b=D*J{FFbrx+L*b{^?x;dq^CczdV7Bo>aB+d)2ZW7!2x
zirfGH|8ID^*%p)z82G0ge)$9}%K=V{-EJJ<V0htJ4lRI$JAXAlVgmIR>Of6hS&%lv
z122{qF)+Mb1+wbR6c&yKTW|=L_&1;a|NS_~ni99yPKLL4x=du@cx`QXd#44+K}Nk1
zzdLVTeC5RnGZU2l4G+K_bHMUONnEonD9tjIhQ8J`yxsY$^TYp(uf4lr&j0c6|9_YY
zW2nYb*6uQn*PPvDJchShzm<p?-rmX6%fj*cP<I#$sDE>Vmx00Xb|=K`w_Cw<31>4e
z$R2^$LJKA4f{Q867q811K<!u7=I4whTsuJN_C?3<|No=o;tzw$xMQ7{|FfEOvT`&(
zW-|N_cTy_CNhQt;L54Q}U@Dbf2+9;5i$P@Tf%>@PtRNXs5`BHtqtqW&)&WV@1e`^i
z?Kn#~S`R?7S?hsPxo$U(&RZ{j{{8>I8yt7AK<Il}49YpYAa`|wWkAjawOyLuD0Cj~
zyx!}g!tsLFg@K_rL`9-AL`A0CnFXAGUd+(~HMKx73UXF=F~@7O?l_LuTHP)x65RnT
zoi|=gQv?M_i73o6<!(2g&R;Kz|Nj5~TD%*aIxlsXv9x|G;e;wF*$cMst~01qR{%K$
z*3OaXJPPVfb~|twUV6>!1nw#Pgp}u<FJ1&#fSVE=-L)Le=l;J0wPU;ES(>dGN=>_+
zL5)m3P#?Q0jDexSf}vEg`3+CEGe@@r2fQo{GCbKEq9XHxn-65O0H_-Y3YTVkh7v_^
zvEsK8<d;g3&JQo<Z)9MAmoDFa{{P?Y%hDYV>eg|*NH+s1E6u}M&))m_|9^9hiUdOi
zXE&&L2?Ck>txf>k=<@|NI6u6w+X&9?pdzOZTI3i*g<dFuEca1iVeEEi0X36esQ&r?
zzx7)MsJ+StQdFV>s-h%b{M^96&~4xPpTG4JD23IsFqHCjgCeuRl!0L}DB5tk(F){7
zcv%H0lX*H1cV26@U<N0tAE3Un#qa<BTmP2|em@4PN<mR50jkPMJRq?GE(tnsyx3|6
zYH@Y`?7a2D%M=_q);KLb_~ZZo=5vg#|4W#gpZ)E2<}keUf;XRmq1&0I^V19K-~ay`
z9%%hv%HH|n#V!-9z7U0#;5^Vi^~+q4nXvvf#4kFX$2zZqW7WhF+$&M(bWzdhj$`RO
z{#tIQGN`2pYFmJYR-oyUzZG1rgOlt%Pz&@pD9tk*X9a~LhzZHro$s5UGj+$PsJu?-
z4rb|g<1sw>;$jbYn56U9i|Swh|ARAl>wywGEScN@DI3dqlq#ZTav>yHHt?9qod4i#
z3--ur2T;1z0aq`Owv0umi;75Rh>Ad`j|vaCLDlJ^V$ut$nz+_Ni)S}*1E|wQ#Q-F}
z7}Of-4pHIhW?BqtfOTE~H32}q^W&@wKy@6bsCQ8j==M<&`5(vvPD3x;${83I+O)EA
zbUTP}f`enBNGmJHVjghKtkB8|uDH8hR7}8T9%mH+B@&2924EXIZ!{mVhz5^+G`|Vx
zbWs5f8*y~{sIc_bsF>_KFq@TQC#bpedFjHExvU(WE-F5~E-ErFT-HE*!QToR=z%0U
zn14J#D!`^6X9Z~jMbR<VBOp(7yQuK|XZX(wYUtohh!)@e{|99jkHsMCLH#38P@I?z
zYHggE%?j$>G8|{U02<u@)oURt37~4uMTMvN0LzQXKmPxRIOjhv$QF=|FTPD>V0f_+
zloni6d=`V;v;$=Hi)+3N4EsT>-VzlPs6V@1R6M|r$LYQqU;qDaRs~fFzd^wl04gaV
zX*;IVMMa=9M1`l<MaASrh#jbm1~m{tA#mJ9#RXKo9(PgkxZuXh(d(k()9IoTaNI=&
z)Olp+bx{fFbWw>o?xGR`QV(j{b{BCNzU@5zTA@2eB?8jm_ysBhRTvn$nO`%zLJDGV
zDPDS~mt`%u+IwjS>bQ0LsDyMLdd=1C$kNHwe2Ar+v-M=@CvXMN0Bz%zh(TJM45hrS
zZ|gX_gZ^}esEE7<bu>jlE;!DbGnbVE<Yus2oOoUw0>w;-ia@s$&n{5&=f%}LaM7=@
z5Y(#e1l2tt*&>$L`rR=q0XsqN=?ziw>HP5GwKB-f-4UR2Q=;?63;kAbam3OYqap$E
zz}W`d)u1%O-_pRqz_4%)sGWR(<;A^d28LZRb6GiFRFp9=bjPUpyjI=;D)clzu!efF
zax|Y~1T}pFGQetVKx(9$j|jBhF1^_uqY{FlIOu;d3sf;bvSP3u;Ev3T`K1gDt#A2T
zu0wK)MDqbwP#FdCU-P;D$6ZuZK=y;WG$kr3-99QNy&)<g-Rv*C*}+vuNb?ba<{$t0
zTeg7)#C|aGw@w5x{{1iI0wu2Q0*>Zqj3Acno=8@XQm*4JDl#AgUzghUfCSPye{_ea
zXmp0CNHiZ{=@w|cR1(}^rCVyy<;B=?vP82timBnJZYg&|6%#`#Yp(~(Yl()R1*Q63
z+@P8>GK7_*<z&fG=hv?~54N5xk?1_3`QzXZCe5SGJ}N3Ko#$UVgZfWkf5?EMxw%F~
zfuTg(uT%;gtS<sT{RjCGEO*>RMWG%N3JTyN=Vd;q_3EPH()@#wzr}`;fuZ>a6MqY6
z{Og;G3J)WqCQ5|lLU2t4?h0xefQk&mlc2=(Vvimu`b$(gZ@kFW!&aH_w}M8<z)fOo
zJp_?Y;4;Ezmmp}^U{M<bL${BLM>nXM^y5W5FPQ7o$*Tbx|2<iv(E6>Oa~CLCwZ1Lo
zY5vQ|KmR~?h>DEjq0SR8QbC$sR6II=cD{Py@C!6}%HPrf^0X+ZuiE^Jr9=<h0c^cg
z!q@zZwUiIm>SS$x(eRoTEC&vp)=MQUt>5bS!F~pphA&K(gUSHVcr+-eVfCZ#i;$21
z|G!r2c2V&$y!7HRXl&^XPq&Lo$o~=*39v)5e}OvA0<8y1H+F*x-1lh=49ztvA`B%0
z;2;#)F%i_i`p^olLrq?&TY>7J7+4(yo&pf)y#8Xk3TV>f#R*H$=>Kb3!%Hs;KmY&V
zZ3?P8J0HCGV9CG$t!7L43=h1xk;=ee`(rjMN9olU8R`rSir^MKeD(s|cVg+h*!+XB
zp3U$8Xu6?0iUl;_-~$=f=`G~wyzxTMhJm45uK5^C>+KRzYgU$4R*q8E7Y;U{;S`15
z0LIt1;ey&=K?VnHR?tYw3mq#^BH8u+|NsA;H$bC##^7%Dgy3%3H!Z9jJ5}0PIbQ2@
z3%*wDcH&5DJy0T?2CB>jyPa6RIdCwQa<tyAV>#x;#n>&>da3kw^Ffxzp9|VpIZDq&
zABL3CJe@8oES*>Rw+S44#L{{2H5+K$=#XO<W6OckFO84>*E2Beln1p!E*M_={;}6&
zD#*%i88G!)q}Q1n-0<775S)HN^E;p!lozdUOH5mDml}eHuDWYfSU#=$ezDh)`-Qb7
z$U~iMkTy%&aR-k7|9c%EhD=__z|d*x(8<aHsz)HR5Rmo*2PE@!i-IJ(rMj6rnbMl8
zIlvPoEHBji!Gj|XbI^yB5c3a_(a|qIy!-z@A}Sg*_F{PH#lL@`lwHD;)?C5CSjyUb
zgy;1%(8vsUj;r%H#KL_b&%QQ>gl#FSWfjY79&iAQTH1obzlOJ)sgt?$!iyub85mwO
zbzbfkZoO1`q4^j~<3CU^m#}nxe*GG?=0rFOG$|7O4$>*>En@)n!&y2HcV2+l{o)JA
zTgSker}M@OKhV6$VTfxvx*b?v81^wRq#bwWU}WelW;y1}g*KdquqGlp?&X)a|Nnzh
zCp69>U5(x<*3QF_5**wx+RLxbz|h6sC2Vn_M62aMDSN{&t5WIL0yb8qqAiz7I6Cil
z=csVJ76y^7o%dg}K?GVZl^8bsQZ1Ef{Z=W_>&&>T*qxQ*#UpzLhURminHQGs5)}@^
z0}a+z{8J7vx~OnCyT6{<3=ThrO0L##6>OcRpumI*Rd9BG_<rHw4|&C-oiASGgS-uq
zhP9iU--v+P6}>Jh0vQT-SvazIz|G`c7LlwRFHSE6<$D>>SRTZ$GO(s+w?^md*0-hH
zh6i9nAI@FOEeA?CY^+LHY*b4>cHYo@0c!EV(yYLzb)W{Q<|$Ck^P2UAjX48DcZrIG
zr71%zD@W0L$Y7`C>k_`scilcJJfD{wW7qGkX9N}Koj+b2od+uFY&s#0&IW7MQW57)
zSrGp<BgAGF8>`Z<4c1nr+`Y~qT_T-KuerKQR78%0r*A=hSEy58s+ch_fc(?=1~khA
z?tY4Np4+7lD(zL~f%Bd{s0(-8fd$-Ee8yCw@S49nL`4KLboDZW8Qg2O=zQ@)VKGR3
z#iQ;T6_MkhiC~78Ud#*(-90KBKn)F0)1~<UtK~s(@9IFOi;7C?fl{&Na~!+wfJTf@
zywHbO$lQER!SGV&ix-=JgXZ#D50qGR2XKJL8q%77F_s7z9!P8c#l%15fJgI#7tIG0
zT0fNV7~Tf87eIyoYp#ZBE(ZP<&{$6A8WqswQFwT7i^>891_sP{{X8Gsva$d*We$|+
zf(keOR&^!@hVREfX}5&$`!NO3tXqpP69dC*UT9k4?_*&C4<##t>?)B46&g&X+zUa;
zt<yzC=CvSbdOAc!2HeV%0R<hX%>bnpKyAIw@6FFyI%`yTUM4`QdX5+6#taPqT~s6%
zf+Dl^K#2n+#ec8?g=>jGbB&4y1AmJqBLl-r&^%#tjS3F~f2$-T1H-PP8LS*&Z7&Xi
zRr9xiX4*il`vwdBQbSNBY#E{=QLoP5^OAvq;pJRL28M+z=CX2tn-$kU?WP|h{H+&3
zawkC3(jh7qAl)y#!3A)|Wl%c`IwR4*z)-@qgBPT9AxNVw$hiz9fw1(=0V<O_PrNu`
z3~r`zyf|&ZzyOZWM?awv$__4XN(2HyL+_y(PeE1e#FyZv2FHs6BL;?-e?TVJsHiZM
zih<J~C}tVJ?T!GJm!BD6b7PQF?8S=?u*slepMjyfMn$5tg5@PBMR&WXD0G7GtKJrH
zGJIk8=l}ms7ZuRJQEMBhtiD~s(+skxg!RQM(3rq8#uB+*pcXYq?+fu4|NjRCgl1?5
zuyVZUdI4@MKpX^$%-1<!t);?{907{g?iv-1&MKDIL6FiG=D_DaKwbwqkO@4y)9K8D
zT6`nTMbCfn|39eU<=^kj0W!FgsoR;Q(}|_=2*^v|rUxj`HopOlAzuY`BEkIvNb^~u
z^<)WW=daEeFE(U>=lN&4fRm3XczTP!MS+olVec<DR*sjTiB52|T)qc#TkC-mU9g%G
zzJUM592tD>tQ;>vv%{Ugb|`^L-UN_&H(u!8`~M$2oeb8?5Aqi{I7>wN_d9@kt^(a5
zDxd*%PyzW`3NlL}^S?wzWhW?nI$yl#{tXL8f#x5KC9$A(O-AbhNFTR5Mn$CaUGwk%
zC8C|LKt1*sJ-`0{?>zP*(tv@%yYe-}iOM@P-B~%BYg9NGN?CV+rt882GVI)0Il^Bo
z%mkIx0<Tj*1Ea4kAnJ8Hf9-I0XXSXU0pZK;ig9P<07c|C2T(N)o~I2B%18yN*$oc9
z!b}E+*YZ0+&2oqy{mx%IszCt}p2@%f7Jn_%&2H_^Qp(r)3(})Go58^Fn)Mh1*MD|I
zbpV=2FueU*sQE`&DQoj-rq>+JKgvp(n@=<D=l~h#0vVxy0GYf5tyE!Yy;RBuS&h)^
z{U1E?5FH);lKmfe?gbL}Je@~7uY=bY7=C*#+AT64JSq-W`{Lf;|Nl9UIa|K2c@An)
zLRvh~xm1}QYXez1UYrNDm%!7cB_f6gUL<@6cSb<Tp5f(hP;m_!64?uCrZihH@VDLs
z&F$uQ$1=Q529<RTrBU6*EXb*@*O?oXt3Xi?j<oBbbaDK}5<Lb6zsi^0qM*@}&L1yi
zG8h<k^tiKffXYo+%!LI&CfQD>gJTXn?lZIbC`;pCP+O<8^L4J_rOq2KmV5=btYo?!
zz%5dKaD#~tS|V4lzR>yh|9|rv9+;~FzyZ?vsq@AQDNw#X0xCcS{zE2cLH$7JqKwxp
zy(KCFkieH{y<IvPJQ4yO8H9!P@y^SgXAQq~zU;i!`Qyd2*$fPB&HtE6`QQ!8mr|2J
zEqqXs%28_9dE+&6^8uD-3x?7knl}#qVCrRQ1yv_6rsy#+bRIm;(C5y|VR)&VMYz*N
zkfr$$%YKkR>w(g@ou^;Vf{yAT+8R8aEGnHLDjc0>4NvX@RY#B><oYrO22d-zn?<Et
z0$gWz-guEWje%i5D5JF=DDm$0QDNy80rmbs?fY(9kn>)9`c|qpLkjIuIhcwMF9bn@
zJhC7a&A*vSSet)~lrnYx?)>oLfer&h=Y5bR0^ot`Ki@$4vGqXdc5o(W{?AmxZ+M{j
zKQE+4ZfQPH2kxeU3(?LWFRncL|33f}sQ(SX#b_4ui;0i_|A(eWNI&6n=h^NO6@}JI
zCE>j+LfxXEh=1{4544B`R8cZDKNAG?2f9SKIzm*q`S)FFy;LI6`mIEwD@2r`;TKN{
zYr`+5Qm$hRjSjC_TK|`@cZH~McL+E*TAnUFwisj@EKp%%?Gl|wJFj*6sEBkPH@w|^
z>VN0OjvJrWb)NcusW<BX{}L6E&X1k9I$yj919y?2?In2M=2++T&a=B$w6StD+wN!s
z&2rj6%6rH{s<ogXI}GWIECk7SO5iN*H$M9Rzf%^hsF<a*nxiutHmrL%4ZIeq^Drbl
zc7S63#VcI~2C#>MGp4z-a%3q4yeLj#U|?j0cv1q^{{qb=Tz}2z-WAH=+VIQ1#H3!h
z<r06(LeM&xUt0XFJ)ku#S`ELVOL7{1#qhV*FfuT7xiYjI;BP5pWMFW8nF~^B&rrJe
zWjTo7<;q~ARr13orbN=lzC_d}x|I7hKgh&LMg|7=E^&)PrJ&jB7cXid>!P^8Y4oKn
z#1zQFBlp*L8)_L8OL#h8z*cm;=I(W61aUw)vP--pL`B#gWGXYrIRYIaD$>0LAbIed
zDE~ee6=6_{Z>Uj`W+>(8a%FgVjDdk+_Zv`&QllarUF!T=vGZ2vhZnnz!FfZZ^*{+P
zIPC@VfU45h{LP028h@|xVC5*iZg{}(QtJW!sh}kdoGvOnt(QuKI<LJB1(_aG%HAag
zvfi!1PPf#cH;l2%jnO8yM9n6ql({#Ismn!0+QLOexJIDMMMc<(sU9?(2U>o_&|Ad#
zTBs{TMcN`nMHpP#fQ7r*I$Ttw-E3m{TkSwOEkuRGGDL-^M7Hzm%ZPvf|94!lVCQe~
z{rCU>Yc9hB4fYKDQx3dlLewI#bPFo?LsUS09|gb8^M<!y`**Q-xTtV<{sOlTOV~ln
zB|r*XR1{u({QLhuI46j=9w^oE12<MmWW6heJ3km+dd=u$`J#-?qrsxF<ZI{UZ-*I6
zn7sY`E#DQdHT;HAZ}4<p@6J)t0L_qqy~5r3sr79M>oGQl&R^h`QY*|ZG0<Eb#43<a
ztQ$eyGtfdLZiW&TXSde}3~$4WO;8yJ>7O2hW+eU=&?**7)(vf}9QEd}(;?YvAt<YL
zOT5_9!@$rf3*z9+Pl@+I)1M$E45f!GP1m%sa@6r3X9Z<2P$TkX69cIK1mc3!bee)J
zdR+if020{+BD$Gc50r3P7O>QU=JY>yih|U?wtzYY#OY?}mUyAs!@xi&e_y=!|36p_
zs5aPVS-?@p+*!a85giBeJFI>=3@YAtfs*Bm+KCJdoh&M#DQwV0HE1~sV<}tbq0W1+
z{knBjH19&%*)}SmW_B-&CP)EC2`{9KcyU^jf#J0<NKBxF{e`Lqs6Fz+P6M<epz~1c
z+Y)Y274||i9kdv&J4S`$`{m}xETE2e^HZkRoHiY$oZm11XHn^V`P$GXrj*6-<ZD@*
z#!~VBEGn%hOF(TCo^BSE1`E)#Af_0n&X?UbDqZXyOiu2dHY#9t%Yo9J$Cwy8KZD%B
zQNq>h#0V~~IzJ;K9Xu8SUhmt@3mT4E2r9ddIs9knjrjMP(YwLAt@KytEyDw^867N7
zm9cp>ST&Y>UBOtw_Wc6m;nxp3?`fXv{P5xkD8V^1cDShUcgliHX#HQp)$7b;c<IGb
zP)o^~>BZS<28I_qe*OR7P@}@HR3g+XVqka@l(a!>gkS1I#{OXQ3XN~hfX1VagC-U_
zFEl?81oh-PFQ|gXGeLcb<1Q*9k3a>@BbE|z5a*#gD+g#a)&ZQ$MIN}bf(ii@P$~ln
zGx4`<2K8c6RCxZvI;RcxjitQ3?u_4ERCqv(tV@|Xe>7Os@waw@tUd-B7ifOO@>;Rs
zcSlKOJx{~$#*(6j-_4~0uSFYv>z4>L{I)6uwGP?cy5w4Jm)<zW#sFT=<_%fub}|>-
z*0*i2U?{QZkn08qi?%E%j6ov_%?|~4WyP^_y!iR!|9?n=(FU&)Gd$UO<AnmK5B2>u
zQ-@r)E+{y)bwT<JZ}+mugNn`<H~JVDdQF(SSj;<IRD}8Wfx7S#tp`fDS`JjQHvecZ
zWpr!(R$|@F3)0;Asq@E+JauSY)p;1=2*?<?7`SjK<+prY$8C5LT+1#2H5c#p)|fLk
z)Tjtsm1uz|+Y(+7#lYX90_uFLf&$f{gw6kD254m6M}^1Xzl(~9e}jD;e{1Of|Nmdk
z`}hAps5ovuP;bM|-|qPT|9}2%2mY(H9)NTfR2WLFz>_7ret5BRbpCj;v>Oy&rK(--
zEH)h_TsF<6QVsR29i<|@?x2Aao)=F*!y6ThFJJuwP0NDa%|8X?aTUYc%{3}A4E!y3
z|NZ~(@9g^W>c9X0UBM0V*H1z5*!kndGG@>e(aW{}z>RAOP{LTaq>YuMJA>u8i;6~C
zEVv6J0a<jYkrcxU9gpmtqp}8+9&Ws-08QtZf&x_A6cihsA6^uyFfjB^QP~4h@Z!b#
z+n^EL7ZX70=BOM14X3xL9AN-?t3(_!b)wPjqhir{sPo2)E>H{kh(Plmux^G5-R>4J
zYbPj)_lBtGyqGZ&G}FLP%iRoaE3%Z_ea%tA)*GXu^LkTv3)p<nI;j^r?F<Z1&8-J2
z#9kCk1oJ^d2QOH}7#J3-bh2{bETZ?_ge5;n{<l0;#@p-kzoF_sS1G8xecuUg0D_kg
zlyYmH0_E8kjo<$NhlC!(Vo)Hy4Ey{4zdv};e%<f?|6jWQ{r|u52q+7Kd&uzhN1fMt
zT~t_J=qZ7w*m=NO7lMKkTq;3|eNe=7J9F$30u6h8{QdtwxIluAopZf-uL4cR#~2tu
zqe={5{opx_&QC9TLCxXAU^}>!Km*3GwMdY%9o9$Z=#Eh_Sjf=|p4{c>HU)VBX;qi=
zpXMJ-l9#?;YJMcp`Qt?nnj=_WWT}8g^%)$%&IYG1QLtfPgTM~z4pA}bH4$k3%~GP?
z{F}8j!SH0~r_L8IOmZ0*z#i)Sq<M((0@#4gPvE87t=~$d8tj`(I6FUpd%&;7cCCRF
zY8C>etYD!Xvp{+04Np)&Xs`Q!%@+X~TS1-H$JhV=@2&pD?4rT}8Z_<v+FYYz!%(8S
zixZSCKfF)|6(&b5Ka>bVtOiY~m#CO9gHti6m&gn*ctAs-T`npX%?}!E7$q+?Kl;;r
zhz&GA`Qj0%MEHI2ck^>l^G_sU6$^*ueMmw3VkHYl5NLwlGx&driVJ9Hq4QPehyNie
zD$Pd(KyA7bWzdXBcZ`aJ=HbqporgL<yb$UD&EUxWKL(A<&O@CSV6A#s+sX%2^fx~e
z1T6vL->1<Vz}Ok0V$u1k`4K;Ok-@9RN1&Y28KR;9o=%hiHCkWGfrj=#NvNTM(V<iT
zv{(x?*Ui8`6;x12fc+1dwb8r)8WREU_vm&}v3PN)gMq;Tv|<4?d*1wj@!$hcU>bD3
zXnw%o{DYZ)%Aw{TT>MiGa9(JBzzCWeEdfnpf(k>1*Py8lndVbWogpeJoiADrRPY>k
zQPBaFA%_27^K{p!7=ZYoBBnb;#iEPJ#<E_|#(=*Uv{K$irNp3~&qlGt-bR_f)eO`V
z(6iCvZ)pWBbk^l>1<kv@wz9D=5wvmOZv~ALz0O=XWhN`fYiaPxtJfk6K|XxVyRc^_
zXk8e8i!37p!wdh<|Nn!x2tcZq9fF|jWTgn|@$LfcFEPB`unV#Zj;pJw!-tilgVE91
ztNGXe(&wGvO5-J{$JF}2RD3_EtMiT3qm`9Ip_Fr>Pb(`2|Go;AZd1_egw}76T??H*
zI$Tt|4R61;Y(B=)?W3a74JyIpKK=jSD<jct$55i!`oBch8Bz!ubo;2->;lDCuZv3b
zi-wQ?|2H2I=w@p@P<rrnFgP|?8bOVs)&mv6)~q1!)qA%dC=msBV>B;hANbQP3bMVM
zMc}o-LeK)<*Pz8s7B526z=bWSCk=7IoR6U4G)QZlTN7Lbzh-Ve{T~#qpaHMu%b>+k
z0?ef>-!H#rZ>~`hU@Fyay<M3LsvW_ZprP>)sBzHjqr$_)4O*)LTILY>{r~@$8j!JK
zf#w%1%|95+-CA!~nq@JB{x4Ahjj+jprz}0XT~u6N)IkQ>K+Q<daB1_?_n^_P7yV!U
z|9?6AFLZrYY5Ysj*l+9YO1%c#O`uf)C90rRU!VcC3{b}ZU!vjznmzT<c2Nm{X8jkJ
z!MX*wO8Gl)wBD{{GCTm8XB7hZg|So(TyFEXJO))p;DQ{|$msS_Q2@JP`-lJkUnjQS
zu1Epr4QM&b`l4MPsfg=52C4BtUW5Cu^P}M<u<sT?nr@)YN4;+UnOWflI@p3$pa1`V
z-2!$^Ndly(1rG*+R_O5W698wq=3kAa>|oaG7rjn3pwQ%Ky<Ksq+wAp?=3h;vQlR3L
ze;-rx1AeE@5ET;-NI#MB;Om{uznV+8c$RML1ed)aLz|EIfGZv7yzQ|a;K82bGT=GM
z4=>tOL0hd@79MD0<>-{?lm*d|;PtAIIwGg@Sm))=>xOS%``KufxY*d2IM_s&YV>+D
zHdHezmNNHxGZ`Leu#5q9qz-m5+US?4wj3x?bZoGUEq(S{1k@#Uel299U&`0|wlu1@
zn(;O3UQkj8PY0E*X?<Jj+AVtoWcf$K0}WPSa}ISebuczqF_f@4I=y~rd9OscH$;V}
z^TvzRPEdO0?*Q$5SqRefLjC{$|1Vh?85k^o6$_ylz~<)k`c=0mNYxI|o(IcoCE~qK
zjF!hrxpsiI0W?_Ym#`gk`_IsM;YDgIxJS+cN|8Gl7#OTgLE1`Kj=BBUZ?I-4<?57C
z0lWG&=P_mm=S~?F!?&Q0FvzvNBJ5p4ppl=~;SCkSdZnP9F5G&hUcC{*-~l<#_u!#H
ztJb$AqTufTf@TH=h~u+BJ!(bJU=GN`y^)MgEeA?iI&Z%IaEwtOGB#HJ@Be@3l7Uk2
zV8M&Z7El;Kh5}#sfH-eU*}GX(jye3-Z$6R(iEBvQfyS>mI<GhXVyw&Pyn69(=i$y*
zh9_UMbl&Wi_Nx4O925@>ov&V;1C1jc(|iwJ(SH!cIow;L!tt7=^M2=H&?;PKmKVpG
zK-O0Bbjo)#w;m{c+G+e+pwk>wNR_a4e(yZ?`g*4vXjTS&EK3JmJDu(h;OP_vwJRXC
z4WtouoE6lc1yxT-Z5;=W&QmWqKBG2tSYNQofHNStg#gMu4E!zS%na~F1K%aVF(`7J
z6_kMYw6Su0JIu)6vWW>a@(Jn_Gw`=$F@pCeYRm~?<$x97Jm3Pn`2Y*33Iop$x~Qmt
zT-6<-qSEce(jCPETAl=21OqB~T5p$vraeFla}+?c0gQ)1D|bLXc=-Ul$Djc`q|j@^
z%)d{s^A&jTp`sBKa{Mizgas~sN+mj9?EpFAMJz-LJjw&=(OLd3l>|54ON4ss7(0K1
z3<pKh%Vy99N@fN~-sJ}QwSuKv6y()Tro|wtw~i5Fc2swciU?>4By%>0<@;i9P%;IL
za`eiu^Y1h6`~-H=(*}@}O7uEELELc_%r6yz*e%{$4QkhbSO2`;4a&0HdgB;hGj;w3
zm0+NNVRquMJj~z33mPnv>WooQX}!(gdJ4466|}Opl)tk^1+)lO1k~4)={yc`c8CN6
zLnoTE!Nm@!W(AFVfcyc9xo%Ss`SJ||XrIQ?*{mE4{H>s=QqYp^4IZo<FTR1D%ijVD
zm2O>-Hpt)yNP#e@Vt0HGs^+@uSej4%H#`6yjBxyK%fP|FP|LalM7>xp&cLu3l*v19
zy$}X9XhG~3AFCJ`tm9Zp*gJ2$cv^+Nv;t`wY{uFD|G{pzd{HV1W^@{KyRjHvdU5RC
z|Not)AUD0%fq1Ojm7((>WYIKe0p8CS@t|owSBB0*;I(@{I>GVSZ3fzq%JcvK|JQmA
zk2y-X!L^CVi?VnB|3ku0M4SOM%P7(rfExA9wxIONP~r&*1lVwtY89x#-+H_BGa_>#
zG92#y&zb-KyLmzGhZGOpqM*oVy;Q=}9it)un(Pzk^k!*30$J(`nm_8i+zD>(8=f@0
z^n(2lsQUz}@*sU}&5NKlJkc+eeHa)fOqlSW)n_Iv$A4ZI&^8v(UY+3PH!QG~C*7i7
zT39(2f>d-m@hl9O$;#2`B(M;qw$n*u;fEFwpJfMV-}sB?psi_#Av!t*z)NcW|3B^k
zPP4}yKut7;#URr<Z9&=%FEyY1-*Ewy5Ij41K^7c$26uUnvw}<oWiiwML98T+ijIG|
z>h%Br5z+C7A^kR%&SR~YN+Kb46X#k>QP8#@uzT>h^|%ArP2I9!g~c4r)e;P)ygL{{
z8#cd-fU0SU<KXZEl{d#(LE!^o!Tf++Z-d5SFN25UI^To*-CGD<6T1*(dUJ&gLy61|
z&>GJdb3jHPgm|ahNv4yr(@W+xTd#*gr-uwA@Euto-gM;XjO1y(UBce%&BNH4DbT44
z3fxXpP=KO_ALcUfv{Rr~Eo8b6JjMpva|TJV0RdSI;V%?H+r18h*E&=RH9uo2RSgaf
z&)5RW??NEGKRD~zUrewEHCvjWF@opL@<5d%Xki_;?cQHcf<_-e18C6oRA7&HN60`d
z?G6TwsoR4+*yZrwMxlhohO?BtnfDK9d2zS1fVC4x3G0jdp!K2NJl%mjpkcRvosK*W
zkC;k0x*b_wXdL?gzuTE*F(?eWojDeRLje@H-NKy#GR+4REDwVVk~wAQ1qmW`f!1jG
zoP?~=0_7!0+(TUm+Bi|c`eH)^XmkKHn#J=XpbR`{stX!qs+M6W{o2h8N#-|Rn1Wmi
z&OzNyJYdIkI|(cXC6aC@5r`w5SQdkl3TjlLI%fX~h+{x|(cbX9W_^+N|Ns9+TadRR
zX0mdWzK5(AYktG?;?Dp7{~=-Oz|nf3PVfbL0|NtC;J5>*jmZE~3R~m#+OgRd6hQw=
z6`Ct}7)qp&0-n!?vxI9`J*Xwu0q(1Tq7|gr1MH2~1N@!QpuPpvb26<5N;g4Fo6Fx4
z2wHzyCBeYo;ttyR4O;g8g2{t{q1zPX_116v{qsOm#vl)LM@V$af?^Bo$ZiLYouIwY
zowr`t)q}>Mn}0CWMs<sVXBmI7l-vTVYOdg5D0OT8#a-$cn8lFAoW=0MpdLIG+<Krw
z@7ocM63w87C*K3ISh5&ih{0t<x<x^|DR&$KCEvrI3=FTkOC=$hcP?mG9XRuXST8~A
zg1f=4^5fsf+<Krln6Z?*^CReNhH?gm*HWFAn}2YX3OAqlugwZ_doK$UI8<KCwtlNW
zgCxuh7H&Pj-@y-R!GXQs#oXbd!hDRGp}}?ys2(j5fVc}B_%F0Q85p`;RG2%M!F*8f
z1DsA?v+e@z7VEqa2kr-e=B<%qqXJSSBb4*KkOZw*J7f!r!jj9Nu?rsPez)VGIhofo
zFLwO@|KAp5Xeo!~?@~d-|E~o)n4Oz{aFww7wSKF=e~g)-^9MAqg3B6M)K>_0i-Nq(
zzmLhO6U;jNa`oT;|0hfU?FntRodDjnX|V7@8>q8iqTWy;#8|2b@#T*DpwM^q0JSYZ
z>OeEk;4U*{?h4_?YoNScUt-&O60~WSsU)WP2X9IEi|TR)hQNR<h42?^-ND7q5rNJR
zEe9&?gEGE*uySMx^s>kYyqM_Dz`%I;wRG#rQWgGf$3Xq^fDATIkbL-y5}3x<Tmc#U
zo~#_NUxH?sKt6@eF@wf+SU}@K{8J9~x~O;<o_sO65VT{b^#Fh0dH7<YZeEZNK`Wg=
zOBoDrzjkP-6k;kd?+)bQ-|i@oeSoLehG`$jhn8BUpw2%>rxQ!(X~P4}RV@Gcrylrz
zL-APiAs)+LMfY28m-2UeinN|A-SeOK3TQE{XzRBU!3J+(7XEF{LY5y&SUW#-I18Z`
z6G)Ap*+>5WZ@pb&Y8|7(QmWq_qT<mTqaqIO#dh9!u@ba!=|GA2F&7qbu467N5)6>o
z=)Cb_mm6r+53EB9+LLz}Qq=KpuMp@i;CU_7?FKzffb~UcAp=A6F&_Ws|Nl#0bUX7{
z-Y8*x5m3m$(2y+r7aZR^K|x}9qdP#PguT~8r1Qe-Po09Ou0|AYpoOQ84nr26!s_wE
zuX#Fefl~x{&1FNi5JSm3{_W17;AD2@>2~<RzwJx&gZdJ-UQi(n+KucE%3B|zk<VB;
z+<ERr0I0Eb6jXwUg6hZ48!zNQMf4k<3=vSIr|`Fe)){t#_ZauOGcE@0HGZ-E*Z==7
zmN_yo_?3EqSCGF@bO0S*0cydDJ1{V$HCGETl<FEDc(JyMfdN!YW+-^Fa=iFn0WE+^
z1jE9>LXc|m^&#+vFm>484mpUSf9zp~egd)hLB_wZXJF`-1%=;huFe}T3PGD~qeWV8
zmwr0V3Q7{7cE#(G*4w3W&9-2E39sQL!vilo{(?HQ^{@VeRlN@KE7e;J8fOE?$1ae0
zmN!Z`dILnd9YkJ#>2?<BWCBZdI*W9It?LdJ;NN~I`v4EKGmleRXRtu026X-AaR&}i
z53BP9tOp6}!-7_9iJk$C5M1n*JprQcc~(|rf0F18OX$4uVlOvnBBS%D=G_vzULNCK
z5rfXpuN9hKOEkZfu=M&;%GS%G+3ED9+vyKzc7X9kr_-P2SD?i-cfc-dJy62V_+l~0
z>CLPlTUa`6L6-EIm^Y+F|7}Qf{@d#&(U2hgw;|#8-`A?&+=Q7*<kPy{gwj<1Gp5-x
zF_v<6et4k|+EdBVd`#kH!vFvOcY+qP8XoBU{&_Xnl1?{~PE(K-4SvE*on@d!eH@H+
zyxA@)96T>%Kpt@80Zsiunn%55;B~LfZ+JS7cZ0RH9w_nH?di$N(O{v<-+B(T2r`3_
zf1d+m>wyye-gu^ldM1Wa{pKIqC5p{IR7+%<f9RGf?AG#R<p2#xf-1o7G7&KUHS2CG
zu<&dB&KECSg~9zmjm{S@7UeK7Sc3zgSTg&7L~p?hW>Zi&fUO02x-{T5Xk!w`l{+jP
z4fTxnrCgnNL5m~)*np=N!OOG2id(;x=y$vEbUSc#zWN^mTFnSvAIic|D$!Y@!m>Nk
zla-^pOyu=-gpUIP!h>Jv9Qgk~JS_M>c!wHne+3t0r~QHb|Nn!R(!JOu%)roX3t9oT
z54`-%o}pA19LB8&O4$v+fe#&Os1RZ(;cV~_W&|a}XNH#`dA$4A|NpNqce6KGsFtX|
zFck(3sX{Y>5F*!G27D<|=muwoSFddhFTE%LRc?o0^T3R80nOQhi;4zsVMc^TjN+pC
zI7_oVLup^<2c+^o2DD!4TIcERDxPl#8A~LC|C?u|d$MwXR-3+PbOh(@ml=!<44oIW
zSwRtS@CS3|fz_*4t#Sy+$Ocy{phau}FC-m7wFKDf%|`?*kCn0?bJ5|_e$Cf<poGi1
zK%|rv#Mf<p4BB7CQp(c#`nBYL^NdEQ5jqk9FRnQ-F!ai3G#?S*-|hw~^m<v?LDfq`
zoe%@)te8?k#v8keK}F7+0tSX&XZF{ip=yrqz#oh^3{Sq;|KtCE#v89?0t5e>XDNhc
zRD+B*2!2ry+6(!Dx%r5~YnI*^6`r7=|K%K63cC~;7#K7UbzXq1bUzdnoY4yLxXg<V
zkd`9~;KhukPTgTVFbCN%^+xf$mH@B%?1iZ2c@YIteV7O2?cYUDx<ynVD;!_jGcdd`
zvjer7nve5X*Qjvtw}NsbT)`=O28M<-;ol8)LQJKg4ZD@##dnY$Gtl}N)Ni^DF6&}`
zfXlkikR;OiulX6rYtXtbwr|eDEG68a9krb=UZ}x~&L^;ftGA3HJS^Do+iTwDA35L^
z<sW)W${2S{28HA&0Z^7JecEjcT6Wki3rfk&)(j<bhL^gTU$B6N20nHk>iqHIENCG7
zFnAC3lh>T!IqN9U=6~?%GoZTjvPV4^Xh3`#sD=sYEn?|*Vrj6@En#gw|NnKO!!A&-
z_60L&WA^dhVvg1WmA<cyn|~CSutO$-HNgrN?wHNW@#3yIs0?jAP$?1~{@)ZNl<^wm
z*qM7krw#1j1)Y9l332$|Zc~txUo#or?)-7^g?#JnQtp-mCEWW#^~!4&&=v~A1I>1z
zrLQ0dSl-}o4F@^<HfU@WG(!dTIB0gmsPoqjL6F%C?HCv~Gj`s1!DG(A09|q!{-W59
zfx#KHk?yxc>0^W2FXw}5t~!2DwzUPBRL9(WsG-;CfAbH!a_P<sFV34WFa$%^Ylef<
zf#L1uBLc6p0|Wn?Wr%pOa=g?A4Op>t34pe4@EKluG4<E~|J@Ee-3+g}8-D4Qayh(^
z=VxH}e&aRk3o(#Azg|=qgQBZM9=ss^g=j7VLr_paMhj@gwZ!iK|G_~Ca^f)-ke?TK
z-T-Iy3IACc+F3auduop~^t!0zyzpdUVED$G0iHJET9^ag+Q|8uV_^)K1=?L$v-?IH
zD@SjQN=+~5T#6#_9B1c`7wYFg39%%r^AKqBJoD=?rv@vA(qG4%{xfubdf{3Ga$zOM
zanNo|hS!$Owjiq+N<rrUgjh3|D1q1Bw;m{E-C^s+$`J$!pbV8(R*n~fw&3yxwCk*s
zx%n_l<8P4O(zfGZ=YtvnV5gsB25q=+fOri$k8rs2+KZ|$V26R014qXl_O9av9W-&5
z7rK`Zyer}b+phor!To*Enwn#Vw>uxauxADh?19fk0d1BmWidSPn(M_y*pVeK!u1&#
zIuAm&py{=KD=BLJZCIcCf(L9{sbqugGH_oe8q%)Z;SEYb@iq($&aYJ)Y*&KhN@YMZ
zo!~Y<|C9rZK@7u7ohM#Yg41*7gBO387#N^i!TDQ2r_CTXcQ-!}fb<VQ>u?b3plS?H
zdhqvwduv53uywqk(~}^JTR*&*n9ab@`MLE#sn2UQ@Id;S0#L-13V^n&BW+L6?Y!|q
z6SQW8qZf4M5@<sJXeQk03~0!*^+4(2z`(GK43M9scft-%x$)vOXjoC!pc8aZ%ZqjY
z{{Me*_C08z4!no&1pMTm<~KaxZ2e;PJJ6z#7cHPM*&{qJ7rg)fA2hxI*|J;r4is+{
z;)VxaB!err7Y(3EirXcuFaDb_Fhoa0gZ$m=qr%es<ir2MKf!^`Z(P7r=^-khsaywW
z%8+>BkO%T3e+%f`w-?so3=9jw`z3!cmU2P%=7V}9-7zW-%|BT9TeKKK8&mjOlt2qF
zA&2bnw}1{agC4%a-^u|}aiEkJ615w+UWi+Prp8qaUVzSyJC5a?7``3<|2O|;EJ*^b
z49;)<&CK7rlYxQZWf!QC<f0-0-pBo7M;-&iV$dw{i(g?-13{`lYZbs7Q`ZQA$5wg3
zYwI*YXK|?<cTsTwm0&x{Kyk4jvQEYU<eweQAQ9-w83$0dgSEINcJzRx?s<ShrGyJK
z{LKoE1CU{$7Sh5i&@<NzFTIF4_Wyr_?J973<!rVE$uN{cmZrWq13E9N*cd!!3Yjs{
zJj5sp+Jm(iG`4!UTl5ELG*kd02ObdyNp=Qsbc@cI&C1akz_S=cgW|FI0CV$$KaAjc
zNKICdGU)k4(9T!414Qj>zHX+)U}G=5c##Ymumo|eg+aY97O=J5!5p1nM=)Mk4BF6%
ztFHwb)hgQt8AwV4_0wM*$N+^%DKDtLng9wS`)%OiK(PDX@VxkuiY70QDqoX=CjWmc
zTt9e?W^Vy=^RqwJ;B9JUg`J-p|9xj<U?^wZ{R7mLy3u@qr5IuPp{=k30$$7q)d<kQ
z><wV)gsl9K1%*;?hy+WgD9E4SP(k%9Qg^s#>;L}?L9qhrdVuw7f}H^xJ%RRNx*-PY
zNL$`Ta)vd?4}a^+nVa7>bVC-OfL+q-#A11@w7&7zoSCc~CFPJVa<?fcHoE0{Ls>dM
zyf^{Mwud?;z%J|cVCm!qIiOP)>~0qg7D)7fQow8OPJvDjmd*^0ZU>&$10^h$1|@G%
z{h|w<U@TFAwqRcF-17fFs80a0<#^}K&r873&j>ais^&1X9yr!{8M1zEA;@mc8<ro6
z*<Y}NrZL_zgBSO8-iU&%Ck4k7csBV|=ZzQpKpp9uou5D(e9deb7$EChKnH_hEPD6q
zd<kws$G+V8|NnpRx^qZ?f|o3{9;lFM{QaMqfuT&K^Cl!iyx3yQ09gt3n)gKo$QL&t
z^YEZ!wjgn0WB6^yvp`mk7m4hkq*cPc50u$ozlMai;ei)Vvltlox8LZz@#1zC`T#Cc
z?DuW{{~xkJg8@`Rg0>2^ftI*^E6MG=`~B*^6<(|yy&)=E`$0pZU2Gjp$D9~#n-4K{
zim2?G3tH*-yYofI&C5SlFqUw4F?I8(bTB%0@~C(_HU3)Q#mZ6o5Hz*RpwoHC$*uW4
zbK}3&Ai?dRx<5F$*G0t$(inNo5f~Vpu@IEA6ivZ(`pa{mA=3~Q0nj>u7Y5BgILmbn
zPj*T5I$yA1FB1p~`d^|VkpVg^?B#Su1_u6phkJcaTmZK$ZoTYcWMKGyxf8VA>E^+o
zY@I$T9Gy1~{$K`e745E35$L>Y_^tC+^CQpB5EYh}R-od%Mnx*UM75r?p+-e2u~g-?
z0Em%aA_1aGOGRF@HlOo+&D(s=;WbC|IgZ!N&F2{1yZAeNRHRx?mI(6iySQUH$o1Zk
zjJ~1uTPaK0K2HYzeIY7RJJx`t48T(SEms&A7~BnSzm99DQIRexF{l>@G15!SK~#Q;
z8HkD~wSR34Vw9JNf~blT9S~Jos_~ku`83OGMbKU+8SWSrj@M$`F)BQ-1-N5WL|$`&
zJ0K;X{ZH=TrR&ly2SARyuww(r1?!SQNu{(M<aKub_18dt(=7q})V72l#M3Sne9im)
zlH%3ZoY}|Nzh6*1%6S!Ju}&$gyWzLj!XWQRL%fp+Hmrmbw45G%L{R6;?-v{F8A=4e
zr~XM~>;zdUzVZKm{_O`}glB+GiEBP$gP7lktO-62SyBnAk&i<bL4ui}HN2n+Y0%bF
z@T^kr7Vrwm*HO(sib{Bzf0UF+HvcFn^?nUnw#5TZ`}W<kpr-$8^UhC@Zh>4Z<h&-4
z<~?A|45c6zXay%jDY)x#%8QlbwF_vC8OVSgw?HlyWB~`#jMm#FVlP6#aRyoe4jK;c
zyzyeY5d%ZFE~p35T+6@!sSqB3wCQd5|9{6T5R1nNJe3bR_W-nJSpYOs4xZaC@$79;
z0nMTtUV8C59lWR$w9=Fr5(3>lU^l*I)pc;<XXrfTXlw7p&rtud6C%w#1+2Am3Ro4S
zxCISgKtl_(qJ*K>MMVR&h2u3(=X;o3=U=ehkOS`wFTu8IW`pdXqXHh)gIH{Nn!mr9
zk%6I9q`O6B3uqAu#A5zl&~BA(2&a1rSjzH3jfm!j&KB@eTFslCJt`|eo7kjSK~9HD
z^g906ywTYLmfH!M(lk5(I#%HG>SiAm4aRWL#$k~C0a*;aAu1M-F^=V+Ga`-%c<{G=
z2Q`4EsGJ6!@&<|>!vinE(ij*#_*?HXFfeq@0n4=9=5GOQ0d5BERxIIb_|3)Nx*XJe
z`VDG0f;RD%iZuL=DdmR*2*{k5p!LQLzqv};4gbHK4q8MGK9WKj)Q)PfP$(7R-*@>%
zO9BH!=X+3LxCgY{y_Ti9mW83jgMZ&;kg^x437|AmVqt9xs$NUEUTFOK|Nj^R!)xYa
zYz&4cA%%FiE5i#BXV6RzsBQx-Y6n}N4QYvirY;$v`q^K+`1${T=dlhsx0g=;{{P<(
zQV5qj1C~3+#?TF}kNhk@mkaRk69YTsPCUpVrH?>My}Ml*Ub7pX1oygL%ywd6Xg<o)
z?Fu?k?p5axq}98xIjuNKm<<mcc5>+AYB^c@@o?IN&O`8GwhSx<>Y=>>N6BG~z56UL
zB$Gg8w9MfN-9p_AFSFwr7$9Q?;6764aqzV5r*)mDzhCaW@j~W1=)7!DEsQun9Mu0m
z4oSqjzz2~3cyZPgG)JNNyVsey^V5s?AD{qLcj&y?`Rm0sQ_$KOb;kR>1&q5)eZkAi
z=f#7RgAR%AbpUD518Y!%Xjlr?paj;?V9!uG`xqOfIt6tBLF1AKkvv?^0j@RPzvc}H
z2n5$CFA~@M|KE9{`3TQT?+9=k7S#9XJlHJ@I>xH?b_pwJQI#d6+7xKL#NPrsP`SZM
zm%nuuDAh(WHdHY(@VE4WQr7{N#h~J%p^8zrl&ztfk)fm#JgvpvdFr)X%Yjn<fB?|m
zEB=5CNpDt;*G^8LRbb#_7Y=nXS-GgNm)-&`R;yyPDm4aaFI9!u%K<u33S@HY$x@-<
zV5k{7pwlxKt^WVNlNVGL8lLRr1-Tg{%MR)mf*KI;@mZbbA58V&W~CEITlVVz|C@g>
zmr5=KEye`ZmEfhQ4wkH-BdhAvUJLYk@pSsA@OW5*Me0S4gK1D|MLNu?ileheg`>NO
zrJEO|uk|E<pEnZ&12{2hp2$A%hZ%H4my3#kXNg9)Ea(iZ*4q_w-5Gzt$p$jp?`e6n
zh`aL@<E;`_P)f7_ozDR3+wiyWGl9x<UH(=!CI*Jy0LCr{M$o=GP&2vNMMZ$cMz@p;
z68cX;+uXQ1d{o4HqZm6szRm+J<t>eEu(K-F><Up4?+8&*IOd|F2r7LP3{UPz1%-jQ
z3j;&vvAy=7GUNvX0|Pj2qysW?yjeLQV-9n57#JXGxg9_U(ty>1j*CCZz`)=LT1yCy
zyo3DPG&^5dxu}Sjwl`EVT0u^L1Erg6uxF%NZ<i*5+@js(qaxnngT*b~&LFoK{@-f_
zat)}{33E*Y+%^1g*VNjBTx0kj?w*gJHKH{t0@m`S?9InP=OGAyiV29@^`U0J1eLGQ
zLIWZr3YKZTUCP>g;y>tYYmjrbo&Fg9Ukr*X&|Vi!9~FUvptZH2GRR>uD3${<90FN6
zvUot-8G>KfYBMnG1og5zZ|#^43f2RVI#HwZMTd)u!7&#VLk5srz^l=hI59AAyQqMM
zaXCMfXkbfIFBCMP3Ft-H3TXM*`2)6y$M74tz=U}G#Q&EekaKiFbNm8-{{IKN50O5b
zkMKa-{@}qck2)^U8MM#A=V4gOf)*#&fwROskh>#Rz<OGmU@6Ed>DR&yw&1hiO4z&E
zUettwCi+;sD_?c<f-(+h@3B}Xi(vC1&_UUsvH1tJ|AN#SXIKFm_5gJ_(qR3QE(eyD
z10`~xqcJ&N2!QN5%mQA*_^I0sd|3FO5C(?G=s3jwS;POYnL3X*+w5cLb!RO7dhh|$
ziwe-X>7$*8U-LE}V|k$k;(^A?K+7LX-$F*-c7VM8qW%B>|B!?37&~o2BAvP*KVkC(
ztRn^KkAT-|g2qTEfmSK9f=2^D$rjY4=yimYf&BZVdaD?lf9sY8cLg!FTq+T5_@!II
z1zwr@(jU|cuV-W^{Q$1a`CB7F2XkL46+Xrap8G$>x*9ap@X`siU;?yn-V($(0-kbu
z$pD(I{H<NeZuk~_cxNXssAL2m!{FZhGr1JBEsBGIzhx0<2L*Vj;^lo%;ruh7zZG=w
z7o<ovFudLRt<({+qkhL0Py#rv!N9O%Nf9eY!*1~M`cl>%XT3qAkpE5Q&hcU8$hZhn
zm8$_8=@l%!_*$o11T5G2;YC0MxPIp9e9_Si(*Ih(x%szX={?Yy?6*M0eK^?WW($Ur
zAXs_++QaY?|32^{e#;Z3pe)k_(%SmAM8ElGSSjZ*)^(tOc&*s{)3sFQ80%UvPuQvX
zmtg7fu&_XIJ@R7S(*OVY_wl!$<ZlHZ1rH98Zo$?|{H?j5wh<)YK;swu`@m;Bzg(gW
z8YSiNC>4P;)-Hi3tU#5ZmIdrg5W@p6c>jS625WgysLa3s_W<jQs=xpL<4oGBOF>B+
zl>2&N=O$h37U~oQE%)y{)q0?gxi^r-@W8PKkY|}3ntuqEe(n?nMdJp>7c)Qy&w}R~
zx=leztJ#{N6f~Cs&Z+M~QLt_aDB*%eqZlEhSxlvxkkKi|QU${UFS@`n0o`-(q6Wfa
zha7Ls*kB7f-kPbDYXN9fcM*tVc%Wei*d?Xx5GOH!o%9N{)S#PrG1w81*$t7`iV%w!
zN+rOPAooFAu$UKvJl1@e1$=B}r!1~q1g>IVgEC|1AqSARzIKX&@*Ol*BBSG8aw~z`
zAf1Q07;NH8Wcaro_|~vBk(Gn_HJ?p<2@jmlUc&Cw#nf`3^kwIT!)X(Cg7$^%y5P^s
z@zV0!|NqeP<Z$P?){~{|#~nbj3|(CO`wliky4T#GYO|EJ)0yXWDClrLelVZ&xHD)`
z=l|D^AfE>XWjp|-`gcC8951XF|Njr!lW+O<|Nr9*pc$0o4xnK|hHlX>;88q|ZqW~5
z22ZE60CZn&^BbSm1Kpx5b67cgeN=cVltH^lOj=|7SvmfjOa)OH|9x0FvK#_md{qIp
zGZkKo!z5&UArg1M5(0sNpu<Z8GQiGRv*`c-(9WmfVZn`Wz+3#Lf+~W}UeG-w-J+m{
zW1XU)6W|RmHSPt;fcEe3PdU^%H3hVy$@K%MCj~hls`K!1@WdNP<ajG+M<j%m^Z);U
z2&(|jDuJ_Vpsbfw%nS?*K^+6lAI(3Q%RwiYfCA-3_ghdyxVsf(d4r7vAAh?769WVP
zHWrEhDy?h$SUHY^r9kdF-U@OQsA2W;DFXuo#KE8qNc=5&ObiSi^8djLKbvhiK&PRW
za6wi|FmW+3xWA|YZCgD2@(U9KL-Ssc=NU?PoA-juW8iNA)s)BB8{J=S1Fckhcnh|y
ziT@aT<1u%}nC9b5FK4oVHY#$JN<xk2Z|PxVVA#O)Vi6|;!^;Lnkhx&vO4OTw#FQvC
z|41m2ZT_KBBGLRqsgx6DDHp=Xh8>`-u{@<LAgepr-T#Aw_oXQ#0|Ug*AZe&R{#MX^
zD#zG6UV=x~p*~P+-U|->QrYIc;0P%d>5zBto(f`jP6bK5d=4tm_k!c2R0LuyD8wK^
z35qs|t*@s;P2g|Y1lPgXJQbwz|NmZ)fydaJUxF5F|8E7w^UH3qG7yuYgu6rD{eLfr
z{krOf&@E7dS+g|ge=o=dz5a})_Q%-UJI^=n1tkVhM3zW&&jqnN=YnD#;g;7n5Ep{f
zKtw^2{aWo9yXMO&><kPqCSCsj{}{XGYhkEsODr3IgV(1qcgVY=E-@2^E`O77055-g
z+3@%O{}*o8LGv*$OF%m}!O1-@o|U7NGaw*C%a@howIVFEryM{et`bqua8W=&hPf{*
z2P9L4&;S1)<^o~x66VFAJQN<D5d<>k7U)C-@R)Ju)Cf?stDI5uTFZeF`{v(v{8L)v
z|Ns9FI_|`#RI_<6XeyhbRH6AFQ@wO|D@b*h1gQW18q{TSzF@=2-v-))@M6ZL|NpzE
zf>d{kzL?F*(e3(SF}M)<@Z#h1|Npz^g0yzZf(n@9te{c^bbiGS5b-jR4U{&)X`a8O
z^3VVOkT5G{fAJk09L=>H45gf}d0xDLaDQ`_eCeJFQqRAS$?`CNtLvZt|91s|9OSy-
z#qaB&X(s*_1JIgqa53W88@k{%lN0!)#S#_^rjjoWR$Qf^UYrypLoNj6$Hh-(vvTYP
ztrmRw6?EkErC!$sFVrso|NrvY@BjZHi<a46fI9pQdqE+@P~vjj0W@>O@Z!LAP>QlE
z<vz{^8X$NHD#x0C)PVScpw<-VkgDb%Y9PKSh~EP`aDfd}l)tWru3CLj12)43G)QJw
z5)D!v_u6L%NX?6h&q20A6&`002VMRHmZ*6C|Nr7Uppv?P<%Koa0NsTkektd12gvA}
z%5eu!7&E*UJI*Es8toB2&Ia17@S6KL8+dc?gA4!vx7;q_<llF=`GrBJ8%L)p!yM3o
z$1HPLIk-VqfryuTSr`~z+_(mENb`?|8tvvE8YPy^KdMXgn}5WY1a=&T*JsS7GW`1v
z^Y3dYN?_$!Ay~?Hj9tb3MdgM6|6l(8^Z$SIKaEnQ7k$@2A*R9K!VWSw=EDE~$6G64
zCGmDf28LtoO}*}novuBQQJK!r3CG+S8JmwYHUF#TZ#4($@&dc&xGQK<o}u}Na;f+W
zbFi_s{4HWEpibCv*9Op43eEo-YTTOt#h37Pe&*kH7+MXN7+c$diu+Rb7Yd+gJ>L1D
zgWdhbm#Z*8W`KNl8}2Xm((|uFd)+R8#<W%8TAzaA=6L7l4te(%JHc9e9Y9LT?!MOO
z{KUWS5Ii7Ccsj)0UrYt7dCe0RmJ#R6%JI_Y&;S2$!)AaDJH~G7-dx+jP#WI+PqoCP
z`JYt@r{V49f6AqNuk~MqfDPCUivP|}I|M*W0(yNJKv%x4(d7?d<>+*6c&&QewE?si
z>^1vw*9OoGzzeyn|NmQlC}sWc+VGn7#hY`W1s2`l;*Yx*R4J4&H=J(hcAcQ<+S3)<
zz<CQiv(z2i(;*_!T-(6N-{SBabchY8m~B1D-(tbU!0^8nRQA49{|$>fP*JFD3mP@+
ztnDb}Jnq^8D!yMUb-Q*nACPN)@ImuPuZs$Q^Menat}T#Jq|W2rz8#;JH17q+J%0=6
zQYnZ`vn?n)f{xV#&3(SO$Hc(!BJv8Ta0G1tZUL3^^@6<(prcDb2LiW)h6G>dgDN(@
z<{t_Ct?i(EHj{yY;e|3xSE)24w?pg4k~xs-w;41mJ^`dt8&oB#fvQ9wXw6%~+WbSQ
zL>NA(_x&j-aU5fdaclnFP^*S0S%ZT!@<GvA`wP_b1hrZaWeQyPPOxs!a3N@!CR}(C
zSojzl=;k{}YPY;l!lQZN#mvY5|Gx-0`~QEp>xbUh53gA|4@36uY~XlN`}qI=PG-nf
zAH#3Z04x#cHU$-B$5}xnDD)v-oWllMXaiHk(Fs=cTI9t7aFc<fgbT9OM-p_%HgjhM
z3rwZhi+kt)|3A(OI+hn?+H2Mq3m^ag-yPav37(KG`v7TqHP^N<l(2V~wsc<nyrg?B
zs8;2k3rbeK?u;c|$JkptkH7p68tG$i={ydpH$lc7Zw09Yv0gs>0ZLvVE~Lf42&$Ex
zj<L5vBcj)xsYLh~qf+N_NJFf%6;wUH7CgqN(0RNY(qx<p5`xsvpjz`~FW5$n&hsyu
zfBgU7oBAa>F8<`<<F25l5W~wipxwZ4bY6To{r~@q{}=y*4ob^n*a=z;x(igjzexZ3
z|No17=fDS5Xn-5ZE-E@8$1VibVW89V7lP|I$np9b;C)E-$Dxz5%|~nwr%hNGG81&3
zBx4CT=s-VSaL?@U!k$)Ej@PUU=d`kd1_NJ~gDT)M@R_tC$63Lto`Hd3F-U7~i3(`i
zwe`XO|KNGf7wr%K|A*X|WO(4kJkVU`trxdJ`|>`#SnvQeH4VA*1=_domVE<0x*kM=
z9R9ixEmw7brlGTWx~n<5omuvQTXPoTC9M0v{(pS|944WiKRZ9Yi24HSG_X7**l7Tr
z^y$RY4LuCK8#dyQ2A)H02CuMTC=o#<tA(Jd<|Sx|5Y2rrKwC0EnF-u_L2W+4wgW($
zPp{cuaGe7e55JX5^6T}Re{+_cs~2hf4XV)jTW*4y<KULqYo6xcT>LFdK&`{y3jD22
zpuPS}ntyBZx1@nC`V(*dt;XN73oNa{-<k|MTNHfS`0tn!qvqc={4JNja@PE<psgP-
zKY_}a{pUf|8CMBAWVgZl7hNa+|9|NXx=(5eM5<H=Tv#}Ox59wE11*O5TU7r4{}0Kh
zKmPvz|56mB%L}9*)HH?^S%|^}(slwBwL3t>OOVGPVxSl{Jn#~H;D|ohQngY+h!m(F
zvw`I$=;+E9A5MUBG$_PDOGtKrh?k)2++O@X2l7KrDIY`+=<bCLtgmZcfcEA<gg{lw
z4iND=?ZsKJYHOHkP6h^s4V<t2UQC1=4=T68-g<2T(asKPOn`{j>JR}?%>*uaUW+xq
z;mHDBj|gh|ciwpM8gdu`XxJMxhX3L)_zuf&te{;|ETw#}1z$*lTFYy|!k~3H@0)+~
zlomJJf?A#orCAV_OeNZg-ZVJZzIgTw)Ho~=)&+I25B^~4jo|H+1qH@yGl(9>5?%08
zCW!LWU0~%>-5wkbmJIwYpj&e~K}Waqf#N3>)B^>(2^99w`zs;mpLffG8c{FoK?7Vr
zctCfk{(rIS!~g%F3!lXKTR{!LZc|W84d!IF<IJE5({6ABx%1X*2`8J55@DOhQf8;u
zJpB6(H0%Hc4Nr*xc&Omf%c-D5_`|<WFfcHq7vAoVpZxzn_+-d!TR^*{KrKTz4#*kD
z3qhqo>w!{^PE!!;bsl^psL|`B<`<%%?f#;mNicBfb^|i$^Rn(eEZ_6oC7AC)V-Vu7
z3-m5_p77vriTnQ_GO`OX?=WOtj>bPwEeWbsKm$u@@HMb5Djdhb;R#A5pwrbwUYrH3
z;(Xh%!^WQ#v>_LC7pLLd7q3AT+OZc8K#Ns>u#_k?|6na;-w#fjlK;Wg75FTy&cmRI
zk=WN-`$4H0Vf2gDApM8Iy^j~hcmDtHwCF5g>5Slby{en7`3GYu=W#dC-Ioln6+s2J
z7(^i#NMQjBv>o1g>^K`J^R&J#W$FC-S^}cx*=<lLft=r&!O~g4(Rmb<Iz{W*T5p#)
zz7A{t&0HV&Li6wc{~o1$FG4{_Hq@wq4p)C20C6^w8!!L+{~zY>7B0}z7M*5WP}DJ$
zu)mN3Eh?9Jp?viJ|JR^%Y(Zu;pZNbG>>Vs*J6|BmT}XYPbKFG*d=%G<6`*$b3-;z8
zBK+;`j0_C_Ra#&8v2yGHH7Z{yg9ajw9S7}KW&oXo`tSe$PB)epB_KUNBucn;fYRxU
zw{Jn?f-gYxo}fO%_t&Nn-A`|U3gJ$79=HMWAOoCPUKm3RDBW*(-~~5WjHC1Z3t6zJ
zV9CK|Tb4Pj973f$h6i4}0p)9Vp4Ys`-NBs~NZ9NK_pQoU7#JX7T?Ml07--2QNT(G4
z)C0{2I6K)454-@E3vMhgLDxLL*bS=afAEw_z_J=YByT6b`TrlZR1VY>-wbNIt!8Fm
z*Z~d#1+dA-89+TBu;NZP9!Si9V*Ews@BjaMV^lPne~6c8z7B-wd2<sK^PqMDmQgh3
z-UyZ#Mi7UToQI6ugBECZy0L&OKab`gjAf3^C;q=&3|fy0cEoJBfyW&<K&Nv-dvegR
zIuxyJkPw2n5tRB~90jGVAN(a;J3vl)>GKa9U6cQSB9jB$dw8h>@-HZSUl`m3HEWME
zfH|Q33e7)wO1QwG{89++ATE$9Hx|f<A*Lsx?t-`h98QkE{{QzVdA9@9VTDAmIDhM*
zzyJUD#zFHrD93`+a`O*i{ua=(3Wz%PQq~vDzhFhr#2cUyI8bXBbi{UV1T>*mfrLS8
zCzwG&iR>&8AG|0L)Ifu9cwTG<t-AjKI!Z~SlnWFei+=w9|9T75*${g<_*+Xr`#C{%
z*NZgJ<dQp2Z#)acPhiL9f=v-F5pMp$$=_lIs=7gS-^<s3{{M%>>&qt~6Tm@v12kT7
z>^S)TZ^HvGL_r3+u^e{;ReTJ)LFCKj;QNDL{Q3oof!&~u<S(ayawNDA1D*c>s#-t?
zGC*li=40s1QBeR534)f6NPw1(fbKm4ZJ{vy)@ci>BVQZ?U4Qk1yCfA9libZe*!f#Q
zXWqOnf+SXZsKY>M1De1&Agx(9p4R^*s?cia#tXZb|NmPaE)i+4ur1{W9kkJD(CY>|
zwSwdI)Xq|d-aHn=|F65d!9xb1Lq%cIEHA$N`2YW99;kuoqN31xprpL{0E^|((gN^d
z52cyl<t?R2FJ!?Eg>^w*F8Tfce|H?{CXXX8z}d4@u=B=?lKJ3jSR8aRb%|hbaK=e^
zjhEZ=|Nn6|KG1*)yykep0}1GtpgRnqIl~nceheTVK>AD|$3j?;5YdGUCcsoFbh?4g
z!j|cD16}YY0lNP@_eJ6N|Nkv-fOc2E{PPRciUI{SD5dwtsHnW=UkIx5JHc7~`}hC<
zUpRdSHK@2to<p4gQVF_AMTMb6vDuELL=>FCUTnS!DmXwX4pavn>vmC50hOp9VDqH#
zd4HZ4A3&$o{on;P>tI%cXW?FRK&&u)`$7<ukPg2%23E;d8nc1tMG$Dj;P`RS`AH1W
z)DCWSy|4sH9P4!F=!{^2h^T`^4nvYVxEMJETE*hb(kb_%1azp|z2+ZmC08Knyz@82
z(#{*LZ%c$B`k!9``9%^mT^GTEsDGN@@E}_Ii$Q%;(5AQ-oS#8~2<!2@5c>B2|1MCY
zp!GnBgyAKR5@Co1;D&DV5uTS<K}%9DfSL>wCV=iL>^vTr#g)Yn@InMMPkjt@(%J3S
z1C`v}&@-DkOLRMbym;;iTK-)k(s|>>8EXcHpn&iUG0>=qao7L<0a=V$OkppsKsG>u
zmwSTd*1+pr77EN^<?vVxB3lnsRzg;2cAN6d0bQHf?J|$0`N!WHq2?d|>J*!Q{4eF`
zywUo<RO~f>E9j=WTQ4dcL1+EXV|kJ82%2U5%~g83n{6>jcek4k*woGsFTR_hukl3P
zI=Z|QvUL=i1{&Yo0R=7SXjGQ}tPq#+x9nkt&GQ|1Q2`Yy3=NMMOB{9>fO;mTm;e9o
zJhTvGZzofyD2Rr5tkX%y@W64GCKgaz%mK99`_pl-k)SL9I(xPAZnrB#^9zCIA8h>X
zpv9K|Ra!j)SUI{&1wflZ!(KcCUH1h!I)T4ajERBar8yG=14udpG)<A=1QNOdK2Bvl
zXtI;P1=IoQE*0nvQ7P&C@Pf$!G;CEW+TEf88Yxm`_yD@yxq*S9ROoei0K|-gpkW+P
z_XNVvatwQsk7RAfN=EQy8zL{x+Jg<V0A(M9NhKQHE-EF~E-E6Wa@|u@Kt~~Vx2RlT
zU|_IzQ7I_pvJO$n;cuA<Uab9MpFL>HHfSS0c+l1lw34+{0Ag{5BWRR}58*jS76yi}
z7msa0%bCEZNAP!o2CrU9fON(3SjTekw}LL5czGY>!WNY)pvYhVI}&k8?Mp^b>Hn>{
zmO;E!zuT3kJAebSn&vw6?2N{LptAzXg}Yl+KmpnL@kJmz1H((ut%N&4B?frM*sH^!
z(viOvG!EJgwds=`1H&#*2NB!@dy#Ac<AMsI7a?#iNXZLVI2Y8ydSPY)x|{-hoy7|+
z69xv5^FWT919n3xUv~fp_@sbiYzz#q**kB&$lV2QT!2pTgF5s@ksSj=_Z+aVn}7eW
zwR#D1KIEiGPyoNU)cXH_Xh2woEGQ?gY=iDNfoyl$*82Z{ctBW&Q2;B)>qp(8kV_3p
z3_7oM`>1eqyG&$h{_(F=V8egQTP0kb7hZe<wX073x4coxy5ldX!l?nBz_^{o@>WS|
zcP$4v6@$As(uUt!Z&w(Ax5?bJ1*Mltmu^##dtPgR1&@FQE7&^k8-9Du0g>vw-}&Rk
zVvxkQO0iDR>F;ge-D1JuQsgD5hu59U()yOa_3R%!^XPY5|NsByqQb&l0=*1^r}aPu
z>tfJ7ca29txf;B}7IJ0?cr|FJhzj^3FVH!=;MsZ5^)TSm=AEoTiSFX#Qc(~Wywjvx
zL<Ll#y|@mlK3!B4z=Ex}ON5(kK|5m@OSr&^;f1_4s8CW-SqwV91awp!Yz;o^3!7HZ
z!6nT{G@=iK_D*zy?n3`%UvApXGSwv+bjm@gR<F~8<{$Fq903_Apr~OBf~+2L$Y5z_
z<#@5(fPrBLhy~i1c7z97jzZQJUVae>IvvwyF2tx3_0A73mV<9)dkI>4*Dc<9sf54t
z!;8h>t3n}5@SK~Evo!y<uX_Z(9&uMLXl(n#i=AK<rOLf=tX*!bpo7b7v`gba2em<N
zO}_CW-GG6iH$vgH8AM+(L|-FBp9zva-BLAVefnU1pu2r|KpWn;nt#jJv4R``KB*Ae
zA%?C&>IUCpcAQlLbe%VN!E?iI84$Zf`&cuW(akbfW)3LWN+iK2J-&D{33Nh}1?Ui1
z9njry2TD1dn}6Gv9y2@uS~xVJ`Hc?vBuP*+4m3UfBH9v^LQ4c7QOHuN50-wd1Cj*C
z??MTP1%k&}K`c<YZFuQL&7}YTUn~dRGUTGd@j}fCw8x?O4bQO#>A9>NjEg}oZng#A
z##zb->S8Ox?jo0HwgsgMhEmoS2F;*~S)>zk<0YuVg^b;G9_)?y-_`8V&dSmJg4u?#
z46^O3^TZ1#0|tg;U<sDUXz)HR@HmJ<=do^<R*>t!tF~GXfOaP_O5Xl{x%n`2Gx%Hr
zhEnh5-;AYh&HtE7)SLhDmnb#=V=C2#tOj8y)r4(PQh=`3C=q|nw;NQ7!Bp^ojegC#
z8&n|n*8T5l2f451K&cLBodWoR-2#0E28WWe4XmIGf*4E1Aqz(sN>X~=-ZcMUDvx;`
zX2Vhv#=j4Am$W}<OBbKv0nnx{@WIAB;46!G1lU<QI_87SKJKCd>Y*`!b{T_qMehVv
zy3MElznEae0A3*1`QgQ1JqCu?EE||#uWCL5zR|e(4UdC0t4lj8M~T{E5CtijuY$T)
zAn&|54Pt>B<e;X`KFDGp=zRx<w_iteH-mx^bcF?|)9MCoj(`PUY|vw1I1Xll5<%<j
z5-!lb2`2C!6mZ#r?W7{_#{d7D4}&&ef|idjh=_^?-B%4BqkeJt3h2gY&?=s8&{kU;
z!*9(tTS4|Sl&E%ocyR~RzCPT|0v3Al?DGHr;lTkJm7ua*60~Xah=5!3KZnxOFXw{h
zWZhYs>sc5|*gKEE1Rb4bc>8s|;iVT3KxQ0kJy6L9+Q^;J0n)sn0W^96N`<YrOC%bs
zL5o7G85v4h3~z&$G``R{1sYs{+6!(%ZqsF8=#&AwqxD+}XmfSTUp%F7c*Fny&Bs}~
z*+FZ>K?CoG;C;=I@e$A-?9-jsUh8z;uVvl;|NsAb(9n11ix+dvK{>I4jq#Y~;n#f4
z&~u<4ffib_H~(fRJrBB*0KB3N8eg4<y8}4789EPYUM!IS9j8$t)G6HUEbwA7XqMwZ
z2}`rL2qP%Kd&?MhfX)tjdF(%EziM#v8xcsvg3kDS;R!lC`7lxhf*Ts8NDB|!>p_J!
zD90g>p><yEJlE~WqRnV|p-80jCFpG7ZnhWh91IMdY%jsbGJwz1Drv6dU?>%6t`zuN
z%4T`1jH&ao;s4hXV18gPi?rqCV&+~JDa#v0nV=IHAr6DwC=MDE26a;6czQ)7I>T5P
ze{`}TxwG{^sW_}=;d}9@?*ISS?42iGJOpi8cVp3JvwXqd4w@e7b`yX&??n~l_!gFC
zKM_VmzX1|28l9j6=tVlub~ALBvuGX*?DkQS==}8J9B2>;(*CSuYxWmmd>vu=p_qk{
z{dGXEiwe&RzvG}o;XwPtI&WBBE@tYy;PArj1gM`4x`8Q}F%)FZiw<y36R^Bd$_w6G
z|KY_Z(D|4wAOpe1xE}{itjNIXXV4u}7eN<S^tz}>Lu%DVun{ugdK1(WZ+^oQ(Cwq5
z0Xnk~eDI+PQ~}6d9~BYM(p<>3MAD$~VMtvGk&^(OD-T+q`+@-~1quTK`_mZz{RgcR
z108zQ#bA?Gl2I>d6H{Vd&)NLKz=pkC;kB_%Vu_+nQmNQ$H=Cl8@On0zyi%^$9yTQ<
zK{jP2p*v$h3j;!Sf_i+feIPtn!;|1$yZrl@K|8dZyO<${>3NmDd94X9@m?$L1dVdM
zmf8uLWPdHZ6Er&WnrA0yJmfX&PSD_)b0;5YZ#t+g0P;uk8yU!iVQ-F#1phvXUJu63
zbIreFO6~dg1u*s&Fzp6)Qk#Dzm*_SBGANZYyxkkX%D;~dywr`oT+*#q=7#09(zmbq
zJ70C4c)<yp06W$lqap#HK@S7P@9_@#mfIz)?wucA&+5DZJJK53hiZPq(|NgD*QS+~
zqqholctPudQZ~bH8@OJ(?wSfJgn~hL?0joIP|DL=&Cy)V!BFDWeC~fY`wOf8|Nk={
z>wE>C8-I}kO0nPS^_q{fY)}9lxWTr8tMyx{Tz4pgbtp?IXv`jT#wqB47S;}?|E>%m
zH9HX{1!!KQ^DyYRSuM*$rCb34K^ZeZttyUyfZ&YHAcyExgA$&=an_D@NJacw7gF{p
zm8$Ge0`({U=zxxj3I^XH^x}UNsM3b1Z9XCZDqvuH;1~9^vvPD>7~VGg*80E14YX(#
zB+}*1*d^ZZO9^yYka{U6|F#32hYi2IRy)oLY88Vj6Hp7u@MPzY7Y6E}R%hom(B|dN
zA1`b{VSl6Z6MS4B8o!-KK?j(3Ue-Je+7aTS!U37le&KrT|Nl<V4ua#I??9VMK!wsV
z7lFT7piJ1s*j=K+)8Qia@0g3&e+JMAE%5vXF;@o?3LqCjYAD5Xunmx)Yp*$4FF`hS
zT?k<1cnP|#3v#xq$YPK$L6>=e@?|HB%FA1z{Rg3ppdEzGKVnM7dqY$}eMFWQdq6{@
zE-Ikm9*x(c%|BF2K@D}51}oK4o#vxVojEEjkQK(=T-IJJrCcvQ|Nj5~WjknDA0s$3
z|7Unv$;800>piHC3_4$blMeXSXck7$QTU+CF$Ef|wMqqFfX?3q9lP2aqN30lq9U;C
zE2xQj<3*DW=twWn^__a4V~r1kR13YZ0Tr5{``kfyX(KBS)?r}iWdUuDl;~n;IZz6^
zS1yAQw72wY#sB}%K@)+OBA`Bbh>8U0$Y$^r*j+)49U&^98!IJ_IWaQWWb%V=My!{&
zNh-0cXR(QRt!tCa-vU~*WRt?*+6$Th1zkX6Q_SB2T2N8XVw3-x%chjS1$0ohO$C2z
z7Dx$b9|a_p3AA1+We4wPdJUT321h~Xg%`g;75-sx<^kPWc#NqSR1Rv3sFa9+ZaQWU
z_+O%;@|r0eLNkYj1%$ph4I0G;U8xP3Yz1vRIL43!UMmi<i^K3z>&X&%{(XY4g&-o>
zYzGyn+AJW8ez26VgZ7}Ryk-i9(9D5>L80J=%8QGjBybpX-x0(pGO~-|$zIUu^FLk)
zf^I)P49+epoj+diffl2I?udTz;xdFO0P?vi$mbHxZ+OB$=k}ZYFHtcGcySFh#C$~I
zwK7;x<u!9qSa86L17J~s*SrA%p&3$vtQ;>zKzDn9V$wxLq9cH@J4c0ue;;V)7=No2
zs1XE8`k<kY5`NG^buLhj110;{*A{{b3E1#r^Ba+X41+*cju%Shpf*T2_-xd}FDx`c
zjh<3o_<UZk3-|x1=y*_B9v%idM)UKM&L445elV!=fsb8up7?&D*W>>&7v}#Ao%ccN
zKs&f5z}qN?_iqUT^^N$!%XE&jPHBf+-D-FMylS)a#*1?rVB0g&n(NsZN}U!?02N;u
zEUj-#;<^hsc7wHlD^+<7K0^wkRwS*tnvJnktievR)Uu(Dk)hQ1HD~i-4)8_6H@d@F
z(wcv%mU4rQYOY{mC=uzj1zF6$|IllR=HncoPH1Th!ZABQJKPX$k>)p`eeC?8#y3}B
zPyo2hea!(Xw!=JGIbJ+11>N7)`4qI>T%hwXQUMzJ1zbPAI1f7Z{}`kM2XD6x&TtN7
z<#?^!>&V#Y`lZ|VOP3)3wnLEBX#%A$TP~IGhJ^)Zgn;6vt@Qu@&JVq*KceGK9)^b_
z=&FfpFY0u_Va2n7(XX^{pC_m;PXtA_rISP{>%nJiuY*Cu-rW^4FFbS@7%Y#MIJ^jl
zFwDW@M`7Tr*?L((cO5XiP}%?gf9Fx~<tVl~pn)LE8>K?8*{y4)GL*18SstqS`kMLR
zGv>|@AS;xe1YjWqDyJcPgFBCb78EOVi-IDp*NJ5@hz9M}`3st}zw-b8|Ch6vKu+dw
zVFfQhQY{U`RD9ttX!Kl-zvUq_1H+3j(0abZ;J5>ymjE`>f#t<2n5w<Z3=F%H1HlKC
z1pfQ~|K%D`7nm0m!Jq|e>lqms(wZyT82DS4fJW$0+}2#h!cfYyt16I{qnq)CFsQNi
zPpm|+`JZ@+bn`!6u&t%qucg6^ZiWU6hL^WNx5a`T!SFH=WD~=S{~+JpQfFXz?c2@J
z{ExdgL?x$`{e^}$`0P|sZLp809x%M!a)7^;kC}m?*X@7v50P^A|0=CAL986$ZtTmi
zp!&&0B?o*}AlNOPhhIK`34*$~uU~>r$JqrMxqE%D+eM`YG2Hpm1>`q`kOKq5OG8v4
z1qKH2Ri#K86Brm?a-*seU|@I&+DC_^>Hq@+cu_l&&;kaAm!QQk-7zXP2VZl)7Jx9g
zUb90OoXw9JUxM!D=xzaDI?Uao0;*MBDub$|Ip9Ix7Y8*N7+&56?RlG{(gAAI>;VaY
zuKDVg1%+>KHA}ZM%Zo#x!?MAVd4Rv=9yl^9*cka+FN54|+-VC^3Q{)<GytXxQrPRv
z0ZDk(9IgLLc_Fdu%J9MjRQ$TKG`|o`YyKfn&c(kSbRAMb5Gx1hcGMT4D&TmUasa$y
z9xUVp76RY?2j&}ri}r)B<zIS$29AGqet01dR>D93z)R49F`Xa4W0IYRJAb@*`5QEW
z_Ih3ChZpz26=3I&7gxbzFJ(ZwKfE{&6W#|F=AV1uCFo{>&JQov!el_RVwQ(r$9H~s
zF%u>>0it@|ftS}oa{?b;)Wc-Tz%s9sKnbw(!;9JA;*q}<RCj|~bDck4bU=kbM@Do*
zw~f1~gn--+KEMWa?ZJl^Nnll_DPVJcya<MHLqW$jSwl4O&pGfq1}y#Ig$YF33~B}F
zp0(BkrRv=-Dmm6JDm<mKh`s117#J9gT~tzxLsT+2FTCsr%}w9#yn(dYxtqDc0(4sp
z|F#>ipF#K3y#U2+=P_uqaE2Bu&MYsMfojGd%BAY?D0k*~G4bdB|1XY!yW6EKhTmQb
zw0;9$SMlLBTPHYSb$$R1yTQ!{HD|Gy?FBYlrBn;qY*U2Uume1>7!TUq2iac@svCFp
zfJzs(7he@Y>8n)TyVqvku4y1K_7@MqVkO{RQGKA&en$TP|B(B_!Lz*Hb&kDmQ2)BI
zyx8{R|Nj@RV6TCXdHVq=Je#c;N+gkrThL(Jt{EWX96^(K;B#)l=hw1y9^~I9aPSe!
zYc~FE2N(}Q*Tvh|mVVd?s`EN87+(7Rv6p4)jCNLzC{TSL77RK-#qhvuK8MzmC9KUq
zZA)1?PrX**-^atozfXkO@?yy|!voDfZ6Qa#9yC1A{0quHq<OLP1nAt-u;6Z^ZV9Yr
zF!S#dVI#&2@Vp$jANJb1yO;xXfR{t-r4sYzU$!MiAVc`~@vvK-DtU$M0Az<*o&pVx
zb%V~~-2Ynan=^|-sQ~DjD_c;>!}R_Ce+STRYj9%)Y*)9eMkg!BYoG377MNwaAj>p}
zv#eAQG$+E)`QgQ~Z~y;0fXoG7<+}lV>hMd@dD`&0{AlNO(19nA?h@zmeW1YamV2$#
z`9s;6#qvd|xHb4tpi=f1MLR)Ldfm<(ouDoO*uY!O$5<NwnRKvnl%9sG^8%{_Z_6wJ
zEqmbT6gUp5Kp1+RShQI|>$IVD_e+EA|Nn#PZ_wDr@y-jKr+R%<Bwi$e^F;F-&^4hd
znuiYlV#=5z&B_73F7Ab_B5047z}^pDtQ?@d`mUXSUps<*+s*c3$5+VQJ!j`(NI!t5
zHv)9d-X2if;!rnRU|>*y=HcMb@Qg3PptjSy|Nonhu{0l1ur5)NC<1qq(fWU&eX1;-
z*I(FyRtCAKaPaSA-7uS#qxk_N=kd;ep!UscH&BSMsKDaM2^3GZ-8?G%`$V8^V;@!q
z%Tpzf@FWi2&KuywvE}7%P@#JFn==bjiGJgA(6B@a=zL?A7cP<v4BgQjV6S%Gcyad2
z|NmjZnl}P67(!S%Ufj$6|G)D`%K`ol@N8T$PwTf5$?wNOo2sFS0X$DL{mcLV4*#!x
zb7qk!<>+?ic=1kxfuXyYrSaMEfB*k;{(CJ4S(Q+}71S65wY0jKI$ar#yMhK>7&^7S
z9|O%ZLa$~K0x1IZTzynnI(<1hOIcpCf!t8J8ydfdL5)(D&TFj)N-Q9wc%6s4omo0R
zy_gT`TuQgzF8zQydM5}Qy#w9K`BE|a|9{XfKxkT(={(jMq9W3H_JzW6(0D93C|(@-
z3`&)npFkIem9SXeC=mz<16>-NAq)zaV_E<IH-k>>C}nRxt6+HhHRw{Xlm9_ipMa-2
zBcay>fJPU3U4)rl)NTQf7f66Mu6KTV(e)Xszl8r7gRMj7P0%>mi;~Zv<0cpy&w}Cy
zeD8_Gi!-3E4`>M412)Me3iAvPbSUU$0LV3H_gNo%@d&hZ;`nQu?reC;Vhc({7X14{
zSQ$WNo#m;Lmv~YSf9L&f&~W)a@X-G2)b3ywa5wzhA*RxZZ-*301HT<&DYb<}LBk_x
z)PELZVCZJ<WbeH3;)NLcasYXl+r?hY&iw!XHNW9W@Qg+gsF9k?@((ed1Umck{|;?X
zV6*N8O$e8;bRK{Gt{Z%Ars3_^^3DI#N(5ejE>Gb+yn?BOr}=*wcq4px6*%{SH<jOR
ze#{6Ou#1QHG4_Jy!e5tlGcPWg%gWJR%+mU;RJyyEXFq6{ZRg9+OS+wTUKofmFuce<
z{Qo~V6E;6kY5t*5%GK@0@d9-J<ZHw3I-b`5B?8^fJdm_9<0B~fU;pL?PX2BjFW!T0
zs&M82t+sLI0SzqQcyR|LBnz^%^>%3kEG5I&iY^3APJos^y_5tmmjcB&B+oc+0wu}@
zd)-ovhI&SZQYFZ(YdV|$|KA64^iGhEI*)%|(&@}&_zk=$y7R}2r=ZLATvRw-+jQr_
zqu&e^{f4mU2h}Y2qMxJlL$^Wex6*xJPj>!z@l_IZXlU!VQvKEgC4Ar(edmuC+Q0w*
zf6WIjMGY@?{&=w*)F1^7lo=d%<^Y|y^I8@($nMP3?Z(pS%+c(}0=hDS6Rh?<D2W!c
zECdBhCvzt_cu;dL(&Ru^`v3o+(x%&@8GO+YOY49B)=Qwq)&W>>B8`b&>t<@OC;~Sq
zUbyZ!3Tij(-397`74Ww#1l?r-3vf^Y$=?Fneh=~IjTgKie;#i=P{Qo~I<oV|i<#g5
z|9|b=?Z*MC&|u}UH7G32Kr{HD0-1jw53}VdaH|2{QoyLFA;G!*H7jQx%WKdzy}vqd
zyr=-p_PeOCfClPVz-|HWLwXImH}zFF+Y6JQpv4F<4}#|{EkJh+f`-mOr=Y+l)eXSm
z2D)kxG==x#tuzAzxChpHpi~AV0-j<8l|G<RD$or?FaG@k@0xN^F@VUqsF=Wt7^G1D
zk_wuVX+B~R4LR>{w@WK4xQK5C?XD5%6z-G&U$}jwm6fCP`HO=x;PxQbaaPc_5WNsq
z4$!bIxSa+X`JKzk@$dit|Nl*E=CX1GWNZLs@2XVLI1Q-2ZhZ5G1+-?R0yOmuUINzv
z)d0Fo6*O4d+oBQ!x^fjX^6H|Z)0?AW)A{<ii;4lL4c_UZBJf(U*+oT%33Rm^sO0X>
zQL*T*QPJowQPD~3wA%sdWoo;q7-S##2Ri@7@>sDT=w?Pxuyy9BSiC$6+E-DdV!*G?
zz`)<G$;`lTF-66ou|~x}K%If140Mtfn3e6KV!+mXfcb?c==^IJ6%Npu6Td+Hzz`K4
z%@7rxi!~}b-7zXU&LE?Ed88o&Ox-Rj2B6xnm&K{mMa80*2Q;C`(0RP`-RC8sK|M<s
z6&`TC%=2Q6Aasd~=B?~QAjfiax~S-&d4R*xMMbBG3mnle=Q1%cWFPv|9iw8wc(^-6
zMT39;7NLYtR*vR>pCL;Snr*@1S<3YyE%yKa#URc?5Yc*|p6@s-hy@B`!;`Ot!K-m>
zr9g*2vh#22I1$Rq(JNxu_-hpd14Fqh|GuUtVXPdMCrYjOw@sQ5&dLEgedsP|OZG25
z{uUu7&~;&8<4U+7=7J)<`7q1EhPkX9oy;#mE0nrRR5ZH!Y$8}W__zIR{m<Vr7j%H$
zw(SKGtQ=r(YJTX}Y3_CWXCuzv4!WTda?vkCC@V*|^vh$Qj&k-N@Exb%HG|F7KN$F1
z-+@Mpcnsfyc`Xk>n+mKMUPpIl|KQesc@fkt&;DVo4Zel4JNt*S_RGB>G3OuF%#e}-
zTzqze`STCFeg|RAJ@EPogf-{D>st`kyaTT<Kv+``ygt^=-JSj8^3&Hv5XRrvncdkx
zn6+Ogb!Y$3)&|?pzh3)wa5s1B$r7RN>>r&kW`6(KdGxg-NTgI65lDfMtdVgcgq7pv
zeu(2hO0T{aYqn;183tMpr2YNsYmRR1?{{A_b!+#sYz0MH=S|Iny)0&$piB|T(wWJ^
zzpcF|f|aAU;z_rQicVU$0ssDU{QKIMgTzD_p)o0&293%z%MYaj(75ajQPFt0?GNaD
zjs2@4SV89~X}nza2Q-xp%9seZ20`8WFoc!kwHQJ?04n}2gp~u5#iu8NiW+F<wRBN2
z0Vi^k7svTPw`(;X0cCsege16p<5&zT9TvCDh256?;{I<?9SAPr;LRYUGAbYuR7OQd
zMIW93TI+*2h4?tDNhf3|7IJG0D5MZqKD|ho0h(e0EzyKXfEJ-bSfI6tAXc+2XoVp|
z38&$K7u&A=|Nr_4X!Qu_YzNT!eaBe~X0md4bb_`Q=RjG8mmu}?0bT|M@OXc>>4Lee
z9IxeJwaa=TPzhPW1Gz`{#*5dWrr<G_Zn@UmrMF+iiZd_-WK45s<;arGIN8d|@uK|E
z|Npx<7#J9KfQr}`dp`gFzeCTBmE*-e(D^x#`Qj3f1`GXC_udedlo!?FAoEMDdP7uL
zz*jcD$b^W1=7mzMT~t`WYX|p$(iY^XLu(h61n}Cym{OL`8=xMe;iVT2(V)wgLB0g_
zb|*~eJk)xiM4+3&qm!xiKqY(Ug_m5s3=HsgRp;U6v;RTs(Mrm@nfdp(FszAY<zQr;
zFqf61*;=wZshjz~O6#2{aMb~=%w9)ySMzkf?EC;~F*EY^fI^7_)cjfrO61NQua!X@
z(5lbwY7R7Yyxq<MubDyepiPq9(JZf9p{9cR_mH{B*MiMp`$3xlUxb3p1oaGFgX$yb
zIL2|qZ=iB}A1EkHr-0gn0{r`1gg{R3Wno(k5^4S=$=?ndYWlA-)g_vhquZV1#amEc
z%8jGjo#l0Xx9kj%zHrdJnn$1i|L?FE#P5vbdClGJ&hug#sL$!f1JczE+VbK85(F(9
z?R4XTX$7qg??Teb@mjIlUEoDDSgSy{JI`wlkS@^fJCH7Sj!v-M;Bf;`3zNN*4YJY~
zvWECL*wdgba>rRgVG2sdFTy|_BUw;vblzYF3%_{19JF+x*MSA>&t4h1POw)xe}LCD
zKsH$+%muA`JKhUAP+h)T78Ed@a-bn35Ubmr1$>rvr!z~peYaWb|I)h<-JqHkI-d$&
z-`s7{TfovAvyY|oMzaM&uLDcz55tqMxto8nl`?mGurwdw=myPpz3=2*GMANufA7J?
zb3oOFEGYkU-UOfB4?17x#Z*oP25{f4@eOGFwG*^w0(8$L<RHn;Q=q-9$6ZuFH{3BC
zcTuqbg}`wa6&olG>b!!)U7&mqP=n;Siwfw#1qQ?aFH1NW7@GgH@VBo9wZv8S{zzcu
zX!xmGYS4MFJ47W1bO<$6Csq@{LtHO)IUp+&L4{p0=q6`_4ldA?rNMs}6_b~s>$Z9w
zAJ~A#Yr)so^CYrzbl%$!8qRq6iJgI=*+(US=_Tl-ZxD;+r2?pK^-&4n03Rj=5)*jI
z0~J#M-^dISV+0R!_c~s%;Vc);4pDIdovYL9!UVdM+T|r^Rc6Caty0C_VwP^{&KMP!
z*4zA@4eSgI-*1C>AQPBg7O*ogH2l=#Z;fMTV1WDB1LWiVpmkj@gV`AvAXW%vhp2cU
zS>f@zrs1a+f2#^e1=J1?kR3AY;B&!2K?e@(m;7K$a!P{h`5S&_lsGp0%qr1r`04YS
zx8Y|=2~We%suK2wpM|9kug&3303Rd%@+xSj8$2Gs;dO|Of#JW8ibLnUmzzOM7Zr!s
zpPOA&9GG6e>2?7fn$A?m3hu&of_eXHLCrV^P?MzLXC8mc4^{?-dZUJ)$^0$XSr{1V
zg&Teblw>yijNorIXJcRhcgPxkra&&rZ1|bU->LvwDO}O;vzWhSKS+l_!_WK@t%jck
z{H?4YDU*hurTi_RaqQzRDn6jKbqzl&_*-AHLgxlRqM#D}CFl;CMjw>`(BKLv_!YXX
z4c~Uws91F7sMs_gW;yPn;sH_!(f~5%<yTOP#z!T<0qn5@Odtu+Y8BAI@a>>A$^TVa
z0}?@ZX@e%xEjo`L{3{PK>opJmez3^Q&JeK4uZ_CF{LX_1f690IsMx%I1r<1c@V|U#
zjf&0do88QyozE^R77#t4Q1by<_PPjW?P~#;>p>zQ7ed|D{DY<3=f6s83dk+nm|rvV
zZwFfk%Z9I|x`ho-g701j+0BFI@7DrY?A8ILLC_i`%McZlVjj?a;MzVaCY?Sipq+pz
zJ&CLw-8Cu!jn6@$*;%8KQ3`T#%7R2zj&Ck10S+ago49QlDx^Snfp>?f*mSz66m*8D
zlpJ?aNdTGsS{`(fI_Mhl@3)#SGJL<;8KP3q=>t&!>N#}Rs1$VPsFZZtsDRc_7=8m?
zoIMk?!WGolc&!u|2pS;*VNhcpJfyRhkAb22hyduinh+Hhx9$)X7H$!h(yQGrDgg&y
zuy!15c*qF8*vE&Xl(W~3(Yi#%qZZT`^sqcu%hGx5HGg-FN(pz3N<k?r_-yUY?;y``
zl<+mzsQ3tgTdhBuk2CkW{h#^$KjVi^7nPXi8kGcwQtnO{l^T#*krK}C9F-W?&K#8*
zm?njTC9KUZDm6^qB`N{U&zMWOK=WXhE-Ehd!rdV%E}c_UK%v+jqGDip;5DevV$hwV
z;?lVWENpnd+C@dDnB^Fgf|JAl9<W$<j!KOsM7sVV*aaorU{xB&m~>w&fgHjD6%jke
zr2Sd|Bq9J6ftb{CvP2E6h2<ENfm5#sqqUEUPO(69jY<Zi<bmb~3e5*1I+&b#9U1*f
z^}2mjVk{w6*NeQCN9e=qAm$L2n9dND2xb?Rm`=$4jLxH-*LvMSi+Chp(Fj_4Bl5bu
z^?wPo|7&4CU+Wwdonq!=Z1MknRARboR3xB6n&5N4!S}Iuw?KS91v342jRzdv-61L|
zT`Wu;Y#@!`gQ&47o(NG4ONPxgDlrW8O|Lb(eN=QTd%y-3^K{p!L>yyRaPO>9iTDq3
zIW)vyvx5>*^8=>V10}r3!M`861BKB=#efl1-E@NXY!tI}Gk3J8fDRVvT?3}Tcg?+)
z>eg<3TgtlkV*)EjFKAu>v_j%Ns7>bCT%+Rgzl6)$N5!L#rQ1iv!_r5^rOqD|b4;Zk
z5Zf7>e}Hea|ImEMpgTsz1ax`3b&QHiF?V;3ib01s$l(Ug9+oHSK?^rsI!|a`=w)H*
zbWw3(3{f%B1ZCjUhL>Keb-9Q#bhxO5ch{(x^s-o4yQruX^LIf63_94s#&|om-Y&hy
z=%Zo+atMFlW(EcZuw(dJKqo(gI{jelLsV3XK_Oyr%#}d_l<p0jKn{2glI-+RaRCJi
z$mZ9j-61Lt&4-wpf3cLO_d2uuSD9J?s)>(vGk1lkm~;rd4(>eG&D`yyVv^R$@!Ac{
ziBU1>lz43gX4j~gbXvUD1G95fOgcf=uz`ybY0$<Utd&2cLNomTnz!>FsP<rZ4O+&O
z)A_lJt2c|WGe;$-<s^S=^>^@KmkQVjPEbBP#>DU%bhWe!LkVwpjEV-R{5$5t{U5Xm
z(4_GQs3jB~7aw~VJl4VkS|5h7Zu10a7u^w=!_99bvi^ftaTs2D!3<7?G7x<dS^r;r
z;s&K*kN{ZSi$`euOKAK<a6V*Q{#du{8c<uF3sif2_%GZY%>lX+uk*u;3@*^wjuL^L
z7dsDuc6V2R_(x<w>$E{rHP?G%RA3J4y!9fBn}MMdl*VO1JK-)hSm>2{^cFCJj#gj;
zJ05%wybDOx;cg!lkgC`0y-tjvWqF`+cf?uJuR3pap3wa8nkD-ZmqYUp*1GSV;h-`W
zboUi#5)0B_cyW`HfuZvj=-Q3bT;Q_~L6@5dye#7ZaX?|g@nRO##h`wsL>9-3X>dMx
zeht){5CUbkh!5StJl(|{%~p)1Qr%uGy)0aohf4*Ry;(ZFSUQV1I>UH6FTYkg?*0K(
zuPpr1%F5B{EO6Xe<Ozr+3*vV>3v@<^G}|$jYIFy)^s)$B9xIh&4rA#IX6X(S0WCFl
z66g#N=?>!o4X-+ZE-UG_1vQ*Oh1$LE_Y{wTwDAZl9t1DUkSk|m{MYOFzxfA<^|QCd
zkb!}b!SYa1YUg#$@0#aZPnPKRvY7X>Fhh1$c6zXYE-DG&=yc-gjNs{X=I9O<=?oC*
zbQ0){5a@IkY5i8h+F8u<TB18x1msqTYl3+|(^g>D^s*Rt{sLVX*~`hm019Ssn;pFF
zh`$ANerj)qeDl)}-Mk>*zUJ$WWU+kB-wbLsb$bdlTQZft?VSrc=`hXkb`}E|D(wWd
zKs#?49(d6RT5NC-v^D3)fBu#)pus}WqzOZ31WUK*2hfQ$?3SmBIJ$#)nyr{hzjQls
zbUJc$2J&=zada1QboznrB8Egx6book_`y;E=17*#C|KlNe64t#5fL|z0>>R8aRYX3
zx1&I(2Q+R1S$bInVQ~|PJ8mLbdR-MP4|f*|bXSTLne?(~b_a4m!dmlnX9UY}kZlZ|
znJk?iJe`nWcjV|S5a_HB0bP9PF7TQMs-#??vreSf5qiNAWT8GRY&#EkUTD2t$^-2U
zzw87p>%COU-Ff3h)L+mb%xnAJBKhWLAG))@Sbi<y?0j+X1(W5mV$IGEFJeIp&|Oqm
zdR;$sezZJR#?*NbbW(ojz0XTJZ@iEO9ex_40_wa$Pi=+tH#<Ss@cF2KR+oZqtCv{$
zpPzxDL=duK40J?W^NIhU*gyCJH0db;o@(<^5rA~)K*^(w9hASo`3Gc{;mOwm{M$tM
z`M0s~IeLR`x+`UCy<PeSvb6#1&(33=XFE?He9gqa?Na6?Mn*=)=BLb^$2)I!UikBQ
zb?3{^tH2#sa9Id4_i*Pm%L~QqoyY%tUh<l!*YQ8&v0fYIzn_=<flLm8)Ew`;W_YPf
zMjU>i8dC{#^Mm{R+jzvjHG<AL1@Rx=chWpj%F=SX^eV_p;5|VsprPH)(}pKsn|87A
zgKi4u-*(|!6HLpa`yh`%R>6UccyJ%;Dc*(}6=sGKkl&7j_e{kf4i9U7qtbcEnl&Yb
zm7|!uo24})1+=cP)Tq}-MWweyMfsSEiZa7~P$S$AysY7S^C5!{G0@md>AU?*ZLA!c
zA3rbI@u!uQqxpzRTs&kvtn*Ow5BqYEaZifD#v$!|b4g+4c+D1+5s?Bq(li4!<^E#t
z&;S2-fLNgH1v;ntHAl<IQf9*ghaI{&EH0LQ0@W3;Fgw{L!_U9%GRTvT;K%}n&TCNU
zOqdYddD!q|7YkPh3%6s-fzq#?H^6&xKw}A@b1qK)@B9uwpZ~#c@FX7_C>lR6fe#yi
z<GcBd1b7{`Nb~9co!1R7b>0NsLf?7r`!&DL_nkLCt?NAX{gPK0Xz6w5ix+I5{__#Y
zg!_aEh9_U%1tl<WW9Q{15EFcEQ|Do@$cqE)pjFD9H$Z2iGZ`KL9nk}kzYN-tv$&*#
zm80|44iNR?DddhDR?wQs*C2(^dc%^1fdO(G;|-AL1lSq3-3%|RK<oUDb>4V!7qn&t
zyhI0n?(kvIs?Ac_-U6PTIsyy~ou9fHUOZw3?YL?^P$$;u%+guR(e2H_zdcZ(mqoDC
znL{&}rSk-684k3b-C+T`(|$Q<4()L3ff9{?fDBNX9`-_piGiV$8N9ou5|r~3Kyyg9
zU$Y-~1`P`_bl!-LjswMEaPu1p$ma519~F^Z{2>esFP4C&SHK(2TMvMH7YCY;NJPWN
z`9RCQMPO4;ph17o<pQ0Tvk!Ca1nrgpEwt%8-0ScibovhaZqSyA*PsN>v>CJ_Uc~S}
z=#mpq`v}xO(!2rcIf166_}8EA^ig4XtqYpo>(ycFeAW5ke~5}f>w!8^kUWV0;xj7)
zXw(L@P=LXmxkQBrbTwts+2-Gj<qgd>DiRF*t)<{SCXkp1%_o8OMu66oUhO>pTEFw(
z#do0HEBxz^^~SI=blw83viKjOqSE|>p+vl%rSto1ZjgMh4)gbGjNe=Tm!37e4ccx2
zDPZ}xfloVbe!zZs0-Vi!cmn9$j46kje<<)zIly_L`2pkM2{3t8P!|dm&fxtXocz-c
z@NYW+;=}d3Bbmj7#8yCJJ0P(Ikl2h!Y>vYdIuAt}9_W<nOkxS_%;M-Q;_0js==2gf
zJgHl%JBg(`i=(@Ur@Knvf0D?A37}vGO+$ggw(%500|P@A>q~7`P%%8A`Hesp18BPz
z2*1z*jW-;Dv;`GFi3HTc)%jndqVoc@wGR|tpdNYi5gm}fU}4Up0$P|2lLY58!`q$L
zIFFSIoMkZlX88YgFyjHiON=K4Z?|5m`~ntHu?|sTDHkeYwPsN%=hkFVkql8`VLT^z
zpMT8-#*44`*W6^h_`35h=h@P0%{3|-3?%~HEGnSxG-zj1Cu3(IOXr8qU(jmr@Pr9j
zj4vZu7#JpGF}(}~(;_cHcSlaha(D^a>pmf?=p`uMPRQbZX$X?f0L>u2R0A<5WPld`
zzm$ToPl2}V^Fi2WL2M>4JB#P#PiBz$S}#9>X`7cXL3GApkeYiS=7fwRAoe8)8#J}}
z@)(2-8j5=f+K)70LI&tikC*Gf;#tfumx35sEHCGRX||VB!L<F$UJ#ve7i8Wx5OYG7
z*~>~0BLg&Z{W1^4oRF~&B%cIfuLrTi!0as5m%boImfuTPFdhBU7DQ(p0I4woF`?zG
z4!E3E==4#MdClqy8dYnqQE^}>QRUy}$^fav1WKQSSB2W>LW&2_K5no|@U~L$flQDy
zQQSaU8OxL#Y8eblRk~amZ7NDwY$8e}n{!kgn3|7*2Crm5V@9uiK`I$a?7%85K(@Mq
zj)(z`e7!aV875Gw1yTYtOcr675X>;J?J}U65wt0&+eJkNG%y3{(K~_Wy!qE(1E<Om
z6%qdRml;D;Ks^9~?~g%+5NP-YlqnbwfmoftJO3U0C(j(C!XaFu!UJ{>$a;nnJ^p>6
z482YlI*&L1;4BmCb=u!sb+Y+~WEpp_)BNTilI6U;RV!QnSFl;vsL0fGHrJ>qFqE)$
zgEq#1JfOl*!v6hs^EHO=_d3CQjdZ|0wk}r&8(sdE)&Ktgx6$Tr-3D6jJrA@8E<702
z9snJWA<*fgBGOx<A_Jb7HN4b$;q&TV&@P&boi|=2f@Y9T{ck-`3hGG;bY5saq7n_N
z`yu&Jrt>IBcejs<f#pU1cF_H=pe5v>fdEhm-Ve&+KN-7YR7AR@J7QFXONv0t1G*d-
zLAwGi4ufO)hkKWcinPUH$eL3(!`qstKq1xqk_ogX;<ZJWkBYRFk1S&e3*+zCTD>8%
zOdvCw4={liNW4(^2CCaj1-e{Rgsog;8A{oDU1S+vOEG@7j#1$$JM@~b%ST1nf}@1P
ztAyF%^(W9OAV?_=o;QFuu=u(}_`6v6I#~ESMED%NTW^=X12;6lhpmGSIO{ytdAheo
zg#~=;hv9+Gt6zimfE{yTVPS-vN&m4UMuo-j(rZR1{%tH`{QF#3SS)Xpe(Jo?cm$*$
zY#OZoJ_cHiQ35)z=gfDI`%74kF)%oEvO%um3l0kpZ9mm{7*vyWm#9c|*Qm&J=cp*0
zZLnqh@c(~od|Y%?5!d${i$Ocjnos-(m5(4jVD&L7poL&EpoGy~qM`y`p^&4Z^Afa6
zmw|ynwb)j*n2SNR*h)dQSRpUJL?JD|G%tmVp)@ZsCo{2_A+ad4B*RLfxH7LKu|grW
zs3^b4N<m4rSc$>k$0Z=#g~2C)L65=NCBQMngF&AmIWbSYL?Jmvp(I~HwV1&#U!k}(
zIYS{WGbfe7C9^0sxg@`+QXwxtFSR1GxFj{N1Z*{!P))H?U<k-8NL5Hq%*jzmOU%qk
zO<{;<U|7)0!eQFW!jaa?!m%5Q&-Su#z%Y9s3x{Se1l#noa2)An;qd5X;jryv;g~a<
zmE%bl3n+gxs3w(W=9FaSF+hEqlA4y8mztuGnFn&JLT0f-qC#;-YEF(qc4}pLeo+bo
zSS(Kg91;p?`9&ag5DtSvqC!bgVsdtB3PKvBUbPsc2&@rmSXyaba!F=>9z$_KYI0^`
zjsi%TLZX6dF~l;MtE`ZNzo0CPL5o2@DKk&MID<hoCxxLPu_!S&wIsC&tgJY-gh3&{
zNFlE@Cx<~*PYWD>s>KZ5>sdG^uV>-l-pInSbUh2l+Vw0PaqCz({%m03P+!l&VQbaV
z+}P9t-aTZMn3GqUYZc4Dz`)RA&&pwyoL5qm1L1D~@pJOaQ;Q({J0N~>L1J<$gwNo>
z%3+n5Q;?Ae;ZFd`r(~vQmO%IiK>UKD%seRn1&Ci-PyjQJ2c$nKCowM@qJ9oYKD{Wh
zAOpg`0OA*bLJq?J0^(O7ERb+u<!J0+V9>IUW^e|lx%`4ua6A@gSSgg07UgB;r7Ps8
zr78HixcWFoD&*#;q;fGt=9emDB$lNr6qn=|6r`poWaTFn>v1tCXe8$sr7EP9<`$%;
zXfn9u=cQ_>LKz_QAsM46n?XM%wM-uz=zjSM1x2Z4nfax~AX7j|J-M`~C^fGH#s#PR
zto$TU)&i&S#N4FJ^wRv&Vg}U|E{15;lvo7?1%{x~Jdk4<6l%CswUSj+6c|*CL5yMs
zg&I&=$|+z7Elx~NwNl8=%*j!R)-6^j&P)d-CWRUW-QvvjywY4K3nUn;5M7X&qEG{J
zMXa8lo<e>R7g(cijzV;5MP^BHNn%N9aV$e-URh#JW(vr#yu=)ZywcpH)FN=2O3Y0K
zyE&)Wiot*jw?dF<3J~MK>MLQPo12)K!@w0<oT{J%QlkVa4RTV!;SS1QdXNGK5~!tl
zDGd6lCCT~)Mfu=jLJ!7p^$TP0FD+5XPg4M=Jcgq33I<g@lYB0Q#M1P923u`ikWguQ
zenc^YXHHIPdSVVZp23cRd9NfhH#NVsgrUHysKkmPu_#?3IlnZogu&A-n1O)-v}zDk
z05&x`fL5}@je&#)*dPWEe_vO)M1BD%FDvM(CWB%eWE`km&{a)VfXKk&Dm}F%zo4WT
zBwAcj1WJr$iA4(0iACwL4E_NjjzR8NjO4;@CKpJDr=JV7bS=)vOe;|+$w(|w$W6?v
zWN?NiJBR}mic?EUGV{`lxft@((il{A4b6%{K7<7jRFy8ceAZ1?C`v6X%`8eSR!GcK
zNGwV(%>@<8sYOMgh-1jhPtVCuV#rL-%P&ez%}-;<%qvMPN=z=vEK6m`&Ckm$$uDBa
z%TKLHO=c)ANy*G(r~s9UsSIVQMM?R^sSIVA45_(^$;AwL`N=u?NlB?i42d~8sTBqJ
zMI{V*`6ZcYl?-|LrFo$8EH6JNKb;{ZHK{b6AvMi2GdHieqAbkSIWegeR75eb`>=BG
z`>=9|`LJ>*_^@*5_^@)A_^@(V`>=92`ml0%_^@&W_^@&W`>=9E`mk~&`>=B4`ml18
z_^@)+_^@&``LJ?0C8j8(r9cxqLoiCMrdkZD8A|g~D+*GROHxx5G$1Tc<f#^GqDnIO
zW)>HNWYje^)fqxT!IGPqmk82USeg%_AkmIcSF6qdvc0%8skkJwq!g5l7+n3`K-EuD
zVsbWEmja3`EXq>z(-d+Oi?UOTz?G1VjY3gs3b--_RVyGvL1{22KfgesEU_pvF)1e%
zY!$5LQOHZoO=U>UO95pia30G`Ezil!OJz{9R$@?617Q$RQ=`P71i~6h3`&|x3`*7@
z=>#PPB}F9$rR2ooR3!$blzcFe2V$q@WTq)GD5d6rWm1b1la&~h(lS9revuM`5?D4f
zPl-XPBqJ3>mFAUX<|r{Jm1kt;fDEWsVo<78Vo+oN8P1TB&ybRzm&yP#mH}ia1IS2*
zv`hw&b_TF!2C!C!YKB^dDX&;K+F!76+<U>ok@S*<Bku(ZN8?Ktj)M0r9N}+SIIg~A
z;rREGg@f}I3&+t{EFAk^uy8cLV&RzniiM-;4-3ckUkH5Y4+{qfgT%CcBg8>`WX$u6
zg~R+OLjJ)|77h?z|Az&9p#><RGJ;2Q89;-DU>0b!6@+j5vT{84W#xG9%gXWDmzCqY
zFDu6%UseuAKUNM_KUNM-KUNN2KUNMQKUR+AzN{Ra?yMYQeyki)eykjdeykj7eykk2
zeykiOeykkUeyki$eykkseykk6eykipeykkfeykjEeykj6eykjMeykiteykj2eyki7
zeykj|eykh~eykj=eyki_eykk*eyki*{8%}x+*vu={a88d(^)yD`>}G&@nhv!<j2af
z!jF|>6-b}1w!JL_sA;BJ3@Uy=Wp;8=YGO&M0;J6d6NFa3kP?%Dp`VeJ!;^`XBbJes
zqlS@{Ba(@gqaKQbLVP{_v{h3Wzzh)S7{O3dlvtpks|#v{f=Vlp;Yo=ppf*+kgD$Aa
zW~Bhhjj7<=n_85atWcJiQ<@5{S;5ZA&n?JFElJI(R7lRxD@!dZNljrWh18tjmPi^X
z_v9v)fJ<QoJw3fx24!7s1p@{x14AQY6H_yD3rmJvXtqwvF9In|&PW6mcd12SYhZN>
zH1n0EGUVke6jv4}=jVY9w^C3|0V~XhR9i)fdFc=bg8TxhQy7wS^1%g1L1IyA9^6x)
znh9L?B1EF$j)`SJDwXmJQi~En<*sfKgKjy4ZUuvGDuZqsgKi3gZZd;z5`%65gKjB<
zZaRZ*HiK?4gKi0fZWV)W27|6YgRVP+t`CE5FoU8kgAIcngKlaegKl0bgKjzqmoVt&
zq%!E{lrZS#l`!b$moVt2rZMOyGU(<rXfQDB7h~nPBF4&bUyPMws~9WCD=}7%zhbN$
z0^+P3%HpgXX5y?Ip5m+=G2*No6T~5E^2J#>D#Tei8lilUJ`i3k&dRYxoRx!3l9j_=
zl9eM@l9j_u0uy^muyRC7uyW)`uyWK(uyRb6VC7gP!OC$&f|cWj1S`iU3096Zfvn)X
zw?2@S1GG$MQy?n`X!d4nAS(xG6mmx(D+lNl>)nB@9H5hE_XV<YfDUXq7|6=O!N9<9
zB#@N@bn?paKvoVu1_p*xfvg;$A*Zu}tQ??0gA0MI9H8ApmjhWjKtqq$0$Djgvkjm#
zPe2Fs-V9^~U-xn+kd*^;4B-7hRu0f*HIJa;PXk#wK%)gO16esF7#JB|1hR5SGB7f{
z4rJw!Vqj!=8_3Eb&A`a;K9H3|hJlgcb08~+ECVCM_dr$-IR-|C-+`<g@(hd&{{vY$
z6c`v8n1fh36d4#9*n?O(1Q{3^xPw?ZgcukZ_=8wEgc%qaKzUw?fr&vlh?PT`ftf)p
zh?PTyftf)vh?PT?frWwBla)gae6lX6v;y@3Rf|Dg2yngwcO^256^c?5Qxx*^aw?&{
z3s3@vRW6YFq%4ggAlT4WSpiI`fG8tdI}l}JtE~WSve+6jFo3#-w)&;TMfy4U$%#4o
z#YvfYR!Dp}7a;)_f^d^E^B5RFtu<Q(PA&#tM^7IHFbOi10n$CqO)bex2IZTg)Z*gI
z{5()01ns1zWR_)ugcOo06{=E;@)?jjvJAPYxuEW7YDGq3X)&m{U=UDe<q%hA<&alr
z<uFiZ<#1GI<?vQ#<p@=0<%m~j<;YiO<)~C=<!DxC<>*ys<(RI{%CS(Lm1C7UE5~Ma
zR*qfjtQ-f`SvgLsvvS;4XXRkiVCCS`VC4|eVC9g~0LAa;|1u0P$iv{wV94<KKMcae
z@zJ0EhcKit6f=l3G%$2CbTfSU4}lXHCNNB9m<%<IfoWs|MkZz!RyKAHPA+a9UOs*S
zK_OugQ894|NhxUtuoP5)0YyqiR!&}lnFUpku*m=a|0N``n1*RShK1-3Kywd@<B;45
zcC4tFI0IO{lr-33d`ikHs%q*Qnp)aAx_bJcN{f*RtP<ocuo7ladB@78i0La#5#%rd
zYla31+%QCtfu&*L2j)P663he>a`Flc3{sHtgo!~yQXI660>VX*kSO8f<mKk#5#SdR
z6crI>U}9v(1faCb$iN^YD~AJo{`~JhJ4aGcYGO7+atcFoMoMN8Lvns@Zem^vLvnsz
zNoHPYDnn{=Mm|GoSz-=DT4GLdDg(4n#*mR%oWTI<`7?kz#th(6i2>3?U??b0VE~nV
zU;<qJ6{UiP6Bxj~E{2lS;u40EqS91`(%i)2Y=-j0%o30XP2E^Ij$B{?*E{@PtQ=pu
zAZ*ay^&Tn6#sF?NR*s5B7H}Q3HiDHSq8p-Sa|A2Loi-M5-L(zM2AR1hf|X;zVu<(=
zB=u(_SUDv4AZA{QVCA?n6Jm~;4=cwHsJ&c1tQ=R)L&VcSeI;c`op(KgmE%np#LT-9
ztQ<G)LD)|tSUEJ7K*q^lMX+-GI0F%X53=_xg#88NHbqFC`YVE!;|xE<4UCbj95rna
zy{wU}91%Am>bW9WIdq`*3P-YX7(o5I!kv}l!xM<xq#{{4Zajpr6(U(VU|}^OfR)37
z6H<?>Mnb|9RJUv9uyTA@46#cql9gl1HHclDZmb*u%@B5(4=cwP1&Ce)kiDlM;;*$>
zInHRYa(u>tLGm!U8&EYMu^(Ej93U*A&B}p}g|%5ZKo};jpv}s$O`DaYTbq^RAPx+Y
zhsn)`ssV|e)@J1ZVMZNR4s`rco0S8EVd6qMptcDQ12Pl<^FX8k0|<&RAVZJ{2Lm@R
z0}m8{lGs3EUQnM1(*e8;EDY=nyv)3yrWUF+FE0b8AhHrr3IVn7kj0SMyrAYD12^BG
z2?Ov#B4igr**vTapcX0v=w1m>6hnnE`EUssgNKQSfdO9_Fo4^#Lm>>nUSh@cGY?1z
z)F1~dz(Vlw;FASw04W#(VZguuP6wQz?gQA}#1n+_0{E61;*A?Pl>!U`pk5dQ=sb4;
z2I#N~XmADWBmn_XV*xt`Dd1pW!3jX}8lb^^O@=02R*tK>tQ>lJtQ-^dSUIlhv2qCL
zv2r}qg<vTpHb{&OjsFL#?h}*-sZr5m<uEc}<!~`z<p?!k<w!GN<tR5`<=AJy%5m6$
zmE(#5E5{=PR*ugGtQ-ZVtQ<9_tQ?)DtQ=EKSveM(vT}eLc#u&EM<-_&S2vJz5n_o+
z$tkI6ATfppD3|~SP!1Ahkbnww-~cMF2?mN-07QWn7${)@AbBL4urtx^2WdjaSnLG}
zC4dM;MMW&uf`t;mq>_@7M`!?pr(Xy|V5nyZLr9Qg0E44bPzZxlXfT6YfGdNyr;iUq
zXmF4rL$IrR7>H%W5a1c$$`Ilj<jW8o;_c=W!r<)T<HF$V?-#-l9O56q5E2{`zz`DR
z>BkTf;vdQo8syFp;T#ak5aAXa#Sj+a=o9425D?_=#t`o5=j_4Y>CX@l9>fqF37S&?
z#mUwrR*s!XtQ>ojSUIjHv2q+rV&yoV#L96diIw9*5-Z1*Bvy`_Nvs_Al2|z&C$Vz8
zNMhwsPiEzKo5afTDT$TiXA&#Nza&-;=44h5j$~F2-egt|p=4GL@nlvG>10+8g=AI^
z)nrx<on%%H!(>(t^JG>It7KLVyJSe44CID^!a=EtIl7=}7ueL2Y6?SeW;$q+Ni_vD
z*9di3MH(x|gfv!;RcWjoyV6)Wyb4)4E~T+@yh&r_U`}V{5KU+0P)%p$ut;a+a7t(8
z2uNq;NJ?kr$V+GCXh~<~n3K-Ru_B$7V^=yW$H{b7j+^PM952#YIew<Ia`0xbawul7
zau{W>ayVvy4gg@~$jD&jD9vEy=+0o}n3ciGu`Gj?<5UJK$BPVB4z^5I4#`Yb4&zK#
z4xda`j)Y7|IJRW6a?H<U<=B+T%5g4}mE(CPE62A?Rt}adRu0)LRt~EyR*ujtR*sY`
zR*upvR*nf-tQ_;QSUHwwv2yImf|zkKi<RSE7Awc6ELIMdY*r4TY*r5KY*r4>Y*vo=
zY*vnfY*vo8Y*vnG*{mE(vROF}WV3Rd&t~O#l+DWVHJg=#BZrkkFNc-GGl!KUEr*q(
zHiwmCNe(N=$sAUWmpQB)lDVuL_PMMap}DLajk&BGQ*v237U!~Z9Li<oxSz|)@gbL$
zgFlazLoJV$!#0nVBRr3lqcx9}V{slU$C*4<j>mbd9L)Kw9K!jm99sFT9AWva9Oe0}
z924?cIacMfa$L%1<@lD*%Ar!g%HdwX$`Mn*%8_5d%289m%F$cE%CWkDmE&juE642u
zR*o+PtQ-P`tQ>lUtQ^jTtQ;YQtQ^UOtQ^IKtQ@U{tQ<26SvfWrvT__QWaYR~$jb4h
zkd@<qAuESJcu+GlKMy>+U65Lon^^)HknuxWKmeMXgp9oA7gd60%8Eft3kr(zlT(X}
z89eh!Qj3a83&2w^mBl5gx!`pKaCIrEWtqvTATttEQa}Sm435y*E`^-T;u3|D{CtI+
z{JeAq*NW6+*hn#Wy#r(}B{L@#Hf`jWuaKOPnUkUbwL7(#A*85MAu&BMGY>Xn2^m^q
z2mtv6JSe4*lA4#9ngTWq<^rdj{N!u}sLP-eaVZQgaF-UP7U!21C8sJRl@?brxPhDi
zUN=$9;9QhnT&xS#nUk59jpk1Vzx)z~L<K}}d4g6qAaS9SzwjA9u;C@3sUwB_vecrq
zocwZzko<h`45I>ga33^r1X|GnGPk6%Aho<Gvm~{MAtbe;1iZcj$&ui&Oe{)I1-q&s
zF*#KsCpE1^AwLi5S@_&%acXKdLr`jBiY}<H4Kb$}9D4}cLEbB7a4O2rPR&y&$Sg=@
z@J%eqfKOH`KnL4X@^ce2^T1PFrFqE^HASh#r8y<wG*y&ZP?TDnng{kHLl7)vQ&JOC
zz_C!CUz(Gmke{4fS_BDc(4-k6RruvA6s0ET7o{kGR2M5GmL+E9fP#y`4YW!DmU1&e
za}b~@)YKG|^)4j}sksFul?YE2SLP<==VT@;fPJTsng^bhPAy7J0fkv^YB6Zy0_2&L
z)Z)yd)D#6!kTZCuq~?`mre&rUDHNsV=9i_WFgRx<=H;a#=I@bb9(+>EQgalH!2U0;
z%uCKF%FoNJN=;#aNEj<*B<6r}8H@`Gpb`e3%)D%9Qip{tWFjM=D8D2>IX_1sr6{uu
zx)3F?q$Dvp1LA7uU{8hOlA_Y&lG377q!5A_Zv?Z=6Por?E0Qz76C^MJP!32fE>TEH
zElw`VEC9`MxI)z^q=6Q?_~k1k=H;iPGN9{7Miwm2$u9wCv$Xs?Xwrnt=D>0mXtpR3
z<kHl{Tu^AIB$gy1IX5ITH?;^foD2$gSbi=pDN0Su1&xbCvScxXZ(?#rW?m|2sSn7&
z{5*w{j8uiZ)ROZ2qHKnM#N_P6^i*)rXXX``fM&f@82pp6Qj<$ST0qfPk_rjyjKpGv
zq}0?rh2qpQa0+lt0Zm_J7N<fMTrmU}<$~5MKzYvjxw)lznaPQuDP)KkC}$O?=A|&e
zqX<%R`IhFCWM<?SC?uAYfD&M83PX@vumWhENM;&n%pA0y3szQuLIIla7{WkPYmn3r
z%EzGcPyx1H3LISE<mi`}3-MuTUS?rwD##Tu|AWgDL_|Vnxl_QaMN%1pQgic5QWc=Z
zpaLWrq<|LMfWs>>8C0SxBr4>krlzE(C=_QTf^tAkW>QgNQ6+;TSQ<3<o~V$V4=?jk
z73t+<CMguBf>&OFEKk$}6%%mf433Zh0hv;g56*-jRiJ_kw59^p%FNVaklR493|i>`
zUM7a@B4{z2QwcBDk}6A56^c^}OH=cbL8%pM)ud3I0WNcrQWc6)i%Sy06PCfybOtKt
zAaRQ*GfIn7i;5Y7^OLhvOF(6E5hMkGE6qIJVz4-aOKNcmXdwcqM1ln{C}V*WvoEw<
z0r?YL*}>CGc~O2|I=GMl$2HV2xHQP`h$0U~xVW?cw3;I|1?DnP(g4RJLI$;Zhl_&}
zOi58<UNOi3h19&1g8a<95=0_SOU%v80WB9SQGn}VaD-If3fLq;(>w*xQVOmxF$XlD
zTM3Ha(&AKDOePkCmQI0}zodfZeqgDQ!4HyyL76lqzdR3_Uz%5xnwXpcF7{!{Qi}4y
zE6I}c^YWm{Eh#lQv9vf9RC+^7)ZqNIlJdkN(8|Wr;?xw-{4`8$ViIU2j59(rSO?f2
zsi{Sv(kZDlEiJVOvIGjbl)?x%kc(k{g}Np+g&_p1I#7Hf)Ho;RfdoJ$h(cl-XpJFe
ztSA&`l$L-41l}wtN=-{G0;TX`D}`jJ5d}G!$*BxT{sDCaQb6?xvS3ka8YmzbJo1ad
zr6Jf{P!*eBT9OJ{EtZjAT*81zH85{w=7HK=>EPxYLN+hI92B_)Mfnh!;F83gR0Th`
zU`Tr+BQY-}CzT->UNeD;m12eDoYX|{!aGP)DZ<syGXgxb38`zrdO_h2ktj~hO)SXB
zF9I!;f>-_EMir=?fUE^txOwXPL-TK7X?{tfLTW`axHJP9nVXuDS(*!3YReD~&UsKF
zP~JiEw{v1%aw=#UY!GCXRtjioDmZT;GNX5Dr2?o1Nv$XV=W!SxT%#1FmgQ%srZ9j6
z%M(G>7pMYCO#vma;?yEglbFH3JTJ9KAqCVp4K4w#>;R<&P-CYowFsQlJreWMOA8P!
zY=*$n%o2E62ddpbbv|e<Qb<u^a;iRfUIv_%A?r6BL1`S+^eruh28mlvej;d*ngT=>
zC~Uy%>KME;b3on=Ee54{NT1P=AviT1)TB}<%goOK7kLcG@<t4fIf+HN3dx{`8AAxD
z!3|!A#SmPQn4GPUmROoo!r%;UuY=aKftpOP38G-=Do_njQIMFU$p96A(Fz(RC7^Pn
zptJ-o2NBCJEddLL7Nvt$e1al7IX^EY6I3NLI0u9(fRepJPG)Xq2_ojfbz*U5RVunf
zSY}a4X<`mo6Qbo20A3IYuAxv`B;lEPDf#6JV1r;)C&&Q>`NhSVNja$u0iboe;04sB
zMUa(XkR~;xLj>-9ix#nR$P}@1s1>ntXcw_^*cY*Kgch-K#1^q~q!+PrG!(INv=^~*
zOf6#NSY8C_FK;bk<v3Wx%5kQMmE%ScE639!R*rW?tQ`M~SUK2>SvjPOSvd@fSvg#b
zSvg{hSvkszSvh)&Svi&zvvTYxX5~0q%*t`O7}6&OJ7Rzc(3)@%1|7x&nuCa#$;vTj
zCM(B+nXDW?7#SF5%x2{P$)Pw8H1dcdfZ%{eT0uOXR#py`R*3&V<I6KbAZ(Bv=tPkP
zA*>uf&Ozp`K>TG$e31H(5LS+sIS_de-xNtdh;M_&cShrTg|Kq$dC0;M5a8(oUd#%z
z7z>8E7qkH!8H1aQparp5^niu*iZhB!ib@ib81za~D@qvjit<5iK?XetnN(a1Rz?f~
z+OG!+d(ce9lm-?K&_$(@pnXeF&7gT~5EFFbC`cX1%^zG@IX)a^VECd3l7V2DI!Ol5
zenbWa(7K-|Evy_*zA!LYfHXps!B@M;GcbS$zCr3_+E_VczA-RN5r-;bV1TOwX$7f)
Q$$->>Hyl9)K=L3a0BGji9smFU

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/bzip2 b/pkgs/stdenv/linux/bootstrap/loongson2f/bzip2
deleted file mode 100755
index f86964d119c2807748d279f2c550513e9149e6fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 146364
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

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/cpio b/pkgs/stdenv/linux/bootstrap/loongson2f/cpio
deleted file mode 100755
index bf6fd66be238398b96290226e77bb3638e495b89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 88564
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
ZFgJntAUDBiP?&(&AZ!xOh>{Lq>Hrqmf4cwx

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2 b/pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2
deleted file mode 100755
index f227a24bf7188fa132666faaa96cc4d4c95071ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172614
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

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
index e49b09eb23c..8e22a274974 100644
--- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
@@ -1,36 +1,11 @@
 let
-  fetch = { file, sha256 }:
-    let
-      nixFetchurl = import <nix/fetchurl.nix>;
-      args = {
-        url = "file://${builtins.toString ./.}/${file}";
-        inherit sha256;
-        executable = true;
-      };
-    in if (builtins.functionArgs nixFetchurl) ? executable
-      then nixFetchurl args
-      else derivation {
-        name = file;
-        builder = "/bin/sh";
 
-        system = builtins.currentSystem;
+  fetch = { file, sha256 }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}";
+    inherit sha256;
+    executable = true;
+  };
 
-        args = [ "-c" "echo $message; exit 1" ];
-
-        message = ''
-          Sorry, this version of nix cannot download all of the bootstrap tools.
-          Please download ${args.url}, make it executable, add it to the store
-          with `nix-store --add', and try again.
-        '';
-
-        outputHashAlgo = "sha256";
-
-        outputHash = args.sha256;
-
-        outputHashMode = "recursive";
-
-        preferLocalBuild = true;
-      };
 in {
   sh = fetch {
     file = "sh";
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/ln b/pkgs/stdenv/linux/bootstrap/loongson2f/ln
deleted file mode 100755
index d8afd276424f18762eac163b28346e82ea7f45bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59552
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

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/mkdir b/pkgs/stdenv/linux/bootstrap/loongson2f/mkdir
deleted file mode 100755
index 3a95ccf18d6e5540339a62645662d5a069b4e361..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59548
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

diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/sh b/pkgs/stdenv/linux/bootstrap/loongson2f/sh
deleted file mode 100755
index f8ef0a74d6bf9fcd1dee756cd2c978fd1e7be826..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155016
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

diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/bash b/pkgs/stdenv/linux/bootstrap/powerpc/bash
deleted file mode 100755
index 7e3e0a5c79bb35b4f36607809b3fff2c5ee078aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 624584
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
UL1GLHoUNcC=41#5OoHSY0N$bNMF0Q*

diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/bzip2 b/pkgs/stdenv/linux/bootstrap/powerpc/bzip2
deleted file mode 100755
index a9eb626e1ca2aae48704232756b9820bc4dc35cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85816
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

diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/cp b/pkgs/stdenv/linux/bootstrap/powerpc/cp
deleted file mode 100755
index 972a653851c1ea5fb4f1e52c03341d07338c242c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64700
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
P{0EwXg>pa?NS*-zQLmjn

diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2 b/pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2
deleted file mode 100755
index 4f0d64341e8ab2b8c5305d634092b439bf9d8758..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148830
zcmZ>Y%CIzaj8qGbl=0v8p2_)Z{eME>QHUbP&sVNh+I#oy3(H|--&5PSb0yp2=<__^
zt&26YcksPqt0?ohm^)=-18eAxqy5Y0b#4>ga3n(a-Lt#j_a4af`YPM=e7SlyL)qz^
zZD+GrCocAWlf9WstIJlmf1P?xz{IGF*W(Lzp7VQKEpa<P+RtvQ`L5m5Po7>}EwlSr
z&An2amG>rRUCr6cXZY^Tskgd8IZ`e`OQKR&eXY8)>#MZg@4I{}9TqUApFU;vySLi5
z{2r5b?&o>4E#9ebJ+!aCxcpvi^y+hs_h!AZyt#etp>uCoKi|DuTsx~~&i7r9UvJG%
z7r*>Gzc;Y+ec`*k)w$1VYT0BGzh8@&n5wmY_oG{OyBCG-n0kgSlE0;TiY@ECJ5@)d
z@5XN1RlRm?b*lH|82z=M1EpQR<=p!f@M7V;N3P#CpO?F^a|OTojy&$Y-|xpe@K-Ge
z4b^mV>T+1%EBE_;ZEg1Td11-7Rc~9nrSD-Em?|Q-W$&F=O|F^?c$$KiObifVbXvr~
zU|u{)WFkYC$SMW~28ICE;0bK4D&<GN+>fsM{eJz{IiK$pKi;)B?e^Q)kTc7ow^{{j
zy%f6l@Y010skYzA>-W8TkYg@oe)qifqux!<=lvJ2eirb12LrR$0tN<_RSgV!yy<)I
z*|piN`T2b7LB$sg42%0$&Qtiv`1s--xsz*duQ|WY_GRhGi_vMDbT(X&SI_$?^VxxM
z0mH(n`MVpQ>I!KvFzoty>(hs4M%jDb&HD5?*Y?{N!FzAEY-O%WdYyiEb9oL|`vNQB
zDYoU)7oUCi<;TvdbNSWpGHT85$5ik;fIM`oZPKy>r$e5tQ7^preR<Zskarx@`R5j{
z<ga2#beS~2wt7$Ujw7{Y-}g@ScGvDXy?)2}y}QnD5x>6b!_E284`jFd+PtyyPx$mY
z!ZB_`1l#OTs~_pRe#IL*?0(1ba;~g)aKhrk?!4{$@@=;DC##1rdUQuRZo2#3>s6o^
z1JAQBRu`RRzh4QEo5ZTZ%D^CEdwcJjntld`*~>0mF3z6A5EbRX+pG6(%bo{SU)t9y
zhurOZd3~Proo9{iuDoII*M#peOPVx0V{z?*+}&J^7jEa<P2P9&>*ECG>!mes8KZKS
zFmB7wwk<j@!@ODV9mun+mKoQ!aAz^@y?Z6pX~o(AHm4QQ?DMwoDLJRVtutu%J^wfc
zh7(LpD{E)DF#IfFU}|76-g$LXNB`bk0n&#1z8{rqU|?Y1Y4^b<c7v7PmbnaJT9T>f
zckSYf@W{AR_Au_-qbcA0=Lf%7$@XQLh-L_b?f2W~^R}ycFodd0tKV$k`@V776{U5b
z=h^+P;kUc@E;NmSf#K59fbJ~Q{N#p!%~E_1Uzb+h=3-P3TENPn>dSCd_6wKzb_T|I
zzkcsw;Amj5-psLzyS&dv?DyRV47>-_?)w)o&8XU3dHTkloC6G5x9{yed~tjA0lRs%
z_kO?kpJ_MCa#3%fQ>#fpboKLHuHn~$Z<wr(oAc1_Im5H>3=9msj8CMO&)ZjPJtx1c
zSNz^~uB!WaP0kCM!Wy_`zlG2HeZTTM1JkwnVGHj}KYd?L?laqsvIF}zdHwn&-up$a
z`Td6c`Nb>UJ!j49FO00nbrf1*caC}P&E?la;`n#SGzQ<hkb8bJ_ntc&%I_W!skOc*
zEBAfZw;$}+zFlWKcE;31f#m`NLt6s_1A|)6EKuAqFdCU0kus42v3(5~O%f%P1x_5{
zW$QKJs!(KWVrXk(n8m<i!l34BVw54p;5L(&$zM&_%}34W5}Sa*EMd;cmohxxO0rxw
zT9zwRH_PWs%lxHsfe&W&D;Tb{^~u%v%5Yi1iNm46fy2Z^z~tnz$!h*C7heW{xioL_
zm*AxNFFB`tRDU&ZR-(V>uVq)h%K2#2wVHf2TXw}}mRnZF1%``@o&7x*F1}*&)z)WL
zuH%9X6aHWhp-dGeMg|84wFZXelhxWBST6enAMp2VwedBX*J`gE{H3ds*Vt{=<cqIz
zRqh4*J50XS)A?Yro8l(_O!bBdnG=^Uk~GOUxz*M`*q5PGi9>LKFN5GhX-9vij9YE9
zQrNoYPx*4dXXOvCs%l4D^_3m-LjEXR^1mE>*~hCo@P$vR&!>emm(5ysHu%f3th$w(
z-GZ;$EKWJuRk!k~t=SSeR+D4C0zyg(4FXKeZVgNf3~Fk^j0Qexjmw&q(s~(Yu%!AQ
zG4S#6nI&m5Z<&b{!$p&MEFT$sjSOaF34HaxXrQ+IznxM}+`IEJ-r?ERYyO=+=C=Id
zn|k$k|32Km8g0GgX8FAI^<TEyCm#5;OG5tDqSsp6W%Cwqe!15^|8aKAp?5p3%3oYm
z*gJdP|Ldz)E&3>b{o1YThtD>i7d+D}aZD^FQP}R#66X%Lh~`6vG9_B-rkq^G+|zbc
z)OjD6^z!tSFrItbyZ7q;m3seG^@@_BUd)QyH~c4ExBL0VqxF)DyON5lVxHA()7XFo
zjy}%o-Ya}$SGAnA=>3Avm-wI8yq|S#)uOqbX-5sSHzx<F?{+_Iwb<wDyq<~QveQma
z`1agu-MVDSCI25yu}^<mTm3U{>%+=WU%S?_J<2}L{D-0%-`tzAGw6@!-Pn59i7T79
zLW>K{_9z@b6rsO7s5WM1cEZ%FwGZ#y%ePhCyf|^DcBGO0glA#Azdjy+Q9M`Ys`saW
zMcJlXZX_IBr+nS$tCnre-lI~_E-f%D)(y3r`>9*nDN1;c;&GLU(=WaiGOfSqYgH^&
zeCyQYg+)Kt>~g9<FRe3AIEigv7h~^Xg#?BPDqlK1S9(ZD914_>I5ee!@u!3Yvs7<;
zb;*pptRK0LZ<WOCS!edT`cQF0lvH!0PEoCnSI(DRmvobw;+s!?k%`ie_&sg*Cy6-o
zm7MyD^SjfH-|c%p{Yq4!<nP{!e<5tgrL6pwr&>At<YZ*z8c0hRN;I<wxN*2ThPa9;
z9NwJ5EO9I6?BZ)b<6NEA96KNObY7}juU?(!uO-L#a4CyvYz&Oh=+G7k4HXm=O=jt4
zaer&EO#k_%f3>Tmb2sF?ukE>;BU>C16|wr-iNN({*Oz}(ICAmXylf8c_=FEzcKItw
z+gXcBea<;_aPIZVrVn48Uy-_4`^oW)Q>iUm-5>9$3H%x6T=(<tgP$k0^Y8w;!FKJ{
ze)emwT1LzwEWC%`=PrI}5!+Xh*`+^o*5#G2qm)i4ekikfURfGn5M69xk+@gt;_*Ft
z=|>j6|8OAp!Ts-Y+~59h4lMeAOXcxLA$i95-SN8$Lz(Y1wDooHt-Pw39Ah8It-SST
zuJn7QjRtS8?+UZiiTGrrb2DA?)6LG6M`gY^Rww6_Jn*`=`+L_nJHfuC`3kS^oRh9#
ziLFju)}63^I#-m<vcNgAS5!MMzBalOGI`Q-#k8Z`x=l44<^TBSu?N*GJvwoEfV)-P
z#oWd1Oy^Iv$gh&)ySAqMl3;Vx<7<J1Pj9Mx<r8e2_)_7_l~*;L)66EtFgbtR=Q!nF
z=(Erk`=$f=9YOh9PsnyM208h&elk#EUbJ4XWx@?R<tNv@i*0L{pZ4#b%JxWYa^-;w
z$8Y>u9(DfWL5YIrHA@xMo^@vg{#p4|?)t4i>wI&g9*Jz+A}?2E>Cwi%=TqqtX@&_h
z3MU#o80IZw;%{YtU;O5W&C%wfk{f$odwe;6(<EW}`g^Brn6^yexRW$3aI?G1bI(aL
zSJjD6wziCIu<(59`s`eex(f4Bt4X3F0ZGTW*iNuK6%k~OaP#PieN+CgTYl<ehw^!g
zt|U~<F$g{E<aTCn$#3}`_hWM(d*&TYIDFZoF6;=G(k6w5`Gwh=IW@jb)V}HPwNBN%
z=X-tYg&i+AW~c-$2=5em@NBx7htq=C2xF;?+8X|VRkxTn8FUDTWC_T;H44aC?XtKd
zVWQt03AfI)8@w-Cv@}&jCQlOB*f>A*-1$Rk7t6iRee%tC(*9`4gn6eNPBP`*xp`P?
z(SbFJiWT3YQp<O0$~3SUo$os=IYB+iqbMQ7WCCyAogI_fJi?sQd?!ri`MEox{?DAa
z*=GK~F27}opPX@!RjHQy%R9~IcDySpCWb_c1WIfSQ(DEO#igXI%qnIO;N}t{rgg-X
zA!5bR&_LHDrjC{0*0ep!o7(?cv)}Bm>zw)aT|IxDk{?d?T+r4V*;Ar$y{)tJ@`tUe
zF$Y2{;zZ70?Oqad;=s4{>!vOeb=<S|h~!G!vm#8sJQCA$@4DT%bl`XG8`<4=&T=NF
z<XD7!Oi*3J*Sj%r#^<m5)cv@hTjhOSD-e^nKtyZ9^|R}>tEU&Ge&v7hFYlc2z3wNk
zp9pzYI$d@@e>HB~KVd7KJ@LsxXA8XBjzpddObzDw`{LQTnNzK@6XxxieOWg2go<=z
z;jPf`ch3FqSE^k<r)NSczw=U_94+CasrS^y>W=fyc~hVLDRS?BC;PV%ciyf%H9u?r
zYW_8qi;t@1F1^~a^<B2Y`L#&~_fM~~-pjN3#7&zE_1k%_wr$#Ov|;+4#<iysdv<33
zFWx`l)#k^4_TSGe@fQt`I>lLiS~RPr<i;jv@5SHvf8Tfazqad<%wD_OpTGUox)Rnn
z`JGs~&)vT-|1903%wPCy{`-x3u|^WgmvVbWn`eB!znS5BBv)j;_Kxx+n|>aOO#KkJ
zPt)bY0<G7a3b)o&8I?J)PFN;6ziZ-b$12ONo`))PBd^ZRTA}kpMD&{Snt=1Kr(XCc
z(|7D<rFKA<?uyGF=iK_p@pa4H`cDUbYF_oIeK7OtqWkq9?Kl5_^E^vAy=Y0YOs~Na
z2Z4&D6eB4PxeI#z>1#WM)<(V7Q)RrkAcOIedU)8akird`wQ~+{J$Z269(KuG|6R8P
za@#k~skqee<nk}?kgjU?)qCGNwr;tT)4Ntwpa0vW#p2=C1~n4@IX*`_9Me(!y*<oY
z<p1)cSzR0dZ&#fz_K->BPJ_zT>Tk|&lQ}+|ogLyQf8ZFyi=xf{i%(oyXLq``VX3A3
zM#X>A+vjajUbn62+KEl_F+6$UPNzIK9X|1=i|NSUdtaAr{kCjh{<3+~-YP#m5n<|J
zH#_Ts$d?bbrxZV$?q4SR^v13UJsB(RC)PLiJc!(FdPCs0LvaMl55Ya3H%qjvI2*Rr
zO*6my*FSajd0hJ(Z+_e*rqq-9_Dz0_fm;yAKKV5Qj%y=kN=~_PZkgf(7fF}4mjBoP
zYVI%i(KS`Udj*g6<&QG&7=H0ho@(SV%k^)~{&cnw7w#=~B~$IvHkk4<ZDHZ)IU%@L
ze{ag&CrfXhy3F64*k2rbKXBpAS=W;fwhMn^=&0Y7erLxbvpu&C&u2g8`tgp@^lv)B
z-{%#H_ys*(Si48MW~KCn8ONAER$Z;ny(GVX?fWg^EOxzhR`<)DpE<6ropta3%)LjB
z?^^7flcFJgc#D(ixfxHFDjH5c#phf)r$$sOU;N7Eu9tmLodMT7pB;;Hy<7R??5DpA
z%Z}|hs>xHf{K`u8iQBY`ex5#S6?)(3j<Sg9XR&APZIxZ8xvK)_2X1Kp<hEw{v<l%$
z=blxkSYKrb#Lb=4kXYvVVB*n-_m6yjRaCt-JV${4&(yMsN%|XA(p`;36TNq(%<SHk
zw=DZX#)6C2x9lr@x-l+Xu5<g(JJ;r}wm5Rtcx}(y6QLqpQ#L)=xcBqZGTR_+xjWkv
zgl3f1oVDcrUt+xHc5}t`B^lR~h4wZnmd0;>Umw5feR%$@_YWqYULhJhNoXDCL0116
z;o;h=C!W0-zUqNmOv#~wS&N*e9o5u7eBbR_#hhnnUX*fG+22dO&&#>wLBr8zA+8w>
zB|=wKcE5RYMC<nbS97?2uMYU_{&2~$TiP%8T(-@g`M_z(iGwcL<r`LYZM^K-HEZ$L
zsEg~bDmG2MRUh;zs#oAS`}vh0&bN9pi?x?8{?4be?Man6XG>y^Y)0!vuFBeuYXKLT
zj`kHw7tAkxdO5vz`#q^=dD07uSqci=I%dyjo%!&0qU$5M%X>s(B+L1HR^GMaVf=N8
zb#J@s`Y#=(6GipTw)p<@?aRA4;gRiU7I8J<sqX8$jw+-@%jS6Lvn6E+{B&fKp1o(~
zw!;DjS*gxz?CZntW<T7fwJ*s%<*3uygxOWTl6-8UxBJpFLzX=Fxk<f9aOydy$rcLj
zjW<4Jr_NThzUeCdE%vV3!ew^Z;rm|(E9~`q+`iyh#pb0aDlDI6u6e)bW=HG$G{cV1
zZx4%pi;H@!uDa%?)!l<{`CA%Um1ckBE}3fd?(K62Wv0n_XJ)*~-I(tE!Ad4*``f%i
zDJCiRIhD8aB1$3@wO;fY%*lK#Da<2b6wI0*yyeRBDgQ#OD&AhZ9bHy;>m~aJ(@)$A
z6ATZ%)0xe5_RBHF@ViVetb3fDW-M7=-1X^xX~IQ;nk^D+pDnl}H_GWxKY!)=y^7Dh
zH8X`AX2b|N+6OG-i<D4gV*IO>ckc4By6MKBzwG(t{vvbEgkSz|_O)>zTOXUQawLO?
zQ$g&syy<&|N9R(6ws_2pRMFE}J6j=I;7o%<N<Yux>gs0;+xYwAc8aM4@*X_!<y*PJ
zcGj5<?k)=Y@8#Ii*MuupZ&W-uS^YvnV{_Z`?ik&o6sLm$B|q5GLfu(KtQPes?0#+A
z@RZ{r^TW5RPVQZ^sKm5o(u5^fFBNX~;I@>$F>&ku{~<rlOw+km^0e2@eS({mtl73`
z_LyH%%@$iv>1W)WW$>c>g_NOiO8#_JdHcOJ$CrK)s+wEVQ=OU6>bvcUoX^|^&YSaQ
zUy5+BRo!EAiZy+=vHFjMi*he_a<6i~7Z>&H;Ua<c_V;)6l~*;jPG=YVut)Bg)vW@*
zli_>jG}Zhnmoj<$+^4c!v*mv1=W9o{h$;Lz-0x!f%BsS_z0#MZAVx0x;_HS_|8KkT
z@XU+6xcS1L6X9>lZkK!#<1(1Gu(YxLlk%l0ED3*|S$=PO=gG9a;9=i>rkWJ*{>G1t
zt{?s$57saHu)g2-<b*(ts@)2U<=&*%)N%*U`KWSW5})lHpHJ(LmKhzLVX#kO;{?;*
zr|Z6Ld2_Sv$MG(1mcnM|=MuYKh5oi!wp%NdIb)U;XW)@5XL4u#(L5NTSjFdjAz9D&
zAX{0$a=Xe7tLN?h^MA~qB~t3Q-F$<V?D;hY2dacqK5unpjTBzj8u091)EW1*K;He*
zhv$4P6JEG$E30exrmG?mn%f^_KgqZmVVQm9-t3~*s`trFF7J((>-@Mo@A?fDyP){#
z{!cg6+y4^(bLA4#<A5XD|N3St#@zZi-`KAB&yk3b`E&ndN&fSFBc$uU^Hj}l|GVmv
z?=~!5v_wKFGHk0BmvME@CaHYwIAh19KLsl9r~jP1<>Zpo#HVMZ^7+>7)G4p{(7)%G
zhiC1bHU1lF{GX>E`x*PZ{>l%n`_D}y<M&ssJ@KfgX1}a2w|nLE={rKTGPf+}IPJ`0
z_S~|ECpnw3@z@5Hb6)YyQfHS=sjMh}<z6Bk_POF?;%|NfW8wMb$3JY!+Ae<Oq+8R9
zECsv%W2aV4-}1-9E}nDh(&@Ibt6XL-=ijk*e)5^JY3^sGJ&t?bZJL<(Mz*w9WR^%y
z=>Kp18#b1H`~KT>Z&A>KPv1Evcnh0cw*R%!ExhB3URz10{?+tF%Ra{2?2cD;k1EeP
zR@&44`QrkK{c`!XZ(?38G-v#B*7w4%{AZtRA3eU<W_&^6uXt)p;QK9a=ZGrx@#^Q-
zS%ut{zb#k7cRg43vwh@bhxo7>HM14B|HyZ~;kRC*tS==Zvp#(DO5d*&mwe4xuxTUP
z$@EIqW7cQ7?=bd;=B=4vzWC?568;&y*JgQ&tV#8f+p}%4cINK>yB25foeuB0cRZ47
z68rZy^`lxxSD#z<kZod>n%vY6l25D}`}y=vtK}NxM}66_-&QQ+V7#$UP})~L=?>+V
zzs~W2>n&ewtv>f#@cQo+98zk&SN>JMxV5oGs>XNL>>oF;pUbj~dG#~?@P5H$DO>9=
zcX_lJzMsjFHj6RIKmY2Pkgmt6Rn^P<5^c7p-oN&PL$suw$@RyYj}{(gVW+lf7_*8z
zxN&pY&-|~ECyWm1R;|%DnbCFfa_-UOiLt8|KeT?PuiL-**IwB#5w~mhxo>@b&aJO_
z$)q<c%^K(OI6d8Od1|JHl9Y(+-FNlL%}bvC@}K>2bthxvjCr%~OwNurnf?6M-ue5x
zHn)3x>efB7VdYex)rY3IdKG5eJow{<!vcp-TMT_%($D8#_*?d-e}2U+dwZQF49@c-
z5Ao`1d8J4s|B|TDDfE6k{g?c;3A$(Yx!rxj?Ax8iWG$8deansPSwHH0bbBN8I&S99
z+5JOCs^s2+S0)O3uXQxccj^?;oW{MxH{`+H*_T#2G<dXCD=kwHQ&bN;tTFZEzvE$n
zY!&L$k6YNQMy!-w6U=<`*;Loe7{NA~V`|GBU6n076y8_N61ko|bD?l4OTI+l<KufL
z%Q~Hmc)2KWUz&`;)Z00X!Hd?#)$LI-nreDW^N0A;rN^8d4>Rj~TrkL0vu>MvB-(MI
zV)Bnpory9XM`F(@AL~gLkuwod6PtHkUgp8AGzP1smE21*Tz0PwWjVL>`TZ!r`uJz+
zd(AhPMIHVaHFrmh>mJ_c2fHo)FxIRvW=`;rmf5gz@w4p?t84P!Y`<6@x`J;;$chTy
zCI4=v@4xrz#@+ef`J5`vrWxgWRNmb5RKm7y+HuBqgXH6vZy&jm*njIr=Of$QTAu>%
z`&<3rudT|Ny|V7!r|1vGpAH<I!h3z6{GzqbyI<66w}uL5>g2HdHviPxbL6tzxx0Da
z7ER-LD}N~I*xT?!XHU%hYR#<`({^B)mf4~2Up(q<o_oJoIeTvXooum{5%d0SVO`Un
zp1pweY)$!&MVo9x>}t<FE%-R)+M3gSWq+kUe30(+G&1nM-puR1KH+2Kk<eYAM7#Bs
zZA7YPy)U1WA?eXL$8?Ip+n@bUq>lb^+3Wmcs==}2%SvmO%rIQwbfWU?`Rw~$#~((m
zIlGhnV8TD;WtLKw6*o;&bdt3igH=mhSMR?&Zx)NzM%_@Qt6lELWNIfbXZiZV=2s2R
znVJ2+S~wGp=WXMcw$1sP)qXbe(5!F9S0XuUw)suG60UyiRbHgn<Q1$NE<ZK**lJ{D
z@qEcb3%BAAfj&_icW(Ua67^_~sOJG&*)1&-6?#-Acd7nZvbgHdpF`^vgTlP#F>*a(
z+mQ3=M2GeFc<a=c1!0_zSGB(Dj|=;zzG$^&XIcKU%UUcs-JV@5G;i7R+dk!RU$S`G
zfz?%YE{y-YIAcO@JUrgXyXN%g*L~mAHY84%s#x)A-8znnDyySmb9-9K^o?5NZkiS<
z=X~?wP}=*o%J0|tUA_`MF^OH5su#~~|HgdCV`|tfLkanh->PPwC^CAyfAT87vs+KJ
zDqmh8u~gTGDdE&Ku_>i&oO#;)tG8Ua8N7Aonsr)doYYo4%Hl8O*=qRj$LEsCX8oMM
z3V(G)6i17@34VI>YqiaVJ2Ly3^VTP?*fM>!(}5*<HZK%j-!^TI`Fr^I#$u-{6Zb}T
zmp2`lP!tmUB2F#)^-9CvERLri<?saU+`M^Koyz8CS9b5Uky`UtcXrL&h|~S5UToKG
zSgt2te`R{{PrTUwGrHOiDIJoFebqUG7^hr6HsNo?tCoc<d`oPT8XoQynf*8ITiq)D
zT!|GAt@(7ld9HHuy=~z)2)BL3^W`6xXhmS|ge|wM(+WPVnVigaZJXV-inCQ>UD`8F
zM17xM-#-8Lu~Pd7#j9Q&4`6lkJlX2drhX*#<Kk5{?gu8z&Wg6umnhwFp7}cOkB{ai
zk^EYPQ$3YaTMO-3CnYo7D*KZwlYY$X>Go^V9WU0-$g`Yh&5$d+{L`LoMjLAMg*$ot
z`Hn4_S~5$4ch0Ty=3BM*_)c7B73AY)vA%iQ>na!jmX(h-CCgT43r?MB>3gf}yq>PL
z^tt<|)*U?^*sl^hd(!a@m0o-2?kf|0a_V;+!<i+nD^5fuykD9!ccq(G7ZcCNO&dO6
znkCe5?6!oA=RD?DS<^(rN~2Gk@1E(i<=)d}vWYXCo6c#Ad0YNuyXeLu#%|lz9&k4I
z>1@3w9m^iWEQ=D}wX?FrjHRM3?pc|<S4voVYopZPnn_oS%UU+7&G`Is|Llbix&%7X
zg%*@#Snf@K_Wq?&@~`xs%XtM~3!gsv{6_0)l&I{tH!judi=Fl}9e!$>o5&h)ZF7c{
zG{^0?Ds#Urk8}|?4eLGU-t5$P>Fp1x{j+Uq_w3k}<gH$w96!lv%Y|#Ub<eiU4_B%0
ziF1<T&reW2b1vy^-~Q6|H`crA$@~a9$GkA({`5T)zJ2XkW0F4O`&HNfM?P$Of2E%3
zqqQqfmeFbxpW-<kJt^GFzW>=-d&%QZvpw(XYk}{k%-XYAxT%P*eG&JhX>Xrd)XY8Z
zk*r-=-F;%FuYyE&Jxe!-7}pV1R$p74g~>^_vBiuZt|}Q_-TH~?#?|-hJ9rPWbDiiZ
zZ8>D5sU{m}m~-TI+{6=E2jc=<Ch;4rP<ypHF|yt6=X`c;t%Vo3rYO~ZO<2C`Po3`T
zU#3fJYA<e1+pDYLrF#F#%uT^udo@_yLxY}sFTZ28b=ApfH-GSbsGO%_WUl((+IIHJ
z;3ToRZc&0pGoCv#)Ja8O%XILy-~46GiS(npW1lj1-+0Y(|I+^Ql}jJW@2F<_TE-u`
zWfAZ9XD=4(KR?uFcH=hB-}5t<ym|k8)ixXR#b=I*Rpj@2vs=}zj}`26lA6RYd;MBj
zU70R}jt|B%kGiF!vs#rEMd$4DGBUB)q}Z||$?f&Kdk0^Zt!=w^DZA{~ub(!%+SUjx
zzEpj?_r|Qd+gJ{_I~Mmi>3?qg=#_2!xn|<>mXkbx7W-(0ShokbayeS8J-+$yc9Z1C
zZ=THhC;#iZY?<Z6xb(hrR`&{0*KCb0&*V<yZS(W>k$bG?t+p+9-LmEH7AOCnKF@7k
zD4XG<kLMd+cD}FQcI3c+Uo(e8%*<^1S#tIF8fS(GIyv6j!OrCAl)9qefsN{<2oByY
zchtq(6)c^_tp)04wO3obReGAn^u%FC(yoP%)wf<b9(hejSms54rEk<Nlh6&_eXVLG
zg}1z}Jb#$4<#b!(+XK$tiiq+HIa=w5+iMfFtQ;asA9*vqd8KhTMb_&b`@UsuH52}R
zohmU^M4LD8$p+T6w2Rl5eB30m?7UCK^sSpzw=L<JvU;%&Z!E*YS%RWcJv>Xc-JkkR
ztx@PZ?>-T&>&xSe=CHmI>AF+j_<zll0HaBgj!PSgo3053B&AI<OXB^h$@H>Y^VEyy
z4J!Mq6DFm2OJ*#18ny9&qy6%2ms*Vi!+oSJ*Sh;?><X7jDgL<eg3y|ZmBLap<vF)L
z?clhw+I&7=?i?=eE6qs<{qin6S5i{^{g}ae;U<%=Ra5s}*LNuWo2Q*6Xb|bsANFmn
zzPw>>@XL$`ZS%HWUwH54s?Rrm9qRs6m7%4*{gKtJcY^n-STE|z{Mj=hxUzT2;=Rm^
zmaULly5P2b+3K_zT0(wx>jksi7oLeZo3S#gVe|A2!c!EZ9`wl_&e4)m<<S)qFx6kr
zIY+r`#x={=+oRa__I><X=e39<>eH-MwN5Hw$F6Q!<r$!Rsz-2br`N5v7i+F&KVG-n
zx9ho(hi%HU)e5{kJ&rz|Ml51?nhjol@NipwFZ^@#fdi%fr+B*Ovq<_aR>(3D+rr=W
zdu70@JwB;id2{!%ir2?^OnH<oH@{Hb=Hk65l}QgiX1@HKzvQ7whKazY__dZf4G}E{
z85K7aUOc(}z*UHE|FrEIA|fWe@7=C*6~+quw5c;!npx$iR{K7FNnPo&1i52NX70Q$
zeQ@fnn<~eS9!zY=%zxXwYN6b6mQy}bY)0SY<r34DCf~D~%dL6y{j#U!+$ZPqW`0=|
zvrTcLFylAL^ZmlR9@iSrOV*NBTiw{0c#FTe+ubbnx5q)xuP-eHi%v6aYO!=lp5Q3y
zv3#3us|@?0h~6#xyiT9X`MmR4+guZm{>FK1yZmCO+w9p{S!-Cc-MxJ7jN^q%O)8R-
zZ2D9M8<$?W;VyTl#IK?H-fupiBZ+%A1wAxqVmA6%U&xsKE0Xi@p6kD+3%k4X+dq?8
zdyW5iP0Oaa`|2If-I%}S<!jcD(++Y}Z(cZQPu?eu@5e9LO?-51x=2Wt(T1%(YmAf*
zT5dl3a@X5^$#(7iZT{;@554`E!y_0HsZ@PJA>p9;_O{fGd-DBv9JJkMUAyAYti_Qb
zC0h&{=V>jBb+tI<o!W9_U-XUDfw9}R7QAfvv|aOPtXEOeJgp$dqzww^44l><_&wL8
z^wXaC%#XPJ=B)SPI+6Z!L06&7g-ebHKL$UUaqz&h*p(&bvwllOT-7|gg?+Nex_H(%
z3SMnjHTtc><X!%}7VL;L%GGpiZ@*jr_V5Sc{Q1?_Q-4Tq$=g?;EVQ(7TdA+7#wwp;
zg@svfn~pBIoc;drkFZ;JRiBj~ZjX$}etFZy$>ey8!m*X}+@JCJNu24O)3@gso8guP
zhrLv|f}<0U^-MqSu);>EH9~u`lx_)QdgRg48wLlv1ah+k%&I4(ss+0rO)|4Qz~3vM
z6rrTHGU80>^q`Qq`dGfA;%_JWp8T47bZ1Y^7gknJ-MWI1*PFL=H2ZGdZ8Xz8>exxH
z!`)lj6>S|7W0FoP>Sso;$h{h<wVJc)m-X`3$CfX3S(sjIxlL6x>rl+ywL&}JW%~8D
z{0ut$R8HnD56gzdI(DHFW|^~6pG}<?^5Dxl#YQue$E`h&Ph3&kpSb$0`IIG0Z+O)9
zMexSG%-&$~Rodf|Yx#kUpog5z!U+nVrDr-Hynm&%qc-@ZeAb1FkK7mjd8qV6<8<n+
zdCzu+JbRFzakt~kqK&hkr<Gj@J3e>1=bBen7oB-%du+{yt(SOq9`y|I-Q4j0{*q}k
zY&y1wZk+G7KU4pNbITm2WycpS@$gjrFzH>@ar0&T9&8+q3~pu3GHt>!v(Mb?I~2`+
zdWUq@_gByV$J^`Iooj7gzQO8?%&qWMA-w-M<|uF5$f3~K!LhchJMyJ5m);K3LpusY
zcHBHK*tPz(?d0SAtY?>++%|M7T-xq9%Rsqc)uwfaB)PeC)OZ*Smopjg7?_@|ZDE*U
z_-5L99vKPao!-K1mU}-PR6V~d?_%dvA9W#~>ROi^F*~RIyQ{5|zxdvkTHDC7c6ykk
zl;gQ<smrY$jZ7>u*_GWpCKvBLTP`>!d~Jhn&8v4xk=4O>-1`qUcfR;=IgO+0VQ28u
z*9ol5UR_EYZHq%Y9a3IRcJbjz@;Y3;jk_{0=lA?{{YPtm-zaU9tDWMz<XnvN*Q#pk
zS)n>nb37g&xm~_O=-uCQdScu*<<1v(tZS~^ziZP=$$3`gs<XeW*|mC2X1Lg`Ze!y!
z`)WVjT&&4?Tc*e4$|~QfPRSqcC}*9PXWK27s%>@c^`lk0<D!$+_gsGbqs6N4(Z}!q
zxKCRCt}81p+q8McdT+KL6NGqe8XP`pamWUp5x=nHsblZNm%qAJ&j~xuYbr6-T{JGL
z;nh6(`o)g(9tRxsNMx8O@=ziFY8%&!H4BzZWViQz_kN?6-O>d<cMtGykgGDx_%e0<
z>W`&P<qQ8MUs$nHK(S}xZEdby7TN9`3}@$Nrlxphh}D1WyLWExrPt4QteqD8DDi^d
znf9;cvYERKKV0ZFW85@tp+uO@?4JzB*7R>wog|X!Y!rERDUZ6PWbA5vpU=|kL_fY+
zSaJQO`c~N;W){=<@9zn0cC27iNUOB}&A;&Vm3KC!4jZq9_DyB(jGf-2G-dPR-nl+I
zR~NUM+!jr&seHoKo}9#6%spebBa7|N`}Mo0lwaTTpY`SQ?fl!_+W%SdXLHva_@u-u
zW$wM;!NEUM`g?cwdtZ6cX>dZfY$0#4S|F?2+%iq3V@KNE_N(9Jm$&EVzn%QbDye?<
z73nqAjdN#oNBwC@JLe~tl%_7he1VNYB4Or<+(+sK<=%7c<TXt;_Q{kRxib}b$i9g*
zDVprI&M{i(qeRccbw}dXvbWFfUFq19t&|zDYxeQryuE^qP9blk)IU7c&e$w0xJlC|
z_WqZnXL7eBzBk;vw&&@oUDxG0d><U*ymea2q2Z>H#8T@>CxfK?u&{574AW8)&K<A2
zY^9+)Ctdgb<nVwu<!ai?J{zCQSI#b9+VkM&34_ZsU%!tNo6qy*<-QXx0uv_PFk0L!
zuU$4{<+jesia)&v!dQ5WmZ&B+F1&PRRqS<MlZ!{p;(Vw23AY^j_)V$nSzblk#mO_X
zt9JjGURtyzaL)vRl*=kEo7I<k%=b>basHIWrmehF0xE9jC+qFny5sVzea!Peetj$O
zXYHW}7gKl1|9UgM;pp+H_U(yo5`3jUrX48{^o+i$_2<^R{a02to%&Mny2Q8t*46om
zit}}!zA1V0rRLh#w9w@FuE%ft=B`<><HYW#leK=_uF2VKc5Ux3=7-{I{MYV&a)07Q
zJBDLQiCSM9PJQ`t@lM^eNk;36UgQQaZO#vQaeGJK0!japzg4R$TNeNO{$fRj(2s8{
zFOC<_4>;Q$P|GZ>%fN52dG$A=?3%k>FRzJQ)X%St+U~H-kypz6lX>~650CzGD*ULl
zefE<*_kO>}t<qcZryfmeb}pYJAy<&Zs&1hcZ}BU$`%>wG?SJ~-=WlMaP=DlpB0xZP
z-R*$G24%(}g`Xu9IpRJ_)P5J%pQ5_{+B2TF1+8adt@|Et-N9S6^j@;F%hzeXU8z$f
z-^D#BF*&}p(kZScH?6g&{LeAz*`^;W_zV_2Q*Kh=`{l6PSIJ}D&#6x=Shp2@HT1i9
z^mx~!Gu{ic`GbWoAK_db(IR%eRO&^ax$_L4S?4x<ou@qElk#ac1s|rB3!gT!8nY#&
z@~Vb!D$CsxVSU@ab>^c*laK2@UhwepT<c7>s<Ou3#qT0|+d8vXW*4rrb`uNdPwl#^
z6}jYd;DLKvd=}VVdRM)-BKTX}g5P=f`tPkao>Tm8)vSdFbbj4@>b>qn!UHasHs;C~
zKbGBBfAd*;;j@pgCkHa;&onr-*5i5bo7K9Wz0+ShNMF-RxzQ2VHbJXs+wyt$QUZ!+
z3w(Rj{@!(N>eb|$H2potpS)Lg(fT1Pa(?;U87Ix|Z{8~F&1-kz1^2=)7v!AmyL&^{
zm7AR3H)FGpVdMMa1=o1XYgK=#{kMJB#k=SC+AGB_I*kXuoMNlne)qqY(s#)QTfTFT
zkG?!2y2Ms>;V#>7-RnF5ah;uzu<z!FjcG}jT@7QJ{#(}_5{PP);Jwek^P0C(+obsI
z(F#Yn5+d?uT(k`N5n=p(?kXFDb%N{nEj`L(UCDBM`vZYfGM}Wce+fIR!&X~z_OEPA
zSQg{*J?9JL)7%AT|FNr$ko{8~*ZaI_@6zTICtV~pSyL?Sr>XlI?R`B@>fWx}OrKo0
z%Tj4G4EdgHTpevLdWMI4>jXuCOV<_7zp!`nJScE0;q)C7HP%bs_ol9Nk9Sn*l6PXw
zWft_>cg=2_hxd+pulq{xo74Q~99(pJ&x4O|?;KHAmbo{NYi`f3Ra1}UFU!^pS-d&m
zu2-;9@UNLY+Y>GXwA|TxR`%gsg&mOz2Ud0;yZCtWq)W!u@1K=EHh5f>@7D0w?cw?5
zd#C)_JL|O|<IzZNqvq@>L9gv<(kE%3N_zE{f3we_oEEkXS(jL^wzy54ymD`V?ee&J
zMGtD9?t0F@Wq(cLt{<B7+WwT5RNh_^_)1_>%cb3UyxVv$KepQOWW9aFfz@BbW6Y*q
zT^napZ8Lk1P32CbQnR`Jyngk5Q`kE$8_9QSZsF_RX>@qj`TBm>JNqZhFuxvb9mu^x
z^0|rRhBMqpJ*tfJjHjQgl-hIR;76{mH-8T9d02Tx`RAv{rRS?3sr@ZupYbW-?KgfV
z{_wX>aqMc+&$AabD~j(;*Dzt*DiNW{mUA^}WzQxCRqalZy6V?yq0wIrx|2=`@yN+F
zv9kntH8mIbS3Y?C$iMBp(p!`C_0IRd&AyedS22%a!i3cqxF1->F@OEsxADSaZ>vvB
zgALD?v9-=Q+}!Q$x8$?lWwXfjlh-LdyLare?(E7<NnsU}zfV#;o_cS+mGZ-5bK~Y&
zJf3&<*7>cQEw0TqR$uS9<Z!se&Gm*it=8`EFO4``$M>2oxH~&>Li~omkAwGKYI;!j
zY(t>j!FjEHk@xt|%Con>lVGW4RO@mSzigSe*rT~LZhO~zuCFb!25VRTS+~d5{-(cK
zrt~BBH-_w7=Ic+eC7(JUbS1H0TfnKCBa!8cL9)8pn(kW)v*wrmt@pk7?oZJCtRwx}
zwH)vMFFrgWYAw^hEh4AqJAJ6>s%f#5-|YYL+&8K7npb<OcLqFrkoiSkaqha;JATPX
zS=;Tdj(zapGQ)q>cL)Dm$mhvsOBPTOj!PB^vyN{_mb57iw9;|<sCeO{;3OyJr}J~J
z_H(b;lfs)D{D@<R#9tHlobOi?cWs?Lr*G!R=aXH1J8qdIO?qRwpgP@b$4aLOM(6I{
zJ^ao{gy*_oVU5kCWxwXmzOvT0h3g2f*~Zq6GmUbGZEoGT@4oG!;I?~G$s6Z>m=e}A
zefRkr^NiBpL>Ouobj=GE?9_{MJ#yGKXotdqn28MyOU!RBX>IZsS#ipCF{5X4{u9UJ
z58kW&E<CmO+kWrg-@h*2&UiB1<@v11vJ(zT2Xo2rFRbBC-kdIUIz@5L37ec*b{}8n
z%$vWAhr9jJS0~PQC2aE^F)Xw3_@#a%^@W+mT790HVt%f3e)_AsY}Wpr@xeS{nYmD4
zkLmIAzuWKHeR+D&bEn|ml!f2Yk8NOou#rhq@%CO;joDG1>(4tHFPY@=bK^4cyu6Hj
z%{wc<|GZYUEvjl2i=D&q568l|<&wqRm{ikj!#LPCtS;VJP;gM$JWsGL`c|~_K`u46
zY7aq%AL{I@PUe3sk^ZIEfAs2h->dtCpYu0wo^98+diKtcfc$wG3dRN&J0`~$T`b(Y
z?><Xs!!oUk+_@aqZ@)k9k?3wx`aVs(@VE4L$N#(4AAY?1C{nyF{??a`rP9oQGD4UB
zXFa&%P+XJt$@ABf7u!YMF?Wr6CK*2c`D$hL5(&?IQ|1|mD-xG|GH+aUO=8E13nk`X
zx94?dc%Hk<amL`~GQJ1j+&ndoC3IHKkeOxZdCW2E$R!@b#$Rl52G+fmZf3T8s}D1I
z8*oc`F7;j9Te9H3&V~t-X0;ov-F8E1ZmLSn3{y2R^M3!$*FMR~AKmN0U^_i;elypV
z%`?_(nH#SBnv>7itLGt6x5?muK}L#D$rgjnTjkv*Tu42UsWCyVI&-@H+V30FCc93a
zEu_|8`X$^$;rj9T6|cM+U8>DD#2u2fE3>%vf@hjGkICih2X1lHsEHi<C*S_4{Mq|8
z56jw>IoHW0Y;vF0Eu*crs*NGBXZN=Ctb8lZEh+T9HHC8~SA(&EZ1r*zaRu4$9J1a*
zO5cy&`BoX_ZvRAn>EqXZWgCjxH_!Uc+b+@W8paSBBp!0o=inFVD-Ru>_5QJXb;jqV
z-sx9a^_>bl1+#4a*x4QDKf7`Jb?d*jrG~qHEn9!<oRmI8fAZryhFR@XjMCEbdyJVD
z3clXi_@`_o=j^yuDoy)bFI@O8`G&pa;su3B;V!wGZugCrE>tVO+Bc&w-rqp{Tdefs
zfF#?ktCzcV`PU2cUb@iy{!LN;p1Je)s?V?Rdep3R#aUzBL=`I^W;V&DGPB7i&hSkt
zHCV0|w3&03#T3D`X_gz8UfuP{d_!{2f+8dCmnUW|f3&@9?b74Pul`@2ctrem#jCK)
zhnEh??W_8hc0cCZxirT6N45z&g>E@lt(qm!dEI<rL++P2*^>uLYL;EzHv9RLVm6T_
z6GcPvC9K-CRs~uJ>b?6e+|E-ofA@l!2FpAj`pnD{U(dra&sLJBS&+s3bX9?PL%#2k
zH1QpiW^ahvGTUs=({inX=v%Q%-6pI!;3YBT`IqmjJeogoGFeZ{%-7FYAgn)MKKT8L
z&<0zJ4uN~M>lEr4+LpaZF1g9K{qq9-P0sH&*!GxCD0X_V>|#Q#po9}&Ueb;3y?*?1
z%G`z<-YlJc+j{=K_<miZ+#S=->C~9p74kC3@-#3fJl#}rrTJguCTE?%GyMAD>lQXG
zux8(5wqvW|O+AZ`*=2H;u__uTxg))|Pq)8Wo%L>x!6J_*n^$Rd|75A`+r443g5j1a
z2`XEEc<m07?hE*{e)%3pnHJ_apTa%AI*qvb(^pj8miK=8F7U~P{>>(O-*+F1Q#^X2
zgFpJn_sqw$qmO;PzqfF=QOi>$TaGh-7peQLu01U0ym3MG(>ZPIwJ)z(@~$!dP&CWp
zp=g(?>r9(@e3=r)a^Ix$p3Z%4JfrRJ$|c69-<dy&yrp|)(itV2X*UcW{+*g;aA(Ha
zlgWmmKNxRT7yR#^a?WwpZ@!PLZ}ZwOiF{P}?R;ThVA~0Y1Qx*%fzO7opY2&C>a-?$
zpKYzp-?!gRKAvsX^)mR6Z+XRT%O&Zh?@ra)H6M<ja;+*)Y=*FO)L~QUjiyJ^r$_5V
zeXdn1vpscR`Ox#2*)J#0f9o|ps?XOnqANLH*zW}Q^<x*_s)zHJE@a^oT-$r9{zHE5
zd7HmNt8Z)Zb0@}q+|s#m)!OVm>dEW9?B3^^@19*yZ(4hQO6~uT;e`wPl5gHx*{M8#
zanPYF7xvVpymzwe+COhWYUE#?>g#+>Z1I<D&r7XeutGpda{8%=By%OXvr-WTpC9iI
zJ-htc<!c|ly*tBTr`eekb!&Y<*Ml9BYRQh0x6HF|vsHfIY<TsK(Y_N+GLL@vU3s6c
zU%Byi$r`nUjg6kYCU(WVf`?8=n45oG^~fmUQ;pmjDY?+~z8-uT78Mg0Ob)!jVa?*I
zZ1(iO#^#*b)YGAwKQ2`swtgGR$Sm<8gV)kiVWQxx1rvQf=d|%_SC+1K+<fN4*BiVq
zRNTzV_tkmj+P>a3*S!4suc}hM%M&GY4X3W-*3{FuUARznADdJT4_hvK;r=$}vwvqj
z-(jdcWAdxV8<!qX`sX8fQNE<+Gkax6%0aPre<}nx?pD5Q{y9y#@r%0c|8?7nV`UF6
znEqJm%S^?PsWEL_j}o4ncc~qF_C2;OB>hIs`NPj2o<H__%B<wtd4|0QlIPp({&aex
z?DR&<{0UbcKifR_VzTR1rnqw5#pPGLwry({Vo6A9U#z-x!AI%4FBeHi@7Q;z{`8HS
zdvP0|oKJmtZ}q}ERv-P{HI}EluB+PpLuHcRqKtc$ffn3miVH2hT;7(gwC>DR?p8iy
z7tLglyQ<V@gF!5N<{CjYuSI|S*8bfc`Y=+Z;jY{1nY<si+~ZLfxc{xf?9aTE%X~WK
zaSl7bPqCV9dynt?%;n|%`4y{{CBBMF3;X<g*__7-?h0B<9^PTwSs^i_T(rpWi()9x
z$M>7Jo>5jx3jX+IkNo`CANYD)`@gQVpEaYK#Z^pxduc2Gt4%S>&ivjQs5G%Bf=j6<
zv`dGzTZ~)jh(nOFQo|;0F-_5=u0>6!CT-&S^X;gZ@GIRfQQRt$oSe6%r@epvGpQ(V
z@5(C+D*vSET~p~?#U@rKE!L(tb8YyNBZ-en_UZ*GuTM)WogT4{S8%)K_Ut*;Qv}b+
z@@T)$bY@(VkeV8493Czsp3V|`cGcs|=9LQiQ$pu1UpP~q^U|D6&)5ZY)|qtnU09K@
zBbH0T{?s1pJvnAAFZid4tL%}!5wQ7`hn!T@=F2zIlXj$}mj*2p{4Q%87t5aIzchXE
z<fG4)Uc8*zckQL6$j<AjG9Nyjz49`kZc&Tku{$x_Q!e`6Zp(FQWjJ3vW1pD4;L)A)
zL)`w`%4$}KOp)EZkN1w;+XXu>J~;Yk?H3V=z?!PbTb$(_S5CR9vRLblrgi4OVDlYq
z%GE-)VeZ*y3dIeVv?cwEId-hMMNxTgf|gzI`UBO!KYg?+6J)ux%A0xFedY&#q8Yva
z<}g-H?#&fdX*zHEusC_|i>k@BEygx{Y;4h-4F`)1qHNmk<Rm`4c(`=0gn9X&tYbI$
zTxOpRTIFdS7`i!fo{NmohPCqlU7QlP^Q_rkDsx7hOG#njr=?H-`WJ{-ZkJBAi}H{^
z_qlx^*IVEBbE;4HA35w|YUFHL<#AF{@?-vao^v;={h7s|>D*bwa;fYwgUs$@uTIyR
z_A_p{q~Q9|hbcDp|8$-^Y#-N52(@fZtW)n6vneosS7N+T#P-Qv_dP~(Z@%4{ntQ$4
znc>#!GLf@=4L9~Rife3i&g(O8aeiNz@X7F-kaN!Vckf<3_e)yqY*bbw+<wMZsHkVV
z<9eB@0;SN(^{plqllm5Ij@`C&_nU18VkQ<`Zduwj%^|q-<WX<$J*OwAuAciN)9v^L
z3!Yfkd6iEOiT|C+=UOl=SvhI?#jN;!o((_ac2)fkU&CSZ^RK*7Wl4F#WqBrs2We>~
z7g}_b4RUPUbzc5fPwjjh`$%{9jHq@$7U4U`ZYvr8KQ%9R!RMTv?-}b?-Q9U~%jKJG
zCe9qJGk5n2+)((j;F?{9@vjwf{B`WC&w{=>A6_o1BALVWG(%!4w`Nhy-~O!|ayR_u
z*W0&BrS8<%-172UIfe~;rOt1UV7Ze0O;7&Wvb4)hYXA8rmVJD&EPh{C!i)O!Rt;0J
zGb)8Q_Zzvfua%Nq>(V02Q_CTAw<!O@H1=cJpC#&ZwVamxU|0FYua-7**?iwiMKASM
z7#O_Wc;r7%@(jT+W%<Jm0k6I!9JFOVbf-J;a71QgLztt(oZ7Ebx!=8dc5O*UeZ{Z4
z%A2Gt{<v9{d7PLkDsaTH!QAx5?!_HPx5}SvX0s@2>U-2;xbafpg>?NHM<2Ma?^rms
zIbVAk&qn8omfby<MU=VJ(~n7P?wh{<|KZEqc0I3_Ol7y1&SztCxDe9aWRzx{(4*#M
z{O?E5O_QLRi!vWQmrKiHYKfR~T1}@V$-C)RhH_y3^a-n;@;F!?e}C!<Q`pV#Q(tZG
zc>e6abmh&;b#V&K5s$m>vwBXnef%_gIbX!OYh97y_PyUrE<_sG<!F@kZWelO^IoiV
z&LWPg&#bTa-z(;KEOWZ_d9je&oW~`ShIuCyly<*t=e>Sl>-Imgk|!$vT^DWXEX!wK
z`q*>ZN8<vaEwe;78J%~0Rv9)?^8Jy&((kNZSefbf8nFH?*Y>Ws8vS~|`5g1rn=WmR
zk12R${(G;t*(z4s8cqdcd(P$i9?Be>;5W-LZk=#?O{#j-oObK9wX0seT@&E(`L)2S
z5ChM**2m&%UjM58Zud*}{pFW+zueAdT+k5uGjFm`;#@0EfqjPszq;?g!`&WSyjWbk
z^C4Sd%BoZD%EIy6*S3qhUHIdlzxBb9>yq=btNy*Ryz77C4}YEgu~Ow+!EL{Ngpzs{
zuLTNBVEFB#^lq=Qvg%UXd6z#kFMRU%>6c8YiI1fwi95S5JQ^Xbx>#uP<*D~io~+T8
zc~ac&8OkszciYbxK3yxluI@E*8%*7b;_eweaZ`zyzj)`4wRf-c7RNqaagKFXLB~;t
z2lndcuQ*uhXq`Wz^SR5(>ajq|f62E+UD+OWP62HPHaafU6WE!n%FNjA9#^|=bB@J7
zhS-U_*0*kbW40rBYx%{OV(Sk+4Oja;!^?Y5hWWkaQWm+gJ+9?*=XhvoTz->%;W)>t
zas!(syc7BBS>)>(m>(QG#UcG!iT%k@uP(W5GIK-jDS2$NO3E{^SM2^ZL*eIrsZI9|
zKAOe*R{LVkUO%_IKI6NqVjo$CpH|p3DM_PVe0Nve<L&BiZ{7)bpS)G)cxu;<1@o@y
zlyp4p+MHl-`R`_}zP^ahj?bT(Z#bpdyjv8P`z7~6UHLBm+%`F7WzI9nirb(4OEyg4
zWMpm*e9*{i#-FzB!P{!(kGA*LzuFYXU=|+cthpkrVD_oM<_ET&UL<)$iS26Qy%WhB
zclnEpA78Y6qE2bV%WFHC!*ew}44yh{5ScT@AR#1e#e#!98a>q_D?|-@S1w)U*n0m{
zxoXsG)BBT8JQFBdQEIk!exPXRfe(s&&9@(ZFg|&B^Q*eNZ_C*yrvI$Ev3mc-d7;L=
zbD}w3?lKZwQ;@J)dXCJysH=9iDJgR_`-&xbX1sl)cwslo*^}4P9+jWH;XO^kr*;Nk
z{K=9Z7qt`&^k#PbToyfN`sWAJS!OVs+ghc0q?R{0t<n8cYS5wl`R>gVcI}1V#XrmF
zY!!MZBg5S(%f7dA=ak5I`%X87FIzj;?Z4kEcEz=;^Y3SiGJIRh_OADV*}}wqrpImT
zZ57YkZ-4e+o9_DMWgm2$Y^{ZiHi&1O=UhM2Uo3#Pans?Nt7pt@+rDo|HM@VZ=!f9m
z>49zYcQqusX?N%><dIqSE!1|~p9fz}Mb5sO->y9Oikn%?S&c>Q(;juPT0iP?i)amN
z3@#B?=&;BWJsKL#=yrSa_Lg-&=7)R<?_U;>c<K{}$1Rn{W##8<4_$udsjs~*+f4ap
zz@f8`-|RKXuGxS1!IO*4yMAPC&JMfnQO3Xi%>srhZEiLde?gh_Jx7D|9~(POiGIBH
z+;_7>%1<IW7OoHdz59ak!i$eyel~g^_j%9VYn5@_h3}Lq1l)ID_q=^>%A~6GUvKPP
z5x$QzN7FVu^oi!#{E9aF^|wV6`AV2`wpdqmu1XZuQWIJ*|69ep`I|l^*FV0Qq4Zjv
zr=rL5mfP>OCnxRv(Ac_UQlv!0iJ}W>+86u|bFf@IUm1S-p@YPeHOF)QK2>D3V(Tk>
zUuEqx(NU;$!*7+T3QNAt{P#)jp~+c;R!?h-<%!;BCm%RmzGBPGQjaRDb-H3M>a1M3
zy${wsVfekGePQ?4%Uc)i&RYIh=6&a(OqHiuLLM(mL+!dIdKP%k$ulVOV4kq}dAmXE
zMA0`rJdZ->&b+m0BL5->c4Y_UeAzumGJ8aq2FdfRPmG)?EVJzPW5-I<%E-z0#OL2$
zyM-^<Q$+oOZ_Jb<&kx+axpLn2f_KVKje54ah+W&gsJH0UgG;Njt<<-#da`!mf{+R7
zRUbU$e);KkJX74R%y5y9QBGR4;se`p+uds{c8UEuEG?b8-S*3gEAx0SR!6Wu{G==V
zB)H$FBB9>MQu;(&!lz5-_uPU7e(zQ?73cb~X;VS|s`ez_uk$aL#J}3wJYPX3ed>Jv
z(~pfl_aF9fT(-oPzv)3f$AONcDrOR)ocs6bd|Oo5qw;X)`!Xx8-6!8`E;@Ox_2)9S
z+tR)<%F1rt#?p6<z0;$+_sp5+!yf3{_v_uF_wVi;3A^~HMstRVg3}yH=Eu_7hwNUx
zusi!vpeG@3UVi3U<$vXCj@Ef>$V=FjeqdpJC#Pnn*~F9k=gr=s_s#E<(uw?C+Rofx
zt9I_Xo8J}Dd(K7wVfwN3<`;iD@1Bv}aX4z%*F|4MTlQD(<9WBJ?uf`?SB~(_8Ucs+
zRw%`3u}qkAlWEc6*&IxVoHuWqn_Du!?0jNr*aa1bQ%d*L1S$((Itp{Bo{&lqYnoY?
znc@8|p`~NC!IGH8HJNtr)UQtK&;EB^d|%5{#ao{f3cC58ADOB)f$#X9ljaFJvp02c
zv9|_=aaBY(FYx>w@37NT=BmlbvkJf0NB!2@dg1qT{#RS}J^lME<L3_k`nJh_H(uLt
zb)|2c7s9+}>Z9=9hA57CW~TCz0?+1hT)yFAu%qa}<Bj<@bH6@~7b|$&TbRu9T&Kk_
z&rn)vagX4KBr^pg4$c<$byH0avZ=J({p;mmyQDpfJ;|fUqsYTAle3GXRC$^5oX`~v
z&t)eveaH{7PEa%QyfUF}f|`+M5R27))~#HvNo^}W9MsZ!(Rk&-Qi}wA7RO_vtS*U(
zbHDD7Znd^6vhcb8fy4X{lYzb&>%V!wwq?i4Gru~t`oj%P`|k$-yx6}+8r~>Wl@zh}
zmizy;gzeq86-6E!L!Qj#sIZ?JCjZ<{R($(WPnV#J(~1)`4oSU?5WAE2_3Yveuiw6V
z5<7iX*U>$$cCxKkZt$sm+a%31ow4DPK#$O!_!ohTShhNU?$9*;5M7;o)6qh{VA*lq
zE8EuR+)Pfom7aLd?R0MBZ0*T=mS^u>Xm|X4R8rOqCEh;{H@;tZ^y-koj`Z!{rfOW+
z-gfS_dHMbPqGB6&p4ZjZFB@B<ti!hNzGu^1bN*sqwEo4l7W32!*oqB~?3r_eUEui9
zlB{FpXUl#4x3tt<7QIzB&nNELu3hW&He5b)r119ir<Ggt*EOw|<o%JJVY2w;qskp^
zKLrI&-??Dk@k?Uuf;AmKHnOj4Xn*8VFC}qcPgF<E3I6F_ahh)y)K)S)54FGdC;#2;
zpO5C)`Pi(|64_SKAmGSuyHcLvxb4g{b7Cg#+Q)8ReNpdloR;7km3IDX7OS*$r?o6!
zJe_MTyOgj%L)JyH(ss6a;Vdf|_wpXhJhRK^(ea6gZOgP885Yi6{C*Oj$6?K)X<t2b
zj|!i!yKqLiZ*wENl7x@W>X}Tn|3aQMzc@c7Opy0bc8$yL6^%zfMlG)Re*TzQtqbqR
zv+UA=cOnCxi?c|4lTK(}ck<Y0)~})q3-i?s9+t5*lp9P8KiJ<aT9Xs<$>5M;3&WL?
zbC(2l1%72JJzu_Z-@nFpU*=p3Tk~<&tNHhy&#>uYD0}b!BvkPeFYm({Mm&nwY?VDu
z&0fQ6=a@fh;vchatIVq>ukFjaw_s1^B%>u<|I+;<gMJ@RxSMovTJd{B1L^#aH@4?|
zYrfa><jVzzZ^^Um-7C|ro#)?wdp1_qW{r{g)2#<GWgbovJI&)WS;|rK(&EVLj*h+3
zFMn-l^=aO<KHR@w<V5$k|Eo8eiLXdrkkIzqX=nc&h0Pb;Y$9IWkG$(TYa)BV@%0^V
zY6~i5>W<Zf6<JI0N^5ZaF<Hd6p5ZN<nE8}Wxm!*0td3=K)SRkTZ&~WSX>P2c*Pk5O
zZ(k&(?Pk4Mk^cN_%^z_cn}av?KcuhU%<J&>lXpqO1jiq-bxp2Osnf*1Y<nvmU+Q%3
z&>6X>j~+IeKUQd)*~oJs=<>dq(^8DDm2ZgJ_)cPK(!IjmO{U)5<$jT(?vIp&Ji=E7
zPP1Co{9w<exN?5y^&e!ia#l*;R<3SRIF#+*aQgE5FO{!fl<(1zpR@SBSwibR^G?|>
zK74JLMRo-_-8b$zYxq@v=9wPTuH@KTw~py;JA8ffO@puR7iUJCyV@46e*Ayhr3<Gw
zrL>pmuiPndZ0ijsYmNgSeHfbCH%>ls^W8Svp!AtdO#4!v|FB(u?8Am9i{G3skZ@dP
z_Vb-f)BX4?{g1I})*{DWFRt9|wC9cC`a90|eHWx}IvmQzc7F9g%^#nB8Z}JpSoW#+
z#Bzty+yl)#mAfme&t~SlT`_5Qp6@NQg}uy8M>8von&y=snP*rRGq*(Pt=s(Bowpy&
zyLB$^)zxg?<$vU2lv~a{JaGEv{)GGYewYMB6yLk&>-b^rpNPmAaTm|;Km9Y>dUhQ@
zm#&^;&}CLup`xU~&r&sK7uRmSIxEv}uj*{4hRIuuR_vW2*q!7N<XSsl$!H$W=8BG6
z{H^w;TH9AwJt&O(JvsN5+4~LI-s0WdFE0KJ$k$xEJUX@Poc7FpOZ2RZd*&rpr8qm*
zO?L<=In%cA(M+*>&r{bhob;GpD>B2y+-JqEo1d~AS2ptQKkXs6IKA!5gPy-j=lwKw
zau-~1=zZQ@-9D3G$^6zoxl@1U_~mJ>m3b^2vOeqR<bv9YdEaKNIawDRow-F%CHV2)
zng{jAUflGI+H~~SvPXv%fBn+eX>-0YV|%Yu#oPnWdHr~tx3<crU43;!=H0m|6DO7k
z>i*e3@xh4#>7uK)6W3|WCdTl`A6R>E;WEZ%!K1o+|6X-|<+Nf}(Zp!yGuhu)>6|zh
z%y2xz@X~z2um1CMdUo<`G&TBsH8;>B`%1S;@iBJ?H(%jBdNIu2U0W_`lxnWazV@ha
z&exm>$wq#TC)#;`-&|NHe$BYA`_y!Cod~vvXZ#h#CFBdPw_H#AJx$rZnR}V>p)a`-
zXP%2hacAY5?>@(Jvvl@j<BB~W1$X3&?tFXi`HLEM%N5J7+gl`U6y5b*?&RKo>nHwH
z`IeB(+u0DEX0v&-K?i?Y<kZy%-cN~pvB@phdwQIX!Ky~f<(K1%Cud#akeojIRr-qn
zo+$sBC++xH<OFAadeC#5V<YFf<cy2QYxWr2;xZAeGD$etxNrNLJH<90`*kmPJ}@%d
zb!7Wa_ZfN8YqBNQm=p_^n@hON&E3v#T*fuy6Ibmo<8@DrE+t<#u)mr+clz(*r}x?A
z&)J23E6-|k$qSa^m%PEFZ~V~o>)%fwlT;F)-H~=z&*I&=T<u(C$DQhHGSj-Hoy)AB
zTr{j>=QCioT-ov6NiErD$JO?oo4#+j%D;2Xozx4Z+m9(7X(-TlIcyxYUSwa@)tA~L
zxi3who&6|Ur!F+*faK@5#aBhFT0=|aF5g<)ZgJi2z~!WuyJze2{4jWURKWG8bn=@=
z)4Qe!^qre5Czh6WOE2=z;-~UrS1fPMI<@is#9*bh^1Ao;2R?n|<JIvmEv;t(KeLqp
zmxHhJ(YcaWWvn7B9^E!Rt5%Wp-D5R-<@3XvWMl64xanV2caGO@x+Xd8Wlm1>P2>E8
zBW#yt@<LWw^cKvp^`5d@cjxX!Qy;`~ug<PN-Ygu$wx;H}oM6-aTQ<#{NmC;lSy(pt
zZrT0H)q0wU%EdXRVuqHXrVfW478)$)c#s<#X_};U^!pl(tG{y2Jjs^R*~mBbtVwmh
z&3yX>&r8d6Ei4LC%x?UOnI2GmjxX7j`!@5Dq&r2kH6w!$#qcz4+*SKa<L3>b=ED~y
zZ}v}nV>53{@qzeNSxRx+Pn_)YznSoSUet?6TSDWk6!s)sd-dyXW>x9oe;tpDLOaF9
z_1{Ijp75UOPv6TAxmmhve*J#-Vw3Uml)UX>E&&?H9`LhFu(KAJ8YyvChq;*{wS$>&
zPfvnk$MvE%w%(iCnM!jfT@;$QB7KY1-8i-5OYa@C=|A(tvOM#9oNY~Xi~inB_LcRr
zbEdzQ;yt$E{X*Toz%v#JJyOcdCT<2BD`nbJr%k;n5TsJs8S-+ezi_&9-nnxdQ$qJ%
z`(^mNOyA<b=@Q1Nt7A5Z8+Mva`@8t!7NNS8Q-a$B{;0|4J>1KGz{e$FM?-NT^TSP2
zE<56;AH3*y{PVw<JJ-JcJ0B_$VWt}9{5a#R3ZKubZ!2Ub$v*R|J334Bc}~aNHOCn0
zuJQk}nb#kG`ruXhW1WlmR%m}rGH=>>e6qFWHomR?yF}H$-u`DIxMY%S4qt|7dzgu~
z(0c|c{Y1BrI}c>Ps!zYNbGFB~RfjBp_uVc(wm!F(w=q3(QmWgfj}see*?8^m*1TKu
z-t+66aE6E;mkEryCk{?BIDccFiMTQ6*Ukc`H5(r51<IdPP2FF0q}HUdZ%2OBBS~fN
z%-1WELcTE8_Fj9HxJFMxqT<8S_fm~>&MAI=V)<=)+68SnR#w|PBCnh;Id5$5=?h>!
zd1R4nA+K<qdBU+<x!he>43$OGq9wP+K4)3?cXqiR*Q4@l5#crcccrGC{Z{?s@%yv$
zKLw{Y^3RV-4w*Z}e|PjJL*H{;iv%YYMd^$CnI%n%J#H4Z?&!+EHj|0@oqsoZyT#TW
z7xa}Db2a(=>r+DWbsyK>yV5)gTIZ#1GB-+cZ9JHJe}i4s$@No}D=rr6XnhuSUF)SC
z$0=RZ@TWt%cmL%-W|P`1&3k#B8MgRrToH3?+UkpoGw&5ghpo`zzvvR&w&sMCkKoE*
z|MotJb1iZ{@J3UhC0Ik_Z%N?0x3^Af>2%!6iH#O|ALaGSE!ZwrCUR*>fzs>A^8|uE
zY%AB<dAT*ex}`C+Ghb%WJ(X^52Z<O1kAqE`Qs1t=+95fI?aO<o{NL&Ff{!;HTGhX(
zKJiq-8JiBqJ>91BEe+@Pe$$NjdTA4v$0jcJXIsB(YBcaO?Qhx_$NQ7h@6L+FO6xYh
z?tB&EY-{~7v&;0_HWRniTNW=?<_XeE^OCqZug`EpXWDb&JC*;<cK&mpz3VX>g93v!
z+o~_TlJVV(l;l>PxY&D{ca7<~@*3lGo4v`RZC6aMPLr_acAIg8G2=khjjuBr7Zm%5
zyb|jc?0H;wnf2U>jbbXzo?7cXIt02;^E}I|lbooc`+MQv=euX+a=rSmYIodq-DZcr
zYdN8OuHW)grz*Oy-*oJ(=&TZh0B&|&fs;PTJqO<1Rg7_8U%k`crg!5*spGpoIo{3A
zt>0+Vpwm37YHz!8uh7986}>tYhIX+HH|||zWRUS$EfyAW)B3^Bo^7UCPXwp5TUJ=y
zmE&-!-NeM(_sPcTrKGfqz3zsK(_?ndXH~Smw9&k8w&}E{BRM~&eyOl?4p<pDbJF};
z6W!J|nq|jQnz!B$JyFErcI&zh&nwXdJlsDwNcC{fGk%=+w@cRS5wGXUD(`PE-X>jS
z*&sas<v01z;$PLPZ-1SA;oI^vy)i;=$1l6i4O_HHx5D<e_51P%55&KeC#iAWfBH-3
z)v+~)(k|WWyVSsQ++FxyZO|c+#G`CEyO|u@&i)H`J?+qcnK^ttr^+4+KCadG=H{(m
zSgP?m`nK-3qz;QmffGC4uph2IyYTp0F2@->XJ**uNBvsW5b!D?qc-R7)^ky7J32S4
zSz{(F)>!$*(*9NJ!Fx=H79^a@j9Pd#J^QOPr^4yS`+}6S4HK?*#$P^JdsVhcNg%at
zN3U6^QbFB@5Svdg?up-S>2B%wu_~S|a@Di_q~^W@It$J71Y}JQf4OTvGo|tN^j8-S
ze(?D0{p-a#jt0dUmGh7MNR&*9%s=%wY`4X|qn($E5<2g!ToQUO^MrVBY0vhUrWMSw
zTi0zYUpVK=lmpk&FNHk0A}VOQq(hX6|D(i}oyBusG+RmSx-Px)#&hfTqr&E=wfN?p
zw_L<~T+%?|cwWKV>b*OA|1_EQ%&NYeu(hFI%+|s@-uc7roL%#xBQA5_&Asd3wCTM_
z+gCTuV#)B>m20y@ww;goWXf_%;G}g{i)7D(g5<3Cbw>r)&rA?@J2LTt*72w}lYJ$n
zpO%H4{Bbhy(~8rp<ycL0-*-4ihJKzkwZ%uAy^nvUWxBo2^SF*9M;Ry1ICuBHW|-2$
z%%xYnmwa*gH?b{8MSR!8a3L4D=<tfGEfc1m@XRuh*z!|qdE%F(&qmh_4!+>Y4VqG{
z^mF;wKb-lq1@iuI7@UdTzqH4dlX1d|w)B5jxWs4XoqJ=Wyo&Qe(T%SX*Et;SToK#f
za5v%m^TRj3q=aSOyFTHT!CwCJtIKaVDqYv}moRb>6>Dp3klPk2$95p&@zeA<wvtaf
z|6kW?`FHa2&zz;dGvl1T{x!W-b?wx8ryeG)KlW<HyP3o7pa1!&P*)-R-M;=G-<?Xk
zcERR-$M-IuyWTT(rg3_=;en8)b^=dg+FEZPQQX)knLgqC=Et>}zjuoWKK}B<{zvxQ
zvQojXcMQ{J%+C`L`WnnU!BgUZR(^5%TZQM!6(=_9JiOwtOPTRXZOp8G<vFznzb9Ae
zRNm3bt8d#9diUwgp!ZodFTCR`V^9C!tFf52PXF%4c;2qc&cjcNtY^LawD+Hj(S~|v
zf9a{g?~APa!~?Hx{nc=A&q?iwh32y2YN}tHH=elLVyMpAQz>Kj-n2XIw3u<V=I7YS
z&Bd8Jmwm3xHnnKb(lKK-?UH+TvZtG;Q~isFLuW?YWd2vJiq~$=dhN~c9HGeaXiiGx
zo0UISoxSJ7`rfqNINIUp-{`s1_oRFJEJ$=;9=q(g+l4!93|t&q2O3sP5HR-)kW`w)
zvB~4W&AH3AupH((U34kNzbfy-PiZ?>#VghpXL25YF}Zjpd3CqB)$Uy{7gt$*ojgfI
zX=1m4r`lsNp$QY&9F;aU39#ufEY)1GNap?j39*hYJWZ>2f8CdVC;R82x7wd4b6d)O
z&FEy@tKnj(*xQkilE|DPdd@0endgG(_mKNFz18xG)6?E?&(7Ny%UZqsWlrkO8qtuZ
z6;c^-@_~Jk*9t1+=4}`7sIa$t-etT;%=q_2W-%!>C8wFTI!6~*i<nP2uf-j3DYIFV
zna5(!zi9d8J#W59#IvhzJiI>W&B@&LQupWHT)Da?%|U@fs_@9alvFNF#zaePfhSh7
z$``-dYKGVSDoR*!u-nS(eDjQT!FOt;GHlfKs!W!PELtqSY)WB>_XBqGZ)Ml#$ur-4
zGgIw?LzBUkxkqyU>#0lleE-U>B*naD^Mac5_0w%`x|Um>*<=^DcIn|@y<IO2dAT{R
zJ>n7#>g48&nR%~wUp{kCOLoD&T+96Q8$bS>{l_acdm?We4{uM`qKxMCyYnBa^Jy)<
zo};YJYs<mTTfV<bCs}5J)&%7l#|=sraLByP-Mnt`jZM!(ukU;4are}GzMY+B3oFi@
z*mUjEog>lpCv0`}x+FH-O6Yj_+`gO3Xw~Y&3;sRpnm42M=%FAX7uVL17JZvpYx;fn
z%s%uoWZofzUpk>(izgh-`1I4XKW^u_tdQDdJ1$M*u<oZ~)-MA2MM4gLTAwaCX{Cv9
zqlJIQ;WuXkj+X9QdM5f`YOTCYkJj>iYT?VcXNf57ukQ{!Yy0_hb;-UXrebAp&S_ko
z*Sv80{m_+cf4+NNIo9*UTG%#zVv*Vrp+pzP<3=Z)_>yan&aBjy<JE{;Y^}!g;C$J3
zXKt~zx<^b;WWDCHx#m|WbnEs1X;U??vHao}&J@rN)Vl8-$GGD20VxiyDi-mYpBMhM
z<^H<ZuOW44MbcH3_7w_G`3*zeUr4i?PnlZnyz=<|1E&LL-CeST|H#6*Q@36hpYVR&
zqk@+k?V0tbmil^6+nI7u{>dC3j~UESU;k+>cv-%$?%L(G+isjM@s0cxz_)<M-^u)Q
z<noF9i*0u4ZVO!VXv6MnU-z!<XP&NN;b?HTDsbi*rREPCm2P&Pnl{xfMtRBv%}e_{
zd?KzH?X~zf{og8`EN{NYH=c=KJI!x*<o)R;<H^yNUhVu7xYX!Lv&)^A66r1RmB;Ts
z|F-L%m<)I0^v<O&Okd9Y)cN;qkK5Yx+a_CQF@KG6se5*2&C%3_^QC5GSDoStW&Nzn
znzKp!R?+_0g;mc2uRrWnV%?{2%72$(vEcMuxpx<Ty?(0XVd5T%@4NC9(|Tg#rt?;P
zh__p~Tw$Y=Bwu9XuMhG0k_@+5|8@L~J-p>T*X}KE->3f-j5SaRUd^n0I_Npu<ztTg
zwZbP^z6S<7xXNwQxXg0D?`p)vTN_JmSbLm2yzX0tkly3}E13SW-V+u2EWF81eg5CS
zyLI2+lligi&(<@aud?>1F6m2VaC?w!<;nVLrh>#FwlK5X=hv<eZ(rVL*WBMZi^*7#
zUz$(bQ!cZiezM2=S*9C{KUML5(LKgJKOyQzl;X>Nf2XC|7e4+fxR-UiV1e!g$6s%m
z_E$%&Z4--3OyiqZ^^u)t#=P&ovlmw-o;y8zyU=axnoGy(Y?PCf`700h9Y6Ku>rUHZ
z^P6VxZ*{ZIo^)zO*qVOk?|-W<e0^K&e*Vf&hRL~ik3W9#HKu#{AL}zF(pCqGBUpKE
znD{d7<LcvGwlq^lac#%a#cON@1uo~FS`_WqwdaVEi2W6Nqbgp9rJ0(sXXouM?kJx+
z=YQ+PGfLV|Ov-vz8DDFUO4}d*wnFmt<ylv6%viWM()dCO+sg)q-#%g&ce1_btL-Y`
zjl2GIv$my$lYQj84gZg1?TIYh>FHc~(e=NN<AZLM1|yHon=bE9EZoa}`PhQxe-!qd
z(0rdzKGCZ9Uir_PmbU9-_g?>EHQ(95Z(7fr>L2s>TKp8L$*9Wj^gq!gJIAgi+~RkK
z+CARWWo55E+&q_g?dHMDhF(IZ+7fBjcVzB$HIyIbmdKkW#>VLVZri#YGLjj3_4|MR
zU2`#N`y0U>N1CJ<H?WA9#WYXjia!whJ)etB{N;g3yWPz0^fbp<PRex1oTF!=vYkQh
z!3*`fvbMT!ZX6Asf8ndGFgqucK!=lnO68}Wci*qL5aZMAcJQKH#YdxkYhSr6PgYPk
zB46^Ay;Dqa(N{Sgi6;q+J*>{Z!)2LRO$<V3)-<yiS#!+p$Yy3dR(;Rs-C@oTS04WO
zta+4mnWN{1jr*pQ-s@@5%ZYgB-a19*gv9%Qi`p!^?%hAm5ooL)DDvv{eYGjgiBI;i
zRutSkGN;!%C0j@BjdtH9mW%(>R@E^T)l@`SUf3*p*UzLfQc6Pf+QGsV;fy*4cFW8{
z)eaY^`UTo#33Y_XUiCjvTG`K?XSDk9t>e*lw|O!`d%k|OdwlDong0u$jwQT3VMeiY
z=B|%l{6D+>>+@a3_phv896Uqujl!cE{^I+`&WD?Z`qbT?&%gU(!=Lz%(+uVx6;hB`
zzF}38R~5f)-K%}=_ty5@kH2&L)uue@W9EvN?|5mYmsH9gbz6V$)1rgI1)a|XLK7s;
zTBX@f$&q7Uy5Ysu8?7HbzY2<+%+A{OxhL?~i-#=Ag{|A)S>5%pjZuix?0CFtUErq$
z??gNp50n~D-n%b#`9Thjj_w&p>gAI^A7wGL{#(lbRr&KPu~~&qfp`38Kk@57b)|d%
z{F$FCw6}b3Xm2`ZvZym}#V*zDabN70TVD%Wn~=nL?EA9Sb`ldD3ol)ju|L0-&rxGX
z#P40n?Uu;`I$2Bgr@YbAI$AWv-8GXrBCR9SujX#{(Wt<<{Ky3?vXMqy#~U7`^3FSa
z&3|rC&uw%6!?mGq@`h|r8m?(%OM7%NG_5`OZA#r&w&c0L9xUE}{g|AL(wEImuiwfh
zi0R$>w%gco^*&ZluJ`#Xczh-tGgJAxW4C(w>Em_Ur*B+1{bS<V=bxfYcD)d2Q(tzW
zm4#>j`>2nb_FV9r-&o7zvFFvN@+~I2ta(;sef;xdQ6+CJvpd_)8BZ9m-2JlSzV4@e
zH9U7uX%sH#JH;Wuv-q)3v&Yon(z>PEF~yo}AF_HbZ?~Oix7p}UVd%r>FVD-ExJzE1
zW5{}{z$YQa;f>OUN$GX%(G^SPv2Y$r%Fn!2>uS5v+)rS&MBCFPpB}$0oxOj#lZoBu
zKU*Hx2D7X17i@a_*k68S;^T{Jnl>_~h$bx1R5CszWjoKZLq#m>-FnGJ?Sn!G%O}2$
zPrs^T{NdDhd-J)`20AW$$;q`7pE1t3E*BPd>5(~);TzY<Yt}G2&YUS{<{I<kY!kb(
zf`<e9PK_sO4aMI#^8Z~mEiOU)?YZg>f7Jy%TYl!A|B&1vv-i!HjJC><)2p<97}lkI
zt*PYDXqcr^bk@@U+|!jd9X8+0lwZBf46fhSu~cF9<e*?47Ws2l*@nChO%*Z``IgQ;
z1&X1|*PAc<c;New!bj0XVYAK6ztjirZ`9u`UK{=9mgJp17GHf|trJgl-(YiNrMS_L
zqrY}eynQY1%%^8nu7c9nmwmmKTyGsw#B*o<^x*TlH_!O%7FIW37QfQ<qWejvX1Gb=
zmK<yESr=bDlU~cF8#t@$nDqPm3GFj-cD$<-c~o}pv~TFP*G1cI&Rm+l>vX!7=bSs=
z4AXuc*5tJ~B6F4P`_h85XRj6ip0{sb&9^%{9=E^YpQiu$(jxog|Ja{jJe3)+Bw*pU
zs@XbEHVB3Ls6;sn+`aB99wy+t<l5HEMYEivr7dE+n{zJw7dG>My8Pt7xP!YjlRk;M
zo(P;at=%tF;M|-e9o@ogXKvT%W}fi;Zcxv;Ic)dM`$vDQdhy)mAB&960fqneX5H2-
z_BZ~UpEY4RvF4818_ijZ%7V|AOJsDMU3*8<X8of_ngK407Ah)h?26xbS#E0Zr!(n=
z*YADVweiE#<>$Z5f4zRg)Pj=ePkz%Ck0~;J`2214&2*19$4lSsJpcO5*148Z^UuDr
z-?{c^f}&!cZ`7U|pI9leEmJl=6ph$>Vb^Ry7R7{e%_X)!mpv^FGTadT=-945T3?Q~
z@jSk}p3Ss6v6-#xZ-v+EhheAqeB36>{?EUkaQ(#7Yv;Xwtqx%5nB(9T=kn%qoY?V=
zrA{tAV$unmHOD1N;%Bu@t9J4BFz$S}G2wLoix)2oB%~7bL!Vb%zJ9+e*JpAP3(LkW
zXCoR7RfRMrmV8&4a4>YDTjk%!)2sK_lsxX6FFtqbg3e=kD$Kn$kAsaT9^2><W|Y2m
zeS!12in_b2KfhLD{Mx6}6D+e>Nzpv}8-sO!^VR7LC$&<JvPvZwguUFmR6yBSu+8AZ
zs*Fo(JVb7?O+BIXd~@A7XVIOpJ0zmw_Vv|9z5RBMzjINjgxthz;RR2op7K6_xA3P-
z-_7@TN|=i@=1ptUo84fcy;uDC=ZX(q3D&`VDZlRhU-Fd6)#Jb%6^j%#MaHgGDxMoe
z&kILy6Orq8%8hin8IZ8SCa+9yNAL6isRYRh#yVe5Ei>;5;#+T$;L4C7!4{Sn@^V>!
zBg3=^-3*q?dXx2K?53FX9Fq6`aQ%J438g(XOJDsF`BBp4;h_H3axFuj2g|?Jj}H3g
z{Jz@O8CA7L?$Gv(GbiT%ns;sg_7k=@DvoeRxTWbx+!KHIu>7@B4%-W-*&a;SxBvNO
z9KlxiX!(Wnx8nony+8BgT6Mq2Bilc>zAY?_&ipwedSRbO8~4<mLbsS#Z?@^*pJ<k?
zD&cXA<B%g;ZuR_Zha!(;W+yS}pkra&pBUAT{OT`m;dQon(DUzf*@d!W912VvENh}C
zxR|DW5B}`fF3GIEaPMnoS*4V$l8OCix5o&@_RT9i!67bw-0+Ek;#c#Zdhg$STeRCv
zvQ==K=kCcZ*FF_YPHbVAe`<-^DJ2<Gm!43TK-K_1scU`#Y(7c~iw!wK1iM+;cAczP
z7^L&-%FT0SOSUaquxQ7%WHFP)VmhLw(+zn}WL^?jk;S#`P)N7BSU}3vb!SuN*c2<|
zZpe7L_k>2z15xv%XKoeUPJEmf8Q5@u>-dT+<=!{@j~);T<37JPZ(jU_oqj##E3?~s
z^7Gm!O<H_*R*_OT$1%gUiz*z>a~lg28Pq037fsz*&$f*7b95$0QpjvIqYthzr;o)|
z#w@(Dqi>qKlfrbKoyS&pPO{i)5%}>KlV92i<|&o$l&vi`-}(5k;K#&R_jsQ8##a?J
z270#V8}_j6S?}YVF+=aeQb*bB{A0ekX5#5;mWx+^-0a*`<2dunQL8DNEH-^9e)8?s
z<6m+Qy#GH52o=7)`El-g(+w;-Hw^3EE-7Dp^J3Uk#YqdrJD=6*&Z@oNwop_xxT5^W
ztV6fdgl|t1*yH_>J95Ttoma1JS}bNiS*Bw8HRaR&#k*b`?Qwbg<)&J7ULMzewx1Wi
zPe^~Hpq1fxEP?O*w)5847bzS#_9nxV>5=BL4CT4|exCJue^+T=+fI(F>&@dApPVc<
zJzDF${DK;Gwry*3G#d^~$jFHD>@Hl;#=x?n-A}2Ni}7XQ`F+dpey-Z8sb!LtvQ6;0
zgO|c){(F|K=53MpgY$lixY%l1uNS%Z<gP!z0OPMhk=y5Hm`3S|>;9fAZv6U3nEbDu
z*-}%2WR|muF+6CQ_G!<pE1|wi47>UyZocwREPU6*I&aCXQ-3^mHm7$Vjj`7+J@vlv
zU7=O0#{&M@%+a^zJlHE&TmLRUKx_M}ZS@=n0^QjeIv6LdvN<q=?Sk^^m*!s=ObBgX
zoOEx4{pJ_{`t_rB@SfSMbLMyB68UG@ixa(lg(?sK*ge-y)LDM>!EZM+Z<U1I<KgX@
z_U6(}hgzYv1}R2%6KbByZ;w>ow=w5}&bDK5>`#79d&7|6sKV89=JQO;nF%a1S8SL#
z*QH*utU9|(Tht+Ii})qx8|#`F)*o8;tGn-_Zsu1054UzMnE&(onb<(B4bnf~s3l70
zto9J_v2ZJweX0;5az-JuONf6@gzEV{>%Sa3wyrQv_gsm?WkH8m4$gIPaf&&mH@5`b
zW_%sYfAd_T+vJG0Rjkt&98F)r!Ft8KEOv&e)-8d&kDGSxSS`*i)b5d>m|d%RX~M>X
zC#=?8i1=Ff{o)f%@$zkNdH1sATEE-y%!B!~pK+aN#lH;#Y(^gy*wY<)mu-D=J@MtY
zZ9$V)wQ$x-URYtXD5Pww>9%9bxcV-?uYK*Ry*^C9Q%&`>#w8b%xh#>tw=5`9Vm{UU
zZ$-ipCl^nF>5IRnU)wSB=PL1gPd&eFwB24FbN63DBwyGOZ^tbu{>=i0jo%_#wX$A>
z%u;;%fFt9@k9o%)&yktID(HK)sr~ij-|<VGmvU~>n#9rg{h~;g!ty_V_fOyW=;8M;
z`Ae_Lw#hH;3}SD8v1@<v@4L${ey^)PTWCA&zxTF(YfkECd@(Fvktw}Xf$dh|ok<=C
zmwz=|_*&zeqM-`!4W}wTBVkFdCAQhGb7yK8_V03PJ-kLe*Qvkf&++J+WfE=I<8R!y
zbu9Q$6SwyC7tWg>ORXb~qyO6N$(O!A|H1wPiNRNHt!y&VV(IWuX;fG;=a<~)<H3jT
z)nwNvD<9tY(dPPzKhDlS-~Kkeqxkh#{Q4Brn)B@(cN@hlQVmQbnZlO$tzgicEUZ@9
z#O$`z&+hQ0FVF5Z|E&HrZ~dtqbD4~oj&g7*2{Ei@yO&XY-KpC)ZPmeju7zipCU|Ge
z2|jk|>9=rSjlVXZr(W9WJ8fT9+`rWq=gbIyQZ3*j$b6&9FK%w?zVg$r#ZK;xdD;Et
z=fCEY?s<Rm`K-mK^7}NHZg~*Re?FhL>q6C?$P2e}Za@EFG~pIY@Y5}fiApwW8|shz
zm%bO2<>I`=OJQM>hf3c8g--Qn@0NO6E;#sfmrM0N<@oN4>n+dQFTC`2-XGs1wQWuv
zOlw+16IGfT79Lj7+92j|Q_IxG&z|-ByAwq@q0-)47BGj(?*91W!LGl7DvMP9-c(rT
z9(>v(Mv0|@HLO@lOzYY2lI4<CB8Ow6oJDr=uKIOQ?ViDn$-mA{TIQl7HS=z7PT8`F
z&B5~NAqJrgjXJgKq^;*q{3DdV<KvBYC3BU!B$TB2D&H;dPOF-Ezqwxe__iE}74rS>
z;~N`y`JB#6x-O9vv;X<Ov+O4)bd(nx=}cn$l#tOqEyT*C@=kuJ_qpCbQu_P%Cor$w
ztJX8i!B4`xN%ztG<K_$ct1XL{%B6^Zez2^7`Qw9kYr;eRCo*a=+=}lyqLI*B*0Pmv
zdZqQg)hE6z)hpjTF*SXv%=y}5ufM)Bwyg~`y*A_Rhu1c$$^rh&XD@WkGvk=0(E0d~
z&W{NSo3opvd=5<6yDewSg7ntu=TCX)q%^Uw`L+LVz3;&{)phgJOZcyKyzG9lfIs|8
zhGp>i%D+lwQR=x}bv5U-7XG?$OfG%Rg8TP0_lM1wohosdPs+G!mWP_XQDaoYi6~PM
zNyhsPr&hA68LVmbkZWjPHRI&^ADa8JAHU$snYT;$a?+QoJ-bW%BssgfI?t}u2{LVQ
za}>Y6WGeI5|5_)KpKZ|lw@>27-(BT~?%NcevY7fy@Auk&^<AcK<loLrc9(ok5$hLv
z1%E5Hzkg|E6LL?j$l=Aos+z;xexYF!e>(n){Qfra@5#?IPCw6NepQ$Lvf-0JeTvbK
zO>f>Uwtg~WxxUHq*igSmeyxXiPQ~QMEPwRUYQFRS`Y&b)dBW4)X7b1hHVP<;@d&@|
zY6`yL$yE2y=Iws|^O|RaGwm95pWR%v>UZw4I1^{T+N;kO3O@K9{+#`8%Zp<FuVq?N
z?Y~x@_nD$DV&!{?!RQ9Ff3UOF%1|?Jmx%J~PD`gLWM#grNmA>ye!H*1DZxR0t=@}(
z$a@U;xE#v$trl+c==#iXIL<os{<nua6|H7^@aNVfh8oNe=59A#;mMUTX;z=`iD<di
zlTyPCnf0VKE0kn*7%}i&PMgehV7C6l!iq;aI`?KS*jc!G$(mKGEI<8U>#wodu27fR
zA#(}WBM+@tkIv6db5!&{7Qmp)zyIjwAN#LYI?uhC@oRtej0aW09tT3CdW$rxIW#kz
z=N>$>U!`BEcK)^XC%)O;pIh+u-0L`p1)aZ^d`UF=l_hhspn3b%rF%6Jmg?#2&z{Hs
ztv*ik<!<91CA09i`MTNPuV<S@&1Sw)8d;wf+P*x1^}|Zr7nT=_Wu7Tnc7$ooka(uF
zQP}9hA}0I2uRfpmn(&|5GUfjD@5ib<+xBG%FL7`Td9bKdoY8+~zT6+af6HgZtxxrt
z*pyQj%=K|0x4@C&wI3(c-Zn5vH=Zc@q|Z64>#uW3eRzoO+5cPqa@CaCT)cVx?3-`w
z&ho<ipKkT~KeT_;f5hYJk6_W&p`6Ea{&Q`Ae?w};;}s=SYu*1}{XOy5JI#)e_4^%9
z={n2amdQ<68+5_xvZ~FsWyLEF9Lvt!5ZmK_>xQ;fuk@Ga=^y=eT02>UCDa~U#<OwD
zp_?{4nQrY5JZrA_T=`<1g{YFAk*N29C0unIon=BQ9?Q<C=jiya=y_ub&#?tJ*Qb2g
zu`T6Hy}r%Ot@A8bt<Sn~>kES?<CB0hJ>{C0(gn)y?x{6Z<3G8Pi)qg(Ef=$#ga(V4
z=h_E*mdjVl&WgUjqxug2<jtqgvatU?eu+)8r*)ag|K}l(4p(S!&62ps^TJc4&E;Ov
zRw>8*Kjqe5_9)Wc^D*qruO0e^yJwqrhv(dReU)8H*<$O8#`5@l=EpCk_s>?kv42PP
z!WQR4Pk&#28x#D2i6L=T)vb_4_M81~v5KA6EB<%Fdi%OV%{R6&<!r0J_vpp_;tk!i
zcE7cp5`Cp`|3m-o<tOi4y;2o@r{!_sWG;_fmDy*GEL_qQ#T>f$o0Plrfzv1SPNxf1
z%?>TTcC3EWrBhtnk4kkFtDK*5Hg(em!wtr_IoNLVL?n9ig)c3;%8=jn&6X{m+q~q&
z0u7BB7o9#{Z}7c&?Y+d3&ol2FD)v<gOh1|GyywKSm)k3?=iCoD5^QdMLLw`C`^AG_
zK3rc^V0)fB$^OvuJLRF053X-B{?&EN;-HI+?^^lSQyv7f$?=-KU*vkuuyXo|ko~(}
zHEub(M6R;$+QVgAd2;wer`H8%pW&Bh`F(nRzV1vO=FgWF6dPZbGfkVkcE#hWRlU_e
zHg5W?G3T<+MHcC^W|ESV@BF<N?a~vLepz4r+pDY3jnAz%n0a?kTYcl<1MRQU!qe5g
z`nedE8*v{MRAI?7WmprY)M@(lt0<S}Yn`QD=dNA+dH&A5)AQDG`z&29G3n6?C9#{_
zl40^mNoBjv^@lC+-!%8^3%Nt;@gftvI^G}nld<f{>jfOYu8Q^?G2LyeQD**f@#3$W
zlNmM7<cn3uU3OPVX|OoplN)#bXW*U=h9%qcy(j0F=PT<zJ&>NLU|3<YYAg4w9m%D&
zRmM+GIQxW5%l;d8t0iBcDkM<BBXQnYo85o2vUPa*`KLNQl$0}=d43Diw_py1?e~BF
zm^q7e#<V0WHRdAIx98)vgg@)`Rc~97BXdPO;qk4duQXpqex3g1(9#q0!zXZ5{d<{Y
z#eVPmr4I3WN$$6P2M^l$?3R_AC%<(PQ;@5Y@$tTE#WPw1CrJpLZsW_H%9+?Jb?mmb
z)W^7<xo%hZL}!V_a$Ww%8~!{d$cJ~?f<?_{>gyF89!*KC2op%{id%eNO705VnZxSS
z)wbMRlvusnP+$|k;y>1{Wplk9WNrH%pIiFp=UI=QoU{&SiS$}t*LFspe&LEATTI0j
z@<g6bPjP1{f6jjReda#R?Jo~+4>t7lWt%wjl)Uzh1kYWq*Ta*)uFbwSC+5`E%Rzxw
zZ#Nx&ZSzd|uzKd|E8q7vZ@3`6KTS4Cf~PyCTv-3Wd87PWYY#kWJ6-g2)ynG=oK1Ix
z*2=mo+5I%vh%>Id*B*2;&s=12Pl<%-^N8I$dJlYD@*!*0gSs8hSeo70jaO~f)~|Dn
z+q1#uW)|~%p7_(BdFSs>=HYu6eCzXpMsK5MmiEuYOV%XwU1ngCJ2HVu*hn$4F=1_o
z-csr9FHRP}buwI9-F(G{B}$e<$I{=Df6}2p+P(V<v)&oBOUz&BJTobFi(E;?<nO%x
zeddnKr5EjW&UrFphhns0$XBV}n?jo(e)ibVlDvL1TUtlsHt{w!zOqwuzWj<^f4a&#
z%{W^wH^BAAhvQ<UapqGWAD0om`~JY+w;HS07v5lxbzpdXQ_mpAq<+Ri{VN9yj!kF2
z=8%=ja7gQ6ahDp4W?WF){o`lZ7Bq3F9pruJvoOJ_`nZ9K(+q1fS2yQ0k%+T9-<q0A
z987R=Q2VlAwbG%S$>MWvKD~N?UE(2Y%@zjMWgpxvWS98f_<geS%cq5_9ZJ$`?^i6}
zG5^CMcd2u)5>i*G2{NzN6zJ!_`}XPAnRRc17`aaR&8zjDE5FP9TGk@(<GhF6s+aRD
z^_aD-dhe}2+)lH%$g*Da?#(#pv^bRUo{dpl_<YvYm#%FO{<}r<LC#N!Zhwa={&L+_
zW+v&6oLm+?o79qgd#Q%>e<i~`&+g}I@H$7a)M;DiXa|K@Og^ftB2vVzkblPZ<^c`6
zya_cHuO#wWmDeBgaZPQ$m}MHr{qfCTk3V0`vew$xy{c%l6Z1Xqnpo}jn6KkbYy4Cu
z{+`Yj_G7&ZBpg)gOaio+KR&o3eA{_*!}5Pe8l;>U{`WiZ&PZmBWL5ky(>ngC0%wKh
z$&Oyv6yCyfSAPaDo-*Idc;ChP#IgXVkCM#co9|sLv}=(`oMOM4@hVGUTYvZ``;GtZ
zu<!2N$^X_pMa;#-vGni8y3zyR`wTw21n{-hfAh%jSgmv*lK;~s&kGaY@9JQC>!gv%
zw28e@TjWE~G#95u`&C*O>F@gdW%b2V4HpHpl=7MydKxxtJESu)vGXM7{6qiu``nUO
ze;!sCa7Z(N>-mLk9n&W1Jio*?L-@;k)xdSL|JqAGE#4h&Bgek`V=Z&`gKwclfnN(A
zG%0+Y(zW4z{=wXHbG;laS(<0h<&eMla>a#=_Z?s6-1_(UcF_H6JCj!hgqnx#^08By
z@i#s4W`Xd-D>oKj_;=jE_!8UY>9?Q#$&mNda{IPS?oC5Oz^M(rvro^tv9~<&d)aIq
z`?ckFo-b=W@$2hV`On|W=f}y%?#&7)Kl50X)27L!X_~V{;j=yc+5WyY`X9ar>@tmD
zW_CRP=u64I<r5PbFU?Gp375&(y5?EkvA`3r6TWdS`oB{xAnxzPHi50jx(u(0E}pUa
z=WDI}1uag$xbE!bY?t3@bRqFyXej%gx&M~_vd$B@y=2>;QlFn|-`%n~TU*y3BKG&p
zHQBS3KOY2S<W6u-kuofJu`X%%?wh|4$9&(^eNjeXnb3|PhHY97Q#NR;%s9c(nzEMb
zWE<PR^UsR^UT>Nwvg%)T%rlR6{lbTJr>FndVdn3DcO>vti-X{b4$0Cy>G%A9qa!>5
zrx-=wtN8J0-z&Y-MG>w#n_RDouZ#buZ?Q~dlF6gKpeHgxVkx^ntyMpge$*?Z^$&+H
zYl^>@XSJ%y_N4(qotM@sYV32W@aI~wH)&pMqeaNkEwie853g9M$)eZwZrS0jzB5IP
z-*A7~o2Qg{iqlbBDWYZ40w+eVUZsae<tLu}+8e5s^=#hyp1PmOw?&fp86&68Sh+lH
z+y19fCl*bTnbl|(v|`s9TUV}ABH#Qk%B`xE;qY9uvDLpcJ5p-bQ;}}}vew@8txi^g
zTsf;#T&5ju7FaQ7_s$2$dIKdnX6wDW*!8pYV`lCWw^h4xx82#ksc7Dn2OLYeD{Z=1
zb(g(gaOZ{o)mQ(OdAY4JdZM%fTiI6}<v7kD@T*+c-=32(;iSC$@+E6{3U0+{Yjp2C
zv2y8ZiLLftyG}jQesS^c_8E`2T@ZFk-X@aMU48QM(yJbm{XSNu=XBV&h${=&7&)jY
zaH{->KXg`c?b@m0GA#{8PMppRJjy8=en&W8@Ak}axTzv|d)4zVGb$>x{%jL3pL}e`
zsb{MGkE&KoZ0F%<VR3dlvUzWA(Si1OUX{zHo+~{2H1A!H2;;c)OizAmy=VB8-Bt3d
zOB1v6IoB++&HZ|7<KtufQ#WrtxOnH1qrFa(N|v0PGudfbzGU#@`5Yhkduoa&?CHC>
zfyYI2UdNS^ryk1JT=*Y~mUu-!e)4LPU~6KhyD;CX+-c4?&89_~Cmr?OAjqq8pixL5
zxxwKg<EQ(!vHxbz7jm$f(snxPki@3PYY%ks`T6ubxqY}>B<K3|S0y{IC@K8?+m&z9
zG5hGXM|U$Be6@q_1)EmpDm=4vT6XQ)We0T=iL&#NRqK=#8s;P%C}NiRdv=?(d}{gU
zXD{s5tp6-|Kik-H>CIC!Wg5T8F+EClTapl5#PBZ8H}mu6!+omCY$<{g?@oCiEDmW}
znYQv%XRy+)`+>jyFYOCE9{Kp!y>Ip3Kh(&{9sc$I{J#rn_4m8K)u+$dC(}Rq&hy(h
zN+Zv0KhtsKU%3BYd;KkExca47_}QO7jR}AMBli8>52p9{&we=i%0lLQ>E>_hTQ6nK
zXk2skf6lkh$Ns<5ufKPzuGW3(qWG7mD(&R&{ki}9#sBxy-~YDTe)X^Y@8q99B<rU;
z2TptU`)$aa^Oe_Y?8T2Zd46ZVrJN+YNMudJ)k8C)zIZHNmKn5IbI}t+!%gx%Q&j?H
zrZR~nvRu?u2v_PjsH`lq#%Icrk6*;59h-i?#?y9A@$dS^w5MlHeKRj7`>pax5S`64
z@m7>c*`a<v$yuB7#fwc>?@Q3RX{?dDq`*sLX<m=vuG8hWdt>|flwNAJeL3zkIr@gw
z)k$6|CJMPb%dWOex!T5&Y~kcoc;vRqW!3U~uR~n5xfEoWwt84|wlQA)<MMku_jzN+
zU-$E0*qU1Yn}6bu{fCNwdWFqj*Zgzb{aa@KiJ#N+TeDWN&uI)=>dAlWY10{}4gcy_
zI?3n$T{NR{M^oFiruoMu|4#Gqy%`YuK7Hra!@t-3pMPWX_I&UDg2M|H4LN^LQD<U)
zm!r}CeWubxk0tldY(8+3UnoB#kp1`X=fR)vueta6)vx=fFUUT5o6b>pv&FQt<G=0`
zcJq&0ckZ+M{(oO&x@nwD;g)ly+s;)^dh*{mGca1TIaqpuOxdX?|BipU_wIs%<RRnd
zeJTeRmc{5l)0^=}?$NTp=i{}PIViB+X7&;kU`Rc?UL|mmm5Xv`<iDza#W%kGlQ5`@
zR}61R+H~7FJz4)n^rUm@SMB?QIu@K;xRiJQx{HU?b|1NZup<4~7TZ_;!gku1Iwt>P
zQ3&G}V^g%hnZo0tb^e>hjuSR7{a=*?JqQW33SD%5uV;|V1^b{m23JyCf<I2M65#*y
z`G0EvT&qo$=W6c!l8{QsZhG&usQx|E?sLaq#ozFM+VrSS`txs-Bo~1%&tn;0r=4GN
z-m(40h9^pYCo6V$Mg({Dsr=1-rp3MOaYW}^=k=fePIX|ox4~_)(3PmTYYqoq96j;b
z)}}Q|;FjYZgOK{kzt&z0yx^kDJ8`$q;>%xZ*W5ULGhfVbYyF*TnXVf(D<7_y%22~5
zF<FAis4`N&Z))S^tVMoLZnoJq%v=2J{JEMHc_;p4D@08Go3~rBYcWGW)8rdlViL6(
z6hA5}gtT|vSl-&|p|Sd^m#a&Jj=9q&o%TxZzuG3}@2IbuaJTKn0xou^YM#m4mo49z
zaQlnV=2uA}kpkz1W^+7bYV-D&ydxh~5Nj=D)WU9j?C`67`oZ}hlB*Z7+ugY2czeNN
z>p#mC>bYB#UN`>}>$<BSdO<d7^&6#M_m^`;KK!8kYCq$=-=F^2UtPH6((X+ME~z%$
zsIoicQ-7`c{(EWp_Z9J%LftoKGetKXiSJnV&Mzz6Z)NpUfriGba%(nlFV%fEBlC+Y
z>+a;lCEx#i$*2up`L1MUsrat!l2do?D1V!4`~3Be%NK1Af36HT=Kp&6O%C~G|9_WP
zRDFJEdHLJY>(f(D>=v-i{3XPpzbHdM!Lcdzf8Of@r@qV2y!-y*i!U~Rt`^0MnEkH_
z;X1Rd-EBT2$K2d~v!?}rw)64h5&k>pyuE7t&l?dJzkO!<s}?wqDaqdNM$28rFFke-
z?O*);`@hs$Zg)b_{%;%BKaFCWd1cy#H<DW}onP~Rde~Mbx2b8;7ta26-<PzEQB7r<
zHtYHg9jiBQd45Az<d}YNtaQHT?}$4a%Q!ygYrkfzedq7{<>jG!HGbt!?oYasv*FKK
zor-CukxUVM5vD5d6VBIYB`7^ztaByINHBt#jeGUo%=+0c3fCO)nV{8IFlmNCsvpnk
zZ|`n38R$%y@@<3Iq8%qp&d7RvyBYbV|Hj^etJbzxCuukzP}=kDyzh&WLk1^0CReVi
z>}AMzcMmO*)5+{xa#g|eUCK29dCwEBm+M|FiCpaESiL;WL#J9#LPqzFutZY$xj!0v
zA0^)0qyIapVck8wDC4ymCAt3Y-LHdQ+8?UXu`@m}S4PB3c8$r61&6~d#b<up`)>B7
z6&tqfUFT!*ZBB@rmc$i-!VamAhZDQZ1t&NrJzimOuOTG)fBxC;((}*d966WFeXHU`
zaeA^qrbG8~yWFZDvve(%?)p9_`scPOX@@obvo%yG1hcS2A99eo8!@fn$Hf>EWmN?S
z<Mn6%PuVI~u;j?6dllOR=AS;yAi#ZyL0{D^%W8WtGgHo|DNONq8+Ij|NQ7odt@N<t
ziCy>L*54myCXYjBnIGSOv%4Zc_}4nC=U0=?DhOQA<&~M+`((+sOwO!|<xF8+59YR?
zE8ci0I-KY7QO+$-b9km+7wKNMgw;*%2KNv5nA$>XmI9@wDf@Q^x83}-^~sj~oI8b^
zg?ZJJH41V~bIre}NpG4Y{9&KiJ>g$QMVhm36z-V$f0@rl%bQudixkwYvP_<E{GIaW
z@B^cDP6iE^uJEgC3IF_YDD#5Cf}UexOip?x4))2%->o_EYTMFdbKWH+MqYRlDfv)2
zZpPLa?HhaAWX^?WTCZK@rYqXoC#08TEhaIe*Su!?)jh=*a_0Q0TRq{W=Y~bq$-9a&
z+7~`pp>p$$a|-k0B^GHX3Xk7N)K+(2Kl_!Ou-=QPL+zy;7BOFUWK8|>Fh9c~Z${qF
z!eo=>(<e<?xBBU~Z(_NdQ<r!%7#mjTvTgfq8)t5^(oHn^;<FTC-+lY<m48!_(XQe-
za6n?iqTcdHN5x~e?R?KNci-frJKq?~o_o}`o$26vUWqp%%jfBD(b#s!#9ASGdDjG9
zvlW&sqLL=gDS~AU3AqckO&-0-vtBh{`1ik_^Zc*w<T(~F_ui7ZlE3TTQx3Uf{l6-r
zUfr7+YQv|u{jUDsUH|v+9X`0{X2IJv$*nvQN3Z2PUQm}LaWwjQ{rC6VfBm-l`n90$
z-$S*lX?t$z-2G*9I<l5qz^r<{-v4z!c3IClw|Z0Owfg+e?0Y8Ua8+%I6m#qd6=3?Y
zQvA@24bMLNncOkE$tSqq<0g*_gVu>-Ta>5HUH)60fAZn4B?tc+c3R%-dpL2U>6KNy
zXV>Q3T>kK8Hg{c3mG1-DOW$r6$^W^3_eiPd?er42oa7JB=l(wyX1jTc?yd73b`Lq%
z=Y5rPt@@o@ySns;p6dSl-(;Ol&YJyslKe-7`<ITz#g5a{EvnpB>76NMy{5c(ht<Q$
ze7`@Rp8YD|$lP1CbM-epNw^>V`^9}Xi{E@}I<$)HmT%e+F)!fbmc4tN3st%zJ6m!;
z+S&Ff%n*!8ke(~$Y*DAfU--v_^Q+RVk{sQuugm_#zbd`={z(N}pG33pKb?r2*Zrn_
zS9a;8XdBEiSNwR#{y@_GExq%DxmPCaI>%z$JFj)+WtNn}#s^3EA9db8a=d!a`(G3O
zD!=$SKl``3)*Xe-CWR7xT?(olzuw$4>g$tRtZpN8P$>8Kt#=EyPTRPZ=ict9T*=5c
zCQc7aCtj;szxmpatuJflS1&&=H}&7-n2l#D<GcUIzMprr=Z)Oqn6$-Z4${F!vmTU9
z;;t((T&TrV`NOO~pXHaKx4)(EO8Ki@*&Q<k<0bD0-Qr!SAl~q22J54@ZC@O}OyIp~
zd}otc)1TYHbL1DYESHkH5Fi>O=G-!;rFu1o=MiPiZ=3A5E)a_h{;aS`?c!J7o&6RK
zW+^AlnA+Q%4fH~99F2eQbb?HM>M!B{^1s&kFShw*%N{B<uR%$=exi_X_t~&@8AV4r
zCajgca)haZ#bM#CJJEjwM2)T_e0w8V*7UhJ_rjOm^4w={XXF&^|J(k>T*Xf8>WVit
zro20pxi0;Rmv`|M&vF)JlUN~T!jLRKZQ1OVmwwM*n1Ap0>`!WwD<3~8(JI{+zVpxJ
zr&DgY|7p7PWV2NMeBOi=`wVYrUOUr!{O050{wS~iAC%HrzQ?7Us-Cu)=S`-Up0q>g
zcBc)F92r42ks*Qg-nk3E&XW=@E}Y^K^uPCO`uFW$>(@@Te8-WRd#Ulx!?jbq-Z;1!
zwy9fQdGPAVg-d1!+i%~qDez~}*vjp!>=C#{U_sY<E$MKRq{2S+MM-VOcOIVIw!%wZ
z!1AApyR2He=xSBIbT_ddpLaSt&U#oCxlGyLEjKIh#ib8B9rpOlI<RcUiwl<=yBQT$
zaXst#!TD3Z{OTMVhlfgrftnw->OY8P4luiy9aH+fPQCQOR{oZDl_qiJW`<ewI9WSQ
z%x0h5I_oUE$En5%qK02O{<ALPlI<<p_TGsze*5OH(l4yCOP2q9SNQj_!K2IWu5BzP
z>1DdTvNFXAivlNdTKo?8Dxafbzh%|hMbTNx8owWQey;y{C7yljezR2p&YU9EX>NVn
z_WfY)DcM#L>+gPVC*O;iE;gTDPZjdw2>hVLqLTUYeX~VZ#U0oGOLe2YJTB_}F_q{E
zxoFy&mlef2Q)rKO@0H@^0u@sp%f9)xFPlA|ZyisNOWrxBqCXlP|7EsM`IWw6OZ2Y0
zuk{pnFK@4jzNq3_?&{%vQQ~OVi+P{2W6cCE>K!_mJc*0(a`!2x2huIywak-TDt5n>
zc3;qQ=wI%dM^oKS*!>DuYp=|IpR}>(!ilagy4yle9CsHun6R3oZ|9TKawXF(jxKY$
z9iil@;OM9LP4RY?*8-ahZm~8yS5)PxX-Z7d=<GIHcqEl?2miW#vbVoQXC~<Om0q`)
zu)SP$dELwzFTS!Uv!sV#lFPlHvu|0ZK+0mjiQ8Mul9!vVnOUr`sXJ0D<V8}}-tT)}
zNIBf_Kl_N)>}%4qh<1?~GZU9?Tr;!I;)u(;7cXNrsdHy7_j}~Rq2J!Y_RHF}q-LM+
z{snteykBxW@2czcaM>yL_4yJ{S!2bwp5g-MFIt&A&U$p-hq2?M=WWf)?a~5=`1-nc
zvIrWT>YS3y?EQg%riwp<Wbh>;nO{LoQU7*rJCy3){Kvm|leLWO`_gmm)~mT!J*=(k
zJ3KEV`FGBBk&?K$g|Z@I^J8v=-JRI;)brL8`CkFMZWf7!*7@yav<iC9bR<lB+v~y!
z4goICYMWBdMu!HLTn!DK`K~zO1pl?~TX(JAxIy*InWKk}em*+G)txiBLr0;bhkxh$
zu=}1ze(m(L{ABp=zVVIwM_&AN*Z*uY|IX#3$Ikz$uKTv=zxVeW_p@~}cVy2v`uGyN
zN8|e3FV-)2Ua3@P^4s$B-Qi6&^?q{{@=pKfWxn{-!`0-#Kjr>qlfV5B2`;g}CVA~-
zkA21&XMv^`z9*LU(;6?F+-x4w{jT=uvCP?u?@QBWJ~#0{-jODrt(K;${AHi~pJ(@W
z@!i<b+LHR_<t;nm`0(GU#XpR<l|-Gl<6Oq|Q1pTUx8p><5Y695>=kG4dE3aadaL@o
zNtqL5gZvF`Dla!ZeQ-(lVaC&};4=<e>b8b-CHT!x_Plu{FN0g8V2PVrEn7+7M8-32
zTe6-j&s&qd%XsO8_G|649{zl<U;FD?$#1zt_PEl!-4RI=k1gM4i<t(k-DY;DXT##3
zM?!<*^Nuje_eDB#?oU~>S5fhX^14q=tOvL3JXH`?aM)oZ%k*qx$$ri-QPXanW)^jw
zd9ttN|ExMau`Suk?X2C>;G;`dKfCMa#<_XtbY3$S3CaJ-_5Z8>b34BKY_jQJfAO1z
z{IT_RI(vB^Jjlv<a(UurrW0<ZMn@j8vlh8utz3R~byqfHU|`hw%>OoglU=V^U%!&a
zz3bTAUxk0`)P4VHFM24lVoRFg`kqGXot%?$cC{O(>d0mO-gLMmRPoCS+fc(DQ~0I|
z#DD64Y7_W>srK8c3J(?HroTSixczpBELW1NKol2izC`j=Z}saNbOJBsq@7AlD!H)x
z?l#R8ClnsGr7yZx_9oXdHpe*W%IyHLX6@dEEdkxuZ_H8*o=stv<P0#slQDJEM%Gh-
z8d)y3e6|0r?n~th|2o0Wy!pS*zN3>1ESiK28h=f4bCQ1{zstI0o42rsW~ctq=ga3B
zMc6EHN$ucRwVQAMi(rHIj-|h*oLnY$WW_8G&lN7*O!`p<<-#qw+b$)0L<=t7apv<k
zvm~#!1F07SyQ0^Mhe_?U-|xHXss!Wq-G{Z@{C-T>c(1!n`Z$wB-#?D0DXZBoH48|x
zgt)%m)Dxk2X-ZSKfaKmyS{qqpZ)$9QX4IwSD)D0To0}8WzrMBnbSC_8YQ^eHj~_l3
zvzGess&+N6ReI=CE48&7PIP2VGY-@&ZAjPsB%ycgkhw9}#e@!J$<Dwd?y3_~BBz`>
zI<ZqQL@&7J=w-Lpobk~S8F!2`O5bXfe7PXb(Z-|Utf_fwvhP|MlP9{9j=t)Z`e0YK
zM*4-_lMkEE$MDsE&aBQ`cRq7_M(!lT32h6eDl56&n$EkCcTUh}p_=)96-&N<sLly_
zoM`aj#g5w4&`?&UPPRfN#xqsVL`zG3qqaWxDiK-CGS#qnYqRE(=;$Z&)!(jv^W~J`
zt3Q5`uWEAs7ftwfL+8InqTVBo+xBx`#fbj>+Ip)wD|D%-{)zv_>iWAUMSj;&=Lr;z
z@DtD$;s5q&Mq{XAfX4S}^^<GXUoBj}NZ9?k)hW%hzS)LVd!{!p-*rF!m<0RtAM4o{
z2QVI&Y@4<(B{lf;$uoQQzg-+U-|)0XUi66x3oh{n$W5u4yRCk5eDkSiX)CPX?|t3>
zG5uZDP9=qu$<B)=?{3om(4nG~Xnk|_wV5SfAMDR5sr&Qz?a#UOJAR)PbuZLu;`;hP
zdwuw=e|&QoUb=?XoR?Lr=ijHpc+1ge!GfPZx_%T)2#pkxx&Lt9zg*Yv?#>U&V)LUX
zKFE7<j!BNa)1NnB0cT+SeHH;Gi3yF|XXd@RyVQ^6y$Y+FifsG8YHrQ{Z?AnjtiSTN
zDyQW#)<p|+9J%K8G;!3r6fILL*=N4<+xPSt_vdX2;mB3}7qW52sWk!nO|Krm=X%69
z-M(+to~BiI!(S!-Si7mP`u&SvGv=D@K9QYTf9LkH>lY<MvR)^0tzUj?vsi-b5=jQe
znaoBUtC_gPxW%|M1)C;%=x_?T-w9PT3F)8t@Mh~ho0nTW96f~`_=Op-&MQBf!FEQZ
zsU<K$V}sZ&woADo>m@E-oUdDw9edICpH0;MO6#=gKXs+9-SN&5abxNhW9o8cNfeyu
zDeAH4VA4@W2`*QTP25ToL?Rp$xVTxB8Vp6mJT`~~h$f0Ctr2td*u>GaMyY9~sDr3z
zQ;V36Qn%89Ag#p;8<RyNTqgvGaUAH<Sf#P*m@A7D7sHXJ2_iv`DH10ZbU1n}35e)v
zI?9-!v4Crn>m(hQiJ>0cg0|5*l_m@kS|@rKS@#`P`&@6!achpn_Y3drb*?uF)mPTd
zh`uhzV%dIJvBmuT2CF@LxJ)0k>zweaUgjB6yK4W}>VBTiTQw~w9<jOao4;k6{PpTT
zrnZ~UC<ZBATewS}@38(Ml{)3kCEp)?zGqupw)C`rX1D5$zl+Xr_D!B*aK!85)Ck?y
z4=XR`sGT^!Wk>52l?|n>PoK?tUgOY{_~p}^t9xpcQW6pk9ti%DJ5!Z7>qPpyx!Vel
zJ=!%#K%7S=Q^_%9c7LDPeS6cZslS5`s%`xd(Qf^f{g98z90|d<#fAzMkB@s<Z`|A?
zaX#|r*4$fjx}>gTnkRhP^3C34frpi$;d9HQ-8q7@eBX&V-I&6ulCj+5b!8*tCI{!W
zJ9M~PQW^p(>r8CLdY`C?$-ApOIV`I2Y$kV<)ROk8djrm{dhzzivy3acX@b72Jbp%=
zwo5Op&|V@IKF8rpO3*~PHs;Jdeox&e)~$~So^;$yfbDR_UDM(>E~zI|g9GoGzjfN1
zt=@D~^0vjza7mr-RoAlj&ykSMbv!7SbNhIX?e&S>xB7)I?3axRW4Yd|)v-fz%Ms?M
zPFwu{Po9*<+Os}y`7u_W%sXB>O9N84t*!^(TG#Zhe4ea$&-oztl!v9F2c_7y)wa%C
zZZLaoOePb*<ok`T>9L-tT2EC;y`H+1{RYEnF$d+sf<-l_GJ1>K|35q>H=l9MTdST^
z9Z!WPa>yt=@zuIzEw$8h(@O6f`ln`bu2cTKCtoI+nfv^|9>+2j`zKvjJ;Il%Pi0p5
z$re%QaPrEpS*i6|nSHr^lF|y-`MR$u$;F52Uef%<Q6#W%&k85)YQfKQpQRqY?<M%~
zq4A5*{g=AmCET8@x$Et`J_pry^_ImUn;No~<~40yK3#To-OWpd(+(cm(Y0a4fyMGE
zZ65Ke$#0tPl|L%JD`a@$jKTihYg;E?uh|oExNo_LXI4%ACB@@`C-}DrZY-$_-2P~l
zS<q)Yv6Z=f@BXQ;o$NTHC|Y&ShWo`eHO6&u%^^Ep@YRI;DA-`pWP9WHO!wyNk{?#u
z7jl|zsNtRXx!i7*!VLX&$+36Bre*#*di3RV*SOgq#2>FMd$lfHD{8XACj*B&Os&_J
z-qg<!5M6XSaof$RNp>4{nC|iMT^8W1y6A9QPqTFMZS((A53V|Gn);?_{;UI=lxp&p
z3YUE_zMi3W&N511<Nc1tD^JdsFJEWZTPgc_1Dn^CM!Rd(b1EK$y+7+JZ6ov0Y=!fe
z?xovKSa%$~TYCCPm|I)kBKP@%49roj2X+|ndtP1jVePJMg;yWB#dq5z#+&Xdo_L*q
zW&2@6(-jiJQHl-C0_&0=7A4!HiIoKCZhFT(+q|{3<YvOHuq&IQ<X+#iyLNi*lSzJx
z&#ap>)@il&u4?FD`SN;8(1qn+kFP#a`SCDgvYz-njo7}up>vNeKJz-mgTa8`vu9p$
z@9RA;?A+X~3St8e#T--q^egIi!jhT6M|vkr+;jEoy(i5@i}p?E-IU32;9BSBm$7dr
z?|ppq?Y7=k3i(_!{p7Fxdv^QV;=8x|Bc0RJ@7=t1HGa$UB^TH0i#?HGto&#EiEoq9
z6#YN*L;qa9Hl?85!tTfP7f&kK&P`NWo3ZF}X@HKb&_g$`_#+AJnv;cVZk)|sc5chY
z_hQ+CCR=8wbb89wBsQe&Ik4kxii_Lwn}^w-pIQ55cTt+7EsywSqpRlnVOxZXBv-t!
zaJ)I&PU@QJxyYGIS~8+d6HPWP7FlOi#B6SHaKp)G9#7UBm;ZH4>zA|L{Xm7o{X5=%
z$;&P?j-9!0+phG}{kl@i7+!=Ki?#{y@JnuZD|I1ya-8VJbDY(tjoSjHmsQ-B>~P|p
zGTrgurLCE}UR>2?JgK;^<?Xs;_F49&6Tiy0KWfV66bTkGJMV5}@#~uWz0$>{4uK)v
zv-AYwjXu2QQgJxbIC0yZHCF=`9JErO`RryHQ%G^l9ElShU9sK8&SKrXJyx3yecwA5
z>u1#atxmMuFZ=S&qaC^XP8ua{FIRrJn|aljO*7it4_Q}TPn-GbXw32j*ABE#UNh6r
z?LtQBePf>M<;HV4o@MbI=17qEaQ1M@ja4#x7<)QmTbFx?@Z0Zux}RtFY;)a5F6_6A
z7^2G-IbON<n_ceT>y7e!RXtUYZD-!QebsQo1VfqSQETQKthpduAazVHdD$<W{Bv(b
z{pM#?2K?x(`m9|$zxK=f(7Cr+!q=}kwDzhX8+S{$V9)N~D>!wQ=w4}h<WzcQU(UU*
z?5O*u%}YhMtmRoae?`{MHMbXC_Nf!!w^8AUeB@rAV}(YwJ9GLCg<=EW>&~t2Pha_m
zXYE6;4?o%qR%YMkZ!rsEacRDKMZuA!$!H^&IHUE{6MCO*4=ZK%R{SccdoH|Xf$Ym?
z$ItzmzTLL`Xw4VSA0ho+{zAMD*1tRcQDIw4=eq@g8ZHij_OoC7&v3Naw(xD)wqHeJ
zvR}Qu=dSw9qU0;#{K;~f)zt1wY%X8V9xjmHb#}hI@TwO(6V)_5<lPyU{i_cCeyC{C
zZJlqdH4+mheYCjoCBx?1*<VU)vuCSTC|zbfUiDUuXX>_t)yn*Z?{wPVMl5o^yEl!+
zTu5hPz1Ic#Gm3Su-M?EIW=XAj`&Mjv;{EsKtG2)B(cO0ZoI}oRG25Pbh1(Y-7<4Ng
zWPh;a@vXT3&&xl&5B&6e_Q^axdDbgReXVjoW=y~SOU6(%NGLeriKtP}d2jbBHMOp3
zQ*~G0Xg~E#zWm8Yp{g?tbxcA_j)Z)b$W>%c;9U^$<&4ihgPDdaW_|SXTbI2t@pk&M
zq}yWoxtS6+l@>OO%&ymduk&-|d0h8LF~yB3KF!%7;uvebLE83i$BWtr?|j~&yz6dQ
zpG@&Qxk!omdJ0*4Yqv~ylbLHMryR4a#bB9han{?8nJ(9ttz}Dla`nZ5=)LDcv#0y-
z-<zT^<1?G%(!?ixf5L=&kMnh2dhhnyImnRDKGg6|4#&rLo>hO<J!h!)Z;50&<NmTs
z^^)xLmW3=C3pX4;dHt|xWZdD0U&{EbBIOPgRUKQsO`7#2Ysb3T^IV?1UGSW>VyB4p
zl!t*ct7daat#Fwc{m(w(Raro(obiUT$qLVQSS;)>-dDSGIp>{y#{^rJA9a+kHL?sg
z&zhe1@$%Qc)<1HK(`KwwT;6+__p`p-xg&}9-9A2ueUmL4cjoa)26rLW(#_ALUo80A
z%g%a9dBF^qUiK~jPMFG9efwCjwc^BWWe@9vlJ{koCEHdgJpH7++Cgc}#zwws_5FLk
zo$HxB>q6p0fqS!KGCj_HxRiO|R#2$%&8LP2J3nmBogQhrEq%jjVMYF`t0yn>cZMo-
zYQ25=%SY<?EJq%%AjwY*H}|zA9GtP2x2b=7s^gIr2PJCQ7GJ!aJ+DciO3dllDHCtc
zS4(uFrY>}rZ#&2AR>yLp%=S!Se8GL)g=t4u9ZQ@qr*z5mmnYjUqm&8xFI{X6Zr-}X
ze*J%$;m+5*YfmM8FnHekOMC4xfsc#_3|G#))$nls;cFjMFKse1kVsP~kP1vWV(~QI
zM}Ot{i?QXN5<3l98GE;xWi+q2^k_@}f)mo2X8p4dJ$zCf6=AkzPt8(^o3lH<NiStT
zxAn%{nf>)1^Bymbd1Dx&u-<%D`}Y1swlg7D*SeI)eweb8afQ6<+K2MB@f~p~-tNYB
z&-3#IYbz{%a=d@lr2nbwZzT7^_@y5-FG<bh_kZNL?zD7u>=eIi+lp!<JN>eB-Irc;
zRq066Svj{NbnafW2T~cjCYM?S&I&TlZE57MpEZ+tu^5Mo>+|gBdD;T+d)G<IF0@l*
z>pgs#MR*~LB#%PPt<(HH_Y+OxORugsWf8x#`NikM&!aMS*axmGT_YB$ws$F)b!=#h
zkx0NHo+HQAIhD&o&QD)-vtfVotl#gAo8#JJURN6Gh<I!eei*c|ORgzmMTgePC#iv#
znKp_xDLM8ee|Te_XxMbkZf8NqJn6vDq?wZMIZwL#D>yu6@7c}EoF)EVUd3B!yXAA+
z<!>}je|#T%AUXJHNR(vEH3R4OOS7iA1>8$K8Dbst&}P<x>JtnB$0pz1ag%4WVx`BF
z>t0qm_fO7Gt}Wf8!Q-;WP)N{V{f@ioo7P-!y0|Ce-1OwMocrPvZnGV(XE9&pkh;Rs
z)k>uE9c$6e2#=l(r%wxiNxPZnaoOzMzRsnq*qNBLR0A^~OE&y`|Ln#m_Xo~z_jN~n
zet2;4g&$GV@(mZAiDk=LvAMNkj>p9tGC?yJN|-A3+H9M4_}Tia^JJB-<?Lg>aKt9-
z@uaui&n!fi2Tsk_>$X_OahzMH{8GWn{F0w%Uw&_9(_<9*)i~=+zTWptjlfB6PBQCH
z%($(bap&cR&4Hr(Di$~%{TOhuX<6Bioj<g`J$udT6s@|0Dfx9s&w?dA5@)aM({XsT
z#bD02^Hz=9<EqxKl-<1f^NswTcSY=G3$nX6iEm!HyHZnq4c|4*eST)DQkRWY6Be~Z
z^$BHE^VUe}{<kZcW~$C{KW4*X-md4f=9QoL7x(3Xm1T_Q)s)rAJxPXz?JCbXJQ-F?
z86Vu(v*K2BqyGA`U<Dl|bsrCvv%6k~te3s^?S`bpB$xINg>OVwMDJMmbgNH*%Qogu
zzs#9ued5kFn?CK3^F-<N&fZVwmzWpobZ<JC$RaZ}g`HPNuzC5rm1o-h&z?9DDW%mN
zQnJK^qwWsJL*aRGM#_%Y9w$pX7f(4++-Kg{Sev!N>-d%Qts51t@fJrrNwyg9%hzZ<
zsxdxXx2pE}H+K2P<!j$gNX(8o_48`V`Kn3Ju19V(R6E(XH}GR@@0%XutLIi&?Up*>
z%r)<?q1xYz6CQTR?@?rKNba4-81-}JCsWf2adtvwi<91H3FUm-GxLhM!R3@LcbgoQ
zv*(hn{_xE<)?Op|ylu(!_!(B;v*St@O&6D0^CG&Jt3}|>v#ks^Z-bxIn)Xi#XRBSo
zbke#}VdL$OcLhIMb=-g4kQ`(t>wnaCx7$9~^HmPa=94O-Jti9OfAj5J-RaZ)&J$nC
zTFg^_oo{KmdEMfvdkml5Pw_ihb5v|qR&G#ZTX>&YP4_heMVVz2)}EK|JR^0|XTv15
zZ5<2wUR2juUYR!g*A&ArtwrDWON!aa_t|;fx-iK$I)6iNV8gVFeuV<%yRMh^ZQY>s
z`G!iaU4Qe=#6{;;F`9g6FStJ2c*0r*bKQ;YSC}`le3~-t!O0t~yi6-yof;WM-gOiy
zi|VR`OgX1;$<=y?<JBFlPALamc7|t978ZJTb8T+l#nVQcJUi}M=Wb0sdoDn=e{1ro
zZL6;3Cb~;ZOj3VY%i{2D&(#R&q6-HkEiZaYXDsqNy=3+?osADytIbR}8ujw@yR4pb
zJMOXd?<#+H>|fNf^R3_CJPw$l_xMM|5w*s9RU4Hj@66S)>+jI9%bQ$terj^gw587!
zr>Ny_@7rK&bECvjK~Y#m$!g8Xk`{S+#xP!2k8TB_b4wK18B?UiW+ZLO<~-f~#buSc
z?#<IrtLs0#-9K6G)n|3NSw%0`UwtLGf8DOT)3@#QN;BNo74rJ!?Ru-9vvYjjTxY42
zpFHhmL^AWF14~w)<=gA4v{7DM>*?dF%cZw=PCRKPm1G@r%s;L^;C$ruo!i&F%{`LF
zX1=;Kbo!xLZ40#}eHpKaUcKST+0v5la%bYZeaoGzGW%A~FErWZ*%j><yy{`lnev+1
zKTfb#SRHR;;tqUXDZh7H-4j1g<x8%f2SnJ?%)U+Xn15jTlpkjz4jXnqUaDBds%&Je
zJ0p2%&4JUYw<_K)cbTjw_U4xq7khQUr&b;QIS(4|7+p1<?<OzX^Jn6U<g3!l%A86c
z$SFw0+%&tk*ZJkY8S`e|6bsp=&!n}av~gS6_g|-OHy`(UdQCm?bI<+VmsbexeEVE_
zpIv*R;5{CWgTZ%nzCPdb+D*Jq@u2N-X@yJ0VQ>EZyOI9UI5t$`lt7@gr+~ntj1y}o
zEDx+|bU0xx`Ly8mGv4l5>du>vB%5Eb__*63fm`T?tErgYJ0)?=YpF)-{%o_?&`_wH
zXc-{hciP8%Z@QVpZ1G<*z7sFpEiQRJ>ty6>H%YDCUutV2W~*KPuDfxWsh``;Ef1f5
zJQzI1@Ijlf_lN20Sol(GyO^9fI~w;NX3mJIeJNW#tzV(VJz;Z1ePGiy_dFi?)VlHs
z0_$dZ3u*T2oRj3*JmddT&O>T8f3y3{p7B*IZ2Rf_eB#3|E6S(8zhHde@=^B`PnECF
z);Qbhd}tAJNwsuWvpsqDaX@l}$d&3Jw`|?j<@&wX^vp|mvv#}7w>6v`%u$afJBiMW
zsWZId*LiT#^z-3*LMweAxE5=KpL}txRVUiMZdvW^M&^V590etRA79qFXR1=EQ^w$N
zuJXR|{R`_h8I@^Fy03QXeAa>Myh=6q-76;FD4x9cT%_-WJI@xak?eN0dfxJQ=JD9u
zJAR~pPrT^#%k78VIf3SF4o$xPM{51~v!BJczQ6zUihbSEZH_KG%e>cpzLb07{^#rd
z{flZU+BX@!@bp_~mws%{FOK(;5>`uO5AS3-#@6d$ela?+xI@;-^WtVdKkoR`r-awX
zn9dZx^LVAPdV4|n>qpWv7IZT&ofY{gLsmxSQf=F5Ypdhup5D*gcfqXeM#b7?{=U9n
z?#)jSjNZP>;Z|bh{JE35q8_PBPYZf@jPdoUpXV<N?q6s1eno)tf!%-3J4Ui@xn%U*
zxY_RY_pkkNMs=dr4tgd=9LIc2bH!{}D<{0W=(}*+67BX|#mvWIG(JvjkZG8{vU1Pw
zge<oS#mD)LCSOagaLVR1JmYS3R;Yk&Luliz>rx9JYU>+cEfH7PANB0$#hBcqHuAHy
ztk?{i{C2HN^f{NM@~wI88b{?l*AE#yK7QRUT6tp4#D%-ocH3&|YdTIj@o(~Sn|nuU
zn{M4N-)}TQQf9a13%8C3azcB<Hk(A=K7Drjo!X~Izpdqby(i2+Lf-UCEkkQ;+^&_U
zSR%Hk$4-9J&VII2N<_Tk&aGSAfA;g(bMHD-5O8p&^O+*6(yBKL8t-5C&UqW#*SfB{
zWa2!hcV;#g<syb@iZU|2kJ%g><+{rHIdm3Fx0EH<@O4Q&OFFpi!HhmP)d<fV+3&M+
zwixyCZs*|gW740@A*C>}O@i&3-*x}#zh2zF*|^_#PQ@oCox8CP&P$qSm(P0l(u~`Y
zSI>FEdHuk-=39>P%uS#0H{s&^=;OR$;SST+i{|dxd&YI)yo+K^kqNnr&CbW2`4*n%
zGud!+((PQct1~7pHWgZ2B;hD<-}`<cbH~c=(2s|%@Eu#Gpq}?%?%$ixHNWq7AK%Kn
z`*GN1-+QVDj<)F<N!)Kc^QLs=n-x>eNQ=vAdA^q5muM3BIrqxX*SV##|5D73xi%%P
zeWYL?@Zj|H%?j;1ZAG$edhDyua`?{EeO_DTF5|yCLaL$Wmb4HLyTh$st)knf@2<I>
zxw7I$di=so4-Xg2;|YIZc;%*BkK;q*MU4GEyOLy<r^ZUm6g`=&(`1v8;IYGax=7`$
z1p&V<I?UO1qWy@i*!Mm@WzpBCOO^N+%{`aXbVK)!Ps@YNO6Q^!=DbmQe$Q$9qxk#!
zN%OKV-~T#$-hTPJIab{jmDg`P^ka1v7qiSx58b1BD4@hp(u|4UeOfvDV&AllVQq^Q
zK409uHIA=h<`Q4F$=*#HH$FS7RKOe;b&|C^;h5jKsb^LlySQQRqcwh87cN~h;ra>b
zm=(X4OplnbmMMhi%JD1n8a}uON69@XTs+D0p{d$ZZ|C-78&}n7{GGQ+`*mjTyX3VG
z9zF20vuMuIJ8QK)AzI{Ngsx=2vhi-F8|NqatStEQ%kXB6bQqUK+=g(wnQPtaHuCbH
zJumTo=^h^EUAG^uxp!!O%Hym#UuSeDbn`BJ*vxla!7bILByMwm&$?@CikCO>aqn|k
z_3YjW!KTl$$x04U-@a8_GhULPsJ*S`s-EW0odV_Ms?S>3Su_lV74JSv@Gsu8%7*pw
zVf$&St7`9lKa=}u?U`w>H~z9qlz6YTGV(yV(vIn`-{0+#V_KW!s%kI#!y(F3?cwI?
z!(2M=*U1;^?tLT?QTT9so#D4+e)$Q!CZ6k_?rb`(x6@p=tU_+fhqRw@LM1nry0fcC
z%1T{5!^T_Pp3W{U`^7E);_9~-<Gjt5EO^4D$KRN6eU<Rq+sTSgUccBqiEo=<-;cHh
zq07EJXGks=pIrNNTb;~=^?b$}x!my;1wJNX?&(c3&zx@@Tj4RIyr}e=ZCh$Gf8*`i
zTOU%C?md3K<gcCCJ)OV*w?1zS{ZqSp$<rX~b$hEG=HCcuIJkFx6axoK-Tc%;VY~1C
zlV7;cKlmNrM5!P0*H=^=-aUbF*CwTuxN~j3Db26Aa#CY7O2hRhJWQML<XX1sxqIoN
zlU-ljo4V(F&YD}MJx6}z?QHDbS@XwycZuDagJyxUPbL@z^-s69u&8}3Gtownd1be1
zhtxwQX2zG{O4>W$-73-Eu#lOpMzibGCq=uL9Q$`&-EegMIWa!NE$(YdKj%wV^t|tR
zUmt#I@f0(UhZ8>LPx^X)*QfmoJ^6X6*^DP|sl5n1b3SUi@ng9FjyLALx6U_azct?D
zU)dznRG}yktJHV&;M6^Zdw;Rz&dERh#&Gws$xZ5s)-ICmJ!iy}IJo-$Z~4qGq`Z5Z
znZUN-x%m(C%$1kUP>eab$|~WcP;tPDsrv5ULz`t{HXF5ZhqUNR^Gfzj>s+oeLFiQV
zfgdT={%_cA%f6QU{4Y^;X^+R$Eyrd%IJ5D6IJj!>Q;9_iS-&IJD4gAT$I`Ud%Qfb*
z>3U(F7{${GE3TOf>-F8fZdv;NP6T^W<l{P@V1pY?Ui_Z3IL<9jdRiRCmg2V4$+Gfe
zp3b8KpRXNDdfmhI_VSy5CSO#xM7>h5vtGWr@<n`1h@wPeW4q{n&Ycq##XtOLKlG(T
zQX%)aq|8hmHyewWb81X4-}GKvc1d>)&%MV_lK0)(Tab9?i*ZH(pX)A@n1g(wYbM-K
zZ1>{uWY%u{7JHyqaPs=aSC78F8DMlI<*NUl#U+zt)*QR9cgJt`{(PBZRSR3p-mUnS
zynOq$j9oVuW*259UHJTH0V7AhR8T^T-^#=HnKRjC_POX?ia2*!-`3qIc$?YX8&-4l
zicdfHD1Bz6vdoC9oqviaOOm3`kvdaHrX9iQd{@52?Gj<j=KFqi{(F-x701E_7gZgZ
zeLV2ZasIl^(*)M`?Tv6goL4vZv5NB2%O0-{v>GlX**Ge^?JmxUtj$pG@KNY$)ZqB2
z&y;$o;loq&O#xq+?pWP>!?-+He`fFGlaCI6NP3qS>}BfbJcHqx<k2mgXL590VSFz*
zBPec4j*9an1(A0T7Kt$ZjGi%BQTBU*QaM}OGU4_+?YGTc<ax`pcWyG^lg<sCyR_)`
z*B9G1PS2Tq>fP)8yq)&Cdfk(^t6wnMq_?5KWzIb7l|21>OFK^6SnZj(KXb>viA@sE
zW>)QN>|EX&m-|Qd_u{<;ac}NCc%7K9*uZBI`t05F8upTnPtVIl+!oZl=wc^!+$dkP
zIJ^D3J@Ye<neXm5cqrTGE(qs8y|424!)J~Bd>cROe*5|T?oo^S@XDEY`i?0oCnP*(
z6=|65WN5^;bA4>r(xem3^Osexyp*!^T1fBZi7ziFM*KT@vhUFA83zi=Hu*_xG-A5C
z`aqp%sJ!{C1+$lOE!GQq)F4*yeNRSjZePRgt_|hNQ+M(mRJk~lZH@n#ySgRJkNB;{
z6#w1+dH8BgcA>EL(~swm@LFfz-YEC!*@gDg_soCF3$T|8&Dx;Fe%;Gu;`*7_VjQC$
zop5||F~K`ftvoX1zQRWi52cbaDXqjtmtCuR$~Y$N`n7)h4)q<)vp4N3Xzt6js~28V
zUBJ%5m2tX{xBAqN#F;Z^SY2x=%9dzs+;21AL+~m0a_8b489t$>oLkwBExyi_%J?&N
z`om*}^YbrnasJvf@o387<6D03o&2<2$hyExiNCitP1n$zFQ&3+f4FSywiz4#-D{tb
z<GMducwh0C=f>8$KJ)H5SAX-ozc|a{*{v13<u#i)gx{_`d7SN+#Rj*7lQKhJUAby?
z&Y*XFJTsf!4hO!?5*jz>v|e5-bHd^nQ+m?xIV-a6#b5t6cXep<<yULDKVIQJ|Ky(k
zz7>8){C#s-euaJs;IO_^dY1V~qTk*7swr{>Pw(B^QX1HI^v|&yw^;&MFEl$>{xwTn
zX<)s2)^67|dw66!8{TnqYUC()%)NAO{hr$!=bD6X-JE*z^zp7;&u(}`Tn}aY$krlM
zCVOt-u^8uv%tA?r?q8GZpHSv}(&GGv&pe8ilMfxLnc(g6aW409xw9_kcDF8&@%)zF
z?&9?Nilw#Olz5fT?T;hAe*f7~u}gpL;_?pXR|>nn?V9<NIlwvN#G(yBTMn(LHai^k
zYWD`aV^8*^J7>F`yn1TYs@2-JX0EF`ai?nIw8aunrteYxxN_O^c)_((mZmIv!4tG|
z`ojmu9;;vN6xk@XIk6zMt6A!?;MA^@dk<V+y_Rh|>lryWo>qUh8Hc}L=5RaQR1v*p
z?>*no4VGrXhCYwJrCpHW=DjlOv9xBi)ZNuu*>U<+L8iuxQKxmC@?PgftWEqp<F`;o
z=$r7kKrgW)?@N8PY~LQ*d5S5th2acSjK@os?uoOvu4A&ZijJ2Tet!PL*PCoj98F92
zHgss5J6pC@UyYepjxTPT#5w(_g|l`(J+kA9wqT<2l<3UfBPkM&=Ulp0x*YuR@tsHN
zC&lN_V=lUv#m@OU?~=f5<5LTh*WD6+C%gXgeEVbEN$0w&tRm*zcq#btd)Y)DEny~i
zTc;xSx!K)wJBsgAFvrvxtm%5;aOe1eCC@8sez33@vh3|Ub5A`+e}!GH*wZz}F~4(t
zH#a^~3~V`b*JtIshNB$jXS*hRd(7OTxp<}Ao?ly;*eZDrb{{JBC`i8Y$9KDKe&deK
z(v{&C=l;BY)pL!<gbF^P>%wvqH!bG1-EXk}+J$)wo<F^=f9Ji;LO;D@9g?ke4*j!}
zJaujzO!=Yz?pulN;-@cGKjqfFm+=00oR01Bh8H*1Em^es%GK%YJNIPT3imut>fxKE
zS$IiF>W$WUHOF%?1&eY^-d;QK-M7L>#qiY(OO_^%EekJOK3VH>Jl9hAQoXlT3%mA>
z0F`?(>_HE>eqNg=6R}BOW$VLL%@#(kC#t*t{QbSOq~%%?PsE-xMOUUs<d%8xm0jQd
zwDHE<w-39SZ+kTt%DBAK2z26@F(-XN^Oe@g;)Q4LJk^?Mp`_~BbaR8D_73J#mxI#;
zHcr2D=vd0V?=K#HVm@K1yZP_uZO2aO2ynzU?i4GTpy<7`Tl{L(YKtF2`zBAQ)_hh{
zI@6`pfM3Pq)$}zs`?l`MJ(j;VdiRoS=0o=lytnf2ahUz(_B+k9pH0^8@bPC|+U?{x
z_gf1;2iqbsrCq_Ejh!WL8-BZQjqdKd*zZ@dn%yJE>Cu{8mQK5qwYu_hX^(pL@W%8$
zHDarnzQgf^NLeFWPu`~3?y7Iquj(|v`h1fRGfAsduh@JlY&zTNrspaty*tF7bd`MR
zQ2O+hU2yqi7P<ay1vg*KoXwJL8#^Om^8`x;UI}FvM!p8-ZLc2P&r4rulViDO$)mYK
z2F2$N3z*gCzKM)pe&_AE<xVYck9$1IFG>3Byd=A>Gq0>sJL<zi#e+RI5*o2Z&lvA-
zsJ?h@!>`9XUkAx<T-Wp4e$m|@ch?2PNA7-?eBk4@&x@;G2A;9#@Zqa_wV>={oO*<A
z>ohw>_j2#IC)RDO3O<tg>+RO}+u96g2j<VwdTDMx_wMEvP3i7~ca9YY6d$X&@qDY#
zHyL;DH;<M{+bR@ZxVT9<&!ME@e3VPidy7})+D_lC+k+myn^nB;#;b=sp)M(Je%n6I
z4dpDi&X#7;{BW=#cyFkwwg4{=OFVn-eWhNTAGV+UkNe&a^O22Cs$hL|$nk#R+D#W!
z^u&tyl^&URNpxGCsidfNcH@S%PfE9SKF;oWaxXLI+)vhfcW<7|Nf({hc<u76+r^hV
z_C8UsGp}4D%h<#q?RPnmXO6-~ee-o2HPcsIu;LG{oHV^kBx?HU4YPJWPh7WFF7MB_
zBhR<XZV%o(tMlRElet{`6n{h%@k>OivCX@A@V)akBet6#Ci2g7n{<DV?sCE9)zP=k
zh|b&0JXhT+KHk9G*k<9z<8!{8?L72&>fvRtBG`_WoKbd5pDga&+iMabzx3E<zWK6C
zcqHb8_Ds0V5Fx;AY@pB@mo4`C^fKiHcg@vRl^rV&Yzh=)=-x1GRpN_MfyXK$($+r$
zFCSkc<GAZxVc(*iUsg)me7QL}ZO(bAA2pxu-n~^*e8a}_#t-HFJB?2)h+yzGVC1x0
zo3_R(`NNWustGlG_j<f}dju{y9A1*C_F3RsbkdovGZN>^l*b+Yeo(?&==g{KEH1x)
zgm`%;iO>BuW3KRHu5;;yT`uO%m#pv0d;FTOc<OO0vvzsJzQ68`R~NWhe*es`zV)0H
z)6N4&j$6wpo4$N%{?hWQ>%`>-caOz>`0e)N=_6N<NaqDUzqShrJWZLY?kLZ-W9{R<
zN{*~<#|@LV@Y<Rb=R3&ub<Q$N?|XPpRp_>y$L%25z0(UcL=63EB6A*^s+ymw-9105
z=UT?Z8)fewEnj9_sO}Q5-}n5L$I{Q{ay4I4UnMf_$Cs~ijrmqzbEhBL@P5ATi+I^p
zQEUNA41U{}UJVoyULv2}ozOeeH#7SFY^jfHK1CJIzW82i<8(1qdGD*d_xG0F$vb<g
zk(nX4?%KAM5~qYKwPtzDJDxqW?K^jH*CUgA3r(kfvAHj2eqN&QX6kdcU2m@k`77K0
zF1@vD9>*-l^|qC}LqE>jbz(+8zu7tKZ3*wgTdZ62nr>(B)ye2(zQr1r`{2u>^4+p_
zk-Ja#T!{;~C->!y%mhY;il*4)K2w>W?^L{I9GQ^v)OCv5hOm%($M@tGv_!Hg3*1t$
zst^d|k>AvLUA$`M+#d79PY1IM6K|is|H1WGt;!D{?zplVj__&zQ)XvasOe6c{OV)&
zo9vQ%{ld(GSGG1(pAUGPXnBV3>C@Jb{flNYeD0jEETTb8K%}}=_?f=y1$X7QzhvAz
z?_Io7?YjHb96mlh#&xPYEL3)PO=*<y_m14Wd2#KAr(6A^?nkyJYi6{lD_y&*$Y*x;
z`|ZlD24Wsd`eteF*M7F!LqlNWw!L<XcRM_hy;hX6COpS}f2VcNSxc2oR{dw*+;3Hk
z6tn2QA7}e)-P)4mqtolI=zG8Co%V_^BY#u+1rL?7P61PWxr<_7?+W(q%vhJESUAJf
zPyEWM$1OJ7oK&x!5?UGA;vzLeE?VvGvz6~SeqWOMeJ~)}CG)X**{d6O{#=fAvyjf=
zUp3{az5eCNTl;ob>iv-Uy+@XJi4H@@r285jiv3lMH&u__+jCN-L_Kl+><cNv%4@lI
zi1Tm1ayle)dzXMmx1Swr(6>+8*L#0NzE01&@@tQJPN|K-y|6!(*$mf<3YnH#+!d5Q
zbTjwJk;19do?qU=U$^p0MBZYfNY6;N%y{X;4|6hYkIwtun!P<(=g@tYdkVE{`4=~x
z?2f+aW_9P}rwRY{XRVJs+PaOOd)co|O#RV^=Xo4VV-pqIbfV#rXTqg!Z}aU(51z`6
zo3DA7MJv&ofkpVPynm+1M(ab3p=oK+g7xA4Yu^j<nG{4fN41x%VR~-uV6<oVn_MBD
zDNjrVBa@3BOnBYz_36>0xkAQl%4Vz@9R~UH*7$FE-J=}ttSzaXyWn~0m5--iX3uYy
zQ2M9!y7Q~VeHs2sZjZa`qMIiRzP{elBh&RiDoUxXDD`_wmF}17zcW?@@!4{IfA4(p
zfs;(^yd1-<XqArD?QzUeyB_XYaie<<>+{OF4F(r(HJ+ZE!1Jkex5_@Zqi#0m4DMMy
zOMLlAZQ0HvAx73ytY<x~c-%IlM_^LN%>#erH_qX3d9d@3p8C1|t-34se|=iz;ljys
z&Z3Z|aZ8P?`Znto3ObKwXgEyb=BTyKo;`hK(!CwWE*+`Ke;@a{P_X3R!7jen*2*)_
zEvl$9xN;=<z{W3gwZ7;wv{ac*Vtp&WENL2J_`SCOGdYj8T4<%RYiL&dvXEg3y8QU~
zgQu}yxcY-{24+lR{BwEp`wTOe_tpQVPJZ(xNbXL;PFL9tzccS2`mo2g<Ze?O!~N%%
zp37T*$<TfG_x{s;yKhv#3)}bILsBX?YfJ6sztvh_i>{we$lPF?Ewn}Vq9(&y7A-sD
zUg!4OwXR|J3sw~GyM8<Uin0330G&>i@XDf{2Q|#5dnxYTy>$J0pI?(#Y|Gns>eAMp
z`z0kYn&$$SZDBc4QJ-A<W#3JevK(vYi(95J-pEQfnPZ>S=lS`>_GgJd7k33NJK}Qk
zz7|tm`K}`yJkF=T_&n)s>yC{goWX(BoXb8utFK$~B(`_uzdN1n@44c_=6|`oIa@t;
z+4;Pn?~DER9+7rnP}w16dhglsusz!>)^cw=eBZN((Iimmb*|=Pt2Nu7?z`3!xwG%B
z%`}d+9cN0myCf@oPE075NV^;Dxo&xik9vM?TZ`GrC4mkO4)F}RZ%-^<t0rN0i90!Z
z3iCqd-l{4d`?&|Jwp;zaaz*5MX2$iOGm_Gu1m}n>s=k{SwtYdR<L@c{kA8=*Fe~9-
zaO_pK?wa@Fy4#KIoGS|C=LEIR+i>7}az&5K)U!`47}xr^yxse|;YNC}>(8(c8ynkI
z+Sl_W@t>MfziXfRryBjx0><OdgTkE}|L%~V$oh}(wsh62#UE?M{m%E#sQ#sARof)F
z$gtO{mPOCu@G^z`eQp_z?O(t2f6MvrK5J8pnYHnLDZ#Lfm(KUU{HE(!AoazE@BAI7
z6Nhgb{BD~#@zJY)CGAfQ<(CTFYuwWC=S2NH_6r|Y@YK6CYH7`Rzx}n&+<*1Arm*hU
zzj}&Os%?t=<wtKm*rk@)^EW@P+J9#Ag#T}uOynln3OGm{GcYOKsddPpHu+}huU?le
z6Ay}2&pGx<`;CKb@_hTFVuhakak)PNsv~A)O_OMojBP%~-TG_mmsP7$5*0qBdHWr9
zx^?$9f1K5EkuA612K(+>GKpJ1FKu1DMnXqJk0e8yL4lR{@ozaZ89NUComt#C)h*;-
zUN=iW_tyRW=~rzg|1f=G#UFC`Zm?&Q)Ukyg^AhWSrrL-mzOi^zF#pA}{cMNVntN1s
zZ1UVBCF6DYhvxd-4nOtpShm{9Kl$JKTmQy<OaGHB3vRE!P+xoKo$v{VQ;fflZ!^C-
z@!!V6Uj;{cCh`ARlI$M)&$x8v^EG?tKYqFL&;HX=Z%+IwU+y{CPegdqiRjC_z6I(<
z*F5<CJ9FVjot0nq#?JM*@?dM1BAZXFU4qlnis<*L4wiLo8-K-L`g_dyrNxyy?f(MO
zf7@?bU}RSkq{KX3xYe&DP~pXf|M$+%{>OV!d@Ex(S8GCqyxR`P7QqCUHv9ivHM?ap
zemKn0f1p3*Dd&=^v-dx(ows8}LjC9C-y*};HRieGy!?8#?A^LK=Z=<K>}5Tt=I35;
z!q57bsKdFQC9-Z8J~DpZdB^EBhpYI(WjmVNYrOZRdVNkSf86)-TIsUwUq9}>zLov*
zt&Hc<Jht<XG8P?tDU<r*i}UAw?EmkJzkGh<<1w=z53VInICj};;iHo`%dO^Hd!PF;
z-+SYasvpy|pQ-;!e*0H{{YLfU3Lzh#`2AD$vHrh0<&f%oclS>jhcy3MUSj-GF@f=Y
zWODq{UmI8b&)%hT?Q*HR)6ZvJJvl}O+^dxuDg=Iq3A`!$vHh<Zo1uUG^G}C==G{z?
zzCX+TXx-FDsgERT^Zj=!9XiuvbVg#{<~^D0H|j(f4BHA;NGGwncR#zdN3iOByq74$
z*PR!#`YbO$NelGPX1K~Q@q?vF>&7L83PwKZ3l0k$vAP*BW7_4l?Q_oC&NyJ^aN%Hm
zdq~q`cYfPWt_MpVEV_NU`PP>3Ji+sE!SSx4rmpOqTjp+9$dWzNzyEXm<nQ;suX$Tn
zR&(yRM}wSnR=wsg1A&7lIy#=S?{;wFj8E^qy<(wOk-`7@-{#*x{b9@89y6(vzs-AE
zIg*wvXQ|O_*{)c<{PxW#xo2Cy6jVR|D)sSwgQCc@uP02bn%GnNI1ax4e9!e?ecV+4
zd%@jv{)tWgX3EvT{#&2D{Q0@GB>7jb-2PwiE#G?g-MQsQ`>W-r=ROx$8v8hXU8_i!
zy8ex*e5?4>ZRc~3Ii|?2<9peZ**4+dc6QfXtuSfd7VU|JA+fD1S1fS1j&PoJ|G9UL
z*B7=A?#~t;nDDYA_j<;^?Nym?{qF5vZ*{1^G3txZzW45Ouk@Vt6Oy<e@-EQH?S1K^
zb*9Yf?ItCz&4)8Ij%i5d#MgL~oiPsT&dmF%TrB*_(?&RA*4D}%jk&!plRd2RJsCPq
z1U!&gWKt*O(f-Q)?b7FKZ0u&nNAGyHIC_cwrnc<W+v*ob?&`muT*mh>qO{7dd&7pg
zFVc7G)!Liw;Z$5QC-V%$0o(U7iG7;2>)SQ<wi{na{B4`UX1H$>mr2ECkr@Vt%D*#r
z&pZEh-@jS6%QPgDZ%D}b$z1Afv3%Q8RrUUE&MN=h^JnJWTqmBn`Sr#pzhduiy}wCN
z<vBy6L?bK5`-8jNE}6WGRP#-(cbG8O+gJVFhg;vfL{(RRJ#nE(D3Evgwns_aTgq<B
z-hI05O`Om7AANQ_S2tZ}&Yi#Y^x@E!lmljcRkza{&L!(6Ms1rjXI9XZZE8ug9zC++
z-;sJs>`hea_KQMKpBD?gfAmS?f6~36Y5hw+*%(YJ-t)5Z^2bkKzE+={`smV@TLs>^
zn{L|iCQoZp3%h-3^Zl>V=e2S^aemuhRowG;-+r^V$$vz5sxFHx(2-32FolOF*frvu
zt{XesyuB@x&zV=<To@2?+_BNif~)c8<pW(mf7X<i9s8bsxbo=r)WzQwcbhu=o3X>y
z?C<t{6LRxrgszTzKffR>!8)%_Ogl;P!`?GY8doC{UjE*{?#~?Sh_Zdhf7h-(>?PiH
zdFR#DI$h$Cj9p7-ce@nsw==PyDIjaR$xm#{t?yPb^-q7t8^_H&sBJCIxTNip@4`8%
zt@7)>zyE3a=JVb^;y-)rv%lLPesJ0Uf34d+8T%R+13$sedmDR~evwRFbohvyPr|<S
z$9~N44`o{H`_5#6#Ogn>{LZ$4<$+n@2F?*bVotU#Z0V7<lChf<v^XrS`S1AynMHDK
z(?7`@@i(TF=3n@@^N`OYws{wSP22EFcqg+Em-G8r_4_raFC2a)RC&#R$Bj1|qTg2i
z-mtZ^EwM9&XMeRuGpoAy-pl`61sDF{6-_*;_c-g4RJ9??Wcl5j!ma+>*Wa)8|NPJY
z(!b(s#fw{x%ACunsuz03rjwpi|L{lU^9L#EJP$bxT5OkFK2Wm0&(}MlcFhF4?SC|U
z7R$Rc_<3@^TeU!uDb(rr_u`EYJ6M1IpR6&lCsE<io4;|r%rgI_IX66<`E{w2j%|`)
zt4;TGi67+)&0+-H%ye9Kutf`gC<}aPAMpO;&*)ucmU}L~G5;?Ac0cPUi*IKWCuOAG
z2vD13?D)Jr@@zLpaq-?F9y^PlSH6gyywJJ2x5C0;#q&iMSX3qy$80J8b?<cHk2KL<
zm1&=O;v2hf@Ax`H{l1LRI@kNpTHTKEnjKBuFa18}{GxMidHkiv(zh*{SG{VZ=dnwZ
zCF`_zT6J|_4|9rVUm4ikXLVCy;Wpii-I7l7XSY~&PIOamyjo`)?)1jmgM&$8u4TyG
z>a05#kEa&a`gHZxHfm@ZaxHy!ka1E#ztHhHU(NPE-?7<UdhgF)@8V`}{2ysG;fM31
zP{saJQzs>QI$6fuJ{fXMERUsr(x164d@9TwENnUNgpL@QS@#Rwe(QDN!;P9q{&|i~
zUc&4Tt~Hh_Z7J~b$zXdnNh);Fgs%Ha|JPeysD59){Knrt|JTWfKX3Z??mqXjzZWiU
zyi^_@eeQ39p>6QD;FYr~f9$E9UOTN_?8_99)~PHhyw~5pl3%q@+}YQD{r|Gn1xME0
z3X{AXXnLYar;&ZC;r^6|?KhLyxI>KOpM5sFR50_7wnEIySDA<He^>LhF+SO_ns24i
zvx!S5n0YpT)U(^a`B2l=CJE+UHV?biiyzm&KYW>SquKQLH9IF(-G9>k(e?R>h)1GT
z?^cFvoEG6|Aa=!`P4|1P>Z%BHhh2i4rmw8@ZIbU#y}DhrD0K7ML|)$2k$cl_b5`s-
zK6~<!yHA2U_iCKp(@=i&vhrCW_cqQ|dck()*H{0X7I4(ZU42iB3fF>EOCu*HrncaS
z6FE^Cg<PK(Ebyo|lxCd#HoNxrxAm#NCpQTsezkk;<$G%J_ozd&LL3*a;FrE}x%=JD
z%O5(L|Lo=cpJgBY^Y{IwW;a}`6OJjW>L^!juJb>#=#|Bb4~M!;Zr$Ubclk=~`+YxD
z6qo3Ic&Ete+%I6a=%Lt)s_@|NR@SesdE8Fgm0vyk=;jBHoANUbg*)Z^Rd@DYEnsiO
zy{25<`tZNo^}8=V%eP-YJwEhm{APz%hvkOT*7&~;)(IAVAtu<&vUq;`x{gha3XeS3
zO%h|(+0=D=ry|d#wcmS0c9vaom&i(bba&&-)FQ#^h=t7YGyh8bvwwLl!|saRC$(Ru
zWovxHgC{)>+xqKE@pfae1!o$zSFYXk<@+=_nfUV4t*a)!cg??gbh7a0JD*n1JpCy6
z)VYJRxxbscuANl1H!9w<NMM0h<BJfvze{aB!j>^QoYgt?YWJ(1C0o>X8*}_Q#kD<D
zTwQ5vl#itTzq^XFG8io5w=ERg@XBSk?n~i{>*oIqs{X&|`Ip~lR%m%D`#0}Tz2$$r
z|6W{N+wI?*t+(*^y9c}Ko3~sl{<(b1>j&=XEXvV=zExF|uWe*HX1ng@&)6ApOiGHo
zxl~xWn<h8j?Z5t;{l$CsH(%RVF3t`-UwZp>hCo2~d69=!sTH^P>MwsbZDaI#?@P(6
zcO1A;9{h36@A>*&|8IS<)ctRL?Qe(N*2FWHSEYvM_Wzx}<K>_D^#|_VyR=AZga4)C
zjGJ#`=O;?d(*Njmzixfoyt_Jc<$ALZEY#=!v7$=j`MOz$*LFR7xi9}BW7H$R?ccBN
zDfpTfST0r@+P}CUmsh=b!h}4_bni)V+tXi6_+qtAuwn)0BCZvl=69UtY^h3FRFj*d
zEw6cU@uz2zAAjtM`l|I^Al~I{bym8UjPP^i756Xv{(tmA@C2pw%TKLp{CMvF-KyHb
zti<;8mZ*bM!{jVCPnVCk<DEIryKP(iJg(%KihFa<pVvF~@2J!|+&BIFq9dGJA3nXm
zZpIo3hk5;ZKfn4a7Yjf8XdY+x_jR3i@auDzRH|O+{&?cp_~y5t{Djm4iu>DMHvh0v
ztKM5+|0U+#{&)+99RXhwI_K#{-1mF)x1T4>coS!G?7g?__n7}kyV;sMR+T;IdcQt;
zdE@0%mTZw+vibM)+_ipMS6}+E;ph$Ps`D>4bEa`Nn9mAUmSQ+|bso!~Urh!!ZO69y
z%ngnadUR|Gufa7Ref5={3A~SWiY5Bko+P9`J7H1US5Pasy{>%6Z7Y_teaHCOy5|Td
zWz9?Fn|JW*hwZ)v3+(S+KW_ha=gl0ukL$ZmZSnSgSbT5M-2Q!=zWx!s|ETZV#-22G
zorrt-_gfFtYk#czDR^m1)RCAAw=R5*;*ANI9(AB~`thk3cHc7EvdVPvi%0XFx3BbK
z*IgYKCzGmUAs3jdC?lL><2ha9?z&6AU%k=L*(v>2bBgJ<@Y`Cix4!=E+?~R$c(XTZ
z!PSiC|7VH6s(SzJ=8M&<uJbNtkL5al?mxGtoAmo#`$DB28mtIot3KuI+{60g<yWa?
zzk})v`Rlj;iRX{+YrP?9cvafzlDp5!o5im$#Ld%tw6;F}^M8krerM(-2j0ElvD`NB
zobgQ;mu1lxwR^Nx9Xu438~K!caz9Si)O3_rV4kvh4*RYfUuGO`sDAvcboczDiMlD5
zBRbO`-j1x4(f=ZB<PxoIG|N~t)7a=C&zU@lV^62u&e?XmjdNym^|^(MUY*I~-5U1b
znXYc=wmT}pMvbkf5~ZhX&E019uxQeqgJ+@}XHI4`)|_lmV3ZahwQ6U>&Y5j#iN!`b
z(~Y9H?&3Lfb$fuZSYw{+v>VrE#1wO~A4xy?@BR7z>o5Lezw*EP=RUpboi0D$nuioL
z9bxo8(J+a{#ly!$k<<N_NBjJVKa;Ds#Ab;bf4VRKZrN{9vloohjjdg>-o_@KOw2xT
z#jfSK$f?GO<$T@TrS7^N8{br~J2d6*TAiCKv^FnDG5Q&>bk!zVsUw<wccvOua;)Ks
zm@V;k)y!wjp3YOmUwXP%3dn{y%s#zd=<T(Ls(kkqUF^#&xtHHMayz4M;Stw}&3w$y
zOHbaIH|6%El_xCalSJ-V_^K(lCk3Z=*Pb%wP+#$7TUEIc2Rrk=i^>aaEZ)qyY1_ur
z)8YHz{<KN%5l7xDJW1F5ZJfC2<fF8`#WkNTC9SQ3j6Btarye-l-pauJzF~t}iplms
zW}n6h+a#l2Zq8~+Z;^T{|2m=Yc|TLkYNzQMx9(<C`kj8Al)87X#e^NN{%)Ue!}N&F
z-jeUxZ3*l)lRPplcHCz%JZH_!Gp~{HluC(-@i(3+=VaOgc|A>4AEZ6bEx+Elvb;*a
zQSjnst4nT1xfd@;C`R+uDg^K25ik;B@{q1#l2TI1Z>@S{B>wo$&-qoMQyUU1r+6(B
z+O5d3Yb6V7WXJu*hI6Oz>~ga;<2|Gx&Am%Eib<GliiK79J~zj0ZzhRfzWipT?Bpr0
zWv?rBF8Aj>sWDZKM_t=-na!E-iPGY&?93jHNfUdj9~8^<D%|(i|8)NT=O6#=`sZ%{
zdFr|EivGWQ)`@K`T=aQqOT|ey_D2>gj7z79X=JQUUUo!n)ehExf>5&;&x4oF?@rq-
za%NxR6$_UKK{tNdHCZovI^$*d<=Vt$`|JL^{a>VTT3(#%w$+~CkJY-SlNVfMS%371
z=c~Zv{^O+`ja=OE?mRyxJeOm%*%_w2dUx*{^H-PC5^|>BR1Vs8h5bp3r<`~7%G&3@
zX4`TuFc-Mq@uc%*UdFc>iA%&hOT>5ZKUu$g>-oozKbF?LEhvhbvi#V|e`)(pI-mJ#
zlWqNP$^vC=Q?tw6NnIaq8XR8Lw4$2J{AJ*t_cC_3dkX_z|LEH)&N6Sp!usM^`Mae*
z<1Rm_U2M%^BQC(LbH=f+YG#FU6aUVi{P$noK3&JR_28U5&#NDrKA)fQ@zbvBvZea_
zxnJBmIk_s<U|)I8$35RydtF{-?|6eHl)d7K@Wq3HOp-TMr@8lE`fdN|(dolaJ_SE|
zwkJ;X)AvGs<NxlzHl&NKjV#;#WlPqT2P;0`yleKs$T}dPH#phi?BceiGS+M7zqt0?
z;`;R?2lL+-t?-w2e6s3z?$eK-o(Il}cx5VSbN1bVOTReZtCi1Ob-rC|u}VRyrSkjO
zyaeCRmoxvY`qke!^NPf(#1p@6?0fKP)wU_K=FU`XdG`4ikA7N&kCoBe+qV`UcAoGe
zOgU=mE*|fXThfi~nWfCU7AK`HS3VlD=1UFh>&W8lH}5R2&w6*<@8UhTuhaK_TP(me
z-Oj#VaBF?`9GefXl<q$$`B43%|LB*1gKzr}UAMfyQTo(5-jL|)Z~P3B*`JnjHEQd7
zt&>X$3;j87W51Kc@n!j$65`K4ul-y3WBXYFgX2olTc2$!_}aMqe#E4(C;B(mnaa$o
zOFz5a>(VSm>1`YjwM+cIeLjD$<ITq(Zcjqy$P4cey!5@UETMkF_4J1YR$W=$o2@F^
zoIm@?_$L)>J>&h`UU2bN$@H^5`&z>^UNlTF>R9KzSo+qb&7mbpR$O~GYOJ*4zh<cV
z{?k$0=0Em5!QSCXWoDw2^wxGsZT-vM`1o+d(zK=hZ#PsJ@vh7BeY5uCwYRfZXP<PJ
zZYzqH{U&~4((^Er6=9eD6<Y|^DlfcwxBKj#g>7>G^36?5MXcOaf9!g<X~~yavB~O-
zk8FsNxcc_yy|yPFo97BVFi2Q4<GrG=^K#4Lg3tx|E6ZOWElvGaIc>|AFI(2R73-{h
zbUw{oMbB>)huiAa`Faz37nvpP+#WXdklrHUqQg7d*fpfyG4!&W>M1{Pr^@wD#4!my
z8><C7_ncHYa>mb0fAQwo>nA2>Hg9`VJ?AQi`|IM_E19Q#FLYYC_4|!ud5yp9ZM52c
z#MSksw*Sj`c;oWQW361FZ})%mGJW<=r<p5J==<OEwg3CHp3T3z?2g9yteTzqTdKck
zIp}f33piFT$<o_x(I)gkX+>-5${5jaJ_?~K516#=-6sCJ_9BDp=w~~wDxn=t;^*&Q
z&XSIAyOL=U6=_vze(P#p>TJnBe?MN8^t%$D@-6WgPsSa-zm-R)e0iQy;&_QYEqCrB
zi|qB*$xmdG&vBnHKX|9TYqxW0(j4hBZQnLyrv>*dcPB2E+8Ab(c8=%4`R;`Wn632N
z-o!CZH=pC))6bZ{e`7_hwA1|!j75j_&M3F8z4$KwS#V;<$Bm`^+wUHlzT)WP4Tm!4
zT-KFJn3WoN;5i@TnO9%W%+ap&)LZd$TDx~d&DVR?i=M09oA>DM3a_0?k6jd&Nm=zw
z4|2a&zG0)@l+vAxK3Uj)xW04|^O9+A4Ebg*Yh$*ZvN-VY;zOsJne+H9m=Zd-r7#z5
z-*ZuEmP=v>Uua5j#?g0g4>SGl+|G5Ri_cx@O4m0l*%>u|4*X`R<zoEBV7MXH@c5(U
z6VGOHi0;0;K>prW^Mk%(&u!0sQQJOIa#>t*xu)*tc?(&!njYW16!6#LjM>KhH%;QQ
zmv=w^+!JT~w6=EZvhUXqzP|5XU9qHn*N^`^rGKX_T#(k``cgz>Zn{HT_o;iH=|4T~
zU;Ns8zB_F3jaOTPm)A+WmstAexuEKeFDo~x&$;pKW%K<{FZTc1#~qn3cj}-?@S<zB
z!S<m}m+vp%8@H<C`D{61MU@>PwVoEjO7o6%$nv-a%T?<}+T>q}zLh(_Vf|Gn)|H$r
zPaUuL+qA}3v|cU0p6PreF7kwgmT5uQmJjnR*-w?~%zOR%RajW@>5QC}|Ng0Lmr{Ad
z@+Gz<Y+XouOEtgIqNA^`cJlmm6sc3?7GJM@ZP7WWHDPn7?@EhZ%FWHbpJS`@gsDv1
zB(DXpaY)lR)-LPlr}-$%ZuP+^cHe7ZTZEp+ZSqhms5#rz7{oQHq34Oq?;ZPF3v#}?
zmz;REN%`CQEsk2xx{vL!C|dHt{dAzIMM&YwFY!vDE&ES2Y*+Y_pMCFAjQWlLm-n1~
zr4!vHm#{c^#zlh(-<ID#zx#hi$lbL}b8kxO*fX=6hBq$Wd~D^}L&5&l+MkcKSN*>@
zJ2<i4mQ`5pZppH=Z3n0QvprU55NA4f+SQW2FRLEC^wV8G*<*5~i=EiA=+5Ko*(Kft
zcj=_cub7jy%v9Rb$LOkc`g)OX#!EJ;i}qS&EWNDR>T34-?#9$fLYbeMwrYgibfhL`
z-Zd60H2RUYW^TPO>oXgxAHVuPiGTle@d3+CpEX`NOAm|7v3`Gg`fOU#mm+?)HP3cW
zep`3`?AE!PDun`)np9FJ&yIFm+x`7@_~GjTYmdd~Z&>8;FJ!u&WP5>eu~^tQx9Egt
zt6FOM_D+1F^Gzx|jD1F@7Oy<J@QVe@H5$af-ArhkD$dn1_gx^zihaxc)-8A=xZb1f
z$&muX{C<OJNnxj&-PeY3PG8x3(dxJC)wa_rCRa9owupWg_5YE?(Y*(k{5tm8|4h`s
zvd{;XdljD~^TfW*{wd(6WmL&_)gWAI&QX<(vzm<0hgVEstgU7hGz@m#QdcoceTwR4
z6P?T>S8|QMZ<JcYYSyJ<IGa2C*6*xK!czjI_q5O7c=dUC&#@M{2|WRCxAHx>@YpU{
z&gW<mn^tv$?e|lTa$*zRGPTP)+p~X^&8c-xUYukux^|nw6zOX5+hQxa7(*|w5@h;#
zS7@4f9{U+V!<bE49WJM2D+1R%wLPqxVXYo`LhfA4eA81`?giQHHg}HVzOw3ebaqp=
z(lJSeC;4`nH#XOGI9Hr}sGHrhNzLR`_(st}-3KQlZ_Oy5dTn!-+*aAYYjZbVS=_a!
zrz&luNy)2C22<VAsy0rmHFN5TP|@4Er}Bn+LJ!CK1T(d_hkt1-KNXcdJzv|LlQT3-
z{zle<Ng5g<PZ{4AJnoRb`+ip5>qqz8dT*{@FzbH*t;%)j=J`$cr>pMBUYxo=)Uf(k
z8MppA|LJQU=kK#ie_Hrdee0w8it~HjYDDf8S(J)wiLLW`ePMb3<>%bjwKi$+U6}mw
z<BJ8$*cV#VrB?1Qc|R}g&sE<&TU(=j_t&Sh3f#M=J9*di?BqzRqbv5jFZ#U5C8M<9
z$>Brm=9Y`yThuBxclYZkzil?#PrGf}@KM$NW@1G7`*nH3dPaBV<)8Mr`nzAH&bL&r
zXmafa+t;GSdAafN@%9Hd%w3eUGV_y0#EmEW@{jujzX-Ozky&=~OuB_ljBLDc^TIQZ
zudLK6-}c?Eo!0ibv3K3gC)<CUUOiV>vHR}ZO{e9&cgw!2xKUwt_1n%}yLrXR-6!wb
zQ_uPFVfc$Tf$Ut5Jy$lLo%F8j>-A-|=k8y*w5)DDH=A4a_rI^abn}d#KXKhYTbzmW
z2y4Qm$6U2Z69uNM*vy$5BCNGh)j~HXrqy11<&woUALsmAxI@du^4fjZ>Y3kGZ}Z-h
z^f)^C&86rt`{v{gt1lgSzI?yb<ZbtOx7OyI5`F(o+BHk1H<~X~Pgnj@x`l+l(wEC-
zCB9i-jW-48s9k&WG3Tr3j?FV}AK0_v?4=VkmHFO(O3Y21a(GY7qo>l{HGAFet@S?j
zPx*GavDxyvpQT@_t^P6ne0we}-+ouP`nCh}f=om<FU&EXap!Z%_VOKK4a-vtR~6~;
zhc^38+2NMA)h%bkn-4lg>MOo{D9?Roq`Pr?zP-nph#$94TIu}B)oYX4nzcN4qruuw
zcM|6qt}Wa=M>0EKbK~7b`t#dQJvwsgw%yyJ8?$uWJ(sUP;eGmwLf{lH-7K98l}C7I
zDoY%83QsNjr(4$bb7TM9+T5VKnYK$d9z3?<-1!(&o@b()iVENC6nc91>H2GHuE%&i
z|FH4ul8MU98CyeR;vF_t&HDKv?)k)qeYu}sUBCHN*LTqi^XW6+I4xWjKY!J2R)Y;C
zUkkVXIvulmHkVlG)iajSGxjZ6+vqv>!i)DS*H`R}3uB4N`R8i(#c@N7)0xYe9>>h~
z^ypPZZ`EJ%azp-?n-$SgHK)Gc*zkFZLHO|npRIRZNX+|s?ADdwx7&8xOc!t1E*g4U
zJVv@k<@)=k_2M_0I8^Uezgs$YTDoN6kt6wY&m1YeUTmc3S<@;b@WndA(fxgA+0VD1
z@5%7KdLMW`*7f-cyV#Sz!cTawobcK4%q7!3$v#)k%I6AoW(4oNtFAdU(WaSw?y^eO
zisES{??axLZT4*DIz9hMsnypl=QAGO)Xv&GG2ChEHkm1>UtBA)s5*3Y!|FNVc`MFu
znKq*}#!s*O^|?zWlWxR*&H8qA!%C)Wwv0E|iGSa=`OYri!yB*gD;<}rF4c&*Zq0D!
zm_>xmD?v`v?N_IE-`%l?;n&%v?@rxYy3nd*=LSAUuWW(4$-lm)*{-iYGPATiQtFlU
z?Nb?oNoi-yBv-W6th{so+VQl`Q_As`Qx<RivD@P3^~S}w>vZ;n@0M5Bl;x@3o4c$%
z-el+P``q&%7C%i`U7GVkd7p;UwU?^PCkOdwf2h1?`Bc2*!J0K2{bW6MOxVrU>EF+k
zBNaAfKF^oj&6)N7L8_+$r|1f<ywSd5&ke=fUw&-5`F7_Qn|q%7JE#A+bS-&Xkv{X?
z4d<3wKRENxT~_PmTC2aly;Hk?EP8r(@trvf8<~ZkB{W9zJSv)65bSHcBCJ1D_lsx2
z(I!RnlE2l)ZPM14@9m75Tl`Yu?XD>4Mc48Ucqca7XC=ISYW*<#s`TX<^FRHa!TKg+
z-<Hh`I=`-MTXab1{i5xzY;9bp^b3o6lQ%6obn8INn^%6dUeTEWVnxSZK5H!1exs?c
zepzkTtwZY#FKWyXRawXK%CAi>U{|HUYtLi4AEsVTx%%ivgjZVOXLI+%>k5;vCY4P1
zb}2D%Eu+v!{ql|JE^#$+MbAVQO^Q687Zv!oMRmdM?5LWhCC9c*pYr9$YunYUu6u~{
zX&nvX<4>OAadeWzrpiq9!pU>9voDyuHU4)0(bvxj2SQqAzTB#QdG6w_Bhq5eBG<jj
zEo-k_cE((|yEV%qs`tvag`vl<6mQvbB_QM3<&R$tH&v-W->VsNm*?eNS(67{Z}~#a
ztMo+EnqJM;)><@4Oy?9=du8R@HI`Lc>+HI!o2@OM<$JqproZCO&Rj2h)`90#aNJpg
zWU*wQb9)YXUwoZWQu@mIM4Rr0kJkckpIwr&iA!et%~jhz76&EWwAXO9UHU9_PT<?w
zu0mGw3w`ay4(YaAA8Oj~a@uO&%ww%>UM$^erRV#jQ}ZtD+O_X#nc2G{`P*TZrWd6S
zTX*-*Uwh|z{L6gpAErgmBxi2ja&k%FpThgW!SDMM3y%GgF5P+a&#t|DmEE(YH7^th
zUkaG?`npojWl^oy*0<W#we-_1HJ-0|rnPJ1eBE|d=`U-}MW+AxcQ=jQ;jj4ZQn?PR
zn(NN9u0CHk`-Sc~3q##ozIJ+#wf^L{emR@EsL53BXJFEVuvI%F=e~IT`0|c@PnYZT
zZ(SO7rubHsf_bdjzIp2|<_0cySX|N=FLz6*QjBBY&VyIer8o5C>4r?zm(TFj-diQN
z(8c7xal+PFw`3-r;3{dAl|K7yHgBZw!dI_6o29Mu<CS9$hejTst>a!WH}POq#W7hP
znT(jPZ^C!Su(Ul)JoETk&}yl7v;3m#?%GXrohQb#`Fw2YdH1N>OKullyBzV*+TYdh
z;)mo_w)x7puAJDS_%Agp*E`hu*{QTQYi(}GM6S6c6QXKz=l=c`N8f#S`>DNOIG$nt
z<+9_?y(TkvC;q5iu~GThlLZIWW?yo1Fh~!z>f>lz`}2f);0Y1-9rg3qHLX~n7h{(=
z{Y^!fH1F1q`cog)O1M4Q_t^cz!$ln}+a#^6KCu^^|6wpWTTQp4iCHY7=y4Lq&4RPj
zMZ>iHS}*(Umnt|TQFzv(ezt$OZ)NSYdCVm$s}3AZ+^l7I;QbZds5iM;X4iVOxchh8
zFaD8P`{v!OxtAk<om+Iu`}*<yy$2txJp5__v#5f>u8*E72Wr;m|Crku^#0wKO}%EB
zCKC7cS2s%abd{XBxFThu!~%ise?FJg92IGok2!y6O_S**KRNLvhx+yE7axaww+-ov
zkZMcpP@2+wJ9AcFfaLeM;>B;xzdrdKZd)lMeDM5B@s-V&{J4Ad%RlXXuT%2H_r=^B
z4VF9tOo=A#$D@Q=nxjNa4y~T}rn>srGn?~M3MFRvvgw-`^6yL5$>g^=y}<6e+d(_e
zWAdykN?#of{#w6f`7`xz^XDA6-?i_p`b8_}y;}`Ze}<G9L~*J$3BO*xAdvZO&HLZ)
z)I#Hb-oIZn|HhqoMvik+6W>QFyT*xiCgr?{zkL4mtj$L<1!U}UTBB3r;w>NKhi(7;
zb9YLgRKe$2tnWYX(iIB}R*X@f=I{9Cpkxp~6XTPz2|T<DetWsS`QsOKSNZ1Z9$UE;
z556%o|M!0$q`&T(<R%V5+dV&&EG$G4e+e)u^es~TXR6BDp8u(^@Xb~muUD~4ogdq<
z{CW1A<?udchhjd5S#@G_6`ytejj8y#wd=*-?)KN&QTHxSRPeBT@OApGxd$1lS9`_x
z>aeOS_f4)b)DV$we9{%jW}ELi$!ej$-TLY<gDnmZq?OivpY!Qa>Gjn&CY)komkE9{
z?R3dc)lY33XEJ7su8KBh3tJc8KILzB?Z1z`{^jahKibx>4t!M`qdtH0O*V#O2C}Sb
zL1A*oz5TeKpGs{lzt}K+b0%X?a%yR1%GFlhuI&NeXRfm<n11MLN_0x{?iPQi2kZQK
z9;@9vxAL9nk(gt>i}^oBK218jSa3tRVkf8eq<OFHip9DQi<cVR+@0<4oGa{bCAUM@
zPSI<smR1sTc9vXEzxhge(#GS`=21sB_qa;(9Qv|;rEb*i6WO&o7k>-xzH&c*`)vvR
z)vxEx%DJF#)%R?7`VzZNmcR`krb^acY?yia{{j!ypOP1B7$qbgU5d>LF1pQMy*zT+
zi&M9KZPsb;s^9y?(tPp5Z}SU3*gd}WC+W({T%B&c{vZ1%+%*5NyY2nkY8~Ybs#|aT
zJhu6plFds+uK%ws?@W|`lse(Z>)<-$6$(}>9cu0{ao>B{+vgK5lXUBpoV>4R;o4U$
zo<31;CT`Oe7k`)iTkq)6naP%aZEODL-~RhrXPz3H-)m-Z)-Tlu8DwfsczAL2Bzah{
zYVLmMtAFOp-s#U|QZ+qQ9=!h5+}yEe{`x~J?<U4?-@;R~=KTHF$FJ0_J-<@W-=y=D
z-;!5_5q>Sl9tFPrpS9=x<I6qfdv1Q#$rJo`pQ%}6lhoN`a}@hl$t`3!ruIZ_u6$6;
z$BmD#zO^tp!zJ<8Z!Y`08kslAmiKob{&y?%ms`|o2Hn2N%jPa_Fv*NQy0l;e*A^MK
z$mhx*_CI7lTB|0v`A@(9Y7ULkn%`GWZ1xoQe7WnY*yisMi(g+$+vc(|A#h5;DWhKY
zzEdBR7Hj<s{iSiFs+d`&Ct0Satp51vuXX<?hySy9oLPM;_L9nv+M^ez)wkAGcXrlx
z3O06zxEZeBZQLl?*e3URKL4sWYIEvS+_(ad|J{H4`#*o<=h54WJ~1A!l)w6zQ{RKL
z;lN^sxX<YaZ=_DRP`rIsiWL95-%qX`zL|BQY;NTd$p%3|_B?eZ3-{WOSFYRc?_7Jz
z=Fm#{``f;55v_gl?(?g2FEY19^UimD=6J2x=KtL-{VOj2*U{8pmFbyfmt?%mZcntj
zNb04n_uO3FTzmgH_spm?f6g9rOiuTJ)wbvH>+`l28XXfkCN;StRM6_o2WhD@KA~%B
zuh*R|`&gTMaqVQY+}>IdquANDOlQ|Jy_xx!S4rxtui1v%D<x*Ulw8(uI5fgTI3VGG
zq3=P*uYa~$HOcLoEGV$W*VT8+!_A97X}#OBSoi7I&GycX-+K?S-!Jc4W6%A5chWA&
z?rE3pqYLyz68FA$oA-Zr*pYepX1jjOTkpGPb>2haeM;Z&SLvruf2&y_J84Sw#Tw&3
z>lO9H9l6={M1q&sM}2+kwAM%OpTIZ4$PfFEZho_MliC&QyXH|EleRP|eLw$W`=oiR
z<qtZG?pV6G{P8C17n?T4pZTwEU%dS4*C*%BMJqlHHvTl<d?#aiC416r*Obx)|IC*2
zH+R^6itTzmTi5MpXd=U}$bVkJKd;?uY1R8@x>a=I2D!gHHVS*cZhG}R{9g3eEw_GE
zRLfdd`1jmm_cdKtHKi`c<npzAd!7FWJ@)4vf3s)L%1y0%ua>ztG47U1;Fq__Wj{Ij
z_?aCCr#Gtp^9nlkboy?EuTOU^k;=LHqj8DW&IG|<pSN!PwEkk3V{7DU<HZxdO?$R~
zlX%aD^^e{6G~8W$;==ary(x~>tZj_~6}9{Pt$$oun)_R$YOzYZYTV-YEAQPgIcg$R
zGv}DD_WdU+8n+X-sA$iTn#pzLaJ2xZ<G*d4@A@A8oL{$Y{ffdI*J+BUwP$dKoKxgp
zJ-IoYH#X_Y(Z#_VzHOP)8gnk{r(W#xJLlFs6_oS8v-qcuNN%3?&acMXHrctUPQI$s
z9X)gPuBr!Xg0<FtR$^{CbMV?M%dac~TuTHeZ)=~owVErWY^A{2UG-kytk<rKd+8ya
zW-M9!R#4{l^UZr_XrE9pj-DF1>6iAp75n(=0#3ev^-B9ZcVP3ZrpEXwy@rMpV_hya
zzkS+b-W2mzow2p#ysho(`}6)*`P=*qJb&5s)Ta-&D}MR<o|P$85fSfC3GPxWxsns8
zJ88!5gEqcCkKY<bhFUH^#3Ne}k`c4DK`wSx&C+?QQO(jX7FRv2^Ly0Cqnr5rrNNw*
z_v~I<?>Jwx&!2bAw{UCdx@%jO{F=40Z*Js?J$V5Sqqj_rt(nUfb(CK!G;4mA*95<5
zci!3CeeXSzJLm75o+Z|us~vT&RVzvqcF0{UIWg~-rhZ;uWtG(&5wV!rN9V5>zwk+;
zznpL4hqJ!zf`^`O^~|zeb#~I4^wnY~_pOdk-dVAfJ9#zd$rH;PkIb!|YxAt>Psg;M
zqP#COVi$h9yRw>_d&MfAr)I8Rm4D`PoQ&HntbX9`g$n`c8rOd9zvC7*Id4zwk&Bb|
zO7vb?pO_dP?&|i;r`+85&aP)$jf|G<zP+fcO>X|zuA_%f7A<{~!fA4D)5=X*U(U``
zGWoS-$(dpahu&SiaSAtdl5JLJZrEkEBRW^=`vvLe4N8&$i<k5@sJyIlyeb;-HU4t@
z#sx=T{jn7DQ)^{;nx`6?qbLzQvsF?!Anj3{!H!bKC!Abdt4^C#1^kg(^Xb`rp&2b_
z8a6N~FuTnX5TCsDj@kREGhY4qpKqV)cI>sY;nV0o4%W0{hJ?gf>Zg=m2K;<==Z*RP
z?)m?0!}|Yz7y5Ix=2d5p*WZA=4&}+uj^90W@z(nDtBuyV=2(Z8?APskx|_@RdErrO
z8(psb>kTXGcU2q}jo8q3<*e-|jqCB2JA;|T?DpnfE7mn${?0mgyI8+zOlnnDkWj~y
zjP{lt7Lz7ztm||-7C2Sa=giCqtp(e&C!TUWF4?pt>ejkBG1@^Zr<}>nEt-+4oxAMw
zt@AI^m~Fgf6<N<Tnc`Y`()I9`1)bGKvh&!lR;D+7_TVryYCaS@?PZLw$?46@qjQaN
zbB?{bva0ov!ofB#=L6re^$cep`z5(_k$u2tw$zXLA+r@$O%8h(e(CM%3m2lUxGB4R
zEdKJp_r*eQ>ttDhdyDr?IJ0%L@T4;bKC-&5_v%$;I_;j~aq`vlh1;k5Ez0?_ZQYIY
zbDGVW7;PgnFFkjuyU=y>yG?m{Nl~a~k5XQC^;&~>u0b3Tj8O%e9Zz^3K6p3Bs6F`j
zAGMv24;kC>+duooZ6y=^t)y*wrKZU3fUcy7m*?&#?D^goaL{$xMS+6<ll#}-xjj3!
z`+Q|^>$P>pnf`C;p8r<WIjj1Ao3r%xnOu>_tp2or`g_0o`v29x{`tqYTuri#KE9dx
z^!{2_UJ->?LM<6jY<BFeiuxGJ{MOj~w#T28oQat`r0yQi)eU%|TyuZAvU>C!5f2ts
z4*krai97XfmbdhHF1C{oO+4(t{a|i;`;}%<HdZ5}BLRL1Rv}KW_>wy39r7=|Z_GKB
zBVR~x@1?!&$(w8Ryz7mRG%!7$R<mqJPs;T8l@=?sQ~9;6m#?Z~mzt+_GN|%#Z{1A~
zrosbHL@qI3s;m06{mr(&=?uU3t#!N36MVp3qy6#guh(L%Lwy(S>gg6aRhZk8ymnt?
z!>+H(jf_70+uyF6@$^+>Ts~Wi790EO?io&^?WGs2rl%QAKBj-={uvAY_2(sfit4uC
zxqIA2=jGZBRqM~syH|eZWN|u2a>w8De#!qqZ#(_$Hkr)pO}h5Fa^1et)sb7*9yfS5
z@6_LX=f|O*#d~6fmfzUiTGMl<C!P0CiQQsvrByG(V<T9D9x^utYHkbkJ3Luyhg9+A
zm5!p49qpQ3|K5eyt^U(}hGU!Rj0H8GXE=nf)=R}~U0-#p@>)r5xZb7M^AGHnMBcLc
z%~kt5HoxQ7+#TyrKKXQg&WkA@!_>62>XdIUTCn+(nvLc}`8S$;Gs2_TZb_twoV{$^
z_DRuFXbS7ATMc<f-UzO8x^&UmQr|65wcOJB`S(c+IrwicubSkc`$l4=)~B4MPI-P=
z(u{R$zr~zi+Zh-1E%xSz&6A#dh!E@w>pt%AE^U7qGuOm`1>GE%ouBPu6S#Bu!=0&R
zr#7EIo_h6*PiV!I#|o2n>SwvC{IAnHc5yvtfU2!+d`(yfzo$oBygie?_m(w@9$i0}
zL{|z53bzy~g@(F@hK9y$4GjzhgYvDRwXvT~?bH6BUh8`{{r$YEOJCkSxoQ9XjbxKN
zhtQ^^zAurPwLRyrn}&7@IJB>OmpV&hlgoy?%3tp~xmgz)s0w+ihK7cQzdvtopStb!
zw%=N-R_)?{SC?XvwvX-CaougJR;^m~@Zq;t*<K(P0)G|Sf7WYm7RTjFU$%9B-6h2s
z)Z)TX7sPir%tf*Me=TRv=aj>e_PQ5m|9RSIzHYv&_Lh^6HG=;}-k$68M{UU}$&S@q
zZ)8SY%*nj6I$x%!e`D2?cQWVI_~QD_d*^;!#ir|@zGLZ%W7Tr(YyvZq?j_Ejp=i*|
zQ#z^VRG;iZhNk1M7q>6^lzTM0xaZ@c3g-`sY~BYhc<^h+exL5=uuSA!jq1<HXVq~|
zXHJ~DWXbR`#b#5A{Bgwxb#Zr@A1)|glK77!>Vn00uNggjQAhg}@9*kN&A;-vt6{3x
zQi~OyKPqd_I~Hu(zHjC+k>6|knpK7FGd6Bq@yg2j_uJzI?<}2jKBv8io-NIL#q8GI
zec5jfpU>y*zV&V6_A(#I_w#1ibIC|f*m>{k>GMw)?7sfzAGg%Iqzv2Kg64T&67D%H
zIK3&g>|Uyjnoa(kmcxp?x<Bo^KkxgOU}Y#T9Tbufmtxjqb?)z*87XtlX5C-;^7YYc
z)zbo=UfVY1c507#+~+G{y>nY$oic4dk-53-K(#=1?Fq5H%1u}7x5Wo(eKL4e!*8km
z`R9vQv*NxV?!NhR3GZU%VD94Uxo6{Be$86&np;TZY2rGI2Lj9PbeS;do@mTf58|2A
z`?q`6*P9k?j{cpGPej%zEngep?j0F9&u+e=^)uu3H}<3*{U&>7_f9F3?69dbo|H$f
z5xkLiak_}}$|teUHw7>x@Q2@cQ(;}eP@(pHhEx8bAFqwK3z-IgtO<F*b8hL(GV!_J
z^tW3(o#<*#iTSwylKKouXUQ)1{~P#({_a;b^ti;~c(U`1+Bx1RmQ#zHr&_9(F41qh
zc<ij~Z=M*5<A-Kv{MeAWb@d&G+|-7zmg;8r@=CalGA3qSOnl$Q(Kfk0Y`#}jO!}hk
z*o@TT{cluRpDM_4#4DS5wug1piTnGc-}t$sZ2$8E|9a9c9(`LieILK-tEZ)h?ToTN
z|KG_ZwZZ$;^z(mjzpH<+^=a+9#x?1_WgZVBDm5=n2>fC(Yv1DQ|L%)?WBa`^M^aPn
zkl7O+6V*$a$$S0nX9vnl9z5g1%J7%<J70~M=%3vln@fJV+xc$fU!JJ_VN!{jz3-!6
zcP{N;>wMkQ%va0RMQnkN_UF3OO!=XAB;E;3xZCZ1fBQ$h?VqNY3SV-lQ0;i@rFbOh
z2E#GGT>pt{4z9J@uQ#J7_KuWK)Rz8<0<34Hudx_R<2`KO+AX`G+^mYv?)RK67t7yN
z-r?Ie@n!DMt)|B1)q77`Pu|hIq|&DAk@baAmiHpArp{vdOoy**dz<>U@;Fah;XU?u
z`@?wqHwwI#JeKio*Ob^DMpx(G?>yrWKVi~gg?L@2&>!;)mM-1DRP$Po<h-_u3E50a
zYf755zJ?cxT~?Zydh?`fu9-r^dBx{nZtVA3zi`glC#njDpMp={?dpvRl0Wm$|D{pE
ztTk*LW(Tb&SR8OE?C+@lpLb68+_K+?oqtXJ>(*yqeY;(I<AG0i=O6SdH~RHW@BH~0
z7e7_6e>?X_sa3(g(3OF4ADAZxad^pHyI(myFwp4ipYEum@gker{VKdfq6()dyja-!
zdP9HZ96RMT>x+~0YUd?49o@C>dt7#t-nIUHd+%*ouq#B--sg~#k9B08-OB|cYqS<8
z$SzViaC(yR1S>a#`yM*Ce8lGcUwQXh+v>im$u?&u|B5@_RQNh{aofd<U!wNyYE0&9
zU6C$5m7Q;bbVcox%j&x)RmskCmk!#ix@XRmoAPliY{y*xOU*G;xhDIP{Xs`(@e8gE
z(a|N_*2g9%9W&&<+1~%OxL-<SRfpy4nkCv&t}nG`nr&#y{9|K%YH}D);)&UYi=7xc
zL@l4~%RDr16Vvg&O&?yGcfI~|*jV=qe`@AJ$FSvT&*Kji=tm#s4`?{%Xe)PDQpUsX
zed4s1w5gm*Nrnvp=NpV2<83w{VV!j|&h@EUyxMDV*GAr|(DX~SE1agfIUG{Zowdtp
z`jQGamI5BvAGYW0o!@9*7T$WiyGZEbUbPt!Do1bso|9kx{@j(f1<J*5UDf;cY^z!P
zsa{c6HS0r*)VDLQXB=o)S~2&U-SU^|%<cbdvpqy*UzB|K_2#+c^#j}22fR;s>-uWW
z&J`yL^^+|dF6@0HbAIFhndZ@Li@)`&DeZey>aANaV>Zw0v)Z0}4^1#wD5LY?S%uR_
zzYpPh0tVJn_3=N?3aM@o`>0waZ_E;zt}O0+H@rXDlf9?Aaf8R1o`XLu)|gMW-EX_^
z?}g7QQ`tSZ%bfm6?>R0z%cFG4`KeA$7vvP8KC&G;9m|*Wx~*8>M}3kbQ&nY&gTEF}
zptJqn%(Q6|T(>i7Zbj$cz8b#mK$E)6G5IrXxpKdzw}x9(d4FEQQB}9xBJP%x`m|?%
zD({E=U{^U&Tzh@d*-PK6W%{;9_nA#kUeI9pVJAzPX~vngufI&O_<ty^T`y3+!+0N;
zs{B9s>=UiY&C8eOz56%w!?IhC>?YdpY!y2CC0zdR%*geV6r1d%7shlZK9X4T^K?Yc
z|43^uy#`<1z=PrIEUFByf3A7jr+%-(IQ>HH+duC+Ulv-4DsfMfOBVZ9U3`*%O4$p?
zOJP4vpCwq7zOdYUXK!H6w$}!qKE~||{xi+-)vn(;xh46*%q){O9%YXgOZ~Ehnf+ts
zrA;c2#k-R%Ic`-y(vQ?SR57=h%im^c@sy`R+nhFq@Ov%X*UD_T$huXIFG0b&s%@iL
zR-@5zyOpah$?J&impZ(>XA1M}xk<_by(e595=?(+i*3&eeRP#SL8IB&_2?vp*81MI
z%;$2(b~1YmAM^O{2@iPN>+3DI^rpJMcW}*&U7}xSW}KAF-6_jG<5<wfYh5Q?byw}{
z5`NY1@$>$!U6mHw(l_ptKHq-H$m2&;;hY~6i$A*0zj(|_|HtZsQb#MQkF?JC+1!5n
z%HM=W#%9YmPaH2F-#PW`5^YJJrN!Htv!*jISa-|Xd-kSR>xv@nyXL<CS9c}X?$xv%
zMoUxF^%8?@J~2ISt3Q^Z+h(3F>zw{>QKWv3NQtb%OH(;ziO4zrTT^pAKAEL_Gpe6t
z=)slM=fv_!)-md4umneWzNmPXLC;3XAfwe21vb0;cW?MCI@Lfo%iWNDE+d0TQOHuC
zjgl&SNetaDl4pPWKlhnSMdY`*6LwClc7<m1I^XQQb~Hsg?)HO!&x_A&Ui@4<RdKcm
zQ}9b=^`Z))o%%cUr!4K3?qm7N+B4shAx+s<*R3S#5S!&I<xrz!Uc+-d425NzS27&i
z-?41_%<pgK#HP&`;#hb-H)qMb2JdAre(lY>tE7Fdc(TXOd)GwzMRxY|?c+IOb@oq*
z$<lw@R&lM#QeN+q_tPar$D!lN)3{r6eG(!Utp24iEhIZ^6VKtaYoT-QJme1IbvK-A
z!qUklG2zt8-8%Qo5<~X(Kdzf{IcL}FQ&ZU<-9CGJ&-Jp}<=)S>fAI~iyZS7v<?`3+
zuua~&DqmUGXenJ0JdwWnxrx)6yMI=^;`Li+<a~TujZF2KlvPXr&YdFcxM6y-`qsm@
z@BMH5_VCj5%e6lPcO)pzk~P}fHDk5z(Ez@dL!a-(KAK;eb$!(v|BI2bPq*|bCtGo_
z2+VbHn;-Q#sZ5@E-T!<07yo>G_w-?h65(0RQ<*}ncgpWBopj0b`&%XZ&_Aue51FgX
zzouvRKJ(JFTMO$v1@8TH;nWU!y`(fVV|US||0hb0nHVW)7x3lJWOMA`f4|ZG<~{#?
zyP5^w&Uz>6eBI3Wn_2mW{Oc)xI~9H<EVY!0@UC0hC}^j!VR0hkk_GZNL))gE*${vF
zj~ZM4)(i3;9UaR<WRnaldn;Qs<(ZZ-b+omu*E4v_v;7ad;O2kZ1)p#+d@YPR(o-GH
zpK|i?3Wuc4zU{j|@2P!vx9DD8#{sS~$E6$z8P9)yUY&S8@r8B9qhH47^8T}(i#-1O
zj?M1toSoS%?479#dIc9TooGATURGm~=fCO4JnwC4e#I-kukH3&;imHJ@6ms%=N<_^
zwBM|mSLGwbYiM$g?f$Y|hS$u_KKBy;yjS*m!inAd-!Ht2SG*iO;r``^Zu2HTIeIp;
z-T5qc+p*dj1E;%RR5*?wc$^fo<cD>@0f8AuZkX{eeDE!(a#y5Hergf#TfUUG1Gj#^
zwMwY_rMX7Q(XWHO<T#ITCbxi}`FoqGaX;oRI(2Hlv;Ia2iOv)M6CI9<7t}1jf9$J}
z#a8}<hd#%DzOv-q%Kq1`sz0<9GL4jdeS}^<{}|ut_-NCd%@^53UM$v5-8Xwf+Rfe+
z=hF?9OGUiT*?umb-tE?Ow<+CY#--{_!CK3Gz9t;H96d`;#arWy!MB=gVJ6O#4j;O%
zk*u?OL08@C2b&Mc@qS4?Ei7{D*{uBLnGVetj6X*8yWdIq`cu>(q{H6f;l<oZ-zIhT
zb|{9joziBK6@1#6CpO!-O#fjT*PB>_#?2Z_UiR>ncV$dy;@tLj^M?ejdo}-lN=_2F
zJ#VV{wD<85wG%!C%rV**{d-CIj{JMC7N_WDS?+oerR966OP1|w)Pd{ItL8;b{ITv}
z*EAQkk`sJ)-@geu`0C)9qg6AdUqu~scb&Lk(P`K0;^}>VHFWsdj3&f{g)G@$v)!<#
zbW4t7tlPZbyQWX{-ZJU8dHZ~YOI|-8b4UhFSa?L9rQ^@DRehIwtClX}@!liw{he?1
z{F>5;Hu;a~drDRoYacv#^hMZ|b$6QNvW&NG_E~Ut#&h8(K3lewG=-j>v9i`iZWdqP
zrRHs2$$~GVPh5~Y#MAxc^3{t09^KLQ8@DVze=w%|{?&73*H1P*)x5H%c1B}h-m5hm
zGme_+D*aN}VHYz^sbP;}z`{+5eQr0(B+pHD+VMqD)c=6TOaH(BOZC5g{rA|nyjONw
z-|40<PtS?woXS$Q9%pWDEjY~~5+LJH`E<>chY34Qbv-XCkMLO$Y1CDbG=FFIGq3mG
z+pF*0X*d30EOcSI=uu}?t&klrKZ{Cw@EWbVs5RYji`%Wwy%YOCzlyWV-_n<|{Jqx)
zp`w>B*bEYXO$e9d+7NP1Q)|D^(w=>Gnaia&Ry|*JJz!th)bxJ8+e?add9A+e*w?qR
zd1cD|G~d2Ar>bV>@^6~EPWoo2G<UCCSz6P-V_n9IJFc-$n8Rc=b-Dc&*<5Y6>)+Ha
zoKLHIbMnLaviZg5mv3pW^ReD)s=M`|VBN$0Rqq?KuXx|ETN`LwyFcXaZbSY1E91OO
zZPpac(yg)Dr>%V{?cvjH!RxDR4y}3p-f!E*>6%&3!l&GCJ1Kpaq49F6n%9=3ZQPII
zOWEyReNR2~4zv^gv%cfXs#$yHCfe(s;ry_o<=2&01{Yg*nSNwSPCUIe^=-wvn?l`(
z+A6BDTr~b=Y2BG~BI3e1QC^<KPyft0_FloZbi$@b(d|>&-hSNL!x}XAWZtGJ%vaaP
z9_>2lcJ9O%mAdw)uebG89=<C6KwxR^n=9vK>>XXxTjwX-UmCjE;84U-kBN^r98#ZS
zqw4uUXZEB^1{W%}ZTjk$5mi>kBf`@v<91lCMf}8*==D2iloro9S8nr(J?3l8_B-dN
zy}zBjvt!##{T(JR7J0ws(yew}6k1uDxo6qspf9(7^1dusEuF7A`_k*hzOS>UCz@_#
zE{(hq>9cUHshaKb!`{V3#~oX599+0iTh74x>Mdu<m`SYJ-HWY4RZP=UJkM%stj@mT
zAo4WtP`Rh~kx5J<y*s=uAIc;N34MH*xLD(BOy!F=L6TBa_pIl;^l)?a-fX2k7yB6x
zZ+IRZxB9p9kLXoug`G~khfcpg>2ym&>(pu?p0G_Je1a9<>o;X^FaL2~Z^8ER^h0y5
z#MrU0XTL5snrE!6zjnpKlFhrOA4-09+Qz_t?}d|-X1{XYqtw0j&m@x_x1vjTd{~fR
zr@q_TWfJof?$h5`lSOW2OZwKy99B(?UQ)e0DMBROE?VRRo37N%?eexZ8y_0Eu6T7k
zb^Uk#Pru*JUNvutocyumy%PEEkH4t$WL)1crI!C^(^ai0d{uhki7Qj98gA~F*IE_2
zJknJ^c<$w!`Nh-cERZ|axXWs)j@F9Pvy^ToX}7BCFI&ImolzL4*Y%^*_ieFW7r8Wb
zit8~s>2vu!hhq<?Ph*SeN#zmTZJ)97YI<)}D$Am9IaSg5+d`VX7sWOU?BDu$fpj#N
zPUN;`b`Cv_9=CJaQz{B3Te+!4Ij-}la<Sf9FW2UO`lXG%VtTFZv%kyVt9rzQPQLKd
zZk^ci%(%yg518I|-5YSO{iD5~*RIW<^K>WZ7aV-lU2gh*)BfQ73!56Z3#fj&`T3_n
z#O*SNOv7*%A!GR;4x82ApSagAy?t^R!;z4x``=e>`V_a1$DZBr7SH9>uRqttocSis
z?eQ$Ch4<9d(>IPs{bkQr%lE$GYGHeU>HY7xPeD%Vv*cKo^sEt_ZPp%b<+iYTE1Ttx
z%TL4RP7xLBlbG>G;sDQ9m4>&8-`77aJ^yyLMYWp9Chxx?52I_pE&3O?vZ}N%>}Fo=
zfAeXdkMJE5blM)};Qi*_gZQsAl;<DRQ7Bvf(Xs7^i2C(h54N^VA)4#It(-cK#dWTT
zQgHs-t1WV@+KN0i-W!59)XK$edh^rbAHVROio!`c+@Ylbd%V7ihRoV=+0pnBvr&kD
zQ65*P)tL)TTaMl0+-@x{ByaI*gXR6={M+xh&7QWa=*{$Jm#!SBFZ*WVxnWmDmG(UA
zrw4d1$xDYf&0w#${4dPExV*C6by{n0^zt(?T0J(?GNPU+wKZ#2R-MZ$&+NYUMR)(6
zSJ~S{%;L&eqrOkGIPkTm=6iRb*s)pjeI3s&i&#5H&vWV~lj+40p`SLaOGpj6;}nyy
zrS7EJn&ldf3VR>Vk?4GV%V<~C^r_31Ca-%b;U2hp?oyuAg7Df43tp_$l+$f0ezm$&
zkcY$Z&eTVBT<K96#-7(~a(^{eEqndBqp?wa(W%mi%9<>`ZU1gA6=C1L`E=xCeJw}U
zH#3D6E?FU0AAWDe%+0Tt#$MX7LAA}R?`-LmtQ@v{6~(R6{?paOv&;YVw{86%EV94e
z=*z$JN1rCxc3hrPbfl&xPqO6lrMRieb|wxVAJ_h0$n^0uzw1G3gX_0SKR$Tj{<&)9
z8eYy%7yZPG`)Ai(%XRWjoO4ty@o#!b-BfE{_54-mR+}zwUo55Rd0)t9$(l{3qMqm6
zg7z$byykIMG2i{7qYv#FZ`)YQ?>+Fm=ijxR#z)p#-MF*H;CEB0abfW-r!?7`DVsJ-
z__Wb>f1#O;@z%f#Jl~`jE&EdZ`oaC&`2Mi$mls;Uar^wa!nc{J>*`YR{jXlE{_}SG
zp+D?#X0I1M_shQg=B=a^<EejN6&X|-pC`S_s1eg!?xN@Yr>uYH?;GZ4c<MGk_k4B#
zX4-AW{Snu^4*ce9;@iL2RcDXp@@an!zn^HI_Os;djyu__XMZz4Q~Hkmt;cDWD-n~D
z_TImyaK%QehwZlQahpfwH_f*jJ509wDpN6CLm;N-??vm#O=6F_?k$^{7`yfD+U1&h
z45liH>3Kg2r$_X?n>EpRQ)u_X+2+e)(pr}$dm1ELA3FDUYS^FCwVn^kcYnSiA9*dl
zmSf`6eOEFAeG|7B?o%(m|7-oJ&GFaPNEn1}{Vc=#_glTI`pK32uMHX>cIRLG-zKA8
z_q(?ChcH{%wSP~NuV<PszO}Wsy47p#>J&chgby3aW~kRC>{I$yZeWnIe)WpNYav|r
zhpXNxMhYEGY&oa6?c(CRthx0}p)E5jGp}3g9_iTh;MVGyD}_Q|Dh0A%&3g8l-}1Rr
zVWd^t(f8c-n<74~-;^n*e0N#mvv5m2-UJh=po`m6UAJyJubi}t=Z&GX;rs6w_C0KT
zWxHMcT%pN_4;4;M`co$q+`BJ+EAMp>%YvpBXLeJ~*k#d~E^9(01+;b6|Cn0(DQu_j
z?jPqYJ^tO>waxYJrw{3QueW<$I~$vuoBgXd+|_?`que`ZemNewDldjl%M$nR*rga8
zQdA-Kapfkz_<1L*zJJb_FE14jy|B8%Y#Wcui(OK4Qci3ZI;GSfvL$ayz_Q+zYnB<`
zW<ESwYKCvzufMg<M^~L#S<LS6D11@QJ}IU<W%umu;&i1?XYJe?GEw%J>c<bOB&RI4
z>}7S9)%s8+*+2i9VW!coxYY{}E?(#>ws+O-wMo|&m2&L+cx(SHdCkOP!|<QgQ(qaL
zpS!*)yjWqqtgB(-MlNrrSF5}&D%C>UeHYjAE!!*2V->dIlkO9TwOoBJM?R^&f4lXp
z+B0?LRSPd@E!}-Y?7GM|k>%&t+m>wXTCkyA%WtK-O7s@-SNA<$D6cy-**Is#oWCzG
zP42R~66il&YSzL?kC{`hC_cHJE3%sBXh%etRoIMj-lwmnXRaxnwN%NwszKe(Qz30-
z=|$HKxz%#2{`QCeO(>C0v(lW{;bQVgtl&~Yk%6S;bFPVvElOOkY&>ts?%on+xHI!|
z?)e{yfsI~ri<P5;`vQt81Z%QvHl=y3IMsUW+IBX9eN6oVWgjf>_y<%b>z(_wDrJxE
zvfSSvjNk3Obbr1h&jB5|8I19VBqu9WT{@R|{!_U`a{qOi!|&etH8}h_+{c(zJNf12
zU!Gs5iI*5hXQjEyJeyE`=04l3l0x||SFXzob7VJ1OnY7*v8MLp%hI>ydZxeZr#qj#
zR(YDkcV5ruC;$HLFFjn%Kl4b(d6l>Kzg#y9HDmVptbQ~6?bluVCSL#d;cLsjMH4FL
zt4%J=_?&#G@^<jc?jLG~+qUhxbwuq+S9@LL@^bh0RsTNqs~)L6|Jl5=^quXp+V6%k
z4BiK0^M5CD1kZ~2=N|o?d5*MAvFx1X`X@a%=`_SyBy9R7Q~0i>wd=Y%e^B08FAbr}
z?5xOudz}lugdSNS>2@@1^S+8FucT9t9_rcl@xM~TG=@KRg;!a0w=_H}t_nEG_W5F6
z!_4JtrKPx7rGpM%{cdRYPQ83}^4dQF_3by``(I8ed%Ry%DlF!XcA}wev(vk~s`~G~
zo%^r1-~ZCzuQQC<b=PqI`G4ezm&MtLZxWfO>#baQH!PT=qGkH|L#xD+pPi3hZ4VGS
zE$SnkxzIXASw8t``nM?lZl}5jpPMhgSYLMkV)eSVb<3vN$DBUlB0TB(k=_Lw+^+U|
zV*3yLu<v}9_pfZ9`Rg<JHTpN4559=76rLm=H2rLrWDfV$<RpC+ud*B|vHfb5w@>bW
zdxl|~;#5NsiCQi8|5JoEim5E$`SjYmtFfQIhTPs@q#?t+|Kg*MJkMEtGu~PCcm5O(
zE{k5f(Kqba-Seu+Z~V7ydR&u#SkGPS@$s_tHR-AX1;=XKtlvd3?X|1+-1M%DdouUh
z-Hr__;x;CEq^4e5H2HbZ7Ly}d-S;&+`~=pmaMEcxKSjJ%`P7E@<$KH@G~WN4e#{~7
zs(%=p(aaCuXC_=>zuK+gmT<7dC-i6O(ck}~@_iLGPA6TwdfBqxa+=qEk0&Vy3s*do
zXkjVyc=1F=p@*C0fcj#~lML?{e!Y2mzD05J?`sDldb-8S!kDzUT-BoFyMOFUe>MN~
z_uB^^2zH9pJDI%Ne5lQ}`{T`jae)&9?E|K|$<EU`_jLtF`G&($OAod2E{I*}=Gx_^
zVG(d`VXcQ8lh)g;>k;qLtt3{Ml-cs#)B7BJ@$L8ajnBPpzE6JkabG!~`6d}ZKQCSN
zr7NCFy=gSLrJ>t$dZ$Zo#g=c}JPX;o@62Vcd~4M3H+lMND;|Au=Ze@gDVHAsGQFEx
zPpj)~(f#6Qw`slC->qx{Z<;4{2sS!4@f!3tw3mkM4St)VbYQ(j+~3Ks-c(!n?XJGI
zck;fXSw8bF2~5oAv3sz=c>3f!D^IyCu?_P1&vk3Xqrc5}WF7}jy7v0<Uz02IuWp+n
z60x+a$Az_{saNR45iM2u#V0%3Y8lf{Wt{)<YyXPG&TB7g-HRXpVtc;xe@CqA7E9w<
zrx>^VUG>Vuvzd{>E?%-gwIy|v!t<Ix=eD1GUZQ3uAL+S&N%HfEn-`qVe&4@j?{@wd
zT%BJ7d&S%j+!EF(4B*|j#B#02#fx%Fy_4P-9dEtoD&O?5d7G$>IL~YANUrDaHJkah
zE}!VIdMB;WH1DTbG?%>cb59S}B?^2FCs-1!&rW=2|99<f%MTNlgl!Se4i4a-z<VpI
z^w*lu%Kw%L_HoSKi66KBi!ID`c-AEt!uVXV-^FbGM=K2;vw#PtcWUInKI3<(;J@F<
zvODcZI?tu~wMzx8O>Vb6RA8@6JI~=+oZ6bovm!D=?p4W#@X2D{`_9xPw}k3GUe3gs
zUh)02NcI=I>s!Cp$8%0i=<VFH&f&=~=_!n-)EF6x_qpWF3;Et1Ex@cJm$A5ylaDj5
z>hGU<Ef#HhQ_jx*vgP8t8yigIyq`oKoPVoE>p*d7jGn%k$d;WK4<2v2my$2}`lCGi
z+Z|WkKRs(K*n4I2st;#$Wb5Spz8L>KTVL|2{^a=u0UV3&t$*_N#nU5RDuowK9&Ot`
zRZ}Q^Nz<*$|He;$MeA?-uQmPYwfkoUE-znQ@^9C*S0}D<Eb935RABD;$r_6<=evI{
zJM8^-zr%y7-@ykLZE*Q$v_$mv^3%?{&u-wodoiKNb7t0}<eN{Q-%iQ3?&ZGo)PG*a
zx9oQb7p^Y5?DR)%H~Z(hoSb6i<|9g%_gxA&Y#+(sIMc@Y{koVv&!)XtyL;BQHI?&S
z(_<fhvD)!?|J7ei=GR}$H+JV2dv?#WN@Ce!vqvFWJaQq@+<rQ(8NXJXKjZRKQ`Lbd
zVcw&;o>v(Ze!R5`_&oEl{j@3drurLh|L&Z2=|)}jr(f^p3vPaGQTF`$jk}RPjS1F@
z0<xU>$Nm*9x|w{!;H%@N#JJ=o87tzSUTIqW%j@AggKqYDnN=2bt9<utHx^ygX7=h_
z`s3rF=kuzqC#<sn<;MAHqp!)wr?YDH-b}1FzkYbD>-oB#z-@br&)ly{IquE9eOCzI
zyp5ZU9>2KOxbAB2?``cC&08W@J3DR*eY0RgpW~)kZcK&@`ubL9>egr6I#emSNr<D;
za~r#$qWGcaFALr~pFQm2zonmtZ^=3Se51B`%3?W3qhoRkSYMrZ9kGLN&2zgJncEBX
z&hv5aJ6gOuqO>4R_-fr$@t-FT<=Ia=Bfs9y=lzoZf$e|Ry}W#&hhJNt<w*ABo4%43
z$)2ksS?Y5Vw|q6dxx&nBhp(!xgswU(=Zl^4^SwVD-q4Z#$n?5lXq%o+@gEIu&yI)2
zfot@I+X^I>w#&1K|5+~;CjNR&!@u0s%X;-<jvuKsTP$pOUyivxMfv<~wy%qJTifbf
z&@$NBmi{WDE46#Igj`j8O+ZLW?5oO>gC6-mAOE@b-_-e7X>zjd+S%<N^A8t_-mj9p
zd3SPbS<bo>H8u-3D{i*^&2X*l-Syf1>aYIhul-xE7jpl1O<<R`$^Kt=s&5(E?yl`y
zV`M0?_$=4QQ->w$r1EBHCJD|}R?cYN_r-U{Dvy^lE1tH^RQh$BQ)ENIeEFPn6O(uG
zE>~hnWZ__(DR7ic@cZxRyp_A_CR@uK)bVE3+S&d<UZA6JZm5QB@w2U~%lOt!Ivf4W
zN3MKL%Ze8k%6~tefBO5)tDNZG%=2kc*@aWhoFAW3ZelaJ#P;RGEEmhl5(yvOnQR_&
z<6;~ZPKx~%)bQ20MWm$t#K-z6YD`BK#K}5d3{8IUt5fpr1G}l4I}7@n7}pC<I^^(E
zQ21E$rG0<rJ^Jza+ROX?=V!jDjSVb*vZeUoy?<wJrQR}#K5s2zo-2OY<-e-vGkb#v
z?_U;`uwQw(huQpXf%~_&n@)sI&+_$>KRP-6ZI@nfnCbLwI#&DqWWFtaQCI%-PnN>_
zIJ2zyMGk9TW#!9dZp;#C?yxA^exTvJhuglr)2;XqzWyAL5~OgVq$e(Mdx-a(lk<7G
z@5t1dORbO9F<i7~^Pf9Y&YW6wqADzCfvSgj>fFc6W}cGv@M-mJaL#bJ!R=Z-D=z8O
z6q||n1nn=oRx8R^2J~mXPm%udWrKJ2;c!Pzwr1n+)g3P9_Q=Hx|CPD*z_t6kRqL&*
zLSkoSo#gMmPMXr|s1?d7cyaz^Id6A9lhPBH`)6<6UiH(pLD;Y0B(q9KU+5ARt=L2Q
zq3bukz0&#lM@H6%_i>*VtFPR0`(^A8gXuA@&+T@cyt}Ky#j3v0c%E}eeW>R5cA+am
z(i0lvf2=e&yEOHv+T*K#R!pAp{o3C-vLe>YuAcijQD)l<zUsqkAK1MSzN=AZ_-Edm
z$3L>4M=jTh(qHq<Xtm&mvUls|dM@Svdh*suF2-*n|CFZu(#g#`E^hnmQDW}8yK9xR
zPQ*@_<e*{s<HTd;t0_-4cv27SI_4m^BDVJHYv!Q1`3!Hxr-jVy54!*S_g!^`4&k4N
z*g0!k>QB`l;ePzPego(C=H+h`e|D8jTEh0EZK==w{`wb(o!@Oq@7)?{>aMGn+Pc~J
z&-SvDeS5Y(S}Yu9f8PCtQkafG(sZ#2Stnwof8}MYd2(E3vgL|(tBxviKKvQ~-*?-K
zi!UuJcb&IRo%~hm$b{R`;V%1Zm8YKRdbRfZK6UQAFLy3RKCP~wb^Fsl*Sw5sORw4b
zZ>$$q6yE;am9DAm^!jFc@%zp9c1CZ|tGvq>zINqu^`i;#OF9m%f8v_SFB8Uf@mK#U
znP)rtG>dn&Fsqjpu)jGy_x$I7Z<V~h<vq}!z4FUbP3EgBmv{?3@tm~am*rWVXUwlc
z5A$e$WH#WDy3BtqqsPSYi%XBxF|H3)nm-mDZIu3FDwq}hD_)^<^(v(XOD_Wr;rV^f
zew1HN^*nUq`3ydVSB>9zM0_ODpDXy5uK4wr|ImiTCl40r{XO=H`<P`Dw}Rq+uRbA%
z8vB|4$4h@(pY^g`_kO~D{S7ZGCLVjGRQ2?`<l))p3_Ulz3;$&!@?pJGL;K4)8NnR7
zE^YU}y=40tH)|zFJ!gxsu&Xim`s66z%rEB7_Pa`@gN=IG@_KJLUilFGG5qDD$;V&F
z9KC<sb=o1W3emWSe`j4-oFkO_kE@(xwXEU-UcbAae)GTdc-dXTw8j2t$zQ8kJ6`QR
z<NC>b#oOfh=hv}zM_t&ERxa8Yx+ubW-Mg&g><j<hJj{~6?!?@PRmBhg{Bml$@Yz$L
zW=;NUll?A_xqn6eUD?rmrT=`l!t_(lD;?fH|2N&^d47M+XOGF+|2BR}^X<?Rty-n<
z@2q8|^5quxNFP<6-K<Xp+;7#S`FY%seb;R8WTtQDCH<94|2IuDsGt1s!JC!s|L0%$
z+b<l=d^WW!p84FT?9)G2D>>dbWn}aWRkEt8e^(t+x?=hP@wFkBx7mDsskJ++J3n;S
z|HvITpPk6QX7{~!)<(zVPM`0VFN2%-nP+Wi5=<*FQ9NhxU-3mr%K7E9j6YSH?rV%I
zvhbhy_iz54npyvfzy7=Ychg40ZFU=)4?78M;%oI=D8nTCeb#an&8_d(YwVh3D|f5A
z?MskY=^4Hs56&KbwX5E!bKP~*pZo3gm*20JjLhHgeWGs8i>+49D|o-%V7}mMSnoOQ
z29Hky^TZz8Us0$2mU7KyU3T<h^)Hpm{<ziLt&+dyq=va&c&;oZmy`OpfA^9zpB_B5
zjo4|rQn{k8?zi(U*C{KxT*M~!9iDJ#&BploflcrH5*vGUPt~N&-uw6Vvd!1dELLCY
z60@v*=gp42ahEqWTz0bL*;}*kdhWf8ha}JX$`o}yY5ElIpA~s}{oaipA=3-C<a|)n
zE&iD$9JXBQ;35A_SFZM~)QyVu$|{OG)Wq~$x#sBW8{X5_KM7m5{#MQWi^n(c=I)7_
zwP}x-+WZC2++XgSzNa~JjeFe*Po+6Cc<X%6YScVwWokLd%vaMRKY@F)ciM!B_kKRT
z_~TB+jsI7>>NeLk9;|D8o-|F_I*KcCl62CyJsP~>%XhUDNXSa-l^NN|a2$MR`^6*A
z;J~lM8O5bHx@>0d*XMuoY|Hg+=I12DUmiMk>5;u)TiRx8w`}WL772kH7Xv%1<N8$F
zYFDdpR&8?7-<X;z85Q?%QIE+TKFKxrJZ$cK`+F?x*X6moa+lcWbss;u>Ppn@;w8Td
zD?GS=T)1hv|7gY=$u&o+Z?xR|y7seo;k@VzhhraRn5>iu+o9uHa8Sypca;-QPT)%E
zc_z}=YCmu9K40?1`q(~wKE9=GtD~>6wa-1)Gih0jRwPp}OOeFtT`dyw;z2?;GTGR^
z)ro1zJv#g5#~!)<_!aAV1^UbWeO>&c^!uiiq>sDi3Q4P0?c|o{Qiy5G5tmGPx<BNi
zw_@I`us<AnpKSEg|L>ZbHd|bMep97H)vY|sw6~3A89Z;R-tTXgK6Ld=F5BDLp||cV
zx^G<acmC>@-e(anKhBTevhd!f^It29b+?{PQe3mlHSvD?{$Dr#@a4bxwn#03Pxp&f
z&&E0JkC(PN=g<4fu(kK`ylu`0Qx9)ly!7h(_pfSd#MZ3)ezsyBTNyvIn_2G8nr+qQ
zdH-jsTb*s|;XnQ<*;zm1TGF+|eUA=t|NS4V9$F)J-A(iUmi?)%GiBHdrS4=2ovXdP
zq2KA%o3yfpbCa(n{f&=&{p7jaz9-5pZ~x@ys><ojyD7FTW3{IB94^+g)%RSK9xrS>
zI5Rx3@qak~ve#C6I(lxu^Q(^WnOs`zzoyk#v1Yft^X$L>e*fiJ7hrm3vELmD=jaX1
zfsL~`6cS<|E-0L4C-PUXD9P^n)EiqbX_#N?Q(rmXao&V8n+hx>(rerVRs<;=6I3%e
zdg|5ZB{@}_J4|l21;;raI+-9RR@ElubJX?`>s)D#t7l4OnKZwyyb^iN@zF^~p(n|Q
zCu(lEU|+w|^#8RNsdne(9p8Me?^&$aCh;YZ@$J)qW$snR2`>*@o)ENL>io%*TVn;I
z#k`=}Th?1!m-f84ziRE(j?4YwGQa;_`<s=juy~D1A;+;xlV9&Rv5xi9>YYc|2CPg_
z+U#<K_nm#rw#AFD|4;c-JKy;Bt6x(6RrA=BZ<Xz3JH7r^)%urf+)FxlpV8slyyCw%
z;|l$Q3#!+?%j-XWxlFFV^Y_0qevjkhf0X{8?0YNxN35PmVT+p-@69tNQ=VV>R490V
z(yqtN6GfeUPZ*j!a1v#&V^p>Ye}4Q6AO9_7l_stI%9eZX8UOeba>8_zUT3y)od=8W
zq>hV=4gU1^UW+vS75=6<VR}Gc^7I_$=4F8`<(5ZYB;GycT~c}e>Hf0#w4ZNGLig{x
z)>HDya>Bm2j$Jo+cdM6g|Nc!xUSs0ZOZ+R^jLWotvWRMN?q%*%sPTy7RQ#Xge(CUP
z;bSfjyZ$Z7x4N<KmHNT9uK{v#Lf50ttTlgcaPV~Y&D(Nom+r}|U%aX{Y_I*ApGAAN
zZOYqQ@9SXSQT9IXyTrBW_T81sb{=t$pMU%?|Iz<$lCAekxv~;UPwwvT^)NYI;ArOb
zmp>@@O4`5salD4h|Ji?-y6>NF^p<K1`|Kk}H=TJF{+|2oy3&pEA)Buzd{~sH^Ckb`
zw=4T+Y<A3Daq82OI`y?b|0f>*;M)Cm-^>5^_?m8P(m8Pd`mZG`4&Q3E?>q44RBQjg
zV3v2w113FV|J4z>g`-F&KrX~Fo%@&WAI<p+$$!-D*5%#mSmRLiW&iShts$R&%KZua
zmzewb*?!p#zl$pRr~Y5ftCHhdzNXpvD{o9knoIc~_k(-a7=+1x-E}%UZ$;4MiQAmm
zn0fUr93>6?e$Q|B<XboY)4T=$Odd}Z<XO%i)*$lv_x-Bg);Ih37XPcMvDQEL;$@}O
z{-f(9cJ-~+Gz&C%o)KW_H(!6zmVfg)KAz*@oHplpm1otZ8`8qhJmqaUZ@teCOF7lA
znd~9QwK|I3t@6PC7ae+^k1pkQeBaGyw#`xO!ig5K*89bU#{371ZZloE;k_((4!4k5
z!EN`-ZsA{(`yLo48}3kI)YS@J`<&;M+&q_O2SgP4ecv9BIs5H~^>H_WWBPlSCi}hT
zT$|PE611RplfPrty3;}mS8{^i)kmk@R=ZJqttoz&>$4dPw2tK6Qk)wdlD>asT+!l}
zb<^+u+sDy2`+D`i<;Rz2mET>&|N8%}2TL2;8A4}BNF4s?eq`bsu6wER*F07(4@|ih
z6?$WxM_|o_%st1w&%UZIz5mKuUre8M_l^yXlE0!<IXU(^artD53$Hm48LYu5V8|qI
z^*QG6k*OuQU(d-umu)}yentO@^et(!Kl{HW7*?<5`tma+{nv@NFOI$qU0IgaBK>hf
zz3mI1{8uZ}Y!y1{^e4=guI0Ag*qL6@`RrZLyOXjDH*d_+3zMCB?yQbXwuH6&#CHNW
zcO}nz`thH9_pgX2HFp;s{30y-bN-PD!M+Z@(MPn3Vs<HIoh<PEcU6o*<vOFF#=%1^
zJMAVqeOXz&u<*;D!obg$Z|!otU(39z?TC`m(io+~Yvp`urftp9*u?!q@7}Xnx6T($
ze=_BFpqX>~+NaOo{F1G6dAj|mk3*0Oo27r%BmZ?<{a>u!l;vZ8S))y6n)oH=4cQ&P
ze;r8MWpqtHd(Za?>@&`%&eS%#oUtwcgYC}y5vB(o%_%UNy)QRlb<X*p_KRm9J*&_C
zplI@r>k_XP-^;)8Lf^`H#!H#l{cKw|8(uI8E01YXch0rWxnDj<CT^dd`iuA5a}SnP
z-MlL>r||Zi$oq_m#y?)KyMEzR*0-8<v)}FCZP=4+FzaUE{o2}U+3pNe2@?VHbu&(#
zec_)R`fzrVb2L-Pz9VPbs=RmDrp}mp+JF03+xyKrI(K?jI5xLF(Npl-kkqW3$Mq$6
zPvs)khO`H#nK!0S7P>EM*t6wqT(efdVQt?jW+f*oYb1|7QVnd*sXewaXbF#bsLr}=
znv<@sm2ta#d3SKUcQnf`$63eJB5U4nO*nTnZjZ^9^6l5v7O$4B%t)=wY~@W|s<UM4
z#_8HU9shE~67+WW*jVjf-<`Vb;QvQ9cb;bU-0SRAVt%STky)j|vXSqz>5tvrtM)6O
zI6n7xZNw#$8D<+x=dNG4@KW_0ZQj1);$Q!NT>ka<y!sukdp)=({>^WH<klCjsMOai
zd6I8w!>!Oox*h%A2YP?5l~w6Dctu7^&DrqF<Ar(33wuO9fB1RyuJsn>s=#*|Ij#l;
z*@Aqp*X)U|x}js3zbM6eRZ9XJOJ+*WrafAclb$#P7~H+>-oNKSkoY{$IR(>p-IdNW
zbqMk`nZNRW>cRUTGH%KKe7W@w-)Fwxy2})WrN8$o%PjSpzV@byo%sBXIvZ#I_Q=Vc
z{ZY`oeCqAT(i_gcH#|E}&Q?Tp#~sOn_uW^e?0znpbmhqRhhcvtQo=rL;@!L{Ji>Wn
z%56{8$g~IR=5cduH=feucKhP5IGw-uUmYyIrF*w)V#qZC*9*&+_Y@o6{Gu-NGHa%8
ziao3G-uK*zpKkwOymjxNlG~~_`(ijG%cj*RYgD#Qx;Cf$iReR}{m1y3kGgIuU8Chx
zSYz|>kN^5-?sMh8YM;NC;_1KL<E&Lh*@pe|dEN!<N*>+s{->zvUg91nn@6W=*v)tf
zej7&IuNJLa#`Tc@*}}5;l)e>u+aDxxeW+WJnDRxyFZJ}~$;%riEDyh3Sup?Chu^6;
z-7mdu|C2Ub@NMO}3xa)x8-7$*zgqRaO?>sf9Vd7GdU1GD*8K^q{z~tNmR9Q3zMbVf
zVX3`)dht}>w5+AmB*W&bPQI$YbV>Bg{MU)L&7y+h`@R=#Ieppl(Yo{sGr6VT8+`3Q
zJ&U<>?RNW&{k7epc`rRPZ{!B8S#(>f_~c3D51Y^Z?%^`MH+7kF&c@JUKb_lc;v#?D
zbZhos_+7F3cP-=msQ9FUJ#Aa(^Bj9Q#oxMvg`tD-+sB{s??e5siu~ZaxPQH4oc+(I
zD^=Rhf9jO7Zn(AXlufKwNX(=)tPP<{?rJT#s-+!jE%blOZOJC1w)fG3#<j;^H%@rJ
zclnDOfAd1urhItyJ^jt1u&}vSQNNB~vz-69?cdqdmSZc;1r*L|u=Z_#bMEF-;rjV;
zpBKN$JhS=XdRzPGRn=(=Ofv%oYjqawOL|>*Ywj|?jO6<5mA|#-Y@O)%D>Gi>-rdzx
z_0m^~g+<<<oai_y-ZQj2xHaN5+sbR(x`U?fePvhi=9+Hm&#h6r=j4U-EcSi+<b52Y
zx5B@g&j)gsD#+>lx&EcnWp(Ze9SbQHf6doQi|b;my&}WHuIBwaTb5Y1)m<!f!s17J
zTdiLw=1fYG3Q?MJthV`nD_@4uf%DJmb>A5N=~7WDUv=fb%;)vjb+ZJ_m#@|o_^|QW
zjXV2<9{2<<_#C+2DlSze#%a#^`R9zRY+5s3D#ZHqtJl2YvK7lU?HAjB$6@(I-ZZO<
zt2L`%uitWO$Hj|Yp}S5_e3d16N>A}x+`p4uaeM9ZjtAZE`Btmf+uif*-O=fiJ6#`I
zZ?MgmTF!OY?)RLyiZ#+pS<n9dam6QcvTWq7rTaE{Y^(Sv!C@z-cvR?=eeU0&sgvdG
zb$Tq{+tj9{Sa@AKd^RjIy1`ym{c>sB=VRr~=kDm6y?bOGd)i8C{$9_SOP-|`ZTh5Q
zbvO4@Rb(jN%*Q^lM$2FSZ@=vPV0CYM*cP6e`;Heij?Qt3d@A|v@_tuav$L(0F&>@8
zh9b9CY%D3MsVl81`)oM5b#X;oQiR$f+0PxfR+cV|+GKWmSLoVTeSX>TqI-H=H`*(8
zPx~bk@zZzJs>eq*9zD2dVc_B0nai&3|7);im9@X?`LZ24tNlG|4cDyO6w*0M%G2V*
z`HM*lR(|+&J;pRnaP78B&+WZWa<3CrjO$cAaOsM&Z*k<bxT9<DJ}Jv6{2Cx09#t`i
zO^|n;mT*wb-e2eU{;sdhoF%qgaG_gk+TP8NBA>anihcLKa{c^lmrtJ87X1Ek;^B&%
zZL{5N^%G=2Ki;QMk#{NW`;Ijpr#CP4^L)0`e|e``$bUQATW`0|S~Ypsi>>e9Y|q;s
zqdCVd+4NTQmSrz{@2!l^(bL))9cgOc#(nm#;RF8(Yc8C;YOQf-^Rlh$FX%Sgo{Zg}
zJ+nIG^9GkgmCKI0hV{*5Th_a^cK^mD5kj|oLdrIVKHn9Q@iKbPqSBDnPRE7LD$TlI
zJTE)w(^I{5E1f1D+4^GVkN8h(WmkshSH&$nv+LTtJgxqldoMm+vxxW6wytw7w*UHe
z?@Wu#u9|5vE9z*8d7;4Kr@70NyD#O29Nd`tU+|2~BHi7+VvhGV|J)JFT&#IbimgI&
z`K#Q7{MhMn+xCf0$`a;#r?>9E`r67==GxX~rRZA`jG-@fTozkfSvqa&l1J&cmuyOW
z*R)G)p@-P=<x8rsM29-4S**V%ed^Wxzr8K(`_tn7{!iS0IxsK$<`UhUs1-7GDjw?%
zB>f#*#g}<3+4Vo>>u1yXpR(^nz4PI{&Ga~N`sThlRq4i8)0gWmozt^-e#(rR+df{m
zqE5{*ueqKg`Z7rD|L*ptqwRW`-=bE$o_berePN?Kw|~O-&1+9xjSY%;oVM)Eik%aS
z{q7xKcQ@PRb&N}r%8&jE)4P*T?vX0L`Fz5aV&AS0$`>bo$W*?PrN3rzxwKxz2cxTT
z@_Hh&@A5hSJ&$)>|In&)4e$4up8Q4o_SIeYTz$%{|GfW-z`3j;YDT|G7kst+WzX%r
z=hSh5H&0701bkl6%(0H|)HLDe!4Zp>N=+}BYp?P_=G@DSds}NZS6$lHz9+{nyW#Jg
z<FN~u9erg|Icxe{ncC1&v-rTto3<|NzUy-%$6$x0uK3#}OOx)0W=@yPu;Pq)`tsBY
z?~|@?Qr8w;o493~;nNNGbtbR4G<{ZdR790E>)WEYuJ1%Tmbb6GmiB&U>GB)u9Les-
zr~aDUeE5CnhGzTD%c;NP+BV1M&(ym6xK>sq+`qMBZN%N}``xl`X+{1tn0d+j&Xa9Y
zbJ=c&Tm5xCdrs(9#2lXO)=id67b<?)`&Q|G?)<f@7QLE$y#7g!zxKm&^C#y|eOsNe
z{*&UX;&(e&ta$y^<eJx>tMYn5aWS^BTI|1i!l%YsbH`0MS3b9U%KNy72VV9qnlURy
zValriYgU9-tzRkque$oTYWz;Uf2Q3F_iYR7*5~`Hov9=CV%FaK^%9GdXY4NfE~b2C
zp2q2C_34*3%q|ZUHBnA}wn|g(^tLr=wy_Kym$V-*7g?Mq5^v`pQaWA2QF3n(>l2|!
zE-e91FUdf^`3_Szy9X$3Y1BAq>$ON-GI9s!)hqAPb7P+fH>}uqN%q<0Qh$rRi}|l-
zzuCy!{rQulZqoL0=4S73n`;&O>Sn*$xG-+b^<P>C?yk_jHC5)>l1255s#~g8YgZR|
zZi`&J<GAk1^MTK_ey+dfuWx&Mu5D`b*(-6&X64+hitkLZEO&8~|1-@noTH>~8~@_T
zmv-4rU-19Z()pJhl{GBQ1zEq=D=#|VRMN$4Gx3J0v9jb;Q2{09*!dHV&B$2uaN{yt
ze)-L>54PQtHTm^LeOuq5-JvQsq%FnQvc`M9i{am%bvyE%<r+g{1sTbcNqjT6l=pET
zTKVGjiLEyeRL`Hx^j!MvxyXB>&Pn_kht2dpM*i3{ch*hTU&7r^Wo#;2t_w5QuW<VL
zOpyJv?2PthSw*amo^>r%uc(f65O*rmaP@hUv}pOXgH4+byICH;_{Yxd+z#mt`Ah$$
zJhWrJz4ZT&exv0|ORdkmKDa}o@ZNSa#m%}Lr+S&B^y2*Q{w-&G9~ol&{QC`u@YcTM
z&$7*FE-o%Et~X9k*g4O2^-rOc^IzmI{@`+sP^x~Qc_}-)<*?L=g-2)UBsiSE8q216
z)Mb;9kfT`8HcrX=f3yT-Q&x5wo#Uvxyr5xLa^Q|1g1o{RSA*@=TP=S0WzlCtnT&`Y
zu@wh@#~<T~SY@#0?W^xy66Y756I&@&aU*D9;D)Wz4=M^ynM8(rojz>4GCnGHt7(RJ
zjZc+jK?VPd<<mcYySDhgsUb77+987j&i4&Bb;Pt;Xm8B27kHBQz&}1s)F4OV*-=aP
zy!cQz=lKhsa%Jk@J=oM=cWw3S`^RgZHq2&D?U=VoA@hyt<@foIO68`n+MnI{;PG3v
zpc}TizOqkU(&8?LK8pJMrXoU2tZe3-cdcJ4qS?QGZhP(WZ}0V#=Zd}?tFM_Fv9%>{
zyna!)>aVNbDY3|z?@d3<sy2G28oget^oz){X^SN$J-mME-1VzZOD}IKl$alI=9krr
z%}Rconmrr-t@1gYE84<7%~E@X$h7Ibx1u6^wlAvfTeV3tv^7UFdS=c!ogZI%)mT=q
z?sm;qu}-&)UbQn+q$}2CYwXjl?3rRwp-)>PKgurIv1P87Na<Rww~sHrP&~e+p)9nn
z&}>)e*(nyKW_c%DrA$q=Ut5Xtoau~vletQ%%jVFE?Pc4}a<QJMP@N(feA(rig14Wz
zu*!nTvt~59HMBS?ntE>aHu#x*@%pO7Wp5&-4yIi%^HJJ!V(0aR-A~UxOm_I#y>q4a
z-Fa-{LF?jm_1Gt;b}YVRF!#&bHw!XXPr5vLW8EshJ_DPO_13!lUR(?2%W}yi3iI3y
z_X#+=rCh2jcHS~8hM#uxPj3EuYflAZqw5WU=I@6L%QA&7+;UF1eE;Nm`=rR<^RIum
zG-zXfF#YugF~OrImzOkgJSj4$UTN7L<LGqDZ=KvD7rkcxY6A^>IqUx?nI8OgzQog7
zlK*{E^m2(5#m<epKln{Hy&IKxS1<ol?NL|0;+OJolz)WI(Q=qSIhA4ggZ^okH#x0d
zn(f3R*d-EstNwZW&DT}-A=;nC752RS|MW;RYebX$oO!==FHW)0UV6!Sy4UjWs`^@e
zo6_ay{5iQ^vDD#bCPx_i8U>BIk4HVf1UV`O20ps1G*97d*59)obMr30IDh~BlE|l;
z`>Op<_}gAS@1%6<ldAKpUlu}6la%<`IHYP9EBL-Ly}QhaEk0MBZ?|s5s>3gWf98Mq
zpPORgytQ5N>0!o(^w2J~8*PH|`Cfj@`R@nZs9*j&o%_?vLzQ#N4ssmJVgDe&)TYEW
zamwLG|K{EPZ~5N-;pTk#w_omkQ!uY^Z#TOAOLJ3bMS|ptXO=w<lf4qY3-9~$_t*wc
z!!_&JGn^I#XZxAR-L-!ATGQ8RUWbullR`y(*H_M9&Jcyj^>;pn#pwPnmDD~jn;^Gi
zuh`+!0_=aTe%Z@=Ze{<;-dpd#TDqofJ+!ErOMs_L^HR72n^Wi}jfc%)%3st<4JQ?T
zYU3$rbG5!Bul)DVM6r+m6bq)e9r^41Fl){+onv+W-`_qcyQ$nOVI<AASbyuoYpK^Z
z87|zo<;D&7$qqL%rAqJL+}L;6MqppV!dHy!9j7fPWyV&T9G%U>7Vo-V*Ff}nnxtD`
zpqudSgZJ7SML9OVm1JGfrQ_-$F=eulpp*EwdDoIA`>g0q4Y?UAc;_}xn#pW~U3Cu^
zcbz)<{ClkPB$*m(-Z`qS_KQ#L`Yjvgesllqe|G=B-zqHFeSV>oPxv(X{kDq~=095^
zBCq}`L;QW-iW?W^eic4=HGJ;ui?$JNhJP*dLm9t3e7oi0a_3){H+*|}C7^wE>w6n{
z{;bz~oNecIo0QM{e6PH+C#sVF*{O-=*spGK5nXt2zP3_=p~CyGi|^09VjrAt!Nv2h
zM}g^0_KfLKM=K}IG``q0(cC@zMaQN++&Z5A8;`fWmfyGG$%lnfwb6mz^^=r8cfNi-
zE8OOz@vr}3=2sLYWGqtlH+|(@H04an_ecY&>YdlSt~stbu689xV$y_CA;yHoO_4XO
z#QRMxzukM8zVA)y#LGt#B!BG8;q{x6{^jwz+6#tK9kH*=ocC5RIM_7*zEddhG<t$$
z%AK?CC$dC5J=t;kV*~SBF_SgZJhX4V6!p579#P5>B-k+1g#CoUp}XrW9iRO<C;2z0
zdEtvCMc10j{eCsqx~bH=_A;w(>AuCi%Z%sD-$y+AV$P*U&Hg<9{>9uM!Ix*58ohn=
zqxRl?WwzIEFKtN9PF%R{2hU2SgJGUM5vxD^S31llmmK;1_bK@)hd*BUSN~y6sD*Rk
zpD*#A?VoF<e4l@@kt>syIeOn>g8Rcwo!uWb8m5)_EI(W5&ha|_a^0%=!S~!3{EF+U
zOTH$YSJeJ4vVO{y|GOXQx$m6f8h_F+(xKMd-qFg-;lq)935UBMCGHru9E(oM-alh=
zy?w9W`d_u_&x_^V7suPrn4RA<KmWU=(TlIQRab7k5<dH###Sk15!RRuv2!NeQ0n0b
zQ{J`8nuU9RDMRz&89D)1i;OP09G$XX|FJ6P;!k{^emm^?di&zuH7A|**8f>?t@jD{
z;)9E(x=H_fF@a5x@uHPH|FhjIUs`C+kY6w3We_Ak;qKEM>x_+TMiSSI5+6L*c$4!s
ztz=)`8}n5UWaOl_gmmb*e`?$9?b)`YHmdH_#>Fd|CrG`HJ^xBsB3C|5v)FXgy*;xI
z1?;$GzoH}lqGMT#n2EyQRTs}>c1s?uF8rEb7?Wpz#eahRM#-z)dwTjJzO6X_a`uMo
zh<EYt^}pJDQ4IHFH*eZ%GAS%7%wxlv<uiWmezYs@)RfRg+7}lnG%3x{DY^b3glpN#
zPcpUM=^mv_Yy74PzyCZ>uK3Hfy8rLL-ufL`Z+b`i{>?el1zKiwFRFa<R4hc{Tk8_9
z7fKP!PreMDWl*p#oO6jSOSQ;JOZU`Id|zJZ>#UZvsnxo;fYo@Rcvqw^b8C)0)3MUp
zMdtE9<GSp9p6TR>_}mv^eExWr^O1O#<DZicPHd9@*?-+(YwnxHHezf4PV4E_`Y~@E
zPkC;G$rst@A9@x}5KqZU%m4Q&Us%ZPr~Bs9nai%OY;V54W#W3R(rK=Z`eIBBCG%{x
zHp*-Y`IZ}8zvxV;UFg?Mzj%GNU3%<ae7(>r@8<5A{zZ@Cx9<~~t(E_DbN~M3_cy0p
zs}@)OYI6M0=d!^1<>e=z9zH#3U+TthcD6_VTl|<&_dVoY^&HWp@N-u$Rm$HoZM$n$
zb#L!HzL5K0Bip9%S1;Gp)N}r>@IJ5AEy+XS{6)RTtanxRbL`)!<ms)qP{Btek=?TY
z%Kl^jgX%ps=DV+&C!v^Z@*{NBj3$Mr`<E?j@9g$3>|0~-J!4klgjbgGUwaCg*Djk>
z7U*a#Qy;WXW1{KRBVy+t&ExK{pA-GJO#Jinz5g>$_uNfB5pDHq+uEaB=j`@lztA_Y
zqt!a}g^ZiOfBLkx`M1{2VVK*$q|Qn;YH7Ujm)<v~3NjBbIWkZB>EyKKeNpgp>mB>7
zPMaHMslAU*j!ks6thCskFLz*ql4IaMrVhiPGNDQ9=j&=VM69fPnG~lQ`9t1EWW~-S
zNp<1TdOvkSt?jfWzBo(Ei%w3GbM1+`Z1%hN-S<t`cCuJ+S||GB&rU<usrjaSTISZ5
z&#KRv{O&}U@S&IY?x~h4i?(`R5x944SFNH;WZ$xDI~$MN{Wlap<~==m%Y^Q%18>V$
zeb;}ZRkF(8vNQZh&YzO&#k`Mq?XzYr5qs^q@OkCIn^#oI_o)8P^_aak{fE~pZ&e@r
z;@9h6%SY`xcIoy8&uEFM{gP=j*P3$aNd??|V!Kauk*0p_kLp*)=4)G4b7q;$t5jc{
zl(MdB@0rfkPK&*RXYXHLb0Gbb(1L9x{(1{`toJF@ef>GXG2P_YE4SFL@9+2y`DI-X
zzkE9K3De6Zi@F~23wy_2eYC_bq#`(M+Unic_b+66ZtnJ}ohd}>&T+>{%vOs#ZrgKf
ze%aqEowYc!`ly+fla~5=sao&#&*L^u@3<tT`1SR!d%Mi{_Fw#eSII6U+TUExJJe=w
ze*6FWm4E(!d-K=!hcu6Xb7rR*)BGdbrga=_QsT}{n%F5JSmk?fjjV6h#UC3apXiG$
zS$tO8{nvKS>iB&R7uDSSS?~L^{^!P8k2h+Ec7CWnBbYdG@#I6Tzw=7;O|Q6`7;ZYh
zTKeRwpIeT8X{|fXDJo{JY;kU<(9ZSiUOZEr$NPNKpA9+oo}b#LDXYIcQQ4l?eY4|i
zzqGsbm#t6jwM=pyZ~uOO>geK+*XB%nX*oB1)e5=TIg@?Y|NXIR5&xPT<<EsLjbCpz
zoc-B2^=I`)j`+1#Vlwo3PHJp?9F%$b;RIdh@Oo$4<NggBBzv8nNLl2D6<tZ?YYA{N
zKlaa6S&4&t(R3Bp6$jJ1eg8jjOOx(tlh-^go-5ycdc(>e`qsLen2jy_zD<>i`TTlb
z^+Pke+voo1^_^xq_Pcj&_R5%zw`$pve#CX>2I`;wDyy^jT=_eG*{^Rt=ihwsO{k82
zZR&l64_USzZf3o;d}8~Tev+KPb5>4ux_;RTE@9P!3NM*DB8^*kcdBe=$&Ju;mrwrk
z?V|X{v|~jxcSSJsiT&twJp9^R<6)`0K%nxv70Vahsoin$me47|(CO*6=hmg0L>GVi
zvS!wr|GlC|Jz_lm%CuUm1f7ZVWG)p*{OZ3ZROTn&@+CG(=1GyiUoWvy+%Tg+MdZ`-
z>un7|eTUa5XgxfumLJclJw3~3>XF;0^Q$LKO%u)CP&56LRm9C2oqeBtd*^MQzi{GD
zJ?Z<e&sSWz&#_#k;ifkC6o)VYzQ;kKNh_7rJ3I{C3StYNuF^bp=+0~NeC4gjdwurQ
z{dqa*RdBb!*Hhx(_U-S`<Mj{tbk6#e`3zNKr5kA*^p~yC;ylT&^qX_io~ttamtxqi
z#wuS~Z!gf_Qas^V@$-m)b(h{QTa|aE-{b+WVcp%2Z+BmwVJrPFzrf4b;M<x0<44uo
z4l|opt+3^t!24ru{C^9<`EMOhC!aqw|KOX1$EJS2Ea$1sd71Vy{rTpya}~?y|M(u7
zweR6N_BkyIrz|^T#TU4D`v^Yzv2DLgbsGOgzN>1Ycj`(sCQI}zlys4<|NccQ_ulLa
zPKPI0iSQNAzyIgOi$~w?FKa%P>woFlVr8ah)$!(1DRuD~wIA7;qQaLkw`iO0W9Qsq
zz_Mc!yTL`<87DSIBrf?Q!&hK5t>7>}!?xd<iJ2e6zMJyBJ9J9q;STj_K07&5PWY_h
z;9P3p;V94)!ee_#a;xye!0p#->(2k*zukYz|If1DeRJOT{;#fXeP6Y%ux3Wp{644a
z>CEd3nM3FC$*s?q?tZ&vY3sfd54EM-jSjy$wdIxlzQYq^%IYt!yV|cWTUfHmjdQ*F
z-<T%VK-T1WQ%_s2$e!P3ef0FL57t|1S8L0?v?<%{Y5KT_t0RMR=|W-Y9o^sd&)cA*
zbmq<*$$u;2FZ|l`V1i@Tzw39-?VYU_7rl1v$|YBstCg}ZdnY%ne%v*cnR|BEx{Aos
z7gbVIAAV8&HLZWnFKheC#z|aqBHZg-4^%6&+-jTi;Nf>s+x=$WSkFkm(Y|+L!7l!s
z)0!;V@AvhtT6kz(Y>`>S#JzzmOAeV!vS++jI3-XSv}@NqCd*GUy5;KOT<`TymgY9^
zmaATNqb!!2C-7oXs<u?P{^IOn<($i}`c5tU?yz0;RO+<#Qyo`%>02H*H(2U6<(c%e
zD_Q*RS6(bz^P7Ff7K@LsG#~i(c-&bXksY*Evq$i(mxscloJ(Ait+A$;Jp0%EahZIp
z%qJn!EbZkX|E|OLK5h7$%(=v>G$Ai)iKVF)x5&%Vd&}B<CvjCr7T@`r(!OgO!>g0G
z+U%yy6wX^^G~;aGH}Q3^m|rQp>I>jIr`_Z2_wtpwhslGPJp0~@T)etyS46hScM)wf
zqc#66j$XRNb}Vg8@6NvJ1#8;1llZK6&N?e#8kS)r5x2Yi&}8Sk7L_wM95^niBCgZ1
z+KKnrrj06PYpj+{)8z3eSKL*cWT&%a?vutITiZBErcRe{7Yy6g1U@Q0|GitprsuNN
z{HcGd*u5FPXI>NvU#`O&^hHHgCgqZclw)dYfy1hkNuMQe7T<ZTAT9s+5664%s@Z+F
zPru)0Jzx1nx#094mFHAfoewfe-5nQZE4j!0y5`I}S%xz$Qn5c*KG$*Iec{^v;~y$#
z*!W&^>(tnz=vKb8-OlF3jJppmaQ0{<6~=^0ILu(*@Kr(H`j0X5I)l~MDij>HT<_gt
zAhudR)oXRRZgPg}^Sp$GPHQ>l3resg-hXT$bt|nna0Y|Lm)%A7$6l=4VPikt{d7Zu
zOyCRGlT`&P*;e_b8*gmCQ_1(s=ut5rPcp;gsNU1h68lTd`@Glxj0>K-$zDk~LAuS!
zrC)#FnUA0Ef7&jl{XS1_{>O)`zH6IVHXmU;HfL>;lp=$YV2_^1fsP4ZBqRk(8P$FS
zIcGbr2=-xGFq>uDGUoc`OFykkRxth7Q{C&ljIDXvhmA?uDo*^24D2gjI`K3zwC>F1
z-mALG|6!g`b81O|t5li%o0&7#&27K=YkkqJmj|<Mz4BM}S+Q#xUupuc(3#j?AJ+R5
z_^&oUo{{dEuyS|KO@XTW6Ebd{j*I;n^D6W1&U{Ypj?0;`W%G?J+&3!!xU*UK{NHwg
z6UWpR1Rf6%YQJ8)e%|AZ<Tz3JH3i-F=lV=8YFRpq<vUI2cw!yL;w`8nZFTpHSoFc|
zbMHIdE<XOE($&H(WX1Ii^<MQQxeC9tmhVp5GH>5)h4UUkGA@A%6`^<5FA7h*bad^u
zr#aa%0_uq;O*RKIv5TD+c4uGhC0tfGH#zF6LdLDu-ev#gmmACx?WuVfc-~TCtAWKC
z=9ZH)EY2{`+HakiIV+!W`q7%_iAw@=s`mTtG77dyUlhD@YU7g6d$>9dZxeX<m?`+-
zL+hO)^U^oHdvB#Pp`~@xTJM|FA57dQsvWuL>?Fx8;$=zOI}d7SX4%{_a^lm~-hTVo
z;gELE$N%E@J`6gkY1!p?<zV&n8fHn(@*MX}l~nKVWh-{yn{hC6%aL@)D?YRTuF9=_
zwr~AWkD{r{UoNV(XfZTta2;`eW|G~Rv3|=9$@$53Pfy(D>AMn}HRC|P-5*B7=1YGv
zHQsGsUBbYnxas>9$=3Y85);HODbDJZYEAP<JNNyK-)!^w;h&dpt+-`z-dpI}T*(E;
zT&|nCKapP@9?yB>{jC{~N_L;T!~CJ0HFA+uic3TOUslDb&7Zc{Ki>8)djF@5o38UF
zF8@?=+u=!ncK!LRVx9ZS8c*l%UmHF1PSuN(Q)PX(hB_up@Y<*D)UsSNWmhL_2Y=f6
z$1CDb+<vbSu{Y~UN`c>r^D7&Y*w3YH>W(Yi{9ZybY5#kxy=C*apS}98Y){)NEyKF!
zTfYRpeaL3D@9{*}%irTwO_wLzu3vlNp4P9F!$F$`1>bI5RU5;SxVd1V=l;Eqs@C~W
zIKT0;w&F|aw;%rS^ULqrqHDS9@3Q?{E#;Sd4Pif()oHJNYR=3L(r$i}O<Y)<TSYdD
zZdq~vs}qlZnZ{l5Z%!3z&cD}ai)1eNwC#4!u`|anDqMWDQ}ToFH{%x_wR~?E*V?<B
zVZX(*-)-f_xnI1#_+%S2<S}en-hJ9FUC*?z!rOJe=F@BrhNxLiUXOVb*5-<ze$uuw
zRX{${bD<@ty~1t9DH~Z>lXRpbUq8F@DD%n5%;{6tY%N{aEVfs5+2p`SMJuLCORZt4
z7JR>S&1U<+$WI-*zf?H%_0o4fezw9?-gr&To%65%Eek&UtZ>`U*WMFcBskKhmc9t}
zbhz`qS~`YN{Ln4wd!^@F?OH4QrtUfBv`RBN<ZN1*@BVx1N-gH7&ARM#-*C?s?!y;1
zcr<%1ITD=NT~gpJDr4zzB+XHP`Jo8YCI#jX`QGbxsTj%VO4SsKEZm$ZxpK-p<$1w}
zTHejAlKiN2+DEZ<!PRFv;WuNa9bYap_f0sryVvKL?;UhsdooV@Eu`nGk}PKFTXu7S
zv7fq(!J6LZ9m{4_r>>URyL`d%2c@#s(~FnRpLX)<`@BhM*^CZHrdm#z7#YN?9Ck&F
zM^$5uPV4W$rFQI<G1Ee3+*+O<`}EeP=<W|$4F+jtiY(_^LM6iDo1@I)#2Fs*Hk%&5
zmCf3?|H>&dlUunxQpp*2XMIawd9|SKIiGMh$KI|DfoaiP>W@^vyi8lM;al<3>ZsXF
z-1j~eou7F6ak^f}`7-fDiI++o3l`-j&ad>@#ni|k(|yOzm*MRh`L_OAxxL!Wi>_?Y
z{>ia=i$Zvh=kAP?E4N>Ys`~PCS=J{RoAsfrJ(vC+%eHy9H#{}!{f`*$^yRPBwp_E#
zPp|m5@5HjX8Y&$ga~v*uc5d<Bu#nrm_}21&nmbxnJ-KY2pLOin;Sx)R{besB8nbUa
z;%Lyd;;>b6+j~(!Ag-|GfdcQfeY+RAuGam&cWv9`IUO4Bcilh2D|5JNeboEv?%9`?
z{^?h&I&)ynW=GN7*13(BXDO_WJfFaKz%AKoLdymZj?E#*%)OOfEd8N0r6+~|?~)zv
z;em6t+2%}R<#}7#b4Fv$R;{3r-d8K<1g(7P*n7bIPR6Arg&Y1oe{=rZkFfRn0&h+q
zZe<JW<bHduJn#3<?n&QwFFtqS?o@44xpSXuo?XpMP3qArxN|V<4d;YV<HmMDwMi<I
z=D$29>$`cUjGO!(>yzP&CWT!N-llGIpn^xeowIP()ilwMf`5dH?BoxvXcJAhs(rVc
zBS-$b+~$N^MjYafLeHjpIeWYBc+n=m>qo(jD`|h%&7C2o*0cXY!o5fD3O@Ke*3*4o
z_#rZ_>CvStrH7l;sy|Cyan@U^^uJ|(^M!Nnffw}-{FCf_tf<MDsI`n|RrK1`K2BU!
z1xCGfA@c4&cfYn~u9M~K_x*06b0g}lH0wUQLmG>;MI<(|xiSQCC>-?AFq9NXGScaq
z7_mkqpj))ZrBk#gu*X%&aAL<ok)8>krIa)lH4D0_E!9>^xb;XnI!L39CvV%`r|Tr6
z7#Nycw$|~hTel}I^nR6_)i2J)aqsP&3tKijn5iu6@SYKQ<oWqY<u|%@`X~P0|MRQ-
z#q`2k#Rk=Kv#s9N-uJw#^zr+R<=gJDJ-D4KlF+er!ainRg*t0~%L#_FHBQ(~J#lEs
z@xn{5&hp$mZ#3CQlGU|w<G<Ftl=n6>J9#Ip*q|&alVO<tRWdR??fBWoXSL#Y{2Y>Y
zE$Y%Sw=_EOd&^?6tZz>xEZ5JUAITgo{7mav{Vj#5pUn5~KDsjb&->*+?z_!Z=KjxR
zrTo$0ZNSdO(X$--m}CD~6&({WT$RP6Ig>xsQafbA(d(WcbN;c_h0VDAPKnRxz_HM`
zn^)APE?;FKo?{vt<rB^#pzo>q{AbrHd98z;O%{)LG)!;kohhsSde-W&8u`;Vz6Pvf
zIsX1!#xo{KnMtRgf4IUlZPNQl@m>Gt&3|_G#Xa{5S>^T*oSs}$?Yc_*8>=FgzYy7F
z-Yb0kUFCNB`#=6y@LKOZUX{@$f1+>eqnrt?3CGV^#$?>A{hW7e!2$1LT^G5Tua93^
zxN~OnBiW5h4SSMpcgv{x&bYtRk8P&6;mwj6w$k5Ne;pU(&#&}UnQIiMcWnEv#YY!d
zc*Xye+0}bj-~PX)$a!PEqOw)>{byhND2cKBS+(GZP}#Xhdn)Gr{W>{my3{SX8PfYV
zN;R23`d<}i!m!Lwn;|?s$DZx|@7sUoE<Y^k@#m{gqqJQjOVlT;2sbH1?+2Si&(3{Q
zFv-Y+&n3>{r^V8T5f|8>`a2rTZ+OPAg|%~A=DA;ai!$HcKa*<s>Vd_t%%$}^%mlJS
zQ?>Vhy_Z#6zWvb`u3W482CCT;j@&)5M)uT#1IHMCCh~4SZ0mjdyL|X*&W4PDm0JF{
zoS3F`WIo_I{Kk9Urx$G1z8VKE$=1eA@6X-wH0|S)jl8UU$uk<1ObYI_RsXC1?)1Ux
ztMQE=cHi2?4*vL1rL*OodFjLAf9@A={Mg<1YTfV5wRf{?w*SogrW&7Lz2f$jYty^7
zDvNpP#Tjk$Fz{6BUOZ`)hlYd9RA<f?fAS>#^RIrtE}<hksl3EVX@*R@Ut7>A_dm+A
zPip@^UcBO6)tm?E9$U>gCArs~F%K``^%I);=RxINo=G3>Z<D<iDRZIxtkz7i-?GLZ
z&*}eP!)dKKS@irODVtd<EjXXQlQ|OhHs-*_i%woH*<Ptry!=01x%7s$cHNB6_PjZA
z=iVx|Z#Dh@nV-|<jA+oluH7}EY4IVCokWZK=kT12)ZIGG=3w&s#H;!{{;lJe=kGQP
zIGF#k*YCgUCG9p}bN{!E=T3OJ^LLA>xH|0LRkz$WqVfJyzl=RoD}KbyyZ6UHDpNPd
zf8&x=w^<q+UMehqSI6(XFx4TJGlq{j{psVxe?>o)j$F_+Ww6^;Eu?(t_a?4oe055D
z_wGKGrE_`rE{(pLodOx@FYoDmlD#l5Q{TNpNlzj_P)lXyht;MM>y4%Ot?wTc{(HVr
z_MocW&11WL>u0XI`Ac%KzTUrm0xzO_OcFViRHvAHE@;m`C-tUcX3@HTYYf~t{<d%6
zy}+d!B(|Y1Erq$qU*5=8@6zgz*TW_2na}=pn)!L(=k%Q`|DD#E<MUmAc}c2_!J4Ih
zqWoV3EG5#dd8SXBaCZJvlg*Juq9wf&4R^Bnxwd>hr}=c*i-jisO)RnUiw$1{`&{fx
z*vLHHv(NlR)^e{hv)gM{n0W}71bpq@z+qOgcYW|$)?J&Jr{wM0<Hp(-Cc43IT3-07
z7tz}CIeYI&PZB%xEitoJf8S}fDTcEQ+#Blef3gZXH*xmN#i6JFfBZP7ug5}WZr0^;
z{$%!?VuMWStTlcAR{zrYx-%rPhiA!gyM4C`j~|jMaCbV;(U&aoK)<C~Q8l^p_NV{L
zzskt$+_mbjviakCSGm3(sMcB&JX>gs47bdQ7^Z|H2h#W4TpcHQp1Jkx?=S23EBy_B
zTkU@K-~Zj8;tlzibo!iXpJgwf{c~^q=I+XqPc2R{Hf7$fzH23>tY_48BmJBUqhQk$
z#uHD97+IP`wUqp0f4&cXnDb}9<KsG^V}FdQ*599X{{H$^O&Zaq^Iw0O7$tQz@#b3X
z7GajSIX#pA>q{+OZP?Df-ZF8{8KbMWmjAnd_jq~Ky~iP!-OB4WNACTXqFpEdpH)DA
zN~0S4;XwPN89|w|YtL-VdX=4=b@<xBRkqJ=GI=`g?|XRr^LMEijQ77kIbEY=J9SY$
zzhc-IxAk`)s#~V6^az!AIeqPA;}-Q5xoQ?l`CqHGl;-vrHLsRE?!HHH@Ava!6SpjX
zs?RCr<F?w{S??L!=0~=2x98fO&iOCUa7B4_aZl#*hZ7z$JmfrK*?fsf?^Uf(&sy;n
zp(1m9W{H}_tGXY`@8f?`r#36>cDTWrgFJK3?T+~@FiFty^O48xQCa&=+dHm(cz!Kg
zMe^@*uchlxU0)!`Vo`8$jR?bn(hM&34~w59$XGiZvR}S?-lr+wwHKwtNNATGZG0nn
zuxc~=jr7ggE%WE3Y)$@tnaSW1)3?pLep?8(z36iZnXXs9{e%8uCEJq6AFcB5ZdzR{
zVA}ff`}4QuCdRgFW7jYKSN~|!e!Zibx7TX!4cmOA^t@v%qh00vsnOmV)&4&n*xr7%
zk+;-7`g6)$gB!}5%J;nCwVAzp<$;vqw~@!Kv{`mIwuYX1{cG78xoZNOOkRil@lv?f
zuvaJQD3eD+Kv!YNB=%VqF*(!He!rU*cx4v9#ko2aXUm_3veNGBJs)3B-W#dDxiVn3
zmHZsbszd+7Z9knqSF!le5{vw^7q{eVe~R4m{D0WF&Gl!$Nd1ZN&e?nQ)4uK9MrY6c
zTJ0t;IOCBg)8RkA?{jTs2;bt+<L1~<(&M`0lf~WTTVHEsvSd~;WZr*h8!2)BX@k*r
zOF6YVw)$y%=hlCH;<|Lz`8p1}<JYHg^S?dOFZh|`?7EV$m4_~>d2Q?1w?5_8CU3hU
z>FlQq9d9!J{<r<gqvP{Vq|8*%xZth4@9^#0bNw9~Ccaww)H@^S!|MXS8O>n=Z5IvS
zXGTgHIc2xq{c%~a#ldX(#>bClBz3HojSPGte6dhWdU<-~zvKGWA3N@~e(P)cSZ+Nn
z=>Gcerw^_5pH+Cf!@*J6CDQQ_o0?_2fu)H<xk&$&^xG?ywXIJtPQ2QgAfemdHnF37
z{+gwR2Sn0XEbg6Y|GL><#A0#1SgdH2%{HrWHlL@h61<C<wXR*$SRFBwt>b`?{;8W{
zuT15?TKPB2&%84`cYjDtwpaPvZ3RIa&KlLQh3wOv8X3#$>mK?q^uW?2t0vAcfxWL%
z<`nbvtH~N$6lxyJS?{dkQsPu;l|MC={d{=zxet4n9X9;p7Jl<m^}RzO;jUX#Ya<de
zu030`$jPIza{0fGShlk>T(*3wGvu}Jc-*2a*rXz1c;dl|*TF0^|GiZ?(xwp7v?gHc
zG}CUSNunJ`{8tOyS6nU_;Sj;JPx|=kk~fz$x^fN+vq-QAMTzBmGaStnjTD|=?l1Sb
zz*gkp#Dsp6DK1WxL32g^T$#U2<!sccj{nD|q}ZH)E&gfy<GU};KN4fPoo&rlSCaNd
z<!_g?n$ljgYll>qbmjm2GWqG|6OFq>8-LZT|2{9rCg=OH@{jJfnwd@N(xt=;-g&=Y
zeBzDH*?RTFFHu(_XV>t?8|;+`yz=Io=C^-al-gyg<@i_MVtX;)Y66Ey`?H9EKvw>P
zTOt)U`7?9>sR>wN=*+z2rQO~(=E(=u-EY_kOFWX=aIhyi{OY^7Nt>=tyz^^Ma8#G@
zdwzpe$Njg=dh2;wHk<kS<=r2;wNG8%=Vkob`s1O8Yo^SWd~P>=)r(9Woy7fHmu2cs
zsB`0H;7OKftUcV$-59mVh(qE_of+G|bJrG~SAOyR!HkQ`uIn$1elN83`nIW;OxM_k
zT)uu`wSGt6@7d}1s(jz8=kP4B36nBd^YPx|^@`%}Wc+z%{GI)H!GSCfZr`9|=l{G)
zUSE)wqRY#r&wAK*vA=irnSd`ntKS4i-(%5#eYr>HbXumg)5$aE&I@oTsh(Q$E%`71
zw8gwPl&=2hnG>Mv9{+A8pIe{l)MZE4Yt3nHxVR(9-gIic>tBhj9$gpo4j1l!xO!j7
zxv*V}{u-z56|$RusX6_3{qC0+m6!2bGqo`u_^!oZn`9$)@A|^8^LM_jj#1yobNr*b
z_4?n9O5z`Gw5R{mSs?i+L)|O3Nn-ZSe+oeb&Y_}zV&WL%Z<Mh%WV+P9v{v=fFkx{`
zb2bri@G|RWP*M7#!+C}+hmr69#fER}@9$4Ko7>v*jzg6%Y_lgHLx=sB3g%@g30dC^
zVh&!Jyl$S!ya0pWLR(L`E$UnI@H6Ma6D|U$)^Vq@{mnNM|69Z%EXdW+*rpUFA||G=
zc3I;pm)rkup6t@`JQ{Y}??F+@r?gbXi;PZM6GY5jy*lYH7~FqiX}jw0XtDb)(#&j^
zGwZwqF5KGmrlRsP^OtXpC;t_Rb{x`Jr73CmY?=}KQZF4(P7#$)7YmxqlsQ(oe*dz&
zC1;0G`%Vwh$R%3&iH;r`%M7NPoO&tFv*=)o82kGPHx)NYu{ozrY35Wq;n9*TQ}gbr
zRDOSX+?S{EC;r=O@BFp@{KEe%$$UM5nQh1Cs`4la)bm*-cO>xTKRtAz!eC#`+U>8Z
z)c%Oydvov2;`&AL?iU<dc^wjV@D=^_lGOIInDwzXBI|%zfen|4?g|G3sZC2`9{lZK
zd;jZa##!ljr#rb9r@h^gcI(!r<u}!BL~l1YPrc_pX>r-L=FWv|m!{mDmMWDw?ZcTX
zeDBzga%^SzxlyY){=>KV?K?GE1r`N;+i9%ED%7cZ>XyjD4=PuSBX$~p=D*;-$wNk3
z^=(+S%3qOL*LL6Sw3=nJzxe6q+--AeznC)ZQ?u55p?*yEyeRMQ%j-0nTvH-!#g29;
z)n`uC)|@sqQcGfu#v)|}ElZ=DtxGqEuhp0_&9F(SYXjHK{RJl<r?gMxKQhzrWz(Cp
zK3AQDcv@1@cA0F;Qd89q4!=@R<!f~NvO`AVrU@4`G7iV=Ow6~P`|DkgqHE;c<|c&|
z#s)9<a#)*Ji?+#$zCAM`i|v>EyM3h<>CE=q@;%$%I%uk?O-z+?b!lokDBz~TSDb1b
zpnI`fbfpd3-t5f|>yjrc8XK}4)Sl`iByN7FtvNRM?@4}x{jWdrM_O`TxMHYuXhD^a
zp~1C;Wr|UUz3YGeWq<x->zikKPRsdcZ?hJU&SfZD@<8w4RipO6#JiVoC4G3Sc`1$c
zW~15>hmOU0ErBMBPQA!VVCRpRyV=DfjVEZ1;0(!>Mh&6M_t<BCP-EV@UH4-|CIi<4
z=jp|<XVqr++c5?T`6)>&JzQlWuf;0FB2Z~`n1$iSTtDB5OU$bZFW4un=sI$_MW1W!
zGOfUE7ZS{N<Tx~)@nGysu;y9UleG1Y|2gMO%P+!9BWLcLQMpD`f}2rrqMOp9<KM1m
zZFE(MRB3Y%KH-=ouG&_*=i!nmi8^ZU+o!!X_TrSVC@^JoljK<9uF`eP!ysbA`%PUg
zM(3525?WSm2*^oU=g4O8*;d%<x#dCrdq#nCE(C30N!VoIb!au4N|2`tlakBl4*`ob
z5?Plt@wiT8KE<;lf%}r*4GA`mly6B=0o}?hwF{O`JGpaqb=@Dg3g<1)-t#zD=WtB8
zx#YzGg9|*@xb{jHXP(oDQn&2Ny|=leV!nL3-dr8OZ5^AdJ-S(Ie|*ZGx>V~<w}(W-
zuCCJxxl(6x4p(xm;ZVP6`smN~jbC=_?U}Q3=|NNPDLZa*aXvEVHaej1smG^ty=|Ra
zR=_3Kx6##tQ4TkbrAzW~mKppy%p)r5osrC6U~oN3qxsTHj!5U|=FRI*$FW`xR6DP4
zcq?D@+S7%;D<xc26qyXZpVUxhd1K~x{PuyJZkM*+y5^?e^V#x?oZYFVO9ec&<lK^!
zo=9*72;I)=Up}K#T+=f#A@cPyizRC#16+bSBIdELzQpkK;)T8c4z}Bzb&k9eeSNo8
z)Om-;4-H(Kx~$LXM_!vd=gJ3vZXxE14ZN>Jc$+di6%@}VZZK56yTl`X%6B>GOFwjG
zt91F4sOfl$F?OhK5c6tT9O1emWMjgKB>{ns9@;sKiCVX`bl7(k9CpYv;ouA7JRHMk
zvVil7oUF~2Y44S}H_hHQciJ6~EVr0`GZB+VQ)eu&`OLDBPxDja+=lYa#vL75h3Z@p
z6ONp))HrS8EzZTnc>1v7j2r=%;8z-<oE5C8oO7%hgUlJKk2VW4{PQaD+<9%T&3i{L
zzuvqDH!n|mdPIBLw&XVL&{o&pZ8uok#d?mI%dksvUc37!`sfk!JG;_V9-m)$lFw`M
zeIaiF`2f?2`D$J3mw&ipJa@J2o~@@or7-ATXt*I!EcL_3SLyfJ7KH}xKJkaD{3gQ2
z);<w8bRtDm_P1-=sUO&2=Df^5RwQE4ArotjO>ZhDGhPzfalDmD=2VJGH_rr{l#jEv
z2MX3^=W^>L^oJf66x37V@)Z`I<srnJ+1w#w|MAn;fAP2G+`sth&%WDc_uYTbZOeE0
zd}8VM-;(cNFl#RMxbW%<hh%Apt2g5(UCVnL?%v|DnVNaSKxw&4mP30)wEcA6`_}zO
zzO8$DHMpl<C~>Oc9qF_-H_kSe@blFVU;Q)kSX|-|zOjKrW46?KNgvBvHsi>SD;{B%
zOM6aze(tbwTeI?;`<C-0PQEY@`pV&YO-V9BOEh8<+u1)1F-aOH7>jpmvK`@M&<x)@
zTZm2Ey}I4C$K<i;c3IO<1J4aD{Zn{)<6o7rJCxUjYc^WAGHFN~^)yZKSi*IPJEDA{
zknnO&hZ}vT8|S8dF7Ef2Ir1~Gbn(KwovHdPht4hVNEEqTV^MQ;=Ea!CjCIwHt4=ti
zm#pLn_%30_oDp%OQs2#Y>V&ovtWG5xn3pmw3p&49j(>gauNNs+`7452<vu0MX#8on
zEaS!HPx>LIzrR~I_^<k=d%B%7@MFcDY?BZU-5>upR;>Rb`SHfI-AuiDXS<IVJm#Nn
zv5_@X!t1J7wa_LlsY^?&JNj?sZM!sc6N`(<gV>~pMak|vCaieLlYZ{wl#ErYrb*~G
zztCnW->-fC{Vb~{W;Znn_V>b^&uhQGQ=i;?`@o__N|mM0yB;3mJLtJ9`OAAF&c641
z)A@Caz2?{%bAOW5KO$wMyzFKBVIQy8;W;->UOe;U+<Y0un~i2i<yUPeSY4Rj?sTWo
zC4ZVr)IHP82{un1^4BbywrOkc-6+o|(X2BbTke}_XmvI2$s0x97G-u<Hb)y3#|q~%
zrwx4D{3PULU#3c$9lk7m&vMD7^YSL5DXalgd(<|0&fu!#So>(7AIC$1BYX0i6YLN2
z`M;=KbHT6C#=~jRnl8Z(Zsw(2U9KDxTU4BQ%dee%l;AOY8;`HHnf{db&8H4B^}2F}
zHO4y3Df(5pc>N-6?w7h#q^5BDRb-m1>k=t?6!k30vX3u%M#`2chqzr7ZnCh%Bm^0~
zS{@$0kXvQ;o11%X3+F7EQBnTljkk-@^bh~sE==Bgf5Q=e%l0d;F1~yHih04Jt&2n6
zZd!TsK?twYG_9ZiWWW8&NGp0)HS_t?qA6RqcvT!bb!6S)KHsF)Eyf0OqmKBP-Fh9U
zyKOp)#bM8#Yd+4Mz|AuE=<Kep!}B%?i|dCgy?yMQyttC@-lPc%#V%@Rig+F#b9mgB
zIC;s{gWOXlt_XAt_Sw-k*|VwJWV-g01BGc3{ME^I{+}=JY2TTsANt;6YKnTp6Mro!
z=cDJ@tNPo;8ajC|>BwGTI`>vFQenwe8AE^h+(6%r>=NsZI15@ADqlQ%F@fLEVwpjt
z!2O34Zl+soTbRh?5Ea2ZpU>P(PRd}e$p-63${aZ}BmI1iG4Arv;Z@nqD`x2+ajn*K
zTf)MgOIdRx9SxgWo)-(gNetR}hR5oqn^ro@#`DM1BO`Jw7dp<nl@c6u$R#gP_D-u?
z2k*_*8>-69Bc`RyI&{d@mB*Xcw^?)Tk)nM|f6GSykZ|}sd7fX2R3``X#V%2n$Ss|c
z7CA?lw#+#e$vQFJTVZ8}(?PC-36~>SlODN*HZNSMyiUQ=WztDEh0+;aU;5M)Jse)w
z>sJb_e0g8KY+_^d`{(oiO%k2ua3fIrX<}2Dr*UUzg+~}SYul2<lV9e#`7&lrt6ya1
z%;sD^;poAZSOZlFM=^s)9?wv&!+%Q-{t;Q<`#Gf6YH8Z8zio1dw|se-c>B2e%;k;C
zI}}cyoP4A@zhYKGZq6A##lxMK(`}zU;GePmd8~Fqt?aKkr^FH$ztFp-U)*-->;ogt
zmMx#^%b(n3{;<LS5L3px*D>6#B?n))Y}e1-&>`OIqJ1SGy!y_kbrwgA(%hm<%yxx^
zwp?E~>4Hv^3zJ0M@#>suwtqE0Oy-@}UUJv!&5Fs{RkPHr7f!AU<6G=M`{S}qo6{WS
z|Nc$gw0T+sYhZw~V6J0Fa;(SN59-zBo81rg6@;-)s83k@E^7XTc`BY?gB$0X95D-=
zWB793)cWba-hG$#>&v&_yL|r1`#;#5{=D7rC-U8vt^55ZPLJR5Q9Eksnu|PcZx<Ug
z38^YocmLX7`>ED`?N@RCL+@^vHF2ihGV48Zvgl;+4wWs{6Fw_)`sm$%(EalLZj(cs
z&d*5U{Bz{J@RZ}GZ5Fvb$x>|z8!J~HUBCIkm;2u?U9K_>=$r6y)8qrM{PVuZOnUQJ
z`;=5nQ)Kx9neP<}56&!X3d@%4T+0?&9HQ|oripixxaZn;jXc~=F8v|_zu!-(`Ll(2
z;_EEIg_|x%IC1Wrn;o6JSg2Iw%(X98!5Oc!wN%`vEbV%pIAhU={6eKwi@nl{B{Ez}
zML5=}NxAIkP;t-+v36vcyiZ<K=Uil?*_r}o84Jmvg_{J+Qp{X$UwU4zsKvMNeAm5l
zOWu1Y8&1z`wcK^}ve)w9$!&|c7A)Oz>*HGI!fUs3URvHX3ohzbYI0Ccvs%bva;oTC
zh*r7IosBa^^<rJkuAcbvzK|)i&B#wy>0pST`3^PFE%(EV-Hu(864YjXv+us!gto<d
zi#^(p?DlYJ**-(>#FajdJ}#Dx8z#EMo~~fJy5eNBWaiAS36IZjZ7a-}9b7ENedVy*
zDl5nGLrKEZx_NdhHcz@f?O5{t?Nzeo(>A*@t369p)DllSn;rIvw<9NRR>`s*x4LCq
zTs4z6c673CSz6%EYw>#7I>VGFt=l$9FP!P{@Umi0U2;;Fwe{|d)(%I3XH%ct+O=rS
z;i=1VCl~mtW~^X3B9^D3Ey#U)vS|1u8SAjsYi`Hs^L$jkA(!4f^V+N@_qx0uJq<W+
zYoilTZS}e<zjx~03v)AKyE4z6K5Y2d^~Rh(b2dA^-^sC!U72NbidfH_8JQEb939s2
zh;SY4Vhy>J&(3mTO2}-^o`cMCRU6*Uo+PelUflP^FlpUH*`Q0e`o90RG<N;rv-w?2
z_V$QK`3D;VpI<&@q4+H6;u57#f^i>q{fc@jdsQ*VCbz85u1A{h%(fZRg!~n`W@)f!
zonUrMx>bB5Yw~?oo>H@eQ++NisJwH3{^{4YcfL(5uu=M1FJk#sF!$t_6B8zG7hdkY
zcwP|)59g@`_Uo3JU7N7Ym4%J5&4F!wRo(aZ8`^IeNi(rT{#@zC64}Xp<6tWPYOSn>
z<eH=?{*eCe_2E1ZH%5K?aP2$G$4nLD&1oJchkP6p`5EdCnr7U(^(-MN#NFtOv%$id
zZIW5rW=>~%I9c?V&X&Ce?_ATa$a_y&TvqY=wy7`QRu#+KeTz4i6-U1b_FR4Z!d{=b
zOdGn@<Rd?QlD6JDyX;KQ^<#-sBnns7ojogkqT!s$mK#&7e9f*-R?=hd6H&QgyjJe-
z)X+(%Pss|o)}HabF?Y*)x!R@8byD-@9rn97H=!^y=Gw>bO^z>aw)%ZhuTP%NQ8Lrh
zQRKb&%EO1IXN5XetoY?QYmL2n_Wjq5msvdQqYfB$xr)52HBaKc!*S#8w)Z(g)~=eG
zjQU@HGnZLTF3xv(xXZlkOq#}2)~Ak>gG!c7a{eZ}Dbl2&*jZST`J=#^dXBB)8M4>+
zv@hD=^4ycJ_l?bgjumVEHXOB&h-O}B>AdbxcBjn~o2U+lyUWTid@y}gd%bDaRjsWu
zI-esgvp$@iaQDc^bV=E@5fUAWVMp6cmOWUf5_Re&mq6aTJ7sIDuS`0S%=Ttk_WvM5
z53!=fsomFXc=bNcG&s<Ixn`T5u)Wf`eSRCSn}jZ2Um@jhtGq!dpsvyW<;||lJF;`R
z>@Ln(*OS25rS+Yu=Iai&h^HG~oi#YR?57>?m(^U;P0EiSSjZ~*ReNHJS7AktnN_K2
z*W-x2y(KD>1-?J%=$L%>cR}>WDRcQB={&#r?fP?@|Al|+_I$p{efM<Ve-7>ghqWg>
ze0q6{lumq~(U;eu{btqwb#kYlxO3<9oz~fF43?Q(YII{`UFWjvsq;~mm4`)b%cGe0
zT}V1V=a0d&vTL8ts_1SjXXmzRG-&&+!p&Zisl=!txKi_!B6DvD&&TOvj8j&A4p(Y<
zn$gI`H0O-&s^`Xyt7kWy7uHf-;MsD$jWe*Dt)p|p!8V6zw&1t-zcVzbbHCPJ_pYw$
z!b_H)y_!$XKlt{(utbo@qhT7yI|ZMPLX|mO?K5wgov&LxhiCPfLlate@3<*FZRI2l
zF}1cD138K1osEi(=G)JdZMuClL!<iehTE&eju%}&b*}Q*a#K-WDXtF<%&INZ4ljIE
zmDJs8ZRYbL;?~`DC+>cW?&_VPV7Xwowh+s?13OMS=Po&L!>`)iX5qe<YXrUGYZJX4
z&s4^on$_efGiC1sx3c3BuXt9?+Hrs8E0KIg1y0)&8uw0jMg|)_lKyjM=C0^81I?|I
zHhkCFnrg!*@<zpN!wuH8(-XNHYZ=rRNJ^d9yGC4Eb-CGN6~7?a#M=zJ?j<mJOZk{Q
zh^u`wx#ij0y@sz}Y2-v{=FUlNQVF&2DtQo{Cowg~>~P{GwFk2$3ftbO&eF8JEbzN`
z=Z!dVulFn2%1!3)yT6dRlH=VQ<F4B^pY-=j-p<O|uz>k&+rsnKU$65YmrbAdG=*Iu
zq3)7)?$6_Xefmc^Yug!_rWPOfKBgHq?}@KyYxg$x0~!8lXLIky7H`et<GAbfe)r^E
z8?UCBDhe>_m79Ecqs4HM@xYP9i;2m-^U8gyjLsM(Iown$KT+HwX_c+=;dn^vUUsqD
z54Y`ExydHGmaSbWZuv$tzp66<e5UD63)d`5c-A<f@|Z<phIbQ}D(mzbLp}qS9WvL?
zR=wkT>sG47G3ADW%hzsY_r}Z2%?~(SzUIknUA$!b>gBt;a_^toc&BR4anB}=1)Xx`
zex;_NW>@w63NKoIebRF7@Z{hX6$?slY4pi2?yAXLbm2jt?EGcsO^hk7<}Mv8%OoE!
zyuV*kxrf1AN9u)S<F2<#GtUQ|ZkVl7d~Z|ma>rjBn=kV>YYQJQe8TO_DwJi=Cs%en
zs^N8xTSnZYPCmCIyb?G36xVZZUi3-Ud&x}mlH%*TBTkz9JaOaw#lx+4Qe<4VzTK`Y
zy+Q1qLz=_|%}p7Ndu3e$7kPyIJaW*&+jG{g6(#2PeYcb{P1x)G^1hf>o5d3!lWB`D
zeq`d|3!Af6tVqad%AMW$Gcv6jb{*bW@sfR}brx%n*y`s=tWP&MFPk`fW|x)6F54iR
zRHjU>7dtEJn#`VVO6e=ivy#c3ZoTD8W95Y_ylv(zt%_l%Th?xHyu-7D>435*AM4jS
z5*z~F8Qa(r3McNEmE_hT66MXM5XQt6A|RN0N@|OdA>R+CxVsrw6@EHcGH~juFr>V9
zvYM7<rLU1wHbsK>>$0*msTntNI;JaFCP>AmY;fV2c0b%kH^fXnMMk<UT}Afc7K=;~
zM;3!4Ofzn#s;jON>*KT$oON5O@$&3N#=dOxnBy~;j4~cb_&uJqQ0VNr7rxxjdA4uA
zV(!}{>(T5RZPDn=-;i>6$vflCSIxc)<aoVYYU7cvbN$o;Ly1TCm$eyGi!he%5-np@
z(cG5D_ar<v#O>VE3#XU+@b2!Fd7@PG!t&NniHlPdLz3DaZpxV8Xb`c{MZk)8!o?$J
z+&-UmOg7)9QqE*HgQZu1*~FMP&Cx1!M`P;QEpuCTyw41^Ns{+SJrnFYVU@Gr!53GI
z8M=*?*bbZ!x!f)o`1rw-Z@2k6-|qV>{b6<1cA2DP<MmwAZ<dH&Hry&=kd^Z4*O%j!
z$Cqt*a$IG~oYW=fR#;ZvyyUdj*`<WRC2EGhA)8!Gv!NS<QS^BYp=&Mz%?3ApwUTc<
zyZYu-(S0jbmpMyKWQ~)GCT|iG@KBi8Y~eC_S*7x~$FHBeU0Cx_ed4~Bm;Rn_`7?Mb
z@8{^|YzunBR~?hTvaC3o`+DV?XTtYb&5oO{j4X&f)$P3Q$FnCLhd*r1nisQYmUT{R
z&d+;U3$2f`>v(SI)G0W1inaTeqM5^@EsI)=rk{N_Yqx98Dm}f9G+~~IYfQ`^{@H)~
zCVj_YyYTYme{RnRFH4zLV5qS3`i`XL1zu-XO*ppB=CVWAvK+y={J#0g%?l-uTo9by
zXu{KSp#O#QoBh9QGh~En-tAH~KX-Vy)vsxHmuM|I5*&5zu0(lB<OT&7CeI*77p+sF
z3LFi7Y?I}>Y#*@7Kc4%kboY<=*z&2Rzhqwh{pTM%J2WrX@o4<JHCL*AXI?mw)ZEI*
zTD>KA+d-rJ_wTpNjm*hyohT_*BPJ^0taZlY;gZtgFk|Llo*dE-)Ng!9VB4FO<Zycx
z!^$PWw^&{_cjP?rUD|%j*-`z1=HJ7zuH~!#7hG2~Eq!v+Y@dT^<Gu+T6N=l#(`HtA
zu<-~uxwmi`$~=y8eAuBoZ*Iz*!=Cs4u^PxMez1(ybZv&P$1{daNsgV)OE%7S>RqvV
zl`H2irbgW*+8pbit@Usg4Hb0`{t~Ejpfqpov;$qzHIsM0Ea`|{XYi`M_Tv0SdkfZ-
zr#^o7x9|76AC?p5H2<(D7yg!~Fg4ZaTJQ;Bon5P?r&zit*4^=Yq1(4xXWr$zF|(4l
z-eh7uFS@d;?#Tf=mz}$hJuZ0kJ~M0+(}dlN-2*-aCMC&anY?&<_(-TW+rdR5f|Fi$
zdls?J7re`0GtD>MYC6NjnU3d+=FVdGUB0r%;?lHh%9+&?Zg)8JmAtJuHXoQ`CHLB|
zvnTP8tXsTI+L^TrS8Pa}X|jItB39qhGfD4R+$2`sULsh(xa$a8^o`TKPd`O%>)7Bm
z#dV5<ixS6;4TXtIc00B-xSX(LP&gy`xuSB4fkN3F_RSl^8&?)+ty?&iTj(Jx+rlQ3
zi0LiN(~=@))N+|}XLF0)d9Pq_F2?mHe|WZV<3dKMdiA=1eJ9FqNSr%dYjSFG!GgRv
zru%hC&sy>g3^k8=PiLCJ@QsH>(NO2iRgO)yoO7EPnfw^r_5Jyq@6HnSy|(OkZj#R{
z1Ea*yj#M-53r^G6xcMG9NX|@>=~t34XO4?}dS_lx&T0X1XYZ^^=3{5Jhy><N6=?TX
z7cq$J`u<JX>LTmhI?nrls+MJ>n|{5q_*|y~%QWYj9;K4zC2r4+Co76=Iv_cLL(2TM
z2ET<?vT0Y-A3puC^<gg}ggk@<xvb*Cdc<9XN*JE3w-P<{>1vT&*<61oTh5>+H_?!b
zFH{XSb`%Lb-le)zRwUr%X?}G(_xxE+wHmfh3cL-Hm>3@zDf?<Qz1VWmS?<>(g(fwf
z>Of}R$aW(SFPW&aPmjujS6_PnQEu*^+J6eg>MCNcK@7`1nHSiVzIhd;*EjFrtqE%+
zOih~l6SAY;o{ZggYAWwcleNZTd|Y0#Vb5+h8z-BtOm%u+qH;89>lVi{rx~UJQEi5q
zhgrX|Wu8;G?J;9^P2b~Hrs8KDG}i0$Ykg7n_?a(jE9tcQS;WSmW8vI0ot75P^5@)g
zb>X(vs$Q=i_c`w1n50(t=kJz{^SRDDeO$Kb2$x*wLEqjNj;s6DSTH{+lihhL@6oQR
z`#W~+ELYp+A%1bgbDf8mH%%<jx^YBfv7={3X8O)h;b5T)3Q}x$tY2sI<+HOhnwA|f
zaSF3e><rcqXImVR=pC9g!JxgvTrO;@X|5TIYD3TT)q$p`QrolF?w#CuHq?FYl#oY1
z%2le&o^P*Ju!}cKWPkC2dq>(CgAJb_EnJ~5SFRuwV=TegDdsZKO&~(Rll6|JxV3oL
z-KzKHb;<HFJ}OhIuWo*jwxs-ti<yzK#YApaZoApM4?j4pShL2<%Bs-IY<Zc0;q!32
zq?Q|!3`dw8`Ly`vwF)#8>pHpktXj3G(d+K75<$y38>BgU?3X$&2(a2wt*mf`#nrOR
z=;4P?N5u1%E@^Q7THQD2%k$ubWv2@}8fS_M%1qyp+410p!$J;Ck*|BMU112dV9;tR
z5MKLEgG<avAyIYD7J;YR78pFR2=GXFo7}hJU6A8RekNWCffF;7)9>sN-j!|X$|$ZI
zJx9b<*u`v;<e7^~%$<HcEQ%_r^QT<V)bj8>q<V|JF_EF|negsyo;sQtdnR5vy(oyI
z@Tje1)fr=+HD6ce>3UyC)Z`SBh)mq3uwmoM)yFuM)*X12)H|nimvEWK#z>LC6tnA|
zYuDM%kl=e>I$<hjs}ft~;j^yyPVnX33Abf4IB6o-Q2OCg<fNSe?hb<4TTC-nNU!62
zmF1k!@>KIo(?ONb!M775s*)H(*(ctA`}}H^@v^sJyWcK+l<4czp|RwuA&1nuO&3!x
z%6@pK&3sz0%b{0xmi@^W&sVNp_w?|&-NKJnw9GlVp`s(<n2N;7KT|{+Lc~fu`9mi}
zGMO<nHnGpx%+vklj{WBTOnXy9t^gnH%^Nl-lrR4~v9o8Q!QZ`m*dsVOZ)@il2TCrx
zmcY>=T~=;=Sb3|PO6r6uPe163L}fj@R2g`951+u5=)F%P`c%KL_Pl31ws1{yQ)r{x
z!K776kE4$saNQcc_ET1)+Sjd2I*GR;zj4T!T}c*hoVfRFqkda$hq9-U^tqqCe1-vL
zOnysva-$+{?VVAOI%Vd{4y_}5xGEkoPn&V+wG5wFsu}xi{*+RSJu)W07cF|e=fGm?
zX3r(*?YtpLyYn4qHl5tENlDR;(f0gYH^ZAB&sDqUrT(lwe|er(mDIf|jm88KRqv16
zlFFW?omuv@IemRtR^lQy@1&WV3!M&>E(vp=bs#u~XGu#-=R~&&i%Qf=E=irw=BX;3
zX<WVb7MB$NW3>+_IF8I&8sgH;yLtPRP!?A=ZY8<(Wx^842Mm2oy%xE4^SLN6zckMO
zRJziLa}iTsYlCuqb-vt8k2w?GZOGVLexV?C_7pSk*-t+0dt<WfENjf>wk!JHZpm&+
zUH23=n_rR1*VEV?(8x9~?#}Wu4i1kE&2<7_Sj;Z+78o;56j9e;+gockL3S1Uwp}Vm
z3#Yh=DLW{09Nu<jpYBnfoajUysRQXEDjqJ0g1h%_m|kPRD=*~78o}2eTqt44G)L=j
z*UB@?4Sd`U&I$CH%e^o5XFBKLxbbvb>e0jk={0({jybBVp0h<SeA|bs9Q#@JnyHKD
z7d*IJ?lavl#&WK(t>4it!q<O1(2zJ_zIpMct&Dl60zNBeT&eMpRp%(%$ki1YxAEG>
zjb?fYCvsApTBMIlRaw}*KVNlrUVQe_M=7@tmvdKs`M2)&uPF1)5AVl4j&)ubuYKvt
z;kRwub}}Zt4XCU(;1lR)KI`Ri#9>8Gvcxx$jhc@q$*8Q`pd|6WRxWDKlUIkX<&@c4
zKaI0__>f6SmBYwGDdTMJ_YL|pkEeawJX!kG6VaBb(k7~55))R4ct?j_$}D=U@@HGJ
zxR2UQ!?l{4ZjM_QnWw1fMS6QFuVR{N7_?z!)Pc209i~cwtB&;Mq-r#<g&M{v8_sOf
zSSjYF(6ME~%m*h=@4sC3bmIvF=J{(bzn^{o)!eU*flZok-m$R$;c&Wr?g0PvNcoWY
z>yD(%Sfpgw&9EXw`*&F_hf%pBM{Qku*z9X1LK(BB%Sx1VADNJnrMXNy&9$p&3uDT!
z-|26b?v65LbP(u>(q0vCOv5j6m*2hh95q`L<X_hNo$K6ekmKgu%f>3cGc$Q6yR=l<
zv$hjWhv$0kW#!wY?IK*ZNT%@9M!i0ThXOhVAM7lro-JH)@}b%1w`SfBas4GpW+IpM
z1+<tv`j<4tG_7CS9?i-t{JHefi(47d4jUJml$&4so^*PD>xX9oy=gr<r&~HtEpTjJ
zx$f7ef)$HrUtM%(#jZ6=W$ip>#<<7$>fg<IpI5F>e&NXp_AQgb7`U0=1WZ-XC^_WY
z^?1XLqHJz~j5`^JUW9J%a=EDbqxkU^#SU?kjf-10#uzgD%NEw1W&8J}l}SiJLr|jF
zrshH6{dxOW1%)j1<o>uP=D>?B>iq43NnJXT-ma`75u09bK58Jr&C>o_*}~!5g(rpQ
z#QE0Ew9DRkw0pzSr45=4n`2q~d)o^<_=ClQ_@i$e@$nB$xumdJk89_2QSGn)by{uN
zYqy`jdE4lIm;Q}kv)=7zUBA5YSG_(f({+g&OM@-zq}a}wN$Sp9;MY2h^^I!}=PMPa
zO#)&99h!p8Vme(LQ@+helAI=RjIq~4wCMm-$DTi$dt6KoT;3n0w6n#iF`(G$ut&s(
zTc1Dw<6_8~kQ{w6v5;X>xb~4+rh^GT`3|r4)bMwF`|>_>p4wSP*APiDUd@PakrAu*
zb8Zv}(>mI)YtyEcr+nIfG_9O!^6TjgrH;7<ZL)VN*jpyLUC{gccH!qalVf9Dj9VO}
zZhV}1I^wK`r{94qHbwc5cdlZYwI}u9leBDshdGbb3^+xV-K-XR+%W15S@rnS=U3At
zc{B{US8}keT5oWZ@r2Ly8Wq!a+ZFB?tIR7|GcK`DIdb9ag0*Ui`j1vKw=r*KJU;i!
z-wppC$~Jy}XxtRKd;0g-+cG=ylr$cme$<t`?x&U0#fxFDlbeiLHSN_W{NEkizT4SB
z`@8SF{w*&2%!}8iPo4Dk?a%%DpZ?$d|M~R~C10zm?@vGWExo+r_nG;=iO)}1&GQeR
zy6V)I$b7Deyv{pTt#~efGct10ETObLg1tO~o88%ClU(Q7>0U{=^v<@HW6AB+^_M<>
zk$TI#_s-H})$Mz(37t;R=~|-Yv>;j4t2K;kOGeYC)K*c~CXOzh=$tUarXC459oHlS
zR#whwD>eqM6^WMSXk|_;e|zrfOtsfnx!>CFo2ngcAb9@kCoMDQ(*j32=hcWR%zct2
ztu^1hyHDIe!Sl>~t(yGI$?nhM_VOj3`TNVh^wn8A=4<~rO&Hm|nzf9VNN`*hzTR%l
z<u1!Lq3Ag8@6~ylVX29)Hsoy-=<fYsH8ncr=ehGPsk%lFTef>;oM1^v7HqlFG=KlR
zZ80HEZ>?wQG=5(p{dKxrz<*ZPlt_gQ5gMBu6SPkL-ks9Tpnm_9uE@#&u9o&{VOF2X
zOB%nNe)pHlIzo71muu6BO|FfRTCS{uBHc=>n$}Eo2uu;vVN*Jo;>IyaQ>0~0Yr+N*
zk&a0k++y4c8@dENK~%TGh6paECWA<kK-Vs<17ZwIx&(q8J-C=wIEF?FOki@Aloat4
zoEXXED8{YO#4W}sv4U&KL{BkprHM_35!^}>f^=A?T;D(Eiu|Fi+ZMDx6zi#u%udkx
z+sxTx`X(~*mi2|qEfNl2FG*~e#$2=CU2I`icD7INj?@)Pmj<ns@|L>ovG>oyu1ixL
zeGa90nfjbDP?^=C$^3YO-m~7fys2lV>3w(FX=!ayvbjM_@j6e0*UF{YIrp<<a*w}D
z|C^uo-yp?_<ExI5Ela?KV~02JyIfK2R&n$FeYCyGKs2=Ln30R1iyM!im{QlGCXS;`
z9EP1DF04u#T#GnXbTcutIwmA*9Sc!V`(s`opRn>_(VhH~nEcY^bA{e3d=m{Q-MEY0
zic`hb<;$V{eQi}7wc+dv--JBZOwe>W>bqg<v<|j!>sQOneWZ9e;uDLxsVgVfYg7G5
zCp-P_8$b5g2rW9}{3&2f-+Xt@ADrh?EA!WcKTOZ!c{JmK#)V$rv(aVqw(aw&IsVkD
zfAMlV-_BXv1U5&`Pt0XZntZiKa^g3IV~*?`9NaQ>MOJ(&^*oXDlJ?kK&fDB~@$?^!
z!;Safx=p=Ue6RTJqF-`45$C`CHO#Quvb8Z#W<k|{oz>yy=cLMeR-8VRC|`f`fA#F?
zt=^}Lms^Ou%2^-(%FbRm`iAlA;(yCjE~knZY)K6(*_d=RG4gJZ_(vo5fRduG1v50i
z{gaW~HgWb&h3hrO+aKl0J^HhB-Zbv1C9b;)bM@D3`Z3cZSyo|5=&KLAo*vtLmMy2{
zfBUU3H>!6ZQIYUDGSgUyVR?5?>}<EV*su1}|KBsWKX0IacFwsO`E~p6AOCS@PkX%W
zPtKn|Jo~Tzxb-E&UjBTD!PNwYhbwOXIsEXe{mDE(#gBDMCj4@#yssK`C-lVYoKt2|
zB5I07Ql=Ik_Un~T?hzNf)2uRyWn#Pe%~svVDjmOjA1+B@4u1b{LfV^P7kksj&E~wW
zy35WVDw+3^O|_Nx_AH-rvtQ|QT#xwA@0xw0$U|ac=l`S&b9bDXB_JyjcBhabVx7p5
zNv#X-cD{af*pD&7>6;^)wzu;hL%s7t4F}tN>Q$CGa9J}2ByvaRGyRcBIxb{8<?6)u
zo7ZnK4ZGCG`{(JB{j5dNj~v!{9=&+bkV(+I@3r&d$fsBMc-JktDEq@>T7wqTj7JiU
z7Y={V?CRiA`1XG1HKik-{XhJyZ|hf;eCXJ5OEp<QB-wJAbCgYAuWqjIq)o34XQrj_
z9lrkgJkNCjn;KCaYe)P2%vsX68l*}+;yMMNP0&_YB9LtAl#w>WGs1O(P3?xspXQb4
z#WH0!ZA?02eXlcF;fLfyRbQLQd218$-f@&EuDR6i<uOU=3t!ABmPW}#K8rH4mN48}
zc>39^XP0|Ux_zvRiR$2D)%!WYNoyrT0IPy!ib${1(gkK6VoIB|)UrAmANY&3nd>#B
zJMZ1lwnRWnk4LJjc##~7%aZv$N*vd&-apo?rp-1XL*T#-&CqnlH{n|D88_B6ODZfh
zPY|6tVXD%>kgg`V>*ihBr`=~VXq4>;3f#O*PgdG|s&}MFf`Lf9X+u?~q56^&ewlsO
zeyv&4FLo&FaLKjqSJPRJY6t8NFbL#~@Ve$TVQTlvDM~L+r7t=?OZax|-t`*O{IbvG
zP4oU-Xwg1zdPg9i#yRHBK)2%0*4=-_LTfZ5LM1j&53gDJ#a?V$>ibQvjkW!3m4DRv
z^;v}dSlav9CbsNWn7Z$jf~AXGwKEesAEwR7oZx6vVU?S4%WUZp&!t6i`zx7v&-O%H
zn{3*W*YY|t*jc-EmLY%BT>WQrrq24g;Rln?Y>q9H)UMCzc>ewUhK4UI<|rhUe}7i?
zal@C`qbWYpZZbEQOS2r_F5`V-3Qx}O8x#KhpU`!C-dw|3elknj;>A`T`DCWtc*&tq
z<EwRo?)j`e#j6-fm4p5ASAQtqI5&>#dj?PEaqiu+=XdtLU{ASz<)b9Os_MOPACL7l
zz0wo+{dNELQ`$}R@w{mlxE<5-I=Pd$o(taSmDEu(W;%F1OTcpKwCADx(r%?K2_3AR
z$2gR?u-+9H`McwlI(tC=>i72px8_S`uuN#|D_o%2`A{d>^jq+QoZ8)DYE3h@``&Ys
zK9?0ymGkr9xr?vn^{=&^c&%|#Ui+aGt&IW^?(=uwcUE1-JFT1R#)N3s7O_JP!YVvZ
z*<PLso+JJ2_kv@BHyPF*`Ti_HW`zf*f|G|}kO8Yo=tMS6(F9GANTov#0ZofGF-=l;
z)n?L3;%F3OP~wzu&}LY5K)@v+q+x>?(;;Q0d7YbF8_IWG%9>UA{n(76&vBi1oR`TL
zi|ktFIHlw56_1jcud31)aQqD1+U}V6An{W5;SJu=uWlQ6Fn$o?VrtM!+VJt$wx<Cz
zZ5pJVS1Pus@2}e3*s+3#%}_KnX~i#{4U8fYOISohQko3?Sr>#%O-WiJ5-OzQe9kk}
zvDwtir6o!0AcL4n=p-j4vr{?}J*i%kG#L{EE^{h&tdW@O!}TM`f8qs!w;~A}x;BPY
z9;;<rt(v(vR$<raSrt>9f@bh;u9(=}m{>2mNcrWa9_ypEeQz_^^xbD(zEu)$bTUGJ
z&C@dq$E^#F&-8raBl%3RhgtGo;>qS|?)rMSq{{s>(hRKDFR;A!<zb}7rdjVSY$nOd
zX=rSgxW)6jx62@*#UlE?j6_nyH$xRs`Tb8#wjI>;>R!RD^z*>EHr|&H%3OF7K0P;a
zy?OdpK%BDf%`>iSM{Bj$Exz!hPB>vsi$A;dsck8rb=FxfI@2|4#etx!2I9|LVtm$j
zhOXwG`1oOqlKcEE8)b{xdU#F>GNk$>FF!VM+S><D>*pW;pSS0Y!TmcwwrW>;m#}}g
zi0rK6^RRHZRdJWC)q^oM;RciLyYq!xjJDRiFS{}!^q}|U8Nb*gADARdJm}3`U%p8A
z-3f_rm%iVft2&q6e&(H5CFx4XO0~pHT#dfI+amuy-NR+_fh%r3Nx27#?A=~|P1Z48
z>7is`+<V~GipB{77gcs@^Ioj5xgM4u?XkIQ&Bw~Kb05@v;h7nnzQt0~AWgCLcC>}F
zD&xjk5j;B?)$X2^dYrh}&*jpQ>$ZoJgB$7%O*UFy%L$)a>AnAe#Q`m5CANg}o|?0t
zs{XrOJQ=qu_sI6B2OJ*q-Vr<{FZVH>OSs|wC8Ji!x!~PX^|kw7eV8BnK<i`2hh4L>
z%sr<x^C<-@aZU;7&nv%w>$>?|GZQ(!bDw|K82|cVci*UIy?}3nR@Uu~j*XTa{Ij03
z8;d)?Ve=?GE^xa;&zF6!#(^-Gs0on?lMF*yf(%=h&)75jK)JP#-oIQvBZo^j{A-UL
zpY>FVU2&4H!sms)HucH}4ozs<eQ@byiBHa}J0tg0yPSVM+s}EUwt7-X7oWfL@wxBW
zh3({Jro35ewMk))<0XLtCLx}`?$7?uU3Q*1vq`=|H`1=;^9z?k^*xcC_VH@1zm}}l
zbPDzl+G^%f6M9MLbju{hM(a;}UF;j|?mv;AYQ}Vr!*uS|R?aO)SDo&)<5?hh*6L~w
z_v(hH_oiH8y(_nFR#o?wGvbYxo154iPOl8|+H{<Ex4rwZkG0`f?VE$o{E3-mv25kN
z47bTTmwWlWQrXhd6!dtuY`b<_LZfqSLPF-o8l4@nlGCGFjwn7%<W*tqP?>e@MD@2M
ziS7m4yBHgdGM72Jex7wECuNeVxBnGMu7ug92i>Qw%Jw-W(&`p-TFpx&be*x0<)oRN
zorV_6j`eP9$VwMBR(X-K;^BtJlfJmg?BIH_NW9yC*?CWl(zf8KPaBrxCB!ekl@|Eq
z?dj;ECuvO9cW-tj?sJyOxV6Sn_jZ@Bl~X(Gj@Wfugab{2K1>g~DPwlb!}m+(qz&xV
zoEy|`op@OEzEx&vVsOqv<*BKM{;fXya?U-ez0Wf?_HW;C>xjZ<*E3Ad`0r1XNMi{w
zI>&OM?NZ^)S=)JTp3U^VvnEhdqp|JmFXyUMhx`Yd`x=Yf<eqN`@mhXX+1H0X&T&c$
z%My+Ce_~j@KTY!9{Ad3XfvoJujhh5F<i;-i7%BPD+g5h6a;c%uJIk|Ml5-yl_T6R{
zY20e?>t=2b(^(xhp@Tms-l^K(_g6`9UVKH>SLXlXzYZn;*f*W8XPZgZv3s!-c<+6j
zCwb06{6qlrT!)gEvLY(Gi!~*dFKc|+u(jl$e|eMga@iZ#69abF9(LLLNb2Z>wISxQ
zvwZ8H{F#68__w7?`ku5T6u8_tA;ElGShlTo!6}jE+iPx|?YR~>bFDDfl#G>z;uH6L
zH2(d*eX>Ao?T;3v8BQ8yhd<dq6XViT&RQaSYlSlZm8FhNO%+QG7H?xacROsMSKG~P
zPSKu4@3+c$tIgu-F4(Y6;&N^1&M&`nv?iN128mr*EMk$?qw(HrjY@#oLhlT%Ug>44
z8Oxm(vvxO@O7=(?+-wNpUCZOS|I9U>yEzh5r<8hi=sCEuBz?HZH9gc-z*8;1TU1JG
zj*GyB#$U76Hs9yrwv9d;a(F3Qv3j+J=)0Gjl|;OFBDgtL2=N*+|N3+1z#&HiVP_ea
zXYA7or<FJax2Ai1*kBp7TBNC~NxzY6wZv2Y{q5$5Vw@dW1zxxYyq~*Gz9pka?1R3s
zcC*n5LudEssA(4-Jiedg7TEE?Y^ILMvE^QB0@8`QX184Vu|YOL@Lpws@0BNSFUk7w
z-`pzFc;(QlHG#qFCN;I|PtN8SVO*qGXSK+q$h=ME>C*zEvK+fUwTQM8QVRpkGW3s@
zUXx0(G`QhzCsk$f>&7i19o`Gtxr|p?c4i*k)ncN+)WX%VIAvi%Wm4XZo@BvW?MpL!
z0@nz&p8d=^d*MFOd((0vLs^`A(`NN;IA~ySq{;cW+?AI9R}xKD>`w?4o${E=uOWOE
zYmbCu>$X*~Arm?IGPm#fTB!K^a{P<}#ygcCSwjA7+4A8scWR_Syxr6gSEWTqg|rO2
zl#WJ<hSWA#Rz6>Uz~8o8@mb~5i2A9|FGuN1&j>ji)bvZ`&;6VexktNnOP4bxD|TFx
zE#Ihd@u1_*mBA-Wc5b=QxV6SH;LcQqsD@KBRk`Ank2cNE-?mrmUe?{%KaWqH*2!tL
zNK;$eB_fp~)6%}sR$;cr0U?86h6@)&8tkU8z4&m#tO=Vgs5DRb+_|J{Y5v~L(KR!Y
zPoyr(x|S)(r*L1z@_~mS=bh-CJ0`q~{UF4AWr0(~gnuW}_i6eFnibyeo)c?w)nt{r
z;;N52J5MnkSaD=;OG~$arh+2Jj3P&6qXnmY)nXDht@5a<-YYYI>SbApi)(LuWBr_A
zrOYDFmOJ-d{o`+U{g40J?{$8D>fggx4BaaFxGr+}aVsQW&S-VFx>vO2&yTJG8;z|>
ziarsSM6Kdv_j+F8&39Y8&B4KIwd{vwD;IHwOx-ho=GUs9v1hd_4Sz)i{>l$b%lfpr
zZ_>5L9^ocg+0%Y?&H3ka;h=@8)3i5-pGwaUsea31JoSOkueWhke7~1-JBOWp-0v2Y
zc5zFZ(X!Ze&H~aYygt2WA_V&7=1o@*-@ki9)eQUFpX>BpXNGGQNf;=eKJS&j<Z8o(
zjs|6^6%B@a{QthMUp009B;B&$AD^sGEb=v9{JVJG|HPHQ<xh6yJh1;hQ^R?ho091k
z-lG}I+r7)TMxPCh7hRBjGy35SzQ_V^2e<AetQ-o`k!{zF-RzGSJQreV=}HLN{gKzf
z@#(Qev!?rGe%Z1mH>9BJO7OE68?qnX*<Nt3!QiUfl*se#YGs9oD+>cJWvZkwGcY@@
z40HHV<Mfa7OVkV2B#pBZf+hxMg(fTcY;!%W*r&u9(tA2G)9aMdDxM>&rW=K`x-E>D
zZZM;v$1U11;Yh*;ZEo%04-&-!%z`eHXa3-1`kGasv(-m+W~*0*M#)X9c|UTk^{$-X
zzLaBvtJTd-8@`q6R7}e}5_5aWgxkEHRVM4qv{tzZxuz|TlCTs^77>{}Ia0|;PI2C>
z4DF56-hTVF<DJtghm-OdZw0Fiw`*KDQz~}#WrYiqV03!FQT$<>UCZ8SY3^_+EAExC
za+01Jz<;#!q&mB_vYX4~g{*olPFhxHUogIS^0F>H<wi<;;a%p#CK?)ooeopxJXQ30
zV5qREp2csz(}xcql)8$|Ee`!(etPYk|H+Bop3GiX;uuyY`g2=VnJ@ilE!_L{y3{G>
zH~lMD{;O}Uzg;^2-_B3`soY#=-q$-G;&e(7{b+aV+tw?Z>6d3&i?ldwe7Is)`X%ex
zY0rfwKi4)sXVczO<TWj%acxX1XV?QJpXiXKLYIxjrp@^KR;w@bM9<QgowM`rmftWp
zH(YvZn$ZKE!;1XH53X%BTe|V!a@S?ESI_9!)+)Ymno)L0k=c^S*sXzK+fqHbvQ1kj
z`s(IcWwtEantto;if2pjS8iS%5_NK0)R|+AjtRGULMJV-c#w1F;*WDnDudnFPWaq4
zQ5NFJ&B)>2mR7p3_kM&`bA)d*&l$~3o>SS?>!erj+uAH}M@y<8BKAvg^xIk6CcB*A
zI3v}u#%*V^CbNWqwBxdwePT|>y|vE9Sk8{voF?U5qp@)1Lf$h+%dZ`C4q4o}Hh0Ue
zBuOvMDaUi{ChJJ9ja|61W3y@6T;ae?;VkaL5!tGxKBxA)+mxwxYvG|tffCh_Z0;>v
z*>yW5o@%TLEAmyFx#qN<)6#<uL4k@9q1myY_T+B+?K5L{>da|}CQF@~TyxTNm8heZ
z&TPxf$Vpdnb*lDP&iu6U$I_=<3TMP-&ddxJNE10NZcwbgd|Qc8ufszgnJmq-Eh~+p
ztpcvCG*Jjyp~1T;Ehg2`A;xdZOdEx1Y%|ltXQnyE`D_&E=s3?HUGi~WY1`)I{B0fQ
z=L>9b-aWt8DphA~q_U*b`ux~gz4!0UJ+(sTM~=CZM(Ogml7_Q4N^Ta5Z(rN%Kk?Mb
zWlA;1-A7Gy?RrXI-#MIiRQgx<r2{|f`#<p*PWG`b{j{zkWgg$@OD7){{ppf^Q?Z^+
zGNV9QWX-0)#w_FB$OSVj&zK#tbzyDUV6)=jhMPKe?M!icJ7alb#V&13Gup7`$jXR>
z$qGTO9vbtt4HUYpRW-f3cHNpeC8(L}*UKKWwU>I%EZp$OSxB&C=2S<^#NzbCgDq1h
zm`>R$wK+0H<ibmtscEXBoINWixu&c+*v_{0>Jc+`p|`y<SGJfmF1&h@xAKRW)YU|h
z@U%A10+UX&4Q5w5a$CK_)^5AHb+v|=7PH~x%V)Ypo0JyygbKKJ%O_p**bt;B5*XOT
z6PUv28YmJHBIepGH!Y@0iGksEHd|})j(f{FIyl<R?p+G4OJ-keq}1<nSLNMPzbOvS
zn-*y;Ix2qi@O=HnRx@O7bS^%9MPtoe*CQ5fOC0jEN>dLe-Fm<%@c3HL(oUsL1+5cW
zlax+yOyX7&=r}P+?+x1|&z=vH*bMY4E^v7^n@l*#^PwQyK*u*hk9$H0`_dcY!Tz2{
zCPbRZer3BL>A_cX;<e-^-KpBliHri7o!x4Ci#!x6E($2M*v_xr#!w`6f<f`5Ad8Ef
zbILrss|-P9TQyGB1l@A3UVizsxLBejPt}x=s$#i?F<kB%b895U`>r%b=m-WTwXg;z
zm>m#X5W(ynDU?1>`7{ITEEAKd6Vs;f`Ic$39aDRH%x4RaXUEQHEpC+nHU-sbK^#|E
z)h0|z7G9omfPFek3VU%yk>r8geM(a&CFe3rsjOJ+ZFGZMA|c?W+SI1W97#bw4wq(}
znh=`Q(PDH#abkd$kB8mfnH#wcST@dhqk8iqQ~H88ZI>=AJUK~IFqt)CqwF&2O`c}W
zlQ?-RYElf^q;nlxo-XA{Jj^P_&eDEngLv@NW4nA~g7P=%GzY{izL;%dmKt#5*iD9w
z4Guj=UATG+xPRU-|Gjw4Y#*6Dk)3a<ukAMGO_NwQt0%^pXG-LLf4e@-v-duy>|GnS
zAp5!D{+Pqknte>0eCA*5zIJNC?Y?WyC68S>mx!h&236mWnyWocI969MVE%jC&XbHj
zM>l!S&gR|pV6wylr424Gd=8yDxqIPs&CVr<!!<;OGL?QG^O4}2wT#DdhUR3>4F?5+
za<<L#Jo%(CX~WA|w^`Mg4|hna+s-R_Y__Q8cjYR!M|moi_j;_Pt`r+Ic3LhmIdv$B
zd$YPzQe3t4D;cFD9(ipYFE2{y-9K9SaEXA2p|qpdtOZeiGovT^=zF|u%IGprHf>><
zmZ4nswMf26>1Er68I8x9npfvtxp46Kg}XVr4X@wq?YgturrI}b@^1F#yBXJ>x3tXc
zbZ`=mZ+siT{PPS$h|q*ts*O+DXRJ*+@V;XXL+-uTr@7v6J)dK=KzhRjDaG4w`t>!u
zOcuI^2Iy{d5zt9Y{GrjR*=8*8`Q7w64injH;!b%iR#>Q{;h}JX_1>c<!MjX<52soO
zx9pwguIzatOHg+4j^@ODPZAZcd%YLuWmk}Yy{$*llcV@()Jcy($xODZE;Aom@%}N{
zw?v1na*o@C<2NUW2R&w%aLZqit*B7CWA@t{le|2S&aDv2&~26pWA#+^Yz!5V3fOch
z+x*1VD3zzKD{ho0$Zbhv2;ydRZEE35w!T!dpmL4Hqju*S5vv#pS<mlh7*0$+W>l2Y
z#-Jj?*RsZP16QMD=5i%JAy2NAN=B{|J-9kJ<$Sb^TpN`3^|7irxw*D5x!jslXR_$v
zDuvI-bX+@CEEniJQ~Ja>fv-*L@NVfP8SFbcY)(l3*%f+N;27IZ<-=MZ7S%{=InQ0N
zR4Qu{>-*<<*?%ux&fRrxU9`jX5QgWr<trtcPsmpNdp}{(XaAly9z%{FS}R27FcdhS
z6A*J!TIHIsL1m(%m;sZ4&_1z=rY;P37!A}H?^QT5M~G*_3&~^=!G;B$)={QsrKLG6
z8*ZH8ytji-)%INw+vU&$JwCz-S{&Sro;-?c&t@xeTmAWX`-ffHC)2MC^88b6WnatB
zSfrbwn-r?$@O@orn}pW_n<oM4`Zi}c1U+;@mDY$T9k7u!Jo-hq<yg(->FskT>9p;9
zU-*IJm_}!IR#(ZLZ(lF%%E;E0QkXGmX4Zm5QduDzS(PQ1Nu6@D%rv^?vh8JekElSz
zyJw1CRvUIqDf5dC_n3NLE$Q3C7f;jXg*Bbo<{Q+}E#|Snbis_fFO#Q4?fbal?y`P)
zkvZQEGbO7pT-*{8`C{_c31UvglUnE1>mECOduGwEZ?pQ0#krkB`Vvk=Eu9ge-JPz=
zy~{_gD8b6ncFV*|9SM!BH(6ynGRkA`?D9O-WwpR=7OTU?3yT)$Ox8>~*m2BbfmTVR
z+9a>?a}91x6GK=VHZKn<nY{mm2w!T{%PxZ}_fBqnur)#5+b>o1f4v6h#HFkONlk7k
zJ*}6dW@j9e+1+XWdzH;x6OT<?r3$SlX1K2CIIoiP`jBIQP2{!BbCxppL@FIvGRK5j
zy~_N_=M2qB4ilB0FLkykP?+^Rfd6q%!x6!WjuHx83p6@52C^zmkT~M15~_4ac+HU~
zVtyZPRa`!^R)p<>rnl%u{T;bS4U7eIwX`^nhGdB(-IXh!#m<w=_wnGAX2A&x@d45o
zCPcEQ2+wUd@w>UR_ac8d+xN(sGn#!an_D=aWiI%rapB1%b`!O2nZmoXC*P3V&n~$w
zKPFmG>#SngjkB|3m!`@yPLh@lQS~&d_Gj`p-toe6c~asWMw@Gmvt_f?;=XxZ6XW%2
zI3M7(=6i|8p{j%_*KV@jofK=lN8?<MUYca4$l7d{gB;ZhC(QQEY8IB@I5mTL0>d$r
z4~a%;e(F-UW_uSbd}}l_{@&St$?FogiROO3bwc>*ioHCOoL1z&O4;e*r<Zxsde!lD
zVZN{KN#AZfWbk9}W*Pfsi`^}DCGcIh{<8eHeDRO3$zK-tpRqsK^WXhr^7Mlt*Z(~{
z{^5SQl-Gvcb7HRkpRaYVB;EY@WuwEVI6viUKKEa#aIcC-zM;)ABJN11#@AI5={Y8K
zVp40aZZ6VY_~ZGZFLpw~kNMbE+}*Wunz`9-0~zyM(z|`HHFLVON$o7#Q{2-%>$u#@
zWizzrz7~o*$M9lq#N_|KFMjJ5`r&haQ+iR2uJ8Z7pKm=2oxf_2?eWC<x;*{5Q<YEs
z-GA?c-8Stn>wDIhvYi&-UC=f`<Z$r&cRiMA{s%TcKX>o>hdO!hm!ED=$#!v=Z4t<J
zY|n}Bw}qr6GPNJ~AK&mHZ&%H_*Im1#nAYTN`?R<@aa)+#<+sY4az3i?ACBr=aO_nG
z+w3y!*9~$rmCt>1sB-JO*?s)zi?p>8JC`U}GDV-!tC}XZ_0n=4)ujp-s?1-NzVfK{
zzwz~w*6zED(_e7zXI->C`arI@#kBry$0oDPu`gVklkp*Ys$$617qQy5;TjKgYWw<%
zAD6K!aj(f(mDReSrG-(&X8wi_C;5jx-7Gy~uB;*=fdZkS6VuNroZ*>tl6hI}<V)?R
zt?W}@3RQo~y~yz8XsBsK$*a(i{=6?;OCsDnCUGV{R+{3_;^!*uvuyLqH`Q~#<u&m9
zt~A+^JEuxz>coi!m67Qa%wu>h-krN(+Q9p)?z7s5#*U-zXE!h0v#LnNrr`FXR{5-{
zJ#&30DBe8i*S5;_?pa>3OSd@^*zcU=m@v^}gUGBaW)d7Ltt{UBttj)ma9xEX@tJ;T
zx>@^{!;WjqSFYLJmM}Tz!11<4?+TKfRURrD&PvgXI40(<xufx+a|*Aawe^Kt>vHt&
zw0%z~o~QdGsBEH&gqM<x%F|060pDiK_;FTow{Vr_fwxY5N(;N+%!<7sJVVj;#E%Q_
zSF4yg><jAVb@4tp(R#t7rPmzx#Om-ocvfE8+{##SAjT!t=(^cKS24{=Jhe3kPTrC;
zpTGH9rOJg2fwH9&-$@313chw|r(XJW9+8*?C667BQXMQkP2UV7HMaEJ@oo6LM|SV#
zZL)PC5lbXaGzq%M9*CFly78m_@4FoqVUMNxA3XW^m#_8cCho`Q4s}bl^2&Xby0JrY
z@eIYuYdjV-G`bZ(p4_JNr_=fTi^Ajkf7F?_-+egWFLLokpVNomERb)X_sbyRh_Xq@
zB(`-+iYEM@`S{=br@!`ny;Q_9i(`e(u~qdoS|4*>ZhKL?f6l39j?+>4pXRDFCr$c2
zYuDpNsprF2shRGZ{&{`yxtH6mWOo05;ap%U9wK$eGVs9tcnOi4+;{J06!rW&xA%MP
z%oOR5<${(G{#&b`{#=rzc=l$X{zIqGY<9tzVC65D^)@T$UR?W0H*ndUd40W4t*`xB
zexrPH#;^I_b6c4NRa{%t`c5o3WMBT#@V~kH)34U;Hhha;toX3uaru?P_E*2`^kk|c
zn=+FuT9_Xm7ue_*X=I_KEWobKe=XR{+TM4Hh}~v4cD}tw7qhxr-CDz@HtWp|orH~T
zVjJAj#3l3dCqJm%@0EL~>64C*V8C~?Bce@bDtBfko!Qhaxol(KN)PkM$wJk6L05xg
zw{CM*n06ve$9GNt>)9Qe|6CUtgmkQ0v2kM0KhsI!v%-8QM0wpjx~QYW;&hJIR+ERV
zn$fIDoD#?Q*3ODf%8EL)H0W;3jO5CN%{|T@p<KOM8XXG`6dhQh+?$-2V77GAVWBXk
z1=?GuNG_9@VH|9D#`ARK)a}`Yky}?-EwfPAq|l|*ndzZyTH3;PA&_aQ>!mOq7eSxS
zhz;Vi)jST%u3522izh&k$7^y{#H}!%@}(hSJePJYRi9`&g)4eVt3Zch$L5w*hjsNf
z3!K`t<m!~riAf66KW=iKeCEayi=~t6W(Aj5mR!4i#lr9#w^DV7GKVBzv$S{MhMT4K
zo66dFr!YU9-#v?!J!f|LO=lPPw=Qcc1?JooV-aNZWDRh2t}EWeW+cCU`rgyi{+e+b
zMbD5G7YR*i`0}Ri@}u(YW`DofNn2)db6%+_4ANQ?B>C`T$1$!qVuu-O4yyXPg(a9o
zOjsQGN9Ev*6AR5!jJbmC{dMlduD@pe>h99AgS%tXZd}<Ga`R;Al#*Rbr<7z~n{#kk
zRBXWIuB_=%rwcaC2sSG;T@{?|D0tXyQ%K^fn@f(F=GLYC*!^}_l$dq%^9t{^N*C`e
zU6|_o?UTK#4aZaw+cg2V)``dn++&}-iv961*UjQHw@WHs;*hOdB-<I<lc@6c<;LpS
z>|t>q%Vtj9EqH0=+9}6%cc&V>{G0Fp)<1sL=9R4iYrZgk=?{FA-k!NH&_qMlmCwo7
z;BCoNwT}!D8y;sYpU@^dxg|)!K<>khRR=<KA0D^j53fA5xy-?m`Eu5^u8krSg`Wsr
z5OOJXTi7MFL-WC%#wiPoN)H#jd+N7E)$_tsE8*3v4tvyjS-RYB_|ofAabgmShmdRI
zexVuD9D7WP(ks%PdD45{+<U6zoN}qOV{yc$**xZn(uq4S99o(nzE|LL@gj#iNp{a$
z`JAGd^8Vge*w8Py@J{8-H8L9nHve49xT5aD2|*U2n+lw1x)*o%bcr4<Y!T$LzL7Zf
z?#0QT!pj;DPAETlU1iTV>3=rAzAwmH<g!9mz=@apoIi*0>eUs=0_S*63dR~RNIP6P
z^pauvq`(p_r(^}khWhTrHLfB~u1ymsluB{#JlieieBljOl82r0hb_W8KRC!qXr;V=
z-)=vN(SYYna2s2nNWk4D$A?xHYS#=}x+Ywn!rW}DZYIf@V}4=7vK%H?PElnE7w45T
z*PgPoVpsArT%f6vcXWbCL%od0q7ynQ*J3#zL<M9fHAeM#Wb&pq9aS=Dn~}*ZV8}Uh
z)xpSFJB^&A6iud>e&Ust+UWb)m|3&uh{i-WB@@TMTbGierlut3tl4%n;?ilS!=6Qf
z)jvJTXYrUcYI8=I>^{>t$;0Aw(qg4kMqwgbgbwF+-sSgRV_-f>z#{SHYpE;G6uOhQ
z7Co+g?WQ?t*4g9|W1$z>VoQ09d035Bw;67Grdhhi#4DD&<AT&8PF9Iv2B|)~WpaEI
zZ`GOm2CqIFQ^7MUa7MQHuH8?9?@B(c?rhxpi#MEYY5AYO4MFSpFQt9Xo-<+X50yuy
zwduBAn?7BfvOI3{>}zMYtn`yJj?npa^0STo+!a;Q-z~+@EHB>hWZOSs8*k(3Ld`AF
z0^bS^p6=A>*PbTIb1mC#e|xS{S@|J}__{dRoQEs|p^oPswg|94V*X_-@>{3)k_zwa
z+*uYrl{HuX^zGaI^59mp2{r0BCf!=WwEE1~=S@HT-Zpj5RPbRrpV`2~eTe1Z{S4^?
zo4z#NmS`6G?CtPK%OgQAfSs>;<D4yzC%!XO5dFA}cbRqcGp3IhqCdoQZO!^Koq40Q
z$0ZM0!7sNHRF8*;pNN=M>lYlJKI6)(<$-$~k3G*#TA;f7joW2IJ`O#ze}6Tnt9OMi
zFIFkq$aOk+ftGuC&H>?dCLbdFbTVFSILYtPsJtr4j5ET!MMp?Wc9(3=OT&i@U#I^o
zUbvfi;e*Lr87h=*w<i|dEb&b2z2|t#iGPWxn#_@X+zOtHj~i~&w@wvub7x+>C}LVc
z`Q@YPwpHI98WR~-rhQfTI-PgL&BALHTg(<kTD*I;es1fHgCcj#7CCyZ)e#b5U+&Lr
z+{tXTZ)V~oHrDs8w}Lk`ou9HZOr_j5!jU!cL+-H)D>`-De#N<E-0e`;ee}+zy5!DB
zbq<53Tfa^ioXpS>dAITVYpKtbi)+$-UUE-pyYSEIO}}7Tw&lcIsu%uiGW_7x<5QMh
z&akB^z&ZHnl&jOjnl{AFab?~;&w1W8+bvslD+=BfcU5?Fl-PVT3@npQ&$UiHlyJaE
zu`^RP#`){5_e`_xTIR7A_Hlc^C@IgHT@c9HwUg0CW!Em2c8`U-cX!sjRkm`nIG$5J
zD_4x`!mQ~`ISa++cIIk+4sI}RblSb!#^;$b>w$xeLJ>(KR$Q?$C$4VZGm%S0BZ*_$
z5`}|mnlHpTom;rxt+CVFomMO!*xV$}>0bBlk<=CTm#qu;rU`D=WM@fL4rEt2KWmxP
z^<0a6-(nteY+-yqW8uBbnawQR?3;PsuTY)W@%r}kip(30317r!H?fEvJ7y--(s%6D
z9P4#kuUO1`6VKAiTev5AF~`-)P38yZ_cE9r%3z%#Q?Z-jkY@{{n$7eFUv!qJ-DqDI
zZu+L<gZwh*d%BO<UW$FNWNv=(cuh;#!_#du%Vib>o|4-k@j1!+OKGBz<P5$4y5Hvu
zS*r1e7vC;e!IR6|{e1d^bUo%B4_c$A)CPWzP3Thkb)xK;$L$W2cY<ufmu__It};n8
zH)Im<XjfXS_0;*Q(1S@&mnwL&oH@_tnz<y>dZHf3VLl^kruQ%BOiyp;yHj~uz%%E-
z+(|0Jm-l}0yph`4QBuM%%^*wf!I_yW+c+y%_^c?ud?_pahJjj-e$mb!5^oR3u^C<A
z&TKH_S{+?KZ^2KVwiAnY34SV>q8I12qg8G40>yZ(d?Q84y=^hG`zLR{_-doBb#Oyo
z+>$+O@8^gLXvs{9(OPj#p~p4EHI(I9WD=Wz-W`S*g-2>Kn+4^T^SN>O>zBHw9N4UO
z$?(SZsdKI}ZPrUL<TCIsHBFNhnIY`rlHkU3a8U<q>*5Ik3}-jwxGC289Y5v!V>wT3
zq0<L1rJn`r&T;HY4_EuFD$bhk_tC=CcKhjDOCmfr+1`EK62V@jbzw<MlFnt0u#I7C
zGgx-ZT@kwz;B{w`u<V{iF%RY#3h!;2dfcbsm|QpCdO_#A3ol=jd)Rb{JzLBoak9pt
zLsA}zeZ>jvS?p@A`o57$C%9NXI(+fnm@sQYyu5oW<43b2Tn4WTRd;+oJz1<x_S-{8
zWk-P(Tg9&&%zUH~r=j$D>q|%J^cC0Ul&#xjZhlW@NzB51@d6KasdUYFFEPhFQrK~k
zhvcH7rQbZH%0y<F-?*^e-}7L*yU1h-=f3mGVjQi3lek&c=Nz51gjqtzMSF$s&b{+I
zcV17~=pvf5CNiqSCD`-g>cwl4rYbq?E0wD{7S_MMm*Hck(8R_@W+AOO0qzJl(+h6X
zrd71vzGTq3<NGg>kd<{TT;Htr=(2P%?2VR{i3kgG*|zs>t7!Pt39AlB7^#>X_u0>w
zed5HsxjaXWiaNJRZ8s}4Hwp|Cop9c4UNLXYkqxgqId^$lMbs_-<oCXGt%9@yyPD^A
zrKVc}U+<?}d);`4lR?c=Vb-LlG94cTyc(R8j|*saOcYYm;TOt#w1LN4&{bq!<)n0B
zuO$I4tgPPZ3U^)Ra)^BHTO;zgzi7^q2}XNv28AD+8*<z1=AmcW!O1zXz1z0EHsxzH
zI9S3b;(JPY>FIz2ou!K&U35H~9TnNOB3L}^S@de<Ju^6+n6h$BO*hWiJtMsK^tPo&
zkuzhJXPxCN39d{vWfbiRiZPIOm2{gJYa_03x;TGUJhw3KOyd(WKC92V&nh|<{rXa5
zMZzbg$ptRA^3$fWOm1Eq+-iJh_4)~`XY9N&VbQ8t=8H09|CB4`x!9jL<vewf!k!uN
z#r{jg_d4HrfBNQ)b8WYSwy)QEVNiAFddkT^$4b6NTBP?fUt^iGJXlR>qvMx~$Ca#2
zZEswhuX&5uA93JS%UZrs=5y|bhdK$O9!XAr;{Vp?zx^-&V^{sX+Uwa)A&L_^*(!Ks
zBpmwOm<$<|H1rlcNqVc6;I+AN(rd$g2J3o{Yl_~LN#9b}{B!HGPx5CZyF50%SB}_q
zCY@Pojo1eJKgECA7hgOc9A;dwzG&a2J#P$u+E@Iax^?IM+LD=%^R|8uSv=)^+NM{A
zM)uC%<98`{NG?8hnd401p2EDZ0ver@nrsT!xExy{zSgdAy12xwDU&$wo%qf4ZKb-E
zk;kb69XtWY)eG*VeRuu*LI3QP^7_y9;>`{18u{1rqEmQXuUcHWdXK$iy^#BC!O)1n
zV*BtTX*Lg@g!#PHO+V%Kbh%vZw~G~PS1Df1GZS&k{9LWrRefQVc;e@^wW3>HKlW~_
zWM&8xl0L)8Fh}Ep@S?*Sj{`(6oa??lBgJ{DSl)~{L!&to`CEOz%-%D3_N?|f98+#f
zZEO#T6`ox@W6DG0C66^yPKr(qOgym0dq$FlbFGfS6?QQN?<zL7j65BQlMgTUE&RH2
z?^fMLU#*|k0kf+ns;*;?Io#y<OnAxRDGv{Zz3rIP#`g1qo5&lD2d)|do9C9ynsxEW
z6gCOjCG9tQfA}{pTpBUs(yA7ZNpGTAEt!{@WeM~={+RenRN7?i{Y;IfX&m=cbiXja
z$z1zu?vV$nU90Dr$h`aW-lAJSSwiOCPNA6AxjX@h{u7srt0aD}$$8HcG2uhJi-14Z
zH>XYSR(t2#ao;|Evxj^0<=Xj5J7u}_C!H%VzvndJq_fD&(wE}08qU#g84fY#uWDG*
z6l?QOCduVPwfe!v77cNQqswhGzD!$n?2(~@4#VtSOB}*Jb{^NcvF5~#qR5Vd$!eLd
zCmg@L=M`Oh=G&b+5{<EO-Uf^(kL<haa5ha+dhg_^cfJO3S@=ih-ZGz)KaJtZn&@&V
zf!qt{zEAkD>Bj`_ow?jfGF?Iud&MoiE(aWC7h1;3ym5}0nLtmnl%Cf65SLdfJ%Sgy
z!yRw0E7whIJMG^ScJoz2vrS>mqmCV?7WS~ul75sB>+B-s<k8Nu<ivs*mz)-hy;Aau
zc0S`5WN^#T&ZyeQDqzYK@5jqlxrN+oUdC<mQ+<n_TIFd+p@N$!I-OG$HYx~l$h2;C
zzN~0@EXMlPeJyj3FWqw=FLsaWFnUwkGl!SY+sZtV{hh~7-m+Ecx#C%8=6)2q6w8vT
zkzNooy};v5yswUYxtK!7jojmPOTS*=$-B&9c~fzx>W+$uWll@xC~fX+UvBYAee)r1
z+12ZmpUTPIe6dqt^Fq-pI=fVy=Lv;(KDYg?cDcxt*T;cj^X8W`9|t?c9GT!Gz!ABs
zvo)>Fi^VIfP45xgypV^vos#i$_uV`ym9ce$kkgE2$=jltcRl?DLtdFx^6{FiZ~C%!
zX400Yucn{vNRw!Ku<g&m?|YADzWCPlUZW;CcH!#6`n?}zjxm1qX>(gLt8uNPulN(i
z*&4Tto@GtGx5~qH%G4d3e7O6696KzxU=f#Bm}=I6hH&vWXG8kAuKW@Zcsf`8XZ5SB
zf6piWHF*#}JGQfJu}J2mM(Jad9BwGh%@MhCt>oI>z_WjEZMk`nF;sJl=Cs?=HpeX)
zBaGONlsQ~{v;L*Qjv1-WS2`XYJ*Co6GBa_*g2EDkcgHR)&dJQoT`aWLvb^udFPYvx
zm&yBNo~u01*ytE0YL@36snMi8VX4p3ZA+7sT~-Gg8*4gsC@$+*%p&mH%-MO`wWNeJ
zjTrAXW7R2BCoC<?(mND#L|dujaS~h8;cR116UGJ+MwV#{4z_MBE3*EhzT(47rHnUo
zT&GX+Tyj}UNO<3j0HbXia}BOctVpextZ2q_Raio)uqVM<R6x;<bNZ&kLXMN%c$_NQ
z5BGEj`>Xpzwd?LU@wHswgY1>|iY?DC%oR!yFi6+jxa8fssg;V8gavpPTO5h>3cY8Y
zZ4tPv?rxfa%k%{e3z{bi3f?%`(xtj`XYR4y@0vba4(nRvORYTPyzh{d-RT`4jo(zx
zIma;f&MQuXi<j^3yuan+_ZhO=RzCJRvt`nzLmy}M_RYHOvuwh<>&Ba(EqPTn>u2PR
zs(GQ`thoF(?4ADN>zb>+sS&AXTHZNjDn@Et70TpER2KO?TlMC()Qpr<p~Am7!t!%O
zB0Tq+omF&`-dnlvyJ~#Z^wtv^+6Da1BIS#kPj*c;R}N%8bx4#cllj1p;ByX&n^gjo
zjyAQ-&zQip$ss_UM@5^psp-H$rVW$0TteDZ6wflr+|W^x6xdVZs>P%x7`j48L5NGG
zBhpc|?XTqQ>?@mMc4kFs7){gm3DDWfz4VZBhs+wDCwrrW4u+=k&aKsYDtMD6YlDi2
z3-d-*7VAAvq$JNTlQo#U^wy3&JDXZ;?}Qzfz1-v$;_*UgF^7%lfzKWmOtTZ%%wJnZ
zF?;#4@NRTD_tBj9xv=N8gH0|<O-354Hbg#kK0c|r_xVfd(3owvb{!C%HmQOoV3Km<
z{s0d-p(Jttvi9(viDioF%SB>15?SxG*Yk*!Kb_vERKEStiQ+xV%WJmkW|*!LkML2@
z&^fk`yXe~F96d)bRY!;1Y%irtCNDEm7lwzOnaeptW04`t1eWsCjl0!2@>lmv^LEwQ
z+N!p;uwyY-nAjDuQ<si}YKdmubd8Y~@bQW^R_)l)>Qepf&1=@k)V0U;(n6Ll2|Fcv
z(7f1j?aO5u?lZljHC7xw$a3pRFxOYh+-obRoOWk?Kgst--na9Prz69J5*!Zwuwnfk
z@am_|A?ud6Q+j5v3$lFw`K}1(gWLNrK4dDGB)d{!L(AF*l@7hD-GL(36-?_?%9(63
z#VeV+7%uH<7roETouPi?dg89I!z~N+#T%^7n&{ohVE3P(B=O_)n`N#OCa5?Gh6zNl
zB(3OVX;`&FW5t?|Ni533LLwf|G_pT-A6@XkQzcWWRe92tkH#qvr)`nj<(yVvs%E6q
zuwX;u)3<jxCcG=P+_2`tB7>d{vl3*a1xzPg*KMv{KJVVN&6CAesAyb#`)v9A_IY`;
zrPK2xk3HMA>_x$*Wj0E3-Rrp){n%-2p7g+FcT3F#{<03X6_OLa`|7D)IuWd)%%a4-
z!;gD;x#v~8<Y+q{OX;6mCcH3Pu5CCmL0)r-iPI8Sr*F$+n*{>SJbjhttgG&NSCQRw
z?peQp$(BA$3CS$RM;>pu!}8*S@wAc&MNdBjZC-!4O~-HMlP6zJ=Lm%97m3b`KhCx0
zl?9{H(d}t3Ki}cw&FGnHBAn(i|L~6);x`WlT={1?|5j#=XLr@fDaqL@Up`h27W`!>
z^ykVUsl3xEKl0i4UB0?-?b`I?Z+_+O(+rxLd6Ma9Xu`%@ssHjy=j^$2Fa7)$v1Oty
zJQnXar}c-eT5v#+nRi0qiiI4?9Gq+nzgFCM_}b3@X@a%<i3I-lKkdz5J^FL!-R&=5
z?)QJs`4$%TX`kG`_{!faYC>~Yu^VhP329+nX4#+QZp5;vN@veAo)*5Hic4A>zXV<o
zTKry7Id4_I!JPNcDtCX&o2nV?`$*iQZN-7zbsJ79s!SB#a;xe<iN81V=8bN@_H)0;
z_%?rOXA9e-oi--F{Mj!n<bL_YuDbSs<1QP68bRNH6izkmPmfxfB9!JOu{<p{cJE^R
z7U;?P^rgU!cRUJ{G*uK!H=p_aRw<$2{pbGFgYFUGf+x4`Uc~;);b5>EW7p}~Q%^{I
zd3bbTul+&c{*y;|f82H2uw=vHJFIh>9DA+OJoTlb%1Wz~lg#5xv-xxryxH>Zs?Vz`
z%3FTEN8-Y!bj3XNH!J-trsi_(IkBjq#jkk_>&@(Zw+j;@Ux{rzux#DBg#l?@DHq?H
z_)d6fz2vDSd$Qusl}c}#8k||)&i7rzyQoWB>7;<e#6%IZEh0^;nhqu!GH7utb&Dx<
zaVt%#dtc@B=3di@_8Su_3>Fw0PT^17P&zTz^`Nqf@9Q})Y;#N3iJKhQts-QyYr!wE
zQiUt4CR@GKayaJM;j~PJ>%@YdAWdtNAejq_Yj$e~G-@-tD!4MIv$#37S1xJ4sd7!)
zl6hbGIbnrNOP7hxWu6xfe2rju>!CAg*#zETvjF3~f;JO1UgOD(Ja<{eR_ljr_bzJ{
zO}Or-+?l(vcfr=CYY|h~k3Eq49%-0xs&1#K>wTTek*-1ua~YL&Bm&)B*cK>t%*d0r
zs_?BjC-hy}L-t6J0jKB$ArG0kXD+2oFwSb0VDsFh!f;{2jhsV|;!YiY^Y2g8Zm+!g
zCzko;y;^tu!k#kgf=6DP7V4L$h9^6fUtRd?Z;g+43}fm0CPTrAze8U!r3o$Znq$)$
zm0<dUM?>Q^XRY<$^ZEU&7>|8*oN(j6i~OrILIz<hoSr9{dYz?T#x#4ae#bXU#MvtJ
zq@jh6q^$U+@?0aY{NmcqOY=fLa6VbAKGXK#9oggq2Nmww)Xtx&Bb^jzXTokKA9VOn
z+$sOyO~=o<ygFfcR{i|Wwo9i}TMehYS~gj7-<7+!l9-eX6F22dShwZo#A^y-nTrJ6
zbS6sJu8<E^$cjzjIw_*HX%iP4Ps^GKX75|Pm9{_mQl9eZtx%Xmz}uyt1$<SS64ED5
zKDsw>vQb3f4EFZAs1-V*f8NzjUSD^|;&#W45Vr169vvQaHLnaG1xD8y84NnCcit2+
zUNTxXkxl7Oz>&_>NRvO>D%1QoS)FPO_^X}2Ey3$|SXlLbo~6g$zCJqt*7v#ZK5!m8
zCAVAgkXF;Nt*$CtU)`QMef2T}{ocrslQSjF6*A|@Y__nKT-ssEUoF1;>yK@WUj>dS
z-Qrg9ysndLa(}`1;vK7!1R7NgM1I80ui(Ag-1MtS_w)(ZO$HJn4W$MXL#AF{zhlKo
z!KQ;e3bHb-*_)FZD;iF$X<%t^(wM}TEHhQ@M@~@VA*~bK+cYnn;1WufIOt#%FXZE~
zA@cMb!H_F^EyN9Gg{p*Z67iVC(sa&BI9$Ud@+P~5N8i*v0uy{HEFJo1TzFDe;OyDk
zBb+R;_hWbKJdTv?bMldWXP<AqfAi#P`vos|T$Qso=Ue+Y<l=&73%`Wb*s^;Dx-R>&
zGR;y&g1>*EvZwWZmfSUMEIceMOnO$8$E7w1`{#eZ*Z-jY<H!Ehv+KXyeE<LR<jLDF
zr)^#9Dkju=ez|z2t_e%z3f=gX_R`t*uVP=<ZJjmMHf6O}TwNOTubc77`Nx*VIoEaG
zwf%o?`o=Ho{#w1?xw>La_4~QW&S#hn(+|}0_y6S!o>P!6oRD&P;vQT3b+5$*Pv6mM
zbrE;v|5b72^5;t{!q<B9`nbi<ja$u}uYcx%h}-jKl{!b}I^W;k|1u|d-ip8A)TQ|K
z=9yLUKljZ0AT6FT?Zwg7faj9ACm7AH$N9fsA}6O6b<Xt8>%Nt*xD%QgliD6w2{h?F
z@c;KhoI~aPM!ri+&(y~Uy*QU(|8I}YMUJGs3L?LhBpTh-IxM#ED$R*XlAM+#vn4yX
z=+wK@>kA(pPE%jKiMK<YN%p|^V0NiL`He3+gjc?fe6~v>ym`;}->-`fs|pl_>a)Mu
ze1`Xfp)$)7P6>}DnMUS=GuBlK3mZtA&3YJPxHa$Sse~gN^4zr#2Q65m&BvxJF}eT9
zEt$DHEOy^H+L_=vAt_Dvfr?Da(M1pVJ4zS6JeCu8EA2w#>D`fRMdmZop8aZ5F>rdt
zkuJNdE#tCL=7m{0+&e$sI_n#;qKKz$^Slj)Pv7qC{bZaZ?4c+lx?|d`+PljH8zVd4
z&suC@dAUivMtcuWNxnSionzWYsuI@wIu!1P|Ck^dmGfF~ZNYbzYX5e*BttgIt2+<W
z3MKTu@zm%(=$3i3;Yr8!G8flSPc@^4mHBPPuW$W{?x|{*PA{)iExn)q{pGQX`_%VM
zyK2p`#cz?oxxc&lyOh38un}!p9Tsc2-}91~j?>Pt(tuZ7g%_SV%e#O3x`$u<y3(%5
z^Dq1rZ@SI+8nMFa;(whZ|4yv->Q()8$spW%a#7Z)MK;Gj2mI;MJo2h^N@|&1q{ZDk
zYiCc@Eu0i|JH+?@8E?sHDh(fYPn9~SbKiu&>C&Uk=HFv|CO%5JE_ZY-*ZE`3m2F|1
zKh+zIi&M@s?o_a{;Fak#e!ix7O&!12<-VBAH_ENd4=%E3`@1ca>CZ8aT-$zP;mh-K
zdgpR;^XH~X-&WjoZf)Meg_i#L%yCMJd-{9kJ@`;v#M{BrVsVBuqdrN={n+1`Y~~YH
z9Ix<d7kABiCp1||<JhgDTG!p(F$+qq&6wogOP2qbul_W+P$qBdv9GsJZPuz*{cK;q
z{p#9P(z|62Buy4PvFTlti@YPpynA+Y{C2F{ljnTlMwH+a^TIpP$&+lXHJ0wMbF=G`
zo4iqc>dyV)`VpGlL5ZKgbDyhK4}JCadZ+0pfd@YXpXs?*F4MjkV>x5Gc0gEubm5%~
zhRt~$sy^At>pfcf_Uwyk$+syyrYu%xSzEayrAk7A&-Qp(<D2yB%Th1&$u73Dsjhh4
z>w50^{>S%}OYc-aDyULecZ%P7M!Q9)zQs2iVe7jt1wN`T_1u!~&)8?$_@d3_fBw3O
z5gx&3@?KR{h8ztye7mYqgui~ryXr=V!lS#Hn=C5J)>|{JQog?}BYkzXp8B50+fqf(
ztSCOUu%Pt&zBP^yFT1(wTK5TvzG<EGu07NBR$f`%RF@Jjj&Fa>FQ30V|IB~I+O@Uu
zFaOWAfAynuzo_-R>fP)IC+auGUD<8j-1uHg@tj6VDC2C2cAgmNpC#8K-%77?F=*fX
zLDE(;`prZ&9$wW1M)^3iAI9^Wp6^L%=w9?skj<=_rN!&;-s-DtWyiu88RS!PTyIVO
zVs`q*FHeqhUp!u1l$4Q8-1)_H=h3;x_WY2sXgL3Ip_96RNAtb*eP5Nh-%n+DsAL`Y
z#(4&(W}obw9?3%&44a=k-g)izT&s<fYL1@i`*JY9qCwesPAqGjJDbawik(wp7M-!I
zJahVsLsWZ>X0{?D-~20cgbJ3ZYcggEteEmK^T?HaZbzNqZC!UWq!zV#DpaN$RPVXE
z;l)nlhxuFA?OFXX__)KimEp#YNsAbr&s8pMQcV|}9QM8^rBFilW}d%o_5Gtqc^G3e
zimZ<=XP!K>yYmnezZRQN>XvWs7s%K3JwLbS>1`Xiy?fRbMm(MI?1cM@NyjU0JQulF
zVqhSC@bQ|%OiS4<J~STDtI~e|sb^lL<(kLq1P&#-Zs16`BOoc3aND%vxXJZIeV)R*
z8+K?NNk6>1sQu&biF%RD4`zyMO#foz`lfAH&c9P#_wN6*zLTMNPnUOJx^&qdvoGJ$
z^QvCj3e4(}ien3`V6t7EliO>ixXgUX<$y;oD=(cFIb^x>x$UeJ-46~|Gw*!=qc&Mk
zCD8MEz4og4(JNN6I=W6&I+`+Dp`_j=gC~<IF0gs|pMCSc?q60tY06Sff2n2v1D3O0
zn&o!yinK|_AsMONk(U>i$xNKIlW~SYg5&}h%UNY-3O-LfzN_=B;htsOQ<r_^F%*_{
zU9rINoA1<zL36*_neCW!bC$@|#^c|Ae4e;+$?BrtOtViuxwz`~3(>CAJD&9KRWjN0
z>e8>(5i56nD?PDcnq=g<k6X4$28*huWIpT2xV&NWx%)ZpdADb6b<@wgxnx#~jp%&^
ziK!Z9SMIJj<*O1}nkJpJmN|E|)Y-z_R$mwEZVd~}J;+z9;#!^j<?N%Ii<?gL{4z2T
z_t(CE-ubo!Gmp|_&dUa?GMJRgKi+D{x$!Wxbv3th+|-b3yC(KDw!eKd)#aG<nkv?d
zyPr&&8grA|z~*jlSJK*l?6;DA4sEmlSf6=QYhS`|-j%IkdCM>UV`G2toNf1S|1;+d
z>q@U4$!B3>xwf<W`}c=GY9)Ve7F=3VxZ>4w8HpZwt4Diy<*Rp9%CDO}M@DeP6j7CX
zMH4Ry)LaS8iu+c4+c;a+@}d5pmET1qepes;_Hv%Q_TohjJF4p#ruD^3F7*HMdDh+x
zn=khNVh_&~n6Iy@EyDKn`t!|^=VpIY)=ksay7F+_qb;&|qE?Jc-5<|UP-%?PcH7MV
z!cuS5#+ZNzNu9p1`CJyV5ecul*qUEIfBDyftFFxUGrPLi1efD|byhDYb^gqI^q6lh
z%aQiHdomw|&#||y?)f}1H~HM-i1|F#`$Ef7EEJC_O>roa`Ea*WCFg~u%(r<znj|_d
zC)M9S=IgJ-lYg7TBFjc$OS%VVmO|2<==Q=?W|xhfnduDk9U6W$KAU5)&{1Z22^afS
zxu*`F-d0qEvziu&s5ms+&3H6rvyj!p({1mRS6EJ+UUPrhx7Q&WRd>%9#;PPfjtlyF
z+<onZgWi*SKN~DweM^Z+N>uSr`}cl<oiR5!9DQ8=%j`S$yX5_&wlxnj`NG#(pV;eh
zlfCQ!E6bkqj{jm6*}8?yKUb^musm)lw0mFq8ukp$ZJHeybHw;R?D){2uyJ2Ci*@^g
z{+ho0W|eE_FMj*#R;~EI?cK%}(bSGbn>^gOzHvT0{3D}?efMo9wgSz^H_E2{u>4eQ
zeOcu|%#WwXjGiuhYndJ)Dv{XaXmyWSNNvWgoh$UhJXy_Tj^~N<UM_xBaau+pn$1Xj
z&YolU^p#~(-PCtH`!4(JMPH6%idLUNu6AyW%wdI6X75=IXHtsVa!oiUD(`7m`g?2n
z{?Pr~pE>p4nw$S};^PZtG0j}(tHY|7i+}xj<;UrY<@EwG_M5bA?`SOAJMjqf+7B_w
zcFrE5vl2DAPk63hB37`D*Jkcno)RHP6+xe)p~=zFxn-uWrW}9nw@1gOEZ=Q`+R3*k
zf_~3y<CGBOnZV-2aOt3c$m@4!#3UEZ&@wdhIlWpe$n~HW7t@K}jHx@fUS1$&CZ2QK
zwJH2sntSfb2_CC#O)hteWon9W*#(Id&SPKtId=K6i?aToK5o0Y$)l&mLM7wTWT~^O
zR^OifTT5WVon;bE9%Z+?Zb&@wxZZE!)%4y<q$uTv)clrpXMSwl5Mkl%y;+|x@>R-G
zNA9pGb*m<BZQftne_ZmIt>F2Exs^3sM@~1hcb2bQvGde~56^^(Bc4W_TCOxv@vqw9
zMMgba#Q7FV6zaA2C%ONqwTno-zEDxy`T&>CTlL^b1^$Q6YNy4|daPwMhw1sY6^>W5
zi$7@x6>Fpx{r7(Pul>M3^Qo4?h1Ubtge<6)>u_V6vGmm@xowa39_#qgDwNU1zvO=E
zTb+K6BP?tF=54dP_d$U<oiqGv+U4vyOyyBiYy|z2(mYG~xWZaE+cVUcoakgy<ZKhG
znsOt^>goR`AyEf~4ZL1yC(1KVO3pNK6)c)+;TEIvB4AdP+}X^REf4PO%S=?V>GimH
zug%f=ZQ{Yh0b-)3gcuKUH+^JnFfQ+8Ja~tRV_}|QVauc=4eE&vkJd!@wBM3zS-3dw
zQ}01%1A{KnKd&}QOJAB)lyduMtYDc)XGG@2>4$xLBu(AK>K7ZYs!}{85iG#X;cPj3
z=E@20Qzq~>L>gA~dfyabbZF;1B*8A;b<as+`_eY05OzN93EToI5nX4j1q$X~Gu|7Q
zZsE)0;Axz&X`=bUgV_pEj&l#U-I_9etL7XL7B{a6A8dO2&H2nNxBNZ7>ukote5;r>
zO+1c#A2O`c{MjCDNE0g+j?6tGcIwKUbHT^OZnyn%3}%eq^?m=rSG(pfznri0?qFP0
z-#g<j=CUKn#h3gTrdKnC1ZzYpzdM=7_+I;lh>M$=Q{%%|8*El2$+=AZU~hUqWCGXx
zpb1CprZTK#uHSch!b+vZe2iL-e)7||-o9~P-K2cS?DrlaryYEDYire7GuSYkbSq2t
z7Uqt%iWi>z=icVE^D3@MJym%2M)}d4qubBL9J?I(b2Vf0{07q-Rgde-RM?Lt3CMgn
z(vi?teCgkswh2G({<~m*##1zmnMGl_BR_wT!>w4WWbS5$WQT|rM_&;sL%z+Q&Kqo<
zd^`Q(`{#w83G-*|zvaQUO!<f8fA#h`5C8k+^)LH+|JMuaKN=>6wi*)01)QHh&XyJR
zE{rYw@Urr#CaWFSo78#P%Fk<O&6lkC*gI+eg#`?PA73~&S?@Y_fzO5WP5!sQ0Lw5v
zpIh&x>R#WA^q!GswlQVCW2=J6ugi&>Hi&2YyZ?U^y0|>OzkKnfE%$R5Ki|^K>{;1w
z;J#DfU(><-kN?bKdS^r)v75i|@4ZF0>jiG<&sc5#`K06F+jm}0Sd*eB{U@rO&rj#J
z)64(WLB|aHwIhmy%_Gh%OPR3kvFGh3K5yo0x9pEiZ8{#m_r#eWb;6fs+1~u6`~US<
zzN)LWQ$;Mf)DNvV=eSj1#iP!yQ0;rVS>`E8B41X`|Db&4O62W%r_<OfU*ES{ohkMB
zQb*$RnscjGJ^rB(ek;Q0l!K$x!E@VvKW={V<UD`P&elq1!AXl}Es^h%<J@wjNdJPn
zL2bnk_Rk4()9<Wb{US%Tbhnka@3Pv91#W8(u3YqP*$TtWpZWin2ygy+!?x+}9`z@-
zi%b+0Brk0ECpvR0&w_@v9%oMn+?zD9XRq`2`QbCYr3ClAC|v*h0muLDQ`UiR#1_sr
z+8I?}e=BD8+dGr&_U(V3{lW6_U;THN3xC{JyO{QTBD3o64OZ3%oCH)<W`B9<nP9L?
z-|)mn-~5V$%Ce0A9|iPSUN~~wF6Ot%M2kPNPqfc;FXgYi{@b~F@(<Zc#z!-G3bwLM
zezyGi%WOe;uRp1YZ_cuRIp1-MSMdmoR&m!~v9M=0#hj{!pT%m~Rj=~;{Vv_=|6<zn
z`(3+Fq&UdTDT<kKY5J_{?Q5$K^;qqEne_6y_u-H`=Mr*6OBNkgXku&C|9!Q|)Us&T
zi>nPAe?~t|Upw#G_Ir&xRlZ5oebsU*U0ANe%F4gQBc$nsPNbcc&;n@#t}cdZu9FeV
zmmO#=@b8~yaW?4|<Hg<wlkATRSg-%bH=ms~YWwqfdna9W4&+twTP~iSUXyE9up~#u
zqJCz){oPW&*XFkh?zkvPG7E(Kj(&9d_S2KCcTe74m1&;wcypSGobmcw4rhMOy?3$k
zG4shMmP($=>Csj-ivkp7gRklw<z{&G!bRxBYHzOc0PZM`Nsc`%22+AAx42Akyy;k>
z8WfQHR&~pcD$Tk4o`M`3l!N|d+)}(ITymgeq7G+?;wg{DJQj<GM|U`E5sFxHRQ0*v
zn;CD4kFC-!>GJkaQ|L1*G@LAY`oScfmT6r^Gt^oR3b`v3y;<+qeM{^99siS`R;~MD
zEu^FF_3gm2ebZmx<P@A2eec=z)QJpN+O9k0Ygf9@YV|kzt?KzX;d{y3L;pj!1vvzB
zy}IT4up!Io<NB*&U*&C79T=}~KQrC<`RAS0|Fcf*nrD0YL2+ZZwbzo%Dh9f56qOm7
zF3q$H-Ob0y@;j5kqlo=tp4*P2t}5I9y2Y_9{CVSyX_D}!(~qaB+uwHl`M7*5v;6MD
zrkBr`SW260eDeB>^P`KOB7{38lueUJII*j}diL&9HQYUA#&W+Hf6Dv09sTX!tR#58
z#m%W{<8x_l!ydQgd;D}?2y1g@cC}4@(6?>pC$^7O?guyA|C_h%mpofCTZ7w*Z-IA<
zUal$F?fyAO+-hRo>nLlz{qub;r>{6&c}!{2f*qyu=Pakpx|YiudNxu?+-R4|jEkET
z4}UYzoUp0wl+gPZUneX)6cP3KnvLMpmiedBKUmAhpZmOAJJ|M4>>s0_`kVLmskks)
zy7MRG`PCI)mc6@dt-EYn?xnpiuKk*B^Xs<u?y$V<L`&Dn-+qVttXlu-`3j{I6FE*f
zt<Cs#`bPcx=atO&BFtE)u6<#BHuYZB`u<zHtSwlN*@x+Ud1Aplzjw|7^Z(mfFEUG=
zm9syzyz%w_e8$s~AEo|Bdw+`jdFDx7j9q-9SFVh=%KU5pc(tUjmGk^JztJqV&Qg7K
zU-s=K;cD@6nid@PdR?;fKRfoP)orW)`7+(7=>wOBvs(P`wU76&Iq+|W+P`g6KOES`
zy{dRdUI?RS(+T;Em{a$kd#(Tb!QS8f!vFqh#=8!;PvXyWd-b$TGWxG$uaKQTw|MMR
zclqs~&X;e`UBq@mJ>&b?yc71fbyS)KxGa8ZC+O&0NIi61Z#~mTi}|;oZjBS({q|6d
z5=)}dHdlGa^jrDjVKXxtcpaC{U==Os@v{t?m~HXkLih5-*QVFjr++!azW)CAo$2ev
zBDP0M*56(p`2T|UgfN>Wq4U^SlWuKoI5_3%49*6h+23q^UB0RE{g3>=FRIb+wn|IA
zi2{#zsL7Xi2Nq3dF1VDg7^oG=+w|pF(zIy{r#Vf#aO3idSE5ZmO;;t_v$kKid99&X
za#1C#Z2s}XE#}uZxR$6d-2G;44{NdbAI{G7=y*fEn-}LdCN2GF6`~R8;k{FHTC-@V
zRo#sDtJdtVRf(IgWq!Yyd40|1&NuSP&FwM;JJqMgf34m8f6n(We@@r$JoH)W<KMNK
zZFOeHc5l8g>!9qCt|=<9(XX>UpD(U2+beinWoveb>)Iaq7x$Gj|EM|zdd+IP-P7~G
zV82V$yQA+tt{m@M=c>Qyx^utLuGxj*v#y_7cPQ0*^}FfeLf>?vny%lQJLAiA(WYDX
z4euL#EdKekC-nZoh@bn)u2(HPA6eBMp8xDt{$9?l@4H>EY!cm9ds&Q~YuD18b+2Q!
z_<4Fh+x=s`nmI*I&+Kxj`sa6v@j9>1Topd~?(~J5eN$gOj8m~@iC?rbQiA=0`TRWA
zWcA3nb?Z-^41GC`ceQ@a|C8r4=RKRh^>F=(7DXnb7ME9i2~jd<qpE(Ed_131_dYrB
z#c4B{zj5K(OJ~O0r*&zcS$zDx;rrhin$L5KZ^%TLiT-?%ocVW4_{xi-M>d}?dphIF
zw~|A<Te;2~C&h6cHd%c+dCiS?Z!G`b-fX%qacR52WC4|n)8r1Nngkr-d@}W`*A9`p
z_g+tK2rS>T=O4SW+8wSv>&5JaQeW@LGE!<XoPFUyXpCyfgd5K4%B)8so=jm;$ege-
z*Z$mswCY~Aba_W+`{WfT&cAy7siMn$IqNy2MH@Gi^c#M<d2HTuvvUV-E;rd)SEYHw
z^Of$G(@zxV+;h4eVxN3G&sn`TetO^Rqf1?z6XQaE-3^Q1KZUuK?NYM-+J$NN-_D$I
z&f#>T?8eFo;>v=qHd$V~;^d}jT|e}@-~&(Xil9!l`Rm=1z0Yl*y8F_({$rbWU60Jm
z-f}m;)%{3PXw6N7o;AsyN=i%@p0hA0cu#!I#333~)W~pL*IBc!_SVhPEu7NjPFo%%
z+B{DG_{M&#%Ad&=QmmyvR$F~6)(ExqIV|aGwdUEvyShCqy36VUrOwUHpIh!f$LnzD
z>|68X&V5Za=2v<0^f?!+X~RZkrZu9sD;p>Mk*{9o<dNF(s_dJz%L@B?n}UDO{)Wsx
zmDo2k@IP1CKZTA@d}dc%<2>YI^X>*UHdKkGw?EaLr!DZrJE+#yarYti7h$1lY74fo
zFmXwh&pO^H>C<F<?br1=rYv>o#>-z`T5q?iqvh`_r4L4tHjg*@Y84(0<F#dH%yp4s
z)D`r<ysqQU9MOhW)0QC30}1xRPd`m*mOlFZ<g4wsA|Lz>i<HgWt`~ZEwrJ^`b=539
z?H9|JE!w;#@SLsFG|ATc;t5}ae1-2GI@P}6irwmo*K)4RX0uzmMRCK|%`04X1#VM~
zX*qaBT4Q!aro^k5+jg&}`W)!K#MPFRrhWAKZ{}N%%I#<Vo_gid@+phjtimlMS4n(`
zKQ6zodd=t1{jFh_1uj3h`Tbsr`qs03bEHJ-HiW8G%bK3lTeV>0%vn;FIq|LUPHo>a
z;qixmraO)2b533I(DB0+v7;P`>8{%Y4<CB6@84~9xy@Hz7e}Z+lXI~Cr#dfe-)h&g
zy7Uj+Yuc*fm1L}}%L`_y`D;Ge`|>SEtmw&~8GBU>6FOa+oQ^a!xNX%tdGfrWZa~nB
z*WpLjX7_b=RICZ!a@;?1mf4$*8Xn=EHFg%)vX~D}vpe2(^Yh0@t_xZJydS*V|9CUE
zVS>4NLEp1?fhAvy1OKcG*kkj~{-CME<i&!s-+bN{%~f<HcSA{2=!M#=d}7BIOxN4k
zt;Km`@4wY15(kB(tAE_s!y&1nIOBBq7nVr1mhD~7Opc#@;>_lCY-6~(Uxhcr2m6(M
zY<fY#Y_m+WRVKP`J5aUzcz@*c-4a|~cfU^!zFwc|+*N5ffywvH%_J30HSrn!*O##-
z@CsHNT<9;`C{VKG!5rg8pU$c6LKBL!`wF_w#mWD#sy}DmbvEoo@|!Kk*ezHbj-G2;
zC;wSu|Bk$WC)?#Wr7W*0=WhJH?yA1=>u&b)GFOe}3EqC2)ml#cKF->2$Y&6?%%kzg
zt2u#l?{{7;__gA*&Ds0n2|F{*H!FOs-61VA|Mj7m`VOB{3=ImC1@~<`*DRKJaq)>S
zSA0FQ4NcM(h|IqC^Zn#wXUx-?ch9|EE%))GQ>O}Bq}#dwc5=TvS4I0yKJcovxwT`>
zV>TXl$*x7pjTQ$E8#$CtFDdRhz2%7i?}`Z<Z`eP3|Ha+=r~lo2OEy7<Y1jUBtqfmy
z-RH8#n*iqE&V6rVowP!lrH{Ry{>J}?$)}HjVg_e5Ww-3EuM;yb=bO=<xU}8>^|@^+
zHjTEA3pBJgq?M>o7C*1~eUs!mo^^BG%sn0+teh#q9eylx?t5v5zo%-w^6K+HK8Uc{
z%`bRI!NtXe$J*Tf`bzQXzpgEddeQ#z&K$d$b|+gr3vT_kICEsFb!qSvMwMXmzsc$8
zy|tZeuQx1{{W#I><J7b-j#UQv7dm~9g-Z&b2`M-lHYZj?al8B5MVn=P^e)Z{d!QqA
zeEqNA(?V<dKR$W+C-UO1x!3m2&HQ+G@?@=zmFC%TcjJ{jO&Vt=nMWLDONy`Qxc<je
zyF{UU?yKy12BoR|PZ}}`o_*PR<3Q>IwTEqIcwhZr@<3ftyD)v{<g*FPtM2a$kj^Y?
z*D0R8x?M)5<b2~{mHes3Q-j~$II8}GY1L!_n{x&X9%eBYJKS2WOjK`~)aDpfOk{br
zWmBIl?+Kw-n`A<a1!jq+*Q+UgDwPf0A1t4pIpg5tY~5nr@@ujRUu|ayY9;QOHUH>~
z`)4nnIUgRJzR7RzidTLA+U7pi;&nfKDZA|KksR6SvzF{z{rP{p*Vd}L=d+jPYR%am
zF|Wpz^NGfmlOAdR?o~}*?tA%b?tSaFhc{ntnsa-b{2Kl)eOBe0k_xLr%x>iP9QfJ!
zQDV)xzdVJ4^RjM6{?ctXb6Y+4bj8|Dn&!8wA`CW%Pn-K$YqB=Omm@k2Ml)wDV;2bu
zp6#Xbte5xvkBA#ma<Ai`ev*$mxU@EC?yVJx9E@yhg61l|><HVS;Ch8cDZsa8wd+04
ziqmbA>iFCvmPc>B_Mv-wWPHf1gAY$!w2Ssu{aNR=;E71br$w{ATuC^8|Jj^LoZo89
ztuntA%h@f`e!N=l>M5n^8!R6deSET1&wYZ><74*~u5GF;KAs-gY_`o~>+@bdHMit7
zcI*iTa#}l!&vxyzcImfEc(dF%?hM!O`kU@wN()jsd5?;zb=pWi?9lp`q%)}?LoLWk
zS;X09&UTBRdJ0o6f47}H>A|*s!)J4s_kXV_kl^1ey;s<n*EZ>NV&v&9My;3c&aeKr
zdfWB8PRsZ`xDS<V{cmdi@a~b%VFq<(OYR1|jQpjzcK?Rjj`P;y&Sp#YU7h}S-wCJn
zUsk5CQ0mBXh<xOi={&XH?DmZorcmocTf$QJJ!6^FJ^uk~v3F>!{niiDO)kWgau#Hy
zp4a-EwEau%(plB7n%~cms$cNn!V?a!S+~E`yZo=;67lJd-T#TNEseJMUgo;|McA`h
zbo-B-GmEt1{^zGjrRzVt@ZizpTTlH2`;N-EoM312Jg0x!d(juRXeqDtucf};UU=*B
zVFQK(7nx6;d2QeORcUpS=aq6BP19+SqU##2RCLc_p0a4?q(b?KvlG7GGFw=GY0XTn
z1&`uCM835(K3n(luj>`7LR*KX9tSgyOPo&@A8c&tF#EMFOhP;(a@A4yQ%660M5sNt
zbKXC@;pZEL=h^R@{$yVi4nEsjdDH%t?H9ua&cA-)^-V{sg(_uUB^2NL+$MY`)Wy(N
zwq1MIx>YN?&DXoVdv~hGIYz4Z#6qSwQ&OI>aZOz4xO%Ep_@sr44K3rPlYW&XytCJu
z<+JwGPW8Q;-4@Co?Py^US7kFjA5sx3TEz0@r2doFRg)*~ZeBOjF-v(#@`Rx2?saA&
z$_Bek)Spf0%(%t9bBBlH3@#p~OaGc@l-O9ScyBo4HDmRZJgKy@8SS(DY_!(Mtx#N?
z;`vqU%G#joaeup|ug(lUT()ca41b1Kr`a1lnEF=eXgXf-+q|H<@7ZRvH;HYxzMW@(
zm*?`{`@Q7(W0I@iT%Z4fU()dW9-E!BgV<O7^*b)v=4~D-^p|npo$Ys~^8Q%%L+<^D
zifKWA?r!J3=swqS&Mcmi%*_JQI@6wQk#De8IJ@@dnK*%i6Vld9HG8w+MB9Y#e^_Tp
zIh0%x_46%ke}BPz>a4#fI+D2K^cHY^bg)p$yn9MR|Ja`^YH9yHu4{?hOy1hsvt{!x
zwbbc#@78W(KC{2+)9txUN5UBe?j)#1ao-A<xxQ`F=4{_9TYHxoPFGkcD8Z&Y*Lh9r
zq@pqn!(En}Hpt8Fy#A|ZcGtGJ&Xmwor=$8N+4$C*Wf=Ia+qr&5jYi{U+vQplVt$)R
z<uflnEiF_W7qfYFrtXI+Y@UG!Ee{6Y5>9Wp_2}cpoF0C8Gil#o!^cd^wp6W{mC(^B
zUSyJI>m4=!^&b`)yOgBU%TLS`=ihfuQ#YlqZ)*7a-3hkOC)U>;e)UTHoccSLy4|a!
z=Qy**v2NNh>8e}UYUe2vHf+_J;C4jOqG!*tQXbB$t@plNJeYW8`*s<(tf#drHSSE}
z+<i9k%*uB=ns}`gF1=4WH{IJiMm~MH;rpI^tL`^-^)Iq{8}GgmT&Q5=P|~=}`nSr_
z8UI|juNBi|7VKcqeJEf&hv|#HzYAk@Y5#APOS9+AW-q;y5LRw?PQ3Zig&8jvt!|vP
zs8d;MN6ON*9_`#Q`o$j6YBj5WYN_4m;=ZbRA}#c!W9k$Yd+l=8{X(aWD{?*FeLwT}
z_^lhIvL=;DthV#2^x{jWPVSnsW4<S+YI4pjoqoBWUtc6}UE*onU?IT4y5!div0vKm
zLE?_DIa!|N*5)p2mn@Rq6|iZmmAjt`bA11&tG~YU7VNqw-I09Z9$QwqMcVa%Sut;3
zZsGViE&NWgPvab(dpbuQt0vYyDV%C;zgpq@#H;5*Or52)UulVo_P#PO{#&+*)st)0
z)A<oe`yK`}`y2MEFgv%c>6%~jYVXFCRzCVic6FJom?Gvb=wTt*=gZ1$HF;BXul(-b
zlR*#KHoI<GQn4(YS-p0~$<^$k-#^XM3wkf*qUP4HnRC7K)T6;On2M%c_v&6etxeim
z_venV18LHCGi0~#VB0BqwN+tjLxYOP)LY)cB0pT!uFZ?7WxKa%d1?3dwa;}-{ZnuH
zx?MY_Q?udN(rdow`DC{0$!-0R8|t{qTVcM3-Hf#!PvgC+CN1ul+8%%STu$<atZDPF
zDZZM%*icpS(4@a9+$-`t)(0Lk6nXnNP)L7*=+;?_IL+rK_bK1EmrUJX`RBEoh|I^k
zMMs*Kc4r2^w*PYE=)7}F9kvMVG4#x;GQF{VZF{w?f1{9W+UM>Ee|fL-%$O*WeEp~G
zdTt??b5mCx^uK*t!@OVl*yk$~d4)|&RxYTC%VNts@Zj5($43twzrVJ9)(79TDV--n
z_ul_uQn&trTfWSS?$;Gwobuayt0!Eoac_#P@sQxL>09*1YRMLsgAL)w!sp&t{lnN;
zCi2eKX@Wi3MGB1T98B2Xnf%-msktIu<MM*j0*_NNDq<B)tLNX@xG!<BLPPECjXzdS
z@#DRAQSHW;%3qp}542mG4>YaZwIj$f_PpKnB#RTrS1+D5xBL5+ufO<J&ANY{=-zVW
z;(NvGcjC5c{+YDnvbNQtBj%+}#+n7kFJ6<?(dyC4ei-qmBeHLQ>4IIYKNi2)*42J<
zMP2Woj7!#9b-i<*TmIXV^L%phoVy{{RSG_7WofNh>#)M~zjvf@+>ZBx>;~(uDtucS
zdRVKnGjvh+CmFRr-&ROPzf{stV(3Zrmv`8d8yD^DxATuf1DiT~;_9|;QRh=<xtO>$
z3d-Jzxz?@g`90UfD#_?7kE}|v8He<xQmG{~H=VS*d(LoK)3l}MzD582m$f8+!iI)j
z`qzz)-P$9@@$;eb3x+Q)w;eynpX5K+{d246-lSd!o5=sRb}Y$r+1GNI*RQqSW_9-W
zZ`rU@D|TgYU;lokIBH+iI`6L^vy#?F9cG-}7AW~!oBvdF`i6%S(>pf!{>;Ajvco81
zy^^u$$-qQofmt&4XU+y^=iFqk<2xK@aei&ep5<l+MV2~iXHRH)UwKb`{f###zy4Ww
z?c1_hi!Q#_@4qb<chY0JtLztzUt(EBS(~#ei%*(xYEM_^4w`Hmqb+!E&UWWYsqc&9
z#iXAmmB#QL-dlCn`PatpCucTEnapzEX_fY*!cR8B%%V9mAWVyOiq(0?Uu~hzseCT0
zo`#t1`}A3F#_i-Ce)l%d*=IGuBE9}{wDuJ<ZSK|2VgfG}t8L^jx?=Oied0H%onls@
z499g{RdsbZZzeJEN*I{LN3S?CTXOP-Yf@4QO-wTc1Pe7okK9i(Gz}Nb?-vR>{%zWk
z>PI$CQY|u@Y%dkHF8x!;e&oFM^v4?e%;tPKDPEvG*Slo(aR*MtgHN5p;#Iy>u?gru
zId;RwAmd?haN>NM@^_!FT<go3v8H1FTpy1!j5Z=We1noCk7i$wy6>&D$+e+kMts(D
zE}d^8FJ&J)-#j^YQi8)omk&n;zc3b0Gsw;McAQ+Mu)dY`_v5KTNeln+xIL9Py7INa
z#chQ@Ea$bS{WFt3yD8NyQKgsd!{b%?vTTRW&xsOx-h3`lbK8Ro4b#4_PoCUQ-7H<L
zrmia&_iN8f(+mx%Q)e{(m~DN1^P;okgaeQ5Tg5cze80S?z`)|Y>!;%_i{d5KYUi(H
zGqhX(^~cP<u$5e@=dxCJn^~A<y_{wE`g}_>@4;|^{+5c@AqrPC7dZJgrW#MaxnR?R
zSb-TaPdY2Tcy>6S%Q2jNe$SJnq#1#Nn^a26|Mi-#jtu{hc)DLWWkVys?vDFP6Pi=b
zFI0b4wO%{;NlsF3^P6qC)4p$vzxMpWS~;<ajMl9a>n3jLs5y2l<w~2)E4_J}ctU3{
zv1@v9vyj<w=^b62*;%e<z2+`Vns#pL)Afp5p8vdj_)5w1b2;n232ZVcO|ZNDaoq~t
zy)1kzL2QoGl>L+?E}L@gcZsc8^ZKV^P0nh)f=y+7Ns~nuF<2%QEZ|;h?81EJ<dtP>
z_q0db?Pbn5AQgUh^_hF$z9y<B@Vk^w_$~I<k!{)ANbiP~Znrgdghr%Zx$*ba)q<R9
z1)_c*)^aA+2FG>Ro_jkv_@DR8lGt45FWglsF-xU%x{he)wPbACdRimY>mFCE%c|`{
zQPs*@Tkn4iuGZ7}<;`+%?TQ#?zfRe-Bf(2nHuG%ScJ^PAtgH2Q$6!X5v!1SfDuE`F
zx6^V9jr_0PE)nrCeJV4j*Vbs6c;qCDO%FdC<b3~fm78t0U-i9+^0}8AzT6Woy}UZ5
z%I0cv{EIJdllkBI>`8w7JZka6?@`k>r_4{blCPh;>e#$P>O3|I`}&uhG>Dxmks!JL
z;nu>Kwt%^hWVHU>U80r{xMixe<2#{McA7WuqziZK+ULPpBDzIp^2$zoc4ea<8G`fL
z&-QDVZ};wVHZLl<b}L^0a&{!2u4(d`b!;XI$+dO8fgZPWuWV@cy!i6{7yZ4qJsVyW
zF7D*`P^D>V8S29QhO^+9@qrJ8Md6&=gPyN^<azF{_NrYa2|ly8`9(e75)#%bWn4RD
zg-HCm>hGs-YF(>%FKB)8g4g?Pf92gDzj^=FsQRB?-KD$x4P=#_e3h@8^s_4OG+l6a
z%k)Kwt$sKE>{+W?%M-#Ct`_*T_1R2UUG*1z&!#0$n7^s>a^<b*)2(=VPJQaoU3Mq_
z@tze{yHsz_bUnFf!L_ePH+|e(_$?skX3G-3xgmyy^QL~9tg?_JgI(ca;LVl2MmOKb
zN=+3ySl;rB`PBCnHOJYzE*}$%W=^Qo?A+q9a7XGatLLw5E(=<noy^6zEJ!^}H`2cD
zkT1_tWp`n{J7(|J%)K&iea)*L%fCg_*OgBGw0n<at(fk7uQj^!noCoqqJR8Zb1hwN
z+Ad$UyydI5MOnY%-(H#Z;^Nk?cFm#spDSkGxLST~lm47lVY^Rn__p?I<(hM?(|R4g
zot%|ybFxV_+_JxH5s%2Z=i1j+706pfa6i<ZweQo<E%EtT2O8_6y(^|FzU!;gjbgX=
z&i9X=+t{*J+PAIIYyPSYOWm7RoD56XG<CSjrtI#vXc<qNMH)l!rIQy;5@xMfcdhiz
zotr`H8w;CfJ)ECX@Zd<CLWJOpTQ9uJ6L=PTPo8mh!ZXGXJbRuxW-gf!I^)EvGa|R2
zE^$o~UfvP-YKzhGPv5i5c8Bn#U01#%*IOE}ZF6#y7TeZyt#5fnr}))yM4s8LdA^%_
z^X=PlCzc;Qu3u~`d(1`lPQstmA2~b$MsAi&%WN~HZ+M>UdVX>mhuOMaO3_j0CL|xV
zHs0oH^xy7n(z9aM3#qS<hH$=C500-jeYjpz!mD_z(VRZ-V**oVEa~JeHC+{-I7d@p
z$Aq*OSG@9b)xC`i-cNWc|MGgs?TQb|uimD}GHTbZ{dQLEe#Jg@lg1Sa%#B(Lx*WO|
z`A72<E^_U-$*IL)q_Ecc>XE=KjfELqKUbS|wocj*q_J#<#r*eH&fSSDH?vGOEe+&f
z>a=k7Q;}n$LXVR4M5eNA(`gloV!wJzxr6oUxg0SkB|)J(*BGLooM3dBt+LquLHR{b
zv73x3&1)1id^k)(SSM~cCX*d@_;rMIj@HB*2Vx2exs{^?bW8--d|tfoph2f_>Y1G8
zBIVRcsUhi)vt}wBS~O*G+Wh7(!i#fljaC$&i_G+2bZWXb`wY&lJJkO<s2e1zJe<UG
z(Bn#grJzb9*Gbh5mKiw)B9|QPd=|CKT@y-Nal%mH`)q}|-+~0?UuWs`&UFf#UA$Fh
zUYo_4l%62x4+??T-B)f6^q9@PVMgYvs|l&?JO7>fG;2eedDfrKiRMZ(SNZs8L>zGo
z+aMO5!d1`wOCq7+#Fh}Hvy~RB-9kenocM|*75Xep|B9`9!am*nx_8i*)A8pny)i!<
z9riKlzR=v-bLpuoIurf`f0{Y(tB3L3LyObuuJJpZ>wGt{t~ubEsqng{SDS5SdI?Rc
znm2u6n0@*U{bu#mOIFQODBbqrZK;*n?|rk6tc*`tU!PSwd1KAw?fXKqMVHlER>oCT
zY~8-5LQJxr@$RL!J5r{7XU{b6-hJqSvdd}PrSF%2U#%Tel{B?peo^i@)t8@H561oE
ze)#Z6=1#47d)0+M`knhQMRU&cpx!0U_b1)8Hay`Ht^S}W)oJCT4NBI3vtrtxCu~mo
z%`d%q_qzy}gsuKD|GAiU7RAZQN_i!`(w#bQX{gt`luuu3bS4{%m&R4;RcIVk^fNsb
ze$aBahDeccx9Ak<%(|;b?<Z?!=bu=%ur$>AbMt4RP7^Q1nuA}Dp6ENq7W-?>rSFr3
z)MTDq+w9x<*J@icYuC>uX}^WP`WJ_Oc=KzSa`a7k%Z2aul<Td^d2rzQS^>dz{c_Wi
znhqwK8m$d&^6Iu}elBY@m#y}B!M@uWyw+tW_G$TOY&j`1UHzEyTR#27vXba>UC-RD
zCNH%_Z!M2!FPJx}oHy(4O}7J03udrw&sCbJz305+8ZWQOmLXGLrKHBK@MHe6;>tO{
zVB=iTqYvz!>ANgryS(hx+s^{GR*J7*VD{zbirvq2)HANFD_$10URbZ`^|u>5*B(DD
zv&vIj$M2{dSKa&dxX^a%r2mcK?X%yR%((QeN~~JOxo77F?<xnTU6vAkLg(B%e}A-R
z%-#AgBQ^J?YeTHflbxX_wPbP+g<9o*HmRKUV6D-j^NWh7rOQ2XwKjamx35)iVc=ek
zOAB`j3olO8*`M-qriz)!=^&@D%jNAd6L%lI<iBE_pZ-2iPVTOK^LJld)xy}H&banH
zU!Llv1iMh1?dAywKW|>iTpc0MdOU{X%y*+B8*YTJocqO9=Scc9^Tvm4jw_Fxi=Aq=
zMoUE7KR`%%cF5|rQs=s+@$CKZMl(Crwr2j}iT3mDLg#N!Pnp5^_xd4LAxGWcp{F;O
zmT(vz(A$>h=Xdwp;eR$&$4ruB=eNdHbV}vybzdp`Y^VFN;)E~j_H2u`VvlIpv;Suu
z`-9IP1mw9m=DpKc{@1|uoykK5r_&!EZsJhnzg*8y>{c`1c>dC=U6qfs&%7?FeDhT9
zar3U_Yv)J2X_o4feLb_<Jkh>YW6J)U$JV`Fz+=?B{i=djb>4^2=D>T`zJzOUQeHp1
zWrmXJ|Kw$Vv$TvR%GsXPexEZZ*?m{I{h5{5JSUtzrupRgin;52<8EfSWb{cb%!@iP
zk4NfE=rz}!({Eo2I@<8{YmB76;pgu%^Kz%Y@dzxx^du_k^s!Cxrd*1X-o9FS*4oy5
zxAF{!i}z%|h*`O3sqC*fzT0<puXV+ZMIGt8eDrtk*mT}`=H<z~PgMViE)BVNrrKrq
zsp{3O+uwYhI<-`6oyVC=(o=)E_UH01+k7jtYUQS!%|esa*3OpQDx~%>DCbt#)$U(w
zU9Rc9UsbSX!_?yX`dO=doo%nWX!is~1|Qm=-#xwg=*)Sk-|P8i?YKCt=Q6**&mVJ7
zZ#kvC{>g^#$vvN#o5Ch%E(+eiGV*4t<n`!k(K?gl52Dt$JuUB9&C;or?{r!6Ze9=X
zw&Ym3eg8B5%X;4{e7IZ5z?kj1C(qm$90tpu=14LAZN0TkEHd+#RBhdYXDL5VM4q{|
zNiKBvnyeGwrnJ@Op1d5P^=Y$p_4O~cJ<>Dwy6e?G^Si{O#%tZ#*5kanl=o_8wf3%`
zB2%5#A3Y??YR-Cpy>7DX({!=^<;SPoJC(6VCo(wo`kmVzv(2q8EL!wN{+iO#$iLBl
zTR9km1-a4>d;9fEi|O+h&s-HXvn2TJinYn>!{g@bsqpS)E!tpuRr=TMEgzob2F_W$
z>a-n)q>W43=8#=4ws)OtlXN_BJKNXlvqH$#<PGnhxouy!Y<9ZgT{hq8)3jt}EI;d-
zc=M`=|0<>nC0AxfzRK8<y}q&9T;Af_!<9L1a}O<>>a2cQ``WVwzFCX-ZEwDO@@Uq)
zqT0O2HRbOZYo9CGD7<l#=Jk?m+#mRJLh9}%!RP<Zx9oos-dMx_D@l8z|ABd*7F*RH
zm>rQQpYm0{^p9ZIIsfm0S;mLIf1LVNZvKXUuWI}|el5w|QvU4Qk!@13UB4zyopSo<
zjce-^7}tOJa^VVF!c?}8+&j-~xfE*HSgfkRmgSeKq$+;x{j)32pB_Iu=g?_h@nyml
zHoINFm3zGZb$z0od3yhW<0lhbp5`nnu70s&?*D`%XTI(a4c;GkRwPyAg7@AB!Nogb
z1D&H*&%da<^V#>n&zX8tT_^4L`m#2x=kXssy~*YGoVInd37=9s=J(E`W?lBC=tXOz
zioQu1mw#KefvG)cCU<TKSMjZ-0?kVb!xQz2MFamwR>(yrJukO>?Z@rgyVp9f@Z-kW
zaZ-*y&wN!npyH<5`5<-)gHa3X17q=iUlGYgsvdnDcFr|>IxXJF*1cc0?4|r;;mPt_
z!?SCC36ytEabA)fymG6P$Hi=ItG;QuoFA=Jw||U!ZQj4)2mkh!0&l*seAAsSe6*Ku
z;YI!I3t#W16$X2mrfr(M{l?d~J_!f5$-K2mV4fFu@k-}S??V4$n|4eRcTT^i%W1Oe
z%xrh>v&D?U-$K5NO4)IK5Bc>h``rS^B}ZI#ZMj^!ZEtj;c39NSQ&X0$*lJ?6==BTV
z-Ck!N2c5f`w^%!9c{cCz9RiyR`-KIhHm<tGYI$qxC&51o*LRgqQ9tc^`^Mdt6BYF$
z`%?5)-COZ9f+^8FJKEKKR)Rt)uXW<#SE+}El+Uf&qjGL-8(ZT)wyGfJzxuh3Z_4~5
zoVHfADr{P{ez8T~Iai&B*N&!SZEm0HbM3*FKhl3<Z(sH0(mdPq^J$cid5JQsq*Kq@
zsaML@1>LLM^v7?#)Ux^7_1iB5y{^&9RZs5bT6J&D>eYAcR>${pKA3&@(MxOJZ*%^h
z{1TZfW;|`X%vzrtH={XJLaTCSUrGF7_*(RS!m>pVKk@!6o|WtUL;93+&)#pHyg5f!
zynNY_+Vwl7_>_g@>8VGyJn0CZ>i+1z?Dx1QzV}uY?mX7QwBh00NoIdGmdGysUbE!j
zz0@k%TU+X<9TzAOyE1Fy?c2<fFIRCK=#G2)U$4XK<TqQ^ZCpFAe$jn9&+(~yuj}#a
zXX56xL@m5@^V<rsa~TGIb)sVO3nff{9n<^kvijy6N9VO4dK%VwT;j7`^I%g=-HL+f
zW4Y&kf8KTcLDcm8Yl6OWX3H%TIh6Qn@2~2Rbqt0LVJk~R`jxzr&fR<Utt(Lf@=9Ud
z1E(@F3cPH^HY_{6u<wWc8RKN<*vVm>!C$V;dYdB~_qlZ5ftTO!{QYh@r}TO(8Y-Kz
zRMRU6nb3G{d9HXRsu-FQ2-h_<3PmGC6r@oD!Nkh~yCv(V=+(a|H>O_wd-F;D>KpU;
zQ`^I?PIsQ&xJ;F6(=ulNdAi$ge4JPv_H$1)+dH=H<=JO1M;A3N;BLLPqfN~>s;kG)
zMPdKOa+!&~%bu?>{wkGuMah_LmEnV6+nQ)S=@aKwEEhU#GdZ&2P29}SS1oxyJX|z2
z=1sVuHQzF)pga8DHv&$le-jHm|IZ^thxL2cor5zxZG+$6WxRIv)aUtolJ#uv)v{}S
zKcJVm-f;2Big`y<cW^$jO*&>)+a1?r%F=o#Z({GIt3}J6Y;pYR@=%NaNn+~$^lam8
zTVp3TRUS_hlK5Vl$a|OR_V3rh85fSe`+aBOf4{IJwGN-8RQC3#Zm69)`$gU4>+WhZ
zRZnp@X#3}%@XZ&}d-Q(Zx%YcCw^u&5+WT%{&Z?WTZbx5py(*UKdYj{Y?ziUJ(%)C&
z>|SrFI&tfD?4mD^<HhuLK5gr3Imz;4>zsLfs!daW?U^)-`BwMlNX;d;xF`8lrnDs8
zP!T@Qdo{$!k+Jh^;F+}P;<uQeStl}E9e60T^X|02;<J-CE}GQ5QR3_QNmBgNPWJ3O
zT)v>wbMCF@7W&L<B|kW*H#oldq$@LNUw1dFv0BE<EN<slwzX!gXP0}<Id?0kG^p)-
z==P$OFB3T3cRT4#`pvb@LEyN_32ytudEcjByZh4ld3K3erC76O-LB_%Qg>&4RL@-S
z;#-{hqw@V(HNQ0dEtB6bEL1(^wsNADC&MEp`9rt9%s=cXmRw?U@=eZ$xRw9cok(4?
zX1?p4*KhR<xtaa$tiRT~<n;&rQu}KRM*rVkvR|G4pSed|?Lb8tgCk=m`^9S~56A|j
zNk}E!aXqln{nw^9&)NE|GxVhFXCKyH!lYyLS9#&Yg$qASza2O2k+6YkpP1W|o~)@s
z|8KNB_#V`DYgt1?dKH_Y_FDP#SE}cCme0N>H~(SM%<i>Y&YVqRe;QjN_h0$>=bDqR
z<y#baZhc<DWO<jh<b(W4ciUC=Cths5P`T*D<=cPs{%!X@b#&#l{)-<c<`k8hTLs-~
zcsK9=lh9YLCR$FG4GK<&=f}(Wr7?e%&$+ia|G?8#bH9DF`nmQ`GUJMg=Tef)Pd*o(
zw{%1Og_j3=jrw*R{LmC66vKC|ztFjV%ZlICdamN))uBhK^}oMO_~LhDcc)eN;b%!|
z?$Mr(t}iWj2z}*jaE?E<*2m_Ib)WO`UH?9PTl`{W%Y}2@%v(=h$lZBlcW(7F8OK>l
zvwm_YY>JbyF%scXF7-OIyN=;PO8CP~R}JqUYkV<<kB`mPD`I&r$8E7V*~YL^L7#+V
zsRvTwg3HSF-rrpO_=On1h_Zx#W7dMo52nfKERzl^%}l7_lA88=TGjj0ygmD0mdq@e
z!!UuP{y2xThG_k(5YuzV=6{Hn-x)3H&3tFA122OBhw9AgSsqs^b{kGk+4cQfy?bv@
zy4b272}j>s%T}&jUR(8Q0`D{vw|DwkQ!0D|j+-8FVV|2aNucNCoL?J*@45c@++Z!S
zuwq5)_cnHa(f^#+|7<?af9~X$bHdwo3{?fPlx$0`{AhP6KXz%e>!DA-XWdo(p7?I{
z#l**M33flrZ1U41k4$XZ7w$T3>B_u!UShkm_IpHgRow|c9m>qL^o{mnyUkvwCw_~q
zmc3IU8TGdDa&zD`hkDi9;UAYC4{((7woKGbd3pVc*XgT=7i@ho>u*HT^D333y-U-(
z*FWDG@aVMqN7cjg{&gf}zFO=fr2Hmi$*GOkJfatz{bc#%VwRRCb7|0gA2k)**4V89
z^8~l#?VMm;>G<H#j8?T%jk+ew-oBi0S=M^a{oPgDqaq@F_B$$ctvdDe{ltTz*=xSK
zZLrzV*;=U)xmrV(^-5&vx4=CaJpERTfBw{(a%BbEEOB~v^^xn>9k%C0*M6<(Iyvcj
z-`m!0>Z!L}7I&^G?dm8r+WtxP+f~!9_eJ}B^-E_pp1XFi!fnG;SEi{h>wZtJOsxAP
z`PE8dX3dIcX`i${@P(Y_cz4CP^v=d9ld~^}KMH%ZIaa0Mb8)`4#QEY~T|(hidj&2>
zpFI`2*?sn&xovM#q{M9RE?1s<>q5n2jy?6#dY?W1z03L6zq!AA)7AIMUI(HsO<*)q
z%6lT+8tokzR<mJ6+Wx>~txa9q4%`V2JD9O+)%^MOli4onPATv*2|O&rZ~Wl2>zwb4
zu6}WoT(G|Gm)Z^y@kc2yIPR`1RXFEvW%)XE`IT)A<u@+HzBl>6^5EOVmA<XTkt-Q@
z^j=-NPM6C^E<2=hn%K4}s$15T{OZ~<@sw%n67k<Be{8<qym|2w4zoY&G>=$xyPXQ;
zI3+wS!`(^yV%LnHE|X3wtvvO>GWvK}^eM(;^CurS{Ip-MWJzF>$FI1@);_^<m)%!x
z=>D<O$YfWx#3XS+?dKx*R)*$%GZ5JO_g=VC@v+v_%$shN|L*(ER!tKT{#yLpYK!(i
z?>k;kRljVzTG6U^>ymiQqTKhUHtM>SZ_W!%p80Ek-!c7seJ&fxCrTnhvJ1Ihx=XG;
z&8=6%bLH7lN$rI)x62EJQ)jQuof2*KPxxT^!eH6YX4Ba3T<m#x_t5&g`IUP&Zf@rN
zqaV>c<#JLkZ||042e)uc6cqI6apUq>aiU|<K{h6(BcTz^f(c7Rg4`4q+tqSyyWr8$
zp|NPSgw`R$F4rWFjjqX}k|Kc)p-LxKt=bSMk}N4G#^oxabi`F+LP&kVN!OInjzwHt
zN=GBQ7HO>5&v(U9!0~gG632=o_EA#>llz~{Pp$oa`upAb8^7P*{&<OZ)B41gZMH1V
z($dk}Qs%9{CAIYTy8Qo-=U;DbzQ*L4nlPbxjYJFA&&O|n>^Up(d$M_T^R~l3B}#U2
zl`VdhwBhGTQ@<C?+);N=_%=GVa*GIwXL4PSldl(deEC^_n}}~V%c&M7@oQ7wyk2Vi
zFx1m-`j34F`hPiiHUC-7ox!k?Wul7;i;x3@qNs|<M5oFVLc2sg|21<-D_I+;Xn)O*
ze|dFMXljZ`!0KPBZE1fjO}yG}>TUYZ{`-sOL`koV$Bpy<%RjvO_}}{9cPpotYu#V}
z>WRdI8o6Ce$E)P#nKZN*hEK2V+RAX2r;Rn(Tx^xR%>H{jXU%Tky>8y3w>8gpbuvht
zpY5{z_Cb~p@p?O&!Z&>`PAlK|LZH8*dzbauUsqcN>}GF!aU>#e$-0dEsQSy-R<6Du
zmcf?rlj-!*=PNVj@=g?F>dv2c@|K30|0$(=3updpwD2`rTVvl`RAPU#rki=maib>(
zguj&Rk>~rJG%?R#+s|G%t=wwWBtAJeh71)=|ARMQXtjz~of8bW;`LnUA#0h^luwf`
zve<i`+V!(#?b4eI&9-ekw}wZ1!`o|N(L#3_lB#yw*~!c}<9}fNiuLsY`b%CXs7LS^
zXRqf<Jfkkse*Jdf)M?)r%?>o%=vNWuUUrOW<?{@s%tEEGfa|j1mfPn1wh87s#J;n0
z{yn>yFLbxhmwl`5UGVCCZvCcp?)!Egcs^0cxrD=hO?l>$pbOil72J;&c3}u{KQLRh
zy5iDwvzHORsvAxoa%n%sd#jy0%RfZty#>Rgx7@4l_UbR0?e#sZcB0Ew?+F$fuR{9W
z=J<pk64f=Uy7^n6d}`i)C5Db;jGN~ON+^8)<2iwGm+Rkidj1DL*XQ0+ex_xr>3BNt
zc1_H-jqA%f85l+XMz*W)NVTs_+L+PJ*d>xb?XY9quI2AkB-f}l-t#~4s^F8z$&fcn
zY_GF~RLm#VTB}RFd8~NW$L7<mlN(klUtPTVQjo5b(5}bdSH0)q-L8-<!T0*{y}fM>
zW}dc(3<48ooUif<{&@L3i@dGIsq?#io)}y!^qIJHx<$Rp{b;5f%PFC*w*S^iX?kb%
z=B}#i4(-zVU9crEJ%s6EQd3h$*Tyi7Te%xIZn-r%{Xj_C_uF;vPyJqh=j;Btr8^$p
z*Q=~wI{DM@?&9`>E{#<>0f9+P-6A5PY{xEF9s9g=ox+xyY5S(dne%O(rk?-gYsuGt
zv%lMa^~sI<>;J~$Q%BN@TqnM$y=Cnaa@o>n|7xsdi*!Bsnl&SRYkcp{CbeJZ7X+^m
zaCAP_nyTLBx+!_FOF!p?-8~EPwlClN^h!inGvC_a8F%z|6-!)G=m>v!>9)vfg~AW%
z3u68~+Y{M7^Z5g|M}_m*AODg6Q}8ln!C#NgnU6L#E$S#2J6833+53zCpY3>e-qve<
z#zae*f=L|?!ZSq-zXXRnZ?HPOd38?vL;-ot8-@RR@1J+=|GnRx|8Jf8ueJ7VFDyO(
z-nPm9xHXk`&v);FhQDdf$;_FJY`MGD>K7lMyLb0Q{d^rA-OIPU7?#Yr5m0~9RmjkH
z!ZG>RUGEPB{LyH<wZKUJfPJ;N_SWD2{*^yVo=s-C#-sc(VB>}jk6U9l#uoqEa`NS*
z0~*ZE>#a^~-qrQury5u7^516lms_2-m?|Hxlh|DH*F8i<YB@h+`^s$JwN5V<=e)Uj
zZg1=x-?{cIzYcB>{yFbUWkufIbLS^NuKFLG|Ifbqoelq=kk86>-xPa<ew?kV_Ks|C
zvS0E1L0;eemWjDL8jZ{M^qJ;=&@5cUoBXKY#o2iu%Fc10W0@%Z@X>O04hBX3SDcUd
z4!<=IJG6ePv+s;OvD=p>8~y)K8lxu1k#yntEtODHq35Z8|F_P+6yKyAbaF<pNbr+)
z`!fE2KU%ze$G`g93+m5R+HbtyeJDC|*J{5{;o7r}E~_s;_xzVv{nrOU*AG5k{Ve=S
z*vm8e?(yE=HoW2CVS2cDZu73t#|MuZwstl$2(ze^$~6hSnQgy(4x`J)MQ1GX6~C@b
zn%>vGX_C&>__imfq?>JeJSX`ztz=R*%w6J<!Z^{$zLO(byeIDFX}P2K_nqLIX3wW{
zq~r0VDgFP-CO93r=Qqzt-hSblMQV;VpMw}GZsxsqefU*&t^U#zFLpZpntRqY{Lr;%
z_Kl^-KBWfVd{-^ETzvWUpP|i<e_EM;+P!RE;hLZKqaS}@D?c+;FMs-rU)OXh+-Gv1
zb=kF_``$L!qOvK!>z;|mnV!5C9a3(bexzje`^wiXTkae>m0Pr8Yu1|?iTZkLFHDc=
z*vw_W<+I`vgVcKISsdM~_r^Y+;C<rLm7>>XDG8GluSPhied%hK+irKvsdsgq;zPYB
z71c*)CB*&=P>o#m$1Fha0gp**deix*ml|HQMY*nw<t#X0?(pEAnFa3_$J8b3I)!GP
zGdnP6=IYOv6!rv`Wj%UrJnQXp?G4{nNgABnch+{<*LiCuD;xcbHHkQCJNfM5tkUK4
zEq8t1owwU_U+t<DWmES}{QYjC`;>K;4z^ZuddD)CZ~waL!D-pA-`dqH&9^1k&N=%;
zR7tON)x&_(ZRy&=7h+@Yy2h2J8?%e@J$Mwpv7+m&Oxs~m?qjRU<TAb*6$LI~ON|UD
z>W`eU>TYmgYDCq~*Ts*HxrtPMy(RVb>AA3ntA6RKq;SPtJ9*!Df6vt^nH^Uyd@hg+
z_s9z_ncKV}Kl!$uap1fA>lX608~V5H=|B1Md~NoN$<x~ZTIzGUe+$xo`To#W#~a@}
zcCNoH_grY*=e0j#R?R%M^JbFs?2U^K_m@vw#WZW`hl<%sOY3tB#hSUfECb><r%zkD
z&{5Cmt?t};v#-|49i7M}QeFH_&RI(}=kVvL!Rn`!1r;x+c-dax_wO~6n%`=}Yuo3q
zJMFk;dTz7t!5K@7<61f{uQ!RCT_s;t!pOAgzpaNsn{8x%q0rw|RW?W6KIxzGZ`5|5
zzdY4wcI}j2ean@r7#0Ube&1(h<Ghr^^!VbN8Vfi0op7)Zy_EI!6_di<%D+z2ygumu
zd6iZ%`}@b@U;ER){4+Z@b=H{!S8RH^tA&r94XG%ZxwH3^=$>GY<*VF&*ndwxbK=c6
zzWoA{x2Nc89^KdT_tzb3la|8A3yx*Gc1-&muAO#UHv6COy45j%YV2-{-;UU0x#p|5
zu=9^UGU=vw_9ge9PkSHMRwX3)^~@ZR%`>y?{8zOWJ~f(Cb#+70wt$k>e2J;^@|QGN
z7p&w+`62b||5f`t`<{I$&bM9F@JY2wGjY1#s>j=Q{HSV{Rx+?`JJ6H=UqSu2vrD9)
zAfwVzCyh;xPCCy2@{b?CZ$6p(;)fHF*Zp4~{?K83`^>8vpAUyD5>t(Z9wvUD>67Xj
zckFz_mqUp`ni5@RyuAxIhORS<P-PCAW95E|CFcIc&ClMw`}RJ=BQ9d^)^}gczk~<Y
z$JOc0ea^bMOt44v<fPMS54gW*cGaf$FMXtY>9V2vw$nc=V)v!>fBmTWW5Vs$wf{4}
ztp52m<+A@-?|t8XlzZjxJeR}yp512QdtKJl@Pp@$nG5GION7K9|5wM^AQ9Pn=>E!0
zb+Mk)oP-z;Sl5))$0eRgWLdF@!}5IAh1fXV^IuIiPxiQP7<I0>o=JY@*`seb{@R|8
z-?aMD^{-_Sd#-I3`LNb-Gxrs}nH!b<`OWvq`kdG1+k5xVzM7InHKsSx7^kkD_w|{Q
zR?^#Qf9}tw8=tUUEq=7&LU*v#s**jQTh`sKOuusA=&H%yOsY>z6;5$q?zUR<*GWzz
zd-`%_KZh%6oDJ1ixC|r0<~(kiH#bX9*-?LQ{q1+ZEcS(Dgp^I$@_tdc<Ki_h<5Fw?
zA73;3<<pw?Tkk)ZoofB)M&m+`Nz8@rJ0Gd|gcNbt@8Y~ZH9EVS$&y|0fmr#y@ITKw
zQwsAqKmX`TZNA3YbW7@_!CH?O6+6q4w|>}v_wP3j(ZfATQgKZO+suqFZ~XWA^-P&F
z^X#X7P>qch7M-3nlVhV`1OLn5Qzz|y>L@s8Ow(9*VVUBte6_n3uV$x}`ae^(Kb&%&
z_0BhYL;c0aAN~LN%3o1aL99-|NuZd8CH;)}BZG3|%G^53GgfD6t8P|%zF<E5Ec;VY
zl<b+Kha8s+PH9=bYps=4?y?&ikNom4S=pDA%P*;(q0F_%Q}_G&)T!<&hwj<VwLkmP
zb*^!t#HycnwynQ>&$_vJ=j)Y`D{EfAUizNJK6K(W)^j<5cjR{jC}lY^3Gn6nzpt9!
z5LMpY+F|5;q@tp?xv!<(_|wTB5oycb+ZWIItrJ+T@V9=?w?@vs)$Y8acPDrKDg1N3
zC4A-EEp;oFh-XZnUuc=s=lPM(h2fZ1EB_YN#E9rLTlGmdzr~sSndI(xcha6CXPg9g
z{I>S1SKZ9LX%F}R?-#;XU#jD?QD0m4UU*&hyq8wF?%RLvtKY57`ru8%mAZ~*Ihj_8
zgoUSeefYb#{??nkU-9Wvz5l+MUpn>P^I+v~8$TZ3aM|PCBsDJ&+citq{Fz|c7Ev#!
zx3-Es;l%%=vnwToRD%B(`+a%MXUX&Z*WTTAE8Jo(@V9H$dok~M^M7k8yNUS4+&eF8
z9`_#TP}=wP*Sw$aF382GpL{IH^XP=`@wi1n*;Px{EebjndL+Ec?IW{n5}#P~wwoz?
zTz<WJ|7Aj?w{!dbxhfK>K0HMlnxD0lSKN)@tiP4Tb0qljI_Lj;gBXRs%GR&b>Yj1?
zS)xqsVf)gXDbie*1QHv%JOt+cioC{`cmB!p{1XfKB;9ZFJ@_mCe2=z#Y&|0*?@8a6
zKfYeM^6lEIM@s8-mbCUJmG~UEtMatkX{!5DhE5$5xkqf>N=h3qzu|7z_<Kp}kN?m3
z)3+_dAIv_mJbzt#QQ#-*+U=*i-19<<K0fGAv^V;3@8REdyL!G}`1;NuKu*)GeDd-~
zm&%Pd&dqt!#qNEdd5)^2ux|DR;p9t3iSPFR_7LEhR-nMZ7nkU!tl{qvwD-*Eo8M)2
zf5`iM{`aiKg1es`$SBFaaenu+3$|vxd7G?yLkdoZ6+SJru&{33v}%T?o34m#_B7*U
z4GF<05to14N}Y}cd7iC`NKMl1+uc&y(c!2dA3blDtkX$j)>{VWdu9HfI^e4kEBAKt
z^eM$}ZtRGCyDPYgS$L@%<KAoE>L<-S{J-JQ*6zDsqvy6X=f!sQ@|ei4SjA)6l_nm&
z=%9>r{FA);`#Q&`91G@t9#g+*b*WY8O|kikS4%iNwOLMUS7rCtAFFlUT5fmnMB!c2
zGK<fy&nz#SX@5HY?DpLDhYyZ+b?grR?6$e|d*mO}O=U+9r5N-3D2skQb0#$4gdk&;
zZ-;!+?d!#z%kNqk|2yYjVE^s*-%~Yy`yV?kIuPEz;*8;f{fg_@MRJN3X>OalZFBF2
zfAb~&KRZ{yRJXwC-oM|!?Q->ZthGM>N2u|r?%`>l{8f?`?f6~zVnSV;8{>SwJ+CkN
zdoE?+T+x19O|M$8=k1C#7j0Y4?Y@4>-y&}Dl(#2ed8>6$yLRcn{ATs(lX<$M^e%I+
zxVzgR_vDI03y(c9`NE^GaK|}9hEMcG)W<mEoquOc4(v>*<7Rj(ZRKIZ*6>T;b43!*
zGmeOaU_KeYJmq`WecF#yKDl<o?6vuh|975RNLJ;FI<63r4xHxcG`VKRIom!r$LF^D
zZk;)9ajWXy_WKe~KdmZBtX!LR@w9_p?JCh1IdAlX?aFN`Zp%s(?YzqG+t)W~Lb^1&
zq4;`N#RG<!=iHt6LUVowMb`ZI`0kZP;GvrDrB94{GS4nKxw^h*!px6fUwEzi=C}7@
z%$4;ezr*9-XqNo={ObPVy-#Hwel%XWAs*3k;@(1!+*K_<o;25T{NFw6PmIYd7Z-&e
zdQ$P34~m22Z@$vJcgd_GY|77#m%mQAb}B|ODCO(pMPL5S;?|z4(IfF>+P4)>iPKkZ
z^pXt}XsdKNzpgRLxMrEt-)&P%avMY!2(6cTl5b-5nx}0~e8o@JoXCqkFT?|s-6J$Z
z8IzjUzB<uRtmjZ&em9H7UP=6(FNeCZKKIS9LQP7nIdzR(i)OS+`At69`S0`Pm)d`(
z{rev+d-in0+b@N??mOi~Gdui!BiFd}drsKHPmh=Wl&TdgJ(({SnWX=yV3mZE-nuDV
z8VS}+!oj!is3|fv)SYDC&U!0*2}}6I7Nh)KiP7xWZ31?*#iq+W6kj4C_qbLnb%LX>
z^`m?8-xg??t(qfZvedH3L76ed;ncLoFu|fZyhX)^QkS2Y-76PbzWix$_Whq>U+s8T
zS)@&{-8?_=^+KjHUY->8O;I-)XGAc(|DsjdS|fPY`B&K2oog5Up7bnAhAqXDb(V=%
zK+X-t8n&F<*Zr-MZLEdcE=Rm&le0Wq&Gsy}k?*loou29HpK`fvyCrh?7j#ctYG-h9
zfq)Q)tL2g49qD=VwU}m?-29+r!@k&E?}DfI9`-+952@`feQPG7?kdZ`+>#J-Y?<St
ziNY_xv$Bb&$JSQ6A9`H8Y2|~Eh-b&tHqTr2ap$?^mY06o&R~1daq(#9a$n(&W1?y+
zn;No3^nJq)o0)lRS$}wO(5HR3b_?D*^z!o_;ZJJ=N+-&!i%S)f$kgC@5alwpg-Ob)
z_4I`UbNRj(zk2ibx9VA$UM(%1mG6%1U~uXvUA5t7z?9erEvGxht#fBdBz%$1T4}Q9
zmxfRXPmsZ>5K|Q~xt)3sU8gFqE1b;GBBkqpWzk~m)xYnvxxYD9kQK2~>&DD)+BtU1
z5}oV1m1bOx+O_mu#@pRy&fLE<EF79P)m=Mzdv&5$>HWPIji>p=hUX?6TODxdN50_^
zGZ~g`OjcIc!uFqeWPjGRW%e6RjmWR3tkmcC#>XZW+&FqO_gLF`#zhC&i{?&Z`PcYA
z$S&yJl{rDv?ic*N!@ONi(eQKXLX8Jgw<z9NeR+PT<lpq`*~<bQjphfutKAy+=vCxn
z^R3DcP5WE3RZnxBdbmHKOlVi>IfG^Qp1-?tp<8p&843GSVQ~#&Y{rE=I@;pR^H2FE
zaCtPfELp!(<#{j<d;4^L!w28&J3IP|r@x!2obck3+W*OVt`h=(DsimlQ#qoZ%CvUb
zrJd;|4iBzRSeY{;@M4SHqT)BtL&S7)-K04i`;|&Ih-PyYmHlGvR*9)HE2_9$mS^{E
zx9X-H4~}XqcCNQ<-p0E=QRqc%x@Jhe#IFeRy=%*Ve7+{|{Eob;dvn$HiHtuzY#g<2
z?3OY<=~o<?-tB33Z2$a2M|R&VvweT?uh|Fj=6ac%NtW?b9@VM^?YjGY{;yA7os({A
zY2FaAkgRuYU;Z-b>}>1GFL9f%E~!;Bllf#@mF&B0c4nP=?f-eJzx?KDm)LpY&i0G%
z^8>RjJFcAa37#98n#+~6wTgvx#p|$+XK778*Sbmz-Q2Y-_uFjm9V;6O(w?sO;aNL1
zda6KiuFm0G?;g7MzYW-YLZKsdUdqMI$xeq}Tyyb$GTZmUni-M7Z?2t>-t=O_+AF#T
zUZ{Dmy#D%jyqCO-r{3ZXGb3z$baiJv-4$54Z>P7?MDcf}^Qz4&>uld#maWTws#j|N
z?n6>^klBMYOPOt2*Y-zj-O0PS`<F<g^4piUm&`8f%r@f+n7rrMv4{G#hZoJ*;@+5Y
zUdB{Jy8G$8BiAeDPL0}V<sq^6@s^p=rpK4~tIj#!)~91wvo4d(qwkmTEmf_sb1SOj
z7KZ&gcWP(W5xL(7mR($?qqkW7WN^TziM8j-4VU&WSahi@x1cQ6;^x8&Z&d}kN)_%s
z4HxaWa@jOR!|ZIhb<p0!Q_WOP%bYy5KC|v!zutk!=`XAp&rE;m)fKM2x@}42q$x|6
zuM_#Xb+bigeALe+b~~4TWXcocf1LSl1(TUPo5$58qa}ZM=Y1B*%}YKLk(y$E|H}4#
z%?xLst@~Xsb-TYW<KgFv3qIXyE#Kz&Xx{Xz|BKBPE-Z9CajbHV&e1uwzWNDG+<UFQ
zNCk)g66jOfA6RK^z`InVH1n>1q|^6raq{x)pXzVl|9ssmcdOpfnF94nhgL0`5V~f~
z)CpRGf==q0Tn=A1OG|&qVLD<nC;0b8{_=ujE5a5i8!Uc3P1xvb%8{;lY2{*e_n3Q+
zPH?br%RKwjpd;T!?-<9LOH-z?|D2_{RsO+&v+iXz;wx4*tDNuaj6E%Kn)PaK+?2z~
zbAQHdyfyvI`OVVLerx_$e!50FYpR#aDreiD@mCAq<tW7%ZZpdksNMeP$dq{Ff5!hr
z@9s9g;PPz4lFcXIRQ(m3mvwm4H@oAnE?hX%yicU;yxx{mD^C<ATq)~UIUc&p^0T|#
z@n?Uc?=`D2tdFqKF1C5Bbo$+%H+p$Ccg_62zT5Xj>$PO%TkC(Dw_koE*|%C!Zr}NZ
zYr^kY9)7e;;pnN9xTJtT`Jbce%D-N}{Y7f_|J936ThD&+=jGnNW}BVAR>bZ9eB+PZ
zwz}!*`JaD_ikHpkc$Yp$kTE18^th2g)$4>3q5N|bJe9*5G>-n!;ZJ%II(>g*^O=>0
ze#ZXYsrl?|b)9bZ{hHP6|Ciq^zLuWX@rF0B<Nlg0bDe+W?x{$!)N(UCWO<1F39CiG
z^vrMel@I5g3t2SNknL~xfsFZ!yMu1GHYTnUIQ4M1q2;~2D?yVPePsIl@BQU(I+Bq7
z|Hv~gak&7?v#&(=`Cq!!w|~mqekZ|lu`4cC9mawyudt=h4~ddgoYS`W&-|!X`yGPJ
z8vIWlhX1l#k-IcvZJwRNjXSMZj2oWWc?a~Z*qyb+Y<}$JjsVAtF@-`0o>jh)U;nCa
zXQ}!_<HYq9p+(Q6lRR~p`pf>+P0{LImXLnuxAwl2`9@cF-~Te--%h#b>$|V(wZB;3
zoUDIgQeAP|Y#;0F$7!?Ym&$Oh?PEM7e0h$CQ=&_xrZu~Z=;BaycE_m~>(4&zu3YV1
zej#y{iyWtWgi`cs_bcBw6x5aN>DZGhXL<9vQeQ&cquQLqzP)W~t*z^fdH5Utp4w(P
z&9m&+lAg!+wa)~Hcdo0x`*)9&>vChsi?e>{T3uT5e$kck`Xe>T{OYsI?@qO!amD`N
z9utO5EBPjP=J?qbwSK&&HEFR0dyUgsULlSZc8@RkvFbizdB&XMwZ&@*$HMfU9KVPF
z)}0Qo>uu&oyDSJ=ns#}w;-*t`?kTlL8~<{v{-(h+UH7QJ=fYAxeNLIDB@ENgwz^$2
z3J_`)^4fUl?N0rO2QL$M9;;vV!Y!aurlR}xDN!>qky5Qy>rOpY^3Z-i->=c-<1}H%
zYY|bqI&1lM&gkYm$o}_=#-u4SXDo^oe9Kp>9Q(nMxm{a<=|`W9re1p6Nr~?v>&{g5
zEt<Ap`EJp^>qV*?4tzQPb>8><gB7Ct58M6N$8|*Ghh;F^KFc#ad9MW4&42Xi_+h7I
zVH@~fyQ$7N_~4{~Y@x)l+1brfza}qy_Cv~U;_?)SwD>J6SC@&$t@&yeq_Jlu8_%8T
zi<+hD4nGrGci;cT-Phu4pKi%IbV+{tgBpMK=QZ=ax1ZSGy{b2C`i7HBFGfioUC#Rb
zOw+U$cBfrCbNlyxdHHw$)2m;8cZurD)X87D5?WUDYu43jet!RFiFq<p)S~_|{S>~%
zByv2Id(XDb?lRALYEP8=SUnR>-_$vkSGmuyJWxbeFS9u^&})TevUkbMuGmd~<GSZW
zUCt@f|M%AX?%m|Z=YPYpiqE^-&+vZW*EQS9B5qsXVGg@j`}OmF&+^&$GTPrd&T<~>
zwh51(Zc;uIcF~i4>dO@?<d1&eeQ3%()Ag=wo_^ZtAHN+B+Rb!X`r;gx$7hOXEq9%L
z@#fj}&3?D`E0<In)E=HVWyYr$E*o6aQu@oAZ~vL=x41a2T-)!n`OY+{_VsVF<iqOo
zi;ifTmPx(Zpkw_y>XUbV;-C7Nt0niAnVFo5yl`WY*t6~>v*#=f*7&X)kX2eG;IAxq
z@KVT^uC#roYtLv$$*wnuWM%B=;gL~hsx_3KGR;4f*&r_7x5(c4-M*fXwylLPGW1{G
zQb}=iQ|emd#A2oYXh+dfS5ZEJjdS&bByw6^)2`jp(zHBxWEa1o&H+CI^P}5kigd26
zKRQo)-=Fj{w>N*}STA?Ab97|N@GdoK>`C*FTkH9SyDNOz(ttl&sy>h0z4mRDyb~7w
z+kL|NAC?y!b_K7BIN2buqN3#7^S8BY#s4`awznSV6@2pZZ&`G|{QO=n;qMZ^|195m
zeEpxLTj#rds)@b*=4Y=!)h|xAEvEgC63!&f+$aCn{_>(-(_LhF?s`c)v&`3>`XFF6
zcf8L3KbLM~@?^?)+rGb3&;O{FKeT^EuJOUXo$WsMaYuSiuWRLT$lf3t5hibXZ_3Zx
za`JmV25GF?F(qMvlCqf&x5Np<i7b9S3nZEfbDVM%*R-+<CTS^fY@85~Ec<4Wfoovd
zlGO}$Q@prVE8pDdBXL4>QFDe@RH&}Tv4V*wpFL|S*swfeWuSQ4iA_<9ZkJ9LII^~>
zV@GS!Coe9oRZ6ZC1q0{u-3(qdwfl0aYto91u5L#eS)2@KSj?MHTp?+7*T|uSsn$T^
znBA-Td~Ve#XY=dcocZ7V^6$Ln@5*2Q`oElf_phX#xzH4|&GDP`7E4BQ&571qeB?o`
zx$XV+mwwpSJ)YOj{3G$;$9?Zt|C%edcQ*f2!Al*U>MP@(&r`qiR_5=7?sp5-J^C7Z
z)$G1_8#oC$w6K_-IDX}-TIcn{>6ecG$SpX#GER8$!ia7$B~8(QFd?5UlV42QkZhN&
zDk*5@G;zYssU1frb}dpeoTRDb`sn3BMKPUjK}NHs2^)E)@XiosaS2sA5V0{~MVD*C
zq7xg|C`KG?GSXypohZ@8q2v%L>e$Sf(5&DU&6uRMY10B_CBuX@Ne2TbI)*Vu9dHRv
z=4e(r@L|(}o}Lu(mW`LSbd(x43e_A_;&q#*DxuNTb!cg^#wNoVCl>!cRr|V2W2I8l
zL5Yt}8@3&EbrI=i<rH=8SaE#uOlLulP23D_R-00c4ti|p($HG5fNNuln9PI~8(Ul_
z1d6&Cq^x--byTTAtBYAsD9LM;N{~)cS3`$JkC=u=S5s5lEG<{1qZ1vI48vR*C0v`j
z1r?r7?U<O<<C1i=n@4KfLC;8~ZdNg+V@lkDN)sZuxK`<OoLFS&8lhnrASx0P`DJAU
zm$HaJ!tzVYqdQF|bu0-?2wW_tu}Y`y%4$JDRxvJ(MN1q-149Cm8I#tCDJ^Q^TD8K?
z`RxZaBdr%(0!2k4G&X6iYSI?z>R6!R+R^VjwVR{j!b+v13Y(9#2Wj$rydgSCM`Kb_
zNY&Zn+Ee~;_f#mnS6FlR-TL({FBf}Vm~DO|b64WrS97mcm6pG}b9k@5*>V*ZksytY
zp(#z1lsPs;vWmH~cx()b*qGF<)O5oAnDAlY!r46v5fenLg~Hg3olRd%xpgCHU)?wR
z#Ak_5om=kD{hjgs?w5+-<u=hy8!qvfZ5I76J3Vmu{QWt`x$BO#N1Ak;&RWqU5}~1W
z&{b!y2AADj<GhO6?N%j!um7yNXxYQ}fzN~~O{G!Gtoi)?)GGVq&t4~3n5v7tdS&3i
zT-b1TOYF|O1!74RJx-z@l00<g)Ss#P|98TKbxO>yLO2rynsS}IZ%r}%&V2jDJd?-Y
zYU6haU+p+DDOw>cWNCt!(!?;Hh}%h8Oge5HT?a*#a~3OgbZM!kv?i?yXnboV+QqPB
zC2OlI#}b{aW1_05iB&mAg4zEwt3NgJ*9vV|x@7v^@5>&(?=QbCFLfm^%kf$5^X*e~
zC$}y+`>*Hq!S8Oh&x=0>{@lBK=7#A_KLVdSR(`avQ+Tl9Yb&oHBaiPL$us}&|BB!0
z_3BO1;~lR{UIz1PHF+$kwfel*?KiVy?f=<IuWMqIzWwc=p1$?Ir~2f#ir$9jvMQ!7
zi$69cGIz7AUjOX{As1Z(4`1^+<Hwz~=ca6G@YcKKg>9KNF*WWFiflpy_6of#+bdq)
zSb1`#t%~%#OU{?M7xx+Z2<=mG_K-8Ijlb|RpyMwi<KL1gxs@$jwZb;Duef{FDP7%8
zrzIf5enYRl$*m3X2Y>DU%%kaFD_nK_*H?q1$9q?Pjm{HVIBC}X3-0004PvfIqSuvu
z|Ial)d*$Ex#s`M$d)$;1INBEHpR3=#YgUnxeNjxvbRJ(v0}iiw_M0=;?^OEt>yAlQ
zi>;I>)5)OMUr);N-)8t+y!{vB4D(-8*uOFS@7R7gQ-E{IYi5;a(muC7a~<ATu+X%s
ziQR35(#lQJ*}dDC){9u>OEhS|dSj&JxM#U+cJ0UbMUtI)r<?y>Y-43#bnef!OH30N
zug<gPs4-onXkUNx*wXK7TXb}EHuvpxdtkKDnUCpI%r)kWl`J_MeKz&WRjppPd-IEa
z-xZ%sCF8Cyc&ESX-16ryG|T=itN&9ex@Yz~*YL$3|5b*R&*N`2FS<4J+xJziR{mE{
zz7h2G*?NmDEWVyCS7S$a;J1JO@-*BXf63R){BwWjp-!Gzjnlk}Ie+KB`}i#`|JsRz
zb9s{#l$8vdxJ3h-j&W@i4Rj1~Nzm$X(^}*hvieZ{iI@M||IJ&x=1=+N`J3}U+2{T-
zEjt(ey>S23#k=<Kb}Wq#oG|mhZP?<Z)f?w#&WRQOS8C5F7^3i_tuP@tIo5FQ`q|d=
zDvj*TL{19Io}cw@;leL}PHel8r?Bwp_iI`ULKmO7BLDyHw|1wGZrl&9$=EV4IV|EY
z=<rFrDmm~}%(wQ<f4MfQoxg0o<2&EvIQzdw|83T(JeA<E_x|hQC2?)Gg!ZO2pLeV3
z{z`E$<M4=Cw4kwvCxPSkdFKl=zCRLN;g`7W_gSIyNBcj&n%>H~Y{8rZwa-F>9wr|4
zV0TbF>JXsNzM#%XZ&}Qm=|#Rv&nSP)?vtBtv-#R2M$2<L<x@{xobL2S=)s%)pS3p3
zb=|gM!->f@7hWeviSKywsGm(p!YNt*Vnn#=#LR~w)8wPmHn;X|*nf4`Oq01S@*6Lx
zto)x<WZJ-x+*8-R=BuUM^6hgz=)GeLI3S=9_fYnsRdaQ1orLGio#)p6+aJ?D(a8FZ
zRpO?~)$8B=nZ0N0^QC`m=lia7EHYqQt}JnZkvT@N|5@ER84bZ{1~aGJOf0W+Q;vM}
z!R9WHYuWr&>t`<g{`lv<`s+7DP8_>1vG?}G6UV-M)R>UW^6!tMN5Ilc3qL$|_hAY&
zznOT`Dw13A`nq|)-*-<a``FZ)%waIGC5$^n*FePa;pTHMYIW`xN*v_S&=5?#klMzi
z<SOdu5x(x;)$GQG&Zsy0&2~%Q=k_`Mc;Cv_jqDBk|D@gQIsYL2c&biH@y3aNXB{oQ
zlBOw{_1Gwm@rKXLHLu^_esJ-`wg=ZTn50gX`?-`ER5iag31oRPPi5_H&Xl$bdwl#i
zAIQCK|MfA`j48p(cP|k9{P5*p{g->gLfF|X4qe}Euc@?(BX{0=^-%o>_upN6Jgv>c
z`rMPx7u=7#9sT^&{D|hI^MzM0ef;)%lbQ^R%kqpKQL7nhHnxdZWaqEEs`j{=al!8N
zra*&(DU}9inzRpFw3O8IeNO%5Za)3@ZtXeCs_va$w8o*_A<&&UZsoS$Em`06rdzBq
z4^nMv`OjRxR=;S)k2`WY>z{6q|9@?Uec<mdlQ#b3&`Dn>|NMV>eqM<3nTQ4<#!2&P
zU7BtQEelL-Y31W=4N+!T6}PJ1d(MCRxLeC>|3*taXHT89<#I{DeuL^u4lnK3d%i!h
zar2EuwR0QSsjq&T8d-GNA<5uW^xPoh@U1p)RxJL%f62LICYQIf+TZKdu-*6=@$Xam
zcWu^1&(Ggh+rC|_|LRJw6_RxfkFWnZ?)v}GbJs6M7t^Dy?k(SSKf_|xI^JylsRa@m
zBDLD@V?HW$^vnILj$OX1@UMpT_HV6oPbGE!Sa?fBLC)i9{=#3f>W62(7M6eVXvxD2
z?S<+$`2P3Ua6eqMSxn|#``Xtwt7KYSR{pWkf4Y9{hefBayom~bY%@vzB71tR@^{~A
z)$ifvk9KOWQM<KjX;J=BpIDXGC$IVW&FoYbzp?z->iL)cZ{4^3`Lmb1{&m%~@6&NO
z(AmD-!^c3W`KW=OmtXU%K+TL7%nDOk6a^37aoTiNmusTw?-~jFOPyh}+g_=y3+Gd~
zCbe$U@e;-<(lVvL^3SjRU%!6&r>%2O7Z~h%$lu$xQe6J~+K($Tj<PS0Ye|;1cgc_b
z_rr=;Yf8@_+wUJ<*1f(hd-VFm-q-*7yB#MsCcgZ{{m0z+-29I2su@bXD$NV-dmg*=
zx+d-h>vQ3EJNk>ST?@6@`TgI*k5+z`|MT|!cok>J__=w?4b@2Abr<LLe>lSL@c5m{
zrO9`fdkZVQ*f;-qSi)EHKhxrh=l^?u>;GX_^<_LAEo?Q0$?a7lC+Db$^Sl=*ziXEC
z`09=sWm?NOFS6q*^$A_OGUCWh?mx?nCVmo;4ekzbjD51;v-Z6AGo$u9c`UI?UAE@8
zrKjCrjqiz-G5h7a@47trXL80kYQ7T7H;a$cB7^7H+s~Q&+$r;Pa9u0g_Am3MZ0chF
z$9Y-z>?HQSOLCR@5Au@q1?TMlVcYy&ZJD~ySC&&NOswp$epa*boe~k>Ug&qdzwcx%
z$3MSX1EmG2@zpoiEq#>kpSFHk?q*KsB^z31_B+aSgosHV`myKHtE-bQB__}5Uz_Id
zduI7>o#U(jSyg<WX*&1#FUj5WiV|0?IpBQmWU;`1`B&ff=C?21&OEQ>c>DIv<^`YM
zJwClSi7ij^!}B>gmiLruX0Q7H{n5AD_V0Pt_CZEB!yiw)Uw@i?nZbu$r%(L-P}~_6
z+1sAK=hWdZQfcpF*Sp$o@AMSD8vgRH{C?-A?|)9rS8q;G=V+_U6s-?-+$4BlYkb~~
zqe?7a`Z)If5@*y@dbqdlN7tOrjeTWPV!7)1*KZ1(9(8l6&d<1@eS7X`nDf`Gov>ly
z5MJaWTav-$so=8Pw!>;qK<E<rIZs#o-zPDtN80+^`tSDt!q2e?{@s|ws1+0D6)XR4
zo6aUt>wbls+97rGxO+@D=iSp*oqzJSYsq7Gd&yW6rx^EX_w4f5Iz2O=u|;sfq}c*p
zriyY^%2UNB-M?PGMPhG>a>e```&^gY{#CqluT5uLRgZ+`%F6)<Gnc)6I^)cg1eK}N
zRvt8nmMHe0dH<ciV4+pr<B$7$n>$Y0b^qIP*6Hx?1$jLxi&Z+>{mq38@22Kd%f8>g
z<m2i$2T#e|zmW8J&gofEA1=&IFT1VuaO2#xVEa-{??%s%M>~pz7rd&wcIs+UY`)Fw
zWgp{nGfe{~EZtyX>v^=OS@ZassP9!v61mUZdAV2ZO2MO#|2|h9PWUhRS>=k(w8|y9
z2_Ii??Y~h~Fq>m>%k#P4r%b<oJLUQGrinVfmE!K3QqS^z*x9Ug<F#mMvC52G*+P~D
zj~+XHEOopa{(FwLqJ8-5@BgG{Pgi<<BRBBAty+BI{J@~2f&BHVSIbn5IZe14b2yn^
zt$6+OwBDodetJ4yyubY~W^e62{KGo#_s;e$uRidk?=;^hePzXLFN;J8D=8UXhNpK-
zJF}Blo?7(y`@8+=x#{_A?!T`5sryw~X*l_x>i2ghSqxhzv38&KKX7%qzUBUVKLU(?
zwJoggEy?ma@4aI3jm(UF?_a<BX4n7v`yMY%`?a^uubpM@(fU{O<w3!QU$@<4AFTRP
zW^>F#Fp25#1)1|)*AoL?YRDR!u^p@8{JMyPDPhlAE#JBS`k7y_H8yF=yEZb|RvlZ%
z5jJ1^6W`?Z|Ki-a7OmQUe?xxP>wgyo7Ib;+>`my@*s=86sXVTZA7Q~~{arq4tj?Rr
zaceT)lCyv3w}wsqz4Po<f7YdkH_qg&_;faP=l;WbGvb<lubChH^K0L;zc<SIO7H%A
zE_|m<_sT8nwxz<4R~~ox^8dc|2fxpqrR{zWwr#gmd*V+NwDgs{xLRjYVrQd!C+a0n
z+YJp4+m{?F#mp;b{l0zP_|DN_+vz8nFK&wy-l?RJ_|5*&CG(|^uhh%RoxbtqzyI5*
zb1#0Au(%R^|Jm}HLc#x?r|<aiI;Lg0`;X86cklmrqkHv1JNcY1)oial^7nmM<)C!o
z-{eJh@3tP%)Od90(uo64660J?ZIv>5lX$8A_vZ4Sm6dn&I;EN#t9bWrDr>9bKmBOi
zi8Ai`w?{Pl|I~eqIbwBg?`qp)-~Ot0F)5{KJZs#!``#^g)`dqH5B##3bWYb>zgc19
zmj4(2#rI3S|NG~5&e@lRGVE2K@4w%1c-x6;);XMNUwVFT3Eb@-mg`z2of~Gj<(SzG
z!)afA)SI{e>ok?!UR?ICocV{9rFhx=*O#hpdE0M3w#{di0=t>aKdD3kmiaq0Ic9R+
zHC8El+aLd5{%ifmYWce#+B>@nrm_U>%Xsrgw|3|6yL;XRx4+O#>fNwNL0a*!Bj?6#
zg0FwZfBGx`@4L=+PDvjb<KBz2%=xcxX638rx1D$H<i>5++ypM%nDOb%%%X`$9~I{Q
zjEVm-U;R-{`u<OLK6dg~+b{Hb*&j-MG|R_hL(!BFosKPO+*+1a9d@F}gv~ua*8bmd
z<wSCG2y<$7MZr!zr+{tu+@F08-jVRs@v*N4cWYhCPKOPhmPL$p*LA<;UcPAiXx-1n
ztG-^DcWL6^f^Xv0?w_|QFjc+Cc_G8beD3q5;77^#f)@oJ`%wM1-Q$zdk=Iv(zS<rw
z+#zA3_4W3ei{=aa7&15T2Oml?=v}m&|H_^7ip(9S?k-QiJ7IgD-{<Fl{(t@@_kGpz
zp!QcTR-2C>db2W^({0MpGn<~gl$`hJgp@>f{N<gzHv<J7JYH*rs3|l5ZWl`N;&pMB
zSy1qSqcQI8#5;YdqHKm{3+fz>H7E*-PYkyHT7Q#IRrUBgy?xp2Nnd7(Usxf+u{fiC
z^W3kCe%x1oS<64eyZrv_AGP<B=eK-*7yJMD>52C)ADwmjOWGBeRTp@5WFvo=etqnF
z^YhL;i|;P+dk;Q8<8D2FroGh<m2~@w+g~aPoK^95PN=Z4w`}ddD{q~<?|fa5Msd={
z2AN5$uAv<V6PONZi-Z|?vNo*JR66Jv){@NN;u7qsp{>-UrNL#`(6y#ZX+qM3FwNgt
zKAz1IItkq@E(uKs9g{dV=`>AL>gsZI5fJThX_^?Ou|Z6SwOiCNsmqnMqw%B`lYy&?
zNJtPDM~6;m(h-RT8cLd?j!CQ5h<Y>&hK5cQ><LWRAS&dsM5Jt~z`ctpfuTuF69p4`
zTp~q8U0EaIc4dc%`A^PR<tjK)f?K%TrHgCPNol7rtq+GbN-R1MW{{Jd?EdoqK9<xA
zj4#a0&sg2PSibz$pR@P2Et@x)n{(Mc`CoMcPE(iMxv2LyrvKyhMe+={bC1bzq^&M|
z_3`Sel}l&dubX-$CQRRT`i9Ny@e*QuZ1L_#^xVxRcO*L}OFJCn$=x=;_}$+3+Z5)d
zZwsv5mjC5X_!*xE_uFHVo4J;(yYb)r_zkV?G2KfoyO)&&sT@>N=bTh%r?&A_(lgu1
zRRww<%fpio_iImAi=Gm?O>)WVEO!sr;y2&+OMSLF_y0k)YWqKllyr5mCI*AnISvPB
zF7W;E=9*?$`@HM}b)WU-D!VkBwKJ<5Y?l1=(U?u`cCEJZoI<Mt;U)9sJC|C!y!tFV
zzdyU$U~RzB;|orTG8il57+;<JH`{7ieWAqde-gZ<xrMA6KfYd{+Me-#=juXdsWt<D
z!4-BFmrLf@x|>>Eoi|xqhpj<Ku)pU>>B{$OYquufw>i?VeCNCWi|?j{1U8({2$Wd5
z;Q!%*q%+$zMV3r$j1)=G){4{$6>?phr4yB0s43>E6S82UYg5jl8CTpEXLGd*rEPg}
z<>9~OH{V`d%-XsBispn9=JQ|6@bh;RYq&`|{F7L$Ghv}xzT6+pKN0=$6KfK8{*8}*
ztNGtu{_gGvrC-^MpE=ZTO)_J?p8mVz`iuFipE(*bOZl!`{IWK+wK^@z`X+zh+}vOP
z(%(#dp8w#(zIXfo?0S0Cc=D=~UaiY4Pq8hOFD%{|mK;|0oLM&`|3KKb=Dp8fPMz|3
z-dnkuZ>I8cEM&ElH{TJ~wI*i0`@NO#x82&m`R)Jc!nq>mar+|$Y}95~HNKeOxGJ$;
z<YdDtE?KE+ssD#pZTYNoRoI^Q&h?)k-S#nw#=FbSs(c=vTN3?znQ!gx33YS0`i;+A
zlbZKfQ0vRq2X)iu{)pFp&-|>mJ>*rht;kBn7yEbr3vizNXK%2wx&4zjHA^L|OnmaV
z=LyT?h;vj&>=F*!&0{F67i^{dbhnMf$LaSR`!)YhdNgBR+>Ud>q71R_TNXw#$S17~
zk68bAT4=%_uEmatGnS^USrej}nzZWJty>?(?HB)xpJSYSMD6IKB#T>1!eykVm%sTJ
zEXO@BZ#QG<)m@AgcUN3|U;b>>9P=cj$e99%i_QopaT}LUi=MSMyQH&mf84&ef%cpC
zuKGW5P4c%}^6%~JTZGgq_MD#M-@NR#^|y!rrTf&XUmbn3$Cj)5{N9N-%I@8%U$f4t
z{{7pt+rJgBI1=^jcHlqj_`c`Wi|78Tw{gF>T;%WkFJTt{?s_h&U0?G%)xD#+_n+7y
z)_#Z5iJo5)Dt_g)9{gBw^G=A$v7Fh@tMs;i{U+-kvFC{9#s!O0>MYN++xm9urg=_W
z!tA`%&Zj5JN=a7poXKe>c8eeRLDsF3yTd+i6N~@x&v@muf3r?s*{>TRYxlTR<M#T~
z=5=Aa3%A?8IRA0q^Z)*ZPxd{(xcbkegO&Yt^83SV?>AJ=*~~61bt!UE=Y`4Z*If9y
zLCh$2Ruxx3j>f}d|L+u@wJwW$U()hD_nt}1gqr@zAIc8r|N8m=%kP@-r|#!}&GbAw
zb$!Kkk3Z%t3s0~dWcY6K+{mx4$NZy##ER>Sul}@tVzkv&Dd_pO*Q=P<E$6@gPkQe<
zu0I)t)^bbi{_d@1VNH>6aQ^j$ze+sg+v;~&VsVLw-pc=7<fR+Jt6;O(s_dm@{QSB7
z5j-gx8&-BW95axNPyg{OPl8+Q{n7~+^4D$oYFwRGJ?qxGqifA>o^D9|5%O!N>Hg<u
zUT*moRd#!_dHEBowT9QaGZLSd{MBFn*7s}VkN8@tf7^|(f4``?SN5E1{;Si~(tnm$
zr%pP2@|TTOulr)(=^Oscwqb0K-v4u@{jy|<1J}%A!z?&{#}}XPep&eSONcI$hv)oz
z*9)XCf4eBkvs%6~X}hG_qqDP@&XC=-)>UU$YY~Uul<8mYXO<toVYB|vM_+^HeZ_h=
z=bPP5+?QNa7k#{)&*Fjpn@{SmpVw6c7%taZwQkLZMV?+NyHsXe3;T6S=NQL=qP4ec
zK9}6#yZLa>{qW=2iF1SJy!p|$eEzNvT3H5`?<IY;RkkhqEhYD8*`iywb}YNqzc)rM
zG)iEBt)97_!}`~24{URki(j`Q=)!a9-;)(t($sDxy08bWn4>;-rPJ1*atj|FNZWNR
z;9#G%%<+>k@>wi9R^B{j{POYk!{<LKUoO0TsDABtzfT;`w*8k|a*50CNj+D6Z`)rX
zd6#8B479u@W!FX3?OvrV!+El{+M7e#wDQFBvoC+hufO%DpQq0I?e(O%sq0hwQcwB@
zSSpGvzGPu3`GQ?1gQ@Srgp{J`?Z%y2&U4L@FYo#H>PY&mJ7Tq+`>rPa$v*d1`c-=E
z?ud?G_EQCB&bd|fB%$O8hmnU$lV30Ui3JY(ECK^2#H^QnCCVIr{F9B}<*lC<7Vg}4
zeevU0R=eMP`+7g=?YVYO-)M<cwNU+8`fs^QL*4e8KdN{XxgsWaNuSot4Hv(xU$c#O
zy5EtSWS$GPZP5~zaTc}vPj;-5TrK7%K65iy>HdG8YPa^Q2E6>_ZsVfX<9Im1Nlzgm
zF8!#|-HOUC=J;=E1<HljSeLS7E_i8OA=`5Qo^+?}iETSKYI4n=>-dwqz96=C^^acm
zkGAiF8MpO6ow=4n(xd&gCd<a7GA-MreRl0SF<)$I#EO}z*Mf7s+j-;V+o#JgZ{k)`
zQ{+p&W$@ESS+D=rZx*R3&;GuY`*QZkhb?>gkKT8@+LLB?^xbSO?G*tT-%EGwHoRJS
z_|h|e|Knm|&9yy-pNsxq`@&z}-e#SD^G<0s?{d%2YnH0YCMM50rliEov6-FWq3X-Z
z6~5CLudWC<uA6xF-x~ji(<Sfxe|E<1>t*I@Q{xLA3axyWfz|&X-TE$V`gMNiKZ*Kz
zi_F=2`j^R_vriSActPUO|8Swdwk1nNq~=;gTc7{9YU|2NGndq?S+#<_b~fuj<qq-E
zoo}tn{|VfC8vmtvQ;p3*#_Nv{I4+S8Ed5{X|K?RxwC$c3`rqgBr(S=xdClyf`7amj
z{{891FXa_$)t#&Vn0#6HL%#I=;q8?ZpQq1gFh02WfA`L#>Y*pUe%&g&dhfTxTd&{!
zA)&!KH-|5$`NK_d_wp}oY?Jq&Ub11wl_;|<dV5Q^?|=3EiFvUZ&lZRGKYlvAUXskH
z@+@XH`<p2H`<MN#uQc4gd8;&X?myl0k9!sSPjLMIto~r_L8YQpcQH#>H+Ob+v$_dy
zRu!?%FZmx^)WJ3X>y~RZ@3`jQTm33(twrv}ja}v0*6*hO%Kx%aGo|g++W(PBCtM#i
z-w3ZhzMWmde`P#>{kg=t_@lSxUbR=$o;d4ES<@UlX|J#e2fIICF%uHns4agwgmXdD
z)jdrPY{o5He5T%iD|t`8+_eAg%iBCQ>2pPx`6s#OU;b5J?0)9#_xj_)?$2z@R)3u%
zzxsOSuK)9;X5Z6zdb|9-u73D+-G^23@7_=4Hvh4cyVhs*m%r=d_`{ZV>dbk*rSRCN
zX&mo1`iWo4;^feYzkD<NdjIUNwNBH+rx*R>EjEaEHL#R<Qt;<V@q8OMC$4j=ch_rQ
zi~Hy8{^ncU_6M~u-G4v&cPD5;??Q?FM-vx)c(6O^{JVeRe<MwKS90wsI;Omu*VWNv
zn!e7g+Q|VoC%pI(E;~VX<#ZmU|AK9cdvlgD{;#{PdD4e@rQ)^o`>Tc5cNIM5=WobS
zkXgp_u2EC}_?`UJyiAKb>1X=g!|e+`TyqTW-%_~F`AF_ml?BSliS|X)<EO^d8&~JH
zo&NT1%k&50OBz&E1XZv4*Z+C-|K{iY1vkD(-mi+!+xdFQ&AJfTx|w`h8C<Fiu9fHh
za4u2}YrA>&&lE>V>H2%?VjcHK$f$h1wAcLLwyTbM`X`P*tl(IB`px|e-n8%H@mDr4
zz49wz%X@48#p_ykf3nnlf5W8S@aO;epLe}0ss1Z-_U~KyoxlIxICl4R`<$QZoBngX
z%inwVO6p2uv43sb9q*J&@%&%>%=SUq#IwKaH04h(p1ij``g^=a1k?NrFA@dxvMlTJ
zigzkp|JEk>_hj~l3dtsU3CB3o=%aeeC*HHWkW!M(zuK66YS9yWUr`m#38!m}W1QFC
z`n!F@Ol2*$u1_nr+z8pVFimLYgeE`s%9Hnv|IEIc5E1>q%<O63#`A8!xK_5fR2gf1
z;Q61sMx<+7vEZpit5?*ThTPMQu#&oCDfMgr{k`?e6_->Vd{|<uIlub&55)rZs0BG$
zpKVv$=&Y>k`e$&?=XZQ{=<<*3;@f{He{x{!`F~L8*<u+6kx%`Rfn{^q-X`oU+}E41
z)hNpG(BfX#{`s#q>@%x*8+QFkj%7zditd4+;`_?X*Z-J*TyrLT^6!?5vp>!_tdV!*
z!G+lNtez#JikHvGE?K)h@BGP)&C+Mf#mwI&zw~||eX=X#nZc{xhjS!5mOMQ1uYFqE
zZtu=XzyC|!l(v}qm;d0IEh>3BGLqs)`ij|DKJo@BGq0W|oV8auwEC3%)b<sx_iaD3
z@87DkmzI5gl2OjX>3ikI_Y#YA!zaJq2cNICu5X_IcP?Mi1FQ671`WBI2Ulhr*xiwT
zd3tZR{;Bu->bL$d?R#M^ej(HS)AzD4iMxC6?$Nl>S1xwnX}PM)z4>!CpRYeVO+-EC
zSjyVj1<x7P86G@%TGG7W<llX==UqRR{r&oX@snfg^X-GZJJz|$YAu&<dR4fWU!qcS
zPVR>@pK9f|S*l4I3dsC<wXgO1)x_Z7{MoCndL3)L`1XvbZ;Rlm=He!%z)$LvedNTX
z&Mt0?x^yzUa>dKS|2)0bNmKJ1dJ{eUGD|)#e$ltSU=f??jIaN8_~tF!kzl;$+so$G
z)U}WQ@UAWYz%2W(X};Tv7Ui9p9EHr%Il%%muNL2Z-g7%o=u7Zqo@BA5F4rPt?izM=
zDoylcF^(+QGIMS6!f7|^CL10!yK&~oro{i-OCCwY#N_MrTBgYM3cX->o~u@2DfFbs
z#D2&B)a@UOcWgQRY>mr-lPBCle#qIDE~+)Xr`S^78@_e*xngC>mp=C*u5%k%m#JuX
zl{{I{=}<hyxq17W&^?=9y_~nq(pb91&Er<7utK%|z8CAB3vFJw&3c)0{YklppEf#|
z{n%{Zc|U%m*CwC(^BM|A+*Vjv3Zy(NI=XT1=SyN&a)0kXd{2F6&!z{<ryp#YzOwdr
zVk_J3)vMdxoNWHMZdhDvtoTW}yt~wVk66#^l&8VW54UM=ES|qPf6=GPSbmF;hh}zV
zKiQ1WUYh*aly}$9`!1>H=YLNrl_@K@_Il@>=c)Xk^Zq@xY~II`F;VT;egDh<w@*=a
z7Hz%qtmf7KtvBWOZ~pTyj_207_IZE!_CI-*X*jR7J8UicPnNgM_uKRe9QMCg(cR8_
zkUd{?&)STAtamIopO#v1@%&MTR~x_XJt{8s=$e(`#?8*Nc37=AQ6ObpvVJljhw;Hz
zouMD1L*}y`5)7C0tXOuVK3KK%i@Vf(^)8X<MGw+$Kl`&!jcrn7_NlM0e;XxCj`k1#
zT~;7<cEP^ipYs-k9?tr;X2Fc4^pr1?&EigH`0;0MJo)|Gg6qi)um5TqGAnMoBK9!N
zsN=*@R%Ttp73+00=S}~<F1uL$@zW!h<d;pocj4Ez^LBI8GLQb9x?-|~#^yH-6Susd
z7Js(ec*{kdLrZq>KbE=EQku!Azc040!QofLG=;yL=QMWoG`KA{2;EsC<Np0?|K=NC
zWUTLRyZYynjq;|fRqKyDe-l`tZuIou{+Z4K*S_WaH0hIGR{ihWw4~>+H8>>-;+0!3
zmufuzc0aCCs_Wq1!tGmlGWID6E#Uv-KmFCcy6|m0&zv3Ce|fp<w!Uy{s{5a9w#6k|
z)pKlK+<Bg<EivV%pW<N=i(dwd&pW=|S0?#N?)&W5>yNz-K2WTAS7c89^?zlZo9A2c
z=`2{r{&#Zw#|5ERKQDL7=lVNsLg`w@jpiKL)6Q#ce!6UC?pBX-d+*zIDgHMaY=h5j
z$gMEg-SOi0$u6y(+J;{K&FP)dF3m4l#G)C!m#CiVzbrA~Sl9&7wxuq2h0~3^<>!U2
z^7{HEUuVlNiwv{b)>;Q+I5lR(+3AEQw&rQ)?R#y@|EJDrvB$^Tnb+oPPg{`B@;brl
zYu)X}@RPwd8}5g9Jin~|%l>+4$-VTzihYwiopy&lI(#$qzue?=Z}*DNOLY@n9=__Y
zWYxRk#s9*^{Z0O*#O2F|R?B~ju<Oj;r<$@ky8Dl<Ubv_GnZ*<T%5DF2_H#}8Uj~*W
zb5%#XtR_$X_w#-P9?=TEU;kb>FOUEI?Sem7KHtpp|Gc90$ILM27lIs2&!6o5Xyf#u
zj!(X8`Ni`Ki#6<{6xUfUR^<P!lKeAq|J3JF|M@H)Jf6}Y@p|Ut)g@fBiv#{&<t>nT
z^LP0=9m&6MKVL4*(L2BL*iWl3TDxWIJ14!%(5Mtz#QJ`>XHk_xs)$$c*9qUYe2L7r
z&+@Lj?Dy>N=I{XBW8VrBCvh&Uy6xop?e0;F9La+z$|nSGnpEvqxxek-RqabZgPxwK
zto@tqU7K_w(8>P%qlH{^>eg+(@Ze=wj_^NgnU?B(t4vd-Ce2@<d}g0>y2T3-i~3!q
z|C;~KKPQ{Qu!duyo3m(Wtyspj{X75FCB$|g=I69`pE%+2gG28Q1gx>-*ScWH*^xP6
zyXsL1Rc_B<**gbTE!#A6u0+PQo>uSNga3a|50Qx6I6HCS3A=l@e7BmP+4jOQdF$b@
zw~on9-!jfg-dp`rje8CQqhCXlLf`=d1_`0gYqyRFDSxuMroXph-V*z)8$Wf6Me=;+
zJ$`&GN%`>+|KpR~H@K$XJ-=(l?+j%*-KY1ZFWlI;XKVLu?iD4xo-$2|b83!E{Bv%T
zRebid|7VUBTkik-qUX-6x4xHhPuME0HwjVr@0)l?NJ_b4zu^D;DeJdPZc<uidB(-s
zU#-b~;jSg=p8}1pT7Tk5S$oBa>%{>Ug(Duj*w_s2IDROd5&pe}Bi!g@wVf>AH(PF1
zJDv=?*}dPlZ_5A2ox$|_z0<4vuj{s-p4xp|@aFcPANTqkn|$r_y{mt>PW^r7>&>4x
zO@l3}=drJSUVZ;?{ob7yU;cO1mH)G3Vcx8uln37z9J5`S()B}vS^Sw^qH$SufSiPz
z{I3fJz5WKfKk2QFb208Yzu3cQLFBLf$uDlsa6a{W(o>I)j^#RCmpuRVurAVB!Z^>^
z=#}jzk4w7K4OSXj#7GIc^8cUp{BTIPfW|)G_tRfm%c)O%@+K#H;$vB-J4}`u9M2c6
zt7ZM=9~g7_@|IKo*Ciw}ul`p2!mD4GZL{{<qL=xiH~n*-ep8S=bZQb~X4khz%TIrL
zu*tF2v3$k3>vPpIZwD`^`ko<`v@l0r|HgZZ<GOP<$CPz<&;94}C$iTk<@wgysB+Uq
z-~ShX`#H~kQdF$&v#`wvc3Q7EaQw(|S)D`)fg}lm3t~DUOC%YlD!cnyCI87<9semh
zS0QV{Mo-~iPcQh-TKVB;d*-C+kso&cUU~j^UHbQXo0RW0J-Xn%G^u$17nf=0?_N(k
z5M}>kS_zZ22d`lBT+WqeuOHaUKO=VSkHzcf-~0M+nc9`qYkDi5|32Z)?tfQ-Z)wga
z#!m&)f_(&5EoTgpTDnt~G0iCO7sqp+i(jVu`7gFexnj<}|AlpT*Pfcavp-xck>9uc
z_tl+u-9DKA?$GVIeqz1o`_C`gUw>P?d7rDrZYzdBYtBYaj|kfU^YuI$UNfKFzW!M%
zr~bKPaIEZC*=*srdI}CtG}%8_iO9snw#Zzq-*+M7u(`3Lpp5+WIY&=V+a>33^GEFt
zM;FV7IIE~_{FACo?t96k**^c3E5G~aswvWU?JGY^`0Br}Kb>pu|HAu&d36-ig^oGr
zy~6j*zH?A8SzBhWmuB)3t#{3fZ@e!rJdqMrv_7zRhJ5G;&WVpM_!>D><^SaUn}6|R
zhSWTh`pwRUO-7o3C$?xa7`Z0fy=1h%Vqp0?|HA*-dA5CX+P_`6e3;K`!kVa7fgrAs
zHGF$F^UA!LdUw_q))`l{xO$H8O;<MQ54+61I9#Jk^hVW=o&U}rxlzCQdzfs`gPRd^
zK7Cx9v69z_cf-ypr*mUY_e>Sq@M5Vmx7E5se4Ql$fAykFUe0}EFmsyhO=-T*H~*We
zoq199=|IP^W)`Oj$$yqi66P*);FQbwyyxMDFYNZ$`<;a^=%}{_&(_=dxBAnPC#B}I
zw^h$$Nt0Br+$N*m{<yX5xs%noT}43&C;2wNczjny`&`LhZO-zfjmf``UHu>4UMzQ|
z_mKQ!gKLjg-*%I?|5cy-`hVX4-kg_GaqHPcWLG5b;=I0o<D}l5|9l0V`n~w$UzEOD
z^HHSs>hd$E4;<z?yIVQ1Nx}8X1a{4*Yqz|;<{@>g{p5wB{h{|y<{YzceDmO|eP!Hz
zv%jBQJsIamYw!7Cf9w>yxaYe<>lI;h#jel#z4C*-c>LV|cE>;c+|M)7ph5Kh>IGZ;
zyn0iXo!QuxVQ?U?sQ#bH#|ibT-O@MByZGUkui^vQc;)c(DJ(}^-^f2Z^*Km$c?^@-
z%1a8nC-<rFx5~5sKJ2%7$&K1GJRkHjncwWWuuA)#xqn^06MIw7yGsR~zQ=ZYWTY28
zKig4lcRglr+H&_xM%tlP`&T^Plj!&QSik`t$0GCh2am~nKY16UH+RpEedok;CY37f
zm-u;q<B#HxmTBsn|J158AKLrld-XCUy={-r*zdk-{$1vqjdrx)<8RaV7yh5PtD)iZ
z%|HKK@0yvfo&V+tn~l=vYN5wVPHozA_IvR5S&LlVepk5jo_4=$vVCoF=m$r^*<77F
zB&Cn~tm}DQ&$NAy=N$D{ObUgc<vwkm`Yz?y95-=gh8+FXAJ6{rir5^b@M_*=-}AFR
zXgZ%d-4)PfaNqttpFjJ$x34ljE_$=^@V)A<|MVNb{CpA;7Pq|qQt6A&yX5%gg;@D-
zpIP|jfB)TsEeE+Z>e4T7&92*d`rzJ=*~WJBMb9VST>e$|%D2e9YMYh+&-k!2eEX4*
zQ>=?+S`%YyR6~nj#aA9@k9NB{y?oonWvdUgpFC$KU-Cs?>#XP!;V&1QI5s_*6sl1&
zVS?F{g%S$gTN>8f{;*prWVLQY{DsMTW~<2jl7E%|%Hq5I&%SMay)6EJeI_k`x=ARD
zqg!{nuSoo|pYiOyRedk6O?~=8Og#7hiPty&&HlG~Q{ER97vZn(B-y44W^rY<<|kIM
zbm;`IoRq)g!d>nutY*7!PD)94DoeYObB;}^W_zA{<%*|OGyhi}<6LN&rWY}F$x@ws
z?Frr%D(`PC@pMrRIm@Tm@Qk_9`i!w7&+(rtn4MG{ty)rK9!Plo@naP8Nci00{W9={
zUufWu@3;8aTiwqrdvCd?toe8G)yZqFEM#&1DENKqir<;01=^Rqa}<wWanzLdd8V{8
z^|0#C``_wUD`wfx{y2Nqjk*9{1_kT&0Zu1nJyh}|cJ4LmStegnvfuLb2CXaX0Y%I|
z=M)JP3n+3tH+Z|+?*1K#@Y)j(3`2JOTdUH$;r;*o*!_#|*2l8_KbN7Id*FHMhksvl
zw%OEdzw;#1c75B{YWtaa_P_If8{T-3zi)N=wX1&5%4Bq>tHvC^zx3_S%J<P<oi3)8
z)cNLbW?%jE?TgxP)tx8J7#S~4nl<_Vyblkm60*L^ekx{3bn)NVzdya~FaNt}tu<{^
z=Wf6JFHrF3{^?1Z6pSoB%&AH<U(LeX_ak=B@$${W7Y?j_==7<6@!yJY>D~oD6fYUa
zzi>-2e#af1?$&qj*8RfO@#m%rf2^r}ej}vHE8)kXEydXybGUzO+EzVz=6q*v@5~)9
zOt!6>D*1oM`N@HKvig@9UT(8|d@w-qUDET?@Td=L%yPZv@pr%2@#m*cI{PZd{J|Ub
zKSy$e7B%luyz@wXeP{I3se*TfJ2XOKGcR}^7uhvs$qMFob*GL5Zq5;@>UY|>Zu<N{
z=9J>!EH4zAG;F6vpFPynb;<BBXNobak<HE%6S5!AI%C`>Ai33U((LD-8F$8+-+z&r
z&yy8!p|&IIi_OPBnfKo5Up`kZ8Ml4!wWD+1x&BqywCHrrJ@<su3ilr$oqvAs#NXF`
z%`5uLdH?>4^KoBi)N;q{_YVwwe{DbGC7FGZ*S<VoSomhqS;bGheIkp$`+FXrl8_!W
zYj5qgB6c<Q@*v@-&lq0x{w|qX&Fyz5J$3S$M=n!%pZvGG_c&!Y|LLhmdw2wrA_OdB
z_kD<eaEN(N#>#+(ukQ;o?uD71xK#c1?GM>C7wX#{zRzjC^59l>-I1Pr--fv3C0tU1
zw<FnmA8*;kx5_qT{#-xycIF>z8s=9DEnrkytf*wBC^FGeE_7jLiQ4jqm;FxcUM9IM
zE%lmzbNb=s-cMqKp8Nj{Q;j&y_@F{<Q&Yr}<R-?22_fwPXD3M<xUA)Tt;{JSrR3HD
zLoFS-uFN!%Rwo?=o!LtwB#dNTH}FPi?S7>8(yD4*zDLKLN!Lu4Nbcq4$;n;H6?t@d
zXxpTOwnZ{ouQ;@<?zLai7tj7H`@uSPLz9Q8M#HYOrvbCodPANvT0MLqKA~s@;}(W(
zQM{MEW-LCxDI&*?Nz;G--R_>fVtf;p@A+c#*ChMxt?#E6E&a^sYN>JQx|R7!?tON@
zwA}OC&p0iWS6^}a|M~C-_q^7ID0y_<5B}G`-P?tyLE&VsQisa%@7DVoE9IDWxwKi$
z3TEL+k$ru*=_k8i&7IoI6-x7;tjHF+u~7fp{>Mia<R069W$VIqj)^BqW+pRC>rW3>
znPC6A&gXy0x4*KSSES+-+w+@v|IgZ@cB4V-kc7@W7Wu=5=M4l`9B`=8zw+v(>n|QJ
z<^#XY_B*Dn*yCVrRsBFK%#OqTl8~^|-j_0)IwDkqILzfgzjxxjCvaQD=&+{SEO&PE
zH*b|){_kHOyMM;XS-SGw{|j`d?5q9v)mBTy;zQu)>4B%VM%+-*o@#M_f&llq{3Bn=
z<oc#p-rvA;O#Zps-TN=x{~Z6e=G^?&eD=WF$0`!JPYkCmdo}TYcewC^HcP2=o!26l
zPU}owa5$&&Y4*!<=HeGezI@7IYuv3?T`SEOR)2cU-25498h3xYc*DkjPU;Hz%&AWU
zZy&sUeEOgGf4_J(o$0SPUvu%q^_Nd1RX#oOUwmrWlNKiT$~lLRmP{1Bx771P)CnCn
zmq(Y6wIBKWuK#_;|2e1sE6e{}FDsp-ox9fG|Lpa}kId~(|C)94>E>@Q!uLD7NnPEO
zU)bi>94<Qf@5J&iQ>L-!?B!8%eAJO+=wtES;{b~wlWBOOdE%8afl1}RSbpdgnZ-Vw
zn*QTn$=*e6rS_4>tK5$L(RVVQyWOYdu#Hi#`h`r{#a9dME;5{Oo_N;V#3)HgAuGAL
z|NNquRYg1g+`6>#b7V?SXt`I%vh_MWA&rZt3LG<&^G#Ed%sQN3y;e$j8k@@F5S2hj
zK}pdN@jHccwy+;442W>G*y8ei&CeY*VM&K)ruLuQ)S<Lk!d0o}wbqgL8STdl9$jqR
zBDZhOij)+a?UC9d5$>-y^L>)ZwJKPtH2cz5(+$2qUfkGv-&Cj4d|!VPLvGjdExk@>
za>XCUUFKfu`e&8vqC3rZfA5>zDgHhB{B35FpYNAhyZHZ{C>Vc^jYFhA;-tw|MIqN%
z)c}JP&Gq}vZww8s&#dEm**d|@xW;Pt-ReArgL9(g7cXDc=A^pU&xLc&j^nN!tIZQV
zH#2(F7ge6+i8wcfBcOIlYs!pCc}B^$0SOXczuxzEbY!fKzP&A_U1d_4k<f;&MN<pD
zZjw8cbJ)K;F^s|IqQn0SPoBTok>ccasazo<@2HK=ktCPdrL4!;ee-UMWvOUPZM>T=
z9ue@HZ}o*2w-=m~TxnIdW6>?v=QDfCeWd*Df;|q0Rr9&_slV{Cz31e-@urGZkSO0a
zi4(%pC7xUg5luPm@gX)sDN5s@cHBJ6U5%5{ZmbAxetCIq!sjDXjkvVb{>4?!&Yi^5
zJ-7V6uiUo#-{Q8H=Y8EgZ>1zdi0hj$#R$a|_8m(ndtQ04LjL2fL!#GZcA4F{y}s&q
zaI{XtjJ7txS4Q7&a341aR<UhmKl`WdG+Um)yoJXW_Cy>FDA_eV*!||I?CT4p%gueg
zZ7gRPd`zEiKUw&f=O^ngEl=`~zI}U`w?l3Atqr!7o*&%3Z=GX5<6^+q7i4y#Mz?-p
z?)M|SuNkKQVfi6tbcpkO+`jdy7Z2>;es&B0>ACZji{q6#>eJL4Ykeo4n}20t-Xt}#
zn2aU-aTbS*y0-L0t;^d~HCyG8W9%34-mSNuw6O7r{pGaO=l}6l-q|MoX2kTi15e)<
zoBdSzbRoYla@U!Q%lGt5S+;H4t2b@Fdu{~8H@us#vB1TlHBihXdDWpDM-k5Fl`6Xq
zx+Nt<yC#R;dvjhUKQ*RrK@wl>yY2%e+~;NmcFaC*8XU6k=Dx4$tt$Tw7tcCy*ChGY
z`SmVqv+w`w*GqlF`Rvk+4CB`aG_G8FRJ{GgS>u99J3EgtNgtN%To@vBk(q_%U1!cS
zdzVYG7Dtp-XKwH|^wBbv-mP+L*{iLmQv(0D+)I4Et>!>e#wP`a-1y(GBmC#J3OD^<
z{aZifjLi|tYuBykX&n*E?-1}dHV_p!cqslFSM!;MjT@H-zVDkf)&8*PCHJ3;mK&aU
zw8TeYs<4Z2oY~PX-em5ljPgMYs|EFcTddZ7-M`l;s?nKY*Wct6k4G+_11g`~o276i
z@L9%dllhslb0kAjSLaW89ND9qGH;cJ=!8o$ZB;LXC)IvFes0h8Pp4+Q>0I*WZ_cc;
z2i-m!U8Wz+aJ;^yKkX8)y}tOt^{?xFU!Rljep6|+&iv-Ltkn-PP3A5>V*AIA>Bg14
zGChwcJgmK@@wd5oLiGv02?8gLxbpUYTex_yLmL0Vsq^)%KRz}-KHukG`mNC4Ni{D{
z%!qrt#5r@?WT{0ZM*=F&OrI22&$4IPi&xKT=O6!GXLa&x?;B0^@SuoyuQOh}2#(0n
z(au^E-);5z=KtCDvp;Ok-TL)!hUJggDb^9QJ@&ffZWa9^S$<{vl}qdN^z`)g^78WX
z*Eg@VPL7SVO*nM!^3^cM2nMs6so#<#mif&)8mN2tX3Wvu3;wk}J(oPM@a@yytIJ}X
znOMbmTOzJs+4$gmZvM$*vw2^f7n~oF7_9bYcaQ<s9k2GJ(5X+SY+ih5%aOws88>aD
zf4!LcYPHYRJvCfuk?UIX&feAT-=K49pZJnvBA(q#&PBxD4_JQEwZF4IJDAf)Tx(N-
zaHX%H%Q5X&0i5aU59|;wD$bK`oHRW;G&p_A!Np6ewoE+q&sRKR*1xc2kDkZuQz?J7
zYL)L{&mQX+jCmOjR%|i<+RjhxE<g1~Gv2dhZ;N)-rmZU*GE9yy?aj{YpA>Xyw$P-7
zRT^xJm&^)g88R~|r>e1?o7%7Myz_Y9yd&Dj6mkTPZTwcxzUIj4v<&`JjTP2?B7ARO
zeSUeWy<2)Bi=qCHxo_v~W~g1if4SR+29XKIbu-USO`i0;>9o=>bFuvyo>Tl-IP$aV
zZYk@}{`YFWtKjlw?`!>nUnJUOKJ^HBEjPtCJ^1vIY}tFuQ|sq_pW(N(ankL8tqms&
zFB@+TTH&fyv52#QJDn@vxL{Rey@9>=Lxm*=D`l-7`8fR98qs{`c3OGMA2;rh-}gQy
z{hj~e)r?b#503Q69$r<yV8=f9$a8gvAMM&Fwy|!4Z2ZK{D-+rSj4Z3~_T*07?RH4#
zUzA=<*uCp&F|*pX^+r#<?Dmv*`UkJY)((xI&WI>xwn~1T*mgWcSw8u*U0vb)M{$#;
z?bs;t!K!zSPyCTfYYlGq#H2XLZ5HdAEVFO9eoxx{mnFB?UY#W3KXd1WJ5P0Q*qm^>
z68!VO_VeKG*(u)DI;T5kwl~bXa@Bd|*`@8WjT5`J9q2vq%DA9n;kixAj{cXPdSLr^
z*N?vWd;Z;<{rA-`2b;si9}c(8;N|@r<-1j3rNklWD-QqSGi!7zbC+eGIm;}|!1%Jj
z$cOvK^nhrFQ$cele$?!i{d!fc(ycSqIrM|eR2Ie1)3&jZeI7PPWV)5+)=W%0EoUU4
zqa?Jd>Ze7claQygL*=CHy@6Fzc*=LW`0FiNcf6-MG)z+4BPTf{H}7TGsnbq(Y}h))
zA1F8^sR=0<6j$gsoIAa2)2y|I%g*F9r+wYNG3)A?O*gFry&NV^C^OWxUa*sw$;!ka
z@xgcL`|39<?_Iw0GwwP2f@3*Gb%zWE8y;SGTv*}7SDtz9z1hA!tBU^r*gZ+}P)oz3
H+U*qp)w@1?

diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
deleted file mode 100644
index 4ad8bc93e44..00000000000
--- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-let
-  fetch = { file, sha256 }:
-    let
-      nixFetchurl = import <nix/fetchurl.nix>;
-      args = {
-        url = "file://${builtins.toString ./.}/${file}";
-        inherit sha256;
-        executable = true;
-      };
-    in if (builtins.functionArgs nixFetchurl) ? executable
-      then nixFetchurl args
-      else derivation {
-        name = file;
-        builder = "/bin/sh";
-
-        system = builtins.currentSystem;
-
-        args = [ "-c" "echo $message; exit 1" ];
-
-        message = ''
-          Sorry, this version of nix cannot download all of the bootstrap tools.
-          Please download ${args.url}, make it executable, add it to the store
-          with `nix-store --add', and try again.
-        '';
-
-        outputHashAlgo = "sha256";
-
-        outputHash = args.sha256;
-
-        outputHashMode = "recursive";
-
-        preferLocalBuild = true;
-      };
-in {
-  bash = fetch {
-    file = "bash";
-    sha256 = "0zss8im6hbx6z2i2wxn1554kd7ggdqdli4xk39cy5fchlnz9bqpp";
-  };
-
-  bzip2 = fetch {
-    file = "bzip2";
-    sha256 = "01ylj8x7albv6k9sqx2h1prsazh4d8y22nga0pwai2bnns0q9qdg";
-  };
-
-  cp = fetch {
-    file = "cp";
-    sha256 = "0d7xbzrv22bxgw7w9b03rakirna5zfvr9gzwm7ichd2fh634hvgl";
-  };
-
-  curl = fetch {
-    file = "curl.bz2";
-    sha256 = "17c25dfslw3qkjlcmihpbhn3x4kj9pgkslizv89ggnki7iiy4jgh";
-  };
-
-  tar = fetch {
-    file = "tar.bz2";
-    sha256 = "132ylqwz02hw5njqx7wvj4sxpcrllx8b8b3a00rlv6iad671ayyr";
-  };
-
-  staticToolsURL = {
-    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
-    sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
-  };
-
-  binutilsURL = {
-    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
-    sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
-  };
-
-  gccURL = {
-    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
-    sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
-  };
-
-  glibcURL = {
-    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
-    sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
-  };
-}
diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2 b/pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2
deleted file mode 100755
index c014e9cc044eac1edc13d6f26b3f6f629eef7fee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102939
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
I)pP>}0COIHWB>pF

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 0aa0a9a840b..02635bf1fd5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -16,7 +16,6 @@ rec {
   bootstrapFiles =
     if system == "i686-linux" then import ./bootstrap/i686
     else if system == "x86_64-linux" then import ./bootstrap/x86_64
-    else if system == "powerpc-linux" then import ./bootstrap/powerpc
     else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
     else if system == "armv6l-linux" then import ./bootstrap/armv6l
     else if system == "armv7l-linux" then import ./bootstrap/armv6l
@@ -52,6 +51,7 @@ rec {
       then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
       else [ ./scripts/unpack-bootstrap-tools.sh ];
 
+    # FIXME: get rid of curl.
     inherit (bootstrapFiles) bzip2 mkdir curl cpio;
 
     tarball = import <nix/fetchurl.nix> {

From b614ea22d459a34ed6163ab5d94ae6cd28ee2016 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 01:27:15 +0200
Subject: [PATCH 0367/2033] Move files

---
 .../bootstrap/{armv5tel/default.nix => armv5tel.nix} |  0
 .../bootstrap/{armv6l/default.nix => armv6l.nix}     |  2 +-
 pkgs/stdenv/linux/bootstrap/armv7l/default.nix       |  3 ---
 .../linux/bootstrap/{i686/default.nix => i686.nix}   |  0
 .../{loongson2f/default.nix => loongson2f.nix}       |  0
 .../bootstrap/{x86_64/default.nix => x86_64.nix}     |  2 +-
 pkgs/stdenv/linux/default.nix                        | 12 ++++++------
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/stdenv/linux/bootstrap/{armv5tel/default.nix => armv5tel.nix} (100%)
 rename pkgs/stdenv/linux/bootstrap/{armv6l/default.nix => armv6l.nix} (92%)
 delete mode 100644 pkgs/stdenv/linux/bootstrap/armv7l/default.nix
 rename pkgs/stdenv/linux/bootstrap/{i686/default.nix => i686.nix} (100%)
 rename pkgs/stdenv/linux/bootstrap/{loongson2f/default.nix => loongson2f.nix} (100%)
 rename pkgs/stdenv/linux/bootstrap/{x86_64/default.nix => x86_64.nix} (92%)

diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
rename to pkgs/stdenv/linux/bootstrap/armv5tel.nix
diff --git a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix b/pkgs/stdenv/linux/bootstrap/armv6l.nix
similarity index 92%
rename from pkgs/stdenv/linux/bootstrap/armv6l/default.nix
rename to pkgs/stdenv/linux/bootstrap/armv6l.nix
index 542f74de49f..85b86835905 100644
--- a/pkgs/stdenv/linux/bootstrap/armv6l/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv6l.nix
@@ -1,5 +1,5 @@
 # Use the static tools for armv5tel-linux.
-(import ../armv5tel) //
+(import ./armv5tel.nix) //
 
 {
   bootstrapTools = {
diff --git a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix b/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
deleted file mode 100644
index 0fc2002068e..00000000000
--- a/pkgs/stdenv/linux/bootstrap/armv7l/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-# rely on ARM backward compatibility to build armv7l binaries with the
-# bootstrap tools of armv5tel.
-import ../armv5tel
\ No newline at end of file
diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/i686/default.nix
rename to pkgs/stdenv/linux/bootstrap/i686.nix
diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f.nix
similarity index 100%
rename from pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
rename to pkgs/stdenv/linux/bootstrap/loongson2f.nix
diff --git a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix b/pkgs/stdenv/linux/bootstrap/x86_64.nix
similarity index 92%
rename from pkgs/stdenv/linux/bootstrap/x86_64/default.nix
rename to pkgs/stdenv/linux/bootstrap/x86_64.nix
index eb8c1834a3a..71961e6961e 100644
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64.nix
@@ -1,6 +1,6 @@
 # Use the static tools for i686-linux.  They work on x86_64-linux
 # machines as well.
-(import ../i686) //
+(import ./i686.nix) //
 
 {
   bootstrapTools = {
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 02635bf1fd5..1c6a93b222d 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -14,12 +14,12 @@ rec {
   lib = import ../../../lib;
 
   bootstrapFiles =
-    if system == "i686-linux" then import ./bootstrap/i686
-    else if system == "x86_64-linux" then import ./bootstrap/x86_64
-    else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
-    else if system == "armv6l-linux" then import ./bootstrap/armv6l
-    else if system == "armv7l-linux" then import ./bootstrap/armv6l
-    else if system == "mips64el-linux" then import ./bootstrap/loongson2f
+    if system == "i686-linux" then import ./bootstrap/i686.nix
+    else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix
+    else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix
+    else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix
+    else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix
+    else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix
     else abort "unsupported platform for the pure Linux stdenv";
 
 

From 37d5e9c45596c2c12e2982cb1a87389dcaea7c75 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 01:53:11 +0200
Subject: [PATCH 0368/2033] Temporary fix for installer tests

http://hydra.nixos.org/build/10455979
---
 nixos/modules/services/x11/desktop-managers/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index c70dbf3b911..26b0612671c 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -159,7 +159,7 @@ in
 
     # Enable helpful DBus services.
     services.udisks.enable = ! wantsUdisks2;
-    services.udisks2.enable = wantsUdisks2;
+    services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
     security.pam.services.kde = { allowNullPassword = true; };

From 2fbb9aba43033ab32157513af85f812cd8c95782 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 01:56:11 +0200
Subject: [PATCH 0369/2033] Fix the installer test

http://hydra.nixos.org/build/10419676
---
 nixos/modules/testing/test-instrumentation.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 7b4e5a8cac0..9100a433cd6 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -86,6 +86,8 @@ let kernel = config.boot.kernelPackages.kernel; in
       (isEnabled "VIRTIO_CONSOLE")
     ];
 
+    networking.usePredictableInterfaceNames = false;
+
   };
 
 }

From 8267fa4694d7afe3579f8e7016a8a27c78eb1a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 20 Apr 2014 11:29:10 +0200
Subject: [PATCH 0370/2033] androidndk: add v9d

I also updated the buildApp expression so it can build ndk based apps, when
setting useNDK to true.
---
 .../mobile/androidenv/androidndk.nix          | 31 +++++++++++++++++++
 .../mobile/androidenv/build-app.nix           | 20 +++++++-----
 .../development/mobile/androidenv/default.nix |  8 +++--
 3 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/mobile/androidenv/androidndk.nix

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
new file mode 100644
index 00000000000..cbcff8178e3
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, zlib, ncurses
+}:
+
+stdenv.mkDerivation rec {
+  name = "android-ndk-r9d";
+
+  src = if stdenv.system == "i686-linux"
+    then fetchurl {
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2";
+      md5 = "6c1d7d99f55f0c17ecbcf81ba0eb201f";
+    }
+    else if stdenv.system == "x86_64-linux" then fetchurl {
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2";
+      md5 = "c7c775ab3342965408d20fd18e71aa45";
+    }
+    else throw "platform not ${stdenv.system} supported!";
+
+  phases = "installPhase";
+
+  installPhase = ''
+    set -x
+    mkdir -pv $out
+    tar xf $src
+    mv */* $out
+    find $out \( \
+        \( -type f -a -name "*.so*" \) -o \
+        \( -type f -a -perm +0100 \) \
+        \) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \
+        --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix
index db7067c989c..ca00e78b2cb 100644
--- a/pkgs/development/mobile/androidenv/build-app.nix
+++ b/pkgs/development/mobile/androidenv/build-app.nix
@@ -1,7 +1,7 @@
-{ stdenv, androidsdk, jdk, ant }:
+{ stdenv, androidsdk, jdk, ant, androidndk, gnumake, gawk, file, which }:
 args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? ""
 , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null
-, ...
+, useNDK ? false, ...
 }:
 
 assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null;
@@ -18,11 +18,12 @@ let
 in
 stdenv.mkDerivation ({
   name = stdenv.lib.replaceChars [" "] [""] name;
-  
+
   ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}";
 
-  buildInputs = [ jdk ant ];
-  
+  buildInputs = [ jdk ant ] ++
+    stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ];
+
   buildPhase = ''
     ${stdenv.lib.optionalString release ''
     
@@ -33,11 +34,16 @@ stdenv.mkDerivation ({
         echo "key.alias.password=${keyAliasPassword}"
       ) >> ant.properties
     ''}
-  
+
     export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it.
+    ${if useNDK then ''
+        export GNUMAKE=${gnumake}/bin/make
+        export NDK_HOST_AWK=${gawk}/bin/gawk
+        ${androidndk}/ndk-build
+      '' else ""}
     ant ${antFlags} ${if release then "release" else "debug"}
   '';
-  
+
   installPhase = ''
     mkdir -p $out
     mv bin/*-${if release then "release" else "debug"}.apk $out
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 1e87c30f6bd..bc022bd70b4 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -81,10 +81,14 @@ rec {
     abiVersions = [ "armeabi-v7a" "x86" ];
     useGoogleAPIs = true;
   };
+
+  androidndk = import ./androidndk.nix {
+    inherit (pkgs) stdenv fetchurl zlib ncurses;
+  };
   
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv jdk ant;
-    inherit androidsdk;
+    inherit (pkgs) stdenv jdk ant gnumake gawk file which;
+    inherit androidsdk androidndk;
   };
   
   emulateApp = import ./emulate-app.nix {

From 5ed0347063e95aea44b0241cb22cbd9b2afcf77a Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 20 Apr 2014 00:59:06 +0400
Subject: [PATCH 0371/2033] dwb: update

---
 pkgs/applications/networking/browsers/dwb/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index dcdbe724194..010dbd168a8 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,15 +2,15 @@
   m4, glib_networking, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
-  name = "dwb-2014-03-27";
+  name = "dwb-2014-04-20";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "4566d58575fbf687ebe9e3414996c45697b62787";
-    sha256 = "145sq2wv0s0n32cwpwgy59ff6ppcv80ialak7nnj1rpqicfqb72h";
+    rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2";
+    sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b";
   };
 
-  buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4  ];
+  buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];
 
   # There are Xlib and gtk warnings therefore I have set Wno-error
   preBuild=''

From 552d66cd9e94f7e81043aa7becaaaa4b02e7ab6b Mon Sep 17 00:00:00 2001
From: Matt Whiteley <mwhiteley@engineyard.com>
Date: Sat, 19 Apr 2014 15:54:16 -0700
Subject: [PATCH 0372/2033] Add swig-3.x

---
 pkgs/development/tools/misc/swig/3.x.nix | 35 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/misc/swig/3.x.nix

diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix
new file mode 100644
index 00000000000..653fb061603
--- /dev/null
+++ b/pkgs/development/tools/misc/swig/3.x.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pcre }:
+
+stdenv.mkDerivation rec {
+  name = "swig-3.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/swig/${name}.tar.gz";
+    sha256 = "99cab1055877d00280509f0e04c1fe76643ec3792e9b8e7efcc9aa6e247229df";
+  };
+
+  buildInputs = [ pcre ];
+
+  meta = {
+    description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
+
+    longDescription = ''
+       SWIG is an interface compiler that connects programs written in C and
+       C++ with languages such as Perl, Python, Ruby, Scheme, and Tcl.  It
+       works by taking the declarations found in C/C++ header files and using
+       them to generate the wrapper code that scripting languages need to
+       access the underlying C/C++ code.  In addition, SWIG provides a variety
+       of customization features that let you tailor the wrapping process to
+       suit your application.
+    '';
+
+    homepage = http://swig.org/;
+
+    # Licensing is a mess: http://www.swig.org/Release/LICENSE .
+    license = "BSD-style";
+
+    platforms = stdenv.lib.platforms.linux;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d76d68ef5b..5d196199615 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3930,6 +3930,8 @@ let
 
   swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
 
+  swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
+
   swigWithJava = swig;
 
   swfmill = callPackage ../tools/video/swfmill { };

From 7eeb94e8dcb4a26a207d62bb1dde5ab776f50799 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sun, 20 Apr 2014 11:40:04 +0200
Subject: [PATCH 0373/2033] Add patch for GCC bug 58800.

---
 .../compilers/gcc/4.8/bug58800.patch          | 95 +++++++++++++++++++
 .../development/compilers/gcc/4.8/default.nix |  2 +-
 2 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/4.8/bug58800.patch

diff --git a/pkgs/development/compilers/gcc/4.8/bug58800.patch b/pkgs/development/compilers/gcc/4.8/bug58800.patch
new file mode 100644
index 00000000000..f97da2d6024
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/bug58800.patch
@@ -0,0 +1,95 @@
+Index: gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h
+===================================================================
+--- gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203872)
++++ gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203873)
+@@ -2279,7 +2279,7 @@
+ 				_RandomAccessIterator __last)
+     {
+       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
+-      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2));
++      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1);
+       return std::__unguarded_partition(__first + 1, __last, *__first);
+     }
+ 
+@@ -2291,7 +2291,7 @@
+ 				_RandomAccessIterator __last, _Compare __comp)
+     {
+       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
+-      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2),
++      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
+ 				  __comp);
+       return std::__unguarded_partition(__first + 1, __last, *__first, __comp);
+     }
+Index: gcc-4_8-branch/libstdc++-v3/ChangeLog
+===================================================================
+--- gcc-4_8-branch/libstdc++-v3/ChangeLog	(revision 203872)
++++ gcc-4_8-branch/libstdc++-v3/ChangeLog	(revision 203873)
+@@ -1,3 +1,11 @@
++2013-10-20  Chris Jefferson  <chris@bubblescope.net>
++	    Paolo Carlini  <paolo.carlini@oracle.com>
++
++	PR libstdc++/58800
++	* include/bits/stl_algo.h (__unguarded_partition_pivot): Change
++	__last - 2 to __last - 1.
++	* testsuite/25_algorithms/nth_element/58800.cc: New
++
+ 2013-10-16  François Dumont  <fdumont@gcc.gnu.org>
+ 
+ 	PR libstdc++/58191
+Index: gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc
+===================================================================
+--- gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 0)
++++ gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 203873)
+@@ -0,0 +1,52 @@
++// Copyright (C) 2013 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library.  This library is free
++// software; you can redistribute it and/or modify it under the
++// terms of the GNU General Public License as published by the
++// Free Software Foundation; either version 3, or (at your option)
++// any later version.
++
++// This library is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++
++// You should have received a copy of the GNU General Public License along
++// with this library; see the file COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++// 25.3.2 [lib.alg.nth.element]
++
++// { dg-options "-std=gnu++11" }
++
++#include <algorithm>
++#include <testsuite_hooks.h>
++#include <testsuite_iterators.h>
++
++using __gnu_test::test_container;
++using __gnu_test::random_access_iterator_wrapper;
++
++typedef test_container<int, random_access_iterator_wrapper> Container;
++
++void test01()
++{
++  std::vector<int> v = {
++    207089,
++    202585,
++    180067,
++    157549,
++    211592,
++    216096,
++    207089
++  };
++
++  Container con(v.data(), v.data() + 7);
++
++  std::nth_element(con.begin(), con.begin() + 3, con.end());
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index aea52593323..90a6738a826 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -62,7 +62,7 @@ let version = "4.8.2";
   */
     enableParallelBuilding = !profiledCompiler;
 
-    patches = []
+    patches = [ ./bug58800.patch ]
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch

From 2364bd807da3325b1f3c1f8ad686ff8b56674f3c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 20 Apr 2014 09:36:15 -0400
Subject: [PATCH 0374/2033] Revert "Merge branch 'gcc-fix' of
 git://github.com/ambrop72/nixpkgs"

The patch doesn't apply

This reverts commit 094eea8f6a34296760afb5e11d3b6e08575cb9c0, reversing
changes made to 552d66cd9e94f7e81043aa7becaaaa4b02e7ab6b.
---
 .../compilers/gcc/4.8/bug58800.patch          | 95 -------------------
 .../development/compilers/gcc/4.8/default.nix |  2 +-
 2 files changed, 1 insertion(+), 96 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/4.8/bug58800.patch

diff --git a/pkgs/development/compilers/gcc/4.8/bug58800.patch b/pkgs/development/compilers/gcc/4.8/bug58800.patch
deleted file mode 100644
index f97da2d6024..00000000000
--- a/pkgs/development/compilers/gcc/4.8/bug58800.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h
-===================================================================
---- gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203872)
-+++ gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203873)
-@@ -2279,7 +2279,7 @@
- 				_RandomAccessIterator __last)
-     {
-       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
--      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2));
-+      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1);
-       return std::__unguarded_partition(__first + 1, __last, *__first);
-     }
- 
-@@ -2291,7 +2291,7 @@
- 				_RandomAccessIterator __last, _Compare __comp)
-     {
-       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
--      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2),
-+      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
- 				  __comp);
-       return std::__unguarded_partition(__first + 1, __last, *__first, __comp);
-     }
-Index: gcc-4_8-branch/libstdc++-v3/ChangeLog
-===================================================================
---- gcc-4_8-branch/libstdc++-v3/ChangeLog	(revision 203872)
-+++ gcc-4_8-branch/libstdc++-v3/ChangeLog	(revision 203873)
-@@ -1,3 +1,11 @@
-+2013-10-20  Chris Jefferson  <chris@bubblescope.net>
-+	    Paolo Carlini  <paolo.carlini@oracle.com>
-+
-+	PR libstdc++/58800
-+	* include/bits/stl_algo.h (__unguarded_partition_pivot): Change
-+	__last - 2 to __last - 1.
-+	* testsuite/25_algorithms/nth_element/58800.cc: New
-+
- 2013-10-16  François Dumont  <fdumont@gcc.gnu.org>
- 
- 	PR libstdc++/58191
-Index: gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc
-===================================================================
---- gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 0)
-+++ gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 203873)
-@@ -0,0 +1,52 @@
-+// Copyright (C) 2013 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// You should have received a copy of the GNU General Public License along
-+// with this library; see the file COPYING3.  If not see
-+// <http://www.gnu.org/licenses/>.
-+
-+// 25.3.2 [lib.alg.nth.element]
-+
-+// { dg-options "-std=gnu++11" }
-+
-+#include <algorithm>
-+#include <testsuite_hooks.h>
-+#include <testsuite_iterators.h>
-+
-+using __gnu_test::test_container;
-+using __gnu_test::random_access_iterator_wrapper;
-+
-+typedef test_container<int, random_access_iterator_wrapper> Container;
-+
-+void test01()
-+{
-+  std::vector<int> v = {
-+    207089,
-+    202585,
-+    180067,
-+    157549,
-+    211592,
-+    216096,
-+    207089
-+  };
-+
-+  Container con(v.data(), v.data() + 7);
-+
-+  std::nth_element(con.begin(), con.begin() + 3, con.end());
-+}
-+
-+int main()
-+{
-+  test01();
-+  return 0;
-+}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 90a6738a826..aea52593323 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -62,7 +62,7 @@ let version = "4.8.2";
   */
     enableParallelBuilding = !profiledCompiler;
 
-    patches = [ ./bug58800.patch ]
+    patches = []
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch

From 88e531d8dc1d6002cf4b43ebd8c19fbfccc58ae6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 20 Apr 2014 09:46:21 -0400
Subject: [PATCH 0375/2033] Fix gcc bug 58800.

See #2330 for details, except I needed to remove the Changelog change from the patch
---
 .../compilers/gcc/4.8/bug-58800.patch         | 79 +++++++++++++++++++
 .../development/compilers/gcc/4.8/default.nix |  2 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/4.8/bug-58800.patch

diff --git a/pkgs/development/compilers/gcc/4.8/bug-58800.patch b/pkgs/development/compilers/gcc/4.8/bug-58800.patch
new file mode 100644
index 00000000000..c8e8666761a
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.8/bug-58800.patch
@@ -0,0 +1,79 @@
+Index: gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h
+===================================================================
+--- gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203872)
++++ gcc-4_8-branch/libstdc++-v3/include/bits/stl_algo.h	(revision 203873)
+@@ -2279,7 +2279,7 @@
+ 				_RandomAccessIterator __last)
+     {
+       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
+-      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2));
++      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1);
+       return std::__unguarded_partition(__first + 1, __last, *__first);
+     }
+ 
+@@ -2291,7 +2291,7 @@
+ 				_RandomAccessIterator __last, _Compare __comp)
+     {
+       _RandomAccessIterator __mid = __first + (__last - __first) / 2;
+-      std::__move_median_to_first(__first, __first + 1, __mid, (__last - 2),
++      std::__move_median_to_first(__first, __first + 1, __mid, __last - 1,
+ 				  __comp);
+       return std::__unguarded_partition(__first + 1, __last, *__first, __comp);
+     }
+Index: gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc
+===================================================================
+--- gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 0)
++++ gcc-4_8-branch/libstdc++-v3/testsuite/25_algorithms/nth_element/58800.cc	(revision 203873)
+@@ -0,0 +1,52 @@
++// Copyright (C) 2013 Free Software Foundation, Inc.
++//
++// This file is part of the GNU ISO C++ Library.  This library is free
++// software; you can redistribute it and/or modify it under the
++// terms of the GNU General Public License as published by the
++// Free Software Foundation; either version 3, or (at your option)
++// any later version.
++
++// This library is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++
++// You should have received a copy of the GNU General Public License along
++// with this library; see the file COPYING3.  If not see
++// <http://www.gnu.org/licenses/>.
++
++// 25.3.2 [lib.alg.nth.element]
++
++// { dg-options "-std=gnu++11" }
++
++#include <algorithm>
++#include <testsuite_hooks.h>
++#include <testsuite_iterators.h>
++
++using __gnu_test::test_container;
++using __gnu_test::random_access_iterator_wrapper;
++
++typedef test_container<int, random_access_iterator_wrapper> Container;
++
++void test01()
++{
++  std::vector<int> v = {
++    207089,
++    202585,
++    180067,
++    157549,
++    211592,
++    216096,
++    207089
++  };
++
++  Container con(v.data(), v.data() + 7);
++
++  std::nth_element(con.begin(), con.begin() + 3, con.end());
++}
++
++int main()
++{
++  test01();
++  return 0;
++}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index aea52593323..890122fe477 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -62,7 +62,7 @@ let version = "4.8.2";
   */
     enableParallelBuilding = !profiledCompiler;
 
-    patches = []
+    patches = [ ./bug-58800.patch ] # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800
       ++ optional enableParallelBuilding ./parallel-bconfig.patch
       ++ optional (cross != null) ./libstdc++-target.patch
       # ++ optional noSysDirs ./no-sys-dirs.patch

From 3bab2f2fc4345688257c8d0e73ad39ea7fd1830e Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sun, 20 Apr 2014 11:41:02 +0200
Subject: [PATCH 0376/2033] FreeCAD: Fix build.

---
 .../applications/graphics/freecad/cmake.patch | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/freecad/cmake.patch b/pkgs/applications/graphics/freecad/cmake.patch
index e54e16da977..62efaf1e29d 100644
--- a/pkgs/applications/graphics/freecad/cmake.patch
+++ b/pkgs/applications/graphics/freecad/cmake.patch
@@ -1,7 +1,27 @@
-diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
---- freecad-0.13.1830.orig/CMakeLists.txt       2013-02-02 18:09:17.000000000 +0100
-+++ freecad-0.13.1830/CMakeLists.txt    2014-02-15 10:16:00.939725500 +0100
-@@ -321,7 +321,7 @@
+diff -urN freecad-0.13.1830.old/cMake/FreeCadMacros.cmake freecad-0.13.1830/cMake/FreeCadMacros.cmake
+--- freecad-0.13.1830.old/cMake/FreeCadMacros.cmake	2013-02-02 18:09:17.000000000 +0100
++++ freecad-0.13.1830/cMake/FreeCadMacros.cmake	2014-04-20 10:52:17.293599913 +0200
+@@ -201,7 +201,7 @@
+ #endmacro(fc_add_resources)
+ 
+ MACRO (fc_add_resources outfiles )
+-  QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
++  QT4_EXTRACT_OPTIONS(rcc_files rcc_options rcc_target ${ARGN})
+ 
+   FOREACH (it ${rcc_files})
+     GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+diff -urN freecad-0.13.1830.old/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
+--- freecad-0.13.1830.old/CMakeLists.txt	2013-02-02 18:09:17.000000000 +0100
++++ freecad-0.13.1830/CMakeLists.txt	2014-04-20 10:28:41.782536753 +0200
+@@ -314,14 +314,14 @@
+     macro(fc_wrap_cpp outfiles )
+         # get include dirs
+         QT4_GET_MOC_FLAGS(moc_flags)
+-        QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
++        QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
+         # fixes bug 0000585: bug with boost 1.48
+         SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
          foreach(it ${moc_files})
              get_filename_component(it ${it} ABSOLUTE)
              QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)

From 7029c291c622402dce6bcbe6d58bce4d267ec465 Mon Sep 17 00:00:00 2001
From: wmertens <Wout.Mertens@gmail.com>
Date: Sun, 20 Apr 2014 15:29:05 +0200
Subject: [PATCH 0377/2033] Builds fine on Darwin

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

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index a3ab95d1ab8..bd52a70eaf2 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
     description = "Utility for RAR archives";
     license = "freeware";
     maintainers = [ stdenv.lib.maintainers.emery ];
-    platforms = stdenv.lib.platforms.linux; # arbitrary
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; # arbitrary
   };
 }

From adc65e998d9c8eb3eaca8020fc553bd3d329eef0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 17:02:52 +0200
Subject: [PATCH 0378/2033] uzbl: fix gsettings schemas, fix uzbl-tabbed.
 Closes #2332

---
 .../networking/browsers/uzbl/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index ba9c8bde37a..81b4f5c01d9 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, makeWrapper
+{ stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk
 , webkit, glib_networking, gsettings_desktop_schemas
 }:
 
@@ -24,13 +24,16 @@ stdenv.mkDerivation rec {
     makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/uzbl-core \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share"
+  preFixup = ''
+    for f in $out/bin/*; do
+      wrapProgram $f \
+        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
+    done
   '';
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
 
-  buildInputs = [ webkit ];
+  buildInputs = [ webkit pygtk ];
 }

From c537fa6da03a484081d51998013fef9b9a037283 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Mar 2014 09:53:01 +0100
Subject: [PATCH 0379/2033] chromium: Update beta and dev to latest versions.

beta: 34.0.1847.60 -> 35.0.1916.47 (builds fine, tested)
dev:  35.0.1883.0  -> 36.0.1941.0  (builds fine, tested)

For the new version 36, we needed to rebase our user namespaces sandbox
patch, because http://crbug.com/312380 is preparing for an upstream
implementation of the same functionality.

Also, we need to add ply and jinja2 to the depends on version 36. This
is done unconditionally, because I want to avoid cluttering up the
expressions with various versionOlder checks.

The sandbox binary had to be fixed as well and we no longer use system
zlib, as - who might have guessed it - it's a fast moving target at
Chromium as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix   |   4 +-
 .../networking/browsers/chromium/sandbox.nix  |   1 +
 .../browsers/chromium/source/default.nix      |   4 +-
 .../chromium/source/sandbox_userns_36.patch   | 293 ++++++++++++++++++
 .../browsers/chromium/source/sources.nix      |  14 +-
 5 files changed, 309 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 85964ee7687..29b60967d55 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -67,7 +67,7 @@ let
     use_system_stlport = true;
     use_system_xdg_utils = true;
     use_system_yasm = true;
-    use_system_zlib = true;
+    use_system_zlib = false;
     use_system_protobuf = true;
 
     use_system_harfbuzz = false;
@@ -112,7 +112,7 @@ let
       glib gtk dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
-      pythonPackages.gyp
+      pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
diff --git a/pkgs/applications/networking/browsers/chromium/sandbox.nix b/pkgs/applications/networking/browsers/chromium/sandbox.nix
index 81ae49ebbb8..b470ed63325 100644
--- a/pkgs/applications/networking/browsers/chromium/sandbox.nix
+++ b/pkgs/applications/networking/browsers/chromium/sandbox.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation {
   patchPhase = ''
     sed -i -e '/#include.*base_export/c \
       #define BASE_EXPORT __attribute__((visibility("default")))
+    /#include/s|sandbox/linux|'"$(pwd)"'/linux|
     ' linux/suid/*.[hc]
   '';
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index e80e05ca9e2..4ec853bddf8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -22,7 +22,9 @@ stdenv.mkDerivation {
 
   prePatch = "patchShebangs .";
 
-  patches = singleton ./sandbox_userns_31.patch;
+  patches = if (versionOlder version "36.0.0.0")
+            then singleton ./sandbox_userns_31.patch
+            else singleton ./sandbox_userns_36.patch;
 
   postPatch = ''
     sed -i -r \
diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
new file mode 100644
index 00000000000..a8f3ed0befd
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
@@ -0,0 +1,293 @@
+commit 3c80951744293441c2e66345ef7d82c199f4600e
+Author: aszlig <aszlig@redmoonstudios.org>
+Date:   Thu May 16 14:17:56 2013 +0200
+
+    zygote: Add support for user namespaces on Linux.
+    
+    The implementation is done by patching the Zygote host to execute the sandbox
+    binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
+    process is using uid 0 and gid 0 which map to the current user of the parent.
+    Afterwards, the sandbox will continue as if it was called as a setuid binary.
+    
+    In addition, this adds new_user_namespace as an option in process_util in order
+    to set the UID and GID mapping correctly. The reason for this is that just
+    passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
+    without setting the mappings exec*() will clear the process's capability sets.
+    
+    If the kernel doesn't support unprivileged user namespaces and the sandbox
+    binary doesn't have the setuid flag, the Zygote main process will run without a
+    sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
+    
+    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
+
+diff --git a/base/process/launch.cc b/base/process/launch.cc
+index 81748f5..930f20f 100644
+--- a/base/process/launch.cc
++++ b/base/process/launch.cc
+@@ -26,6 +26,7 @@ LaunchOptions::LaunchOptions()
+ #if defined(OS_LINUX)
+       , clone_flags(0)
+       , allow_new_privs(false)
++      , new_user_namespace(false)
+ #endif  // OS_LINUX
+ #if defined(OS_CHROMEOS)
+       , ctrl_terminal_fd(-1)
+diff --git a/base/process/launch.h b/base/process/launch.h
+index 9e39fba..00e4c79 100644
+--- a/base/process/launch.h
++++ b/base/process/launch.h
+@@ -115,6 +115,9 @@ struct BASE_EXPORT LaunchOptions {
+   // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
+   // true, then this bit will not be set in the new child process.
+   bool allow_new_privs;
++
++  // If true, start the process in a new user namespace.
++  bool new_user_namespace;
+ #endif  // defined(OS_LINUX)
+ 
+ #if defined(OS_CHROMEOS)
+diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
+index fe4da1a..7f118b8 100644
+--- a/base/process/launch_posix.cc
++++ b/base/process/launch_posix.cc
+@@ -40,6 +40,10 @@
+ 
+ #if defined(OS_LINUX)
+ #include <sys/prctl.h>
++#include <sched.h>
++#if !defined(CLONE_NEWUSER)
++#define CLONE_NEWUSER 0x10000000
++#endif
+ #endif
+ 
+ #if defined(OS_CHROMEOS)
+@@ -301,13 +305,23 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+ 
+   pid_t pid;
+ #if defined(OS_LINUX)
+-  if (options.clone_flags) {
++  int map_pipe_fd[2];
++  int flags = options.clone_flags;
++
++  if (options.new_user_namespace) {
++    flags |= CLONE_NEWUSER;
++    if (pipe(map_pipe_fd) < 0) {
++      DPLOG(ERROR) << "user namespace pipe";
++      return false;
++    }
++  }
++
++  if (options.clone_flags || options.new_user_namespace) {
+     // Signal handling in this function assumes the creation of a new
+     // process, so we check that a thread is not being created by mistake
+     // and that signal handling follows the process-creation rules.
+-    RAW_CHECK(
+-        !(options.clone_flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
+-    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
++    RAW_CHECK(!(flags & (CLONE_SIGHAND | CLONE_THREAD | CLONE_VM)));
++    pid = syscall(__NR_clone, flags, 0, 0, 0);
+   } else
+ #endif
+   {
+@@ -328,6 +342,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+     // DANGER: no calls to malloc or locks are allowed from now on:
+     // http://crbug.com/36678
+ 
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // Close the write end of the pipe so we get an EOF when the parent closes
++      // the FD. This is to avoid race conditions when the UID/GID mappings are
++      // written _after_ execvp().
++      close(map_pipe_fd[1]);
++
++      char dummy;
++      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
++        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
++        _exit(127);
++      }
++    }
++#endif
++
+     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
+     // you call _exit() instead of exit(). This is because _exit() does not
+     // call any previously-registered (in the parent) exit handlers, which
+@@ -451,6 +480,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+     _exit(127);
+   } else {
+     // Parent process
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // We need to write UID/GID mapping here to map the current user outside
++      // the namespace to the root user inside the namespace in order to
++      // correctly "fool" the child process.
++      char buf[256];
++      int map_fd, map_len;
++
++      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to uid_map.");
++      }
++      close(map_fd);
++
++      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to gid_map.");
++      }
++      close(map_fd);
++
++      // Close the pipe on the parent, so the child can continue doing the
++      // execvp() call.
++      close(map_pipe_fd[1]);
++    }
++#endif
++
+     if (options.wait) {
+       // While this isn't strictly disk IO, waiting for another process to
+       // finish is the sort of thing ThreadRestrictions is trying to prevent.
+diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
+index 0106a7a..a0465af 100644
+--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
+@@ -124,25 +124,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+ 
+   sandbox_binary_ = sandbox_cmd.c_str();
+ 
+-  // A non empty sandbox_cmd means we want a SUID sandbox.
+-  using_suid_sandbox_ = !sandbox_cmd.empty();
++  bool userns_sandbox = false;
++  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
+ 
+-  if (using_suid_sandbox_) {
++  if (!sandbox_cmd.empty()) {
+     struct stat st;
+     if (stat(sandbox_binary_.c_str(), &st) != 0) {
+       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
+                  << sandbox_binary_ << " Aborting now.";
+     }
+ 
+-    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
+-        (st.st_uid == 0) &&
+-        (st.st_mode & S_ISUID) &&
+-        (st.st_mode & S_IXOTH)) {
++    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
++      using_suid_sandbox_ = true;
++
+       cmd_line.PrependWrapper(sandbox_binary_);
+ 
+       scoped_ptr<sandbox::SetuidSandboxClient>
+           sandbox_client(sandbox::SetuidSandboxClient::Create());
+       sandbox_client->SetupLaunchEnvironment();
++
++      if (!((st.st_uid == 0) &&
++            (st.st_mode & S_ISUID) &&
++            (st.st_mode & S_IXOTH))) {
++        userns_sandbox = true;
++        sandbox_client->SetNoSuid();
++      }
+     } else {
+       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
+                     "configured correctly. Rather than run without sandboxing "
+@@ -167,7 +173,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+   base::LaunchOptions options;
+   options.fds_to_remap = &fds_to_map;
+   options.allow_new_privs = using_suid_sandbox_;  // Don't PR_SET_NO_NEW_PRIVS.
++  if (userns_sandbox)
++    options.new_user_namespace = true;
+   base::LaunchProcess(cmd_line.argv(), options, &process);
++
++  if (process == -1 && userns_sandbox) {
++    LOG(ERROR) << "User namespace sandbox failed to start, running without "
++               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
++               << "enabled in order to use the sandbox without setuid bit.";
++    using_suid_sandbox_ = false;
++    options.new_user_namespace = false;
++    base::LaunchProcess(cmd_line_unwrapped, options, &process);
++  }
++
+   CHECK(process != -1) << "Failed to launch zygote process";
+ 
+   if (using_suid_sandbox_) {
+diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
+index 5dc09fa..4e09bc4 100644
+--- a/content/zygote/zygote_main_linux.cc
++++ b/content/zygote/zygote_main_linux.cc
+@@ -397,6 +397,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) {
+     CHECK(CreateInitProcessReaper());
+   }
+ 
++  // Don't set non-dumpable, as it causes trouble when the host tries to find
++  // the zygote process (XXX: Not quite sure why this happens with user
++  // namespaces). Fortunately, we also have the seccomp filter sandbox which
++  // should disallow the use of ptrace.
++  if (setuid_sandbox->IsNoSuid())
++    return true;
++
+ #if !defined(OS_OPENBSD)
+   // Previously, we required that the binary be non-readable. This causes the
+   // kernel to mark the process as non-dumpable at startup. The thinking was
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+index 8ed1a97..cbdfadc 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+@@ -173,6 +173,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
+   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
+ }
+ 
++bool SetuidSandboxClient::IsNoSuid() const {
++  return env_->HasVar(kSandboxNoSuidVarName);
++}
++
+ bool SetuidSandboxClient::IsSandboxed() const {
+   return sandboxed_;
+ }
+@@ -182,4 +186,8 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
+   SetSandboxAPIEnvironmentVariable(env_);
+ }
+ 
++void SetuidSandboxClient::SetNoSuid() {
++  env_->SetVar(kSandboxNoSuidVarName, "1");
++}
++
+ }  // namespace sandbox
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
+index 0f6db7a..c629391 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
+@@ -46,6 +46,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
+   bool IsInNewPIDNamespace() const;
+   // Did the setuid helper create a new network namespace ?
+   bool IsInNewNETNamespace() const;
++  // Is sandboxed without SUID binary ?
++  bool IsNoSuid() const;
+   // Are we done and fully sandboxed ?
+   bool IsSandboxed() const;
+ 
+@@ -53,6 +55,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
+   // helper.
+   void SetupLaunchEnvironment();
+ 
++  void SetNoSuid();
++
+  private:
+   // Holds the environment. Will never be NULL.
+   base::Environment* env_;
+diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
+index 9345287..2db659e 100644
+--- a/sandbox/linux/suid/common/sandbox.h
++++ b/sandbox/linux/suid/common/sandbox.h
+@@ -15,6 +15,7 @@ static const char kAdjustOOMScoreSwitch[] = "--adjust-oom-score";
+ 
+ static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
+ static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
+ 
+ static const long kSUIDSandboxApiNumber = 1;
+ static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index dceab16d38c..9204c7f08e5 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,15 +1,21 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "35.0.1883.0";
-    sha256 = "0qbv6prxl18y5824pfd13ng9798g561gzb6nypwp502hqr45jvb6";
+    version = "36.0.1941.0";
+    sha256 = "12rhyq8hliwc8b3371h2axzlzabg99c06d02kl9ldag2kxfpsfps";
+    sha256bin32 = "1rbl5x0pjid5lypdplbqvcx4lgvr2rlbiv83ivvqb5dbg6p7886g";
+    sha256bin64 = "18440spj541w4bqjblb2wpf94slg4if176gprccbxw9sy6b7z38w";
   };
   beta = {
-    version = "34.0.1847.60";
-    sha256 = "1na5d6z4a0wkabn7cj62vyiv3mmvcb6qdvrkyy6fj79h7gk2hb7k";
+    version = "35.0.1916.47";
+    sha256 = "0pq87aybfna4pgsf02v97lprj5kbsrzim7c44nqarmcvlj4l65ch";
+    sha256bin32 = "057l59any3hiqdg1gh4nxry542083lxdaychhljbrfkipq1gy4yv";
+    sha256bin64 = "07n8sqv234dg959id023w3mz5n9ascwrcmxq3px96bqgqim2vf8s";
   };
   stable = {
     version = "34.0.1847.116";
     sha256 = "04cpfav5rqa117igvzmrw0045r2ljxg5fqb46qgqvkgff30pjrfx";
+    sha256bin32 = "1k24j80xgc91p8ssynql9ifjdhpz6w7vl3pk9lvkr0sdhg16hlrf";
+    sha256bin64 = "16gidav4ilc95fr1d6832xzpyynfwnglbz7b33gq62vp8bj77da4";
   };
 }

From ad770bea6789a14dbad6178d3c5e39775d1e5d55 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 15:16:22 +0200
Subject: [PATCH 0380/2033] chromium: Move update.sh back into the main path.

This is to ensure that nothing unexpected will be after the merge of the
refactoring branch, and also my own autoupdate machinery is expecting
this location, so there really is no reason to change it now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/sources.nix           | 2 +-
 .../networking/browsers/chromium/{source => }/update.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/applications/networking/browsers/chromium/{source => }/update.sh (95%)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 9204c7f08e5..6881b8d44e8 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,4 +1,4 @@
-# This file is autogenerated from update.sh in the same directory.
+# This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
     version = "36.0.1941.0";
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
similarity index 95%
rename from pkgs/applications/networking/browsers/chromium/source/update.sh
rename to pkgs/applications/networking/browsers/chromium/update.sh
index 806169f524c..e82d22f34fd 100755
--- a/pkgs/applications/networking/browsers/chromium/source/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -3,7 +3,7 @@
 channels_url="http://omahaproxy.appspot.com/all?csv=1";
 history_url="http://omahaproxy.appspot.com/history";
 bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
-base_path="$(cd "$(dirname "$0")" && pwd)";
+base_path="$(cd "$(dirname "$0")" && pwd)/source";
 
 source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
 
@@ -116,7 +116,7 @@ versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')";
 channel_exprs="$(get_channel_exprs "$versions")";
 
 cat > "$base_path/sources.nix" <<-EOF
-# This file is autogenerated from update.sh in the same directory.
+# This file is autogenerated from update.sh in the parent directory.
 {
 $channel_exprs
 }

From 11b84078c5e1cc3d3ac38122212e263760d7019d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 15:25:21 +0200
Subject: [PATCH 0381/2033] chromium/common: Wrap lines to 80 characters.

Yes, it's just a comment and yes, it's so insignificant that everyone
would make a "O_o" face. But I'm getting annoyed by things like this.

Obviously that means no feature changes :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 29b60967d55..9727de1a515 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -155,7 +155,8 @@ let
       linux_sandbox_chrome_path="${libExecPath}/${packageName}";
       werror = "";
 
-      # Google API keys, see http://www.chromium.org/developers/how-tos/api-keys.
+      # Google API keys, see:
+      #   http://www.chromium.org/developers/how-tos/api-keys
       # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
       # please get your own set of keys.
       google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI";

From 0517041a2fc421f3efa75933e8258ae001ce21ab Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 19 Apr 2014 15:31:38 +0200
Subject: [PATCH 0382/2033] chromium: Drop conditionals for version 33.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix     | 2 --
 .../networking/browsers/chromium/source/default.nix            | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 8c83dbb853a..e230af17530 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -9,9 +9,7 @@ mkChromiumDerivation (base: rec {
   installPhase = ''
     ensureDir "$libExecPath"
     cp -v "$buildPath/"*.pak "$libExecPath/"
-    ${optionalString (!versionOlder base.version "34.0.0.0") ''
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
-    ''}
     cp -vR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v $buildPath/libffmpegsumo.so "$libExecPath/"
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 4ec853bddf8..2c7e7277b81 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -32,14 +32,13 @@ stdenv.mkDerivation {
       -e 's|/bin/echo|echo|' \
       -e "/python_arch/s/: *'[^']*'/: '""'/" \
       build/common.gypi chrome/chrome_tests.gypi
-    sed -i '/not RunGN/,+1d' build/gyp_chromium
+    sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium
     sed -i -e 's|/usr/bin/gcc|gcc|' \
       third_party/WebKit/Source/build/scripts/scripts.gypi \
       third_party/WebKit/Source/build/scripts/preprocessor.pm
   '' + optionalString useOpenSSL ''
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
   '' + optionalString (!versionOlder version "34.0.0.0") ''
-    sed -i '/import.*depot/d' build/gyp_chromium
   '';
 
   outputs = [ "out" "sandbox" "bundled" "main" ];

From 18234b676821db85f6d94777c90303e513f2f110 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 20 Apr 2014 08:39:40 +0200
Subject: [PATCH 0383/2033] chromium: Fix package name for browser derivation.

The packageName attribute defines the output path and binary name of the
product that's going to be created, so we really want to have "chromium"
instead of "chromium-browser" here, especially for the resulting binary.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 1 +
 pkgs/applications/networking/browsers/chromium/common.nix  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index e230af17530..a4b99bc5802 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -4,6 +4,7 @@ with stdenv.lib;
 
 mkChromiumDerivation (base: rec {
   name = "chromium-browser";
+  packageName = "chromium";
   buildTargets = [ "chrome" ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 9727de1a515..7bed83ac4c6 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -91,7 +91,7 @@ let
   ];
 
   # build paths and release info
-  packageName = extraAttrs.name;
+  packageName = extraAttrs.packageName or extraAttrs.name;
   buildType = "Release";
   buildPath = "out/${buildType}";
   libExecPath = "$out/libexec/${packageName}";

From b4df087f1461e7a3671d971396c0ad1adeda75c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Apr 2014 18:17:31 +0200
Subject: [PATCH 0384/2033] elfutils: fix CVE-2014-0172

Patch taken from upstream mailing-list.
---
 .../tools/misc/elfutils/CVE-2014-0172.patch   | 32 +++++++++++++++++++
 .../tools/misc/elfutils/default.nix           |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch

diff --git a/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch b/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch
new file mode 100644
index 00000000000..6553dea7b4c
--- /dev/null
+++ b/pkgs/development/tools/misc/elfutils/CVE-2014-0172.patch
@@ -0,0 +1,32 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1085663
+
+Reported-by: Florian Weimer <fweimer at redhat.com>
+Signed-off-by: Mark Wielaard <mjw at redhat.com>
+---
+ libdw/dwarf_begin_elf.c |    8 +++++++-
+ 2 files changed, 12 insertions(+), 1 deletions(-)
+
+diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
+index 79daeac..34ea373 100644
+--- a/libdw/dwarf_begin_elf.c
++++ b/libdw/dwarf_begin_elf.c
+@@ -1,5 +1,5 @@
+ /* Create descriptor from ELF descriptor for processing file.
+-   Copyright (C) 2002-2011 Red Hat, Inc.
++   Copyright (C) 2002-2011, 2014 Red Hat, Inc.
+    This file is part of elfutils.
+    Written by Ulrich Drepper <drepper at redhat.com>, 2002.
+ 
+@@ -282,6 +282,12 @@ check_section (Dwarf *result, GElf_Ehdr *ehdr, Elf_Scn *scn, bool inscngrp)
+ 	    memcpy (&size, data->d_buf + 4, sizeof size);
+ 	    size = be64toh (size);
+ 
++	    /* Check for unsigned overflow so malloc always allocated
++	       enough memory for both the Elf_Data header and the
++	       uncompressed section data.  */
++	    if (unlikely (sizeof (Elf_Data) + size < size))
++	      break;
++
+ 	    Elf_Data *zdata = malloc (sizeof (Elf_Data) + size);
+ 	    if (unlikely (zdata == NULL))
+ 	      break;
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index e2f6c693298..5ada382795c 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./CVE-2014-0172.patch
     (fetchurl {
       url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability.patch";
       sha256 = "0w8i94x9hqirgs2lwcd1g36s77r5svh4j1fgcrd6lx5w18vch0di";

From cb83796abb3870cf6dc74c4823067bc7b43a9395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Apr 2014 18:20:57 +0200
Subject: [PATCH 0385/2033] elfutils: update 0.155 -> 0.158

---
 pkgs/development/tools/misc/elfutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 5ada382795c..53e4bd6821f 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -3,21 +3,21 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.155";
+  version = "0.158";
 
   src = fetchurl {
     urls = [
       "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
       "mirror://gentoo/distfiles/${name}.tar.bz2"
       ];
-    sha256 = "1n0fsg2q961i0lj355w2ad3cmp7d1jjcdhrfhmlgsvs14r2lli38";
+    sha256 = "0z9rprmizd7rwb3xwfmz5liii7hbiv3g2arl23h56brm45fay9xy";
   };
 
   patches = [
     ./CVE-2014-0172.patch
     (fetchurl {
       url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability.patch";
-      sha256 = "0w8i94x9hqirgs2lwcd1g36s77r5svh4j1fgcrd6lx5w18vch0di";
+      sha256 = "0y2fyjis5xrd3g2pcbcm145q2kmh52n5c74w8dwv3hqdp5ky7igd";
     }) ];
 
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,

From a0c0dfb6471506a1c4b98c8b6ec7a31271025573 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 19:29:53 +0200
Subject: [PATCH 0386/2033] Revert accidental change

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39da338126f..0d81df6c31d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9927,7 +9927,7 @@ let
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
-  kde4 = recurseIntoAttrs pkgs.kde412;
+  kde4 = recurseIntoAttrs pkgs.kde411;
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 

From cf53152902d1d0ca6ed618f2a39e5999e0c42071 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 20 Apr 2014 19:41:15 +0200
Subject: [PATCH 0387/2033] Fix GRUB 2 example

Fixes #1891.
---
 nixos/modules/system/boot/loader/grub/grub.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index d7f2319975c..a3b09223cbb 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -133,11 +133,8 @@ in
             chainloader (hd0,1)+1
 
           # GRUB 2 example
-          menuentry "Windows7" {
-            title Windows7
-            insmod ntfs
-            set root='(hd1,1)'
-            chainloader +1
+          menuentry "Windows 7" {
+            chainloader (hd0,4)+1
           }
         '';
         description = ''

From 193dd39d8c7bcb2ec2c36e198e8253324a475b92 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 6 Apr 2014 21:20:13 -0300
Subject: [PATCH 0388/2033] mpv: update to stable version 0.3.7

Also:
* minor waf update (reflecting bootstrap.py)
* lua5_sockets inclusion (not detected yet)
---
 pkgs/applications/video/mpv/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b37a8a87630..f7c4218d0ff 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
-, lua5, perl, libpthreadstubs
+, lua5, lua5_sockets, perl, libpthreadstubs
 , python3, docutils, which
 , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
@@ -42,14 +42,15 @@ assert libpngSupport -> libpng != null;
 assert quviSupport -> libquvi != null;
 assert cacaSupport -> libcaca != null;
 
-# Purity problem: Waf needed to be is downloaded by bootstrap.py
+# Purity problem: Waf needed to be is downloaded by bootstrap.py,
 # but by purity reasons it should be avoided; thanks the-kenny to point it out!
-# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
+# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour;
+# An obvious problem is to update that stuff everytime mpv is updated
 
 let
   waf = fetchurl {
-    url = https://waf.googlecode.com/files/waf-1.7.13;
-    sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
+    url = https://waf.googlecode.com/files/waf-1.7.15;
+    sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
   };
 
   version = "0.3.7";
@@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-    [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
+    [ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
     ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
     ++ optional alsaSupport alsaLib
     ++ optional xvSupport libXv
@@ -128,5 +129,6 @@ stdenv.mkDerivation rec {
 
 # TODO: Wayland support
 # TODO: investigate libquvi support: it isn't detected by Waf script!
+# TODO: investigate lua sockets problem
 # TODO: investigate caca support: it isn't detected by Waf script!
 # TODO: a more systematic way to test this package

From 31a94915d2532273e3630206a9e13f2e49ce0775 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 19 Apr 2014 15:16:00 -0300
Subject: [PATCH 0389/2033] mpv: minor updates and cleanup

E.g. parameterize lua.
---
 pkgs/applications/video/mpv/default.nix | 22 ++++++++++------------
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index f7c4218d0ff..903b9afdc4a 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
-, lua5, lua5_sockets, perl, libpthreadstubs
+, lua, perl, libpthreadstubs
+, lua5_sockets
 , python3, docutils, which
 , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
 , xineramaSupport ? true, libXinerama ? null
@@ -42,10 +43,9 @@ assert libpngSupport -> libpng != null;
 assert quviSupport -> libquvi != null;
 assert cacaSupport -> libcaca != null;
 
-# Purity problem: Waf needed to be is downloaded by bootstrap.py,
+# Purity problem: Waf needed to be is downloaded by bootstrap.py
 # but by purity reasons it should be avoided; thanks the-kenny to point it out!
-# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour;
-# An obvious problem is to update that stuff everytime mpv is updated
+# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
 
 let
   waf = fetchurl {
@@ -53,12 +53,11 @@ let
     sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
   };
 
-  version = "0.3.7";
-
 in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
+  version = "0.3.7";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
@@ -87,7 +86,7 @@ stdenv.mkDerivation rec {
     ++ optional cacaSupport libcaca
     ;
 
-  nativeBuildInputs = [ python3 lua5 perl ];
+  nativeBuildInputs = [ python3 lua perl ];
 
 
 # There are almost no need of "configure flags", but some libraries
@@ -110,7 +109,7 @@ stdenv.mkDerivation rec {
     python3 ${waf} install
     # Maybe not needed, but it doesn't hurt anyway: a standard font
     mkdir -p $out/share/mpv
-    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf  $out/share/mpv/subfont.ttf
+    ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
     '';
 
   meta = {
@@ -128,7 +127,6 @@ stdenv.mkDerivation rec {
 # Heavily based on mplayer2 expression
 
 # TODO: Wayland support
-# TODO: investigate libquvi support: it isn't detected by Waf script!
-# TODO: investigate lua sockets problem
-# TODO: investigate caca support: it isn't detected by Waf script!
-# TODO: a more systematic way to test this package
+# TODO: investigate libquvi support
+# TODO: investigate caca support
+# TODO: investigate lua5_sockets bug
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1dd60584096..23cfaf25e6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8713,6 +8713,7 @@ let
     };
 
   mpv = callPackage ../applications/video/mpv {
+    lua = lua5_1;
     bs2bSupport = true;
     quviSupport = true;
     cacaSupport = true;

From a07455dd16f82dd3cad686243ad9ba549a77e456 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 20 Apr 2014 14:04:41 -0500
Subject: [PATCH 0390/2033] Add expression for cabal-install 1.20.0.0

---
 .../libraries/haskell/Cabal/1.20.0.0.nix      | 26 ++++++++++++++++
 .../cabal-install/1.20.0.0.nix                | 30 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix
 create mode 100644 pkgs/tools/package-management/cabal-install/1.20.0.0.nix

diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix
new file mode 100644
index 00000000000..0dbd2acdd92
--- /dev/null
+++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.0.nix
@@ -0,0 +1,26 @@
+{ cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck
+, regexPosix, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "Cabal";
+  version = "1.20.0.0";
+  sha256 = "1m2lp6v1959mdm9zfg6fg1xw2iv749r4rzj576lqvn66slwsjpw1";
+  buildDepends = [ deepseq filepath time ];
+  testDepends = [
+    extensibleExceptions filepath HUnit QuickCheck regexPosix
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  doCheck = false;
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "A framework for packaging Haskell software";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.0.nix b/pkgs/tools/package-management/cabal-install/1.20.0.0.nix
new file mode 100644
index 00000000000..0c7bd5f473c
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/1.20.0.0.nix
@@ -0,0 +1,30 @@
+{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck
+, random, stm, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, time, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "1.20.0.0";
+  sha256 = "0m05wjmi8b07xzri3d7y7bwcxmd1asj3kcg9c1idhjwmg2nla2dz";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random stm time zlib
+  ];
+  testDepends = [
+    Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 time zlib
+  ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cacc9589325..40734fdb6f4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -714,6 +714,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; };
+  Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal = null; # core package in GHC
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
@@ -3029,6 +3030,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix {
     Cabal = self.Cabal_1_18_1_3;
   };
+  cabalInstall_1_20_0_0 = callPackage ../tools/package-management/cabal-install/1.20.0.0.nix {
+    Cabal = self.Cabal_1_20_0_0;
+  };
   cabalInstall = self.cabalInstall_1_18_0_3;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {

From 6b634673f9eb89f7280050e07088041ec7ec4575 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 20 Apr 2014 22:42:55 +0200
Subject: [PATCH 0391/2033] Add remarkjs 0.6.4, a markdown-driven slideshow
 tool

Also, add required node packages (and update generated node pkgs).
---
 pkgs/development/web/remarkjs/default.nix  |  66 ++
 pkgs/top-level/all-packages.nix            |   2 +
 pkgs/top-level/node-packages-generated.nix | 931 +++++++++++++++------
 pkgs/top-level/node-packages.json          |   8 +
 4 files changed, 737 insertions(+), 270 deletions(-)
 create mode 100644 pkgs/development/web/remarkjs/default.nix

diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix
new file mode 100644
index 00000000000..bf96175b8cd
--- /dev/null
+++ b/pkgs/development/web/remarkjs/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, lib, fetchgit, fetchurl, nodejs, nodePackages }:
+
+with lib;
+
+let
+
+  # highlight.js is a git submodule of remark
+  highlightjs = fetchgit {
+    url = https://github.com/isagalaev/highlight.js;
+    rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
+    sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "remarkjs-${version}";
+
+  version = "0.6.4";
+
+  src = fetchurl {
+    url = "https://github.com/gnab/remark/archive/v${version}.tar.gz";
+    sha256 = "0sdhpn91b05qdqfqbfrhkfx8rkqrgm9pqg4bgjhxf9prfjhvmlrn";
+  };
+
+  buildInputs = with nodePackages; [
+    nodejs
+    marked
+    browserify
+    uglify-js
+    less
+    mocha
+    mocha-phantomjs
+    phantomjs
+    should
+    sinon
+    jshint
+    shelljs
+  ];
+
+  configurePhase = ''
+    mkdir -p node_modules/.bin
+    ${concatStrings (map (dep: ''
+      test -d ${dep}/bin && (for b in $(ls ${dep}/bin); do
+        ln -sv -t node_modules/.bin ${dep}/bin/$b
+      done)
+    '') buildInputs)}
+  '';
+
+  buildPhase = ''
+    substituteInPlace make.js --replace "target.test();" ""
+    substituteInPlace make.js --replace vendor/highlight.js ${highlightjs}
+    node make all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    cp -v out/* $out/lib/
+  '';
+
+  meta = {
+    homepage = http://remarkjs.com;
+    description = "A simple, in-browser, markdown-driven slideshow tool.";
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23cfaf25e6a..1475b3f4ed7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1832,6 +1832,8 @@ let
     inherit (gnome) gnome_vfs GConf;
   };
 
+  remarkjs = callPackage ../development/web/remarkjs { };
+
   remind = callPackage ../tools/misc/remind { };
 
   remmina = callPackage ../applications/networking/remote/remmina {};
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 28154178770..194fb8ceaa9 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -496,7 +496,7 @@
     buildInputs =
       (self.nativeDeps."archiver" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
       self.by-version."zip-stream"."0.1.4"
       self.by-version."lazystream"."0.1.0"
       self.by-version."file-utils"."0.1.5"
@@ -868,6 +868,8 @@
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
+  by-spec."async"."~0.2.10" =
+    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
@@ -1285,7 +1287,7 @@
       (self.nativeDeps."body-parser" or []);
     deps = [
       self.by-version."type-is"."1.1.0"
-      self.by-version."raw-body"."1.1.3"
+      self.by-version."raw-body"."1.1.4"
       self.by-version."qs"."0.6.6"
     ];
     peerDependencies = [
@@ -1710,27 +1712,27 @@
     passthru.names = [ "browser-pack" ];
   };
   by-spec."browser-resolve"."~1.2.1" =
-    self.by-version."browser-resolve"."1.2.2";
-  by-version."browser-resolve"."1.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-browser-resolve-1.2.2";
+    self.by-version."browser-resolve"."1.2.4";
+  by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browser-resolve-1.2.4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.2.tgz";
-        name = "browser-resolve-1.2.2.tgz";
-        sha1 = "83b1eaed8f120b906f56078e134669db0a4a5c11";
+        url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
+        name = "browser-resolve-1.2.4.tgz";
+        sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
       })
     ];
     buildInputs =
       (self.nativeDeps."browser-resolve" or []);
     deps = [
-      self.by-version."resolve"."0.6.1"
+      self.by-version."resolve"."0.6.3"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "browser-resolve" ];
   };
   by-spec."browser-resolve"."~1.2.2" =
-    self.by-version."browser-resolve"."1.2.2";
+    self.by-version."browser-resolve"."1.2.4";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."1.2.0";
   by-version."browserchannel"."1.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -1755,6 +1757,71 @@
     passthru.names = [ "browserchannel" ];
   };
   "browserchannel" = self.by-version."browserchannel"."1.2.0";
+  by-spec."browserify"."*" =
+    self.by-version."browserify"."3.44.1";
+  by-version."browserify"."3.44.1" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.44.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.1.tgz";
+        name = "browserify-3.44.1.tgz";
+        sha1 = "e6ad85bd1e980e5c6aa30e27987536448dbc4d68";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browserify" or []);
+    deps = [
+      self.by-version."JSONStream"."0.7.2"
+      self.by-version."assert"."1.1.1"
+      self.by-version."browser-pack"."2.0.1"
+      self.by-version."browser-resolve"."1.2.4"
+      self.by-version."browserify-zlib"."0.1.4"
+      self.by-version."buffer"."2.1.13"
+      self.by-version."builtins"."0.0.3"
+      self.by-version."commondir"."0.0.1"
+      self.by-version."concat-stream"."1.4.5"
+      self.by-version."console-browserify"."1.0.3"
+      self.by-version."constants-browserify"."0.0.1"
+      self.by-version."crypto-browserify"."1.0.9"
+      self.by-version."deep-equal"."0.1.2"
+      self.by-version."defined"."0.0.0"
+      self.by-version."deps-sort"."0.1.1"
+      self.by-version."derequire"."0.8.0"
+      self.by-version."domain-browser"."1.1.1"
+      self.by-version."duplexer"."0.1.1"
+      self.by-version."events"."1.0.0"
+      self.by-version."glob"."3.2.9"
+      self.by-version."http-browserify"."1.3.2"
+      self.by-version."https-browserify"."0.0.0"
+      self.by-version."inherits"."2.0.1"
+      self.by-version."insert-module-globals"."5.0.1"
+      self.by-version."module-deps"."1.10.0"
+      self.by-version."os-browserify"."0.1.2"
+      self.by-version."parents"."0.0.2"
+      self.by-version."path-browserify"."0.0.0"
+      self.by-version."punycode"."1.2.4"
+      self.by-version."querystring-es3"."0.2.0"
+      self.by-version."resolve"."0.6.3"
+      self.by-version."shallow-copy"."0.0.1"
+      self.by-version."shell-quote"."0.0.1"
+      self.by-version."stream-browserify"."0.1.3"
+      self.by-version."stream-combiner"."0.0.4"
+      self.by-version."string_decoder"."0.0.1"
+      self.by-version."subarg"."0.0.1"
+      self.by-version."syntax-error"."1.1.0"
+      self.by-version."through2"."0.4.1"
+      self.by-version."timers-browserify"."1.0.1"
+      self.by-version."tty-browserify"."0.0.0"
+      self.by-version."umd"."2.0.0"
+      self.by-version."url"."0.7.9"
+      self.by-version."util"."0.10.3"
+      self.by-version."vm-browserify"."0.0.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browserify" ];
+  };
+  "browserify" = self.by-version."browserify"."3.44.1";
   by-spec."browserify"."~3.38.0" =
     self.by-version."browserify"."3.38.1";
   by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
@@ -1772,8 +1839,8 @@
       self.by-version."JSONStream"."0.7.2"
       self.by-version."assert"."1.1.1"
       self.by-version."browser-pack"."2.0.1"
-      self.by-version."browser-resolve"."1.2.2"
-      self.by-version."buffer"."2.1.12"
+      self.by-version."browser-resolve"."1.2.4"
+      self.by-version."buffer"."2.1.13"
       self.by-version."builtins"."0.0.3"
       self.by-version."commondir"."0.0.1"
       self.by-version."concat-stream"."1.4.5"
@@ -1798,7 +1865,7 @@
       self.by-version."path-browserify"."0.0.0"
       self.by-version."punycode"."1.2.4"
       self.by-version."querystring-es3"."0.2.0"
-      self.by-version."resolve"."0.6.2"
+      self.by-version."resolve"."0.6.3"
       self.by-version."shallow-copy"."0.0.1"
       self.by-version."shell-quote"."0.0.1"
       self.by-version."stream-browserify"."0.1.3"
@@ -1819,6 +1886,26 @@
     ];
     passthru.names = [ "browserify" ];
   };
+  by-spec."browserify-zlib"."~0.1.2" =
+    self.by-version."browserify-zlib"."0.1.4";
+  by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-browserify-zlib-0.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+        name = "browserify-zlib-0.1.4.tgz";
+        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."browserify-zlib" or []);
+    deps = [
+      self.by-version."pako"."0.2.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "browserify-zlib" ];
+  };
   by-spec."bson"."0.1.8" =
     self.by-version."bson"."0.1.8";
   by-version."bson"."0.1.8" = lib.makeOverridable self.buildNodePackage {
@@ -1897,14 +1984,14 @@
     passthru.names = [ "bson" ];
   };
   by-spec."buffer"."~2.1.4" =
-    self.by-version."buffer"."2.1.12";
-  by-version."buffer"."2.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-buffer-2.1.12";
+    self.by-version."buffer"."2.1.13";
+  by-version."buffer"."2.1.13" = lib.makeOverridable self.buildNodePackage {
+    name = "node-buffer-2.1.13";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.12.tgz";
-        name = "buffer-2.1.12.tgz";
-        sha1 = "da6270d276406da92cdf357b5fb09e1edc547f22";
+        url = "http://registry.npmjs.org/buffer/-/buffer-2.1.13.tgz";
+        name = "buffer-2.1.13.tgz";
+        sha1 = "c88838ebf79f30b8b4a707788470bea8a62c2355";
       })
     ];
     buildInputs =
@@ -2155,6 +2242,8 @@
     self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.2.1" =
     self.by-version."bytes"."0.2.1";
+  by-spec."bytes"."~0.3.0" =
+    self.by-version."bytes"."0.3.0";
   by-spec."callsite"."~1.0.0" =
     self.by-version."callsite"."1.0.0";
   by-version."callsite"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -2251,7 +2340,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.6"
+      self.by-version."has-color"."0.1.7"
       self.by-version."ansi-styles"."1.0.0"
       self.by-version."strip-ansi"."0.1.1"
     ];
@@ -2273,7 +2362,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.6"
+      self.by-version."has-color"."0.1.7"
       self.by-version."ansi-styles"."0.1.2"
     ];
     peerDependencies = [
@@ -2294,7 +2383,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.6"
+      self.by-version."has-color"."0.1.7"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -2315,7 +2404,7 @@
     buildInputs =
       (self.nativeDeps."chalk" or []);
     deps = [
-      self.by-version."has-color"."0.1.6"
+      self.by-version."has-color"."0.1.7"
       self.by-version."ansi-styles"."0.2.0"
     ];
     peerDependencies = [
@@ -3025,6 +3114,26 @@
     ];
     passthru.names = [ "commander" ];
   };
+  by-spec."commander"."1.2.x" =
+    self.by-version."commander"."1.2.0";
+  by-version."commander"."1.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-commander-1.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz";
+        name = "commander-1.2.0.tgz";
+        sha1 = "fd5713bfa153c7d6cc599378a5ab4c45c535029e";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."commander" or []);
+    deps = [
+      self.by-version."keypress"."0.1.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "commander" ];
+  };
   by-spec."commander"."1.3.1" =
     self.by-version."commander"."1.3.1";
   by-version."commander"."1.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -3185,7 +3294,7 @@
     deps = [
       self.by-version."inherits"."2.0.1"
       self.by-version."typedarray"."0.0.5"
-      self.by-version."readable-stream"."1.1.12"
+      self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
     ];
@@ -3310,7 +3419,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3353,7 +3462,7 @@
       self.by-version."vhost"."1.0.0"
       self.by-version."bytes"."0.2.1"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3382,7 +3491,7 @@
       self.by-version."bytes"."0.1.0"
       self.by-version."send"."0.0.3"
       self.by-version."fresh"."0.1.0"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3411,7 +3520,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3440,7 +3549,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3480,7 +3589,7 @@
       self.by-version."vhost"."1.0.0"
       self.by-version."bytes"."0.3.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3512,7 +3621,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."methods"."0.1.0"
       self.by-version."raw-body"."1.1.2"
       self.by-version."negotiator"."0.3.0"
@@ -3617,7 +3726,7 @@
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -3836,6 +3945,25 @@
     ];
     passthru.names = [ "cookie" ];
   };
+  by-spec."cookie"."0.1.2" =
+    self.by-version."cookie"."0.1.2";
+  by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-cookie-0.1.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+        name = "cookie-0.1.2.tgz";
+        sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."cookie" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "cookie" ];
+  };
   by-spec."cookie-jar"."~0.2.0" =
     self.by-version."cookie-jar"."0.2.0";
   by-version."cookie-jar"."0.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -4446,14 +4574,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.8.1";
+    self.by-version."debug"."0.8.0";
+  by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        name = "debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
+        name = "debug-0.8.0.tgz";
+        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
       })
     ];
     buildInputs =
@@ -4503,30 +4631,33 @@
     passthru.names = [ "debug" ];
   };
   by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.8.1";
+    self.by-version."debug"."0.8.0";
   by-spec."debug"."~0.7.0" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.8" =
-    self.by-version."debug"."0.8.1";
+    self.by-version."debug"."0.8.0";
   by-spec."decompress"."^0.2.0" =
-    self.by-version."decompress"."0.2.2";
-  by-version."decompress"."0.2.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-decompress-0.2.2";
+    self.by-version."decompress"."0.2.3";
+  by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage {
+    name = "decompress-0.2.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.2.tgz";
-        name = "decompress-0.2.2.tgz";
-        sha1 = "12ab828b16f5990de645e48917774ef6045267c0";
+        url = "http://registry.npmjs.org/decompress/-/decompress-0.2.3.tgz";
+        name = "decompress-0.2.3.tgz";
+        sha1 = "ad471a0fc51b7193b72f60c9e040ce1a7a4b9fcc";
       })
     ];
     buildInputs =
       (self.nativeDeps."decompress" or []);
     deps = [
       self.by-version."adm-zip"."0.4.4"
+      self.by-version."extname"."0.1.1"
+      self.by-version."get-stdin"."0.1.0"
       self.by-version."map-key"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
+      self.by-version."nopt"."2.2.0"
       self.by-version."rimraf"."2.2.6"
       self.by-version."stream-combiner"."0.0.4"
       self.by-version."tar"."0.1.19"
@@ -4554,7 +4685,7 @@
       self.by-version."mkpath"."0.1.0"
       self.by-version."binary"."0.3.0"
       self.by-version."touch"."0.0.2"
-      self.by-version."readable-stream"."1.1.12"
+      self.by-version."readable-stream"."1.1.13-1"
       self.by-version."nopt"."2.2.0"
     ];
     peerDependencies = [
@@ -5044,20 +5175,20 @@
     passthru.names = [ "domutils" ];
   };
   by-spec."download"."~0.1.6" =
-    self.by-version."download"."0.1.15";
-  by-version."download"."0.1.15" = lib.makeOverridable self.buildNodePackage {
-    name = "download-0.1.15";
+    self.by-version."download"."0.1.16";
+  by-version."download"."0.1.16" = lib.makeOverridable self.buildNodePackage {
+    name = "download-0.1.16";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/download/-/download-0.1.15.tgz";
-        name = "download-0.1.15.tgz";
-        sha1 = "8dc3d49a131cd3714eb8fd614a155077d2c7f630";
+        url = "http://registry.npmjs.org/download/-/download-0.1.16.tgz";
+        name = "download-0.1.16.tgz";
+        sha1 = "46783e7f590d1c0d49eb1915ab8941c74cb45e99";
       })
     ];
     buildInputs =
       (self.nativeDeps."download" or []);
     deps = [
-      self.by-version."decompress"."0.2.2"
+      self.by-version."decompress"."0.2.3"
       self.by-version."each-async"."0.1.2"
       self.by-version."get-stdin"."0.1.0"
       self.by-version."get-urls"."0.1.1"
@@ -5826,7 +5957,7 @@
       self.by-version."oauth"."0.9.11"
       self.by-version."request"."2.9.203"
       self.by-version."connect"."2.3.9"
-      self.by-version."openid"."0.5.7"
+      self.by-version."openid"."0.5.8"
       self.by-version."xml2js"."0.4.2"
       self.by-version."node-swt"."0.1.1"
       self.by-version."node-wsfederation"."0.1.1"
@@ -5908,7 +6039,7 @@
       self.by-version."qs"."0.6.6"
       self.by-version."serve-static"."1.0.1"
       self.by-version."path-to-regexp"."0.1.2"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5962,7 +6093,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -5992,7 +6123,7 @@
       self.by-version."methods"."0.1.0"
       self.by-version."send"."0.1.4"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -6023,12 +6154,14 @@
       self.by-version."send"."0.2.0"
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."merge-descriptors"."0.0.2"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "express" ];
   };
+  by-spec."express".">=3.0.0" =
+    self.by-version."express"."4.0.0";
   by-spec."express"."~3.1.1" =
     self.by-version."express"."3.1.2";
   by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage {
@@ -6053,7 +6186,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.0"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
     ];
     peerDependencies = [
     ];
@@ -6064,14 +6197,14 @@
   by-spec."express"."~4.0.0-rc4" =
     self.by-version."express"."4.0.0";
   by-spec."express-form"."*" =
-    self.by-version."express-form"."0.12.1";
-  by-version."express-form"."0.12.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-express-form-0.12.1";
+    self.by-version."express-form"."0.12.2";
+  by-version."express-form"."0.12.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-form-0.12.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.1.tgz";
-        name = "express-form-0.12.1.tgz";
-        sha1 = "1b62e580303919799598e038fdfba8c65a2cd677";
+        url = "http://registry.npmjs.org/express-form/-/express-form-0.12.2.tgz";
+        name = "express-form-0.12.2.tgz";
+        sha1 = "c23ed4f233df09a1c61bcc698b8e4089dda54c1a";
       })
     ];
     buildInputs =
@@ -6082,11 +6215,11 @@
       self.by-version."async"."0.2.10"
     ];
     peerDependencies = [
-      self.by-version."express"."3.5.1"
+      self.by-version."express"."4.0.0"
     ];
     passthru.names = [ "express-form" ];
   };
-  "express-form" = self.by-version."express-form"."0.12.1";
+  "express-form" = self.by-version."express-form"."0.12.2";
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
   by-version."express-partials"."0.0.6" = lib.makeOverridable self.buildNodePackage {
@@ -6132,7 +6265,49 @@
     passthru.names = [ "express-session" ];
   };
   by-spec."express-session"."~1.0.2" =
-    self.by-version."express-session"."1.0.2";
+    self.by-version."express-session"."1.0.3";
+  by-version."express-session"."1.0.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-express-session-1.0.3";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/express-session/-/express-session-1.0.3.tgz";
+        name = "express-session-1.0.3.tgz";
+        sha1 = "a45ec65dda263f74f3b5b9c6da0ac74c36ac0639";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."express-session" or []);
+    deps = [
+      self.by-version."utils-merge"."1.0.0"
+      self.by-version."cookie"."0.1.2"
+      self.by-version."cookie-signature"."1.0.3"
+      self.by-version."uid2"."0.0.3"
+      self.by-version."buffer-crc32"."0.2.1"
+      self.by-version."debug"."0.7.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "express-session" ];
+  };
+  by-spec."ext-list"."^0.1.0" =
+    self.by-version."ext-list"."0.1.0";
+  by-version."ext-list"."0.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-ext-list-0.1.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/ext-list/-/ext-list-0.1.0.tgz";
+        name = "ext-list-0.1.0.tgz";
+        sha1 = "a266915887ed6b87056eeb76b8c29e61d84ebc39";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."ext-list" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "ext-list" ];
+  };
   by-spec."extend"."*" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = lib.makeOverridable self.buildNodePackage {
@@ -6155,6 +6330,28 @@
   "extend" = self.by-version."extend"."1.2.1";
   by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
+  by-spec."extname"."^0.1.1" =
+    self.by-version."extname"."0.1.1";
+  by-version."extname"."0.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-extname-0.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/extname/-/extname-0.1.1.tgz";
+        name = "extname-0.1.1.tgz";
+        sha1 = "2274f61b52a963e1c8b2bc1a17673e51a2b4d0d3";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."extname" or []);
+    deps = [
+      self.by-version."ext-list"."0.1.0"
+      self.by-version."lodash"."2.4.1"
+      self.by-version."map-key"."0.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "extname" ];
+  };
   by-spec."extract-opts"."~2.2.0" =
     self.by-version."extract-opts"."2.2.0";
   by-version."extract-opts"."2.2.0" = lib.makeOverridable self.buildNodePackage {
@@ -6668,6 +6865,26 @@
     ];
     passthru.names = [ "form-data" ];
   };
+  by-spec."formatio"."~1.0" =
+    self.by-version."formatio"."1.0.2";
+  by-version."formatio"."1.0.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-formatio-1.0.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz";
+        name = "formatio-1.0.2.tgz";
+        sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."formatio" or []);
+    deps = [
+      self.by-version."samsam"."1.1.1"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "formatio" ];
+  };
   by-spec."formidable"."1.0.11" =
     self.by-version."formidable"."1.0.11";
   by-version."formidable"."1.0.11" = lib.makeOverridable self.buildNodePackage {
@@ -7843,14 +8060,14 @@
   by-spec."handlebars"."~1.3.0" =
     self.by-version."handlebars"."1.3.0";
   by-spec."has-color"."~0.1.0" =
-    self.by-version."has-color"."0.1.6";
-  by-version."has-color"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-has-color-0.1.6";
+    self.by-version."has-color"."0.1.7";
+  by-version."has-color"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-has-color-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.6.tgz";
-        name = "has-color-0.1.6.tgz";
-        sha1 = "a77443bddb036c6df06e04a4493ce9f23533731b";
+        url = "http://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+        name = "has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
       })
     ];
     buildInputs =
@@ -8125,7 +8342,7 @@
       self.by-version."domhandler"."2.0.3"
       self.by-version."domutils"."1.1.6"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -8148,7 +8365,7 @@
       self.by-version."domhandler"."2.1.0"
       self.by-version."domutils"."1.1.6"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -8171,7 +8388,7 @@
       self.by-version."domhandler"."2.2.0"
       self.by-version."domutils"."1.3.0"
       self.by-version."domelementtype"."1.1.1"
-      self.by-version."readable-stream"."1.1.12"
+      self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
     ];
@@ -8367,14 +8584,14 @@
     passthru.names = [ "i" ];
   };
   by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.1";
-  by-version."i18next"."1.7.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-i18next-1.7.1";
+    self.by-version."i18next"."1.7.3";
+  by-version."i18next"."1.7.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-i18next-1.7.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.1.tgz";
-        name = "i18next-1.7.1.tgz";
-        sha1 = "39616a1fe88258edbdd0da918b9ee49a1bd1e124";
+        url = "http://registry.npmjs.org/i18next/-/i18next-1.7.3.tgz";
+        name = "i18next-1.7.3.tgz";
+        sha1 = "8a064866c8e6e87b4664a32fe81b9be34b4a3894";
       })
     ];
     buildInputs =
@@ -8386,7 +8603,7 @@
     ];
     passthru.names = [ "i18next" ];
   };
-  "i18next" = self.by-version."i18next"."1.7.1";
+  "i18next" = self.by-version."i18next"."1.7.3";
   by-spec."ibrik"."~1.1.1" =
     self.by-version."ibrik"."1.1.1";
   by-version."ibrik"."1.1.1" = lib.makeOverridable self.buildNodePackage {
@@ -8515,8 +8732,6 @@
   };
   by-spec."inherits"."2.0.1" =
     self.by-version."inherits"."2.0.1";
-  by-spec."inherits"."^2.0.1" =
-    self.by-version."inherits"."2.0.1";
   by-spec."inherits"."~1.0.0" =
     self.by-version."inherits"."1.0.0";
   by-spec."inherits"."~2.0.0" =
@@ -8868,7 +9083,7 @@
       self.by-version."async"."0.2.10"
       self.by-version."abbrev"."1.0.4"
       self.by-version."wordwrap"."0.0.2"
-      self.by-version."resolve"."0.6.2"
+      self.by-version."resolve"."0.6.3"
       self.by-version."js-yaml"."3.0.2"
     ];
     peerDependencies = [
@@ -9004,26 +9219,26 @@
     passthru.names = [ "jade" ];
   };
   by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.2.6";
-  by-version."jayschema"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "jayschema-0.2.6";
+    self.by-version."jayschema"."0.2.7";
+  by-version."jayschema"."0.2.7" = lib.makeOverridable self.buildNodePackage {
+    name = "jayschema-0.2.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.6.tgz";
-        name = "jayschema-0.2.6.tgz";
-        sha1 = "c160e767cef66babda76b0fc34a06d4adc44965d";
+        url = "http://registry.npmjs.org/jayschema/-/jayschema-0.2.7.tgz";
+        name = "jayschema-0.2.7.tgz";
+        sha1 = "99d653a0c6ceec4f2c5932c5d73c835bb8911062";
       })
     ];
     buildInputs =
       (self.nativeDeps."jayschema" or []);
     deps = [
-      self.by-version."when"."2.8.0"
+      self.by-version."when"."3.1.0"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "jayschema" ];
   };
-  "jayschema" = self.by-version."jayschema"."0.2.6";
+  "jayschema" = self.by-version."jayschema"."0.2.7";
   by-spec."js-yaml"."*" =
     self.by-version."js-yaml"."3.0.2";
   by-version."js-yaml"."3.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -9550,7 +9765,7 @@
     buildInputs =
       (self.nativeDeps."karma-sauce-launcher" or []);
     deps = [
-      self.by-version."wd"."0.2.17"
+      self.by-version."wd"."0.2.19"
       self.by-version."sauce-connect-launcher"."0.4.2"
       self.by-version."q"."0.9.7"
       self.by-version."saucelabs"."0.1.1"
@@ -9781,7 +9996,7 @@
     buildInputs =
       (self.nativeDeps."lazystream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -9827,7 +10042,7 @@
     passthru.names = [ "lcov-result-merger" ];
   };
   "lcov-result-merger" = self.by-version."lcov-result-merger"."0.0.2";
-  by-spec."less"."^1.7.0" =
+  by-spec."less"."*" =
     self.by-version."less"."1.7.0";
   by-version."less"."1.7.0" = lib.makeOverridable self.buildNodePackage {
     name = "less-1.7.0";
@@ -9851,6 +10066,9 @@
     ];
     passthru.names = [ "less" ];
   };
+  "less" = self.by-version."less"."1.7.0";
+  by-spec."less"."^1.7.0" =
+    self.by-version."less"."1.7.0";
   by-spec."less"."~1.7.0" =
     self.by-version."less"."1.7.0";
   by-spec."lexical-scope"."~1.1.0" =
@@ -10307,7 +10525,7 @@
     deps = [
       self.by-version."async"."0.1.15"
       self.by-version."semver"."1.1.4"
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -10531,6 +10749,26 @@
     ];
     passthru.names = [ "map-key" ];
   };
+  by-spec."marked"."*" =
+    self.by-version."marked"."0.3.2";
+  by-version."marked"."0.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "marked-0.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/marked/-/marked-0.3.2.tgz";
+        name = "marked-0.3.2.tgz";
+        sha1 = "015db158864438f24a64bdd61a0428b418706d09";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."marked" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "marked" ];
+  };
+  "marked" = self.by-version."marked"."0.3.2";
   by-spec."maxmin"."^0.1.0" =
     self.by-version."maxmin"."0.1.0";
   by-version."maxmin"."0.1.0" = lib.makeOverridable self.buildNodePackage {
@@ -11029,7 +11267,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11038,6 +11276,55 @@
     passthru.names = [ "mocha" ];
   };
   "mocha" = self.by-version."mocha"."1.18.2";
+  by-spec."mocha"."1.13.x" =
+    self.by-version."mocha"."1.13.0";
+  by-version."mocha"."1.13.0" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-1.13.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha/-/mocha-1.13.0.tgz";
+        name = "mocha-1.13.0.tgz";
+        sha1 = "8d8fa4e310b94cc6efeb3ed26aeca96dea93307c";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha" or []);
+    deps = [
+      self.by-version."commander"."0.6.1"
+      self.by-version."growl"."1.7.0"
+      self.by-version."jade"."0.26.3"
+      self.by-version."diff"."1.0.7"
+      self.by-version."debug"."0.8.0"
+      self.by-version."mkdirp"."0.3.5"
+      self.by-version."glob"."3.2.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mocha" ];
+  };
+  by-spec."mocha-phantomjs"."*" =
+    self.by-version."mocha-phantomjs"."3.3.2";
+  by-version."mocha-phantomjs"."3.3.2" = lib.makeOverridable self.buildNodePackage {
+    name = "mocha-phantomjs-3.3.2";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.3.2.tgz";
+        name = "mocha-phantomjs-3.3.2.tgz";
+        sha1 = "2d7cc9926f0fbbeb341697d7f2a031151c601722";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."mocha-phantomjs" or []);
+    deps = [
+      self.by-version."mocha"."1.13.0"
+      self.by-version."commander"."1.2.0"
+      self.by-version."which"."1.0.5"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "mocha-phantomjs" ];
+  };
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.3.2";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage {
@@ -11062,6 +11349,33 @@
     passthru.names = [ "mocha-unfunk-reporter" ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
+  by-spec."module-deps"."~1.10.0" =
+    self.by-version."module-deps"."1.10.0";
+  by-version."module-deps"."1.10.0" = lib.makeOverridable self.buildNodePackage {
+    name = "module-deps-1.10.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/module-deps/-/module-deps-1.10.0.tgz";
+        name = "module-deps-1.10.0.tgz";
+        sha1 = "57a9cac9dbd092428ec5249f6cf37fb249d77db6";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."module-deps" or []);
+    deps = [
+      self.by-version."JSONStream"."0.7.2"
+      self.by-version."browser-resolve"."1.2.4"
+      self.by-version."concat-stream"."1.4.5"
+      self.by-version."detective"."3.1.0"
+      self.by-version."minimist"."0.0.8"
+      self.by-version."parents"."0.0.2"
+      self.by-version."resolve"."0.6.3"
+      self.by-version."through"."2.3.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "module-deps" ];
+  };
   by-spec."module-deps"."~1.8.0" =
     self.by-version."module-deps"."1.8.1";
   by-version."module-deps"."1.8.1" = lib.makeOverridable self.buildNodePackage {
@@ -11077,12 +11391,12 @@
       (self.nativeDeps."module-deps" or []);
     deps = [
       self.by-version."JSONStream"."0.7.2"
-      self.by-version."browser-resolve"."1.2.2"
+      self.by-version."browser-resolve"."1.2.4"
       self.by-version."concat-stream"."1.4.5"
       self.by-version."detective"."3.1.0"
       self.by-version."minimist"."0.0.8"
       self.by-version."parents"."0.0.2"
-      self.by-version."resolve"."0.6.2"
+      self.by-version."resolve"."0.6.3"
       self.by-version."through"."2.3.4"
     ];
     peerDependencies = [
@@ -11147,14 +11461,14 @@
     passthru.names = [ "moment" ];
   };
   by-spec."mongodb"."*" =
-    self.by-version."mongodb"."1.4.1";
-  by-version."mongodb"."1.4.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-mongodb-1.4.1";
+    self.by-version."mongodb"."1.4.2";
+  by-version."mongodb"."1.4.2" = lib.makeOverridable self.buildNodePackage {
+    name = "node-mongodb-1.4.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.1.tgz";
-        name = "mongodb-1.4.1.tgz";
-        sha1 = "6b37d2c90c2a70ee12fbf7289a45f694f9530b79";
+        url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.2.tgz";
+        name = "mongodb-1.4.2.tgz";
+        sha1 = "68b5a5ac7ee146dcbdf17d01f60ffe88e61e76aa";
       })
     ];
     buildInputs =
@@ -11167,7 +11481,7 @@
     ];
     passthru.names = [ "mongodb" ];
   };
-  "mongodb" = self.by-version."mongodb"."1.4.1";
+  "mongodb" = self.by-version."mongodb"."1.4.2";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage {
@@ -11605,7 +11919,7 @@
     buildInputs =
       (self.nativeDeps."multiparty" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.12"
+      self.by-version."readable-stream"."1.1.13-1"
       self.by-version."stream-counter"."0.2.0"
     ];
     peerDependencies = [
@@ -12084,9 +12398,9 @@
       self.by-version."express"."3.5.1"
       self.by-version."async"."0.4.1"
       self.by-version."glob"."3.2.9"
-      self.by-version."rc"."0.3.4"
+      self.by-version."rc"."0.3.5"
       self.by-version."strong-data-uri"."0.1.1"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."ws"."0.4.31"
       self.by-version."opener"."1.3.0"
       self.by-version."yargs"."1.1.3"
@@ -12307,7 +12621,7 @@
       (self.nativeDeps."nodemailer" or []);
     deps = [
       self.by-version."mailcomposer"."0.2.9"
-      self.by-version."simplesmtp"."0.3.24"
+      self.by-version."simplesmtp"."0.3.25"
       self.by-version."optimist"."0.6.1"
     ];
     peerDependencies = [
@@ -12468,14 +12782,14 @@
     passthru.names = [ "normalize-package-data" ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."1.4.6";
-  by-version."npm"."1.4.6" = lib.makeOverridable self.buildNodePackage {
-    name = "npm-1.4.6";
+    self.by-version."npm"."1.4.7";
+  by-version."npm"."1.4.7" = lib.makeOverridable self.buildNodePackage {
+    name = "npm-1.4.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/npm/-/npm-1.4.6.tgz";
-        name = "npm-1.4.6.tgz";
-        sha1 = "0e151bce38e72cf2206a6299fa5164123f04256e";
+        url = "http://registry.npmjs.org/npm/-/npm-1.4.7.tgz";
+        name = "npm-1.4.7.tgz";
+        sha1 = "7e3c4385973ffb58c9bf15eebe2668c0ce3fafe0";
       })
     ];
     buildInputs =
@@ -12535,7 +12849,7 @@
     ];
     passthru.names = [ "npm" ];
   };
-  "npm" = self.by-version."npm"."1.4.6";
+  "npm" = self.by-version."npm"."1.4.7";
   by-spec."npm-install-checks"."~1.0.0" =
     self.by-version."npm-install-checks"."1.0.0";
   by-version."npm-install-checks"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -12586,7 +12900,7 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.5" =
+  by-spec."npm-registry-client"."~0.4.7" =
     self.by-version."npm-registry-client"."0.4.7";
   by-version."npm-registry-client"."0.4.7" = lib.makeOverridable self.buildNodePackage {
     name = "node-npm-registry-client-0.4.7";
@@ -12614,8 +12928,6 @@
     ];
     passthru.names = [ "npm-registry-client" ];
   };
-  by-spec."npm-registry-client"."~0.4.7" =
-    self.by-version."npm-registry-client"."0.4.7";
   by-spec."npm-user-validate"."0.0.3" =
     self.by-version."npm-user-validate"."0.0.3";
   by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -12744,6 +13056,8 @@
     ];
     passthru.names = [ "npmconf" ];
   };
+  by-spec."npmconf"."~0.1.14" =
+    self.by-version."npmconf"."0.1.14";
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.14";
   by-spec."npmlog"."*" =
@@ -13046,14 +13360,14 @@
     passthru.names = [ "opener" ];
   };
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.7";
-  by-version."openid"."0.5.7" = lib.makeOverridable self.buildNodePackage {
-    name = "node-openid-0.5.7";
+    self.by-version."openid"."0.5.8";
+  by-version."openid"."0.5.8" = lib.makeOverridable self.buildNodePackage {
+    name = "node-openid-0.5.8";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/openid/-/openid-0.5.7.tgz";
-        name = "openid-0.5.7.tgz";
-        sha1 = "cb92228f7b887bd5af0a444db42b67db785b0e9b";
+        url = "http://registry.npmjs.org/openid/-/openid-0.5.8.tgz";
+        name = "openid-0.5.8.tgz";
+        sha1 = "e1e3b26235cb8964ef850c074529b9d031550e85";
       })
     ];
     buildInputs =
@@ -13301,6 +13615,25 @@
     ];
     passthru.names = [ "p-throttler" ];
   };
+  by-spec."pako"."~0.2.0" =
+    self.by-version."pako"."0.2.0";
+  by-version."pako"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-pako-0.2.0";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/pako/-/pako-0.2.0.tgz";
+        name = "pako-0.2.0.tgz";
+        sha1 = "bb93787e8c60587c8b13cd3cd8802e9d6f5dd8d5";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."pako" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "pako" ];
+  };
   by-spec."parents"."0.0.2" =
     self.by-version."parents"."0.0.2";
   by-version."parents"."0.0.2" = lib.makeOverridable self.buildNodePackage {
@@ -13526,7 +13859,7 @@
     ];
     passthru.names = [ "pause" ];
   };
-  by-spec."phantomjs"."~1.9.1-2" =
+  by-spec."phantomjs"."*" =
     self.by-version."phantomjs"."1.9.7-3";
   by-version."phantomjs"."1.9.7-3" = lib.makeOverridable self.buildNodePackage {
     name = "phantomjs-1.9.7-3";
@@ -13552,6 +13885,9 @@
     ];
     passthru.names = [ "phantomjs" ];
   };
+  "phantomjs" = self.by-version."phantomjs"."1.9.7-3";
+  by-spec."phantomjs"."~1.9.1-2" =
+    self.by-version."phantomjs"."1.9.7-3";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -13997,6 +14333,8 @@
     ];
     passthru.names = [ "q" ];
   };
+  by-spec."q"."~1.0.1" =
+    self.by-version."q"."1.0.1";
   by-spec."qs"."0.4.2" =
     self.by-version."qs"."0.4.2";
   by-version."qs"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -14320,7 +14658,25 @@
     passthru.names = [ "raw-body" ];
   };
   by-spec."raw-body"."~1.1.2" =
-    self.by-version."raw-body"."1.1.3";
+    self.by-version."raw-body"."1.1.4";
+  by-version."raw-body"."1.1.4" = lib.makeOverridable self.buildNodePackage {
+    name = "node-raw-body-1.1.4";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
+        name = "raw-body-1.1.4.tgz";
+        sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."raw-body" or []);
+    deps = [
+      self.by-version."bytes"."0.3.0"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "raw-body" ];
+  };
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = lib.makeOverridable self.buildNodePackage {
@@ -14361,14 +14717,14 @@
   };
   "rbytes" = self.by-version."rbytes"."1.0.0";
   by-spec."rc"."~0.3.0" =
-    self.by-version."rc"."0.3.4";
-  by-version."rc"."0.3.4" = lib.makeOverridable self.buildNodePackage {
-    name = "rc-0.3.4";
+    self.by-version."rc"."0.3.5";
+  by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage {
+    name = "rc-0.3.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/rc/-/rc-0.3.4.tgz";
-        name = "rc-0.3.4.tgz";
-        sha1 = "01101660fb38363c22afbddfad46ecdb92b42df9";
+        url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz";
+        name = "rc-0.3.5.tgz";
+        sha1 = "fce2220593be57aa1296685a7e37ed003dfcc728";
       })
     ];
     buildInputs =
@@ -14383,7 +14739,7 @@
     passthru.names = [ "rc" ];
   };
   by-spec."rc"."~0.3.4" =
-    self.by-version."rc"."0.3.4";
+    self.by-version."rc"."0.3.5";
   by-spec."react"."*" =
     self.by-version."react"."0.10.0";
   by-version."react"."0.10.0" = lib.makeOverridable self.buildNodePackage {
@@ -14481,34 +14837,37 @@
   by-spec."read-package-json"."~1.1.8" =
     self.by-version."read-package-json"."1.1.8";
   by-spec."readable-stream"."1.0" =
-    self.by-version."readable-stream"."1.0.26";
-  by-version."readable-stream"."1.0.26" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.0.26";
+    self.by-version."readable-stream"."1.0.27-1";
+  by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.0.27-1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.26.tgz";
-        name = "readable-stream-1.0.26.tgz";
-        sha1 = "12a9c4415f6a85374abe18b7831ba52d43105766";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+        name = "readable-stream-1.0.27-1.tgz";
+        sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
       })
     ];
     buildInputs =
       (self.nativeDeps."readable-stream" or []);
     deps = [
+      self.by-version."core-util-is"."1.0.1"
+      self.by-version."isarray"."0.0.1"
       self.by-version."string_decoder"."0.10.25"
+      self.by-version."inherits"."2.0.1"
     ];
     peerDependencies = [
     ];
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."1.1" =
-    self.by-version."readable-stream"."1.1.12";
-  by-version."readable-stream"."1.1.12" = lib.makeOverridable self.buildNodePackage {
-    name = "node-readable-stream-1.1.12";
+    self.by-version."readable-stream"."1.1.13-1";
+  by-version."readable-stream"."1.1.13-1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-readable-stream-1.1.13-1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.12.tgz";
-        name = "readable-stream-1.1.12.tgz";
-        sha1 = "960d442bbf5f6690b6b20550413931021af8e506";
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz";
+        name = "readable-stream-1.1.13-1.tgz";
+        sha1 = "fc6f04f3366bf37bae21bec2e411c1b4d2cf1a46";
       })
     ];
     buildInputs =
@@ -14524,15 +14883,15 @@
     passthru.names = [ "readable-stream" ];
   };
   by-spec."readable-stream"."~1.0.17" =
-    self.by-version."readable-stream"."1.0.26";
+    self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.0.2" =
-    self.by-version."readable-stream"."1.0.26";
+    self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.0.24" =
-    self.by-version."readable-stream"."1.0.26";
+    self.by-version."readable-stream"."1.0.27-1";
   by-spec."readable-stream"."~1.1.8" =
-    self.by-version."readable-stream"."1.1.12";
+    self.by-version."readable-stream"."1.1.13-1";
   by-spec."readable-stream"."~1.1.9" =
-    self.by-version."readable-stream"."1.1.12";
+    self.by-version."readable-stream"."1.1.13-1";
   by-spec."readdirp"."~0.2.3" =
     self.by-version."readdirp"."0.2.5";
   by-version."readdirp"."0.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -15049,15 +15408,15 @@
   };
   by-spec."requirejs"."~2.1.0" =
     self.by-version."requirejs"."2.1.11";
-  by-spec."resolve"."0.6.1" =
-    self.by-version."resolve"."0.6.1";
-  by-version."resolve"."0.6.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-resolve-0.6.1";
+  by-spec."resolve"."0.6.3" =
+    self.by-version."resolve"."0.6.3";
+  by-version."resolve"."0.6.3" = lib.makeOverridable self.buildNodePackage {
+    name = "node-resolve-0.6.3";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz";
-        name = "resolve-0.6.1.tgz";
-        sha1 = "b7fc874a8fe240b44de2c92b7f885a2e8598b652";
+        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
+        name = "resolve-0.6.3.tgz";
+        sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
       })
     ];
     buildInputs =
@@ -15069,24 +15428,7 @@
     passthru.names = [ "resolve" ];
   };
   by-spec."resolve"."0.6.x" =
-    self.by-version."resolve"."0.6.2";
-  by-version."resolve"."0.6.2" = lib.makeOverridable self.buildNodePackage {
-    name = "node-resolve-0.6.2";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/resolve/-/resolve-0.6.2.tgz";
-        name = "resolve-0.6.2.tgz";
-        sha1 = "7404e59e3c02980aa172272186521db3cf0a15f5";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."resolve" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "resolve" ];
-  };
+    self.by-version."resolve"."0.6.3";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage {
@@ -15109,9 +15451,9 @@
   by-spec."resolve"."~0.3.1" =
     self.by-version."resolve"."0.3.1";
   by-spec."resolve"."~0.6.0" =
-    self.by-version."resolve"."0.6.2";
+    self.by-version."resolve"."0.6.3";
   by-spec."resolve"."~0.6.1" =
-    self.by-version."resolve"."0.6.2";
+    self.by-version."resolve"."0.6.3";
   by-spec."response-time"."1.0.0" =
     self.by-version."response-time"."1.0.0";
   by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15392,6 +15734,25 @@
     passthru.names = [ "s3http" ];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
+  by-spec."samsam"."~1.1" =
+    self.by-version."samsam"."1.1.1";
+  by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-samsam-1.1.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz";
+        name = "samsam-1.1.1.tgz";
+        sha1 = "48d64ee2a7aecaaeccebe2f0a68a49687d3a49b1";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."samsam" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "samsam" ];
+  };
   by-spec."sauce-connect-launcher"."~0.4.0" =
     self.by-version."sauce-connect-launcher"."0.4.2";
   by-version."sauce-connect-launcher"."0.4.2" = lib.makeOverridable self.buildNodePackage {
@@ -15637,7 +15998,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.2"
       self.by-version."range-parser"."1.0.0"
@@ -15660,7 +16021,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -15683,7 +16044,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -15706,7 +16067,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -15856,7 +16217,7 @@
       (self.nativeDeps."sha" or []);
     deps = [
       self.by-version."graceful-fs"."2.0.3"
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -15923,6 +16284,26 @@
     ];
     passthru.names = [ "shell-quote" ];
   };
+  by-spec."shelljs"."*" =
+    self.by-version."shelljs"."0.2.6";
+  by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
+    name = "shelljs-0.2.6";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz";
+        name = "shelljs-0.2.6.tgz";
+        sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."shelljs" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "shelljs" ];
+  };
+  "shelljs" = self.by-version."shelljs"."0.2.6";
   by-spec."shelljs"."0.1.x" =
     self.by-version."shelljs"."0.1.4";
   by-version."shelljs"."0.1.4" = lib.makeOverridable self.buildNodePackage {
@@ -15944,32 +16325,15 @@
   };
   by-spec."shelljs"."~0.2.6" =
     self.by-version."shelljs"."0.2.6";
-  by-version."shelljs"."0.2.6" = lib.makeOverridable self.buildNodePackage {
-    name = "shelljs-0.2.6";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/shelljs/-/shelljs-0.2.6.tgz";
-        name = "shelljs-0.2.6.tgz";
-        sha1 = "90492d72ffcc8159976baba62fb0f6884f0c3378";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."shelljs" or []);
-    deps = [
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "shelljs" ];
-  };
   by-spec."should"."*" =
-    self.by-version."should"."3.3.0";
-  by-version."should"."3.3.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-should-3.3.0";
+    self.by-version."should"."3.3.1";
+  by-version."should"."3.3.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-should-3.3.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/should/-/should-3.3.0.tgz";
-        name = "should-3.3.0.tgz";
-        sha1 = "88b1adeab97d8811e0e479e3b93d7f1c1bd5bbca";
+        url = "http://registry.npmjs.org/should/-/should-3.3.1.tgz";
+        name = "should-3.3.1.tgz";
+        sha1 = "28c93a522ba001146af96078f0a88bf5ac929522";
       })
     ];
     buildInputs =
@@ -15980,7 +16344,7 @@
     ];
     passthru.names = [ "should" ];
   };
-  "should" = self.by-version."should"."3.3.0";
+  "should" = self.by-version."should"."3.3.1";
   by-spec."sigmund"."~1.0.0" =
     self.by-version."sigmund"."1.0.0";
   by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16043,14 +16407,14 @@
     passthru.names = [ "simple-lru-cache" ];
   };
   by-spec."simplesmtp".">= 0.1.22" =
-    self.by-version."simplesmtp"."0.3.24";
-  by-version."simplesmtp"."0.3.24" = lib.makeOverridable self.buildNodePackage {
-    name = "node-simplesmtp-0.3.24";
+    self.by-version."simplesmtp"."0.3.25";
+  by-version."simplesmtp"."0.3.25" = lib.makeOverridable self.buildNodePackage {
+    name = "node-simplesmtp-0.3.25";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.24.tgz";
-        name = "simplesmtp-0.3.24.tgz";
-        sha1 = "7423226b0735a8dbf87c07c3888f33ba2135a0e7";
+        url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.25.tgz";
+        name = "simplesmtp-0.3.25.tgz";
+        sha1 = "09b6ac292b7dae8053cfba11da09a0458eb8af39";
       })
     ];
     buildInputs =
@@ -16063,6 +16427,28 @@
     ];
     passthru.names = [ "simplesmtp" ];
   };
+  by-spec."sinon"."*" =
+    self.by-version."sinon"."1.9.1";
+  by-version."sinon"."1.9.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-sinon-1.9.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/sinon/-/sinon-1.9.1.tgz";
+        name = "sinon-1.9.1.tgz";
+        sha1 = "0dac622bd3f0e6f9662a7431baf65f58c3459d69";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."sinon" or []);
+    deps = [
+      self.by-version."formatio"."1.0.2"
+      self.by-version."util"."0.10.3"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "sinon" ];
+  };
+  "sinon" = self.by-version."sinon"."1.9.1";
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.3";
   by-version."slasp"."0.0.3" = lib.makeOverridable self.buildNodePackage {
@@ -16564,14 +16950,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.1.5";
-  by-version."stackdriver-statsd-backend"."0.1.5" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stackdriver-statsd-backend-0.1.5";
+    self.by-version."stackdriver-statsd-backend"."0.2.0";
+  by-version."stackdriver-statsd-backend"."0.2.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stackdriver-statsd-backend-0.2.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.1.5.tgz";
-        name = "stackdriver-statsd-backend-0.1.5.tgz";
-        sha1 = "6f0cda0903fd149c6f69d0e50a9e8b4efd85141b";
+        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.0.tgz";
+        name = "stackdriver-statsd-backend-0.2.0.tgz";
+        sha1 = "6c81fc970f9da905970ef387cf1215fa23b05d73";
       })
     ];
     buildInputs =
@@ -16582,7 +16968,7 @@
     ];
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.1.5";
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.0";
   by-spec."static-favicon"."1.0.0" =
     self.by-version."static-favicon"."1.0.0";
   by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -16721,7 +17107,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
     ];
     peerDependencies = [
     ];
@@ -16741,7 +17127,7 @@
     buildInputs =
       (self.nativeDeps."stream-counter" or []);
     deps = [
-      self.by-version."readable-stream"."1.1.12"
+      self.by-version."readable-stream"."1.1.13-1"
     ];
     peerDependencies = [
     ];
@@ -16937,7 +17323,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
       self.by-version."circular-json"."0.1.6"
@@ -16963,7 +17349,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.1"
+      self.by-version."debug"."0.8.0"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
     ];
@@ -17423,7 +17809,7 @@
     buildInputs =
       (self.nativeDeps."through2" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
       self.by-version."xtend"."2.1.2"
     ];
     peerDependencies = [
@@ -17838,6 +18224,30 @@
     ];
     passthru.names = [ "typedarray" ];
   };
+  by-spec."uglify-js"."*" =
+    self.by-version."uglify-js"."2.4.13";
+  by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
+    name = "uglify-js-2.4.13";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
+        name = "uglify-js-2.4.13.tgz";
+        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."uglify-js" or []);
+    deps = [
+      self.by-version."async"."0.2.10"
+      self.by-version."source-map"."0.1.33"
+      self.by-version."optimist"."0.3.7"
+      self.by-version."uglify-to-browserify"."1.0.2"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "uglify-js" ];
+  };
+  "uglify-js" = self.by-version."uglify-js"."2.4.13";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -17882,27 +18292,6 @@
   };
   by-spec."uglify-js"."^2.4.0" =
     self.by-version."uglify-js"."2.4.13";
-  by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
-    name = "uglify-js-2.4.13";
-    src = [
-      (fetchurl {
-        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.13.tgz";
-        name = "uglify-js-2.4.13.tgz";
-        sha1 = "18debc9e6ecfc20db1a5ea035f839d436a605aba";
-      })
-    ];
-    buildInputs =
-      (self.nativeDeps."uglify-js" or []);
-    deps = [
-      self.by-version."async"."0.2.10"
-      self.by-version."source-map"."0.1.33"
-      self.by-version."optimist"."0.3.7"
-      self.by-version."uglify-to-browserify"."1.0.2"
-    ];
-    peerDependencies = [
-    ];
-    passthru.names = [ "uglify-js" ];
-  };
   by-spec."uglify-js"."~2.2" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage {
@@ -18191,7 +18580,7 @@
       self.by-version."socket.io"."0.9.16"
       self.by-version."moment"."2.5.1"
       self.by-version."async"."0.6.2"
-      self.by-version."rc"."0.3.4"
+      self.by-version."rc"."0.3.5"
       self.by-version."uuid"."1.4.1"
       self.by-version."winston"."0.7.3"
       self.by-version."passport"."0.2.0"
@@ -18217,7 +18606,7 @@
       self.by-version."browserify"."3.38.1"
       self.by-version."body-parser"."1.0.2"
       self.by-version."cookie-parser"."1.0.1"
-      self.by-version."express-session"."1.0.2"
+      self.by-version."express-session"."1.0.3"
       self.by-version."serve-static"."1.0.4"
     ];
     peerDependencies = [
@@ -18350,7 +18739,7 @@
     ];
     passthru.names = [ "util" ];
   };
-  by-spec."util"."~0.10.1" =
+  by-spec."util".">=0.10.3 <1" =
     self.by-version."util"."0.10.3";
   by-version."util"."0.10.3" = lib.makeOverridable self.buildNodePackage {
     name = "node-util-0.10.3";
@@ -18370,6 +18759,8 @@
     ];
     passthru.names = [ "util" ];
   };
+  by-spec."util"."~0.10.1" =
+    self.by-version."util"."0.10.3";
   by-spec."util-extend"."^1.0.1" =
     self.by-version."util-extend"."1.0.1";
   by-version."util-extend"."1.0.1" = lib.makeOverridable self.buildNodePackage {
@@ -18766,14 +19157,14 @@
     passthru.names = [ "watch" ];
   };
   by-spec."wd"."~0.2.12" =
-    self.by-version."wd"."0.2.17";
-  by-version."wd"."0.2.17" = lib.makeOverridable self.buildNodePackage {
-    name = "wd-0.2.17";
+    self.by-version."wd"."0.2.19";
+  by-version."wd"."0.2.19" = lib.makeOverridable self.buildNodePackage {
+    name = "wd-0.2.19";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/wd/-/wd-0.2.17.tgz";
-        name = "wd-0.2.17.tgz";
-        sha1 = "277b417057a1a5fe7845ab3dc4ff130888f4ec95";
+        url = "http://registry.npmjs.org/wd/-/wd-0.2.19.tgz";
+        name = "wd-0.2.19.tgz";
+        sha1 = "347ae75adebc15ad642baec118742344d749f169";
       })
     ];
     buildInputs =
@@ -18858,15 +19249,15 @@
   };
   by-spec."websocket-driver".">=0.3.1" =
     self.by-version."websocket-driver"."0.3.2";
-  by-spec."when"."~2.8.0" =
-    self.by-version."when"."2.8.0";
-  by-version."when"."2.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-when-2.8.0";
+  by-spec."when"."~3.1.0" =
+    self.by-version."when"."3.1.0";
+  by-version."when"."3.1.0" = lib.makeOverridable self.buildNodePackage {
+    name = "node-when-3.1.0";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/when/-/when-2.8.0.tgz";
-        name = "when-2.8.0.tgz";
-        sha1 = "a15eda8b6998ce74c6f4e220dbda18ce2ab3b026";
+        url = "http://registry.npmjs.org/when/-/when-3.1.0.tgz";
+        name = "when-3.1.0.tgz";
+        sha1 = "a2479659ca15f725541ecf52ebae091b781ee134";
       })
     ];
     buildInputs =
@@ -19468,7 +19859,7 @@
       self.by-version."findup-sync"."0.1.3"
       self.by-version."chalk"."0.3.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.15"
+      self.by-version."download"."0.1.16"
       self.by-version."request"."2.27.0"
       self.by-version."file-utils"."0.1.5"
     ];
@@ -19508,7 +19899,7 @@
       self.by-version."findup-sync"."0.1.3"
       self.by-version."chalk"."0.4.0"
       self.by-version."text-table"."0.2.0"
-      self.by-version."download"."0.1.15"
+      self.by-version."download"."0.1.16"
       self.by-version."request"."2.30.0"
       self.by-version."file-utils"."0.1.5"
       self.by-version."class-extend"."0.1.1"
@@ -19587,7 +19978,7 @@
     buildInputs =
       (self.nativeDeps."zip-stream" or []);
     deps = [
-      self.by-version."readable-stream"."1.0.26"
+      self.by-version."readable-stream"."1.0.27-1"
       self.by-version."lodash.defaults"."2.4.1"
     ];
     peerDependencies = [
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 45447127dca..57eab330ce2 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -122,4 +122,12 @@
 , "slasp"
 , "react"
 , { "pure-css": "git://github.com/yui/pure.git#v0.5.0-rc-1" }
+, "marked"
+, "browserify"
+, "uglify-js"
+, "less"
+, "mocha-phantomjs"
+, "phantomjs"
+, "sinon"
+, "shelljs"
 ]

From 5701e4e15aa5876e0dcfa5079f76a80d9a5afac8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 20 Apr 2014 22:57:03 -0400
Subject: [PATCH 0392/2033] Add buildLocalCabalWithArgs for providing extra
 arguments to callPackage

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cacc9589325..7c241f9e44d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2992,7 +2992,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
 
   # Build a cabal package given a local .cabal file
-  buildLocalCabal = src: name: let
+  buildLocalCabalWithArgs = { src, name, args ? {} }: let
     cabalExpr = pkgs.stdenv.mkDerivation ({
       name = "${name}.nix";
 
@@ -3008,7 +3008,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
     });
-  in callPackage cabalExpr { inherit src; };
+  in callPackage cabalExpr ({ inherit src; } // args);
+
+  buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; };
 
   cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
 

From b12b180fc28ae8de527dc1831f27607d1b255269 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 20 Apr 2014 11:30:06 +0200
Subject: [PATCH 0393/2033] meshlab: fix build

Patches are from the Arch Linux package.
---
 .../applications/graphics/meshlab/default.nix |  6 +++
 .../graphics/meshlab/gcc-4.7.patch            | 38 +++++++++++++
 .../graphics/meshlab/qt-4.8.patch             | 54 +++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/graphics/meshlab/gcc-4.7.patch
 create mode 100644 pkgs/applications/graphics/meshlab/qt-4.8.patch

diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 7151fc7af5c..4e2075ff471 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
   # buildPhase gets removed from the 'meshlab' binary
   dontPatchELF = true;
 
+  # Patches are from the Arch Linux package
+  patchPhase = ''
+    patch -Np0 -i "${./qt-4.8.patch}"
+    patch -Np1 -i "${./gcc-4.7.patch}"
+  '';
+
   buildPhase = ''
     mkdir -p "$out/include"
     cp -r vcglib "$out/include"
diff --git a/pkgs/applications/graphics/meshlab/gcc-4.7.patch b/pkgs/applications/graphics/meshlab/gcc-4.7.patch
new file mode 100644
index 00000000000..07dc1a08aff
--- /dev/null
+++ b/pkgs/applications/graphics/meshlab/gcc-4.7.patch
@@ -0,0 +1,38 @@
+diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+index 2351b2a..90c6d76 100644
+--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
++++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+@@ -40,7 +40,7 @@ public:
+ 
+   //! Reset histogram data.
+   void Clear() {
+-    this->::Clear();
++    Histogram<ScalarType>::Clear();
+     CV.clear();
+   }
+   /*
+diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
+index 5d40404..ab9d0aa 100644
+--- a/vcglib/wrap/gl/trimesh.h
++++ b/vcglib/wrap/gl/trimesh.h
+@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad)
+ 			}
+ 		}
+ 
+-	m.vert.math::Swap(newvert);
++	m.vert.math.Swap(newvert);
+ 	m.vn=m.vert.size();
+ }
+ 
+diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
+index 3e41e63..4af9508 100644
+--- a/vcglib/wrap/ply/plystuff.h
++++ b/vcglib/wrap/ply/plystuff.h
+@@ -75,6 +75,7 @@ using namespace vcg;
+ #define pb_close  _close
+ #define DIR_SEP "\\"
+ #else
++#include <unistd.h>
+ #define pb_mkdir(n)  mkdir(n,0755)
+ #define pb_access access
+ #define pb_stat   stat
diff --git a/pkgs/applications/graphics/meshlab/qt-4.8.patch b/pkgs/applications/graphics/meshlab/qt-4.8.patch
new file mode 100644
index 00000000000..abfd77d6f25
--- /dev/null
+++ b/pkgs/applications/graphics/meshlab/qt-4.8.patch
@@ -0,0 +1,54 @@
+diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
+--- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2011-01-25 18:51:28.000000000 +1100
++++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp	2012-01-07 11:47:12.836800072 +1100
+@@ -7,6 +7,12 @@
+ #include "SyntopiaCore/Logging/Logging.h"
+ #include "SyntopiaCore/Misc/MiniParser.h"
+ 
++#ifdef Q_WS_MAC
++#include <OpenGL/glu.h>
++#else
++#include <GL/glu.h>
++#endif
++
+ using namespace SyntopiaCore::Math;
+ using namespace SyntopiaCore::Misc;
+ 
+diff -Nur meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h
+--- meshlab.orig/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2011-01-25 18:51:28.000000000 +1100
++++ meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h	2012-01-07 11:45:26.795586149 +1100
+@@ -3,6 +3,12 @@
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "Object3D.h"
+ 
++#ifdef Q_WS_MAC
++#include <OpenGL/glu.h>
++#else
++#include <GL/glu.h>
++#endif
++
+ namespace SyntopiaCore {
+ 	namespace GLEngine {	
+ 
+diff -Nur meshlab.orig/src/external/structuresynth/structuresynth.pro meshlab/src/external/structuresynth/structuresynth.pro
+--- meshlab.orig/src/external/structuresynth/structuresynth.pro	2011-01-25 18:49:34.000000000 +1100
++++ meshlab/src/external/structuresynth/structuresynth.pro	2012-01-07 11:51:46.695981995 +1100
+@@ -113,6 +113,7 @@
+            ssynth/StructureSynth/Model/Rendering/TemplateRenderer.cpp
+ CONFIG+=opengl
+ QT+=xml opengl script
++unix:LIBS += -lGLU
+ macx:DESTDIR       = ../lib/macx
+ win32-g++:DESTDIR       = ../lib/win32-gcc
+ win32-msvc2005:DESTDIR       = ../lib/win32-msvc2005
+diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
+--- meshlab.orig/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
++++ meshlab/src/meshlab/meshlab.pro	2012-01-07 11:57:18.055586086 +1100
+@@ -85,6 +85,7 @@
+ QT += xmlpatterns
+ QT += network
+ QT += script
++unix:LIBS += -lGLU
+ 
+ 
+ # the following line is needed to avoid mismatch between

From ca7978a09d9678556dfc91fc93b876369cd43de7 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 13 Apr 2014 10:58:08 +0400
Subject: [PATCH 0394/2033] ohci_pci is required in initrd since kernel 3.11

---
 nixos/modules/system/boot/kernel.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4cfd8a0b618..bed95a552fa 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -191,6 +191,7 @@ in
         "ehci_hcd"
         "ehci_pci"
         "ohci_hcd"
+        "ohci_pci"
         "xhci_hcd"
         "usbhid"
         "hid_generic"

From 3b93b7bfe6bc992c4ebbde8819b14676bb2e3b5f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Apr 2014 09:05:34 -0400
Subject: [PATCH 0395/2033] nodejs: Fix configuration

---
 pkgs/development/web/nodejs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 3b1b6467972..626cf6a55c4 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -10,7 +10,8 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    inherit v8_3_14 openssl zlib http-parser;
+    v8 = v8_3_14;
+    inherit openssl zlib http-parser;
     cares = c-ares;
   };
 

From d393c6c53803a6c1d61fa5e58e283aaa4beba7b8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 21 Apr 2014 09:22:33 -0500
Subject: [PATCH 0396/2033] Fix icu4c expression for latest gcc (fixes #2341)

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

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index fa486ba0b39..b2f2f7a083f 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation {
     sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g";
   };
 
+  makeFlags = stdenv.lib.optionalString stdenv.isDarwin
+    "CXXFLAGS=-headerpad_max_install_names";
+
   # FIXME: This fixes dylib references in the dylibs themselves, but
   # not in the programs in $out/bin.
   buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;

From f3ec500d487443800a6406690817159654a8ccdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Apr 2014 17:56:39 +0200
Subject: [PATCH 0397/2033] libarchive: move patch into nixpkgs

Unfortunately, github periodically changes output even for raw diffs
(not just raw patches). I'm including the patch in nixpkgs.

I was unable to do it without hash change. Even if I added binary equal file.
---
 .../libraries/libarchive/CVE-2013-0211.patch  | 30 +++++++++++++++++++
 .../libraries/libarchive/default.nix          |  8 ++---
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/libarchive/CVE-2013-0211.patch

diff --git a/pkgs/development/libraries/libarchive/CVE-2013-0211.patch b/pkgs/development/libraries/libarchive/CVE-2013-0211.patch
new file mode 100644
index 00000000000..5b1a9831063
--- /dev/null
+++ b/pkgs/development/libraries/libarchive/CVE-2013-0211.patch
@@ -0,0 +1,30 @@
+From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
+From: Tim Kientzle <kientzle@acm.org>
+Date: Fri, 22 Mar 2013 23:48:41 -0700
+Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
+ certain common programming error (passing -1 to write) from leading to other
+ problems deeper in the library.
+
+---
+ libarchive/archive_write.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index eede5e0..be85621 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -673,8 +673,13 @@ static ssize_t
+ _archive_write_data(struct archive *_a, const void *buff, size_t s)
+ {
+ 	struct archive_write *a = (struct archive_write *)_a;
++	const size_t max_write = INT_MAX;
++
+ 	archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
+ 	    ARCHIVE_STATE_DATA, "archive_write_data");
++	/* In particular, this catches attempts to pass negative values. */
++	if (s > max_write)
++		s = max_write;
+ 	archive_clear_error(&a->archive);
+ 	return ((a->format_write_data)(a, buff, s));
+ }
+
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 5e728d9b3dd..f0c3c0632a9 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -12,11 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb";
   };
 
-  patches = [(fetchurl {
-    url = "https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.diff";
-    sha256 = "1466ddrkdh2r8idmj3v7fk2gwnhc1kdxvyczdpnqms0qlmas6fj5";
-    name = "CVE-2013-0211.patch";
-  })];
+  patches = [
+    ./CVE-2013-0211.patch # https://github.com/libarchive/libarchive/commit/22531545
+  ];
 
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz ] ++
     stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];

From ee798c5c0fb49d0f47931d91998a04f365065a95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Apr 2014 18:05:24 +0200
Subject: [PATCH 0398/2033] Use KDE 4.12

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2817906d281..f082e973949 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9974,7 +9974,7 @@ let
 
   kakasi = callPackage ../tools/text/kakasi { };
 
-  kde4 = recurseIntoAttrs pkgs.kde411;
+  kde4 = recurseIntoAttrs pkgs.kde412;
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 

From 99907f5bd7330c6a43262b6d2c124254ea57011e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Apr 2014 18:07:05 +0200
Subject: [PATCH 0399/2033] kde: Update to 4.12.4

---
 pkgs/desktops/kde-4.12/default.nix            |   2 +-
 pkgs/desktops/kde-4.12/kde-package/4.12.2.nix | 444 ------------------
 pkgs/desktops/kde-4.12/kde-package/4.12.4.nix | 444 ++++++++++++++++++
 pkgs/desktops/kde-4.12/kde-wallpapers.nix     |   2 +-
 .../kde-4.12/l10n/manifest-4.12.2.nix         | 262 -----------
 .../kde-4.12/l10n/manifest-4.12.4.nix         | 262 +++++++++++
 pkgs/desktops/kde-4.12/oxygen-icons.nix       |   2 +-
 7 files changed, 709 insertions(+), 709 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
 create mode 100644 pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
 delete mode 100644 pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
 create mode 100644 pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix

diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix
index 6d3dd46df35..ffcd3115de7 100644
--- a/pkgs/desktops/kde-4.12/default.nix
+++ b/pkgs/desktops/kde-4.12/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.4" }:
 
 let
   branch = "4.12";
diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
deleted file mode 100644
index a10582d7142..00000000000
--- a/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="0m5lxcsv9arkhws9xqvxip6k3gg15ppjslrds1lyr1clk1zxrras";}
-  {name="analitza";value="021msxl7jynj6b1n3j5vv1fwzlqi0ib48fwmai7ffvgc23mnsplq";}
-  {name="ark";value="0906pbmwk5l9vd1wx13299mk7lpa4v342l5b5yg4j5fmhd73i1qn";}
-  {name="audiocd-kio";value="0yx99c3g627a8swzgqiykhd7xk95b43gs1mf7ysadg33gpbcm2fj";}
-  {name="blinken";value="1hcr6ckrd6g53ivrhwd2h0hiv2lqym2lahchb1z3q07qyc2676fb";}
-  {name="bomber";value="14i3bsxmq0js7rj9wyvxry2fw8pc2jcqpfkxa7l490kz8wq01vxb";}
-  {name="bovo";value="09lmbyb2jr8q143i67gkqrsf1pa9s83g88149r7srxsy7lkz86l9";}
-  {name="cantor";value="1yf2q7x6rmims60xam2jhs52pnfmv19fphvcwd45q9mjjxkw3iqs";}
-  {name="cervisia";value="049rrjvx0djdi0rfi4f3qdbn62bjy5hr1g6w1vsr79mryifwv9sj";}
-  {name="dolphin-plugins";value="1qdvs0y7f6qmgjkg4jzbp99l89ykjfl0czn743mx4m5mmnabdwpf";}
-  {name="dragon";value="1gygky1g23mlwx0545pzaljzbg7d3g4wqfxbvbl1svdi3mw9pwxb";}
-  {name="ffmpegthumbs";value="1hsm33nq73x1l902pp1qfz88mlv1mrh4h6sxg7qjfnwxnxiaxbkd";}
-  {name="filelight";value="0z4x5dm09997ia8sv27ichxkmlbq1pn4sbvkwjb8gybgikyx083k";}
-  {name="granatier";value="1lq51441w2y1bh2hqgbbkr8xhc3zk9lqkycy8b2avgdkn9l49plr";}
-  {name="gwenview";value="1naghib8wmbdzh7bz6vga9b7lr797979gq2600ykall3nixwpwpv";}
-  {name="jovie";value="1m7spjpl8n23bfy8xq4qngwlbwj9fpy8a1bdq1q5zi0ij89ljcmw";}
-  {name="juk";value="06k7cpvzpdjxivh42n68602m5frrg97lfss8mpgn830xdbrmsp51";}
-  {name="kaccessible";value="02hlb891297l4hv4i4jx4pi4axccq9qkpmgi2is6zb3yqs0ij1l9";}
-  {name="kactivities";value="1hpnigkfyi0i6qb74jfi52m870dpnv09h5adwkqc0nq70bv8dsi9";}
-  {name="kajongg";value="1z5a9r0849r3fd2i9y5z2k9raj0nsl5hprcw53z3mlybdrpaddiq";}
-  {name="kalgebra";value="1mbyi8hcyy53zhn11yxjkiz52k7a6yb54kvndlm3abg1s862zdh2";}
-  {name="kalzium";value="1gnjz05nc3wgcr0ymahnp652hhrkqlrz400f5dzhkq5wrl7vh3ly";}
-  {name="kamera";value="1pxmh79li1f6grf07w2yin2r4ig6znvhl4ym3lqkq263ffjmjvnz";}
-  {name="kanagram";value="07fw93w78girj6rqi8kb30f5hkk8a02zmm3pdkw21rhm03iv1lm6";}
-  {name="kapman";value="10xjhz3glyrbd0l68fz678k1gsnp6arjyz7xvnwa1w6wyq82kssk";}
-  {name="kapptemplate";value="1rzs4il8rhpwbj2zjrxrvgznx6ixwpnp5rmkysz0sgc9i41f9l4k";}
-  {name="kate";value="148wymcxay6vfdri33cmxb06wzlbb1kka7cxdmqn6bw3a8967dvx";}
-  {name="katomic";value="0gk516zk4nr2lb8akw316z0kbna4yk1cr4zclpg6id5xh1jgpgly";}
-  {name="kblackbox";value="0v1ambfp1gmnzp9c42mycgds4kvayda1r1frgv3822lqv1nqcbs0";}
-  {name="kblocks";value="13qyd21h6lh880l19fzy5l1m5rfnbqjdgqc1yivwxrjhhdd5blzj";}
-  {name="kbounce";value="0d8gjvz9dqzvwl1aamf45a0qi9fj63cr2pid2wbxdp2b0v4qjqfb";}
-  {name="kbreakout";value="0wlaglbqr5hyav9m032w7hadia2a071mhnbhrvnw97195lmw7y3h";}
-  {name="kbruch";value="1zq5rzvqv7nhf1h2zqyjnw4g4w380b9dy9782dsr01l2z7ydiab6";}
-  {name="kcachegrind";value="0w63lrr6dw82r0zxsgfpb6kllqxsliw4k7ln232lj14y6ngs6fz2";}
-  {name="kcalc";value="0ga0xcnairfrfdlda6ljrmpnsn2cy8x2k2np535sckj9c0drw1n8";}
-  {name="kcharselect";value="1n8phby2i3s4myb4nlmwrmvz1acqk3llmic94zysx4j1p1vzjjj4";}
-  {name="kcolorchooser";value="1x0cr95xpqfr8vz5jgr14cg9kximnmanc7yqzazqvdlzqmza9602";}
-  {name="kcron";value="1gbzz3x39dawrjhdwsgkvi7kjsply38j0imyn0rdi0pmksd8pl1j";}
-  {name="kdeartwork";value="11ik4n16ym4lhcdkxnhnjhf2i14kaxc645fm158lghklwax00rap";}
-  {name="kde-baseapps";value="11bm9abdamql62yg6cycbhh58s9kqhsz2zg2lpwppp5z4ywzw4rg";}
-  {name="kde-base-artwork";value="12v2gg6lwq859b3ay8g08galrra44wmrislbysazbific5idxcyz";}
-  {name="kde-dev-scripts";value="0nzfd3zywr8qmq65h1yhyn7fc9grg5aw8819bcvmixws88fvrxm9";}
-  {name="kde-dev-utils";value="1bwqx7g9hrrhyhfbv475bfxw193zinrksx858aypf86r0xf57zcy";}
-  {name="kdegraphics-mobipocket";value="0cji929vibrb6nxnw151r9z3n70l2ldd01x8v8kijpd9igywwvc9";}
-  {name="kdegraphics-strigi-analyzer";value="1s9pcjskh8m69gi2r54z05p4k9xwn9j0ifb8p1163kg1qyff6bhy";}
-  {name="kdegraphics-thumbnailers";value="05bq2wr9knwjkk088fd0bnw1l352dgfb7bg6h5y691wc21dy5zi9";}
-  {name="kdelibs";value="0ykqhgjmfxvysd2skk5c4kijnkg1ynmi2z6agshijyiqjkx20gnh";}
-  {name="kdenetwork-filesharing";value="0gxiqlzxmmwyg2kxivhhyd9rxif3q800p7agp3rns91x1k1k6dxj";}
-  {name="kdenetwork-strigi-analyzers";value="1l8yigrzfrqdmnzsh8ass1n45bw4gp25s9zc22sgmz5ng9l72501";}
-  {name="kdepim";value="1axgk6v0sf7bakjkz3348kg25rdllbdy0rvxys1c3a5kcpxi6z49";}
-  {name="kdepimlibs";value="1qj7mv2dn3833fpcfqirqh6wa3046d75mn7amkbmgkh0iq7s8xg4";}
-  {name="kdepim-runtime";value="173a8mlq1lmz47p9r56dp8pxll0qyam5mfm0fiffvjygc2wlczbq";}
-  {name="kdeplasma-addons";value="1f6shv7d0a0v1iq75ywgs0p9n8x2y0n7p9g185904giz40d7sm0x";}
-  {name="kde-runtime";value="14vipbrnmnzapz1c8l0rfy93i4vap9lgqks6q819xbvm3hqg38ac";}
-  {name="kdesdk-kioslaves";value="1f18ddm8lwx3yqwj3gmvmvg3frsq10k7rn52yd60yxl2q4ifba2z";}
-  {name="kdesdk-strigi-analyzers";value="1ya6dg6a2b7p83wgj7hw2nky6x72cy6g5vmi6id8v70gix3c21bi";}
-  {name="kdesdk-thumbnailers";value="09kz9yck8lwjbfgvw2qppk6x82fm0cyvzi0k9qj3pkz9lva1g4ri";}
-  {name="kde-wallpapers";value="0ipqnnnrl04kdmcc492c3l62d1fmsf3w3gannxhmrwr17hkl530n";}
-  {name="kdewebdev";value="0sbwmwb6h5ddx3s86p01a4jdjjbgvkvji7baxjdpvxscyhp6b0m4";}
-  {name="kdf";value="190mcs9s6rcfa8p5m7c2vs6ghdlfygxz9m038ibvbfic4zyl1kk0";}
-  {name="kdiamond";value="09b9wjn30118q5c8y6ixwhd4041pb8g7izy0w420riaal314lj9b";}
-  {name="kdnssd";value="0bir835kn6m0bsrsh09ph41jn1bm347zfl5fkrwnhnxp937mba9c";}
-  {name="kfloppy";value="1mr353kij4rn4qcip81dhcxswscsmwzsk0a29rqcpxli66ydv015";}
-  {name="kfourinline";value="01qaamcmvcbv90fgmfwmgmdx5asw8mp0biayhimmsi6fc4ykbl54";}
-  {name="kgamma";value="1hhd9qw8bqrc9zj5l8lh1izay2s58qfrj2an7yvppjvcx5n8gbgw";}
-  {name="kgeography";value="1nhgl85lj9w86425n2ndird10j28ffvf0kdy8rgz99bgdhsrk15c";}
-  {name="kget";value="1ix29z9sh575z9srndzryjra0phvhs8izy849dykczjh0kqx5cvn";}
-  {name="kgoldrunner";value="01rrdx2wd0962lrf8cw4c6pyp3yj95wmxf5v0dl95y7zqg81hzaq";}
-  {name="kgpg";value="17jd3cylpj690zd2rawa12cdp5nfcqik2kvqk6i2lq2zlqm3z4aq";}
-  {name="khangman";value="1gj2wybjbrzwf7r2svsip32ll009q89y7khmvmmwz6xl2klk1s21";}
-  {name="kig";value="13i9ddj8d3w6jisdlfw7l8krsdr38g60j18hcpc2sd875ba7qv15";}
-  {name="kigo";value="180b6yqiydwfv62jfmvcxqhsc2pmp7n5s5m4cr3g58090q9lj0li";}
-  {name="killbots";value="099k2y9y2f0rbl1hafqrih58ky1al5nrslx3i1kzkbhqphl8khqa";}
-  {name="kimono";value="004ch6pi60qcrzrnz5fsfx25gmm2nx0hmx88h1s292zbi0c9ccd0";}
-  {name="kiriki";value="0niajfivghvdc88dwk13bqjzj8x8nj6h357wd4jnsvrx90wm8mp3";}
-  {name="kiten";value="07xz2rl8f5683a3zjv8rs2acp81d806vx3w5z1xbvlziiw1y2sj6";}
-  {name="kjumpingcube";value="1hn2n27vyk6zjc8jmnv8hmxhmb3323zg4qkwb6rmqkai28q9rdnd";}
-  {name="klettres";value="15is8hrmh4m45npg40iv06c1v9yjv2rk2xwfm8c7a5r3xncqh6im";}
-  {name="klickety";value="0n72r56xx9vgy19izwbddbssgnmvzacdjq6g5s9vrlnkz2lac0ak";}
-  {name="klines";value="0lrka7pgx26v5rf0kp3mqbw65q9p281hsi3whnjf0c3nnq80v25i";}
-  {name="kmag";value="0y0l19m0irmd5q3fxarr18d7f6a4537g8b1bm6hnq48v63w6f13i";}
-  {name="kmahjongg";value="06dvr50x6y0115pr2rx605pm3nll3lglz2z1q07dc8ydfgqjy2sp";}
-  {name="kmines";value="1fz2q1xbagzi27xvl2wx5hd6fnk0qy33apr103cqq1lprb68n2dl";}
-  {name="kmix";value="137v4np9nhynwybabb1z1h9wvcrzm9yvjxybjkfwz0csz747pyah";}
-  {name="kmousetool";value="1n1isbq1vncs5kw1hp0g7s84bggksg14wgas3bqzhcbcxcfdj0i3";}
-  {name="kmouth";value="07im0lvkws27sgg68lgwc5fzx8wiz758ynxigbx85gavmjvr2cv1";}
-  {name="kmplot";value="18s8826yh9krsbh20widv53z0cvd6js60apvj6iwzq00506bjjlh";}
-  {name="knavalbattle";value="1gc7kgg5q4ha5bil6r5amf5ww4jby953b4xk87m9cb7pwhp65z7s";}
-  {name="knetwalk";value="1ky2933f2mp4m6mh5z4ighvd255pqsmblqrbbsnpy8ks7qx9acwm";}
-  {name="kolf";value="0s1qkvfsw42hsi84wi6a93zm7cz1kciiqgp1p9izgdyd3qr48lml";}
-  {name="kollision";value="02jczgs348wlb8djvb1l44hkg8055zk4fl6am70i943jc1f9isiv";}
-  {name="kolourpaint";value="1m7vjnx8f7y59lf9z8gncspvw1pfbqz7aqbb1msgwphhr06m5x59";}
-  {name="kompare";value="0s8a53bn8k6x10gi9bdfyrqm30742krv2gjz9gpckpycb4d7g8k1";}
-  {name="konquest";value="1n3aai02vgb2cclljak9cvfdrcv75ay6lbaji065qnx9zb925zn7";}
-  {name="konsole";value="1qh4jjwxp3wxyh876bwg6mwbvgr5b9kcyfn7679j04z5hydzxpvc";}
-  {name="kopete";value="04xhp0293xzrimfhnhxi7l760a5bliqk370pl0bw05j9lc3fa2gw";}
-  {name="korundum";value="06cajw6disdhyajnhqjsxc68mwc34qqv95z46345i08b2z7xy7b7";}
-  {name="kpat";value="1rphkkdx7076zxfx186znay355sfz0y2m2xi7mimngydi4n0fa93";}
-  {name="kppp";value="0zji9ihid90drdd561gqqzi2bmxi2vsznf4lpi09iy2x3sl4z4ah";}
-  {name="krdc";value="0dimldcijnw14s9archnqfhyi2b519xgd65jpz2z8nw7vxnfja9y";}
-  {name="kremotecontrol";value="1rx0pa5gvncsczvdzncqhra4rxign6nnawp1w2g4amv0mpjpxdz8";}
-  {name="kreversi";value="1gh5dqsfx6hzlmxp9xivj571f3x9d434p9683cy16ck6rg3290kr";}
-  {name="krfb";value="1s515wb0bh8lhgbffkji48mvsq8wl80k6c3fka3fn84kyqc74kn8";}
-  {name="kross-interpreters";value="0qvhs3d691kzzqkg48y2d9gc45l4mr5qyzg0sb2hkmwzskdmim2b";}
-  {name="kruler";value="1q7z31g67cg5v4x1b348cics063dcy0fpbmh2vmj3g51kha9a3za";}
-  {name="ksaneplugin";value="0h05db6gid0519a79b89y74vfqjls71ncqc28wysvpcpi80rwhzn";}
-  {name="kscd";value="0q6yl13n0gblida0k5a66g8xaliizsjd6zw4xssfj5x67bfmnkq7";}
-  {name="kshisen";value="10c3akddm1qgbmays7v9fh61f9p857l9cpa0k6gvxjg9z2sixd23";}
-  {name="ksirk";value="067i4y1m4c7m6lh0c3hzwslvysfibprr2zp3hsn22if0l5l37fgp";}
-  {name="ksnakeduel";value="1wg266jvs7krvh8mpj6v7r8p5f8znpd3br4x6fs27vcy8pw91bac";}
-  {name="ksnapshot";value="0mylgwysysw1cbhf1jh34qh4d1frhrz85icwg4s7vpw8v6iz26nk";}
-  {name="kspaceduel";value="1x7sn50pxj7v36xziszzq96pl1qcb0ycczx8sxdk30wllpyi50k1";}
-  {name="ksquares";value="1mqxmzvf2wyhcn24rd7glr8g7xks87fd7l5vyh2z73w7dshlf1q2";}
-  {name="kstars";value="05yd9q1n2ja452x6b2b3x0rrr3cpg3zphcvzqk7qv1pdc7dckyyx";}
-  {name="ksudoku";value="1vmslqp8kdmbr5zj0kh0mpsagrhins0y7a5xfb2p61bwprpvqqp8";}
-  {name="ksystemlog";value="1syyjsb0yn59fvbjbdhg4i20lb1ynjd3jj4b5z3bh34d3wzbcfz5";}
-  {name="kteatime";value="1y59cnx65p5i9fw9vm2hls40nq253ps3zj7ps34fcspnjvfcipgx";}
-  {name="ktimer";value="155sbcj4lqxs6sbl2wrc7pgnha4ji5mii1jkax1rggjxspk540n4";}
-  {name="ktouch";value="1v8ybp03cv7xwx9k6ia9b0fnh657an205grk9k0zx5v930ag3p0v";}
-  {name="ktuberling";value="1bcf9vq0hcm9n4343vi8slbqjhv1bffwr7kk4m12gr38yshx5r4v";}
-  {name="kturtle";value="0lgahnmjnwsd20a9xw7f66wqg29klkz7f2i4qalzcrh55a8sbjxg";}
-  {name="ktux";value="1jw8fh47hc8i5aykrir2wq4r3n6ikbrqw1vy3wsz3jcd94434c55";}
-  {name="kubrick";value="0ylz4wf4vbaqbm78ahcz43sxcv3j7znmx20jby0i83izard9w169";}
-  {name="kuser";value="0wsdwi0cac9d1r66l6kial13gqyiyclvrnwi602jmzs10c3vz7lk";}
-  {name="kwallet";value="0a541jgbwpv0ar128bfc67j0piza4n1mifp0dx9hmjqahfylw8yv";}
-  {name="kwordquiz";value="0s6ii237625wfr5qzzdf4s5x9dmwmv2xc0qzmcniib0g4230y53k";}
-  {name="libkcddb";value="03mkgcgcg50r66gfvb9gqxhkl6ixvg5mjcshcz8wlxzamx0vkdcg";}
-  {name="libkcompactdisc";value="1kdcanilyanzi5ixxh357335030x2hlkykg0p3i6375jcivx0j4z";}
-  {name="libkdcraw";value="01xbsb6nsp3rq6l1fyg5i8ysf09hy93n8hy5n3z5jzx8j5gar0jh";}
-  {name="libkdeedu";value="16sibrnaw57j7ngj6d32hn5k0piqmvl6b9slnijzy46yaf60qqjd";}
-  {name="libkdegames";value="0gz23vigrm1q9fm02xs0pi2dkvcwackcp4by6swp8wvz5bx6r3sq";}
-  {name="libkexiv2";value="185cbm1a8sl0hrd7dq69mbkxw88c9qwlhnnip76r3cpzh0fqqcx2";}
-  {name="libkipi";value="1bgrr1dqmn3i844x5ib88z2gq4c2s0zkrxyfv54scy57gnp8z666";}
-  {name="libkmahjongg";value="1svawck122495cdp6vx427nd4vjwmvvpav8xgh15p1av4jdvlpyy";}
-  {name="libkomparediff2";value="17hiffmpknyp86h4lc9q1grn7m8ywhlk5f6p2vq6xl2la6zca6k0";}
-  {name="libksane";value="1dc4cf9wxxg9bg4ldf5ldvl0jpsh6av41kk4fnzsj8h153mak4dx";}
-  {name="lokalize";value="0yvqwbwbs8njzahcp44slg9jaagjrv2ypk8b7abynsa8zlgwjh2h";}
-  {name="lskat";value="129a9bmpiiz3rscnwck4adnmsimb9ql7dqs113yyvkmxj5ncgfdd";}
-  {name="marble";value="1fzaqck6b7gw047jjlbwwsgjlnan3jqj9drd7adxb9klx1ikpskl";}
-  {name="mplayerthumbs";value="13v63lmzzcaz83rjfydhz508m4083ksxdi1m8qrjnlkbwnc6ks2k";}
-  {name="nepomuk-core";value="0p3aya5ajaxzbwmgaqc8rpilzw5vzkms1c7jcsjmyyr51iplkyb4";}
-  {name="nepomuk-widgets";value="1am2gg46ybn6xgfgnzcwzizf9r441i2l7jx655z4zff6wgms9mz5";}
-  {name="okteta";value="0227l2hnz3i8ap19r5lai02y5hqhc3sgkz33wd7j23y0nr5cpv0k";}
-  {name="okular";value="1722ncmd81yz8qfisrllniv0iqwn2i1gyvdd0d0ygs416wj6rmjx";}
-  {name="oxygen-icons";value="1v314rrj0d6jgir7hrhapqagl376f5hwciqxkxkg7vynp6kli33r";}
-  {name="pairs";value="1pfpam1n9bwni2pcq429grzxanprazwz7g1h0l02jbksfv4sabz7";}
-  {name="palapeli";value="0ip07xsr8w45cf0mxya9i64315d7r1zaj0nd0bq4xhcw09qmyyxr";}
-  {name="parley";value="1rqw0y0p7fka6v8hpcq75n8nlk43697js99cdzb0zvrm6gzjmjm5";}
-  {name="perlkde";value="0sxz0bvavclqdimd5hmcsc884alsyflc8v31wd79l3pc51alsibs";}
-  {name="perlqt";value="18dbzm94wa49ysbar7fi64cyhd38w0b0b9rj9pjacxrpfvwa3vg2";}
-  {name="picmi";value="07ycx2xgzqr0sbirsd9gcs9bmxf01i2jnmbp2i13znv2y25xm7j6";}
-  {name="poxml";value="1skyms17zdds878rzzxnc393pvw2fv01wysyr8v7nkylzi77a8fc";}
-  {name="print-manager";value="0rjwi4l99h5wqd728by9ax26v2b7brmkam990s3waids91kbcxrb";}
-  {name="pykde4";value="0x3vz31cz12jp1prdh6rmc501f5av0qby8yi1hkqwgpkfyyqmczj";}
-  {name="qtruby";value="1y79azyhspcnfnkgx54b3k60k0a14aga85cv9hilzl6jn7w8qmmz";}
-  {name="qyoto";value="19fnpzf5bq3i75gb51fm0vrlkgi79jgjcb3sw1w1g5gzy1lkr4nc";}
-  {name="rocs";value="1a1p72slgv7ss73v4md7w1avsssbwflfb339abpc44h361w5pwnz";}
-  {name="smokegen";value="14ashkkh8g0s5i56p5v10w2rskcr435s01hb36yjqva1gfxbs1vf";}
-  {name="smokekde";value="0infmb6gsfiq8iargwba3xl4115dp2fj0whg1f595x0qkl2dlkbf";}
-  {name="smokeqt";value="1nf7jcn2cwdrws8dqk5vgxnda507yh6mg093mgxdjrr8h787x2gn";}
-  {name="step";value="1h29lm6k89nbz038z19irid0fk20dv5h829wvmmmylk1d881a6l6";}
-  {name="superkaramba";value="1n7x85zafz4z7i5p9cw15s5dbfbcr864ml7nw0rwybacppdgp59n";}
-  {name="svgpart";value="0m019wf56pq4c8qds6g7l2h51r5n7ayyf7yyhil8rp4fdwmz44ia";}
-  {name="sweeper";value="0r8qfy5a9y3pcza8ik1yl73d4jn0biiv7kdmv72ci7jjv93fiyq5";}
-  {name="umbrello";value="1d9zl92xcyqhc8b9pn1ih856dainwvgbcqvz6bky891pmggp1n7w";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="libkomparediff2";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
new file mode 100644
index 00000000000..3ae55809e99
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="0c8298z7c3a71yj6nik7h8h7rngqzrz6rc95kl990p37jp2ng0d9";}
+  {name="analitza";value="0l122nh81nf7r4bm73gc6dp9k4jh2dxc7majrzjq37hb8pi77njh";}
+  {name="ark";value="155bhqqyw3afm99c47b3pxqf9fiqcz6gqg1pavsx9q4rmk7rp8m6";}
+  {name="audiocd-kio";value="1c5234s1hdh6jc8szyb4nwqr1h8hhwlmin0iyxabsl0c45pss9pa";}
+  {name="blinken";value="0q0y3xfv3pjrw0h8mnbigpywwrqk8wb2lqbjcgk755j6syinhphh";}
+  {name="bomber";value="1f12qmg58n9sj6vjqdj57ch50pq5f0h6anx06x9bhhs502w6aqwy";}
+  {name="bovo";value="10x4qy4vdp76iv3n60iy24lk1wbsjdfr88l1m9xifj4k942wk2ir";}
+  {name="cantor";value="1x5rxshdbgl40cqx6h5r0hx49rrc6gwnabsl8b7kzimh0kbv2ma9";}
+  {name="cervisia";value="0ia78cjkq606232jy14ps7cpm77pq4xdmcfimv4l6p0xjpq8jzsg";}
+  {name="dolphin-plugins";value="08h278jpbll7wc1mhz58cklj1bkrk61dfwjlflag6fnlm6i4xx8k";}
+  {name="dragon";value="16gyr0dl50nl9r3yc2fkwmqlrfgzzyim6bdlb9a76winzbz8mgxr";}
+  {name="ffmpegthumbs";value="01cmwm6w1z2gsllwdmrzsl9882fw5k59lr1k7z114kkrh1l0b2j4";}
+  {name="filelight";value="01rs1r80ixm1dj5d73a22893rdz2srxqp4dv5pysw1fhn02zdkkf";}
+  {name="granatier";value="1ia85yxfbbi8qxdyn0vwgmdjrxwssb6nadbia1yqsjdncfsnhbvs";}
+  {name="gwenview";value="01p5b1z05v3c7f192fxrrfp6x3ss7gx8pxv29czkp641hpmcg3jl";}
+  {name="jovie";value="1hfkj3vlvm63sgb4gx3xl7nksb5cfqnh7shs7wqm3gl6yj2rwhjj";}
+  {name="juk";value="1vxnrxz6gbyk7fd15akhiyczpgq03cym3nldi61m958cx4khd4y7";}
+  {name="kaccessible";value="0a9r2bk8a5h7mpl37li3bqbsz5dfgn8rsxnri93msvc6555pnyzv";}
+  {name="kactivities";value="1fl638cyj3abxfmbqcfqsd3idmdmys1xim4flf1jpbqa29psl75j";}
+  {name="kajongg";value="19awqjqn9hqhprzi7mjb6nkrgvb3mzhignkgalfjd4j5rga7vzz0";}
+  {name="kalgebra";value="1bj88nh7znk86i6a4d3jcjyqp46kzipfc99xvhxvqdsy8drbrwjp";}
+  {name="kalzium";value="00pjpdbd11jgzs443kgh8y6pxf3ff0ypgl5j3zfa6gbj18cnkkq0";}
+  {name="kamera";value="12mcjw8l0nh2jbi04myx1y1irbf92x9bx93gdymw939lawaalqic";}
+  {name="kanagram";value="1yd5agh61nv4ajlrijxg5g3hvw0xjxdvnc6h3lbz5mgvc8smvazk";}
+  {name="kapman";value="1aa78q6y2s9dig2603b9nry5rx5jbbxz2pb3jxr323hmqxp6jy1z";}
+  {name="kapptemplate";value="08j8xh9spk6ymlichl74n1v2zn342d94m6f4jragnx2jvif2163k";}
+  {name="kate";value="1cxc9bgzvfpns7dhmmafzxhnyjqxyq0adr0l1mbwsahxpkblc30r";}
+  {name="katomic";value="01lk7ajlj98rjbs76xd9r3hnd98dy49xv809m2zchm5ria7hdh48";}
+  {name="kblackbox";value="1sgbs0flllmy6d3518wwnzmdr14kqkxsi76h2p4xyk3bq2g9q2xg";}
+  {name="kblocks";value="1zinpxbvri52r26qiiiv4j4r02a22947hcrchf1z3n6lf817vqwv";}
+  {name="kbounce";value="0f9ssdpicvkiv7dxnj75h1cmz24mz2sy2zyp7rw7mvr9ynnl8w21";}
+  {name="kbreakout";value="02ix39kfkagmsqs8icqrqy9cz90lbl2wqajyjzrshw1vi29iahc7";}
+  {name="kbruch";value="0mfqdgwd5d8sy3bdiicpd5927dgg6zhm521f2q853qd2sqjbspgl";}
+  {name="kcachegrind";value="0dydarm1a2i64nazcl59s0a8b8z7znnm20wdmx2gfm5377j98y8x";}
+  {name="kcalc";value="1znrv4fqwaf56djf9qg6fxcp7nfi7fzza2whjlkayvc9kxv3ah9y";}
+  {name="kcharselect";value="0mbl9zvb9hp0xdi58v0vb8z0by71xkz22pr9flnkar5b1klnjpdb";}
+  {name="kcolorchooser";value="1d1cyaqi0rhwfnmjbxpjjavgwjhr3pd2rywlxxb9g4q3rv8k7wg5";}
+  {name="kcron";value="033f0s14crqpsirhgysi309b9pj02vwsd7fr28n6n2sh5imj30a0";}
+  {name="kdeartwork";value="08snjhaqiddiaj5jfd0vx1fjijsyqwngy7p1mkpdfhj7575sbx7c";}
+  {name="kde-baseapps";value="0k0mfbpvmv0n2brrb8hc0rd1wz04m3cyr1byb0z34a7x7kk1h1i4";}
+  {name="kde-base-artwork";value="0vmkbmir7hviqkv7nqrbqd6skj2srp9w4nrs8rkcvq7c8n76rk5w";}
+  {name="kde-dev-scripts";value="0l5frvb1akhy86j3yic3n1jirclj8r1jwjn760fi89vl1xysrarq";}
+  {name="kde-dev-utils";value="0807c8mq8rqqk8vf9r1idqmqrlfv9bsc8rjn8mfv2ch49mzzdrdj";}
+  {name="kdegraphics-mobipocket";value="1m6lnkr460261iq634lz887dbhvmj56p97k4llch3h80ra10mlh8";}
+  {name="kdegraphics-strigi-analyzer";value="1rqb1lzqb39p95xpf8c26pm9rxhcmycd518hxzp8arz6k2chazj8";}
+  {name="kdegraphics-thumbnailers";value="04aaxjznb176ym89f06gp4bycg67zndwc451mkdr33mal58jh0zs";}
+  {name="kdelibs";value="0dn0z1fs4vym7cp2749viw171dhay9ql2dp65a4hphmsdmk9bzv4";}
+  {name="kdenetwork-filesharing";value="1r3a5y9nmcf06nqsdh8k4jny7dmrhya8xi3jwz0d1mfzlfjksyf7";}
+  {name="kdenetwork-strigi-analyzers";value="0gqj5b91q3l5hna6zbgm17wi54g7g058n605adc1mch97yshqyrd";}
+  {name="kdepim";value="00lsyg6762kd2qvhhqq6vrrrl1fbk07yd3ha8w1yyjwiy9cnsy7z";}
+  {name="kdepimlibs";value="1h7k5ravilwz9r5lh7dqjnzh9h8hz43plbdaicjwk2sg4mqwzzhh";}
+  {name="kdepim-runtime";value="1z631kag1gpmk2ljk64vhscr3lad3mj3599phh0i8jqlxvr4007c";}
+  {name="kdeplasma-addons";value="0lfza3454hzbicqpz0ipjys9brjkblmpsngqg5njxd6ph9mzg34a";}
+  {name="kde-runtime";value="05n5cllsjyf03bgisykrbc74i7a3nm5f0k6hnq9sphf8xnxl318x";}
+  {name="kdesdk-kioslaves";value="045kf44s2gg3i2xl6087zn3cz80y7li26fzxdvvv89ywcq0npg59";}
+  {name="kdesdk-strigi-analyzers";value="15xxpgiy5bp6m78crw448mzv3yijjzipsrybadrbwqz6p7dpysbv";}
+  {name="kdesdk-thumbnailers";value="039rgq5p4mkdrilcvkf6k1d9d45swk74hdg3qnsbz3m47vqqf92h";}
+  {name="kde-wallpapers";value="0z7ffz2i410k2xxl1cr8m74mm90c5sizpbhmhyqxwjlsbz1gwfya";}
+  {name="kdewebdev";value="0ljwbzdcshjaz2dv7yp4ckj0c0jxa60ka6vjbhdmc4x7nvwnx737";}
+  {name="kdf";value="0s8ms5h5gdfa3697xg1yzz0h2hijlv68gi2g7n7g3xwpawbqrzv1";}
+  {name="kdiamond";value="10v7zrj4d96ppawjib1jgdz00455h8334w4vb619g448pj5h66sn";}
+  {name="kfloppy";value="1fd7wwbxngaiy0fbxvqp027rp61jg8fwajz70lx7acs20kcs0301";}
+  {name="kfourinline";value="1s2gc7zk932ks89c24pyimcsspnmabbmsdjh520xkzzxrp41gz0b";}
+  {name="kgamma";value="0n19zrarda9fvhimgnm84mdcaqgcqn4qfr0yw6i76la24pjbl46y";}
+  {name="kgeography";value="0w32841fligd3gyjl34q2f31jldw2vl47bi6cljwp7nlkdlp0lkn";}
+  {name="kget";value="1kls245b5s2dlxcrpa4d969zlr2lw797p7p2ilyhb4rbv871c0wd";}
+  {name="kgoldrunner";value="10xq9827gwib6w9h4hhys1v896rxqd50mz66k3frnrqals04zbbk";}
+  {name="kgpg";value="1wa5ymibiqnjxl5ck94y1xh3qk0bx3v7k7n2y3jcvprmhglffx6j";}
+  {name="khangman";value="1jfi30cb17gkn7v3i42wj0pqgaq3mr4fjbwh60ikvhxxd0nf5nny";}
+  {name="kig";value="1z0f50m1hgr5jj79v5v610bdggy4knlqnbxpnwf6ihj60v3cn0x0";}
+  {name="kigo";value="1klcgh3bpl3gqyh5zvij7ah754wjjf409a9l1xqxjigz4samnism";}
+  {name="killbots";value="04vy4zybgqls4whymqnzgkfbmzb17cc1m2xf2hp32bq5fq0r8103";}
+  {name="kimono";value="1bqbgch1z2nm143sp4lwnh3swvmvavhkj4scgx6d17m24jgd69hn";}
+  {name="kiriki";value="04r7p5f9a2iwv7c40pcnbga5ldcfjjig31fx81ww0b6p62dv2vrl";}
+  {name="kiten";value="1fxyy805b1q2sxdkd0hq2fr6plbnawzyascsbwychsqsasw2rmng";}
+  {name="kjumpingcube";value="0q2hn6lvz5grwz10nqq5jkcg3j1lgqsmmmhmx0glr4c732hg1z1d";}
+  {name="klettres";value="1w4340gaaip8imwy5d0058600v6fi7wnifppay2l7kvlp09iwmws";}
+  {name="klickety";value="088xvrb1jn8f3cfh39387pzw9simrjan63c24hn76290fkqjadgq";}
+  {name="klines";value="0n3bsvf5skr4816mjrd7zqjnh8vp5klvgx3h0025hwcbqyfa64bs";}
+  {name="kmag";value="0x91b1fwvwppiwzsnvc0647429ffhn56gndykmmyzr27i45znk3r";}
+  {name="kmahjongg";value="19qz7q5sr5xphzwxjf84h5vg0fll45fvs3pi5q9a5x5g4dy14wsv";}
+  {name="kmines";value="1nm7di7xs727jvfvv2039hpgkxzddgfv6vvrw3jwls975akl1wmb";}
+  {name="kmix";value="19s9z6m1v3wk5prngmm612r34013z7dkira83ap6kn3v32cfciry";}
+  {name="kmousetool";value="1zf7d3k1jf5ydaiw7v7a34hd5w4fmgkd4g9427546x64n27vx0a2";}
+  {name="kmouth";value="12n1x1imy7w3rn8g8zawmfivic0avzgrpmwm71hy7kxw9ya24yjg";}
+  {name="kmplot";value="1zji3lkq332zgvccnlisdavwxh0d1x81131xcy25r36q9c42syj3";}
+  {name="knavalbattle";value="0ibbahwck80z1dhycvm52k4nnj0pifzf9vi7j64kczc54z20b6d2";}
+  {name="knetwalk";value="0j8lyv60rvs5w214vhpmkf0807vi8b2vc8lglmmvz66cpw42c45z";}
+  {name="kolf";value="060dmnpr84g1512l0c0myxf1h1qp4jdsfgnxg5vwpciqk0dc9qhy";}
+  {name="kollision";value="033x8dg57f5amsnignri6ln8adavbaw1l3sydlf0jrw7ww3qvw1h";}
+  {name="kolourpaint";value="0c7i95cplwvxxm6aqgsk70q8ny8yfarcah9113vk6b81llbwn5sc";}
+  {name="kompare";value="0mq2v9nissb5s41lwvjbpba6fznkzwah9a7yisjq1nq47rp4ymqb";}
+  {name="konquest";value="0bsqxr12x9qgk4al21s2hrm48hv15ir98792z8jna3d5w6j0a2zy";}
+  {name="konsole";value="13kv6pmziqfis4qxkfxbmm3yiy2w3fy2l2qi68l0s6yiaqkd9y37";}
+  {name="kopete";value="012zjq0zmqkgahnzzj02xaqhsh800bn1x7sj8vmv1mxqyi66srvy";}
+  {name="korundum";value="1qyk8gvzcjwi5pi7s0a74glyvi1mi7k5z5ilza16y0z5k6ffgvck";}
+  {name="kpat";value="0lmhygv4l1vkmbf7vmrbns6fl1anbcxsnldn0hccdpp73x1py88g";}
+  {name="kppp";value="0nnz137c384xlnrvy625zdjfzzrp6yrcfnn9gw6fs81cq4zwrr64";}
+  {name="krdc";value="0g7p94q0h3i3j9wwcmmiylz0604v4z9f0b2dppfiaq5bnz9m5pdl";}
+  {name="kremotecontrol";value="1hg4fq6ypws4zb07glsrflmr7vq35h7qqmjf5r5b5j53xqmgr6hp";}
+  {name="kreversi";value="059xsi9x6jhsdsgrxrk08haz1v4p4i46l7zkg8id64s9kvywgn5j";}
+  {name="krfb";value="01l8jv5ad3gc5kxjbr7k4ggcipc5903z82pq9616mk0qpd96j6jb";}
+  {name="kross-interpreters";value="0cdb9kaq9fdjaxks83z3gvjwwhz94g4kgjq1rp6wmzwydk28ip6i";}
+  {name="kruler";value="0i9n2znhm6llriipvrrjh8yymj76a17895w7kbcyd41srk0akk5i";}
+  {name="ksaneplugin";value="1fqkbf47ajw7ckzipphdjpnpv4gk426k1rpq3z1qlbag9f9wvxsd";}
+  {name="kscd";value="1f8099bhylrr5m3a5lrmjxz2rz59k3qi1abfjs63hk2z523p99n3";}
+  {name="kshisen";value="1nhq2rxiylzr7klpqqbhl35v7s4prv15wrckgx84mdm5hmyh4nsw";}
+  {name="ksirk";value="0s577h7sswqr44mzmm2a5gi62w8lpzivy9xy5jpib3iw768a9gxy";}
+  {name="ksnakeduel";value="09jp1cd138cqv131h7m3c994zwxbn97yw77fq1yrcfgyspmdx0x9";}
+  {name="ksnapshot";value="1fiqracij106c22b0ws6n047wn4fww5fzli8rqjas5m25931azl4";}
+  {name="kspaceduel";value="1a2n9kyn6y62yps5apclgpmzbchdrfn3lck9fl68alk0bpqdnz1n";}
+  {name="ksquares";value="1bg9na03ph1lignnl6fdxkvcbsq77dskbgn8d7hyq1p800n7jx7q";}
+  {name="kstars";value="1wf13434sxxwikrp29jl5klggmv0ln73a57rs0m4gr4zrjvbrs2s";}
+  {name="ksudoku";value="1nq4nj1q723s7gv1d0l3wafs2d6wz67xhir2sa1wsw12dzh856vf";}
+  {name="ksystemlog";value="0khb92vxr0hfny2yxwnww33ahgm9gmmrf5h7qaj0lqnyrh5fcl6c";}
+  {name="kteatime";value="13jzf4mcq8glkhg5szpawj2k0ss4qfzrjhpmjn3m3grz1zf167sw";}
+  {name="ktimer";value="0y6q9khxlmb7pgds4f9a83aqnbn0gwbi3r15s8vf72qr3qj3f5xc";}
+  {name="ktouch";value="1swdkzvm9q4r8ily7n4cs91y186zlzys7kjs3lf2q46d63l9nfdz";}
+  {name="ktuberling";value="0fzd17hvb2zaqwd0fw6f3rq0mlq8xrmz155dyg916jg2alslicxh";}
+  {name="kturtle";value="1hlfv77g0v48qfqwpqqnw5qf8fcl4v38612v3jy5z038g4sacxkx";}
+  {name="ktux";value="0shib3f2gcdgf88zh2w67kizbmj7gz0vqy8ff5vmr75fp44111b4";}
+  {name="kubrick";value="1dkd7rzkxyk71hd4r9l6nlvcl3zj8vf6i9v1gqi8zjrqwpxvf188";}
+  {name="kuser";value="1qc4wk5q9y7mmkfjqndcby7782z2aaj7x1cc4dcmds01glm2bw6j";}
+  {name="kwalletmanager";value="1f0ncnx3d6z3v373095nhydj844hiva64qh80cc7rmb624vlcsa4";}
+  {name="kwordquiz";value="1m0zi0gldw7shjy4nhiw2azgrfvhcmm5h423gckjczpqd9f17ihd";}
+  {name="libkcddb";value="0k1xr8z3dmfq08qh7fkjhi2v523lhy1inmggnk3gaxzarlvhqxxa";}
+  {name="libkcompactdisc";value="03ch51firb2xcqwy3p6q5j5zr9570nvqa5cgd5yj7pjnzdwcjxv8";}
+  {name="libkdcraw";value="1ypamhdk8y7vb9y250vilmv5dgxf1svvsw329yxc146ii0pb4nwr";}
+  {name="libkdeedu";value="0m20vxa9x2ww7xmq1a7j4pmqsdj5pp05hsg4q64slz69m5npi30r";}
+  {name="libkdegames";value="1hz02x2k7iiw0i78ifa4ji60l87by855v5f6pm3ksw3rdw0ipz9v";}
+  {name="libkexiv2";value="0mz88j3kszqxf518h7n0fjnql2iqwx780hv4jhvrkraclf4czng9";}
+  {name="libkipi";value="0x4d356c20fdjaqadzaqhsf43v9c9bgbwbyy304q2w329m8ab058";}
+  {name="libkmahjongg";value="0911knwvhwa77hr0ncqwjqzfcyvgi806ckyldglrhvm0gw0mgy60";}
+  {name="libkomparediff2";value="0rn5xhbnywjjbk9qx3xw3gss57l105a4a4v05gh9vvl82hc5sfzx";}
+  {name="libksane";value="19zibd1y96sxwnpdxkd752jiky83b8is85qi7six60g5kkzi948m";}
+  {name="lokalize";value="0sl9i146rx0ls3rii6893alkvsjv8ln0d5yabd72f8kagsaw42h7";}
+  {name="lskat";value="1flx7l8svf51fkr3lw0z85d0gkrabjzi73w4qn2wnsaz9wr6kahi";}
+  {name="marble";value="1gvlq0si76bk4yd8dfbixzwxj618ifd2jlr7fq6f9mx498cvifpi";}
+  {name="mplayerthumbs";value="1nw01216mghwxz7zhkf7px5kkb2d4dqdk7par20agvw2raan9axi";}
+  {name="nepomuk-core";value="0gavipa1hn5aw77q3xrdv9464l8qpabq6kawlvjvv90hjvs8clis";}
+  {name="nepomuk-widgets";value="1cr4v4s567vcx1046gj066xfmhrqx4g6lipffr6d3wdq9cgy5y5i";}
+  {name="okteta";value="0maadxyngj8an0hl3kidvmgj538n6vzpz964yilzj6qrry9f46wc";}
+  {name="okular";value="0cmcaqpaxx8910qmsvag6spjbchdbv6j9hgbizw6qq09kz4d9a7k";}
+  {name="oxygen-icons";value="00l7qy95za3c323hkjiihavmq2vjm2yi81yn4cgwpnc5l336pynb";}
+  {name="pairs";value="15kafhp54dsrv2466j9gnn0c8iqbfx4frrql0r6v5qza015vybr9";}
+  {name="palapeli";value="0bx7qqidywxwkj9vdbzpqsy2fvkjgf9vj8nqk5ypx7jm7da87y94";}
+  {name="parley";value="163xnfd9h8r6dp3riqs3s32qaramyf225bhy6y9laknbrr9lxnsm";}
+  {name="perlkde";value="05ybh43ckfq5qh03pklkgiajc2s6b6cmvp5alx0dvq605h5z881f";}
+  {name="perlqt";value="1fn3gxb8b4kx7g24pnrbg42dv17hn2wv70g53yfr6z277ljinxzl";}
+  {name="picmi";value="19gli6mii15qya9hi6qyb52rsk2n2dk6r4kzla99ps3cs8n4h9x8";}
+  {name="poxml";value="11cwhjil8vdwwpmp1l61335b5j9714hbxiyqw0wyxcr6yccasbdf";}
+  {name="print-manager";value="0v940bsksw04ymxq56lgm6sprkdlyzjm5fgsm24yb564nay3x42h";}
+  {name="pykde4";value="00gpjqgsfv83xfk1xmglr8c32ln9cc05m4nf1qbd3gvr5jb6cxmg";}
+  {name="qtruby";value="1312v8vn091q5lh81cm5z5wkgidigdngqkjs3kf7lp9d1k50ai47";}
+  {name="qyoto";value="0sjii1i31x1cxhr5y5ijaain9ql75fbba9ss1cxz9agswp95kpcz";}
+  {name="rocs";value="0h72mrb65gnk36g9d4l55bm7kfldh3v95hbv0wxad0p9v7baxmn2";}
+  {name="smokegen";value="0x4qz1pk8wn4vq0fmy344v9m1gh12dav3n71z6xi4pnpmpmq7kna";}
+  {name="smokekde";value="1wl88jy9yvvrykzknj1vy7rqhfxr52q053y2jmay53hvx1iaqjxm";}
+  {name="smokeqt";value="1lphdjxcvysn1lkq6yj7z5pmhzlwpkj3xx7izfdk1g6a1pkjwr7j";}
+  {name="step";value="0ma7748ixi00zw9hrjjlgbb7d1a4cr124ka3ymn45sa4q4mza3zh";}
+  {name="superkaramba";value="0xbs2k863p2yg2k7wn70gbwvriin4lv2hv78r5m6fwvb4rsjygsb";}
+  {name="svgpart";value="1svwqxcxl2wp4wq9s3q6crys7jmz072wp4qz69fvqcvp1cd92gsp";}
+  {name="sweeper";value="19lsqw192h3863fbd265didviy7m4wk6qwfgnhc7sxaxxccm19y4";}
+  {name="umbrello";value="0lmygjjsqiw0xnv4d3d1yb1b5zlnj18lh01k954ycl8f50cxsv9a";}
+  {name="zeroconf-ioslave";value="1324mx9gsr6ghi7m1qk4kwr91g8wfd3jsw3rzp26nhrlwjsa5j6a";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kdnssd";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="libkomparediff2";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.12/kde-wallpapers.nix b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
index 30e68934acf..393d90824eb 100644
--- a/pkgs/desktops/kde-4.12/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
@@ -9,7 +9,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "19d2ly05hv2x1kkzgdgvkcpjypp2nk4q9bffv17lz2q5pzhjhsa4";
+  outputHash = "1yg9c780xdxa60bw832cqj60v87cbvjxp27k6gacj2lwk7rm5hwg";
 
   meta = {
     description = "Wallpapers for KDE";
diff --git a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
deleted file mode 100644
index 9040e7006fb..00000000000
--- a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.2.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1y740kbf2dl9mvfnd7lsxc8vzxz4a7i0xxsmq78dmclid6ard3pk";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1gdyplprirglmkiwxy5kv9p7zjzb4vx7za7hvs0swmi7whlx6ff2";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "115prvyvg5pg8ya901iwrphxih5nbrimq3awmnr4fylwvjghcxxx";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0chf5kay9k810hqih18ya2dj8xzhdqqn6bj28r1gf1dwz0f8h4jb";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0svgfginqjpspz556z3vsn3ldcp32fv0q4jjc8mllc9fq45331h5";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0bs5pmrvgn59ff6s7a6j17xc4gjwbydklbcinfz22mjni1kl2blc";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0z3nj26ajixvjm072ii86idd3xfflzraf7fgqyra89lzz47ahiar";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0q7ilziqbrqs4khj91smqr88h1g8n662f1y2zh3nlm096x3gvz1n";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0xgyi75985dz32f4q99vkfhhpx6186zknjl63xnca2603jxqcr4n";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0bxg4hsixz35b2waxc5hpd4dqk5bny5j9szb8i1prdqsdhcgaqas";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1qjipllcdc6an5vnza5bnyxaznbc9igvazrkxh9j0vpdv3g1fdgq";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "13gdhidd6qw60fdgbp73wbbb8n93maj7xf94p75mi1dzbd5i8xh8";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0sbnbn6vpd66k3bb9k09vslxwqz1nb9rvaqiii8q1dkgx32fy5k6";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "021ylfbsvig3dq87z8f0n1hm589a2a0qymv5pkc0p43rf7bcp23n";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1g175xmyphc60fi73bslnysn8sys1w65p8qhj7r52pb0ynvmg02r";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "13h7m9hq8rc1q1pl91253qvl69cda69lqkl4axass2l23ksfm9jr";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0m6691cl3n63qznx8vb7z70yz57ll676pvplfwpvcd2nq3kc7863";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1rxb03cdcz2cqiwwvwmilhcw36dq1b3dh1jhbjd22rkkxi6m6pl6";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "0ckdfqk49xqlr4pjl0kqcwg6c65lzv2hwvw83qyicaw5h8ga7rwk";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1gc1ah58y5psd7v66qj1bl1yd47g36wnsdwnhz3m7hjrj87k1g7z";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0kw87f4xv6zfa7xfhlpqv1fxdv8szzhb6vkmcih069h0q5s9sfxq";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1izhms762vyw9ddik11dg7yg7mw3684ywp4m1648sc0jiq33p5vx";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "12r9sv7p56ilan6s1cy30pdl60sx4pn4cic8xx3wyj97i44wwq8c";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1jy0j92426ldlnhmfh76amgaxvrkpj97a75whi49a4ki79m9z4kk";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0kh3vjdvb8jhdgq3r1lg7z6vvi1qlpgmnmm64w5mqv28fg4ycrzi";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "0cg1ffkh3r8h0fc0fl5qljc7y0y20ynvgp5j2mhzqnxihmdfskr9";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1rzi4wcl9dhn10k3x3j69dmc6x44kwvfh5sx1fpgrdxd08h5ga9a";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1dqdk94djpy46w3jskm85k4v0gr58p2vmm3swlp4xf0fzk32x0hh";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0cjcj49m8c1ldr9zv8qbk9sni66vnlk640yyv765xqppccd4gg1y";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1x3a609pbvrna5zbycmk45q4fx9ycqf514yr7wygh4prl49ah5fs";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1n7nr438kc2g1hdbj2ysp24yybilcjzqan39571d6n7w6qpw6b5x";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "0hx59fv30bgfcmqaf9xiakcvl4x4ji7imlmnyfyk4h8dvf0hj7vw";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1zs25srv7z8c6hcavcq0552iykz7psw3lr77zzjzwj6y734zsjir";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "105km17vk03g06kdxyi487dswd3bgq0l814wqcjd6kfdgzdi3q8n";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "08vb5vbmvsp7chanvmmh336lh583p5xyb71ifhin4l0zkbpcv0r7";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1dhsn84ai9brdy60m3r7wk91liw2wp0vhq57jqb03dgv4nzgfshd";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "14jhhs5mxll2102aq1019sizjggyiiqb3wdi7hnljycry22qkim6";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0bs6rjqqk4vzw06w2hqdj04yan1fcrk9lpf4bag9imdxpy2380nr";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "120ccxca131r1h48vycd5jd9644yqw1ad3nsy7g6i9vqga4ibpn4";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0p1scqncdrm1njlqq5npkizrvypd37xf2wzg4jyfvl8ycbv2ssx0";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0k1ldvcls8shga6faym6hkknj5dk8aivq50ikakj9mkj2spp09wr";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1lxpb0szs4fmsgvl482sq93g7pmlwbjdysdsd3xqq36vqz7y2ba8";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0n25sll8nmidv43sq2rblpg99469hc73ykhp9zblzz4662f3fsip";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1cca06ij41k3n3kyaajidkffmxng03y816xvqki250w7sz23nf3v";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1jnm8931ik8vld625hn0h7x46m2v7vwmdjn4g302lkprdccp309m";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "04r5w6zyl6nl056c0a3rfg1qh1bkjlliin42dla6qsma9qmzhm8s";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1s16lh7w6xrcv7g4gnqs959h369inmv6sdnf1zr3ijz17zd0zhpl";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0600600v4r7skqw0lmj917a8rx3mnaiky3k0ckiz58z1zwbqg5fa";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "0vyfg21xkzk0jr20bsw1x7wmij78razynn8nll96dadfikbmz0hb";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "1iryrrs1jp340nkx05452gxm8yrri89qjz240n9inl9crbha35w6";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0xjfrlfv56g2hhzifg5l19szi7vb9x5gxvnid3apwrfs9b2lgrb3";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0jlv40v2lwlmd4qss55vwbx72wr2ld3pjx0pd13da5afr5n1dcf3";
-}
-]
diff --git a/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix
new file mode 100644
index 00000000000..e646e352887
--- /dev/null
+++ b/pkgs/desktops/kde-4.12/l10n/manifest-4.12.4.nix
@@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1pygy9kckankwhlm4j61fk42zinafw2insc9kkpgmh9mvb8gv0jk";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1qqbl7l84j3d5928gmdq7f7s0i31gw0rlf4y74p5zx8m80xbdd6l";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0cg143wlalplw0qr10h60i6srn0avsim94m1hjbm8xrlg71iihjj";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "15s85xmqbnv7bm7ywivkyi62481ip4vy6yyw81m720hza0imbj9z";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1d0bhndwf8b0pmglf3sx28r6s3li72x7a05kc39n026ha5zyx5f1";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1dx5c6fkgn4hglx8qacrdnxn0l9p7dqbaz6cd7h9pa8b9zri5j9w";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1ynh8s17999pa60bzwr2595pcd744h1n8zznyzr5lq302ir8f8qj";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1da01wd1n64g3l57pagvrb8mn2jj50ni1qhicnlwylk8n2krw0pf";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1qf9g5in9zr39gkip06hr80pzc4frchb2x9q76sqs36h58az5yfd";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1lhrbfh74sqglqxl7yh68qkx0gmppg7iir194vxhm2s1j0jxq8r4";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0qz39nxkiivgk720lgdbfgxdp3wn5wrvx2zf0phvb8g6q5rl68kw";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1i9h68pfsnbi4gw5f4mb6q8jq56hdmi1lqxhwzj6vrbqiip7b9gl";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "020b1p164v82pj6x0jxz6d41w539786ygkfmgrf9dr20zwhchzha";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0vs8bqr6if32bmwvjzdmakyqdl5fz13igg31mzwga4aqlzalxa1w";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1wcd9gzf754150i62zl3fa24jq8p7vskn6adaa8x5qy208c0d6v1";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0fpsc36sk7zh3flxgnvfgxig4cm5hm56sgdgbl01dfg1mac6dckq";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1hrbsd595q2w09mym9h56hymikkpxbq0qmdxvphap5wsh0xsfxms";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1q2y9js6j32rbm5jg8yn6s9zw0jh6yq1q4z6hxy9nss1gh6diqda";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "0zaknfk8kzcid7839wsj61qgn81gjz0hbpis7q2q1syky4nzjwsb";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1d14h5kdfz8np5p27darraxq4ps0yhxhczg9yli436kgiflbvp88";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0p29dybsalnjk00f7l3gni7pxzv1ig95m100svhhkmcwvh065kjf";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1qqbn3v30z058580qr9qyq0sy6g4jw0far8w7ywgnhks4aapy97a";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1gfm0k2j2jvff9lab87yjrywc1j0gayw2fxibzifvpygr9bl60i7";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "11zax6c3qfscadqfamls5k78hw36iwadqsgyiphl574ijz9q48ba";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1ab658x0a44kydzs05zgzq7nks6dfl0z8m69ank5ngd12qnhb38s";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0n26860ah421x8q2jmz8mh3mdzy26s8ckbfpnyph1vc23zqx9vqv";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "05ad1d5klc11s138zb5fj4h2kfida83xqr4z1m6nhv0igwzmza0g";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "14kchh6yixgrkzrrkdz25xaj2q91il6yshz79n4h0yk01lfc3sq5";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0aa4spy2nc1hfbx1z2b4k3sahha0pdxih1k3pl6n9223cjgwcbqp";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "14341a4qr8p7idvsw6zp23kyva5lb4684wjygm24d9wj69nkc2c4";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "02rq9spp8vzvv8bvzny48qwksimrnqj6y9rpc3xh6bmzfhvr7qsa";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1s2gbynxdbpi32rwdgddabsp3n10ngwpnh6za3yjp4is93ici6rm";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "18nmh605ya47w0x2nkglg8lrfks7l9pxr6mjnw3z3lsazafigvx1";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1jxd109m2y7ky0c4im70ipx07rysbr0ndl2fpjb3myxb2nks106h";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "117zl85myjnnb957c4gx0h65ks842sk3gbw9dfp8hpzdwg8zvsn4";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1q5c61a2swxvyhdw5rambibyms40hj34093ihx32ad73kb4mn72w";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0wg4nlra1z6pf8mxlz3w0jq68k0qfhxrhsqij35l9zml5y203n4y";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0rryyjfgplar77fz332jv2w0lv7d6273gv022pb1m83w945pzkf9";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "0aglgvj1ljfdf6gjs478l4wisp2z4dzkkbhz1sgry00p4q1417ab";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "14aqlg64lp287m09zhh9r9l6ywfwzz7f2nz0vr1fg3wqsdrchglw";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0cq6xacyrb9wrrwbl8xrb2ah3h7s7a9vr7kz3fy5rf2rgq0phfd7";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "07i0plzmg0nykfalyjvwnhg5qrcfdf1h6i18b34xyrp3y4gm540a";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0gw1iv550nr307ibgb8i48fxcq03liq5r2x7fr9pl0n9xknh3c8a";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0489n0l9c9wig5567dfh4apyyy6xws7yxq79r4jl00zxl1j43bla";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1n4ckll9ngj8qn976nikxfljf23qsvphblbjnjm0vk4713bnpf9h";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0pzjdnanhynalcjlsg94g88i92hwdsqz02x85yxxg87vn74p13ks";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "1z9mjzh0w6i2a75ys0dx5ksm8fpwyw8wrwdh14bvbnxpnkx0jv8x";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "032vjcjpl19dyyc36z1nwyc9h696iys8dfyadpw9rhcllpk4ck67";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "0sd6vzb1qmbbxk6d1vfq21gkq009lp7qxnpdcr7jbykcf0licq7i";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "1m6fa0adfjzfqakjyrrjwak4p0y5wwdkkq61qx9wvzdb78qm83rw";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "11is37g7fafxhk7ydydgbxdg0x1s5cxr8v1pjzwqb858n1cq5x1h";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1vbr0pjm8d25lxbmhqz8d4x57sjc411a5fkvyxh4rr34fd7xxhwq";
+}
+]
diff --git a/pkgs/desktops/kde-4.12/oxygen-icons.nix b/pkgs/desktops/kde-4.12/oxygen-icons.nix
index 626948cb24d..01020e095f9 100644
--- a/pkgs/desktops/kde-4.12/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.12/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0i28c8iz83ian5mnci66jlrdkwiw09j0vxgfs74mc4wgbj5xns2f";
+  outputHash = "06qddsbq0sadj9jh2x1qkbm69b7cnd2474b3h0zrzrqgnrsf8jn2";
 
   nativeBuildInputs = [ cmake ];
 

From 19e9d25e8feedab55ab493f9da349c5ec80687aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 21 Apr 2014 18:11:43 +0200
Subject: [PATCH 0400/2033] Remove KDE 4.11

---
 .../services/x11/desktop-managers/kde4.nix    |   2 -
 pkgs/desktops/kde-4.11/applications/kate.nix  |  11 -
 .../kde-4.11/applications/konsole.nix         |  11 -
 pkgs/desktops/kde-4.11/default.nix            |  44 --
 .../files/kde-wallpapers-buildsystem.patch    |  17 -
 .../kde-4.11/files/polkit-install.patch       |  12 -
 pkgs/desktops/kde-4.11/kactivities.nix        |   9 -
 pkgs/desktops/kde-4.11/kde-base-artwork.nix   |  14 -
 .../kde-4.11/kde-baseapps/kde-baseapps.nix    |  11 -
 pkgs/desktops/kde-4.11/kde-package/4.11.0.nix | 444 ------------------
 pkgs/desktops/kde-4.11/kde-package/4.11.2.nix | 444 ------------------
 pkgs/desktops/kde-4.11/kde-package/4.11.4.nix | 444 ------------------
 pkgs/desktops/kde-4.11/kde-package/4.11.5.nix | 444 ------------------
 .../desktops/kde-4.11/kde-package/default.nix | 129 -----
 .../kde-4.11/kde-package/kde-manifest.sh      | 146 ------
 .../kde-4.11/kde-package/kde-submodules.xslt  |  22 -
 pkgs/desktops/kde-4.11/kde-runtime.nix        |  23 -
 pkgs/desktops/kde-4.11/kde-wallpapers.nix     |  17 -
 pkgs/desktops/kde-4.11/kde-workspace.nix      |  39 --
 .../kde-4.11/kdeaccessibility/jovie.nix       |   9 -
 .../kde-4.11/kdeaccessibility/kaccessible.nix |   9 -
 .../kde-4.11/kdeaccessibility/kmag.nix        |  10 -
 .../kde-4.11/kdeaccessibility/kmousetool.nix  |   9 -
 .../kde-4.11/kdeaccessibility/kmouth.nix      |   9 -
 pkgs/desktops/kde-4.11/kdeadmin/kcron.nix     |   9 -
 .../desktops/kde-4.11/kdeadmin/ksystemlog.nix |   9 -
 pkgs/desktops/kde-4.11/kdeadmin/kuser.nix     |   9 -
 .../kde-4.11/kdeartwork/ColorSchemes.nix      |  11 -
 .../kdeartwork/FindXscreensaver.cmake         |  73 ---
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.11/kdeartwork/IconThemes.nix        |  13 -
 .../kde-4.11/kdeartwork/WeatherWallpapers.nix |  11 -
 .../kde-4.11/kdeartwork/desktopthemes.nix     |  11 -
 .../kde-4.11/kdeartwork/emoticons.nix         |  11 -
 .../kde-4.11/kdeartwork/kscreensaver.nix      |  15 -
 .../kde-4.11/kdeartwork/kwin-styles.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeartwork/sounds.nix  |  11 -
 pkgs/desktops/kde-4.11/kdeartwork/styles.nix  |  11 -
 .../kde-4.11/kdeartwork/wallpapers.nix        |  11 -
 pkgs/desktops/kde-4.11/kdebindings/perlqt.nix |  14 -
 pkgs/desktops/kde-4.11/kdebindings/pykde4.nix |  32 --
 .../kdebindings/qtruby-install-prefix.patch   |  15 -
 pkgs/desktops/kde-4.11/kdebindings/qtruby.nix |  20 -
 .../smokegen-CMakeLists.txt-nix.patch         |  13 -
 .../kde-4.11/kdebindings/smokegen-nix.patch   |  13 -
 .../kde-4.11/kdebindings/smokegen.nix         |  13 -
 .../kde-4.11/kdebindings/smokekde.nix         |  19 -
 .../desktops/kde-4.11/kdebindings/smokeqt.nix |  15 -
 pkgs/desktops/kde-4.11/kdeedu/analitza.nix    |   8 -
 pkgs/desktops/kde-4.11/kdeedu/blinken.nix     |   8 -
 pkgs/desktops/kde-4.11/kdeedu/cantor.nix      |  13 -
 pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix    |   8 -
 pkgs/desktops/kde-4.11/kdeedu/kalzium.nix     |  13 -
 pkgs/desktops/kde-4.11/kdeedu/kanagram.nix    |   8 -
 pkgs/desktops/kde-4.11/kdeedu/kbruch.nix      |   8 -
 pkgs/desktops/kde-4.11/kdeedu/kgeography.nix  |   8 -
 pkgs/desktops/kde-4.11/kdeedu/khangman.nix    |   8 -
 pkgs/desktops/kde-4.11/kdeedu/kig.nix         |  12 -
 pkgs/desktops/kde-4.11/kdeedu/kiten.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeedu/klettres.nix    |   9 -
 pkgs/desktops/kde-4.11/kdeedu/kmplot.nix      |  12 -
 pkgs/desktops/kde-4.11/kdeedu/kstars.nix      |  14 -
 pkgs/desktops/kde-4.11/kdeedu/ktouch.nix      |   9 -
 pkgs/desktops/kde-4.11/kdeedu/kturtle.nix     |   9 -
 pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix   |   9 -
 pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix   |   8 -
 pkgs/desktops/kde-4.11/kdeedu/marble.nix      |  12 -
 pkgs/desktops/kde-4.11/kdeedu/pairs.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeedu/parley.nix      |   9 -
 pkgs/desktops/kde-4.11/kdeedu/rocs.nix        |  14 -
 pkgs/desktops/kde-4.11/kdeedu/step.nix        |  15 -
 pkgs/desktops/kde-4.11/kdegames/bomber.nix    |   7 -
 pkgs/desktops/kde-4.11/kdegames/bovo.nix      |   8 -
 pkgs/desktops/kde-4.11/kdegames/granatier.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/kajongg.nix   |  13 -
 pkgs/desktops/kde-4.11/kdegames/kapman.nix    |   7 -
 pkgs/desktops/kde-4.11/kdegames/katomic.nix   |   7 -
 pkgs/desktops/kde-4.11/kdegames/kblackbox.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/kblocks.nix   |   7 -
 pkgs/desktops/kde-4.11/kdegames/kbounce.nix   |   7 -
 pkgs/desktops/kde-4.11/kdegames/kbreakout.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/kdiamond.nix  |   7 -
 .../kde-4.11/kdegames/kfourinline.nix         |   7 -
 .../kde-4.11/kdegames/kgoldrunner.nix         |   7 -
 pkgs/desktops/kde-4.11/kdegames/kigo.nix      |   7 -
 pkgs/desktops/kde-4.11/kdegames/killbots.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/kiriki.nix    |   7 -
 .../kde-4.11/kdegames/kjumpingcube.nix        |   7 -
 pkgs/desktops/kde-4.11/kdegames/klickety.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/klines.nix    |   7 -
 pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/kmines.nix    |   7 -
 .../kde-4.11/kdegames/knavalbattle.nix        |   7 -
 pkgs/desktops/kde-4.11/kdegames/knetwalk.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/kolf.nix      |   7 -
 pkgs/desktops/kde-4.11/kdegames/kollision.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/konquest.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/kpat.nix      |   7 -
 pkgs/desktops/kde-4.11/kdegames/kreversi.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/kshisen.nix   |   7 -
 pkgs/desktops/kde-4.11/kdegames/ksirk.nix     |   7 -
 .../desktops/kde-4.11/kdegames/ksnakeduel.nix |   7 -
 .../desktops/kde-4.11/kdegames/kspaceduel.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/ksquares.nix  |   7 -
 pkgs/desktops/kde-4.11/kdegames/ksudoku.nix   |   7 -
 .../desktops/kde-4.11/kdegames/ktuberling.nix |   7 -
 pkgs/desktops/kde-4.11/kdegames/kubrick.nix   |   7 -
 .../kde-4.11/kdegames/libkdegames.nix         |   7 -
 .../kde-4.11/kdegames/libkmahjongg.nix        |   7 -
 pkgs/desktops/kde-4.11/kdegames/lskat.nix     |   7 -
 pkgs/desktops/kde-4.11/kdegames/palapeli.nix  |  11 -
 pkgs/desktops/kde-4.11/kdegames/picmi.nix     |   7 -
 .../kde-4.11/kdegraphics/gwenview.nix         |  15 -
 pkgs/desktops/kde-4.11/kdegraphics/kamera.nix |  10 -
 .../kde-4.11/kdegraphics/kcolorchooser.nix    |  10 -
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  13 -
 pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix |  10 -
 .../kde-4.11/kdegraphics/kolourpaint.nix      |  10 -
 pkgs/desktops/kde-4.11/kdegraphics/kruler.nix |  10 -
 .../kde-4.11/kdegraphics/ksaneplugin.nix      |  10 -
 .../kde-4.11/kdegraphics/ksnapshot.nix        |  10 -
 .../kde-4.11/kdegraphics/libkdcraw.nix        |  13 -
 .../kde-4.11/kdegraphics/libkexiv2.nix        |  10 -
 .../desktops/kde-4.11/kdegraphics/libkipi.nix |  10 -
 .../kde-4.11/kdegraphics/libksane.nix         |  10 -
 pkgs/desktops/kde-4.11/kdegraphics/okular.nix |  17 -
 .../desktops/kde-4.11/kdegraphics/svgpart.nix |  10 -
 pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix    |  46 --
 .../kde-4.11/kdelibs/nepomuk-core.nix         |  20 -
 .../kde-4.11/kdelibs/nepomuk-widgets.nix      |  11 -
 .../kde-4.11/kdemultimedia/audiocd-kio.nix    |   7 -
 .../kde-4.11/kdemultimedia/dragon.nix         |   7 -
 .../kde-4.11/kdemultimedia/ffmpegthumbs.nix   |   7 -
 pkgs/desktops/kde-4.11/kdemultimedia/juk.nix  |  10 -
 pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix |   7 -
 pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix |   7 -
 .../kde-4.11/kdemultimedia/libkcddb.nix       |   8 -
 .../kdemultimedia/libkcompactdisc.nix         |   7 -
 .../kde-4.11/kdemultimedia/mplayerthumbs.nix  |   7 -
 .../kdenetwork/kdenetwork-filesharing.nix     |   9 -
 .../kdenetwork-strigi-analyzers.nix           |   9 -
 pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix  |   9 -
 pkgs/desktops/kde-4.11/kdenetwork/kget.nix    |  20 -
 pkgs/desktops/kde-4.11/kdenetwork/kopete.nix  |  27 --
 pkgs/desktops/kde-4.11/kdenetwork/kppp.nix    |   9 -
 pkgs/desktops/kde-4.11/kdenetwork/krdc.nix    |   9 -
 pkgs/desktops/kde-4.11/kdenetwork/krfb.nix    |   9 -
 pkgs/desktops/kde-4.11/kdepim-runtime.nix     |  16 -
 pkgs/desktops/kde-4.11/kdepim.nix             |  28 --
 pkgs/desktops/kde-4.11/kdepimlibs.nix         |  19 -
 pkgs/desktops/kde-4.11/kdeplasma-addons.nix   |  23 -
 pkgs/desktops/kde-4.11/kdesdk/cervisia.nix    |   9 -
 .../kde-4.11/kdesdk/dolphin-plugins.nix       |  11 -
 .../desktops/kde-4.11/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix |   9 -
 .../kde-4.11/kdesdk/kde-dev-scripts.nix       |   9 -
 .../kde-4.11/kdesdk/kde-dev-utils.nix         |  11 -
 .../kde-4.11/kdesdk/kdesdk-kioslaves.nix      |  12 -
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 -
 .../kde-4.11/kdesdk/kdesdk-thumbnailers.nix   |  10 -
 pkgs/desktops/kde-4.11/kdesdk/kompare.nix     |   9 -
 pkgs/desktops/kde-4.11/kdesdk/lokalize.nix    |  13 -
 pkgs/desktops/kde-4.11/kdesdk/okteta.nix      |  13 -
 pkgs/desktops/kde-4.11/kdesdk/poxml.nix       |   9 -
 pkgs/desktops/kde-4.11/kdesdk/umbrello.nix    |   9 -
 pkgs/desktops/kde-4.11/kdetoys/amor.nix       |   9 -
 pkgs/desktops/kde-4.11/kdetoys/kteatime.nix   |   9 -
 pkgs/desktops/kde-4.11/kdetoys/ktux.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeutils/ark.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeutils/filelight.nix |   9 -
 pkgs/desktops/kde-4.11/kdeutils/kcalc.nix     |   9 -
 .../kde-4.11/kdeutils/kcharselect.nix         |   9 -
 pkgs/desktops/kde-4.11/kdeutils/kdf.nix       |   9 -
 pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix   |   9 -
 pkgs/desktops/kde-4.11/kdeutils/kgpg.nix      |  12 -
 .../kde-4.11/kdeutils/kremotecontrol.nix      |   9 -
 pkgs/desktops/kde-4.11/kdeutils/ktimer.nix    |   9 -
 pkgs/desktops/kde-4.11/kdeutils/kwallet.nix   |   9 -
 .../kde-4.11/kdeutils/print-manager.nix       |  27 --
 .../kde-4.11/kdeutils/superkaramba.nix        |  11 -
 pkgs/desktops/kde-4.11/kdeutils/sweeper.nix   |   9 -
 .../kde-4.11/kdewebdev/kfilereplace.nix       |  10 -
 .../kde-4.11/kdewebdev/kimagemapeditor.nix    |  10 -
 .../kde-4.11/kdewebdev/klinkstatus.nix        |  11 -
 .../desktops/kde-4.11/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.11/l10n/default.nix       |  46 --
 pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh  |  32 --
 .../kde-4.11/l10n/manifest-4.11.0.nix         | 272 -----------
 .../kde-4.11/l10n/manifest-4.11.2.nix         | 272 -----------
 .../kde-4.11/l10n/manifest-4.11.4.nix         | 272 -----------
 .../kde-4.11/l10n/manifest-4.11.5.nix         | 272 -----------
 pkgs/desktops/kde-4.11/oxygen-icons.nix       |  15 -
 .../kde-4.11/support/akonadi/default.nix      |  24 -
 pkgs/top-level/all-packages.nix               |   8 -
 196 files changed, 5319 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.11/applications/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.11/applications/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.11/default.nix
 delete mode 100644 pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.11/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.11/kactivities.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-base-artwork.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/4.11.5.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
 delete mode 100644 pkgs/desktops/kde-4.11/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kde-workspace.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/analitza.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kstars.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/marble.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/pairs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/bomber.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/bovo.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/granatier.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kajongg.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kapman.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/katomic.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kblocks.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kbounce.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kigo.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/killbots.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kiriki.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/klickety.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/klines.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kmines.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kolf.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kollision.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/konquest.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kpat.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kreversi.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kshisen.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/ksirk.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/ksquares.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/kubrick.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/lskat.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/palapeli.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegames/picmi.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/okular.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdepimlibs.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.11/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
 delete mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix
 delete mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix
 delete mode 100644 pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix
 delete mode 100644 pkgs/desktops/kde-4.11/oxygen-icons.nix
 delete mode 100644 pkgs/desktops/kde-4.11/support/akonadi/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 26b0612671c..f74dd7e0444 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -43,7 +43,6 @@ let
   phononBackendPackages = flip concatMap cfg.phononBackends
     (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
 
-  wantsUdisks2 = pkgs.kde4.kdelibs.wantsUdisks2 or false;
 in
 
 {
@@ -158,7 +157,6 @@ in
       };
 
     # Enable helpful DBus services.
-    services.udisks.enable = ! wantsUdisks2;
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
diff --git a/pkgs/desktops/kde-4.11/applications/kate.nix b/pkgs/desktops/kde-4.11/applications/kate.nix
deleted file mode 100644
index e8efc87775a..00000000000
--- a/pkgs/desktops/kde-4.11/applications/kate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4 }:
-
-kde {
-
-  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/applications/konsole.nix b/pkgs/desktops/kde-4.11/applications/konsole.nix
deleted file mode 100644
index 0db47fb2d7c..00000000000
--- a/pkgs/desktops/kde-4.11/applications/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix
deleted file mode 100644
index 269bdc0d3a7..00000000000
--- a/pkgs/desktops/kde-4.11/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }:
-
-let
-  branch = "4.11";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release branch ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {};
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release branch;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb64694..00000000000
--- a/pkgs/desktops/kde-4.11/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.11/files/polkit-install.patch b/pkgs/desktops/kde-4.11/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/desktops/kde-4.11/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.11/kactivities.nix b/pkgs/desktops/kde-4.11/kactivities.nix
deleted file mode 100644
index 06381bb13d7..00000000000
--- a/pkgs/desktops/kde-4.11/kactivities.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kde-base-artwork.nix b/pkgs/desktops/kde-4.11/kde-base-artwork.nix
deleted file mode 100644
index 3f416cebddc..00000000000
--- a/pkgs/desktops/kde-4.11/kde-base-artwork.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Base artwork";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index c2a25664678..00000000000
--- a/pkgs/desktops/kde-4.11/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, htmlTidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
-
-kde {
-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
deleted file mode 100644
index 08de0fe4b0e..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/4.11.0.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="0xz73rnznng6nd8ax2s8yh5wmvlwlhy7qm2y0m15fxw8x9dyym2s";}
-  {name="analitza";value="1pvi6nsdh64pjmrq0xm6vjl2rdpllm8vizf5pxm64m3s225x11r8";}
-  {name="ark";value="152cilip6g0jvqvczv29kdnlghyra0qs9166g4py82w94f96h4a0";}
-  {name="audiocd-kio";value="1xly06zy2m7xg8b675y2l3xj2mixy739f65b6mciyz0240qlian5";}
-  {name="blinken";value="0kyrblhn4b46fcf2rkidkkvpvnirz1z866yp7mi3m9dnl9iqzk32";}
-  {name="bomber";value="1s9wkdz7mgmsr438ikjxc3qj810aw39kblwc2a0v21skhv9glx40";}
-  {name="bovo";value="1p4v5nvx6nfprpv5wm9ab25d0wklx0znf6257ssy97p9knj7lzf4";}
-  {name="cantor";value="00j2fwl2y93k3mwqmnl9ndcqdfmxl2r5nff920sjmylhplsrvzri";}
-  {name="cervisia";value="1gg53a5lcp2mlii285ys6d570wzjx7v5h3g0r1l3h146ipnddkpm";}
-  {name="dolphin-plugins";value="1cj0vajrpmi1imz3gg6has8bqm2hj2px0k2fda35lc0wb2h6vwip";}
-  {name="dragon";value="1gclq1v9a84aq9jbakc0fs0c4y7ykzf05vl0gkpjkijnnb5sr028";}
-  {name="ffmpegthumbs";value="04zarg373420mzdc4psziw173flpv1jc80xavq5qff4j8njjynw4";}
-  {name="filelight";value="1q7lsiq2xxvfs30i0l0ywvpzch0kd8blbg10r56p15wyyjc84h1d";}
-  {name="granatier";value="14zlk4y30kgbx69hb516dcva78xqk7yhi90f7yg327r5a72njwvv";}
-  {name="gwenview";value="0686bybi10vyz6yb2h5zi906d295rcd7wlgh87zjiw0p2rz5qd6b";}
-  {name="jovie";value="02b2jl3ip7y0sd4xscw8qmkmm646ksmlm0c3xwwcijwvdj1h3xsw";}
-  {name="juk";value="1wm0ngpsc62766l127nk38cg5vdhlqsh3gsl7alk2rcrgfainkhh";}
-  {name="kaccessible";value="0mixfx8f8097p2y7zqacawb64r8jzj6iqrkhh7xp9ldwrrnf8jr0";}
-  {name="kactivities";value="0s5l0h2axq43ip8a4wn9lqb7i6hvxzzpscr1wv9qm02g98h1kzc5";}
-  {name="kajongg";value="0g7cx3qjrhga37wp9wypwwhzsk4q4fy63qqbpzh7znc4kfiw3j56";}
-  {name="kalgebra";value="01vgg54sr7g3h7lk9cd3m739y317x680brnp858chqvi7jq9nw5i";}
-  {name="kalzium";value="1zbrq2jm7j9sjzxfl93kambv1n665ah57ljr16r5dqk0x3xchirn";}
-  {name="kamera";value="1bhmxij7fnzc26hv4fbglqm3fhi5jdd8bqxnyx91sjja34wr55l4";}
-  {name="kanagram";value="1hdv0ydklz8y8wh49drpmgc9hqkwp59zvwn39h67fsiig44k6jag";}
-  {name="kapman";value="024q8w4x1hy518qcl76nxgr6q8h3blkw9qfg9z6d899qa6zb6ihq";}
-  {name="kapptemplate";value="09xgy5wrqhxlgvk6yhdfvickqx4v4rqd0s9zda7mlj13yfphbq8k";}
-  {name="kate";value="1r8i3hiqfxs2idjkszkzzn5lpkpm5bzjprs9dv33gzfnnq7w6q54";}
-  {name="katomic";value="0g197ynk6pzwxhr3yw20jw16qd9664j35vsr7511jxyydadbnrx6";}
-  {name="kblackbox";value="1pv9f3vh7l25xlvxpvznjiw3va2ljcz2znc1qxy6ib907qfgnryv";}
-  {name="kblocks";value="0rahh2hra6k0f0z9sh906avznv6x451da6w62bn561hl1fsd3qmy";}
-  {name="kbounce";value="1h25lyga30fxrhrlagw51la3vl38h5qil6zrwr5j3n8agard6nxf";}
-  {name="kbreakout";value="09mq49ia5synl9k166k2zw7n4awv2jkv0c0cckfc1byfvyfp6hnq";}
-  {name="kbruch";value="1fmc1mi94c8dz20qlj8gva64qk8kwdy22frlx8mv049lpaslhnh9";}
-  {name="kcachegrind";value="0iqa5vd03b3ysms692yqk4wy0igmrzjg1jfyw5sapdch1fv4v5bq";}
-  {name="kcalc";value="0yy41pjy0ai47yl2q8ii74b1qqcrg79xan8m1pxlx1pn0pdqib5h";}
-  {name="kcharselect";value="0sbz5c3jkmh6vpb2zh1jmy1l5f37nwxvhn3a1gbzv20wf2a3mh4x";}
-  {name="kcolorchooser";value="11kjklvvxfg2drwc0gh3z14gh94d6yimswh4g0nrpb7ppny8h0hh";}
-  {name="kcron";value="0ydm9b9x38j4n2v6j144v1jkh91nblbfln0yyfshiig44lxfcg4y";}
-  {name="kdeartwork";value="17s40canzk0z6v4hr683l1xzmpld53lma6m2z7kb537ms4sjrim9";}
-  {name="kde-baseapps";value="06mavmk0v54lwma083w7wyr2374vdwblcbisqb6kr4fsqdng67yk";}
-  {name="kde-base-artwork";value="020j4hi6qmwkjipgf9840m1828bjlcy9vg3nmhrjxvj6wxbaijib";}
-  {name="kde-dev-scripts";value="1hscdf1qdg8kc8x2hp0mibp0k3lq255h8a1kj03b8bk0agrzycjr";}
-  {name="kde-dev-utils";value="05nlisn69r6p58340gaaa8ma1ndpafv69yrynln4nzsw5va6awiv";}
-  {name="kdegraphics-mobipocket";value="1f1x07yy0awz7bas0c189xqn1zrv4sz9fb2vlix1g9qbz4j7440v";}
-  {name="kdegraphics-strigi-analyzer";value="0sq5lmnlgz52znz5jlsd2dixfmiqb6cmwrf6x9pw1px5i76gc63m";}
-  {name="kdegraphics-thumbnailers";value="09bmhxxr53p4szqln8s5pz4yfacyn8drq4p7ffsmp7crhjfjxad3";}
-  {name="kdelibs";value="0q7gzfzkdy8vi56v7xkq79ib3d3x22mi9prc5lkqzq3w9f08xnim";}
-  {name="kdenetwork-filesharing";value="11sc6jxnjl3i5wncc6jpif9d8c6dha3r96qjm5l2afg3g945kjq0";}
-  {name="kdenetwork-strigi-analyzers";value="125vk7y2yjni5bwgld47fg9ms0fksd2mwgpzlmbalcz5a05pwxqr";}
-  {name="kdepim";value="017005mndsg69pfvwn24mdbw0cjny7i3hhvc9102hwv7vn3b38c9";}
-  {name="kdepimlibs";value="0q5g626n6117ri11inyr29lnzirpm8ls68h72m8gy7jbbhpsy2h9";}
-  {name="kdepim-runtime";value="17yjsyyn7hp24r1nx4aggcfjkpw8nyb7lzpp21nf61fb26gdk0m9";}
-  {name="kdeplasma-addons";value="174770q0jgx7h61z48322aqvzprnfyfb1yipv2v725r79wpl8knc";}
-  {name="kde-runtime";value="0yafj2mxqp26zsg3kh1s0vw77wx0l9468jh1g0wkl1hbwxjlszp7";}
-  {name="kdesdk-kioslaves";value="00prg3pblgil86way9air9sl01gfrag8ika96nv8i5qhv0fs5x3n";}
-  {name="kdesdk-strigi-analyzers";value="08rpclbv0csrciqh688akfzh36wy2nc60gsbqfrwrmz82cn0rgyp";}
-  {name="kdesdk-thumbnailers";value="1zx6g94vixk7id1zb7a4f6x4ymkfm4n6g6j2akklzwnba1nqadjx";}
-  {name="kde-wallpapers";value="0km2zpgy4qpqlvnbnbfnklal900idf85xls9h3dn57qckrvscs7n";}
-  {name="kdewebdev";value="1pzph18gw47gy7yfmzcmz7hx35wgsdgc7z7h50p15irrfqd9vxvz";}
-  {name="kde-workspace";value="0wdnnwvzd8djysims0sflban0vvf4rjl5xy9cfxl5c61kgf31zvy";}
-  {name="kdf";value="0znmsv5cpxciqx1pksicpchfqk25damz4zrhsh8fl1y41wr5i0g7";}
-  {name="kdiamond";value="13pz413fvwz74jhvyfvn3l18p5asin2l8r39mqvrp5izz876lrxs";}
-  {name="kdnssd";value="1my59awfn0h67aza1wym7cdlbffm22hf1dma80k4kqwrcws433q7";}
-  {name="kfloppy";value="0aglds7n33pk19qmq26xdr2bmfn3hv80zd479a3czlh0yn0wl0lb";}
-  {name="kfourinline";value="0mbggqssizcsrddi2nb93hwyf9wa6lnqmyswia5bp6803diw0iyr";}
-  {name="kgamma";value="0fwgk3jq5x5fp36jp1yvid69pzqdaac7p8xyd7qwa0m2zz2mbddy";}
-  {name="kgeography";value="0hya5wqigyahl24cmm1ssi5xc6pv8d6hvrd5z4s185pd5i2syfyf";}
-  {name="kget";value="0pnnfizq6xmv3bmpdvqf12pnr1rlbzpdn05c71cl0200frd0samd";}
-  {name="kgoldrunner";value="1s2847rhl1r35a3sjh10yadg7qjs4qycv2j2yc4k6yvh226wixzn";}
-  {name="kgpg";value="1hsa5z4igqn5fd9rnjmm80k6mylf3zyg6ss0m66j96f1r1hc7y9g";}
-  {name="khangman";value="0myjlfm1bws6g8a6r27n4cfdiz6vsii7wk03dhc25a63mbw30lq2";}
-  {name="kig";value="1w0i2q6vvy310ffsc87dahbxx2pv0alsv36wcz5j41a0c0q1lnnq";}
-  {name="kigo";value="026dwwakci2xsxzr05k9wdfn8k22sd0f2qd2hjpjf3nd3306q2m7";}
-  {name="killbots";value="1acn16i1k9il6qflw5kbmwgrdhgf59ziqv0dsdj541wp06v9syzf";}
-  {name="kimono";value="0vws62kw7n6xy4sgyn2w1a1ysfb7g3l730rfvcgdcch1v5k5w6sx";}
-  {name="kiriki";value="0jz9rsmvyb3yqnxpb0fr8nxqcbb55ah4gg75mphxvagfak6180x8";}
-  {name="kiten";value="1vvpd63783lzwb1ixchxzcnv4dwhdfdqvgf6ambxiabdhwzzhrfp";}
-  {name="kjumpingcube";value="0czsirg9r8kngy8y21ds491mdqcysn7c5yravrbvv399j71fgcl7";}
-  {name="klettres";value="0b7zd1f9a3b2d3r4wx03b3gclbnxyxl8sdq4mkrmvxlbv6is4w41";}
-  {name="klickety";value="00yzd79lm7rlfc96cg0asvj3zy1bwb4d0qx2sarf0ny1sbs05d52";}
-  {name="klines";value="1qvjhb88vzymy8c75azhchqxp21iwvbhxiq0mzzb4wg513qz9b1w";}
-  {name="kmag";value="0p7k9w93zyl6ffjwydjfm9pps4irrgdcjf9ksbzm5r41ayj1x3nh";}
-  {name="kmahjongg";value="0wz4lvy4gzix5c5viwcfxqvv43n65151wfz9jay09227f5qfqz1w";}
-  {name="kmines";value="0gsyhmzcj3579bscdlzyp3y1lsxgk7fz6s8gzs36pb1d7cll30i1";}
-  {name="kmix";value="1h5z508yy0y39p5dhmz4lvq2fsl1y9hiqgm0m3xk6js1ysz5cp0w";}
-  {name="kmousetool";value="1p57b4s87hw5rhj3d1m9qaw8r0wx4x7brc9ksizxyjfm90q8hj00";}
-  {name="kmouth";value="1bmmv8w6w9z9dnmm8bwai8wvj1cz3nbibd9qilv0wzy8f9x8z2n2";}
-  {name="kmplot";value="037n51fvpj8r4fz98f1f1jm9pzmlpbcn428cq8kn2p6ahy9g0zhn";}
-  {name="knavalbattle";value="1i128qa95zi0fz6bkkkc0qic630c4n6r24bnc73wp38kkklj1mfm";}
-  {name="knetwalk";value="1yfflp2yndjv0fawahiqq33x9ivv0r5dxivhy38p1xx3bw7aa3qg";}
-  {name="kolf";value="0cfi9mfj1ng7p6vqckjpx4hvzs4cqkiy0wk0c32gyzm3w76ggdsk";}
-  {name="kollision";value="17hzzp4pwl46skf7n2aapxc1wbihxvb8p6z5ch7315d967fbw1iy";}
-  {name="kolourpaint";value="1mvqicbjmbyx7wmw8l8gsfci2x0mg7c7csfbib09p6l5ypr0w5an";}
-  {name="kompare";value="1s5yb2jk6dgsaciwklil43vc3zpr70sarakray0jz22w8sbp00l4";}
-  {name="konquest";value="0v9icbn3pam8w6akz8sk4qpmq8447l9d692877yz9a0wbd4kc3yk";}
-  {name="konsole";value="07pikjzjn824xvjjszvczwwg2alj8qqr7ajy0c7wa9w711hqj654";}
-  {name="kopete";value="114g0pl67vdacxfcnpnhzmy9aarmjm1j6iy6jxc1v3ahrmv7iy1q";}
-  {name="korundum";value="07s4y585a2x6wg9m8hfwhxixbp03aa8z4f7cyk7i7fgvhy32s4wh";}
-  {name="kpat";value="1dqbhn3lypjfnhn4i6212g3spdihp0j12vgkxwf0pii79dwk1lih";}
-  {name="kppp";value="1qk2hvpi72w10gyipw3dcsmkqlg5shvr943rxhkjpx7vp327gcii";}
-  {name="krdc";value="0ikb0bmcq8zpmhr2jbyg40ihjzvi1zfkhcf6y76yjsifzx5nkxaj";}
-  {name="kremotecontrol";value="03mwsl79ljd6zni1ijxbrhl4pm7l52dxdjr5456avx6pbp7rq8j7";}
-  {name="kreversi";value="0r66kj0lanj54ajk1fdn6kijsq412gknva3i29wsvy0hlg18lwgf";}
-  {name="krfb";value="096a61zv76nyqkh9cdzjbgy62g3vi9a7xiwkx0mw63jpfag5sqws";}
-  {name="kross-interpreters";value="0x12cl1hnj9rfasivs3j1m15lr5pmh65bm2dghcypzffs1h4m17h";}
-  {name="kruler";value="0cv3qrs20qckx3d4y0a5ciy6n3hnlxhi20ln9m6szk5nrqwwf8hv";}
-  {name="ksaneplugin";value="02kdbnalq6jfkvcj0dmiyp6hijm8jjl1wl4fxd0kky0wdpj25mqw";}
-  {name="kscd";value="1dmmjzphxy00yynvmb238s60c0xjb9arcyjnynm1pyz8gwbjv370";}
-  {name="kshisen";value="1rildx85ajl14j7qhkwfv3ddyai2m3d2mf6d4i6hd4f6hi01y6lc";}
-  {name="ksirk";value="1rzihjagj78lxyprhzrixk129wgn6v9zacbh5ash6mfgmvpp28fq";}
-  {name="ksnakeduel";value="0fi32y79gjnajswwb5ldkyk0aap1cbdb7i6wdaskpwjh7m9xgbqj";}
-  {name="ksnapshot";value="162rbwlg16b0lq436rsmdaljrp4na0c7hsviw8mv989ylm7k78g5";}
-  {name="kspaceduel";value="1k228vhlv1fglp4572w7li3dvz1inn9x08rqfm167qisz7lz9gk0";}
-  {name="ksquares";value="0i0gw2dq657p3nnlp7billnwlz0jynb01bd3alis9b0y7fzr8141";}
-  {name="kstars";value="1hlv4x43asrz0kha7sypw073zpnb0z1mmwxqsjm7rdb3fzr664ca";}
-  {name="ksudoku";value="1ym6q32jlh55q4af622mq2x4q7ir61h54y03i1cwwl0n536jarw3";}
-  {name="ksystemlog";value="1lipz5ijw90zifvcj8j5cbm5myn3j31v0faik352dy552zbc69ld";}
-  {name="kteatime";value="0nkfshr4gh71yvb4fn3zv99mj8ywq98fmzl41pc8g7zb78c56min";}
-  {name="ktimer";value="0bfyhxcnz4cll3al5sqjiilhhy0wckvnsxl1j9v9cl6fj0yclccx";}
-  {name="ktouch";value="0j2qxh2r1pasa86zakil9hbw0vb39qgwcmkjkds4mgd1rdx3z063";}
-  {name="ktuberling";value="0imb0djrsi3b8aasyycalv7b6r42879053h9r89bq0vr7frshza5";}
-  {name="kturtle";value="04739cjbc8hnhjmccamiim3nhm09jpd5398ckwbqa7z1jrnrfglx";}
-  {name="ktux";value="1dkcca00s2cxr9kimqm8vlar0d47184ba0miihipgi7p752sik5a";}
-  {name="kubrick";value="1f1sfr1w66b3i4pi7b8y3wbks5l2dxij4azx8dzracanfraymhs6";}
-  {name="kuser";value="1r1ysz52w7v8nhl4qj9b4aybb7q45qav9yyzdqxjlz3ixvvvyndy";}
-  {name="kwallet";value="0a5009qx820nfbdhcmwvzbda3bvdmjzbi9i5d05rkcbmxz7l3i7v";}
-  {name="kwordquiz";value="11rhwmzn93gilwlgjmh64pbmmkxf4nxjn3sg8plxnvfnjl27dlwr";}
-  {name="libkcddb";value="0jkblif31r3raykhl69c9mjircsdwrbmzdjks7ngwacyfng2ys7l";}
-  {name="libkcompactdisc";value="1c6g1q543siyk8m81bvxca4qv6pnfjxcmv5mgpnqsv5lbi0k0dil";}
-  {name="libkdcraw";value="1bi0ayf6sg93hx30k5yvblv3jfs8ba6sva7fig1xwag2a1dmpbms";}
-  {name="libkdeedu";value="080mmb6spbr9gyz16n92jai8hv13kxjqgnid8qmgzvrkl9dr5zpi";}
-  {name="libkdegames";value="07324rsyqszsjgpybpr7kpvfpkmg61c4yaaajfr0sbj5a0flypn9";}
-  {name="libkexiv2";value="0rpqj634vxffz1498m2vbjhndc3xha06b4w79wv9qlqgcsaglr9c";}
-  {name="libkipi";value="0har58a6ir3cywsl289avblpqlc67ghv6bhli79nhplblycaf56k";}
-  {name="libkmahjongg";value="1xz4x96l0cim2mcjk9ndikzb0p53i6nximmiwji5ysk9k9ijz8l2";}
-  {name="libksane";value="1wydrqjfczb6c37vpzzavqk4n4fxlg7xfxm3qmg90973z9mhndql";}
-  {name="lokalize";value="0ikcq18jsnk9iqf1636c1llbs43dcbv6pnanydsd8m7pp2x8wd77";}
-  {name="lskat";value="0ld93jvy7w6zy3jifwhb2cvm4qrylknbkgknhxcycq7vxxi1nd1r";}
-  {name="marble";value="0l32r5hbqzyvx85xzvphkyv8fz0ar9l6yyql01y54p9q7g2i0wvy";}
-  {name="mplayerthumbs";value="022n2mi1mkc6isc06b1w7q10k4qxgmvjdg9inysqnyw25zgzqbk0";}
-  {name="nepomuk-core";value="1a08gv05lql1jkkng655k8n4y9bxivaq3j6i9np901calr6q7vq6";}
-  {name="nepomuk-widgets";value="12pfyi4y64p0xs62ax18mbkwf9gd4gn0zsih338ryf2zdpw806c9";}
-  {name="okteta";value="0pg9i7ywcp377brrprl93ayxjjizdmyzgw6fx3zmry7amf45dw1z";}
-  {name="okular";value="1kgkvzfwcqc9v18qgm9vm36v9svasdwyqgbn70nxmwr7rmkvzpsy";}
-  {name="oxygen-icons";value="1m0mha40zg03jy2nvw1cnsi9li8kb84hq3mdr2839jd0qwf06rcs";}
-  {name="pairs";value="0scqagvvp0aaa5gknl5rlfv49r289mgrf5ll0sqbb7w2ga1z71kf";}
-  {name="palapeli";value="1qw6cn7qa5p918x5hhl45c17firyrj3llghd808k9jn0azffkn2k";}
-  {name="parley";value="191ql9jc7pib36ndrn3dyz7h0zqa1a5z06vcppcy56adw395khga";}
-  {name="perlkde";value="0x9pf8hjlnii6kh6jrli8p1glqmnly8ck5f0a9jllx5ylc2v7xgy";}
-  {name="perlqt";value="01wwnpkr0rafmp4lqggpnnzan4abgcbdkf49dzvzf202ksyc7i4s";}
-  {name="picmi";value="1x0gx8spda3m4d8gp3dw4wrjq9plya17x945dd3xww5jb537k9jg";}
-  {name="poxml";value="1icgyilfyv3kfgqnx81c0xfdjklx8rr8xhllqlgh5gpr109ib0v3";}
-  {name="print-manager";value="1bxkf7lfg2bvqy655zd22p1zsj68zyw95kl1xgk2fsbv4p4d4s46";}
-  {name="pykde4";value="0x2zx012n3ng7cnbwv6mjjy7d5cpxj0xicnnp5xpd7cqmi2v4k8x";}
-  {name="qtruby";value="0vbhfynyc0bffr76iz2jfxn15l1nv95g8y7lr9iy32ha84bmc5g3";}
-  {name="qyoto";value="0r8q9hwinac1bk0mvym60s9fwx7ahdsc80mk2a7i9bns5fpd30x8";}
-  {name="rocs";value="16kk54yqpx94cvhkmxvclzkz5w3lfrvcy3mvhyqb0czsknv7hmgm";}
-  {name="smokegen";value="0v1adb6qfmdpvw4yimq8dlxw8zsdbjdw0viwvlxbmvaf4an5kd3y";}
-  {name="smokekde";value="00rw321lcm0by0p8ij60kylg56nrpi0y3j0xj2ss10k9cr13cgwd";}
-  {name="smokeqt";value="116avrlmy7k3ihc176rjl81jlzcp9jlpym1j2cziyxpzygki77ip";}
-  {name="step";value="16vzcw16hqifhmscvhdrww0ykcim8bw271xbqb2g75rf2dcl1zvf";}
-  {name="superkaramba";value="1fx5qwmd6md2x8zxn8xqnildrcxpwlrxbqmi2ia4qm7ivngpdsy4";}
-  {name="svgpart";value="0az94772zvzsikm3imdaq7a22c1gfpn0yv2alc5nk85sa7yl3jzc";}
-  {name="sweeper";value="18nwfrjpdczrmm5ckr64vgznz0nfj53lbwafwyzabp1d2wbvp1r8";}
-  {name="umbrello";value="09pg5xng1mgfvna5kdl4wbfc38b4wrswfl48kdmskjk640p854z7";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
deleted file mode 100644
index 04a65cc08c6..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/4.11.2.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="1p31vayk12pfgrx5bi0c7kiwzyk1j84b9cssrir63amfxa0gfqm5";}
-  {name="analitza";value="11bwyfqah01riilrl73b9aymd8jqkprch60fi7ya5jvz385ngxzk";}
-  {name="ark";value="0cygijr642xhrrd1a74nzgidqlb244xnp9na3ry7n49rxni3bm1n";}
-  {name="audiocd-kio";value="0a52wp0hfnw24asyy6akfnyyb1hfkkzfiy2fml7zs9pqr1knxbq1";}
-  {name="blinken";value="0wc72gx141id6h35z2lhc762yp2mi4j3bdrhlsg05f42cz0dyzv6";}
-  {name="bomber";value="1zszxy94gbzdq1jddfglxcpk3d7ly3cn2hmllblhqywx9d2s8app";}
-  {name="bovo";value="1fr1hwpcqazh5y39wgahydr91fnd0rbrnwv2ajaq8zzaqbqqkgqv";}
-  {name="cantor";value="01i2w42x606yrcrr4zacalw8rhwjczij0vfdmkqsr27dvnpl64fa";}
-  {name="cervisia";value="1iln0p690kd40anpq26snyhb1d2ql3kz89y05lbgq14n9v4iriij";}
-  {name="dolphin-plugins";value="0d386hfynxqgmcizqqspzi7lzhlm2nwz0agm7iaw6xl26xm0h5bg";}
-  {name="dragon";value="0jnqnskf4g93fd6mw5b11mp5006yk7p0lshbnglrsnybznh6q2k5";}
-  {name="ffmpegthumbs";value="15hcsglcwqmwhdnp0i8d3slr4k0j94m57baiv7axn4wpbsss5k5n";}
-  {name="filelight";value="1npwgsngqk01akzyny2x7f9c7j092c4vjfmdnm2g7hm36q2gy823";}
-  {name="granatier";value="0bclrsi6999xcsmksbg280mvhszxdsr3f5cyzsn5yahs3k6isf2j";}
-  {name="gwenview";value="1qq827b1dfqx5xybr8bjs9ch7407ix6w47iryrbs8vs3k08qw8jw";}
-  {name="jovie";value="1fq8vihh7v19wmwfgxg3m6qi4730wj12m9sv41c7nwdqz3c0gzs2";}
-  {name="juk";value="18lyw6w7z2f72j9madg9rksafj1dpz8pdc09fby9gvkwacd7qsab";}
-  {name="kaccessible";value="0swzpk3kfrc4a3bf9gf40kh8y6nyd2qhvnxxsv6m00m701cj73ar";}
-  {name="kactivities";value="13iz2d2l7rn2d9q5c3mg4836mxgnds83cy2ll18r82bpp59qj4nx";}
-  {name="kajongg";value="0wvdf9lkkiy07dhwvmamz4gginq6ljy57swp4j4z2mm8m3x9i071";}
-  {name="kalgebra";value="0p2k1c710j5nsvb218h3mkbymsd48y0yw09ijx16cbdwvka7mpag";}
-  {name="kalzium";value="0mflvnb3nrrgh6h172lkhh0mxwrpdwcji74f8g6kb7xpr45ms21k";}
-  {name="kamera";value="1rybwccq3q6q0xk9p7f4clx1gf73fqzl69dx99q19wfc5y23pmg9";}
-  {name="kanagram";value="10vdkva83kb8rk6xaxcv5lgdil5wnz6i2bphz2c029s4vm8d2i2n";}
-  {name="kapman";value="0m5mawy3bjp2zd3jkylxsw4ccwzqg8lqd2v9i07zzf6f9ihjqs6r";}
-  {name="kapptemplate";value="16w8lrq2an4iwrss81fp0jisd52v2lwbvyam93cwxfcp4bsbzs9y";}
-  {name="kate";value="0n6jnfwprd5xjyja1dmja785swxgxnpz769xbg5aylnr1rsldzv2";}
-  {name="katomic";value="14rrnm6qf5lf05lj9d2zalrv5npj4hkng4i68y1svkgjl8p98j52";}
-  {name="kblackbox";value="00n3n011cnspdh606aa3scxj388vs3j1bamhk6bxnhmc26gbi54b";}
-  {name="kblocks";value="0l080dqdkqqqn1927gnjzbp3jqwladw1qmkx171291qxa0x364x0";}
-  {name="kbounce";value="10q1821wcnh4xggrndgvsm4dx6hyx4nll3f7blz77cga8fvz8lbw";}
-  {name="kbreakout";value="1xhnmlp2f8a0pmsabsw0yc53i5hcxf1bgid1ffbbgsr014xgqmmi";}
-  {name="kbruch";value="1rridi7lv1izmq68ymjmmm7mvyl3bdnkxj84dxg97yv91yqjx6ys";}
-  {name="kcachegrind";value="0crsb236nay9c0r49hgmiysa9bqwy89aj1avh3sxh82b7dsqmplp";}
-  {name="kcalc";value="0mw77vw8py0xnvkx43lvfzkghwd974chiszxck78iks2m12vgnpz";}
-  {name="kcharselect";value="1ys31fx7g85xmhia05s0i30k1jf1in83hnwc568lsbzvw37adbim";}
-  {name="kcolorchooser";value="0cn9n82kk08c55sy1hncpg5pjzlinkgvmii2p5gyp28fx4yphh45";}
-  {name="kcron";value="05bgwijfcpk56fkmnfjgcrmvkr50j1p524xg8s7zjxsdgib4p9xs";}
-  {name="kdeartwork";value="166fm27iby4gjk8f8zbdamwzkjh5wbvhfj9wn0pkp2dm8l9h8lq2";}
-  {name="kde-baseapps";value="1kgwgrn73x89zipkhq1irs09ka9wi8hk22daf16c4a6hbpinl24x";}
-  {name="kde-base-artwork";value="076h9sl1gyn6c2lmslig9p7w7m049bna9l8wv5jllwssm8i83ccg";}
-  {name="kde-dev-scripts";value="0dpdpc24kcyihgqqypqrxhmfwsmhl9ffim80n2rsdp3aka4y10vv";}
-  {name="kde-dev-utils";value="1j77v0d706ic9m008apqwc1287ma47qmpbv07xv770i0wjh90pl6";}
-  {name="kdegraphics-mobipocket";value="02dzr5lm75p6rw7k30aj5m296h8whxg1shrv8s1pm7ari2660d50";}
-  {name="kdegraphics-strigi-analyzer";value="09cnwvmkjyxagpb5sqgcj69fr496wb0pn4xns65yzynv0540hkkd";}
-  {name="kdegraphics-thumbnailers";value="1fs69zih92dlm8l60br0c0nwy095hsnszdyspdkmz52ycznmzk28";}
-  {name="kdelibs";value="01nzkrmvv8pa4x7mq5nw0z6dasm668q37mhdgvkg1hk7i57w98z5";}
-  {name="kdenetwork-filesharing";value="0ah9v7vvpg8v8nn59h168zn2gaajf39ha2617dyicknc4gn9rsgk";}
-  {name="kdenetwork-strigi-analyzers";value="1iwhr1ckn06z50j1fq9ah15gni3am91gyhyi0f21jaqdigxpi3my";}
-  {name="kdepim";value="0gs06h182m74fgdp20z3w4h8ib5xm1h0i1asnwy1s61gvpkcm63h";}
-  {name="kdepimlibs";value="0kxnczl97wavm3c75wmy4yjw3vbq4x0jdkbk611jn8hqj32c3fl7";}
-  {name="kdepim-runtime";value="13j39qbb6vgsfhypby994pgwlmmyimmqvfri92m15l0ir7rqgfwm";}
-  {name="kdeplasma-addons";value="1dy3gw8z18acs3dmw375jv9qnxjrdwzzgj2p164icid7l2041n8l";}
-  {name="kde-runtime";value="1w4xav8abgqfj943iz2gjzfdmlnk25r5xj3g79sw1ip1bcvkhpq4";}
-  {name="kdesdk-kioslaves";value="1npqa9wwbgjwlnr24dgprdndygmvsixf19hjbplcnp41dn2q14nz";}
-  {name="kdesdk-strigi-analyzers";value="1b4anyzl3xd8pfhia8s0mbrhlyr086gic1as766ynddjpr6a4a94";}
-  {name="kdesdk-thumbnailers";value="0jmkgmabbip7ymjmvyxdrji7xbplrhcrq4vlq8z0jbnyh9b9yngx";}
-  {name="kde-wallpapers";value="1l4hr5nxvf10yv2n76znrz1s0v7xqppipisc1ffbfdnf2l4wrw11";}
-  {name="kdewebdev";value="0gp1vm905p0a0j4h1lakj2zxfm4c78898rl05yf04g9x25yj3mbg";}
-  {name="kde-workspace";value="05yr52xq6w1j2kc4n5wan5f5c7xbcnaad7sdhfns3alg1grlc3i6";}
-  {name="kdf";value="0nblxiav3rw9zggqxpawvknadxbr601m55535k3gzpg3a4slk7nc";}
-  {name="kdiamond";value="0w0fzlpvj98ykvvgyzp8hhkn20pyhxc1c8krlagaqxncv1b7mhcf";}
-  {name="kdnssd";value="0q74myd7shrp43ny2vm7hadr2aix1v35v0hg6i99z7rif9ai8yjh";}
-  {name="kfloppy";value="1w1qiplcnbq10qv4lyjx521adkcg9w7z372w7fi18hjv93ryliis";}
-  {name="kfourinline";value="0irghbp7hsrl7bhi2ggf6rb0p62vck47rmmy6zb30wv32xk9gz9k";}
-  {name="kgamma";value="1cbdxbh57jcz9anawvwybi1s4skcyq84f2r5mjs1xyg2s2fv1l8b";}
-  {name="kgeography";value="00g544kc7hkabk5xbkl07k3h515ac84l4a49853pj2ryrdrikmvx";}
-  {name="kget";value="1mdfrwdf6lm94vcc5m4l7q14b70x2pkd0ham194acd60np8bk5s4";}
-  {name="kgoldrunner";value="0dbhvqxryilixv7ak0b79g8d8a2mbgkp440sxkl31xjak05c1qmv";}
-  {name="kgpg";value="10py9c1z8i1p0acp2lbi6c95gsfhfv1cw5544xp31v5iccrv2izn";}
-  {name="khangman";value="0j13zzplvrgrq8gsn7xfbf19xclc6kvsrzbnbgp83ji1dg168z6c";}
-  {name="kig";value="0ld9g522n361q0h7yvb3zljllbddyglxiamw2hs2svsm7k98klz9";}
-  {name="kigo";value="1rn8pw4jw7ia3dhwx3jwfzylfd4l067qp1kp01lixddfd0ivh42r";}
-  {name="killbots";value="0c0hx61by8n10j3wcpwi6pzbq7bnmpylamj0c1r5pbxm69ljsaiv";}
-  {name="kimono";value="1p40q61p98vz9s4dkwm51p36yk2qx2s00fpiyi1pi73qg4klbc4j";}
-  {name="kiriki";value="0f01zdlpzwlkriv48p13wlg7j2b0dwzhd7hrq35kyb3jzwx1pc5n";}
-  {name="kiten";value="0kk5s3idg5vz59drc65w53fd1l2x4vh593crc7by2dgzsf6x40sd";}
-  {name="kjumpingcube";value="1gdbjv42dryyap3dln7wy3pysbyy9d10vbpb1asxbpn1kzlzlf96";}
-  {name="klettres";value="08h3b70nj4d4cb71fvm3wkgy27vm1aqx8xzkqdgzs2snzb8ra983";}
-  {name="klickety";value="1vmnbfjd620g2xibxfpb18cfdfcksny7rjah4j90cvadcsbg8x3x";}
-  {name="klines";value="10sk0fn6aavdf0df1xw3p0nbwv22ccpdg00xv7h8m4fk43j04dvp";}
-  {name="kmag";value="062kl6j150f579npfkv7jm2b9zih0ahfpzbpl635fz2av2aimm8j";}
-  {name="kmahjongg";value="1xikbz840dh57rf83af0jnmjb9q4ggd5801kiqkq6lkp413iij23";}
-  {name="kmines";value="0ijibp21f6s5l55m2zrcdz2a8xqjk22na79rc0wsdps7pmvf5sfj";}
-  {name="kmix";value="0md4fqv047g3s9bhr8jz2fcwq1vsld2jfi8j7cg8b8bh73kd2fbq";}
-  {name="kmousetool";value="1x8vb0hjmx6xac2602iaab93ha2nfk8i0y67z48p6i7s2n3zni06";}
-  {name="kmouth";value="10ibhgz7mv4kaiyl779h0qlpwgx4s8flsh0850if06mhdxjxld2y";}
-  {name="kmplot";value="1cy9qi53ivb3zy1lcb35ivh42yvj0gikr8m7j4nlrg4xy93gjrhd";}
-  {name="knavalbattle";value="1nd2z8ylmqcj515l3llbq2crdlds7qidni8ja24nk1wf5h4k9amp";}
-  {name="knetwalk";value="01jjal03srn55mlb11vkimgh1mixdwxqi0vh1s56hd894ssn0hgh";}
-  {name="kolf";value="0nsy2wp3fwing3hkwspjm4d8swhzamaaj5x7k0jyvcqcj93sgp1g";}
-  {name="kollision";value="1vz313lr1bp7crfnkdfvz5c7dynsyaqhv1pm6fyjv6ribv3dh48q";}
-  {name="kolourpaint";value="1k8kggx9ljkms4q70m38xd8a364nkynhkqiz2h1znr779sfqy5vp";}
-  {name="kompare";value="0kp6xzgbbhxxspmlx86f7vhn34iknvspjpniaxqvadrfi6xn4801";}
-  {name="konquest";value="072nvaxa1yjaq16095xkla3lndyfq2p801wc0r0m2imc62f30cbd";}
-  {name="konsole";value="17m68zq97whybvixgjdaz45d91x48aw7ijkzfapml7fldpf32bqw";}
-  {name="kopete";value="1q3825fl5pbim3rfi9s8k5sscvbwdacy00rkww4jdw8z3xxsriqj";}
-  {name="korundum";value="1iam31q7cf7a9yxx1i0gnqhnm0262ns8qpr6h2n7cmzkns8bckal";}
-  {name="kpat";value="00mlmqbm0f3yjm89vs91l0rc4r9lsvh0qq59za43rkg8j2rg5nmz";}
-  {name="kppp";value="0gxnd0p48waz0nz4inalyk52xvbhyd3w5m08p1q2a7ssczvza2wp";}
-  {name="krdc";value="1s8qm8s6gxfpdgvh4zi7svs48fnrngj7hxkyp1fjmksaczffrfx1";}
-  {name="kremotecontrol";value="1zjpagr0kcmqsjg4sswqhannc1rix242zbikwzs7jsbq34qy9fg2";}
-  {name="kreversi";value="1ylimga3wqdam1207c6zp1r0aqmqnndldd6y2pazqgk7wcr5z8lf";}
-  {name="krfb";value="0gq6rnkprk98ylnrispd66101jb040p8m9fcab9n5v2g4lvxzcia";}
-  {name="kross-interpreters";value="1njhlscnsd0v7jzzdknsc8nljc2xz7mbxscymhdafbpmjd655sdg";}
-  {name="kruler";value="0z8krqp9gy1n6kqk5slig9f4f07ddqrsbn6p7xqadrrs5a7g4baa";}
-  {name="ksaneplugin";value="1crry96ca3pk25xwnpm73004srf85yq3xpbwc1rr3a7xmniqglr7";}
-  {name="kscd";value="1ix0zdqk2bfmb05j3cwf55kz4sp4krx75wpfzsz2yf3dz047ylqp";}
-  {name="kshisen";value="1hmv7w2mb6v9rqhifns0js592m2m7ys9fsnrdxiv1nzkcbl3xll7";}
-  {name="ksirk";value="1pjrq3v1c0sk5r5hdk4rlbs47wwmsrds43ascp6p4rxvbagki99w";}
-  {name="ksnakeduel";value="09rl2j6pwdhc8lcb2dxh5l3zb0l0iz29b76svb727sga2y7b85qk";}
-  {name="ksnapshot";value="0n2xbqkm34bq8mgpycfyda82v3c4h07lcqvs747aw95kkydb71yk";}
-  {name="kspaceduel";value="01dshprsrwjgb7pgxz2razyxi8yi1cmnalyxflwxqh2zd4xx300y";}
-  {name="ksquares";value="195c1wywm70zwd4z5cqv4xk315xrpkkbwq2myiyxa0wshhiz31bb";}
-  {name="kstars";value="0xl2vpkxa66gd3ycl092lvnk07fw3phlcp4jmpcby650xvp7h6bn";}
-  {name="ksudoku";value="1gi5xr0x9w13skvs8dj4lflib7w9xqn2xr6h90mbncg5c54wmlqc";}
-  {name="ksystemlog";value="148i90y6gc1bw2128xmb56lprmx80s0024dsd4xknm7fw8mpycdm";}
-  {name="kteatime";value="0cgqz9py80grv7sf8k5mixfl5vzx58g93flv409f7nbpia3fjr26";}
-  {name="ktimer";value="1ph38xw1yhqg65y9dhgpgzls4yx1y025v1wv5wflmcranx68a589";}
-  {name="ktouch";value="0n70611cccp09dy8r0q4n7k3l68938hz0xkvp9ik58bnfkn57fvh";}
-  {name="ktuberling";value="0zfp8ynxxdys819gw7dnq6rl9l62dpfz0hvcm2fd8bvjwxrqzxrm";}
-  {name="kturtle";value="1ciwmgd7x0223d22jzqgr7ginaf8c9hi4zlcsl3s7i87hd46878g";}
-  {name="ktux";value="0njz3icalh644kfcnlr4nmdsavkvsp492ig6w0ryr43namqbi0fw";}
-  {name="kubrick";value="07rkhb4ms8wdcny163z0ffavx3i1z13kxmj8xfbv3jx3nbcr33p5";}
-  {name="kuser";value="0avxd71zw0v8qirflpws1g7dqvs6hkpqxi89zfrvcsb8fgcqqvx2";}
-  {name="kwallet";value="0lnv7yd1ig18dmkxanmkwnz6w28p8ak8sg1rxic07g50qni4yk8g";}
-  {name="kwordquiz";value="03qxjm445jynw41wva8b86kigda2q828p0vkz58ymk8ibds74jfm";}
-  {name="libkcddb";value="0hz4300q0hhmrjd2ackaxbvdg9j51bc2fkcndw2d7wwvqz4a1am6";}
-  {name="libkcompactdisc";value="1jf0ivcy7mv3p7xcbigffmx2sby37ainjw29cp8yv0qgdwws5pm3";}
-  {name="libkdcraw";value="1y75rm55s8407q4qglndf28gix0niq0ypa9g1jwf2c8fpmf7ffph";}
-  {name="libkdeedu";value="1gd0jp85qnml2nlnf554mm9yszjkxgs9jqyi77vrhhp50bxkwdbv";}
-  {name="libkdegames";value="12590b023cjjix7mbd6flhm419w4j4zbs83ar9sihlwj6l3fzs9z";}
-  {name="libkexiv2";value="16jsd5ip4179cs2hvwqvb1cbrl5z06zyr9prr269rg11i8rjfjai";}
-  {name="libkipi";value="1wsmci2rfrg8jw3scl14cjx4q616lbmvlzjs6lv2dza4cya4jqvy";}
-  {name="libkmahjongg";value="1s4gzdygrpzjg4rxkn9ndgaj0gzj4ss0ywpd1rv5nv8iaig42cah";}
-  {name="libksane";value="1hylj10pqr82drw9b9r10rwbjf85fx225az2ha7zcm9j1k170n8d";}
-  {name="lokalize";value="0d3sym5waf1nivwksqpclwj9hxl1fva3h0hzgsmgg39qbnanqg4d";}
-  {name="lskat";value="0m47kb9l830d5798xkx9h6fx3ng59zlbji8pnaj6m53q0yj7n5am";}
-  {name="marble";value="0r27nmbvgxx4w00ii926gkxz2ilaa1sja02q62jhxvm01rp1kvka";}
-  {name="mplayerthumbs";value="1a58f66mpzngd558336h13vzl0paj3pbl4fna1vk34fzjz0ldsrm";}
-  {name="nepomuk-core";value="1l14a7hdbz7ap3lidj8acjvkxiycld4wspcw5xnd85pjhks8fcil";}
-  {name="nepomuk-widgets";value="19g752h1f4gz3208ynprxp7nxnbjgis99016lik8f9179n6mjygb";}
-  {name="okteta";value="1hwpyb9g1fwcsl713g84za62qjissmjfjhw2jvd2x08lrjablvvk";}
-  {name="okular";value="03jw7c3h6708aisk301nvfnp0vih3c5wz928zmh54h1aslfi4c3k";}
-  {name="oxygen-icons";value="01f9xkpk8fgj2ccmbrbjx9z1gxqnj4rrvasxh575lcvknnbsf6vz";}
-  {name="pairs";value="1zp89sp5qmllbm9qqzcwf90cy5vqvywki2yjgz0gn2svp1629mmg";}
-  {name="palapeli";value="0kbi61jxxyg2zzjxhjr0m14p1k04jfv212gkj6ic81hrwzjfffzc";}
-  {name="parley";value="1f266kvb0fzy3gxv9fzq59aikz0g540ydbzvr51hlvlra88sjj47";}
-  {name="perlkde";value="0gm9wim2llyglnzxqbgy0jzj9ji3p683zbrhlglpxpd6wh3ady1w";}
-  {name="perlqt";value="0qxad4m6iqc26yn8nsa3g24xr84ncrmhwhz95i2jzzrbqawwas3m";}
-  {name="picmi";value="0nlw3lqfck3fp77n56qmvlj3p6rr60drsq5qxyrrl3scw2dlipq7";}
-  {name="poxml";value="0vjmd1r90l85xs9sv2wzd1vdml6a6fh0ipzz7zyixy600lqgxy13";}
-  {name="print-manager";value="1bw5w8n4wwggib1yrgai2723fwnjrr3wbnnxn85j7bpy3b84cqfh";}
-  {name="pykde4";value="1ziq3nms0bvpnsl21pw37bkimi817jx0mmqsvf5xkxppx7f622cy";}
-  {name="qtruby";value="1pyz2zimw9qz8b5nfmzvp0kzsq6rvbwv0s9kxgh7i2xxnh2mj4gp";}
-  {name="qyoto";value="0jnchp7kdskm9nc533p7bk8shy0i57dcivrmprnwyiy4sfhd4ldj";}
-  {name="rocs";value="0markia51c5a8ggxaiy6vccpdzlamy7md5jfx4jb79qp8hlv2dlc";}
-  {name="smokegen";value="1fgh5z2gwyjkgk8290nx747bj1iaj7224nx3ad8qra9v8y6d0w3d";}
-  {name="smokekde";value="15ci2bs141nbkk2f209rbdacxfdxx6ncp5cc9gv7if8sm708vjy1";}
-  {name="smokeqt";value="0wmzrr4fslam8mxvl90iyikyyipqlqf7zdynxyqr7zxlc421clyz";}
-  {name="step";value="1a2v99k3v0ry5iwvl4cza5g7sqhib78nx0p5r369fqvcbn9mn0wz";}
-  {name="superkaramba";value="1mwa1ggagl8z2422gyilcvb85sgw5db58k0fkv3jcgfi6mx3sv3a";}
-  {name="svgpart";value="1ma4msnky3civhnx0by6hy4ysi8nhzssrsabnj6hg96d7mpnjvqw";}
-  {name="sweeper";value="1vgg21ndqbba0il96x01kcy8z242g0f0lwfqgzs9cd17qx05056s";}
-  {name="umbrello";value="10q4lar55ad58cl4wnmmvmyywm5xi7gcggrfblll8j76mw4dkyda";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
deleted file mode 100644
index 17fe253dff4..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/4.11.4.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="1ljcsrvd2pdy0swvlc0rpjh39bvash5qwszx0lpc9v083jg9cwym";}
-  {name="analitza";value="1h2bcllpzlkbgxi72g8g143zk06kywgy00rcn5mypsy35b3ka70d";}
-  {name="ark";value="0q1g5kab6147pdw1mdwr2rkmggrg1x3plw9y0bny1xfvdlkmm1aq";}
-  {name="audiocd-kio";value="05a56m059awii6gk60dphb3hwi9zq5gd38i0gdx2fq9ns8a5k1qd";}
-  {name="blinken";value="0fhfy2yvpgcfjdjqq85ws2vddhbv0ljp5gda3x7i7lv730vmhvcq";}
-  {name="bomber";value="1bgpvd3kib6p7vwkkw9al1qd2mcxl8rv2lzw30d3a0mjka0a31x8";}
-  {name="bovo";value="0yb1fds74c803l932nmhs00gxqa80rcmnx5js43r60xjca8i97bf";}
-  {name="cantor";value="154dxff6yki487hy4xy301swm2j9wiv9ql6fhm399cr54yx595ix";}
-  {name="cervisia";value="1v2h0awmlnvjzyaaqkix4mzv3i63qf21y65nxxfvhzv29imqbx29";}
-  {name="dolphin-plugins";value="0jpmc93w8z1mg5cxxppqzkkr9mz5lsd1nsaflvmpyyrgvf81x2d7";}
-  {name="dragon";value="0q2b6f36yaqlbrpjq5h89d8igi270fxipbhj7dy8f31jbyiyrqk1";}
-  {name="ffmpegthumbs";value="175r16jk0sps6144a5d1yan3m6fyargcpa5pk05g3j6fm9z5il6n";}
-  {name="filelight";value="1wgzpcq11znw7gxqf6dv0zhiyyljax9cjglsg7hldrpmpcv36ry2";}
-  {name="granatier";value="1830bp4wb2dsqrh5wlw5si5k9aihv2sgv76flpksdywzgp35nsp6";}
-  {name="gwenview";value="02i8zkb93ribn2kb2f9yqr2ldgr5qzc9lsfw4iyzjbnsdssww0y5";}
-  {name="jovie";value="1qi602477f796wf27b9arhkl4lxcwl3zdr3d5ma38x1zqy422zcx";}
-  {name="juk";value="195wa7qzhadal8pqy98lsxivjkazms9bg5vig89q281p5gf675rj";}
-  {name="kaccessible";value="0mj1zfrkq14yi1sxg3xyq234rfq8ykjmalkbn4a1fb5prvr4x9zp";}
-  {name="kactivities";value="0xhmmam62pgw1f2sdgp7yhf8pxpblcaf1jrclfr0h3pjigghvixi";}
-  {name="kajongg";value="1ag5xs842923y347k92x2phbj6rjmzfpy8wxsqhkygw5bi12n7sd";}
-  {name="kalgebra";value="1c66ad47m94lb2qrn3cas8g194sri79xzx8dzprj7avc3659n3jh";}
-  {name="kalzium";value="0li8dip02hr22p0xrnhqlgjqrqmanyv48cpfd2q6q9hjhqjasf85";}
-  {name="kamera";value="0dcpypb1xzwn2qj2bfcz0dr2ck3falhqa5cgv0sa1lkizndsr9gw";}
-  {name="kanagram";value="1gmk1ncw8sappzz5hr5im4n23fiy628k9wjrf2fhdlrfin1qwhrn";}
-  {name="kapman";value="0pnxnql2vc88rjbgz2zmacwxv8nipfdqlaldllnnx0nzzv8y5fky";}
-  {name="kapptemplate";value="19n4dsdnsk0rm7xci43jmxxczf699nbslk5sqgx7ymrhqwjad647";}
-  {name="kate";value="137r2snggr4lckqdpck9m9lxa97ldhdqm5y1hs7gfnpnhkjhb1nm";}
-  {name="katomic";value="12096dnqyz41sf94w0ywpmwj1w5idrk7mbi0k18qjgbm9rqmapc7";}
-  {name="kblackbox";value="1qjp86lvbjy1chxik3v5m6c90wp86qa8vvpxiz87yryb3zzzrhmc";}
-  {name="kblocks";value="0vwmv5m2zhdagc5vhdvp8jkfnq3r6ls02a5r5k6m2vl5n5a9mi9k";}
-  {name="kbounce";value="1cy7lmx1viqwf62mpi137wsx2haqclgxccsdp5gk8xa3s9r9s08d";}
-  {name="kbreakout";value="1zf6bpdyq5qzzz2xgmprcfkx7jdg153skb24vr44x137sj8mhmb9";}
-  {name="kbruch";value="07w1isaddxs2vv5c92nskwfybh78naqgc84wzrfcand3h6bl1s6y";}
-  {name="kcachegrind";value="08c17i6mk50n7nw9b5n7hc6kgxr6k30lr79jxyh96q861ynlhsqm";}
-  {name="kcalc";value="0lj33rxcj4zb4bmdhz4gwmmakj8kz66bf97rdid4r82cdd1hyjj8";}
-  {name="kcharselect";value="1ghpnwv47yybviygrz3adjzrkmdwnl0qbljm41d0s6x5583p1dvd";}
-  {name="kcolorchooser";value="0951nnc3xlp45qh2im91xhnl7w241667bnpnr6xk4p9pn9h979ys";}
-  {name="kcron";value="1rlfyxqg15r7naqbcwgma7z2vwd6dn95fr4sr3pb460bk9pbpgvi";}
-  {name="kdeartwork";value="0rpipr6zvywr6fipz8m0bw7iik9vrxslbnnfjy7rf45ywkbz7rnz";}
-  {name="kde-baseapps";value="15j335pnswjmwcgcgsdxpkmdw6a6pskkk290j9h8pjrcf1fnwbfn";}
-  {name="kde-base-artwork";value="0ics2inh6vc5k06rfgx8nw3xr782s5r9fj9w2xvd4ynj87mswr0l";}
-  {name="kde-dev-scripts";value="0fkk70c1q7icsds4b99kk4bwxhldy8m7k829d2n659vi3mn0pw98";}
-  {name="kde-dev-utils";value="016899rkw5imqlr1n25jzyl7bm6pg7hfdc13i81ghglfwrzqcwsv";}
-  {name="kdegraphics-mobipocket";value="1x0h9hli509a7fqwy8zvccw8cnxfmaw1grnf6c8iy4fzjik1kimv";}
-  {name="kdegraphics-strigi-analyzer";value="1qpiydbqxs6xvwdad6w5k2kjx22ldy3lz3fl3afahgi038a246a1";}
-  {name="kdegraphics-thumbnailers";value="18pn0r7s334jy93ln42r0ny52nynlrbqxr65z1gqfxxh6bmf1z67";}
-  {name="kdelibs";value="1v9d0r5a07fsyrnrikwgwvh64p1gqx3ch2makl55qqqyzyg16lnx";}
-  {name="kdenetwork-filesharing";value="1y5n2bvx3p5zcr1615avzlcj2jwjw9g3ah6na99anyk14j1x8pnr";}
-  {name="kdenetwork-strigi-analyzers";value="1zymkbs4hd9lxck8fylbdkvlcfdm37g3a42gnfi7pcyqc7mv8az9";}
-  {name="kdepim";value="1rk35yzf0pm6bmnx4fjd2mw6wrn1fvllnqqrg5s2afz6v4shc9b4";}
-  {name="kdepimlibs";value="1lc5ly08drsaa198il44cbnbwrpzk9ci6nwks2gc8p93rrqd4siv";}
-  {name="kdepim-runtime";value="0bxjh2xcp46xnsk71zv22as7qyz393ri5mvshg2nam1jfs3fw38r";}
-  {name="kdeplasma-addons";value="1zdya555q7ljpabsggw23l008fy1q5sjpaphcr9jb4ycyhk879fc";}
-  {name="kde-runtime";value="05nd0ir5x6i2lkh4xhkmdvqs5rfy2bcj6ib6a9nd1v6j2v6h90dj";}
-  {name="kdesdk-kioslaves";value="0bdzm70gw64yab3wi35xri6nkkx4vf5b20r3056z6gys932wzfnp";}
-  {name="kdesdk-strigi-analyzers";value="026swm6mq4dzsq5a38kd6ijwm18gvwqq87k58z8yxc8xwj12cf4d";}
-  {name="kdesdk-thumbnailers";value="1zpakq07zgv1z6imfzpin180nyda1wdaiqjvd8wdl61c444byagp";}
-  {name="kde-wallpapers";value="0mrdgjqyw0l960f6gr6ggjgdw9fhnkv9xl5pf6sxla6jfz3w28lc";}
-  {name="kdewebdev";value="1zk4nnllan06l712scs5pxsy1awb962h1i5l4sf91d9plczdldli";}
-  {name="kde-workspace";value="0vzi0xy17n1r24gflcxfc8ld2qkg77k8isbz94zi9q56qpm0lhhk";}
-  {name="kdf";value="0sagjckmnlfh3mbfrvwxgcmngay6nc3wl3wf5jc5agyhpnac55wb";}
-  {name="kdiamond";value="17xkadf2ycsrd35j83gh2awmf9a5sm814cyz18pcgwjrp6k95dkg";}
-  {name="kdnssd";value="0vwqj5dzzjm4i780d3glnqkl5adn388y48nwazr4dz3kz1ay43hb";}
-  {name="kfloppy";value="0nybxrvki28j01bwdas9ys7m6a549190mai4s5sfnsz1sz3h0glh";}
-  {name="kfourinline";value="043xl0dby94b1v7hbnpsahd5ihgrzp3616zcf7af0icjmwxyqk8w";}
-  {name="kgamma";value="1l1j81zxl2v063wwbvalbvpsjbiq4zvpqfhpfrnp8gsp7s1sn0y9";}
-  {name="kgeography";value="1da95fq7437wiqy77v15k7b9y32d627ghfn16dbfpn1gl2srl6md";}
-  {name="kget";value="0g0yx6mkmz97j7kv9a5y8n4aqrrnr05k42d5jql74s0f1c32f8cr";}
-  {name="kgoldrunner";value="0dy0hx9ksfwyhsz160jlzks5m9y75nffgg53j4bcrzfakhbjiqfx";}
-  {name="kgpg";value="0qh8l99gpk71mag6zy86wjhm9mswy4sx7glxrwbbcqz67zag7ky3";}
-  {name="khangman";value="0452a4di9kbh36spvfaa66sgwfdrj6838h7h7k1g9bay9i7zw1vq";}
-  {name="kig";value="1yf8x2r1qmarqpsqzraf8xxamlgpynhdrl1afl74ay4npngc3dlp";}
-  {name="kigo";value="04jbhy55yb72nqsy9cblj813z33zddbmxv6fgxr8i2avr378d79c";}
-  {name="killbots";value="0sqislgqb8lkqq1gshx7m499nvwwcl5wfn5b6bpvg12azshzffs8";}
-  {name="kimono";value="0bjk8nq4avh0df1i5yz4y6ibgaas7503827dwf8klzns17if54mq";}
-  {name="kiriki";value="0209cjsiz8db4nlb9n77zdj25bi71xfl75b7l2wd64pgwlp4k0f6";}
-  {name="kiten";value="0hb0d5rcwl68vr0ca2vkqxmjx1iz6xjddyxd7fshggv1jbpybcy7";}
-  {name="kjumpingcube";value="0qxaagxg5cd12jjx4sm7mhh2x5xrgl5vsj0h7400x61j3wbr8npb";}
-  {name="klettres";value="04a5vy0qw70lm9wsh6qs3lvbadsa8d3blba9c7xxyxhy8l7zmp0h";}
-  {name="klickety";value="05csnzkb9c396b6gp3iij8m5cjgw68hw8bxqg6sv4gj66iyrymbr";}
-  {name="klines";value="09cl1cyc2mjqsf4p9ws749v2gpailj6kww2wph1iz4l3sgnavi1p";}
-  {name="kmag";value="0mna9a46140qa3y3p19gpif83qik4jgl3705mm8s06qh6ryan753";}
-  {name="kmahjongg";value="0k38vq5r4hr3pfqd37bvb08h7xm54l4kljgyfy3wrx565mq7n5xh";}
-  {name="kmines";value="04fwfsnj1a1cfr6c3h8cq9anvi4nh4kr5xbcc9l74zvmnnl8j1cw";}
-  {name="kmix";value="0wqiqgvf1hyinymwn5crqsa3bd7xv934qniyp8pwhlxk1k2ix6x0";}
-  {name="kmousetool";value="1g643dm8111jk4zq7smlp6hdz42qcmsar2v7y9c9i2a1169r5n1z";}
-  {name="kmouth";value="1ccibpnw09qm6r9nfb2jchrjwg8i5k3shq6g41i80sgpja6ir8h8";}
-  {name="kmplot";value="0kx3ccznqydqyc50sn27b6dswwyalhdhxrd789ac9xx6gpn1vcid";}
-  {name="knavalbattle";value="1lm4393jl45f90zbyvsznln4n7qccl3qw8a1d984ghmqvnx576jr";}
-  {name="knetwalk";value="0v91z2sd3pyrwsqwxhwz4rhm6lc3lr2y8kkpbyqmf8sf4pchfnkl";}
-  {name="kolf";value="00s9p9pxkd3insjs0fxnqcnhycy27wm5isyp4bnaa11i79i4zl3g";}
-  {name="kollision";value="0sf5pzrk10ad6x86wvbmf61jmnpb29hzc21z6l84cbq8iwqpms6x";}
-  {name="kolourpaint";value="1icagd88zvp138dr9l2g5cp7cisry0jmja5qh8mxpidk3ax94d7s";}
-  {name="kompare";value="02y3rlr4v5p6x9x2i0h39x0g1fql893hhyizb05ici2a61ddbs94";}
-  {name="konquest";value="0dg183wmz8b551g3j5rnd591y2sb8ksi0a3cnf8jm8wf3fwfa3zd";}
-  {name="konsole";value="15n68fihdi6fc0hgrk36q668x653y3z8zqfb5zzawpgd2pmnfkma";}
-  {name="kopete";value="1658mlfxaxl67zwd7gl0z83jnp8a8lwgvknxgpaa1nyyn2ygflkv";}
-  {name="korundum";value="1r0dk8hb54wwqk464rwaz3160mc32i7f06ar7k5cg4n9wkqrn9bk";}
-  {name="kpat";value="082kldxd0pnwdcayaww6dkal0imfnsnwdbcsdlcapzjp51i978q6";}
-  {name="kppp";value="1adsa7x8i8xc51a6k9fkqwkrv3rz0iwg1xkjfagslgm8s4iac8ki";}
-  {name="krdc";value="1ddvf4ls6mwmljg5szwqcwn3lsvvpx3pgrx7f0ml5hiymw87mhrr";}
-  {name="kremotecontrol";value="18imhmss3f5azcj4qnrx4jib2y0xx7rdjd4a6s4h8pqmigln6bin";}
-  {name="kreversi";value="0qhfpr7j7v8349kj0avk6qrsaiqj5q8bc4pf58abfsgv205gp3rj";}
-  {name="krfb";value="00z2hrbsfg461dky454xf8ipjp9phfxm8pb6kk0lzakkfzh59zzl";}
-  {name="kross-interpreters";value="1pz5isyb69cal9qyrhih7s5k6p2l2wwk5qiwczhc3h0ynmk2wssv";}
-  {name="kruler";value="03d48bv94l9ff7nli7k5q16xl92b38ih90v1bgxkq8pxl7gq493i";}
-  {name="ksaneplugin";value="0vwzkxqbha1qy6z965s8r1w183ipjz6vqfcxndjdrarzs7mw9ans";}
-  {name="kscd";value="1ari082m0bhn8ws8wl2kps94s7vhxkrmhlzpzggvl6fssa5fssya";}
-  {name="kshisen";value="18pliigc2wg1iypf9r8imqp5ih35vbdd4fac7fsac9mzmdvr8pib";}
-  {name="ksirk";value="1is01dzsd2x6m6vn71i552q0z3qshhgfmlqkvl9g3vsjlz9a811j";}
-  {name="ksnakeduel";value="0bnaxvzgf7bml483xdvpv1axfi39gxpbykcj8p4vcmkyaqlg9xc6";}
-  {name="ksnapshot";value="11s5ika5fbh9rhkfbpg9qiyrbd698z17aqqi44qmwn7w7hmd51si";}
-  {name="kspaceduel";value="058x1j3nv5g77zjkvkzwr0nwfy43gyaqc180mk8xidkzk6w8ncdf";}
-  {name="ksquares";value="1si68d370k69dd70dvc5s3ny0q3lm1qp0xkyrlzphvfr9ivyb6dj";}
-  {name="kstars";value="0dxdqgbayh2mdqdjx88prsm5bplsj73xy6zjz4lml99pqz5h24wa";}
-  {name="ksudoku";value="1b3csnl43i5xfwxnc10qb8aypx8ci5x6lia9qwppcv9w0gqqpmdn";}
-  {name="ksystemlog";value="1spkyqn0ywi0nbbrcmnkmh88z6525ppshw9wnrzm2ncs9ypsy45s";}
-  {name="kteatime";value="00nwbw5509g0iz80bg1jljj07kwl9z8zxkvq27qkzx1h0bm9593n";}
-  {name="ktimer";value="0v9pfbd2hbp7wa01y13845360p7r2bdzpf9h2vc4xb9nifzva9gj";}
-  {name="ktouch";value="11shkrmw1cbn19j4k167d4qjanh5b6jdqhp65dn24zxbs9prk1y9";}
-  {name="ktuberling";value="0axx1slrk7142gm9sc61amixzabphdfp2m6zkdw4zi67ly2w15vf";}
-  {name="kturtle";value="1cm6g8n2qy779cgmvfxvmg49fssrggd1hr87pz1xakd2xkz2qbid";}
-  {name="ktux";value="039ip37bw0bxc7haz3a9b5ks9hy4k0nyyrqq7n6wdhkg0m4ji5l1";}
-  {name="kubrick";value="1fmr7w7f8p54892icbvmhd439adg5b04ddfln9ky34akbw8jiap7";}
-  {name="kuser";value="14dszc4nxgmsm1q6cigh18b97ds4ixsfqp1l717lj39makz7r6jd";}
-  {name="kwallet";value="1s2w3zqbaml3i3p0s3znka7kwcwib76p0zpfbfzjaxzgxwmb4nwm";}
-  {name="kwordquiz";value="1a6chbc4hpybxa7w50jlasp5nzrz9z4qk766cxflpf532s6mv9yl";}
-  {name="libkcddb";value="0h7kg4wnjn2j1wjm758jyf0qiwllzm39zxwkvyd4r744ra88ym6a";}
-  {name="libkcompactdisc";value="18nwbjgviyqd6pvaq4l7hsihask54knfwsk6z4rpk25ln74ls7rs";}
-  {name="libkdcraw";value="1b7yzv25dp55mqkj8ap3qy97ddhdagbsfv8kanswln33k8phjvn7";}
-  {name="libkdeedu";value="1y2iwivgqsg1bb34bif99pa58cqlamfv727h8p69b5r3x0kj1mkk";}
-  {name="libkdegames";value="0k29wf6zcqvpf9xzrxbizn4pi8mijq8rbr01vck9wx8glj3306gj";}
-  {name="libkexiv2";value="048rx25n64fyyms9wjdsnlngh5j7650gzxpszf683jgf70x9paj5";}
-  {name="libkipi";value="0i8k2x68n88v0jwp0yqwbgx6n13vrspb66p3dckwkh4nfsrmnpwn";}
-  {name="libkmahjongg";value="0b5gfqqk0jjkbhdvh55njlci1k18icijq8a0m987x92dlhyn6hf2";}
-  {name="libksane";value="13ghwcssd6zp731lcqa3z8q974g5sv48nlp38crpni83jz7wqyl8";}
-  {name="lokalize";value="1i09brs8v71xhyn3fw69asfvz95gw5iblrnqzf1iybh858fz3sg8";}
-  {name="lskat";value="11754yxbabhps0w521rzcsqjpkxdk53ikqjchhr91syiymf556as";}
-  {name="marble";value="07d6hgb65r6aa9h4ikxnssfiq5a0qqbvlq68mp9qib7hhl38qrcx";}
-  {name="mplayerthumbs";value="1z7f4ibs8jms61kary73p0v4myxsxsag299zp1h3ldfbfshv73yv";}
-  {name="nepomuk-core";value="08cqvw42zzq981vs9gdix5jjsfgn2i4x0hi7q5ajd2rqyjxngh3s";}
-  {name="nepomuk-widgets";value="0ncvza1zlk203q57741rx1cj6gqy009ygqpcnlnfbd6xpqyphqq7";}
-  {name="okteta";value="0b1y8r6fa8dy3xjyiyzj4iy4shwgqff4lv9hrw2dvm3knfvjiyzz";}
-  {name="okular";value="0wlk1rwgif1qbk7f2v26bgg27vhbjfr4pgbdvncmms43839n9zqq";}
-  {name="oxygen-icons";value="1w5yn2xyp5kadg5rf2zxb88apgj13c055if3fj5w70mxir1z8nzq";}
-  {name="pairs";value="00ygnr0r064z33z19mirz79b9dj0wfk6yp38n2rmj1z2568pq9gq";}
-  {name="palapeli";value="0gbp50aph2ckjj6bw7f5p2xfxw6x8qnypk45c4ys2bfj3xs3kzp9";}
-  {name="parley";value="0s1iv864ijrlp9wcj13lvy68133dq7spvrmf2xnspn98ba7dydc0";}
-  {name="perlkde";value="131dipnns5rmncrxh7wmpqxnwxkvnh11rhb7dx76gc9mvgr6k3kg";}
-  {name="perlqt";value="1rkjv0xmn7v8mgmlfvzfa5ix18xl62hcbgrjg800hrvj43cj7ixj";}
-  {name="picmi";value="18im6q18zsahx4y75d21ihnmpn00ml8y99xgcwf061jknf3l9rfa";}
-  {name="poxml";value="0l9zarf51p10hqdnfzks4q7vhm1lkjh1cyi3bqn097jncsv3c0pi";}
-  {name="print-manager";value="1csnbl0q50g7b0yc681pgf88vvw7f4vzqpq493nn1n6gr8i46l6v";}
-  {name="pykde4";value="0mwvs209d75s3smsb9wbvcp5n94a9rxh8nvh8d1wyvlkn60kfpr5";}
-  {name="qtruby";value="1d89h83is86szy4bqa9rb9xcc3iwjgl3kxldcy64cls44cif9vkx";}
-  {name="qyoto";value="063m9a8b7qc1hxii2w3zyf69b84129zppbrxm83i4q4s0v5y63in";}
-  {name="rocs";value="02f9cnzkq18fiblih384v3ngaps9lhgqjmzqv2k8k09bxm6pyiz5";}
-  {name="smokegen";value="17bgshfmxa8iyp65fss3g74wdjdy4rnq7wsf223ls38jk6fjnkmi";}
-  {name="smokekde";value="0dl24czf5rspgqwm5i8f0a6y911alirnz2vdjywa2j2nimi690il";}
-  {name="smokeqt";value="1j0qpqr5zjffr8hfkyav50jpxj8xj8n9jk24gahvjnkk9wpyqbjc";}
-  {name="step";value="1xz074h5hwmacf4v4ca2m580h1sppvvgcwbym142vr55pd3yd2f3";}
-  {name="superkaramba";value="16xijicbqj771mdy9l91ml8ikm0qjs9ykj8nz6az2xzw6q8izz2g";}
-  {name="svgpart";value="1d6si3w4kpbxgzyi044cr1ch9b0jrl23fyzabdzxgb2qkcfxifng";}
-  {name="sweeper";value="1snjprdkzgf80z6waclhibzwcky6k4qam9bkgfd9lkaf9hba5x88";}
-  {name="umbrello";value="08h82pizkkgqqdgfs2jinwzjb6bc2nr4zyh50fkr0bk0xlspp87f";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix b/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix
deleted file mode 100644
index d9571a4d83c..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/4.11.5.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="0xqmb8aymsjkdfjwpk6kjbks7x74cg27x81sg5bhx16dzmmrlgyi";}
-  {name="analitza";value="0zc8ja74x9kgsxdri109sf70lgkx17y234gl82b9yv00snifx2kv";}
-  {name="ark";value="1gylhvql6769q4ys9rgnq1lvn0sk8hzr2m6790xvjd1bcgk7sfyw";}
-  {name="audiocd-kio";value="12xq1a0h6xbgz83q9dd82csw08s7srqmxddc8np0mqazlscb5v3i";}
-  {name="blinken";value="1arbj15v4sjlyzdx2ws7rc7ni4ad2aak8adca5r23rc2zmiw18xf";}
-  {name="bomber";value="0glb2sbzw4nnkdwwd16rn9wz9c46aldyb1sw75f7x45h64jj5da3";}
-  {name="bovo";value="102kd629c41fy6mmhd9cynbs77r55hz4y4dw14qnnfmc840c3mnm";}
-  {name="cantor";value="014wbn53lrmrxq6mra94m6dn02d6nl03jvykks6lg6sfsjl28dnx";}
-  {name="cervisia";value="02ipx5z20dszz0ghccjfpy0wzrcyg8wzpql4yc3j28j93waqrhsk";}
-  {name="dolphin-plugins";value="0m5l01mh29s1lnh5vc9m2dx0vzxsnba47p7xd7w4bjmv7yi72qlg";}
-  {name="dragon";value="1hsx5ccll7zvmsk243r3bvw2gap3kicx5cj8iis5p93iivb1ia4w";}
-  {name="ffmpegthumbs";value="0p51vxr4jgb1rk2jssg3qsl5n14afhf9ygkixv7v7bx0x378r3z3";}
-  {name="filelight";value="18hwm0k4k24hbdzbpk0rcisahyp5hjisq0gg8f5x46vwp424i1hn";}
-  {name="granatier";value="119jx58y8z69avrhs9a777dp38chrwf9a414hcqmbjdqsp7k489i";}
-  {name="gwenview";value="0f4xss58dfgvbzwv43cv58166hxvb1g42kz7d82sn184n1903lck";}
-  {name="jovie";value="0galc7jyy57mw1y5vfq53lqmykqvdr5dch9bqs0qv8wv7fry5mf0";}
-  {name="juk";value="0xy1bin8apmxmhn3bhiw8cpv73az6a3q16rflp99x1i0y5675795";}
-  {name="kaccessible";value="0bmffbdkm2cvgbvblq0rgp20f3zzhnmva2mksbpglfzbmivl5287";}
-  {name="kactivities";value="0a1xxm1is20pz7h2iw4rx0fpwnhlz049yizsy6zx7ld8jl60s0sc";}
-  {name="kajongg";value="1158axh5rqnm59jknx2gp57k65vpd839hqnhm8dwpk033v9a7d2r";}
-  {name="kalgebra";value="18wqkc3mv36vdski1xk1jqrd2jja16ckidy94lzmkksb46xpqysz";}
-  {name="kalzium";value="0bxrhd8x5020srv7w842v202akinvd4xc0kl860vfi633vs4nwp9";}
-  {name="kamera";value="0l858wgpsp961vyfd8i43j01iyi3vvgkniwp4w4c88iqhbsxl8wk";}
-  {name="kanagram";value="1bgp5a5m59wvpqqpb5r68sc8w1jz96cfjj6s6wrllj4r5ndn08zy";}
-  {name="kapman";value="0jchv7fc3b0r70k7r0apm7a9r28jihnjzf3ca08nsrc1l7p94rq3";}
-  {name="kapptemplate";value="0jnmvblyrim9ircnjcyw3djih559jhd27dly6msw3zn2106ky2pl";}
-  {name="kate";value="1dxiw83ym3lg4gwdydwchdmgvbqibsj48ff4hjizl2nabh6v6yxv";}
-  {name="katomic";value="03x7bvixaafakxd3v6lms8x2a5v9awx0nldh7g3piq1pb27pgbz1";}
-  {name="kblackbox";value="1dnqnyp8dkg6p5vh48asm3qx7w582n0vb174g5xdk600zxpdcpaj";}
-  {name="kblocks";value="0r23zf8bkxdiljvd241q179pg6glij5kysm50ccjj1j7ni1qvzg2";}
-  {name="kbounce";value="0j70k5d4wcfv2zqai3m8xm244wdn1irl1zy4iq6clnbhfaaad30a";}
-  {name="kbreakout";value="1nlw3xk53srramz1dgcm4cii50ivgs160hha4v3ks47qkfll0gb5";}
-  {name="kbruch";value="0b9116g88n066nrl4hmw57k61zcc2qjhxwkz0cp68y8d5p5nr4hq";}
-  {name="kcachegrind";value="14wdd2nnf9s0a3a3jh86ylgwf8sqgxxw9909bbs82rlfclc6l2lf";}
-  {name="kcalc";value="10lqkb8x9izc1yv45qlav0zbmdq4ygw2xy93ks2fr5k0p8byc31d";}
-  {name="kcharselect";value="1qbjg9950ksryw12ff8djmwj0lnd14q0ws2461smpyvhbd552vwg";}
-  {name="kcolorchooser";value="1a1rsnnavwlj2fij356z2cl60lnxlc3nzisdmibnmq4lfa4chgk6";}
-  {name="kcron";value="011pv51rznrmy91fp4z6fdv4zlsj0gdf2j2pbqgcm1smgbv0mdhq";}
-  {name="kdeartwork";value="1qsd9493gr4mkd4xvh83rjn84vchqgv1s0q3ga4rbxqwxk3ymlfc";}
-  {name="kde-baseapps";value="0v0k0nk2zypd84gaaxlkdcsaqfklp8501xq40fphdci74qcq7hz2";}
-  {name="kde-base-artwork";value="1cirdsaikp9n3w4qxd3h18v1zq1f2jyzy3cpk51k6dnzvpmyqprx";}
-  {name="kde-dev-scripts";value="1d1i5jcs6kvq9piabk9qpf0s885zym8bll5i71a6yfr1di2gp0xk";}
-  {name="kde-dev-utils";value="0ay04ivb24b43lkf7czr92nm42zaprbw08d9qqgshszcrg5nlffn";}
-  {name="kdegraphics-mobipocket";value="1336md4r28vl0dq6r6dfzjyagn95sj1i9y7s4wqgczdcw28kbsyq";}
-  {name="kdegraphics-strigi-analyzer";value="0rxnigayhyikxiws7ayh0v5j8aidcqc2yhpqkg31mxwm23zmi9pc";}
-  {name="kdegraphics-thumbnailers";value="0qqp6fk3vz02hsn5s3nkbakj3bhm7z2l2nx588yazhwl27g23cff";}
-  {name="kdelibs";value="1gdkiviqkmwax54pg33rk1anby5rhsyv6rk2z6px99phgjk58wph";}
-  {name="kdenetwork-filesharing";value="16fmzszggh7ish0jlj4r0x08dzwk9plc1vmcvryhkp1wx7zy5p60";}
-  {name="kdenetwork-strigi-analyzers";value="1c3cpg5cl7rd8ablm38jn8mdccwalvsfnfqx2vb7rbkigkapgcg9";}
-  {name="kdepim";value="066c28iz7s1a4pjf10bv0kv1pqbfcpgzgl1w38pnq7491nmlsyhc";}
-  {name="kdepimlibs";value="18y0awr6m53rhkx076knbf3zsd1c6frf44qpqkcgvcy1r5wk0ab4";}
-  {name="kdepim-runtime";value="1i339a9qhpnihz9scfnh7kv6wjb2jrnmqikwlc13zymnsw0wk0jg";}
-  {name="kdeplasma-addons";value="0829qvhnxqg6bskbnpiwp4dgsr886bixpz0py9xv7mirfsizdqw9";}
-  {name="kde-runtime";value="1qsnp2r4s7zk78k46p0cqjsddpjai78zyx38w1ygz2mfimz5k83z";}
-  {name="kdesdk-kioslaves";value="0ww9ln4c06vsmrcj5qxr52w22md60209193qdvfyw8dmh2c6bjv4";}
-  {name="kdesdk-strigi-analyzers";value="09869ji9f86rrk0jcwvixkiw6jim2yqfmwb6zd792wf87nlfxjbi";}
-  {name="kdesdk-thumbnailers";value="0r2d6g0nm0j8azr7gs40p9g7cwil0spydczx48qa7lqyags43njq";}
-  {name="kde-wallpapers";value="0gzxll9kkrdp07i96bwxwrpwq3537g3chas5vnwp1rvskqyv6ipq";}
-  {name="kdewebdev";value="0waip70ga76p855yyhdgdkhy8gga7mhwz0dqmw96hh84lr4pirfd";}
-  {name="kde-workspace";value="1kqkhryzj1qkfl8fxj560xf83fya62npx9ld2nj1m2vd3ncs769v";}
-  {name="kdf";value="1iwxp8xjy0rz4sf5bc5dblfjxv98k84svwg2d1s021l9kngfggah";}
-  {name="kdiamond";value="1bvnsbjpwcpdqyzjc7qgbba7dir0y34sns7g11sld7ajxdvl3dxj";}
-  {name="kdnssd";value="1fwh4xab5h0zf8a63r0jk5q9xbg1akl2v092lwl5dw84sh2yqxfb";}
-  {name="kfloppy";value="0pwdgbxi7xf8lml7zwqiaqk8pxl8px999b4jvbbkirf6833854f8";}
-  {name="kfourinline";value="1f3h4izv5vh9jdkzv7c2wd5p3j62n8cp7zwglpwrckcgyj0mp3nv";}
-  {name="kgamma";value="0pgrx2mp072i8wq1hjp9kl0ha6jyjhn3a6x6b35lha8qnjkk7bdh";}
-  {name="kgeography";value="1fyn6bk8gn3cqvzxsywwq34py35w0ampblnd6n3dj48928zc9vlr";}
-  {name="kget";value="1709bjfygnbwav1plsdrqmwmhqi6p7wnzziwhh6vamk7pspfhac5";}
-  {name="kgoldrunner";value="19ywv7pkzgc4yx67aqmkcry47japgbpf9gp2namv0mcrwdnzx6y3";}
-  {name="kgpg";value="1l3sc9kgw4qrcl4p3hqnrr9iw6fz981ayn687s78hf9pb5j94dkv";}
-  {name="khangman";value="06r20f9zix26j8s3k3awamrcqzr6xmdx6adk3nda4akyz7li73d6";}
-  {name="kig";value="06dmhhwgnps4pvsmm45ipmgivfjhg5ig40n6z3lgi3hgnknp08an";}
-  {name="kigo";value="1bxnk3lwg3yr2q28dm6k7257k2288gy22ikzvcgsp09y0g0ci1p9";}
-  {name="killbots";value="1dvi1ffd5kjxhz3lssknv4lj4dghh3i7q1lnpzl0d5i8b2rdgg7b";}
-  {name="kimono";value="0k8mp0f6z4rfhfi3jjjvryidy415wiq5pls8pvffis012f8i8xni";}
-  {name="kiriki";value="11svzhki6zh8rvb6ynm3qdhxnbkkj32b4v8aj1fcma9f8vnmvgn0";}
-  {name="kiten";value="1inszkhzwbwf2b6w5nnvia700ar6d0ixrm1kam8gzdh6mkq7z9pw";}
-  {name="kjumpingcube";value="1wc1lrjp4m4p2l1fx7ncwvs5nmxmbbna3ym5x9cpb8jx7w50psqx";}
-  {name="klettres";value="139053skjg2xf8crz9w9z00fx8wm6scxrx0r6610jwhdbbdq7j50";}
-  {name="klickety";value="0i1k8w1s97hppna1qidjnd3vkp2283pism3g3nxi45s0xjb292xi";}
-  {name="klines";value="11ma1p8fqp9dqw3cgfsvh0yirsivddjcjb4y4s7dpgk5m0sd0dcg";}
-  {name="kmag";value="1hgk676l9bxavszzh3n2705d2s6512liflivyq6zrgm23m623h41";}
-  {name="kmahjongg";value="1xk6pc54q6v75v2b409lhh3mhnw0n4h5ngrhqxhrd9lrmzw5w3wh";}
-  {name="kmines";value="0sh1lsqmc25lhfisfzf1qsmb9x9gmiy2a8siaifaaj2p4mnm36fv";}
-  {name="kmix";value="1m9rr5sqh1k8a94f0ypsw7vwvzg1aaijs8gwzyxmb6jpq09ky31x";}
-  {name="kmousetool";value="1yxcb7x5zlrz1vz3aha6naf6gi00v7xgvqlj4s9nxi4684a3gcdj";}
-  {name="kmouth";value="1ga56k2mfrl9ams4gcag60q0id3plysqzlp0jic314zv3xdrj4mz";}
-  {name="kmplot";value="0d6ifl34s1d35zq6jn4qgwvv49x23f8z9r24x2w4i3zg8hxql48n";}
-  {name="knavalbattle";value="1ipll0cw0vr99dj5asncrdz74d8499knich5hjpsp8igrzxv6h48";}
-  {name="knetwalk";value="0ncy8icsrfzr9hafqxds45fp1mxzdg0325gl4zd5b8bpvsf7cg6p";}
-  {name="kolf";value="1rg39mgwj7fgyy7svwwb18q1w7w7q5wbvd694hzwj30akf2z169s";}
-  {name="kollision";value="0qgmbmrjq7g1b63rdlspfxkm69aly5swp3mqi2v88z4irxfyksia";}
-  {name="kolourpaint";value="0sskfwam1nqjc86dyhpyrg4jwv3a5nfmnk7aqff0zd7qnp712zsy";}
-  {name="kompare";value="1f7cwrnz04d5m7fqsi5xwybi2429bkhi5y169y76fqmy3aiywq7c";}
-  {name="konquest";value="1r3vzd8112dq2xw1ml9v458zdgrbbnmcrq3phgml1q73fn7lya11";}
-  {name="konsole";value="0d9gl124bbbwvi77bhz9dwlz3l42da4nhv88wa63w2ghm4kka44d";}
-  {name="kopete";value="0kz8d4m6apm493v8xlm7mh4q17nj0ijbrzin7255hipqqq1fqvn5";}
-  {name="korundum";value="0vfnq32ip9xhkhvhm3f0g7kxgjaschlfskrahsib7j2aqssq1rmm";}
-  {name="kpat";value="0jl34j9drh6q26d3iiv11azd18kqsvyvgfqs70jfbwj0vpa5y5v3";}
-  {name="kppp";value="1lspvj49cdywj5wj9bbydp1fl7hadhmh25p40l36is2bj1malmn6";}
-  {name="krdc";value="163ly4scznpvwf11ns8by5ph8kamy3lwnhfam1c43rgrhnx5h9rl";}
-  {name="kremotecontrol";value="14nxskj1rwqszk0z9dl0mq6z1c5d7951pwwfnhmrnkw53xsl6x6f";}
-  {name="kreversi";value="035ikzf9ndb4s1zcrh20xmjyci6kfy9l1racg280vwyvlgh38kkp";}
-  {name="krfb";value="11aphkp33wdwd0viwq74s9wbl7rnihvc1vja8miq6kjjlpdkr82m";}
-  {name="kross-interpreters";value="09zgg3afs4z13m5dzr6ddvlv5fdx2n1v50y61pb5yah8jl8vmynp";}
-  {name="kruler";value="1wljhmdzaqznccslrpxvg88y3imr674dxm4dp93sh61wl5a90fa3";}
-  {name="ksaneplugin";value="0aia98rrjq8fhzdlwn6j4jpfa2gpzkr82m3mxgbfvx9k7fh8fisp";}
-  {name="kscd";value="02ss42fyp2liwiizi08fdgk5fjv5kcrzraq05ryaily9szv5in4c";}
-  {name="kshisen";value="1b7v9vf4sq54svd05j1hssmip2kjlzrwbyisyzf6dm8v58m9j5lm";}
-  {name="ksirk";value="17wn20a3ifc5rfg77b9pcnz48ldzxpgwi5i4gy3zsd8d4ykyr7n6";}
-  {name="ksnakeduel";value="03wawqbxp402nqnk0iqm47mcyhc0b5r6mla8chm42q88y542ynvz";}
-  {name="ksnapshot";value="0rbc3ff69d7sgvg7lna85m9qkl5lak9acngaw9x11c9zvxwyx994";}
-  {name="kspaceduel";value="1qv5bny5z442xbciqh2qf2mginx7bbpcgyn80znq0fvmyg0z39qx";}
-  {name="ksquares";value="1hj4k9q594rnxqdf81lc1dzh5fck2bxbvb8bgfsb4qr8qlmj47i2";}
-  {name="kstars";value="0hkxins67q34z99z4db6j15iy2h5l7dz3ww81q371wb0ckmj9svb";}
-  {name="ksudoku";value="0ppqyb7z9pf13h0j6y8faxxn9n5xbrkk3gzi73gwld8ipkm742mc";}
-  {name="ksystemlog";value="0pwqji6h382l6vvwy5zlggcfba4yjmjcfrj0zyaixcq2y1g698s6";}
-  {name="kteatime";value="0zbnnxhag82vfw0krma8ih331vg5n96xqbkiappgi4wz22lz9i1j";}
-  {name="ktimer";value="0p4ybw40rspm3phbipnagkhlwfnkyb21zmiq0wh6md0b5gvcvgwa";}
-  {name="ktouch";value="07xsgsfcsjklaclb540ylfmrjadzy8ig63n7svdfjc19g2kfjyrr";}
-  {name="ktuberling";value="0n1j9z55mval6q1m7hbvm1xrzf8jbvl8fpadjnb12bxfyxszck3m";}
-  {name="kturtle";value="1x0ymm2wr2y0f5ih1f7r9p8pswm95b5ymhsh7c105sh1d5ib6mgq";}
-  {name="ktux";value="1fa11fx48bxvlpq9vfh6q0ywmlcmjbkk60fph66zaazzydjj36cj";}
-  {name="kubrick";value="0lnwq2r4rczr9yqn5fvzazzkbsal2fgslcmmdmk94vvwms7jhkfn";}
-  {name="kuser";value="1l0s2x7jj6rka8jwiyazh916z0glz32aq19skvia3i8n3k4x2xk3";}
-  {name="kwallet";value="1jwpp9klcsnh6shbykvfz25cn8m28r62nb9q9nfhfgz96l9ni8rf";}
-  {name="kwordquiz";value="1qq4vv742di0r1azcn0nycchypkm9ygjp4b08m2gmyfid5b2wscb";}
-  {name="libkcddb";value="18d005vzimazamwri4p1dqdg80l98rj38jglvw8r962bw97rk04s";}
-  {name="libkcompactdisc";value="02g0k81rzdgwah45bh7wj0hzh9akfdcpkbyalahn33q2x10inm39";}
-  {name="libkdcraw";value="0b9g4635j0j5m7aw333r7qpjzy63h6c2xhzp64k4f7jcyp5y0z15";}
-  {name="libkdeedu";value="1cmqm78kw9762axhz5am0gh28p2xibnq49gj5b03wjqi9h122mzr";}
-  {name="libkdegames";value="15xb639x83hy1nnyaqby4ypca03wr9yr8kqw1jnfx6d3f994mlyd";}
-  {name="libkexiv2";value="1cnvvrkqdsrdx6n6907a4ki3gfymaclwdcy1frmnjbsa0hyxzi33";}
-  {name="libkipi";value="0ilxsjld8s7nz59wgn90bsyvd20ikkdf69fkwmxvj850ci2qr9cv";}
-  {name="libkmahjongg";value="0kqn55fdbfmhm0m4ani9iz76rrbsyi953sig57vx3b9x0ljahkh0";}
-  {name="libksane";value="1nmrqkzbqqgs57kgg1b6i0kg65l9rga0hs98n8is5c233z4h3bnr";}
-  {name="lokalize";value="062l2zd0x5rrzdxf592kvvw49rvlkd3v65bg2ya8n6qr083xsr79";}
-  {name="lskat";value="13px2vvxdi38lgr21f3zp3wdr0qsrcpynd787qpx0ckg97x567bi";}
-  {name="marble";value="0m9dqabyf17640n2zcf9d003h7svm678g497r4kzslisznaddvxb";}
-  {name="mplayerthumbs";value="0g8h79vxxgfb2zrh04j79pc4iva4qr2jl56w23crp9sw9cv2f5av";}
-  {name="nepomuk-core";value="0jkbpnk70njw4acwhz908k60wjy84ydwqp62m1fsir5gh7rl3n72";}
-  {name="nepomuk-widgets";value="0snfsvaxv04w2vrj51cf5zl06q4dwywxnqcvbd9ys5nj2hz3i9vq";}
-  {name="okteta";value="0dj271z8f61j58iknk1xdk4nz705xgna6gpm7cxfgrkxkiwqqxyy";}
-  {name="okular";value="1slwk6q4q9gl25v9xvj2m0hmrvl7zagririna3543hxa7cpf0kcj";}
-  {name="oxygen-icons";value="1mg64p8pfayzq72v95pz2gr56b5ghajp6qva63gbg6l17h0ahyss";}
-  {name="pairs";value="0ac8712z6dhy948nk9jhzjcixykda3l97zg8n2p2njg2wggbycxz";}
-  {name="palapeli";value="0x7nfd3wplildnc0fvrlf59iv1z85g4s72525wj5lfg5kavdad4p";}
-  {name="parley";value="0pqgf7lyfp3gj2zk67snj7y7l3j8cnpj2g1zl1pj7mkcd7v9j1fh";}
-  {name="perlkde";value="0x0v0hsk60xjvqnn2v1q3l66hvimy3wvfjk4ds80qvy5a29v5qxg";}
-  {name="perlqt";value="1kkrxyfqxjy3rc6h0r879rd88n4qy2ha1fs4jlmzgf4cmc4g4kvl";}
-  {name="picmi";value="0qpxfvpibc2fj1yz1q0g6srk1z1vqc1db521ngywxx9hbpi2h95g";}
-  {name="poxml";value="17lxxh4km09k9xkr1z62xy1ky1yyqnnj6y82xwpazi9lkn1vnpfk";}
-  {name="print-manager";value="1qwzmy15q84gv7jwp8k3jnfa0l27d2174ll5ln6i29ii2rzzcjw1";}
-  {name="pykde4";value="1p6j85s716r6f13mqxaayqjr4lbfzz5lvgdzmpxfc3fk4n2vbws9";}
-  {name="qtruby";value="1zcfxql3pwlfxwfvy3capc7g447ygpg5bliv9azpzaql051dg5bm";}
-  {name="qyoto";value="0447fzldwcy1nwh2cbqjy81s7xkrz5gn8jiy4ya6bd3d00jisa7v";}
-  {name="rocs";value="0s5k80z0n07qz120zbj6bxs7zp923bilkd3h1swa931fhhxg2gy7";}
-  {name="smokegen";value="1pksnjkawqqgw5l8pjdmfjs4ggxdm8j1429iw9s1xf91z5zpnmk7";}
-  {name="smokekde";value="1075cl0vxz7izrvl0krs8wbqpn32qj4ax7fgyfgf5662cwf8pifg";}
-  {name="smokeqt";value="1w1bfycn2gk9axsjf5vpxxrrvadasnw5zvb8qpg01p2q34jh1gdg";}
-  {name="step";value="0k4xqwxdk1fz69i787njy1bsdappsa5ldx42n6g87lz7dvzwc3vd";}
-  {name="superkaramba";value="1ymb7c2s8x72x2z621xccinxkqpkh9kk1fhyal169nys42cwadhh";}
-  {name="svgpart";value="0r2xl69l2j0qd13wwi007qmxkszciysqfxkcpjiryy9h2rcsl3fv";}
-  {name="sweeper";value="0dfdz7jchhlwx7skina9q47z407fjh47r7f743bllmniqcsswfs2";}
-  {name="umbrello";value="0ss77g4fwvz7w1a9nna0d5d9fxs176b0qapy4ji1qn9hz0igcd0n";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix
deleted file mode 100644
index 9424a762c8f..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/default.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, branch, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit branch;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc name;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
deleted file mode 100755
index e964ce3ddc1..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A modules
-declare -a packages
-declare -a top_level
-
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
-fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
-  package=${i%-${release}.tar.xz}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir $1-$release
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d27..00000000000
--- a/pkgs/desktops/kde-4.11/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.11/kde-runtime.nix b/pkgs/desktops/kde-4.11/kde-runtime.nix
deleted file mode 100644
index 28e9aa52e62..00000000000
--- a/pkgs/desktops/kde-4.11/kde-runtime.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
-, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
-}:
-
-kde {
-  buildInputs = [
-    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra pulseaudio
-    networkmanager kactivities kdepimlibs openexr
-#todo: add openslp
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kde-wallpapers.nix b/pkgs/desktops/kde-4.11/kde-wallpapers.nix
deleted file mode 100644
index 701a1f3771f..00000000000
--- a/pkgs/desktops/kde-4.11/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "07jwbxp4gdxkvxdasbzbv00l3kqrjph4d8dlbyxgryf12waykcmm";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kde-workspace.nix b/pkgs/desktops/kde-4.11/kde-workspace.nix
deleted file mode 100644
index 0bb6ed606c7..00000000000
--- a/pkgs/desktops/kde-4.11/kde-workspace.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
-, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
-, libjpeg, pkgconfig, kactivities, qjson, udev
-}:
-
-kde {
-
-#todo: wayland, consolekit, xmms, opengles,  libusb isn't found
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
-      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
-      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
-      xorg.libXdamage
-
-      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
-      akonadi pam libusb1 libqalculate kdepimlibs  prison
-      kactivities
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36..00000000000
--- a/pkgs/desktops/kde-4.11/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f..00000000000
--- a/pkgs/desktops/kde-4.11/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
deleted file mode 100644
index 606c61cddb6..00000000000
--- a/pkgs/desktops/kde-4.11/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9..00000000000
--- a/pkgs/desktops/kde-4.11/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
deleted file mode 100644
index f585461af38..00000000000
--- a/pkgs/desktops/kde-4.11/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Configure and schedule tasks";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
deleted file mode 100644
index 88757a6b91c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "System log viewer tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
deleted file mode 100644
index 6118cf558bb..00000000000
--- a/pkgs/desktops/kde-4.11/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "User management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976f..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd14..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af73..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a719..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 84cb008056e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216d..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
deleted file mode 100644
index e98705da889..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/sounds.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-sounds";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "New login/logout sounds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/styles.nix b/pkgs/desktops/kde-4.11/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c3710..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
deleted file mode 100644
index 7c9846fbf9e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kdeartwork-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
deleted file mode 100644
index 48eed141ce6..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-
-  # TODO: qscintilla2, qwt5
-
-  buildInputs = [ smokeqt perl ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
deleted file mode 100644
index 64e196452e3..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  polkit_qt_1, boost, lndir, pkgconfig }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-
-  # todo: polkit isn't found by the build system
-
-  buildInputs = [
-    python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt_1
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..30aec0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
deleted file mode 100644
index 03e9dc9a007..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, smokeqt, ruby }:
-
-kde {
-
- # TODO: scintilla2, qwt5
-
-  buildInputs = [ smokeqt ruby ];
-
-  nativeBuildInputs = [ cmake ];
-
-  # The patch is not ready for upstream submmission.
-  # I should add an option() instead.
-  patches = [ ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
deleted file mode 100644
index f0811d335a7..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
-@@ -36,6 +36,10 @@
- set (CMAKE_SKIP_BUILD_RPATH FALSE)
- set (CMAKE_SKIP_RPATH FALSE)
-
-+# add the automatically determined parts of the RPATH
-+# which point to directories outside the build tree to the install RPATH
-+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
-
- add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 53257e836e0..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
-@@ -80,8 +80,7 @@
- set(SMOKE_API_BIN "@SMOKE_API_BIN@")
- 
- find_library(SMOKE_BASE_LIBRARY smokebase 
--              PATHS "@SMOKE_LIBRARY_PREFIX@"
--              NO_DEFAULT_PATH)
-+              PATHS "@SMOKE_LIBRARY_PREFIX@")
- 
- if (NOT SMOKE_BASE_LIBRARY)
-     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
deleted file mode 100644
index a80574ff67a..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
deleted file mode 100644
index 4474c1d9731..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
-, shared_desktop_ontologies, attica, pkgconfig }:
-
-kde {
-
-  # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
-  # okular is disabled because the code generated is broken
-  buildInputs = [
-    smokeqt kdelibs shared_desktop_ontologies
-  ];
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  LD_LIBRARY_PATH = "${smokeqt}/lib/";
-
-  meta = {
-    description = "SMOKE bindings for kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
deleted file mode 100644
index 72b267e43c5..00000000000
--- a/pkgs/desktops/kde-4.11/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-
-# TODO: Qwt5, QScintilla2
-
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/analitza.nix b/pkgs/desktops/kde-4.11/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb20..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/blinken.nix b/pkgs/desktops/kde-4.11/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/cantor.nix b/pkgs/desktops/kde-4.11/kdeedu/cantor.nix
deleted file mode 100644
index 670a3429032..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/cantor.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate }:
-kde {
-
-# TODO: R is not found
-
-  buildInputs = [ kdelibs libspectre analitza R libqalculate];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
-  buildInputs = [ kdelibs libkdeedu analitza ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
deleted file mode 100644
index 09de79ce1c0..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
-kde {
-
-# TODO: chemical mime data
-
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a3..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/khangman.nix b/pkgs/desktops/kde-4.11/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kig.nix b/pkgs/desktops/kde-4.11/kdeedu/kig.nix
deleted file mode 100644
index bd5ef67529c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kig.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = ''
-    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
-    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
-    '';
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kiten.nix b/pkgs/desktops/kde-4.11/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/klettres.nix b/pkgs/desktops/kde-4.11/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
deleted file mode 100644
index 18458cf6f0b..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-    kde = {
-      name = "kmplot";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kstars.nix b/pkgs/desktops/kde-4.11/kdeedu/kstars.nix
deleted file mode 100644
index 4ae36c480f9..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kstars.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
-
-kde {
-
-# TODO: wcslib
-
-  buildInputs = [ kdelibs eigen xplanet indilib ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
deleted file mode 100644
index 9e606adde33..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxkbfile }:
-
-kde {
-  buildInputs = [ kdelibs libxkbfile ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/marble.nix b/pkgs/desktops/kde-4.11/kdeedu/marble.nix
deleted file mode 100644
index 2dc07d14a0d..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/marble.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-
-# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
-
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/pairs.nix b/pkgs/desktops/kde-4.11/kdeedu/pairs.nix
deleted file mode 100644
index 36c4aba9604..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/pairs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A memory and pairs game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/parley.nix b/pkgs/desktops/kde-4.11/kdeedu/parley.nix
deleted file mode 100644
index f9f86dde150..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/rocs.nix b/pkgs/desktops/kde-4.11/kdeedu/rocs.nix
deleted file mode 100644
index ce30d11fda3..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost, grantlee }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeedu/step.nix b/pkgs/desktops/kde-4.11/kdeedu/step.nix
deleted file mode 100644
index 997cfb42c9e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeedu/step.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/bomber.nix b/pkgs/desktops/kde-4.11/kdegames/bomber.nix
deleted file mode 100644
index 026227910f2..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/bomber.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/bovo.nix b/pkgs/desktops/kde-4.11/kdegames/bovo.nix
deleted file mode 100644
index b0e7d99c589..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/bovo.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
-  };
-
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/granatier.nix b/pkgs/desktops/kde-4.11/kdegames/granatier.nix
deleted file mode 100644
index 9f1ab005309..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/granatier.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kajongg.nix b/pkgs/desktops/kde-4.11/kdegames/kajongg.nix
deleted file mode 100644
index 9a6f5e83695..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kajongg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
-kde rec {
-
-  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "an ancient Chinese board game for 4 players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kapman.nix b/pkgs/desktops/kde-4.11/kdegames/kapman.nix
deleted file mode 100644
index f10e099da3c..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kapman.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the well known game Pac-Man";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/katomic.nix b/pkgs/desktops/kde-4.11/kdegames/katomic.nix
deleted file mode 100644
index a9936c04f0e..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/katomic.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and educational puzzle game built around molecular geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
deleted file mode 100644
index 27eeff2f65b..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kblackbox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kblocks.nix b/pkgs/desktops/kde-4.11/kdegames/kblocks.nix
deleted file mode 100644
index 98cf068de09..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kblocks.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic single player falling blocks puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kbounce.nix b/pkgs/desktops/kde-4.11/kdegames/kbounce.nix
deleted file mode 100644
index 77fa0db6352..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kbounce.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game with the elements of puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
deleted file mode 100644
index 3a484d919bb..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kbreakout.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
deleted file mode 100644
index 06dfcee5ac3..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kdiamond.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
deleted file mode 100644
index 11b8838e708..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kfourinline.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a board game for two players based on the Connect-Four game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
deleted file mode 100644
index 6217c47a806..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kgoldrunner.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kigo.nix b/pkgs/desktops/kde-4.11/kdegames/kigo.nix
deleted file mode 100644
index 32eee67cc1e..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kigo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an open-source implementation of the popular Go game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/killbots.nix b/pkgs/desktops/kde-4.11/kdegames/killbots.nix
deleted file mode 100644
index d9c1472495e..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/killbots.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple game of evading killer robots";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kiriki.nix b/pkgs/desktops/kde-4.11/kdegames/kiriki.nix
deleted file mode 100644
index 72f7ab67501..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kiriki.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an addictive and fun dice game, designed to be played by as many as six players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
deleted file mode 100644
index a6d22cff51c..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kjumpingcube.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple dice driven tactical game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/klickety.nix b/pkgs/desktops/kde-4.11/kdegames/klickety.nix
deleted file mode 100644
index b592bc40641..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/klickety.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/klines.nix b/pkgs/desktops/kde-4.11/kdegames/klines.nix
deleted file mode 100644
index 90952fe91c0..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/klines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
deleted file mode 100644
index 946b531ff12..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kmines.nix b/pkgs/desktops/kde-4.11/kdegames/kmines.nix
deleted file mode 100644
index 538454e9598..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kmines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic Minesweeper game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
deleted file mode 100644
index 42ffd2fcb4d..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/knavalbattle.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Battle Ship game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
deleted file mode 100644
index a16e578ce84..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/knetwalk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kolf.nix b/pkgs/desktops/kde-4.11/kdegames/kolf.nix
deleted file mode 100644
index 78815ee5799..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kolf.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a miniature golf game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kollision.nix b/pkgs/desktops/kde-4.11/kdegames/kollision.nix
deleted file mode 100644
index 3147c7305ea..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kollision.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple ball dodging game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/konquest.nix b/pkgs/desktops/kde-4.11/kdegames/konquest.nix
deleted file mode 100644
index 53ddd64928c..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/konquest.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "the KDE version of Gnu-Lactic Konquest";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kpat.nix b/pkgs/desktops/kde-4.11/kdegames/kpat.nix
deleted file mode 100644
index f8d9bad36dc..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kpat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a relaxing card sorting game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kreversi.nix b/pkgs/desktops/kde-4.11/kdegames/kreversi.nix
deleted file mode 100644
index 2aed981428e..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kreversi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kshisen.nix b/pkgs/desktops/kde-4.11/kdegames/kshisen.nix
deleted file mode 100644
index 9c888034038..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kshisen.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "a solitaire-like game played using the standard set of Mahjong tiles";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksirk.nix b/pkgs/desktops/kde-4.11/kdegames/ksirk.nix
deleted file mode 100644
index 767eb67971a..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/ksirk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, qca2 }:
-kde {
-  buildInputs = [ kdelibs libkdegames qca2 ];
-  meta = {
-    description = "a computerized version of the well known strategic board game Risk";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
deleted file mode 100644
index ccf1fb551e9..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/ksnakeduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple Tron-Clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
deleted file mode 100644
index 5285f7916ca..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kspaceduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksquares.nix b/pkgs/desktops/kde-4.11/kdegames/ksquares.nix
deleted file mode 100644
index a17be2da632..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/ksquares.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
deleted file mode 100644
index ea4e13a5e4f..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/ksudoku.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a logic-based symbol placement puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
deleted file mode 100644
index 1a6ba9d653c..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/ktuberling.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple constructor game suitable for children and adults alike";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/kubrick.nix b/pkgs/desktops/kde-4.11/kdegames/kubrick.nix
deleted file mode 100644
index 9bdc6879db4..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/kubrick.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game based on the Rubik's Cube™ puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
deleted file mode 100644
index 3819dcdc9ae..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/libkdegames.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, openal, libsndfile }:
-kde {
-  buildInputs = [ kdelibs openal libsndfile ];
-  meta = {
-    description = "KDE games library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
deleted file mode 100644
index 383b347dc33..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/libkmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a library for KMahjongg game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/lskat.nix b/pkgs/desktops/kde-4.11/kdegames/lskat.nix
deleted file mode 100644
index 2a5050cd667..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/lskat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/palapeli.nix b/pkgs/desktops/kde-4.11/kdegames/palapeli.nix
deleted file mode 100644
index 010dbd5d623..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/palapeli.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-
-# TODO: package qvoronoi
-
-  buildInputs = [ kdelibs libkdegames ];
-
-  meta = {
-    description = "a single-player jigsaw puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegames/picmi.nix b/pkgs/desktops/kde-4.11/kdegames/picmi.nix
deleted file mode 100644
index 165d7422f95..00000000000
--- a/pkgs/desktops/kde-4.11/kdegames/picmi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player logic-based puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
deleted file mode 100644
index b6fd701ac12..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
-, libjpeg, pkgconfig, kactivities, lcms2 }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c23..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186b..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 35af39aa611..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libtiff }:
-
-kde {
-  buildInputs = [ kdelibs libtiff ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 18c6534eb5c..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f46..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd26..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20d..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
deleted file mode 100644
index b4d5e5922ca..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libjpeg_original, lcms1, jasper, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs libjpeg_original lcms1 jasper ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab3899..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/okular.nix b/pkgs/desktops/kde-4.11/kdegraphics/okular.nix
deleted file mode 100644
index 17b8a33ed43..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/okular.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, libtiff, kactivities, pkgconfig }:
-
-kde {
-
-# TODO: package activeapp
-
-  buildInputs =
-    [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4 qca2 qimageblitz libtiff kactivities ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b4..00000000000
--- a/pkgs/desktops/kde-4.11/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
deleted file mode 100644
index 0bf18e8efb0..00000000000
--- a/pkgs/desktops/kde-4.11/kdelibs/kdelibs.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ kde, gcc, cmake, perl
-, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
-, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
-, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl
-, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
-, pkgconfig
-}:
-
-kde {
-
-# TODO: media-player-info, ACL
-
-  buildInputs =
-    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
-      libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt 
-      shared_desktop_ontologies xz udev libjpeg kerberos openexr
-    ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Split plugins from libs?
-
-  patches = [ ../files/polkit-install.patch ];
-
-  # cmake fails to find acl.h because of C++-style comment
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DHUPNP_ENABLED=ON"
-  ];
-
-  passthru.wantsUdisks2 = false;
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
deleted file mode 100644
index 0bd0bf378dd..00000000000
--- a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-core.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
-, pkgconfig, doxygen, ebook_tools
-}:
-
-kde {
-
-# TODO: epub
-
-  buildInputs = [
-    kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
-    popplerQt4 ebook_tools
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "NEPOMUK core";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
deleted file mode 100644
index 0d29a4f97de..00000000000
--- a/pkgs/desktops/kde-4.11/kdelibs/nepomuk-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-
-  buildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "NEPOMUK Widgets";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
deleted file mode 100644
index 4c56e7529dd..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/audiocd-kio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
-kde {
-  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
-  meta = {
-    description = "transparent audio CD access for applications using the KDE Platform";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
deleted file mode 100644
index 006300742ec..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/dragon.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a multimedia player with the focus on simplicity";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
deleted file mode 100644
index 45f6c9abcb6..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/ffmpegthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, ffmpeg }:
-kde {
-  buildInputs = [ kdelibs ffmpeg ];
-  meta = {
-    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
deleted file mode 100644
index 5d7b1db224e..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/juk.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, taglib, libtunepimp }:
-kde {
-
-# TODO: opusfile
-
-  buildInputs = [ kdelibs taglib libtunepimp ];
-  meta = {
-    description = "an audio jukebox application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
deleted file mode 100644
index 1dd8108166f..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/kmix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libcanberra, pulseaudio }:
-kde {
-  buildInputs = [ kdelibs libcanberra pulseaudio ];
-  meta = {
-    description = "sound mixer, an application to allow you to change the volume of your sound card";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
deleted file mode 100644
index e99ae53935b..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/kscd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libmusicbrainz }:
-kde {
-  buildInputs = [ kdelibs libmusicbrainz ];
-  meta = {
-    description = "KDE CD player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
deleted file mode 100644
index 720b01d1861..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/libkcddb.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-#todo: libmusicbrainz5
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a library used to retrieve audio CD meta data from the internet";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
deleted file mode 100644
index 6ed08af89f3..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/libkcompactdisc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "KDE library for playing & ripping CDs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
deleted file mode 100644
index c88ebcc2a5a..00000000000
--- a/pkgs/desktops/kde-4.11/kdemultimedia/mplayerthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a video thumbnail generator for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
deleted file mode 100644
index 0330511a258..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE properties dialog plugin to share a directory with the local network";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
deleted file mode 100644
index e838d84fc5e..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs boost ];
-
-  meta = {
-    description = "Strigi analyzers for various network protocols";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
deleted file mode 100644
index f65960cc337..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kdnssd.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE tool that monitors the network for DNS-SD services";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kget.nix b/pkgs/desktops/kde-4.11/kdenetwork/kget.nix
deleted file mode 100644
index f986da2de21..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kget.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
-, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
-, pkgconfig }:
-
-kde {
-
-# TODO: QGpgME
-
-  buildInputs =
-    [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
-      libmms kde_baseapps kde_workspace boost ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  meta = {
-    description = "KDE download manager";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
deleted file mode 100644
index 961d646474e..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib,
-  libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies,
-  libjpeg, libmms, ortp, srtp, libv4l}:
-
-kde {
-
-# TODO: libmeanwhile, xmms, jsoncpp
-# commented out deps seem to not be needed anymore, but why so many?
-
-  buildInputs = [
-    kdelibs qca2 mediastreamer libgadu # telepathy_qt shared_desktop_ontologies  gpgme 
-    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib # libktorrent libjpeg 
-    libidn libxslt boost # speex  libmms msilbc
-    ortp srtp libv4l
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
deleted file mode 100644
index 4c6bd65769f..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "PPP(Dial-Up) client tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
deleted file mode 100644
index 80557e827fe..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
-
-  meta = {
-    description = "KDE remote desktop client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
deleted file mode 100644
index cb4857965a3..00000000000
--- a/pkgs/desktops/kde-4.11/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
-
-  meta = {
-    description = "KDE desktop sharing";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdepim-runtime.nix b/pkgs/desktops/kde-4.11/kdepim-runtime.nix
deleted file mode 100644
index 43006fe5115..00000000000
--- a/pkgs/desktops/kde-4.11/kdepim-runtime.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
-
-kde {
-
-# TODO: libkgapi, LibKFbAPI,libkolab, libkolabxml
-
-  buildInputs = [
-    kdepimlibs akonadi boost shared_desktop_ontologies
-    libxslt
-  ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdepim.nix b/pkgs/desktops/kde-4.11/kdepim.nix
deleted file mode 100644
index f5e28a044bb..00000000000
--- a/pkgs/desktops/kde-4.11/kdepim.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, kactivities, libXScrnSaver
-, pkgconfig }:
-
-kde {
-
-# TODO: LinkGrammar
-
-  buildInputs =
-    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
-      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
-      libXScrnSaver
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdepimlibs.nix b/pkgs/desktops/kde-4.11/kdepimlibs.nix
deleted file mode 100644
index ca0af9400b1..00000000000
--- a/pkgs/desktops/kde-4.11/kdepimlibs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt, nepomuk_core
-, shared_desktop_ontologies, qjson }:
-
-kde {
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs =
-    [ boost gpgme libical libxslt qjson prison
-      openldap cyrus_sasl akonadi shared_desktop_ontologies
-    ];
-
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeplasma-addons.nix b/pkgs/desktops/kde-4.11/kdeplasma-addons.nix
deleted file mode 100644
index 550099830d9..00000000000
--- a/pkgs/desktops/kde-4.11/kdeplasma-addons.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth }:
-
-kde {
-
-# TODO: qwt, scim, ibus
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-                  eigen qca2 libXtst qimageblitz libqalculate 
-                  shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd42..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
deleted file mode 100644
index ad8132a850e..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/dolphin-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn, mercurial, git and bazaar plugins for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
deleted file mode 100644
index df81145e5d6..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
deleted file mode 100644
index 215c0a3c613..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kde-dev-utils.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "various KDE development utilities";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
deleted file mode 100644
index 98bbce35a97..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-kioslaves.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
-
-kde {
-
-  buildInputs = [ kdelibs subversionClient apr aprutil perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "Subversion and perldoc kioslaves";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
deleted file mode 100644
index 4d579b88ba8..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
deleted file mode 100644
index d707fe9038f..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kdesdk-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, gettext }:
-
-kde {
-
-  buildInputs = [ kdelibs gettext ];
-
-  meta = {
-    description = "PO file format thumbnailer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/kompare.nix b/pkgs/desktops/kde-4.11/kdesdk/kompare.nix
deleted file mode 100644
index 1ddb4b8ea5b..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1f..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/okteta.nix b/pkgs/desktops/kde-4.11/kdesdk/okteta.nix
deleted file mode 100644
index 058636596ad..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/okteta.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/poxml.nix b/pkgs/desktops/kde-4.11/kdesdk/poxml.nix
deleted file mode 100644
index 6e46c3e3ab4..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr, gettext }:
-
-kde {
-  buildInputs = [ kdelibs antlr gettext ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901..00000000000
--- a/pkgs/desktops/kde-4.11/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/amor.nix b/pkgs/desktops/kde-4.11/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a..00000000000
--- a/pkgs/desktops/kde-4.11/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b..00000000000
--- a/pkgs/desktops/kde-4.11/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdetoys/ktux.nix b/pkgs/desktops/kde-4.11/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c72..00000000000
--- a/pkgs/desktops/kde-4.11/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/ark.nix b/pkgs/desktops/kde-4.11/kdeutils/ark.nix
deleted file mode 100644
index eb3e12281d6..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/ark.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }:
-
-kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ];
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/filelight.nix b/pkgs/desktops/kde-4.11/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27c..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kdf.nix b/pkgs/desktops/kde-4.11/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a6..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
deleted file mode 100644
index 944b9edc64d..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, kdepimlibs, libuuid }:
-
-kde {
-
-# TODO: uuid/uuid.h - not found
-
-  buildInputs = [ kdelibs kdepimlibs libuuid ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
deleted file mode 100644
index 70311a789f9..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
deleted file mode 100644
index 9ec0e6c0396..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/kwallet.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
deleted file mode 100644
index ae72becd1e4..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/print-manager.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # "system-config-printer" supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer manager";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
deleted file mode 100644
index cbe7a285606..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz, python }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz python ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30..00000000000
--- a/pkgs/desktops/kde-4.11/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
deleted file mode 100644
index 55e37809e07..00000000000
--- a/pkgs/desktops/kde-4.11/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index 6d22f72461f..00000000000
--- a/pkgs/desktops/kde-4.11/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 86a8b7c0a19..00000000000
--- a/pkgs/desktops/kde-4.11/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
-
-kde {
-
-  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
deleted file mode 100644
index d5f4337f714..00000000000
--- a/pkgs/desktops/kde-4.11/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix
deleted file mode 100644
index fa6406043b1..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        inherit branch;
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
deleted file mode 100755
index ec159a1e204..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
deleted file mode 100644
index c3a46c7637e..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.0.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "10bgdg0npcnxyyqgs1dyfabq8fv08qqifd2vyaffxal3n2qagi1l";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "0jqnav02skkkjphjc3llsqqhb6fid74djng17yhcl1zzdcim2xg1";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "1fh9zddwjz3wirhcr962hcaxri9342q39nqgi1xmwdj2n3mj57xk";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1y83qi5j5wx6fb0zbch3q95nsrhf4x2rrkcxdfcgfx7gwr04d2fz";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1pqbl2mwnpkiby0gm1dk55cij2x1501pgn74zkasy2agacvfaslb";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1cnmsjfzc8cimp0h06dm7rfmj9rw47f61py8z288a0iw7j5rgrr4";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0a7jhy43j9x7z0bp5yijvkx51zfycizvd6kd9a7d88467vxc54hz";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1i2gc86b77k5swmphl25ivpigiqrkhipmnc2vmrp444jialksgdy";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1pgc64gw46gb8hbjmw06q1d6rawpcqw8llgp55drghcjy484j1sw";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0p1cralvfggqnjvikrgibvlic01fpc5fbdyxjrhrhj195f30sjmw";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0msz90jyac7y20rdglbmr8jf7yhb7vwncjynfgrvxd9b998rk4h8";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1yykm0hg4bay7i3i16ssa0rvf3kmqv3vgq3gxmism774c4sgng2i";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "00ma7hhjj08gwzy6f9xmbakkbhcc2gpn5v2j1jdqah52jmnw2d1c";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "045wmlmv2rwik1c4v94d68c62bqkrmf6igxz65dv4hw2f5jj86gr";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1sbgdhr60f10g4lxlcqsx4pid3lmzs2rywdjpqil9ymfy2kpbrc6";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "07y67hg9rp4xckg19zk0lkhrd7i857qkqsbxc0wa9a9chldspjvs";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1jrr7d14i18r1v1d20vrjn942wa5ppp6zxl6xk6vjsvbz66aj36g";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1af0wldc8f01zdlc184zqa6gvd11jd5pw1ya51j457rz69k1hvyx";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1h5ngkc79pkh1zplq06x2v6qv81mh0fw6yidlw54knqz1bblg1k9";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "11wh3s80khm0czyxm5hcb381dn2hvmdg6k2gggq4jicnycm4rffl";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "10p1h4k728p18r2m08d165gx640946zf40a57cf9jwv0z6xa3hbq";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1ymgdbvcyq278gxx197jl0i0fiwf1gpycnkyc578g39gddzzh18g";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1azvfzffqgm15cavv5biy5ymn2wawszgrppk3mki1qnmwrlppx2p";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "19g7w461g73z0lnmzwkjavg416d54gclhac8bvc53hs7dr6kwnfh";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0m6rjgv8x33mhmnis86821djc3xsr2xfx5knajhnyrj5yycyy01p";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0xcpzlzff4s71miia4gnlxr0qvpipnqmk5lgnxjq27rh1isyasj6";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1h3bxk7lvd3ivh613805x5xrcfvbxnn0qzbpyy4bysk3lz9kb4bm";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1mabfvpwxnqhim9gvxb7qxapy6mzmrrhr4q6ai5w2ssyg0sxrb4b";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "14hzpw2phy6yc6ykx7ny22dqwic7lmkv96f6jhdmcwsjbq9jkj69";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1bk1ghwhzbgw6awxnz7w5wl49632rb708l8v080l6is3hb88l9gi";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "12yhzg22h1x6dmpmx79bryq94kii8brqasn49ahvshckx3i2y1hm";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1ag0f1qafm75k1zr5i0jzi3kgal7sw004s2qpq0mkda66p8sxwgv";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "0mc0760yyr23913x6g8f56mfrfwn8s1zav1hz3714jif7sjg6bjs";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "03c0x26plqlvpnsxv5k0x4j92n1dh9mdgg8f5qpwm7cq2k8pnl72";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0naglfrd0bkahq4pbxb7pi4nkp6cj09w0q8j4jnxf7b104rcj3fv";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0bmz5l4yasslaqql0zkp5s4k9rsw79rf37vnm6d4hprpckam051h";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1rykl2z38asa23aa5cqsmril5j0x57j0n0k4qygpy52ifc5gvvf7";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "18yc8hdn4m4h867di098qswdhyx0jsnsh3ax1ax1dfxrdzmy57rq";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "187mgq4s2gmhzd625rni8cmdpvhlnf6zn179wlp140lvdfzblr6c";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1726qd01iaq730c2dkjb8r8fw34fmqn741c5qz2i57f2f527vf8z";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0zip2v24ha69si76rjz4qpmwjqnv0w427qa5c1cgc19a04jnbi32";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1irrhlqmv2cij04kc29rhg0yamw4h6gqijjnhgj6a89gffqn9p1i";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "00pb7z1bqwbymzf91l82ggiqax7qf0pxhjgbbjj5aq25s8rc950v";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "10xixsja2jqhhfwp59yjvzvwmcqvfcs782y7j3wwxmh9a3m6ckzi";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1pxy8x8jgri25qr4v53kqnilk8hjqcq6mgdk8p795s0zi73bhh0a";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "15npn4nq91hxhqpnyvk2c0c7ka2mm6r6p3cm4amyb22dq8qqfw50";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "077anp6h7prj6hlxbm5lzxv8ria2zbrlgixxinf3cywxq0haajx2";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "06l5y2bl57sfx9jh9g5idl3y76sg4dysgxdvwp8sgg9yj19dnjmn";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1jr920hihgr27rfznzdn4rc6sz1wi97pnhvikz2hg7nzqrycmb8a";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1qr6hyh0pqskc4mc7655b5nzkvbmw3hzpzz5iiwp37n3w72ig9km";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "12bnagz2wq1i9zhs7rl6akr6a7h2pndrpqipdynj4dx0nvs0vc15";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "093mwn705f1bp3143pzm4h85hrjjr9fiiahbfvvy2ih6xv3x88nb";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1swcnfpv9n4561hl7rqivny7mcmnk95j495rvr8hs384gq2q1b67";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0x7b3jz0ilb4ww3yi70w36zkid2sgnf0mld1kxkkc8aacm00bmq9";
-}
-]
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix
deleted file mode 100644
index 42591369aea..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.2.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0w0p0ahh6xjk3i545vmkkaxb92s1liv8z0cgnpdh13y0i8gislzs";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "0wghv6q8mgj5cd2n56137zfxjw1jfy4y1d6x3wi0cjjjf61al4yj";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0g14kvfbzf9p9w5279ny1ziygn2zw0z4rpsm8b6msia9afa3vscp";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0kcbzwmk9dy0nwfjhrpmp97aqnpdrmy7lya16sikj98fwbd2d7i0";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0p3g5bwqwvr7mmwz583km498cb9jl4yr6s4v3jdx2w1pv0iqfbfx";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "03310xg8v5hdydi5najijni4nmkycarz2n7764vdl8h3wjlxs101";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "06h19xbbkhmmaicmkjzpa6w1hp5gq3bfblvdjdb4qwm3jbp09kz0";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "08wbgb4brgihpa7sk29lzihaqg8zv024cdd4fr6s5zvrpchx3s8s";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0a3cakngqampvczhgn52y942d131cqd68yjsr71adcgmm5r5iv7s";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "12pl1sm44bi2d07qliaazniy1a9h9jp7slvwn8l11pgfh7ygiyxn";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "1b7jd6clbwjyivpy94wz148gapdzvlggg38lv0a9zl6fkfpa6xbi";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "133wf25qhnls7a2i3s99kk8va21d2cg7v3khvgscpm1im8gi81nz";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "11szsx11vnwi3l41nsvk013nwx0gs8vdilr1jm8qz3zfbm14v7a7";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0fi443pcrjvnivi76llfssw52nzddvxrabqcqxr0czfak2r6nlf5";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0lqzaprzd7az7aslaswhdriwhcdsx9abxq90jwkpq2vliz7gxjp5";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0c32hmg7ns4z585bysq8iqjhbfp33a5wi6r0p1hqrh5y1sc3wjj9";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "060lk2l1q9p39z90qajhiqdsiiwk1qf221087mx5xny1z5ngnnim";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "17a9xpqbqgnhlfhr85v4n3ll88dzn3z4jk6nilq149c7dg8ilnma";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0k97r2j0iv017qrn9yh08cqji2pkrx5vy51jypr305ffmxy1dgn9";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "15vgih10aa11d048cazh1zjr6s08w34hp4xxp8cgcmpm11px460g";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "05x0bjn6dfn0k2v822sc6f45jk196sf1xj7ikn7ws7rm3nkc3sgp";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "00g7x922zxkscrkk8n9xc123qfzbmf7kkyavdsnz4jkx4msrlav3";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0zaxa42sgscbnb8zbp878qk9d5lwdm08szr9xda287jpvzw3asss";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "00l1rh7z8fapmb3ngxnp91xz1qz110r995jk42gw77hvmf0gabb6";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0d0b44vmiaazjsc4d7wlwg36n3ig87xj3m89hlhkhvwrisg5ccv8";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "04qrj66qd65yqv1zrwi1pspmwdj129m9kkmpa3rdfgml37ign7q8";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1zywlhg1yr2llr8cvn4gm4ap7kqgc2lff6yi75dd782whsphqm67";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "16s126qw8kvsvidrhh02y12y8wln3skg0cn6ri658mz2ld9iicvd";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1lrh3bly0hvzxa0zxibb45v2711fvv81i3ca9d628m68mzxim13q";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0hf9156vi0y17hlvrn18fsdfzpaq5ylprvv55i42idxfdjr1plmq";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1zrwwglpyw8qlqw9xyhz6pwjyrasdgfclaz2hicsgv1300nxjv4h";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "0nagjxn4pmmcz6762jz9dx42sarkjm7fpkblw9w42znx8zvn5nmw";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "0lb58d2vhpcnnnqnplq2i2fapkygyb47yq0rc7c93rsf10cw9n0v";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "08l4s3gwnz84sg5mlrj52wdclkm4yhj0a03jxwcfpgfypi3v0n84";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0m6c9dxcdqgcxlx4k160nra0g11im0c2f0hf1fyk1hkb6fdq2li9";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1kp8m2cc131arkhj7z6dsq69mh6abws7963avszbkf0zq31nnxp4";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "01ay3q7swf1vh72wrjlhpi0id7sa2a8pj8n79xn583mlzwcbmzwv";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "1rf288q1c412y161sk2y3yvy3pq159avih4d90k0laphfhhisjnv";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0mld9dmvj9c8xay587hm7dvrbx964zdhysyi4fldad54imc61rdc";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "18c3bws8fakii5qjm0vpni6fmzw6118ndmjz4v83nk6nmy6ww0i1";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "16q3jahvpw3lpxlwqxhhd8xc9qfra2chc6g5cik8dw011sqg0zaa";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0c62msjf34hz5f0il3x7wk4flpjk2w5f4vdpz43vr245qds2vxrl";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0vl8y4z60nxgkgkxkzqkak7gcyc2295nxm6hghmrhfn5zyfpp99k";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0wdv1lya8s4b97933dv72cvq7qa19ndp1knb0270pg5y74y2vq2s";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1lafrmz16j8kzs9nvrn6j84c7wyxzwpvnn0z6ic22bzg646m276y";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1cxy79ya3i2fm7b6w0ilpri0qrhm4bgkx3qwvgqz13lgw1p716qv";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "1jww7nfz8ssgqrldc11agnwv4plcr9vr4fv5q7bspa33hgm94r47";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0kflzm80pg8l5ing3xzp1g0n9hm1sky8201s2z05aahj2rcw4bws";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "15szx7r75d0iw21hwggp96zm9s5i7svsvmqfncvd79mdmnhr2x5i";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "16l7rkxw5am90dqrkjjdvih1dvchgkggf5rinv7bpfk5z65f0ccy";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "08phva4y5982qvrb050n4pl7gnr2yg4zvazfg9lh38ba63l6d2g8";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0byfyav76m7igwix5vj69bvl2rpaxmv8ncz1xc2azyrdxjba9ggd";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "176xnyxl7in1b3igy7vh6g2pz8ch32g0n6kddkkj0a13h69s5vyz";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0i71xxxpb6p95pa69frhxqb27i935bb1vxjb3i51yms95x3gbpjs";
-}
-]
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix
deleted file mode 100644
index 711ba9a7f3e..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.4.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "11dzsk6kvqpvpi77414hyis5s0kp4l0xplyyhvkp28shnbzx3cab";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "0f4j7s31gw9g183wsxh27dvqkckhrlh1yr4dmd6cjiabpnk5avr5";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "09f8dayah2gb4j70pljih8rvk6fiprfvmagii72ymfjw5p609msh";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "08jlsy3ak9c5jbwan5wsq4y66sz6pam5mym1hmjfwp1dzknd8lxn";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0lwk1qf6xnvxd6lmdif9126i4bna7cwk8dj0dd3s2qm4613gyjdz";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "16lm4k45rrxvc228bjzl57a39aybkh6kizm960znkfg8dslxvhnr";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1z0mkh7sqsblhar3fjind0m63mlx817fhw1r9f0jrijkwmv163cx";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "15611y569bk17ss62ic56ai6lwpqhg9apsqcnkdlh1iwk2wkzg8x";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1p75mfw2rs9qb0m2zybscrv2jhj7aq8w5a1rxs3hrddr2wc2k0g1";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0zj9qn2k160184x9lypxyl6d5r8drxz585lagsvd7l0ckx3maqxn";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0bc11cxjf8672mch30asn34pnn53a3xhz9wb4jly9bxy3bjs93m6";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1l1h1q65qsmrzgcvralpdmmmnpricbiyc5bhrd1valvgvwys2rj2";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1wsgvmacix0vd7qr029lsgnksw3hnx57aczigcf7m5dy1mi2jk1j";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1j7f32wsbnpzdhfki9wnb18mq26la61f6ksmad33cikq3pwn1qvf";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1l5cvnbkgv9kxn2b67ycmkyqkdpjzq3a8ggsmn4397bj9vlplcdy";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1lnayg8j76gzhxl21x5z92q3g8gc791c4hlgr3ifg54s8rknbbf6";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0z8ncf32qpp9538kb5l41qhvk0c05j168x5q72cfliigs77m9jya";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "10pjjkp4nhlrjlv38w3srl5x3fi8713qsbp4i92bksas6p1n6pnw";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1d4094ql7nzw5gvhgvdw9j8pacpnlbq76j9670wj5z5mxaggm5n4";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "18s7h8bldkhl55akglmdaq1kx1z8171g96ysxvljy3aqnv400cpd";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "14insp30nb18dva5rpd1mgixhbm6rrkbbs7wl796jqzxlxin1bbg";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "02mwbsg8cvnrqizcggpsq6r9hp26z4r5sg62iksknl4fahzi9jwa";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "0w3yncz364rd7jby39cqmmswh5p7i7hn08yfn038pj9k2wvg3nli";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "09ja8vnl8ykh9j0wdrmlwhjj71dsl0kl1mlsbi0c95dphbj58m0q";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "145r6lcf7mbnfv0kk0kxmd7aq80y5dlkxpp2fy31rigpkz8syiaz";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1s11lqac8j1qbp0fq67zq7jss7j60pwgprjki73s77icir5sijpv";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1y27ax3viixbhh6yrib9k4px0y4aj6fzpnyxd9j6yibh4gmkxa49";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "08nb4fv4hafxyhdxsdf29yh3nv5c0hb3ar0329xlw5kvkvfckgza";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1qzzbphcjl506wha4i9drzc0hrlrc4cicmw37vl1hylbkw7lfrdf";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1rqjv25y8s0g5mr47fasybcfvw36i9z41l8gpi3rdvv52b4s0n4c";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1cfdvbq40fk9f6xqz27bzy4shrh0i7sqbaf3l54f0zpgnqmk6c8a";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "1jz355nz34f15gic4hl09qdd648gjl3ybinbf5kpy0nj5d052lwj";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1v1f42cipx39i9as0k2arb51a4qizh65vdld35dlkfxnkkwl5gb2";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1mwrwwclds1fkwgak1fl148qpxblkk5jxbnjfl7lgc2a28c4w4y8";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "0x9jqq4jbf6664m201pjf0bk5m7kziqpc59ai6n3amq7ihg5zbyj";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1x8hr1sb36jnw9g897dww3c72hqrxhpjgnzm6x8xcqjb93rrjqnz";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1lvdz8hi5y6sia6il8x47k607dl11abmgpa07gvplv5g6gshm27q";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0pnzdz0ms85cqjd2aav2cm1w5rb3v0q96nz7b70dz9mnyxrnjiha";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1jgadk819ws6zcvkqrvjyx7kn0sgsdvmg15hi03mn4nijf8mzzlb";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "06yyrv21g0fyvisj45r9iqiclydj0y5lb4bkykd28f0g6nrcjlzv";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "040fnm9rmj156mn033axx6isa9fvaskw5dqzh40mjchqz4bgw6vx";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1p5glmm7a495b1avv9n9y1im04z8nxps13pf0crvzdwplkiin8id";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "19d10b807kg50jq03xgc84dksfcfmp1vimqjbfd53qgdxdfxa9c0";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1lpgyar5hq39463dsgwlmym5rgivyqyipls8l0km6sy24kmh43g6";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0600x4vgflbyg0vr97vqpd405j311780d983xrf22awbyqg3hiqa";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1zi3s9g4nykxrrpqm2fq8didip1jzv8iyscrg7fc8mls7ikz51bp";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "15zm9p0g4qrb2wz761gvpd05yz2pz8lpcsmdqx8lclvlqr58xl8v";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "039jmlljc3fdynsa27whmx50jb8jx3x7k1l6xdrijdk4j43j047p";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "05krj1b7z1rirr7141pyaxssnbgf74v8bcxhb2m9yb944nx2z1wx";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "19bkp5hsxd5zfgdwyc6bx1425phd8d9kd43xin13cdcikdq5nh6z";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "1fy0v0zd8mq59f3wlpn855ff8q8x6yy8a17vjnwfw69qmar0x4g8";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0h8kycdjg8cglb7sn5m4v8djwb4smhzmws2khr309nv4930vqf14";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0aaybsbbf19js8bxmj7kqqjnqp68fzkqdrbhjlh5c1jdxqvlr2w8";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "1xgndbjqhgw5pnws8qbb4xvrcnbr96m275hrhd3rb99q5xd4br20";
-}
-]
diff --git a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix b/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix
deleted file mode 100644
index 17236c067b9..00000000000
--- a/pkgs/desktops/kde-4.11/l10n/manifest-4.11.5.nix
+++ /dev/null
@@ -1,272 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1yfvdz1s46sg5d2x7jgr0srxc7mh844ir14n9mmiyk6hk69yzxpg";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "076mpcc5m52ap29hjf144d77c3xmg40qc3dypqxgpx1ya4an1lr1";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "15y1h0j7yw03h28mjhmnlbwnaa5cdv0n20f5gby77b3v2b7kjn5q";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "09md2hcj0bkjpsgqviw475v0g0pgbld728p8kx0aqckywsixagsp";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1adxgg4hp2s7js4q6pi6krjy32gl0dk9dgvw40310zb7nh59zbd0";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "00c8dd8w0d47fp113r3bbd1v1rpqd4qqjamsxbs0ygy0vc644d29";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0aa40dmrh3brdqra5c72czch75a44lcng68a7j6zzngdmjcn8wh8";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0kq0z37fxgl25zh6a7rj4fjram794iwchg8hqfdvzx3k6kfjgb9s";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "09gn22hlz99j3kra6k1hs76ypvv6whc9rav1hk1hqrvqaz0v78yf";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "178dqdmmgz52l8anmnnms91c39y9492ksl003snan1yd7r6dbfwj";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0amb1d4y201la37kmambhxwh1pb7b284z48npag863f4bqk491vm";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "04hyginzrzcf4143nw6ps3fpp3sx8wq30irfm4z2lpzl22137rr3";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0dwxcvnissa5jmng3dj5mgq7sm3lvfmzk11h4fhjnnjkna4ihsnm";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1xyg93g3c0p8bibv1vdx1wvivddfc41py1mn8kmib0cnkfprx5bw";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1acazq7x8lzb4r3qcmwllxhgnyc23lq0aamxrcnq7c8i8xya8byl";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "03a466yxp8wcnbgyrgzbpfy2kbnl9c0grsqqqbpkdfc07q1287rj";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0mqlrm6jq29w432s9qx8nsq7iyswlpi1n6l990i5gyk74n1jp03i";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "05gz0jj2bvq339qz190j79rb24avvgsih5dzibxapx99wq6s7v6x";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0gxjs051qfwhdp8g6ir3caxjflsv5k8va9w6zw5ziimfqkc78vph";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "05arlhsbb8qnsz22h020f4dgxqdy4fgf8fzkjjay1f5w47h381gw";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0kn7ngq6qrrbjk6m4178dkg81a2q1hcb3hg5jqz95875c08hsrjx";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1ca61pk19x3bm8fkf7mv9nwfvvawn8w4wlzgcprw3zba94dwm2zj";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "046fyhh4b1qca2m241w55xby9nh2lifdmb44z62i31bgvcfkgvp8";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1vid1xpqsdb3jvhm0vdb14d02p5s2vsks59inp50ympsmlsy2967";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "113sq6d1hlcmbdkwz61bbb0pmwj0wixa1pgv9gm1r61qnix6hskb";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1rlnazib921cv8fjzjm6c928cwlh6si116iq5l1jq4czwcb3j9d3";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1prpqwznyxpxm4i0ka4ja5j1d0gljpvhbh9r7a574ai8k419p6jq";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "09p3vpyj0lw6f470jcbahalw8nh5k7adxaxh4vby7k6r8vip4d74";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1lfv6xf5dhw9hr9jq1ak0dyz3yzwqf3g4cxv3xm27lxks95ddh3r";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1s7vi6952pqrm5b1qm1vlmkxna1lijnbgcdmr0n9y31gi066nh5j";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1lvc0zz5wh5f4nihrvwag4q7dajczm50nfdyvhmbl68gjkar1asw";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "001fjpvqg3z4g214cl8qmvsn1yc7rmkqnajbb1c4wflipvhyyq2w";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "18h2y6i4mzkwwwva5jq2wrbc159hdk9djhr26ilzqb8h065j83bn";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "19kc92ipw94mp9pawxgm0kbq3g1rf6p05892c62nm28vqbmmxbp0";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1zrz65m9q6jylc32rch7iscjjzr5w8cjkxja9xjl0gip409cnl33";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1yj0jv0p4scy8q6f6g7zl2c2qybhnp6skj8jnv6sj4q9prp6qwmb";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0sq17776sjkr6lmj4323377a2aljaf1clrm1qk0zmd3036nh2pgx";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "1xg1fjk77g581fihvspn3936b7j3acgiipn9y4z4fxfr0flmvcxx";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0y8w7nl1ck1hnb5bs2zirpp62cqzh1hps153gqkl2p1hw47dq92k";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1bvilvia5k4a556d5pn4lvmlm58xxv1d7d858gsr5yvnkrixdryi";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0gcb87gwymcz197y0fbb6qnd1w5kkid25sywnjp06nymjnspwqhp";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1z3g2xmskyh9ykimh396055ywhv9hj49nc2rk7fgc20g61wcnglc";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "055a055h3nhvpgaxs87d55va2kyhk72gf9chrqgqjp5wgbs4cpx4";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "07qw1azmqq7rlyd9ngv3wf474w44cqn40fvcpa4hm13kvf19q7d3";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1qks72arnk10k4brms6p1m3i4b6kxrgf581xnyhf2v4rch80ccdn";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0dxkjrcpq9c8qbh5hkjzqcwpqpsfxa5ki8x975kqlh40gcc0942i";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "1qi2sr3l7q2cdypi1m3axhm2ciqnzf88hk52dfcvwqfa4y8n3zgv";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1d6s3n7v6a8wwrh9lbnjh74dxdxnbg138mm5s09418fxl5vi7gaq";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "145j3k5qc6792q955vyxd582sw3ssvp1anvindf04n4dv3nqk24s";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0vasjp5liigq2gp9dzwz59316jkj7bv3a9kfmfkyj7bs11rbvsx6";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "1xqa0cb5fcras13vsmnsrdag26csgab0jrgwhsdisrsisrla6dxk";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "1gblglgbznlsxghm2ib9h83jchsa07g8kr1cnb4zn43n7dsr8h6s";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1ff14fxsm2m86i90v7dp4872r3hlxz13dfmkhhpyscy62fl3bzy4";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "039ww6fa0hcmshd4ximwmj29102qg4xx1p96idcwqwkcf3lryhw2";
-}
-]
diff --git a/pkgs/desktops/kde-4.11/oxygen-icons.nix b/pkgs/desktops/kde-4.11/oxygen-icons.nix
deleted file mode 100644
index d7679cc3d01..00000000000
--- a/pkgs/desktops/kde-4.11/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1y765lfsy63kc4h1g1f3fc42aqlhn7svmidrkxm12nia4jazj6db";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.11/support/akonadi/default.nix b/pkgs/desktops/kde-4.11/support/akonadi/default.nix
deleted file mode 100644
index d51996e3bc1..00000000000
--- a/pkgs/desktops/kde-4.11/support/akonadi/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.11.0";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f082e973949..579e8d741d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9978,14 +9978,6 @@ let
 
   kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 
-  kde411 = kdePackagesFor (pkgs.kde411 // {
-      boost = boost149;
-      eigen = eigen2;
-      libotr = libotr_3_2;
-      libusb = libusb1;
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.11;
-
   kde412 = kdePackagesFor (pkgs.kde412 // {
       eigen = eigen2;
       libusb = libusb1;

From 5d5ca7b26030d8ec96138985d20508909c2c690d Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 21 Apr 2014 18:37:35 +0200
Subject: [PATCH 0401/2033] grsecurity: Update all patches

stable:  3.0-3.2.57-201404131252            -> 3.0-3.2.57-201404182109
test:    3.0-3.13.10-201404141717           -> 3.0-3.14.1-201404201132
vserver: 3.0-3.2.57-vs2.3.2.16-201404131253 -> 3.0-3.2.57-vs2.3.2.16-201404182110
---
 nixos/modules/security/grsecurity.nix     |  2 +-
 pkgs/os-specific/linux/kernel/patches.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 90462a2d6d0..e6db05e11f4 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -14,7 +14,7 @@ let
   stable-patch = with pkgs.kernelPatches;
     if cfg.vserver then grsecurity_vserver else grsecurity_stable;
   stableKernel = mkKernel pkgs.linux_3_2  stable-patch;
-  testKernel   = mkKernel pkgs.linux_3_13 pkgs.kernelPatches.grsecurity_unstable;
+  testKernel   = mkKernel pkgs.linux_3_14 pkgs.kernelPatches.grsecurity_unstable;
 
   ## -- grsecurity configuration -----------------------------------------------
 
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index f42bf440c3b..9f07d9428a8 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,23 +86,23 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "201404131252";
+      revision  = "201404182109";
       branch    = "stable";
-      sha256    = "1yic257h2vy3175c34i54873lc93y0m57rw1d059wz1wxy9waiwl";
+      sha256    = "1gnyxbwic9f847dz6kqp8d03nspbzb976ljv9ri7f78ydpskij6x";
     };
 
   grsecurity_vserver = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "vs2.3.2.16-201404131253";
+      revision  = "vs2.3.2.16-201404182110";
       branch    = "vserver";
-      sha256    = "0grhd9hbk952dwr91syi5pda1iccmcd8s0l3ki13689z8ns35f7k";
+      sha256    = "05ydjal2w33j6jbi0bm8k7669j0hhgg2mjg23r6gzaln73fg1gww";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.13.10";
-      revision  = "201404141717";
+    { kversion  = "3.14.1";
+      revision  = "201404201132";
       branch    = "test";
-      sha256    = "1vraf9g7za0syx5c1x1ks7kgaxc9mjspy6pvgrs0vi326v12sqnx";
+      sha256    = "1xydv1846gl98jcnzlydhsy75qqcq9h3krhb7r9zn21vjj7jga9p";
     };
 
   grsec_fix_path =

From ad8aeebad83a53392cdaa0356a81d0b1492f6f28 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 20 Apr 2014 23:25:07 +0400
Subject: [PATCH 0402/2033] vim-plugins: update and upgrade

---
 pkgs/misc/vim-plugins/default.nix | 51 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index f410f25e8cb..976e4dc687f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit }:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }:
 
 /*
 About Vim and plugins
@@ -111,12 +111,12 @@ in rec
   YouCompleteMe = stdenv.mkDerivation {
     src = fetchgit {
       url = "https://github.com/Valloric/YouCompleteMe.git";
-      rev = "ee12530df0574e18289d6daf25ff72bd3c6e94f5";
-      sha256 = "1z93l2v0s078h632jrlhxzs9pg8phnx60qlrrhb3l2nbfk047rgx";
-    };
-
-    name = "youcompleteme-git-ee12530df0";
-    buildInputs = [ python cmake ];
+      rev = "abfc3ee36adab11c0c0b9d086a164a69006fec79";
+      sha256 = "1d25dp5kgqickl06hqvx4j3z51zblhsn3q3by2hayyj3g2zps4gm";
+     };
+ 
+    name = "youcompleteme-git-abfc3ee";
+    buildInputs = [ python cmake clang.clang ];
 
     configurePhase = ":";
 
@@ -127,7 +127,7 @@ in rec
 
       mkdir $target/build
       cd $target/build
-      cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7
+      cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
       make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
 
       ${vimHelpTags}
@@ -148,12 +148,12 @@ in rec
   };
 
   syntastic = simpleDerivation rec {
-    version = "3.1.0";
+    version = "3.4.0";
     name    = "vim-syntastic-${version}";
 
     src = fetchurl {
       url    = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz";
-      sha256 = "155zfb5z0gmd1xrpna4varqf502lq0cr41gmxq5v71r6kmb7ql82";
+      sha256 = "0h8vfs6icpfwc41qx6n6rc1m35haxp2gaswg9fhcki2w2ikp6knb";
     };
 
     path = "syntastic";
@@ -168,11 +168,12 @@ in rec
     path = "vim-coffee-script";
   };
 
-  command_T = simpleDerivation {
-    name = "vim-command-t-1.4";
+  command_T = simpleDerivation rec {
+    version = "1.8";
+    name = "vim-command-t-${version}";
     src = fetchurl {
-      url    = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
-      sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
+      url    = "https://github.com/wincent/Command-T/archive/${version}.tar.gz";
+      sha256 = "ad8664292e6eee40fbe195d856d20d93a8630e8c0149317ad72cc39423630800";
     };
     path = "Command-T";
     buildInputs = [ perl ruby ];
@@ -184,10 +185,11 @@ in rec
     '';
   };
 
-  eighties = simpleDerivation {
-    name = "vim-eighties-1.0.4";
+  eighties = simpleDerivation rec {
+    version = "1.0.4";
+    name = "vim-eighties-${version}";
     src = fetchurl {
-      url    = "https://github.com/justincampbell/vim-eighties/archive/1.0.4.tar.gz";
+      url    = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz";
       sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr";
     };
     path = "eighties";
@@ -258,7 +260,7 @@ in rec
   };
 
   tagbar = simpleDerivation rec {
-    version = "2.5";
+    version = "2.6.1";
     name    = "vim-tagbar-${version}";
 
     meta = with stdenv.lib; {
@@ -271,7 +273,7 @@ in rec
 
     src = fetchurl {
       url    = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz";
-      sha256 = "1s4aic3qbk2ra2cif06g16d0avlmpxhrm96dksrw9qnv4hcjqqxr";
+      sha256 = "c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb";
     };
 
     path = "tagbar";
@@ -317,7 +319,7 @@ in rec
   };
 
   vimproc = simpleDerivation rec {
-    version = "5cf4c6bfe9bf0649159b5648d736d54c96e99b3e";
+    version = "7788b5f934bc7460c1e9134b51fe5690b21de83c";
     name    = "vimproc-${version}";
 
     meta = with stdenv.lib; {
@@ -329,10 +331,11 @@ in rec
       platforms   = platforms.unix;
     };
 
-    src = fetchurl {
-      url    = "${meta.homepage}/archive/${version}.tar.gz";
-      sha256 = "0f76mc7v3656sf9syaq1rxzk3dqz6i5w190wgj15sjjnapzd956p";
-    };
+    src = fetchgit {
+      url = "https://github.com/Shougo/vimproc.vim.git";
+      rev = "${version}";
+      sha256 = "0ahmnzccf5rv8rwg7b6pfgxh8pcmq955aznjv64slyh0mjqmh6jl";
+     };
 
     buildInputs = [ which ];
 

From 3ad27289fc757bdc6eee8d31ba366a433b36f17f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 8 Apr 2014 18:43:58 +0200
Subject: [PATCH 0403/2033] nixos/tests/avahi: Fix race condition on mDNS test

---
 nixos/tests/avahi.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 4091e7ece50..b6f18087c56 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -21,12 +21,13 @@ import ./make-test.nix {
 
        # mDNS.
        $one->waitForUnit("network.target");
+       $two->waitForUnit("network.target");
+
        $one->succeed("avahi-resolve-host-name one.local | tee out >&2");
        $one->succeed("test \"`cut -f1 < out`\" = one.local");
        $one->succeed("avahi-resolve-host-name two.local | tee out >&2");
        $one->succeed("test \"`cut -f1 < out`\" = two.local");
 
-       $two->waitForUnit("network.target");
        $two->succeed("avahi-resolve-host-name one.local | tee out >&2");
        $two->succeed("test \"`cut -f1 < out`\" = one.local");
        $two->succeed("avahi-resolve-host-name two.local | tee out >&2");

From ce422b45530ea9d308ecf86aab8898b28f58f0ca Mon Sep 17 00:00:00 2001
From: Vincent Bernardoff <vb@luminar.eu.org>
Date: Mon, 21 Apr 2014 23:04:59 +0200
Subject: [PATCH 0404/2033] Updated OCaml package findlib

---
 lib/maintainers.nix                              | 1 +
 pkgs/development/tools/ocaml/findlib/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78355eff004..c9648f2d642 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -81,6 +81,7 @@
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
+  vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
   viric = "Lluís Batlle i Rossell <viric@viric.name>";
   vizanto = "Danny Wilson <danny@prime.vc>";
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index ec19d55c58e..18b03f5923b 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -5,11 +5,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-findlib-1.4";
+  name = "ocaml-findlib-1.4.1";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/findlib-1.4.tar.gz;
-    sha256 = "1y5xy6crldyh8pl9ca2cj31igbjfkicr9zqkq9p1fccxszjnah3f";
+    url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz;
+    sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf";
   };
 
   buildInputs = [m4 ncurses ocaml];
@@ -53,6 +53,7 @@ stdenv.mkDerivation {
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z
+      stdenv.lib.maintainers.vbmithr
     ];
   };
 }

From 5db9287b7cb65f5e28cf28fa1cbdf1c403a5e1ef Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 18 Apr 2014 12:21:20 +0200
Subject: [PATCH 0405/2033] rtkit: Update from 0.10 to 0.11

---
 nixos/modules/security/rtkit.nix         |  5 +++++
 pkgs/os-specific/linux/rtkit/default.nix | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index ba07591bb77..afe93f24273 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -25,8 +25,13 @@ with lib;
 
   config = mkIf config.security.rtkit.enable {
 
+    security.polkit.enable = true;
+
+    # To make polkit pickup rtkit policies
     environment.systemPackages = [ pkgs.rtkit ];
 
+    systemd.packages = [ pkgs.rtkit ];
+
     services.dbus.packages = [ pkgs.rtkit ];
 
     users.extraUsers = singleton
diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index 05ebd0bf845..fe392fb0841 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -1,15 +1,19 @@
 { stdenv, fetchurl, pkgconfig, dbus, libcap }:
 
 stdenv.mkDerivation rec {
-  name = "rtkit-0.10";
+  name = "rtkit-0.11";
   
   src = fetchurl {
-    url = "http://0pointer.de/public/${name}.tar.gz";
-    sha256 = "08118ya3pkxd6gbbshas23xwj483169fqmxzhp5sgmfr16n97skl";
+    url = "http://0pointer.de/public/${name}.tar.xz";
+    sha256 = "1l5cb1gp6wgpc9vq6sx021qs6zb0nxg3cn1ba00hjhgnrw4931b8";
   };
 
+  configureFlags = [
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
+
   buildInputs = [ pkgconfig dbus libcap ];
-  
+
   meta = {
     homepage = http://0pointer.de/blog/projects/rtkit;
     descriptions = "A daemon that hands out real-time priority to processes";

From 0f9499887eb0e2f3ed2fd79ba90cfd3d5fcc42f3 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 18 Apr 2014 12:22:02 +0200
Subject: [PATCH 0406/2033] pulseaudio: Update from 4.0 to 5.0

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 4b23cb4173c..35922b3c46f 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -8,11 +8,11 @@
 assert jackaudioSupport -> jackaudio != null;
 
 stdenv.mkDerivation rec {
-  name = "pulseaudio-4.0";
+  name = "pulseaudio-5.0";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-4.0.tar.xz";
-    sha256 = "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim";
+    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz";
+    sha256 = "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr";
   };
 
   # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.

From cfa5b5778c3318ccb2f6784632a37bbd847d3aa7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 21 Apr 2014 11:50:49 +0200
Subject: [PATCH 0407/2033] pulseaudio module: Use pid-file for system-wide
 daemon, add loglevel option

---
 nixos/modules/config/pulseaudio.nix | 42 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index eedc4ca2b2f..9802b898a5d 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -7,18 +7,20 @@ let
 
   cfg = config.hardware.pulseaudio;
 
+  systemWide = cfg.enable && cfg.systemWide;
+  nonSystemWide = cfg.enable && !cfg.systemWide;
+
   uid = config.ids.uids.pulseaudio;
   gid = config.ids.gids.pulseaudio;
 
-  pulseRuntimePath = "/var/run/pulse";
+  stateDir = "/run/pulse";
 
   # Create pulse/client.conf even if PulseAudio is disabled so
   # that we can disable the autospawn feature in programs that
   # are built with PulseAudio support (like KDE).
   clientConf = writeText "client.conf" ''
-    autospawn=${if (cfg.enable && !cfg.systemWide) then "yes" else "no"}
-    ${optionalString (cfg.enable && !cfg.systemWide)
-      "daemon-binary=${cfg.package}/bin/pulseaudio"}
+    autospawn=${if nonSystemWide then "yes" else "no"}
+    ${optionalString nonSystemWide "daemon-binary=${cfg.package}/bin/pulseaudio"}
   '';
 
   # Write an /etc/asound.conf that causes all ALSA applications to
@@ -68,7 +70,7 @@ in {
 
       configFile = mkOption {
         type = types.uniq types.path;
-        default = "${pulseaudio}/etc/pulse/default.pa";
+        default = "${cfg.package}/etc/pulse/default.pa";
         description = ''
           The path to the configuration the PulseAudio server
           should use. By default, the "default.pa" configuration
@@ -86,6 +88,17 @@ in {
           default PulseAudio in Nixpkgs.
         '';
       };
+
+      daemon = {
+        logLevel = mkOption {
+          type = types.str;
+          default = "notice";
+          description = ''
+            The log level that the system-wide pulseaudio daemon should use,
+            if activated.
+          '';
+        };
+      };
     };
 
   };
@@ -111,21 +124,20 @@ in {
       security.rtkit.enable = true;
     })
 
-    (mkIf (cfg.enable && !cfg.systemWide) {
+    (mkIf nonSystemWide {
       environment.etc = singleton {
         target = "pulse/default.pa";
         source = cfg.configFile;
       };
     })
 
-    (mkIf (cfg.enable && cfg.systemWide) {
+    (mkIf systemWide {
       users.extraUsers.pulse = {
         # For some reason, PulseAudio wants UID == GID.
         uid = assert uid == gid; uid;
         group = "pulse";
         extraGroups = [ "audio" ];
         description = "PulseAudio system service user";
-        home = pulseRuntimePath;
       };
 
       users.extraGroups.pulse.gid = gid;
@@ -134,15 +146,15 @@ in {
         description = "PulseAudio System-Wide Server";
         wantedBy = [ "sound.target" ];
         before = [ "sound.target" ];
-        path = [ cfg.package ];
-        environment.PULSE_RUNTIME_PATH = pulseRuntimePath;
+        environment.PULSE_RUNTIME_PATH = stateDir;
         preStart = ''
-          mkdir -p --mode 755 ${pulseRuntimePath}
-          chown -R pulse:pulse ${pulseRuntimePath}
-        '';
-        script = ''
-          exec pulseaudio --system -n --file="${cfg.configFile}"
+          mkdir -p --mode 755 ${stateDir}
+          chown -R pulse:pulse ${stateDir}
         '';
+        serviceConfig = {
+          ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
+          PIDFile = "${stateDir}/pid";
+        };
       };
     })
   ];

From 2a4282c8112313b9ed4ba929bf7ac68dcd09a2e1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Apr 2014 18:30:05 -0400
Subject: [PATCH 0408/2033] Revert "Merge branch
 'dbus-switch-to-configuration'"

This seems to have combined badly with the systemd upgrade, we'll revert
for now and revisit after the 14.04 branch.

This reverts commit ad80532881119b642d63c7d126e46f4e26cdb0be, reversing
changes made to 1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.
---
 .../activation/switch-to-configuration.pl     | 45 +++++++++----------
 nixos/modules/system/activation/top-level.nix |  2 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 25b5afe99da..4cea0c5910c 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
-use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -63,18 +62,17 @@ syslog(LOG_NOTICE, "switching to system configuration $out");
 # virtual console 1 and we restart the "tty1" unit.
 $SIG{PIPE} = "IGNORE";
 
-my $dbus = Net::DBus->find;
-my $systemdService = $dbus->get_service('org.freedesktop.systemd1');
-my $systemdManager = $systemdService->get_object('/org/freedesktop/systemd1');
-
 sub getActiveUnits {
+    # FIXME: use D-Bus or whatever to query this, since parsing the
+    # output of list-units is likely to break.
+    my $lines = `LANG= @systemd@/bin/systemctl list-units --full`;
     my $res = {};
-    foreach my $unit (@{ $systemdManager->ListUnits() }) {
-        $res->{$unit->[0]} = {
-            load => $unit->[2],
-            state => $unit->[3],
-            substate => $unit->[4]
-        };
+    foreach my $line (split '\n', $lines) {
+        chomp $line;
+        last if $line eq "";
+        $line =~ /^\*?\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
+        next if $1 eq "UNIT";
+        $res->{$1} = { load => $2, state => $3, substate => $4 };
     }
     return $res;
 }
@@ -299,7 +297,7 @@ foreach my $device (keys %$prevSwaps) {
 if (scalar @unitsToStop > 0) {
     @unitsToStop = unique(@unitsToStop);
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-    $systemdManager->StopUnit($_, "replace") for @unitsToStop;
+    system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
 }
 
 print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n"
@@ -314,22 +312,21 @@ system("$out/activate", "$out") == 0 or $res = 2;
 # Restart systemd if necessary.
 if (abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd")) {
     print STDERR "restarting systemd...\n";
-
-    $systemdManager->Reexecute();
+    system("@systemd@/bin/systemctl", "daemon-reexec") == 0 or $res = 2;
 }
 
 # Forget about previously failed services.
-$systemdManager->ResetFailed();
+system("@systemd@/bin/systemctl", "reset-failed");
 
-# Make systemd reload its units
-$systemdManager->Reload();
+# Make systemd reload its units.
+system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
 # Restart changed services (those that have to be restarted rather
 # than stopped and started).
 my @restart = unique(split('\n', read_file($restartListFile, err_mode => 'quiet') // ""));
 if (scalar @restart > 0) {
     print STDERR "restarting the following units: ", join(", ", sort(@restart)), "\n";
-    $systemdManager->Restart($_, "replace") for @restart;
+    system("@systemd@/bin/systemctl", "restart", "--", @restart) == 0 or $res = 4;
     unlink($restartListFile);
 }
 
@@ -341,7 +338,7 @@ if (scalar @restart > 0) {
 # systemd.
 my @start = unique("default.target", "timers.target", "sockets.target", split('\n', read_file($startListFile, err_mode => 'quiet') // ""));
 print STDERR "starting the following units: ", join(", ", sort(@start)), "\n";
-$systemdManager->StartUnit($_, "replace") for @start;
+system("@systemd@/bin/systemctl", "start", "--", @start) == 0 or $res = 4;
 unlink($startListFile);
 
 # Reload units that need it.  This includes remounting changed mount
@@ -349,12 +346,12 @@ unlink($startListFile);
 my @reload = unique(split '\n', read_file($reloadListFile, err_mode => 'quiet') // "");
 if (scalar @reload > 0) {
     print STDERR "reloading the following units: ", join(", ", sort(@reload)), "\n";
-    $systemdManager->ReloadUnit($_, "replace") for @reload;
+    system("@systemd@/bin/systemctl", "reload", "--", @reload) == 0 or $res = 4;
     unlink($reloadListFile);
 }
 
 # Signal dbus to reload its configuration.
-$systemdManager->ReloadUnit("dbus.service", "replace");
+system("@systemd@/bin/systemctl", "reload", "dbus.service");
 
 # Print failed and new units.
 my (@failed, @new, @restarting);
@@ -365,9 +362,11 @@ while (my ($unit, $state) = each %{$activeNew}) {
     }
     elsif ($state->{state} eq "auto-restart") {
         # A unit in auto-restart state is a failure *if* it previously failed to start
-        my $unit = $systemdManager->GetUnit($unit);
+        my $lines = `@systemd@/bin/systemctl show '$unit'`;
+        my $info = {};
+        parseKeyValues($info, split("\n", $lines));
 
-        if ($unit->ExecMainStatus ne '0') {
+        if ($info->{ExecMainStatus} ne '0') {
             push @failed, $unit;
         }
     }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 1600a1fb010..7cdaecce198 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -109,7 +109,7 @@ let
     configurationName = config.boot.loader.grub.configurationName;
 
     # Needed by switch-to-configuration.
-    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.XMLTwig}/lib/perl5/site_perl -I${pkgs.perlPackages.XMLParser}/lib/perl5/site_perl -I${pkgs.perlPackages.NetDBus}/lib/perl5/site_perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   };
 
 

From 123ef8a57b96da4d6fce7e633e2b82d4cbc5c547 Mon Sep 17 00:00:00 2001
From: Vincent Bernardoff <vb@luminar.eu.org>
Date: Tue, 22 Apr 2014 00:31:27 +0200
Subject: [PATCH 0409/2033] Updated OCaml package pcre

---
 pkgs/development/ocaml-modules/pcre/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index 3ddac79a9a5..6df221a9244 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, pcre, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-pcre-6.2.5";
+  name = "ocaml-pcre-7.0.4";
 
   src = fetchurl {
-    url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-6.2.5.tar.gz;
-    sha256 = "0iwfi0wmw3xbx31ri96pmrsmmn4r3h9f0k6gyk8j4pajlhl40xzi";
+    url = https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-7.0.4.tar.gz;
+    sha256 = "0h2qlza7jkzgrglw1k0fydpbil0dgpv526kxyyd1apdbyzhb0mpw";
   };
 
   buildInputs = [ocaml findlib];
@@ -15,13 +15,11 @@ stdenv.mkDerivation {
 
   configurePhase = "true";	# Skip configure phase
 
-  meta = {
-    homepage = "http://www.ocaml.info/home/ocaml_sources.html";
+  meta = with stdenv.lib; {
+    homepage = "https://bitbucket.org/mmottl/pcre-ocaml";
     description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
-    license = "LGPL";
+    license = licenses.lgpl21;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-    ];
+    maintainers = with maintainers; [ z77z vbmithr ];
   };
 }

From adf38bb8d58b684cbe3b8d88cc9f30ec2cbd5cf6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 21 Apr 2014 13:30:30 -0300
Subject: [PATCH 0410/2033] Sword: update to 1.7.2 (and adding myself to
 maintainers)

---
 pkgs/development/libraries/sword/default.nix  | 11 +++---
 .../sword/dont_include_curl_types_h.patch     | 24 -------------
 pkgs/development/libraries/sword/gcc47.patch  | 35 -------------------
 3 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 pkgs/development/libraries/sword/dont_include_curl_types_h.patch
 delete mode 100644 pkgs/development/libraries/sword/gcc47.patch

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index f8c5a213ee3..e6769285fc8 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -2,20 +2,17 @@
 
 stdenv.mkDerivation rec {
 
-  version = "1.6.2";
+  version = "1.7.2";
 
   name = "sword-${version}";
 
   src = fetchurl {
-    url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/${name}.tar.gz";
-    sha256 = "1fc71avaxkhx6kckjiflw6j02lpg569b9bzaksq49i1m87awfxmg";
+    url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
+    sha256 = "ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871";
   };
 
   buildInputs = [ pkgconfig icu clucene_core curl ];
 
-  # because curl/types.h disappeared since at least curl 7.21.7
-  patches = [ ./dont_include_curl_types_h.patch ./gcc47.patch ];
-
   prePatch = ''
     patchShebangs .;
   '';
@@ -27,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.crosswire.org/sword/;
     platforms = stdenv.lib.platforms.linux;
     license = "GPLv2";
-    maintainers = [ stdenv.lib.maintainers.piotr ];
+    maintainers = [ stdenv.lib.maintainers.piotr stdenv.lib.maintainers.AndersonTorres ];
   };
 
 }
diff --git a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch b/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
deleted file mode 100644
index 233d59a3243..00000000000
--- a/pkgs/development/libraries/sword/dont_include_curl_types_h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
-index 7d2fd3c..046291e 100644
---- a/src/mgr/curlftpt.cpp
-+++ b/src/mgr/curlftpt.cpp
-@@ -26,7 +26,6 @@
- #include <fcntl.h>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <swlog.h>
-diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp
-index b736050..229d4dd 100644
---- a/src/mgr/curlhttpt.cpp
-+++ b/src/mgr/curlhttpt.cpp
-@@ -25,7 +25,6 @@
- #include <cctype>
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include <swlog.h>
diff --git a/pkgs/development/libraries/sword/gcc47.patch b/pkgs/development/libraries/sword/gcc47.patch
deleted file mode 100644
index 7b55de75b64..00000000000
--- a/pkgs/development/libraries/sword/gcc47.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/419505
-
-
---- a/include/multimapwdef.h
-+++ b/include/multimapwdef.h
-@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> {
- public:
- 	typedef std::pair<const Key, T> value_type;
- 	T& getWithDefault(const Key& k, const T& defaultValue) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, defaultValue));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, defaultValue));
- 		}
--		return (*(find(k))).second;
-+		return (*(this->find(k))).second;
- 	}
- 
- 	T& operator[](const Key& k) {
--		if (find(k) == this->end()) {
--			insert(value_type(k, T()));
-+		if (this->find(k) == this->end()) {
-+			this->insert(value_type(k, T()));
- 		}
--		return (*(find(k))).second;
-+		return (*(this->find(k))).second;
- 	}
- 	bool has(const Key& k, const T &val) const {
--		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
--		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
-+		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
-+		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
- 		for (; start!=end; start++) {
- 			if (start->second == val)
- 				return true;

From 28229d8ef13fdbdb82ffa46eae8badae9de7ac56 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 22 Apr 2014 05:54:39 +0200
Subject: [PATCH 0411/2033] SDL: Add alsaLib to propagatedNativeBuildInputs.

This is needed because the pkgconfig file contains linker flags for
alsa-lib. And we had it propagated before already.

Should fix build of quite a lot of SDL dependencies, such as SDL_image:

https://hydra.nixos.org/build/10558332

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/SDL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index ee3640fe64b..110bfc01520 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
   # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
   propagatedNativeBuildInputs =
     stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
+    stdenv.lib.optional alsaSupport alsaLib ++
     stdenv.lib.optional pulseaudioSupport pulseaudio;
 
   buildInputs = let
@@ -33,8 +34,7 @@ stdenv.mkDerivation rec {
   in stdenv.lib.optional notMingw audiofile;
 
   nativeBuildInputs = [ pkgconfig ] ++
-    stdenv.lib.optional openglSupport [ mesa ] ++
-    stdenv.lib.optional alsaSupport alsaLib;
+    stdenv.lib.optional openglSupport [ mesa ];
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems

From 65fcb8d503f6be6a42fc55434b6608b866f12cfc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 21 Apr 2014 10:11:48 +0200
Subject: [PATCH 0412/2033] miro: Fix parsing of youtube feeds.

Youtube feeds now don't append a "sig" query string argument anymore, so
all those feeds would fail without this patch. For the latter, a pull
request already exists on upstream at pculture/miro#428, so I guess we
can drop our patch upon release of the next new upstream bugfix release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/video/miro/default.nix         |  2 ++
 pkgs/applications/video/miro/youtube-feeds.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/applications/video/miro/youtube-feeds.patch

diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 528eeff7e23..9c4b603095d 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -22,6 +22,8 @@ buildPythonPackage rec {
   patches = [ ./gconf.patch ];
 
   postPatch = ''
+    patch -p1 -d .. < "${./youtube-feeds.patch}"
+
     sed -i -e 's/\$(shell which python)/python/' Makefile
     sed -i -e 's|/usr/bin/||' -e 's|/usr||' \
            -e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py
diff --git a/pkgs/applications/video/miro/youtube-feeds.patch b/pkgs/applications/video/miro/youtube-feeds.patch
new file mode 100644
index 00000000000..1527fa6a5b6
--- /dev/null
+++ b/pkgs/applications/video/miro/youtube-feeds.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/flashscraper.py b/lib/flashscraper.py
+index 323dbe4..d203b78 100644
+--- a/lib/flashscraper.py
++++ b/lib/flashscraper.py
+@@ -134,9 +134,7 @@ def _youtube_callback_step2(info, video_id, callback):
+         # strip url= from url=xxxxxx, strip trailer.  Strip duplicate params.
+         for fmt, stream_map_data in zip(fmt_list, stream_map):
+             stream_map = cgi.parse_qs(stream_map_data)
+-            url_base = stream_map['url'][0]
+-            sig_part = '&signature=' + stream_map['sig'][0]
+-            fmt_url_map[fmt] = url_base + sig_part
++            fmt_url_map[fmt] = stream_map['url'][0]
+ 
+         title = params.get("title", ["No title"])[0]
+         try:

From f122e0e229354c0961cdd547a1aa0c8068433a0a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 22 Apr 2014 07:22:00 +0200
Subject: [PATCH 0413/2033] dmenu: Patch in store path to dmenu_run.

If dmenu isn't installed in the user environment, dmenu_run will fail
because it searches $PATH for its own binaries.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/misc/dmenu/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 048514ad4aa..3fecddcb316 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
 
   patches = optional enableXft xftPatch;
 
+  postPatch = ''
+    sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
+  '';
+
   preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
 
   meta = { 

From 6fec10dda37e7dc246cb2574bf528292e291c51f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 10:05:51 +0200
Subject: [PATCH 0414/2033] libmicrohttpd: Disable tests

http://hydra.nixos.org/build/10584971
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index d9dfaa004de..d2237e22fce 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
        done
     '';
 
-  doCheck = true;
+  # Disabled because the tests can time-out.
+  doCheck = false;
 
   meta = {
     description = "GNU libmicrohttpd, an embeddable HTTP server library";

From 396da207391b3b16d511b6fa6bbed035af82a6e8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 22 Apr 2014 10:32:54 +0200
Subject: [PATCH 0415/2033] miro: Fix desktop schema GSettings path.

The real path of the schemas is:

$out/share/gsettings-schemas/gsettings-desktop-schemas-3.10.1/glib-2.0/schemas

While the previous approach was to load schemas from:

$out/share/glib-2.0/schemas

So, we're now relying on the setup hook of glib to find the right schema
path.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/video/miro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 9c4b603095d..7572bedc1e0 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -57,12 +57,12 @@ buildPythonPackage rec {
     wrapProgram "$out/bin/miro" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
       --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share"
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
   buildInputs = [
     pkgconfig pyrex096 ffmpeg boost glib pygobject gtk2 webkitgtk2 libsoup
-    pygtk taglib
+    pygtk taglib gsettings_desktop_schemas
   ];
 
   propagatedBuildInputs = [

From 33b4ab3ac1d2861ea23a82c20ccfbd7a2bb04df3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 12:35:06 +0200
Subject: [PATCH 0416/2033] openvpn: Update to 2.3.3

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 0db7c4b688f..1717b38a90a 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iproute, lzo, openssl, pam }:
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.1";
+  name = "openvpn-2.3.3";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0g7vf3f6z0h4kdqlqr8jd0gapi0ains6xcvlvfy8cicxnf2psbdx";
+    sha256 = "04xiwim56sb1vis93k9hhm1s29jdrlq7i2fa07jncnhh653d29gh";
   };
 
   buildInputs = [ iproute lzo openssl pam ];

From 27a8cada791d3de1fd1c6992221ab485d9e4a349 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 13:08:00 +0200
Subject: [PATCH 0417/2033] openvpn: Add systemd startup notification

This causes OpenVPN services to reach the "active" state when the VPN
connection is up (i.e., after OpenVPN prints "Initialization Sequence
Completed"). This allows units to be ordered correctly after openvpn-*
units, and makes systemctl present a password prompt:

  $ start openvpn-foo
  Enter Private Key Password: *************

(I first tried to implement this by calling "systemd-notify --ready"
from the "up" script, but systemd-notify is not reliable.)
---
 nixos/modules/services/networking/openvpn.nix |  1 +
 pkgs/tools/networking/openvpn/default.nix     | 10 +++++++--
 .../networking/openvpn/systemd-notify.patch   | 22 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/networking/openvpn/systemd-notify.patch

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index e3998b1e5b2..9dc88e61865 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -56,6 +56,7 @@ let
 
       serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --config ${configFile}";
       serviceConfig.Restart = "always";
+      serviceConfig.Type = "notify";
     };
 
 in
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 1717b38a90a..0ce22b7800e 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, iproute, lzo, openssl, pam }:
+{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openvpn-2.3.3";
@@ -8,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "04xiwim56sb1vis93k9hhm1s29jdrlq7i2fa07jncnhh653d29gh";
   };
 
-  buildInputs = [ iproute lzo openssl pam ];
+  patches = optional stdenv.isLinux ./systemd-notify.patch;
+
+  buildInputs = [ iproute lzo openssl pam ] ++ optional stdenv.isLinux systemd;
 
   configureFlags = ''
     --enable-password-save
@@ -31,6 +35,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lsystemd-daemon"; # hacky
+
   meta = {
     description = "A robust and highly flexible tunneling application";
     homepage = http://openvpn.net/;
diff --git a/pkgs/tools/networking/openvpn/systemd-notify.patch b/pkgs/tools/networking/openvpn/systemd-notify.patch
new file mode 100644
index 00000000000..9291f7a4664
--- /dev/null
+++ b/pkgs/tools/networking/openvpn/systemd-notify.patch
@@ -0,0 +1,22 @@
+diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c
+--- openvpn-2.3.1-orig/src/openvpn/init.c	2013-03-20 09:28:14.000000000 +0100
++++ openvpn-2.3.1/src/openvpn/init.c	2014-04-22 13:02:21.351026640 +0200
+@@ -48,6 +48,8 @@
+ 
+ #include "occ-inline.h"
+ 
++#include <systemd/sd-daemon.h>
++
+ static struct context *static_context; /* GLOBAL */
+ 
+ /*
+@@ -1241,6 +1243,9 @@
+ {
+   static const char message[] = "Initialization Sequence Completed";
+ 
++  /* Tell systemd we're ready. */
++  sd_notify(0, "READY=1");
++
+   /* If we delayed UID/GID downgrade or chroot, do it now */
+   do_uid_gid_chroot (c, true);
+ 

From 662b92e6086c35d76bc67f7b43a92b079ae4b7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 22 Apr 2014 13:22:14 +0200
Subject: [PATCH 0418/2033] liferea: bugfix update

Looks good after some basic testing.
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 650e3237fe4..caad542ebac 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.8";
+    version = "1.10.9";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "1d3icma90mj0nai20pfhxp4k4l33iwkkkcddb9vg5hi4yq4wpmwx";
+    sha256 = "0s6rg30xwdxzh2r1n4m9ns4pbq0p428h4nh72bcrcf9m0mdcg0ai";
   };
 
   buildInputs = with gst_all_1; [

From a96b1eb745bc3d0d24c17dfeabca7c7d37cd32da Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 14:45:08 +0200
Subject: [PATCH 0419/2033] firefox: Update to 28.0

---
 .../networking/browsers/firefox/default.nix      | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index b45fb4bbae7..02560595b6d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,19 +17,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "27.0.1";
+  firefoxVersion = "28.0";
 
-  xulVersion = "27.0.1"; # this attribute is used by other packages
+  xulVersion = "28.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
-    urls = [
-        # It is better to use this url for official releases, to take load off Mozilla's ftp server.
-        "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-        # Fall back to this url for versions not available at releases.mozilla.org.
-        "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
-    ];
-    sha256 = "13qd53yf8dn9m03p4x5ml9h3mys60nba5nz82lcvaq7ycp1pl1bn";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha1 = "f78517836ceca0cd2a0d3db1f282985c616e3fae";
   };
 
   commonConfigureFlags =
@@ -41,7 +36,7 @@ rec {
       "--with-system-libevent"
       "--with-system-libvpx"
       "--with-system-png"
-      "--with-system-icu"
+      # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"
@@ -56,6 +51,7 @@ rec {
       "--disable-necko-wifi" # maybe we want to enable this at some point
       "--disable-installer"
       "--disable-updater"
+      "--disable-pulseaudio"
     ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
                         else [ "--disable-debug" "--enable-release"
                                "--enable-optimize" "--enable-strip" ]);

From 393c9f2e021a5e2e1af95c210ca9026304a99e91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 14:47:45 +0200
Subject: [PATCH 0420/2033] nspr: Update to 4.10.4

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 8aa8edfd3b9..08a71a6abc5 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.3"; in
+let version = "4.10.4"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "1r81rc2v8rlvc9wfsmi98h7k4qwsqb37v5ww1c4v1nk5lsqpjmzj";
+    sha1 = "43b2029d990515f952c89d2921397c064fbbe2e7";
   };
 
   preConfigure = "cd nspr";

From 6fe24bda2de7482de08920036058ebab84673056 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 14:54:36 +0200
Subject: [PATCH 0421/2033] nss: Update to 3.16

---
 .../libraries/nss/85_security_load.patch      | 54 ++++++++++---------
 pkgs/development/libraries/nss/default.nix    |  9 ++--
 .../libraries/nss/nix_secload_fixup.patch     | 48 -----------------
 3 files changed, 32 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/libraries/nss/nix_secload_fixup.patch

diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch
index 4268231380c..d20572a051e 100644
--- a/pkgs/development/libraries/nss/85_security_load.patch
+++ b/pkgs/development/libraries/nss/85_security_load.patch
@@ -1,25 +1,29 @@
-## 85_security_load.patch by Mike Hommey <glandium@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Load modules from $ORIGIN/nss.
-
-Index: nss/nss/cmd/shlibsign/shlibsign.c
-===================================================================
---- nss.orig/nss/cmd/shlibsign/shlibsign.c	2013-08-05 14:40:31.041657554 +0900
-+++ nss/nss/cmd/shlibsign/shlibsign.c	2013-08-05 14:40:31.033657739 +0900
-@@ -851,6 +851,8 @@
+diff -ru nss-3.16-orig/nss/cmd/shlibsign/shlibsign.c nss-3.16/nss/cmd/shlibsign/shlibsign.c
+--- nss-3.16-orig/nss/cmd/shlibsign/shlibsign.c	2014-03-14 21:31:59.000000000 +0100
++++ nss-3.16/nss/cmd/shlibsign/shlibsign.c	2014-04-22 14:50:31.340743655 +0200
+@@ -852,6 +852,8 @@
      libname = PR_GetLibraryName(NULL, "softokn3");
      assert(libname != NULL);
      lib = PR_LoadLibrary(libname);
 +    if (!lib)
-+        lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so");
++        lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
      assert(lib != NULL);
      PR_FreeLibraryName(libname);
  
-Index: nss/nss/lib/pk11wrap/pk11load.c
-===================================================================
---- nss.orig/nss/lib/pk11wrap/pk11load.c	2013-08-05 14:40:31.041657554 +0900
-+++ nss/nss/lib/pk11wrap/pk11load.c	2013-08-05 14:40:31.033657739 +0900
+Only in nss-3.16/nss/cmd/shlibsign: shlibsign.c.orig
+diff -ru nss-3.16-orig/nss/coreconf/config.mk nss-3.16/nss/coreconf/config.mk
+--- nss-3.16-orig/nss/coreconf/config.mk	2014-03-14 21:31:59.000000000 +0100
++++ nss-3.16/nss/coreconf/config.mk	2014-04-22 14:50:51.302731097 +0200
+@@ -188,3 +188,6 @@
+ 
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++
++# Nix specific stuff.
++DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
+diff -ru nss-3.16-orig/nss/lib/pk11wrap/pk11load.c nss-3.16/nss/lib/pk11wrap/pk11load.c
+--- nss-3.16-orig/nss/lib/pk11wrap/pk11load.c	2014-03-14 21:31:59.000000000 +0100
++++ nss-3.16/nss/lib/pk11wrap/pk11load.c	2014-04-22 14:50:22.164749330 +0200
 @@ -406,6 +406,13 @@
  	 * unload the library if anything goes wrong from here on out...
  	 */
@@ -34,18 +38,17 @@ Index: nss/nss/lib/pk11wrap/pk11load.c
  	mod->library = (void *)library;
  
  	if (library == NULL) {
-Index: nss/nss/lib/util/secload.c
-===================================================================
---- nss.orig/nss/lib/util/secload.c	2013-08-05 14:40:31.041657554 +0900
-+++ nss/nss/lib/util/secload.c	2013-08-05 14:40:31.033657739 +0900
+diff -ru nss-3.16-orig/nss/lib/util/secload.c nss-3.16/nss/lib/util/secload.c
+--- nss-3.16-orig/nss/lib/util/secload.c	2014-03-14 21:31:59.000000000 +0100
++++ nss-3.16/nss/lib/util/secload.c	2014-04-22 14:50:31.342743654 +0200
 @@ -69,9 +69,14 @@
  
      /* Remove the trailing filename from referencePath and add the new one */
      c = strrchr(referencePath, PR_GetDirectorySeparator());
 +    if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
-+               * and program was called from $PATH. Hack to get libs from /usr/lib */
-+        referencePath = "/usr/lib/";
-+        c = &referencePath[8]; /* last / */
++               * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
++        referencePath = NIX_NSS_LIBDIR;
++        c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
 +    }
      if (c) {
          size_t referencePathSize = 1 + c - referencePath;
@@ -54,7 +57,7 @@ Index: nss/nss/lib/util/secload.c
          if (fullName) {
              memcpy(fullName, referencePath, referencePathSize);
              strcpy(fullName + referencePathSize, name); 
-@@ -81,6 +86,12 @@
+@@ -81,6 +86,11 @@
  #endif
              libSpec.type = PR_LibSpec_Pathname;
              libSpec.value.pathname = fullName;
@@ -62,12 +65,11 @@ Index: nss/nss/lib/util/secload.c
 +                (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
 +                memcpy(fullName + referencePathSize -4, "lib", 3);
 +            }
-+            strcpy(fullName + referencePathSize, "nss/");
-+            strcpy(fullName + referencePathSize + 4, name);
++            strcpy(fullName + referencePathSize, name);
              dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
  #ifdef PR_LD_ALT_SEARCH_PATH
              /* allow library's dependencies to be found in the same directory
-@@ -88,6 +99,10 @@
+@@ -88,6 +98,10 @@
                                            | PR_LD_ALT_SEARCH_PATH 
  #endif
                                            );
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 92cc12fe1be..920fd75b1b6 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.15.4";
+  version = "3.16";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_4_RTM/src/${name}.tar.gz";
-    sha1 = "c164fac83fcbaff010786767e2a858ca23a89a5b";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_RTM/src/${name}.tar.gz";
+    sha1 = "981dc6ef2f1e69ec7e2b277ce27c7005e9837f95";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
@@ -26,9 +26,8 @@ in stdenv.mkDerivation rec {
 
   patches =
     [ ./nss-3.15-gentoo-fixups.patch
-      # from http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
+      # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
       ./85_security_load.patch
-      ./nix_secload_fixup.patch
     ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/nss/nix_secload_fixup.patch b/pkgs/development/libraries/nss/nix_secload_fixup.patch
deleted file mode 100644
index 89c82f1b87d..00000000000
--- a/pkgs/development/libraries/nss/nix_secload_fixup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru -x '*~' nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.15.1/nss/cmd/shlibsign/shlibsign.c
---- nss-3.15.1-orig/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:03:40.013256377 +0200
-+++ nss-3.15.1/nss/cmd/shlibsign/shlibsign.c	2013-08-07 16:04:21.128410153 +0200
-@@ -853,7 +853,7 @@
-     assert(libname != NULL);
-     lib = PR_LoadLibrary(libname);
-     if (!lib)
--        lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so");
-+        lib = PR_LoadLibrary(NIX_NSS_LIBDIR"libsoftokn3.so");
-     assert(lib != NULL);
-     PR_FreeLibraryName(libname);
- 
-diff -ru -x '*~' nss-3.15.1-orig/nss/coreconf/config.mk nss-3.15.1/nss/coreconf/config.mk
---- nss-3.15.1-orig/nss/coreconf/config.mk	2013-06-27 19:58:08.000000000 +0200
-+++ nss-3.15.1/nss/coreconf/config.mk	2013-08-07 16:11:27.364608802 +0200
-@@ -181,3 +181,6 @@
- 
- # Build with NO_NSPR_10_SUPPORT to avoid using obsolete NSPR features
- DEFINES += -DNO_NSPR_10_SUPPORT
-+
-+# Nix specific stuff.
-+DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\"
-diff -ru -x '*~' nss-3.15.1-orig/nss/lib/util/secload.c nss-3.15.1/nss/lib/util/secload.c
---- nss-3.15.1-orig/nss/lib/util/secload.c	2013-08-07 16:03:40.014256381 +0200
-+++ nss-3.15.1/nss/lib/util/secload.c	2013-08-07 16:05:02.453563064 +0200
-@@ -70,9 +70,9 @@
-     /* Remove the trailing filename from referencePath and add the new one */
-     c = strrchr(referencePath, PR_GetDirectorySeparator());
-     if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]
--               * and program was called from $PATH. Hack to get libs from /usr/lib */
--        referencePath = "/usr/lib/";
--        c = &referencePath[8]; /* last / */
-+               * and program was called from $PATH. Hack to get libs from NIX_NSS_LIBDIR */
-+        referencePath = NIX_NSS_LIBDIR;
-+        c = &referencePath[sizeof(NIX_NSS_LIBDIR) - 1]; /* last / */
-     }
-     if (c) {
-         size_t referencePathSize = 1 + c - referencePath;
-@@ -90,8 +90,7 @@
-                 (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {
-                 memcpy(fullName + referencePathSize -4, "lib", 3);
-             }
--            strcpy(fullName + referencePathSize, "nss/");
--            strcpy(fullName + referencePathSize + 4, name);
-+            strcpy(fullName + referencePathSize, name);
-             dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL
- #ifdef PR_LD_ALT_SEARCH_PATH
-             /* allow library's dependencies to be found in the same directory

From 1b2b9761b4e1da51a8905807a3e6d487a92f3c8b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 22 Apr 2014 15:47:06 +0200
Subject: [PATCH 0422/2033] dd-agent: update from 4.2.0 to 4.2.1

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

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 1e0f26cc92c..87290d4061a 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, sysstat, unzip, tornado, makeWrapper }:
 
 stdenv.mkDerivation rec {
-    version = "4.2.0";
+    version = "4.2.1";
     name = "dd-agent-${version}";
 
     src = fetchurl {
       url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "0lp3h3flb50i64kgkj9kyyf3p1xm0nipxi22w5pmhb71l678d216";
+      sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
     };
 
     buildInputs = [ python unzip makeWrapper ];

From 52769d5c17935b99bcb78c16fa02c3c48dc0ae18 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 22 Apr 2014 16:22:54 +0200
Subject: [PATCH 0423/2033] perl-dbix-class: Fix tests with newer SQLite.

Our version of SQLite causes the tests to fail, so I'm hereby adding a
patch from dbsrgits/dbix-class@ed5550d36 with the hunk for the Changes
file dropped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../perl-modules/dbix-class-fix-tests.patch   | 52 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/perl-modules/dbix-class-fix-tests.patch

diff --git a/pkgs/development/perl-modules/dbix-class-fix-tests.patch b/pkgs/development/perl-modules/dbix-class-fix-tests.patch
new file mode 100644
index 00000000000..476a159f621
--- /dev/null
+++ b/pkgs/development/perl-modules/dbix-class-fix-tests.patch
@@ -0,0 +1,52 @@
+diff --git a/t/multi_create/standard.t b/t/multi_create/standard.t
+index 5a02947..6c1efd8 100644
+--- a/t/multi_create/standard.t
++++ b/t/multi_create/standard.t
+@@ -444,7 +444,11 @@ throws_ok ( sub {
+     #$t->cd($t->new_related('cd', { artist => undef } ) );
+     #$t->{_rel_in_storage} = 0;
+     $t->insert;
+-}, qr/cd.artist may not be NULL/, "Exception propogated properly");
++}, qr/DBI Exception.+(?x:
++    \QNOT NULL constraint failed: cd.artist\E
++      |
++    \Qcd.artist may not be NULL\E
++)/s, "Exception propogated properly");
+ 
+ lives_ok ( sub {
+   $schema->resultset('CD')->create ({
+diff --git a/t/relationship/update_or_create_multi.t b/t/relationship/update_or_create_multi.t
+index 8710048..c7cce7a 100644
+--- a/t/relationship/update_or_create_multi.t
++++ b/t/relationship/update_or_create_multi.t
+@@ -69,7 +69,12 @@ throws_ok {
+     year => 2020,
+     title => 'the best thing since sliced bread',
+   })
+-} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed';
++} qr/DBI Exception.+(?x:
++    \QNOT NULL constraint failed: cd.artist\E
++      |
++    \Qcd.artist may not be NULL\E
++)/s, 'ambiguous find + create failed'
++;
+ 
+ # expect a create, after a failed search using *only* the
+ # *current* relationship and the unique column constraints
+diff --git a/t/storage/error.t b/t/storage/error.t
+index d5980eb..61d6782 100644
+--- a/t/storage/error.t
++++ b/t/storage/error.t
+@@ -15,7 +15,11 @@ warnings_are ( sub {
+     sub {
+       $schema->resultset('CD')->create({ title => 'vacation in antarctica' })
+     },
+-    qr/DBI Exception.+cd\.artist.+NULL/s
++    qr/DBI Exception.+(?x:
++      \QNOT NULL constraint failed: cd.artist\E
++        |
++      \Qcd.artist may not be NULL\E
++    )/s
+   );  # as opposed to some other error
+ }, [], 'No warnings besides exception' );
+ 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ad5a5bf9fed..bbea59005f6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2309,6 +2309,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz;
       sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6";
     };
+    patches = [ ../development/perl-modules/dbix-class-fix-tests.patch ];
     buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ];
     propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ];
     meta = {

From fa3826dcf40abec1f8c1c8798a761e9ff7a4ab19 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 15:36:04 +0200
Subject: [PATCH 0424/2033] Ignore *.wants in systemd.packages for now

---
 nixos/modules/system/boot/systemd.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6c6adab66e7..4e395899bd3 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -408,10 +408,11 @@ let
 
       # Symlink all units provided listed in systemd.packages.
       for i in ${toString cfg.packages}; do
-        files=$(echo $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*)
-        if [ -n "$files" ]; then
-          ln -s $files $out/
-        fi
+        for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
+          if ! [[ "$fn" =~ .wants$ ]]; then
+            ln -s $fn $out/
+          fi
+        done
       done
 
       # Symlink all units defined by systemd.units. If these are also

From b4afe5b7bc96ba0b77222562be97d5d649eb59d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 15:36:39 +0200
Subject: [PATCH 0425/2033] dbus: Use upstream units

---
 nixos/modules/services/system/dbus.nix | 31 ++++----------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 8cc655803c5..8d02a6404ac 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -16,7 +16,7 @@ let
     buildCommand = ''
       ensureDir $out
 
-      cp -v ${pkgs.dbus_daemon}/etc/dbus-1/system.conf $out/system.conf
+      cp -v ${pkgs.dbus.daemon}/etc/dbus-1/system.conf $out/system.conf
 
       # !!! Hm, these `sed' calls are rather error-prone...
 
@@ -31,7 +31,7 @@ let
           -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|' \
           -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|'
 
-      cp ${pkgs.dbus_daemon}/etc/dbus-1/session.conf $out/session.conf
+      cp ${pkgs.dbus.daemon}/etc/dbus-1/session.conf $out/session.conf
 
       # Add the services and session.d directories to the session bus
       # search path.
@@ -97,7 +97,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.dbus_daemon pkgs.dbus_tools ];
+    environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus_tools ];
 
     environment.etc = singleton
       { source = configDir;
@@ -113,30 +113,7 @@ in
 
     users.extraGroups.messagebus.gid = config.ids.gids.messagebus;
 
-    # FIXME: these are copied verbatim from the dbus source tree.  We
-    # should install and use the originals.
-    systemd.units."dbus.socket".text =
-      ''
-        [Unit]
-        Description=D-Bus System Message Bus Socket
-
-        [Socket]
-        ListenStream=/var/run/dbus/system_bus_socket
-      '';
-
-    systemd.units."dbus.service".text =
-      ''
-        [Unit]
-        Description=D-Bus System Message Bus
-        Requires=dbus.socket
-
-        [Service]
-        ExecStartPre=${pkgs.dbus_tools}/bin/dbus-uuidgen --ensure
-        ExecStartPre=-${pkgs.coreutils}/bin/rm -f /var/run/dbus/pid
-        ExecStart=${pkgs.dbus_daemon}/bin/dbus-daemon --system --address=systemd: --nofork --systemd-activation
-        ExecReload=${pkgs.dbus_tools}/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-        OOMScoreAdjust=-900
-      '';
+    systemd.packages = [ pkgs.dbus.daemon ];
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";

From baffee02b8996ceed6e51fee753c6e6a731a34f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 15:39:11 +0200
Subject: [PATCH 0426/2033] sshd: Always start a session

Partially reverts 70a4c7b1dfdb238d3729c3f71127538943a43afd. Whether to
start a session is independent of whether we're running in a
container.
---
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b66ccb87120..d666b462d15 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -284,7 +284,7 @@ in
     networking.firewall.allowedTCPPorts = cfg.ports;
 
     security.pam.services.sshd =
-      { startSession = !config.boot.isContainer;
+      { startSession = true;
         showMotd = true;
         unixAuth = cfg.passwordAuthentication;
       };

From 83b43cfe51a8283f790d9435971a1da7122d5074 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 16:01:45 +0200
Subject: [PATCH 0427/2033] dbus: Merge tools and daemon

This resolves a cyclic dependency: the daemon depends on tools (for
dbus-send) while tools depends on the daemon.  Keeping them separate
doesn't seem very useful in any case.
---
 pkgs/development/libraries/dbus/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index ff1c9f76cd0..d0e2f2e3dbf 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -84,9 +84,9 @@ let
 
   inherit libs;
 
-  tools = dbus_drv "tools" "tools" {
-    configureFlags = [ "--with-dbus-daemondir=${daemon}/bin" ];
-    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs daemon ];
+  tools = dbus_drv "tools" "tools bus" {
+    preBuild = makeInternalLib;
+    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ];
     NIX_CFLAGS_LINK =
       stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
       + "-ldbus-1";
@@ -94,10 +94,7 @@ let
     meta.platforms = stdenv.lib.platforms.all;
   };
 
-  daemon = dbus_drv "daemon" "bus" {
-    preBuild = makeInternalLib;
-    buildInputs = systemdOrEmpty;
-  };
+  daemon = tools;
 
   docs = dbus_drv "docs" "doc" {
     postInstall = ''rm -r "$out/lib"'';

From 03d9e5cda0db6d4b213f595d3320eb3b69818444 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 16:07:53 +0200
Subject: [PATCH 0428/2033] sshd: Add support for socket activation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By enabling ‘services.openssh.startWhenNeeded’, sshd is started
on-demand by systemd using socket activation. This is particularly
useful if you have a zillion containers and don't want to have sshd
running permanently. Note that socket activation is not noticeable
slower, contrary to what the manpage for ‘sshd -i’ says, so we might
want to make this the default one day.
---
 .../modules/services/networking/ssh/sshd.nix  | 79 +++++++++++++------
 .../virtualisation/container-config.nix       |  3 +
 2 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index d666b462d15..554cc6a1c3f 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -86,6 +86,16 @@ in
         '';
       };
 
+      startWhenNeeded = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If set, <command>sshd</command> is socket-activated; that
+          is, instead of having it permanently running as a daemon,
+          systemd will start an instance for each incoming connection.
+        '';
+      };
+
       forwardX11 = mkOption {
         type = types.bool;
         default = cfgc.setXAuthLocation;
@@ -248,37 +258,60 @@ in
       }
     ];
 
-    systemd.services.sshd =
-      { description = "SSH Daemon";
+    systemd =
+      let
+        service =
+          { description = "SSH Daemon";
 
-        wantedBy = [ "multi-user.target" ];
+            wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target";
 
-        stopIfChanged = false;
+            stopIfChanged = false;
 
-        path = [ pkgs.openssh pkgs.gawk ];
+            path = [ pkgs.openssh pkgs.gawk ];
 
-        environment.LD_LIBRARY_PATH = nssModulesPath;
+            environment.LD_LIBRARY_PATH = nssModulesPath;
 
-        preStart =
-          ''
-            mkdir -m 0755 -p /etc/ssh
+            preStart =
+              ''
+                mkdir -m 0755 -p /etc/ssh
 
-            ${flip concatMapStrings cfg.hostKeys (k: ''
-              if ! [ -f "${k.path}" ]; then
-                  ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N ""
-              fi
-            '')}
-          '';
+                ${flip concatMapStrings cfg.hostKeys (k: ''
+                  if ! [ -f "${k.path}" ]; then
+                      ssh-keygen -t "${k.type}" -b "${toString k.bits}" -f "${k.path}" -N ""
+                  fi
+                '')}
+              '';
 
-        serviceConfig =
-          { ExecStart =
-              "${pkgs.openssh}/sbin/sshd " +
-              "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
-            Restart = "always";
-            Type = "forking";
-            KillMode = "process";
-            PIDFile = "/run/sshd.pid";
+            serviceConfig =
+              { ExecStart =
+                  "${pkgs.openssh}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
+                  "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
+                KillMode = "process";
+              } // (if cfg.startWhenNeeded then {
+                StandardInput = "socket";
+              } else {
+                Restart = "always";
+                Type = "forking";
+                PIDFile = "/run/sshd.pid";
+              });
           };
+      in
+
+      if cfg.startWhenNeeded then {
+
+        sockets.sshd =
+          { description = "SSH Socket";
+            wantedBy = [ "sockets.target" ];
+            socketConfig.ListenStream = cfg.ports;
+            socketConfig.Accept = true;
+          };
+
+        services."sshd@" = service;
+
+      } else {
+
+        services.sshd = service;
+
       };
 
     networking.firewall.allowedTCPPorts = cfg.ports;
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 195a8056bf8..b81f97f2b4e 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -12,6 +12,9 @@ with lib;
 
     networking.useHostResolvConf = true;
 
+    # Containers should be light-weight, so start sshd on demand.
+    services.openssh.startWhenNeeded = mkDefault true;
+
     # Shut up warnings about not having a boot loader.
     system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
 

From 5ba24cc8ea7c3979a174142393d155bbc32167cf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 18:42:44 +0200
Subject: [PATCH 0429/2033] Typo/comment

---
 pkgs/stdenv/adapters.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 0e45ad05531..09c92b552d4 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -285,7 +285,9 @@ rec {
     };
 
 
-  /* Modify a stdenv so that it used the Gold linker. */
+  /* Modify a stdenv so that it uses the Gold linker. FIXME: should
+     use -fuse-ld=gold instead, but then the ld-wrapper won't be
+     invoked. */
   useGoldLinker = stdenv:
     let
       binutils = stdenv.gcc.binutils;

From 384db64d9540d2570d3be1ee52a057692050e7da Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 22 Apr 2014 19:00:09 +0200
Subject: [PATCH 0430/2033] jruby: Update from 1.6.5.1 to 1.7.12

---
 pkgs/development/interpreters/jruby/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index b171492d78c..f70fb164623 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
-stdenv.mkDerivation {
-  name = "jruby-1.6.5.1";
+stdenv.mkDerivation rec {
+  name = "jruby-${version}";
+
+  version = "1.7.12";
 
   src = fetchurl {
-    url = http://jruby.org.s3.amazonaws.com/downloads/1.6.5.1/jruby-bin-1.6.5.1.tar.gz;
-    sha256 = "1j0iv1q950lyir9vqfgg2533f1q28jaz7vnxqswsaix1mjhm29qd";
+    url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
+    sha1 = "056cee1138e49da40a77f179b771372692479002";
   };
 
   buildInputs = [ makeWrapper ];
@@ -14,7 +16,7 @@ stdenv.mkDerivation {
      mkdir -pv $out
      mv * $out
      rm $out/bin/*.{bat,dll,exe,sh}
-     mv $out/README $out/docs
+     mv $out/COPYING $out/LICENSE* $out/docs
 
      for i in $out/bin/*; do
        wrapProgram $i \
@@ -22,7 +24,7 @@ stdenv.mkDerivation {
      done
   '';
 
-  meta = { 
+  meta = {
     description = "Ruby interpreter written in Java";
     homepage = http://jruby.org/;
     license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those

From 7d1ddae58e465a1708967c9fee651c33819969c6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 21 Apr 2014 11:46:16 -0400
Subject: [PATCH 0431/2033] nixos: evaluate assertions at toplevel, not at
 systemPackages

Fixes #2340
---
 nixos/modules/misc/assertions.nix             | 20 +---------
 nixos/modules/system/activation/top-level.nix | 40 +++++++++++--------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index 786ec7d250c..c1be36e98cb 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -2,14 +2,6 @@
 
 with lib;
 
-let
-
-  failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
-
-  showWarnings = res: fold (w: x: builtins.trace "warning: ${w}" x) res config.warnings;
-
-in
-
 {
 
   options = {
@@ -38,15 +30,5 @@ in
     };
 
   };
-
-  config = {
-
-    # This option is evaluated always. Thus the assertions are checked
-    # as well. Hacky!
-    environment.systemPackages = showWarnings (
-      if [] == failed then []
-      else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
-
-  };
-
+  # impl of assertions is in <nixos/modules/system/activation/top-level.nix>
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 7cdaecce198..b739ef693ce 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -84,33 +84,39 @@ let
       ${config.system.extraSystemBuilderCmds}
     '';
 
+  # Handle assertions
+
+  failed = map (x: x.message) (filter (x: !x.assertion) config.assertions);
+
+  showWarnings = res: fold (w: x: builtins.trace "^[[1;31mwarning: ${w}^[[0m" x) res config.warnings;
 
   # Putting it all together.  This builds a store path containing
   # symlinks to the various parts of the built configuration (the
   # kernel, systemd units, init scripts, etc.) as well as a script
   # `switch-to-configuration' that activates the configuration and
   # makes it bootable.
-  system = pkgs.stdenv.mkDerivation {
-    name = "nixos-${config.system.nixosVersion}";
-    preferLocalBuild = true;
-    buildCommand = systemBuilder;
+  system = showWarnings (
+    if [] == failed then pkgs.stdenv.mkDerivation {
+      name = "nixos-${config.system.nixosVersion}";
+      preferLocalBuild = true;
+      buildCommand = systemBuilder;
 
-    inherit (pkgs) utillinux coreutils;
-    systemd = config.systemd.package;
+      inherit (pkgs) utillinux coreutils;
+      systemd = config.systemd.package;
 
-    inherit children;
-    kernelParams = config.boot.kernelParams;
-    installBootLoader =
-      config.system.build.installBootLoader
-      or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
-    activationScript = config.system.activationScripts.script;
-    nixosVersion = config.system.nixosVersion;
+      inherit children;
+      kernelParams = config.boot.kernelParams;
+      installBootLoader =
+        config.system.build.installBootLoader
+        or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
+      activationScript = config.system.activationScripts.script;
+      nixosVersion = config.system.nixosVersion;
 
-    configurationName = config.boot.loader.grub.configurationName;
+      configurationName = config.boot.loader.grub.configurationName;
 
-    # Needed by switch-to-configuration.
-    perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
-  };
+      # Needed by switch-to-configuration.
+      perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+  } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
 
 in

From 4a3508ad1a5f1fa4a1795ba9896b1a5d9ee043e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 22 Apr 2014 17:48:15 +0200
Subject: [PATCH 0432/2033] gdk-pixbuf: check for writable $out/.., closes
 #2115

---
 .../libraries/gdk-pixbuf/setup-hook.sh        | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
index 280d9aa4f1b..c983f9f6a61 100644
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@@ -1,19 +1,25 @@
-make_gtk_applications_find_pixbuf_loaders() {
+findGdkPixbufLoaders() {
 
-    # set pixbuf loaders.cache for this package
-	mkdir -p "$out/lib/$name/gdk-pixbuf"
-	
-	if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then
-		cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache"
-	fi
+	if [ -z "$IN_NIX_SHELL" ]; then
 
-	if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then
-		cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$out/lib/$name/gdk-pixbuf/loaders.cache"
-	fi
+		# set pixbuf loaders.cache for this package
+
+		local loadersDir="$out/lib/gdk-pixbuf-loaders-2.0/$name"
+		mkdir -p "$loadersDir"
+		
+		if [ -f "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ]; then
+			cat "$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" >> "$loadersDir/loaders.cache"
+		fi
 	
-	# note, this is not a search path
-	export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$out/lib/$name/gdk-pixbuf/loaders.cache")
+		if [ -f "$1/lib/gdk-pixbuf/loaders.cache" ]; then
+			cat "$1/lib/gdk-pixbuf/loaders.cache" >> "$loadersDir/loaders.cache"
+		fi
+		
+		# note, this is not a search path
+		export GDK_PIXBUF_MODULE_FILE=$(readlink -e "$loadersDir/loaders.cache")
+
+	fi
 
 }
 
-envHooks+=(make_gtk_applications_find_pixbuf_loaders)
+envHooks+=(findGdkPixbufLoaders)

From 7ce39b067aad3a2ac18a1dc8a13dc841d0363878 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 22 Apr 2014 14:10:36 -0500
Subject: [PATCH 0433/2033] Add expression for sage

---
 .../science/math/sage/default.nix             | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/science/math/sage/default.nix

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
new file mode 100644
index 00000000000..0fd8621b0e0
--- /dev/null
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, m4, perl, gfortran, texLive, ffmpeg, tk
+, imagemagick, liblapack
+}:
+
+stdenv.mkDerivation rec {
+  name = "sage-6.1.1";
+
+  src = fetchurl {
+    url = "http://mirrors.xmission.com/sage/src/sage-6.1.1.tar.gz";
+    sha256 = "0kbzs0l9q7y34jv3f8rd1c2mrjsjkdgaw6mfdwjlpg9g4gghmq5y";
+  };
+
+  buildInputs = [ m4 perl gfortran texLive ffmpeg tk imagemagick liblapack ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    export SAGE_NUM_THREADS=$NIX_BUILD_CORES
+    sed -i 's/if ! [ -d "$HOME" ]/if [ -d "$HOME" ]/' src/bin/sage-env
+  '' ++ stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i "s/ld_version = try_run('ld  -v')/ld_version = 'Apple'/" \
+      build/pkgs/atlas/configuration.py
+  '';
+
+  meta = {
+    homepage = http://www.scilab.org/;
+    description = "Scientific software package for numerical computations (Matlab lookalike)";
+    # see http://www.scilab.org/legal
+    license = "SciLab";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 579e8d741d9..8cbd58431ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10209,6 +10209,8 @@ let
 
   mathematica = callPackage ../applications/science/math/mathematica { };
 
+  sage = callPackage ../applications/science/math/sage { };
+
   ### SCIENCE/MOLECULAR-DYNAMICS
 
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {

From 27477f1fac7e9845dad55670e178d588548ac1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 20 Apr 2014 18:15:42 +0200
Subject: [PATCH 0434/2033] wireshark: build with libcap (POSIX capabilities)

This makes running wireshark (or more specifically, dumpcap) as root a
bit more secure. From <wireshark-1.11.2>/doc/README.packaging:

  The "--with-libcap" option is only useful when dumpcap is installed
  setuid. If it is enabled dumpcap will try to drop any setuid privileges
  it may have while retaining the CAP_NET_ADMIN and CAP_NET_RAW
  capabilities. It is enabled by default, if the Linux capabilities
  library (on which it depends) is found.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 256681ec54e..37a75e437ad 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
 , gnutls, libgcrypt, geoip, heimdal, lua5, gtk, makeDesktopItem, python
+, libcap
 }:
 
 let version = "1.11.2"; in
@@ -14,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls
-    geoip libnl c-ares gtk python
+    geoip libnl c-ares gtk python libcap
   ];
 
   preConfigure = ''

From cbd4650a1ad143bca4b10bd49e93a39a2e1eee85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 20 Apr 2014 19:03:05 +0200
Subject: [PATCH 0435/2033] wireshark: add myself (bjornfor) as maintainer

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

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 37a75e437ad..ea12459a82a 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ simons bjornfor ];
   };
 }

From a70197a6536be79c2e9318332d9435e668954837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 13 Apr 2014 17:06:00 +0200
Subject: [PATCH 0436/2033] wireshark: add patch to lookup "dumpcap" in PATH

What this allows us to do is define a "dumpcap" setuid wrapper in NixOS
and have wireshark use that instead of the non-setuid dumpcap binary
that it normally uses.

As far as I can tell, the code that is changed to do lookup in PATH is
only used by wireshark/tshark to find dumpcap. dumpcap, the thing that's
typically setuid, is not affected by this patch. wireshark and tshark
should *not* be installed setuid, so the fact that they now do lookup in
PATH is not a security concern.

With this commit, and the following config, only "root" and users in the
"wireshark" group will have access to capturing network traffic with
wireshark/dumpcap:

  environment.systemPackages = [ pkgs.wireshark ];
  security.setuidOwners = [
    { program = "dumpcap";
      owner = "root";
      group = "wireshark";
      setuid = true;
      setgid = false;
      permissions = "u+rx,g+x";
    }
  ];
  users.extraGroups.wireshark.gid = 500;

(This wouldn't have worked before, because then wireshark would not use
our setuid dumpcap binary.)
---
 .../networking/sniffers/wireshark/default.nix |  2 +
 .../wireshark-lookup-dumpcap-in-path.patch    | 62 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ea12459a82a..272bae14a12 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
     geoip libnl c-ares gtk python libcap
   ];
 
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
+
   preConfigure = ''
     sed -re 's/g_memmove/memmove/' -i $(grep -rl g_memmove .)
   '';
diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
new file mode 100644
index 00000000000..9c517cc0e42
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
@@ -0,0 +1,62 @@
+From 188e8858243b2278239261aaaaea7ad07476d561 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Sun, 13 Apr 2014 15:17:24 +0200
+Subject: [PATCH] Lookup dumpcap in PATH
+
+NixOS patch: Look for dumpcap in PATH first, because there may be a
+dumpcap setuid-wrapper that we want to use instead of the default
+non-setuid dumpcap binary.
+
+Also change execv() to execvp() because we've set argv[0] to "dumpcap"
+and have to enable PATH lookup. Wireshark is not a setuid program, so
+looking in PATH is not a security issue.
+---
+ capture_sync.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/capture_sync.c b/capture_sync.c
+index eb05fae..efb5675 100644
+--- a/capture_sync.c
++++ b/capture_sync.c
+@@ -326,8 +326,18 @@ init_pipe_args(int *argc) {
+     argv = (char **)g_malloc(sizeof (char *));
+     *argv = NULL;
+ 
+-    /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */
+-    exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir);
++    /*
++     * NixOS patch: Look for dumpcap in PATH first, because there may be a
++     * dumpcap setuid-wrapper that we want to use instead of the default
++     * non-setuid dumpcap binary.
++     */
++    if (system("command -v dumpcap >/dev/null") == 0) {
++        /* Found working dumpcap */
++        exename = g_strdup_printf("dumpcap");
++    } else {
++        /* take Wireshark's absolute program path and replace "Wireshark" with "dumpcap" */
++        exename = g_strdup_printf("%s" G_DIR_SEPARATOR_S "dumpcap", progfile_dir);
++    }
+ 
+     /* Make that the first argument in the argument list (argv[0]). */
+     argv = sync_pipe_add_arg(argv, argc, exename);
+@@ -649,7 +659,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi
+          */
+         dup2(sync_pipe[PIPE_WRITE], 2);
+         ws_close(sync_pipe[PIPE_READ]);
+-        execv(argv[0], argv);
++        execvp(argv[0], argv);
+         g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
+                    argv[0], g_strerror(errno));
+         sync_pipe_errmsg_to_parent(2, errmsg, "");
+@@ -879,7 +889,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd,
+         dup2(sync_pipe[PIPE_WRITE], 2);
+         ws_close(sync_pipe[PIPE_READ]);
+         ws_close(sync_pipe[PIPE_WRITE]);
+-        execv(argv[0], argv);
++        execvp(argv[0], argv);
+         g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
+                    argv[0], g_strerror(errno));
+         sync_pipe_errmsg_to_parent(2, errmsg, "");
+-- 
+1.9.0
+

From e87343f5d4dc37ad477b7c28389f55c0575738a2 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 22 Apr 2014 21:55:27 +0200
Subject: [PATCH 0437/2033] haveged: Update from 1.7c to 1.9.1

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

diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix
index 48f9727b3c0..1701d4cb46f 100644
--- a/pkgs/tools/security/haveged/default.nix
+++ b/pkgs/tools/security/haveged/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "haveged-${version}";
-  version = "1.7c";
+  version = "1.9.1";
 
   src = fetchurl {
     url = "http://www.issihosts.com/haveged/haveged-${version}.tar.gz";
-    sha256 = "08gi3d9lbrllk5lyxw8l65py88xhia48w758lqjddh3gv7g7wfa0";
+    sha256 = "059pxlfd4l5dqhd6r3lynzfz4wby2f17294fy17pi9j2jpnn68ww";
   };
 
   meta = {

From bfbdbc19eb593967821939090974d53222d62bc5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 18 Apr 2014 22:48:15 +0200
Subject: [PATCH 0438/2033] gedit: new package

Official text editor of the GNOME desktop environment

https://wiki.gnome.org/Apps/Gedit
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/apps/gedit/default.nix  | 39 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/gedit/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4620bc6722a..7ed5083e09d 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -117,6 +117,7 @@ in {
         gnome3.gnome-user-docs
 
         gnome3.file-roller
+        gnome3.gedit
         gnome3.gnome-tweak-tool
       ] config.environment.gnome3.excludePackages);
 
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
new file mode 100644
index 00000000000..84a77e5a024
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, intltool, fetchurl, enchant, isocodes
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libsoup, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gedit-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gedit/3.10/${name}.tar.xz";
+    sha256 = "40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup
+                  gnome3.libpeas gnome3.gtksourceview libxml2
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gedit" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gedit;
+    description = "Official text editor of the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d29ea3d1c69..893e82baec3 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -147,6 +147,8 @@ rec {
 
   file-roller = callPackage ./desktop/file-roller { };
 
+  gedit = callPackage ./apps/gedit { };
+
   gnome_desktop = callPackage ./desktop/gnome-desktop { };
 
   gtksourceview = callPackage ./desktop/gtksourceview { };

From 58817053422bbaae3b9342e380ccc815806fffb6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 18 Apr 2014 22:51:48 +0200
Subject: [PATCH 0439/2033] gnome3: moved file-roller from desktop/ to apps/

---
 pkgs/desktops/gnome-3/{desktop => apps}/file-roller/default.nix | 0
 pkgs/desktops/gnome-3/default.nix                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/desktops/gnome-3/{desktop => apps}/file-roller/default.nix (100%)

diff --git a/pkgs/desktops/gnome-3/desktop/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/desktop/file-roller/default.nix
rename to pkgs/desktops/gnome-3/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 893e82baec3..d45b86ccdf2 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -145,7 +145,7 @@ rec {
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
-  file-roller = callPackage ./desktop/file-roller { };
+  file-roller = callPackage ./apps/file-roller { };
 
   gedit = callPackage ./apps/gedit { };
 

From 8f1b59189dc8f919001b298a66870788cfe4697d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 18 Apr 2014 22:52:38 +0200
Subject: [PATCH 0440/2033] gnome3: moved gtksourceview from desktop/ to core/

---
 .../gnome-3/{desktop => core}/gtksourceview/default.nix        | 0
 pkgs/desktops/gnome-3/default.nix                              | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/desktops/gnome-3/{desktop => core}/gtksourceview/default.nix (100%)

diff --git a/pkgs/desktops/gnome-3/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-3/core/gtksourceview/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/desktop/gtksourceview/default.nix
rename to pkgs/desktops/gnome-3/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d45b86ccdf2..204c3fa4bf7 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -96,6 +96,8 @@ rec {
 
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
+  gtksourceview = callPackage ./core/gtksourceview { };
+
   gucharmap = callPackage ./core/gucharmap { };
 
   gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
@@ -151,7 +153,6 @@ rec {
 
   gnome_desktop = callPackage ./desktop/gnome-desktop { };
 
-  gtksourceview = callPackage ./desktop/gtksourceview { };
 
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };

From 5a332242ea49e48c7cb3829d7d0de7be3161eb5d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 18 Apr 2014 22:53:44 +0200
Subject: [PATCH 0441/2033] gnome3: moved gnome-desktop from desktop/ to core/

---
 .../gnome-3/{desktop => core}/gnome-desktop/default.nix      | 0
 pkgs/desktops/gnome-3/default.nix                            | 5 ++---
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/desktops/gnome-3/{desktop => core}/gnome-desktop/default.nix (100%)

diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 204c3fa4bf7..a8b74138eef 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -48,6 +48,8 @@ rec {
 
   gnome_common = callPackage ./core/gnome-common { };
 
+  gnome_desktop = callPackage ./core/gnome-desktop { };
+
   gnome-dictionary = callPackage ./core/gnome-dictionary { };
 
   gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
@@ -151,9 +153,6 @@ rec {
 
   gedit = callPackage ./apps/gedit { };
 
-  gnome_desktop = callPackage ./desktop/gnome-desktop { };
-
-
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From 8846019fcae7be58a1c4e45893d4ab3b9ccdd140 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 18 Apr 2014 23:12:40 +0200
Subject: [PATCH 0442/2033] libmediaart: new library used by gnome-music

Library tasked with managing, extracting and handling media art caches
---
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 .../gnome-3/misc/libmediaart/default.nix      | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/misc/libmediaart/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a8b74138eef..b03d1107a23 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -164,6 +164,8 @@ rec {
   gitg = callPackage ./misc/gitg { };
 
   libgit2-glib = callPackage ./misc/libgit2-glib { };
+
+  libmediaart = callPackage ./misc/libmediaart { };
   
   gexiv2 = callPackage ./misc/gexiv2 { };
 
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
new file mode 100644
index 00000000000..4985bfa902c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/libmediaart/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "libmediaart-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz";
+    sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c";
+  };
+
+  buildInputs = [ pkgconfig glib gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    description = "Library tasked with managing, extracting and handling media art caches";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

From b01a49c14d3e0c8cc1a49d51f61f8d124b39ec30 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 19 Apr 2014 00:42:07 +0200
Subject: [PATCH 0443/2033] xdg-user-dirs: fix finding default directory names

---
 pkgs/tools/X11/xdg-user-dirs/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index bb26c0f46ce..8829427b79c 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxslt, docbook_xsl }:
+{ stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "xdg-user-dirs-0.15";
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786";
   };
 
-  buildInputs = [ libxslt docbook_xsl ];
+  buildInputs = [ libxslt docbook_xsl makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/xdg-user-dirs-update" \
+      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs;

From 91468a3ffa0a54b8a8442897a6ab594ad176d753 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 19 Apr 2014 00:42:49 +0200
Subject: [PATCH 0444/2033] grilo: enable gobject introspection

---
 pkgs/desktops/gnome-3/core/grilo/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 2a7f270300a..3f7af667ca5 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, libxml2, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, libxml2, gnome3, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "grilo-0.2.10";
@@ -10,7 +10,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-grl-pls" ];
 
-  buildInputs = [ pkgconfig file intltool glib libxml2 gnome3.totem-pl-parser ];
+  preConfigure = ''
+    for f in src/Makefile.in libs/pls/Makefile.in; do
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
+    done
+  '';
+
+  buildInputs = [ pkgconfig file intltool glib libxml2 gnome3.totem-pl-parser gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Projects/Grilo;

From a4ef8dd63403f5f1b77b24bc5ef26fcefb6fbcd3 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 19 Apr 2014 23:44:49 +0200
Subject: [PATCH 0445/2033] gnome3: prioritize nautilus when opening
 inode/directory

---
 .../services/x11/desktop-managers/gnome3.nix        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 7ed5083e09d..b1f9737454a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -15,6 +15,16 @@ let
     in
       filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
 
+  # Prioritize nautilus by default when opening directories
+  mimeAppsList = pkgs.writeTextFile {
+    name = "gnome-mimeapps";
+    destination = "/share/applications/mimeapps.list";
+    text = ''
+      [Default Applications]
+      inode/directory=nautilus.desktop
+    '';
+  };
+
 in {
 
   options = {
@@ -66,7 +76,8 @@ in {
           export XDG_MENU_PREFIX=gnome
 
           # Don't let epiphany depend upon gnome-shell
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
+          # Override default mimeapps
+          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}:${mimeAppsList}/share
 
           # Let gnome-control-center find gnome-shell search providers
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/

From f6159b909572840fad8373fe94fdaab5d42a191a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 00:47:55 +0200
Subject: [PATCH 0446/2033] seahorse: new package

Application for managing encryption keys and passwords in the GnomeKeyring

https://wiki.gnome.org/Apps/Seahorse
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/desktops/gnome3/seahorse.nix     | 38 +++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/seahorse/default.nix         | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 5 files changed, 83 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/seahorse.nix
 create mode 100644 pkgs/desktops/gnome-3/apps/seahorse/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5c30d74be69..2418c87e569 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -103,6 +103,7 @@
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
   ./services/desktops/gnome3/gnome-user-share.nix
+  ./services/desktops/gnome3/seahorse.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
   ./services/desktops/telepathy.nix
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
new file mode 100644
index 00000000000..cad22a6a598
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -0,0 +1,38 @@
+# Seahorse daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.seahorse = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Seahorse search provider for the GNOME Shell activity search.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.seahorse.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.seahorse ];
+
+    services.dbus.packages = [ pkgs.gnome3.seahorse ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index b1f9737454a..3fe28cdc880 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -55,6 +55,7 @@ in {
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-online-accounts.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
+    services.gnome3.seahorse.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
     hardware.pulseaudio.enable = mkDefault true;
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
new file mode 100644
index 00000000000..cecc4a8913d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gnupg, libsoup
+, gnome3, librsvg, gdk_pixbuf, gpgme
+, libsecret, avahi, p11_kit }:
+
+stdenv.mkDerivation rec {
+  name = "seahorse-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/seahorse/3.10/${name}.tar.xz";
+    sha256 = "89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
+                  libsecret avahi libsoup p11_kit
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/seahorse" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Seahorse;
+    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b03d1107a23..0e6f2a93918 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -156,6 +156,8 @@ rec {
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
+  seahorse = callPackage ./apps/seahorse { };
+
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 

From 0f74c36e3bffd572df0d66d932d432c882b772c9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 15:50:38 +0200
Subject: [PATCH 0447/2033] grilo: enable grl-net

---
 pkgs/desktops/gnome-3/core/grilo/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/core/grilo/default.nix
index 3f7af667ca5..6f1bfbbcfe9 100644
--- a/pkgs/desktops/gnome-3/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/core/grilo/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, libxml2, gnome3, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
 
 stdenv.mkDerivation rec {
   name = "grilo-0.2.10";
@@ -8,16 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25";
   };
 
-  configureFlags = [ "--enable-grl-pls" ];
+  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
 
   preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in; do
+    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
        substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
        substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
     done
   '';
 
-  buildInputs = [ pkgconfig file intltool glib libxml2 gnome3.totem-pl-parser gobjectIntrospection ];
+  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+                  gnome3.totem-pl-parser gobjectIntrospection ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Projects/Grilo;

From 7de8a89c9a06d1e7d94ed46df13108692b6f04ba Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 15:52:11 +0200
Subject: [PATCH 0448/2033] grilo-plugins: new package

A collection of plugins for the Grilo framework

https://wiki.gnome.org/action/show/Projects/Grilo
---
 .../gnome-3/core/grilo-plugins/default.nix    | 27 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix

diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
new file mode 100644
index 00000000000..a8a1c244767
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
+, gmime, json_glib, avahi, tracker, itstool }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-plugins-0.2.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
+    sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48";
+  };
+
+  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
+
+  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
+                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
+                  avahi gnome3.libmediaart tracker intltool itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "A collection of plugins for the Grilo framework";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 0e6f2a93918..7f3e6464e01 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -96,6 +96,8 @@ rec {
 
   grilo = callPackage ./core/grilo { };
 
+  grilo-plugins = callPackage ./core/grilo-plugins { };
+
   gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
 
   gtksourceview = callPackage ./core/gtksourceview { };

From 3859b1cb545bec5751eb5489fac1de99e196feaa Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 15:52:35 +0200
Subject: [PATCH 0449/2033] totem: use grilo plugins

---
 pkgs/desktops/gnome-3/core/totem/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index a6acbd192db..c6b78c827db 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -19,21 +19,22 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser
+                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gnome3.libpeas pygobject3 shared_mime_info dbus_glib
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas makeWrapper file ];
 
   preFixup = ''
     wrapProgram "$out/bin/totem" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 
     rm $out/share/icons/hicolor/icon-theme.cache
   '';

From 422c4d92b533e831b0c8337150524500507b2e86 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 17:16:43 +0200
Subject: [PATCH 0450/2033] transmission-remote-gtk: delete hicolor icon cache

---
 .../networking/p2p/transmission-remote-gtk/default.nix           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 968aba20754..8fa5cb6c2ee 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/transmission-remote-gtk" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = {

From 1a28bd9904df9f0965122ab3ab05ec3be4d49578 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 17:17:08 +0200
Subject: [PATCH 0451/2033] file-roller: delete hicolor icon cache

---
 pkgs/desktops/gnome-3/apps/file-roller/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 41f1fb0097f..e13e169ccc5 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/file-roller" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
   meta = with stdenv.lib; {

From 737fc2747356522f5eb0368423b3b975be243ab5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 20:42:55 +0200
Subject: [PATCH 0452/2033] gnome-music: new package

Music player and management application for the GNOME desktop environment

https://wiki.gnome.org/Apps/Music
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/gnome-music/default.nix      | 54 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/gnome-music/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 3fe28cdc880..0d2aa729a33 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -130,6 +130,7 @@ in {
 
         gnome3.file-roller
         gnome3.gedit
+        gnome3.gnome-music
         gnome3.gnome-tweak-tool
       ] config.environment.gnome3.excludePackages);
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
new file mode 100644
index 00000000000..b8d2bbc79ef
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+, python3, libxml2, python3Packages, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-music-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz";
+    sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg python3
+                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
+                  python3Packages.pycairo python3Packages.dbus
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ glib gtk3 libnotify tracker gnome3.grilo cairo
+          gst_all_1.gstreamer gst_all_1.gst-plugins-base
+          gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
+    in
+    ''
+    wrapProgram "$out/bin/gnome-music" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${libPath}" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Music;
+    description = "Music player and management application for the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7f3e6464e01..dce605ac164 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -155,6 +155,8 @@ rec {
 
   gedit = callPackage ./apps/gedit { };
 
+  gnome-music = callPackage ./apps/gnome-music { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From 37ad122ddbed3ff29eed94a0311553c37ea73fc7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 20 Apr 2014 21:59:45 +0200
Subject: [PATCH 0453/2033] glade: new package

User interface designer for GTK+ applications

https://wiki.gnome.org/Apps/Glade
---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 37 ++++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix            |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/glade/default.nix

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
new file mode 100644
index 00000000000..5979d10fa70
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, python
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxml2, docbook_xsl
+, gnome3, librsvg, gdk_pixbuf, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "glade-3.16.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
+    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
+                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/glade" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Glade;
+    description = "User interface designer for GTK+ applications";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index dce605ac164..ee8633a7a67 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -155,6 +155,8 @@ rec {
 
   gedit = callPackage ./apps/gedit { };
 
+  glade = callPackage ./apps/glade { };
+
   gnome-music = callPackage ./apps/gnome-music { };
 
   # scrollkeeper replacement

From 74223e3d2f54214759bf9d5f9c27bc47515dff87 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 21 Apr 2014 00:17:00 +0200
Subject: [PATCH 0454/2033] tracker: downgrade to 0.16

---
 pkgs/desktops/gnome-3/core/tracker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix
index 6ac3592f6bf..dbae108d2e9 100644
--- a/pkgs/desktops/gnome-3/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker/default.nix
@@ -8,11 +8,11 @@
 , libpng, libexif, libgsf, libuuid, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "tracker-1.0.0";
+  name = "tracker-0.16.4";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
-    sha256 = "a1d033faf2c78f0e239f3c2c961b96623c9a7dabd938c08e3f5660bd70f54ba2";
+    url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz";
+    sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From 3c76ece85bb2cc9764eedbbff450892ea5542dce Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 21 Apr 2014 00:16:43 +0200
Subject: [PATCH 0455/2033] gfbgraph: new package

GLib/GObject wrapper for the Facebook Graph API
---
 pkgs/desktops/gnome-3/default.nix             |  2 ++
 .../gnome-3/misc/gfbgraph/default.nix         | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/misc/gfbgraph/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index ee8633a7a67..c2952d0bab8 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -167,6 +167,8 @@ rec {
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
+  gfbgraph = callPackage ./misc/gfbgraph { };
+
   goffice = callPackage ./misc/goffice { };
 
   gitg = callPackage ./misc/gitg { };
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
new file mode 100644
index 00000000000..ee8259af8d6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, gnome3, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gfbgraph-0.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
+    sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724";
+  };
+
+  buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts
+                  json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "GLib/GObject wrapper for the Facebook Graph API";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}

From 5a79b0fc861e985adc7f3576288e78e78aca0221 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 21 Apr 2014 00:18:01 +0200
Subject: [PATCH 0456/2033] gnome-online-miners: new package

A set of crawlers that go through your online content and index them locally in Tracker

https://wiki.gnome.org/Projects/GnomeOnlineMiners
---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-online-miners.nix   | 39 +++++++++++++++++++
 .../core/gnome-online-miners/default.nix      | 27 +++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 4 files changed, 69 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2418c87e569..4f623c3ef9c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -102,6 +102,7 @@
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
+  ./services/desktops/gnome3/gnome-online-miners.nix
   ./services/desktops/gnome3/gnome-user-share.nix
   ./services/desktops/gnome3/seahorse.nix
   ./services/desktops/gnome3/sushi.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
new file mode 100644
index 00000000000..c921327a74c
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -0,0 +1,39 @@
+# GNOME Online Miners daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-online-miners = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Online Miners, a service that
+          crawls through your online content.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-online-miners.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
+
+    services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
+
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
new file mode 100644
index 00000000000..06e7781b72f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
+, libsoup, json_glib, gmp, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-online-miners-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz";
+    sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+                  gnome3.grilo gnome3.libzapojit gnome3.gnome_online_accounts
+                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+    description = "A set of crawlers that go through your online content and index them locally in Tracker";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index c2952d0bab8..952fd15d6a1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -72,6 +72,8 @@ rec {
 
   gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
 
+  gnome-online-miners = callPackage ./core/gnome-online-miners { };
+
   gnome_session = callPackage ./core/gnome-session { };
 
   gnome_shell = callPackage ./core/gnome-shell { };

From 3ccf8e1ba2b70563ff0f49969045e4394f7ab3a4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 21 Apr 2014 00:19:00 +0200
Subject: [PATCH 0457/2033] gnome-documents: new package

Document manager application designed to work with GNOME 3

https://wiki.gnome.org/Apps/Documents
---
 nixos/modules/module-list.nix                 |  1 +
 .../desktops/gnome3/gnome-documents.nix       | 43 +++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/gnome-documents/default.nix  | 54 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 5 files changed, 101 insertions(+)
 create mode 100644 nixos/modules/services/desktops/gnome3/gnome-documents.nix
 create mode 100644 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4f623c3ef9c..a769914499d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./services/desktops/accountservice.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
+  ./services/desktops/gnome3/gnome-documents.nix
   ./services/desktops/gnome3/gnome-keyring.nix
   ./services/desktops/gnome3/gnome-online-accounts.nix
   ./services/desktops/gnome3/gnome-online-miners.nix
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
new file mode 100644
index 00000000000..1f7592c0b41
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -0,0 +1,43 @@
+# GNOME Documents daemon.
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gnome-documents = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GNOME Documents services, a document
+          manager application for GNOME.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gnome-documents.enable {
+
+    environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
+
+    services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
+
+    services.gnome3.gnome-online-accounts.enable = true;
+
+    services.gnome3.gnome-online-miners.enable = true;
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0d2aa729a33..d258614cc08 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -52,6 +52,7 @@ in {
     services.accounts-daemon.enable = true;
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
+    services.gnome3.gnome-documents.enable = mkDefault true;
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-online-accounts.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
new file mode 100644
index 00000000000..b393bb43931
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, intltool, fetchurl, evince, gjs
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxslt, webkitgtk
+, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, json_glib
+, gmp, desktop_file_utils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-documents-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz";
+    sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+                  docbook_xsl desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg evince
+                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
+                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
+                  gnome3.gnome_desktop gnome3.libzapojit json_glib
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
+    in
+    ''
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
+    wrapProgram "$out/bin/gnome-documents" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH ":" "${libPath}" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Documents;
+    description = "Document manager application designed to work with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 952fd15d6a1..34c663a779c 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -159,6 +159,8 @@ rec {
 
   glade = callPackage ./apps/glade { };
 
+  gnome-documents = callPackage ./apps/gnome-documents { };
+
   gnome-music = callPackage ./apps/gnome-music { };
 
   # scrollkeeper replacement

From da444ff26f88579b1f3da632ca671f8d49ca1e2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 23:23:05 +0200
Subject: [PATCH 0458/2033] Turn assertion about oneshot services into a
 warning

---
 nixos/modules/system/boot/systemd.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 4e395899bd3..52ba31cdeed 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -688,10 +688,9 @@ in
 
   config = {
 
-    assertions = mapAttrsToList (name: service: {
-      assertion = service.serviceConfig.Type or "" == "oneshot" -> service.serviceConfig.Restart or "no" == "no";
-      message = "${name}: Type=oneshot services must have Restart=no";
-    }) cfg.services;
+    warnings = concatLists (mapAttrsToList (name: service:
+      optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no")
+        "Service ‘${name}.service’ with ‘Type=oneshot’ must have ‘Restart=no’") cfg.services);
 
     system.build.units = cfg.units;
 

From fb3629df494efd7b8ab80ab58663bdff1720f2b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 22 Apr 2014 23:52:07 +0200
Subject: [PATCH 0459/2033] systemd: Re-allow Restart=yes with Type=oneshot

---
 pkgs/os-specific/linux/systemd/fixes.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index c33d05da55a..2004204e442 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -26,6 +26,22 @@ index 41605ee..8517369 100644
                          if (switch_root_dir)
                                  args[i++] = "--switched-root";
                          args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user";
+diff --git a/src/core/service.c b/src/core/service.c
+index ae3695a..6b3aa45 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1096,11 +1096,6 @@ static int service_verify(Service *s) {
+                 return -EINVAL;
+         }
+ 
+-        if (s->type == SERVICE_ONESHOT && s->restart != SERVICE_RESTART_NO) {
+-                log_error_unit(UNIT(s)->id, "%s has Restart setting other than no, which isn't allowed for Type=oneshot services. Refusing.", UNIT(s)->id);
+-                return -EINVAL;
+-        }
+-
+         if (s->type == SERVICE_DBUS && !s->bus_name) {
+                 log_error_unit(UNIT(s)->id, "%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id);
+                 return -EINVAL;
 diff --git a/src/core/socket.c b/src/core/socket.c
 index 7c18a2b..eba67d5 100644
 --- a/src/core/socket.c

From b2250ad851e2e7afa5049870b7955448a57c25dc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 21 Apr 2014 18:40:34 +0200
Subject: [PATCH 0460/2033] icedtea7: Update from 2.4.6 -> 2.4.7

Fixes a bunch of CVEs.

Removed 2.4.6 build patch, as it's no longer necessary.
---
 .../compilers/icedtea/build-fix-2.4.6.patch   | 58 -------------------
 .../development/compilers/icedtea/default.nix |  2 -
 .../development/compilers/icedtea/sources.nix | 32 +++++-----
 3 files changed, 16 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/development/compilers/icedtea/build-fix-2.4.6.patch

diff --git a/pkgs/development/compilers/icedtea/build-fix-2.4.6.patch b/pkgs/development/compilers/icedtea/build-fix-2.4.6.patch
deleted file mode 100644
index d5fcd9f4456..00000000000
--- a/pkgs/development/compilers/icedtea/build-fix-2.4.6.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# HG changeset patch
-# User Andrew John Hughes <gnu_andrew@member.fsf.org>
-# Date 1396030366 0
-# Node ID e8e59c50a451b45bd10cd495b81e5c61b2b4bca8
-# Parent  46f9059509fec2498b1a04ccefee538a45aeff8c
-PR1726: configure fails looking for ecj.jar before even trying to find javac
-
-2014-03-28  Andrew John Hughes  <gnu.andrew@redhat.com>
-
-	* acinclude.m4:
-	(IT_FIND_COMPILER): Check value of ECJ_JAR
-	and JAVAC here ...
-	(IT_FIND_ECJ_JAR): ... rather than here where
-	${JAVAC} may not yet be defined.
-
-diff -r 46f9059509fe -r e8e59c50a451 NEWS
---- a/NEWS	Fri Mar 28 18:06:31 2014 +0000
-+++ b/NEWS	Fri Mar 28 18:12:46 2014 +0000
-@@ -14,6 +14,9 @@
- 
- New in release 2.4.7 (2014-04-XX):
- 
-+* Bug fixes
-+  - PR1726: configure fails looking for ecj.jar before even trying to find javac
-+
- New in release 2.4.6 (2014-03-28):
- 
- * Backports
-diff -r 46f9059509fe -r e8e59c50a451 acinclude.m4
---- a/acinclude.m4	Fri Mar 28 18:06:31 2014 +0000
-+++ b/acinclude.m4	Fri Mar 28 18:12:46 2014 +0000
-@@ -134,6 +134,12 @@
-   IT_USING_ECJ
-   IT_WITH_GCJ
-   
-+  if test "x${ECJ_JAR}" = "xno"; then
-+    if test "x${JAVAC}" = "x"; then
-+      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
-+    fi
-+  fi
-+
-   if test x"${GCJ}" != xno ; then
-     JAVAC="${JAVA} -classpath ${ECJ_JAR} org.eclipse.jdt.internal.compiler.batch.Main"
-   fi
-@@ -350,11 +356,6 @@
-       fi
-   fi
-   AC_MSG_RESULT(${ECJ_JAR})
--  if test "x${ECJ_JAR}" = "xno"; then
--    if test "x${JAVAC}" = "x"; then
--      AC_MSG_ERROR("No compiler or ecj JAR file was found.")
--    fi
--  fi
-   AC_SUBST(ECJ_JAR)
- ])
- 
-
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index de3a013e7df..a8f9617a634 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -43,8 +43,6 @@ with srcInfo; stdenv.mkDerivation {
     inherit url sha256;
   };
 
-  patches = [ ./build-fix-2.4.6.patch ];
-
   outputs = [ "out" "jre" ];
 
   # TODO: Probably some more dependencies should be on this list but are being
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
index 6600c811786..098f774b66c 100644
--- a/pkgs/development/compilers/icedtea/sources.nix
+++ b/pkgs/development/compilers/icedtea/sources.nix
@@ -2,54 +2,54 @@
 {
   icedtea7 = rec {
     branch = "2.4";
-    version = "${branch}.6";
+    version = "${branch}.7";
 
     url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "06gsrci7934xmlddmi9wpawpgb1mp7c8cx3jmjsq91kdljmvqcy3";
+    sha256 = "17a58wcxvg0dd7ka99k819ci6bga2b9l8kp67fq8z3w0yyz76sdn";
 
     hg_url = "http://icedtea.classpath.org/hg/release/icedtea7-forest-${branch}";
 
     bundles = {
       openjdk = rec {
-        changeset = "b028e58c1b77";
+        changeset = "13970e76b784";
         url = "${hg_url}/archive/${changeset}.tar.gz";
-        sha256 = "e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2";
+        sha256 = "bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b";
       };
 
       corba = rec {
-        changeset = "48ef1bb6d120";
+        changeset = "e6ad5b912691";
         url = "${hg_url}/corba/archive/${changeset}.tar.gz";
-        sha256 = "2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6";
+        sha256 = "cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674";
       };
 
       jaxp = rec {
-        changeset = "e0ba4b9a8b91";
+        changeset = "94b7e8e0d96f";
         url = "${hg_url}/jaxp/archive/${changeset}.tar.gz";
-        sha256 = "e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca";
+        sha256 = "3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea";
       };
 
       jaxws = rec {
-        changeset = "4bd947cd146b";
+        changeset = "bd9a50a78d04";
         url = "${hg_url}/jaxws/archive/${changeset}.tar.gz";
-        sha256 = "17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a";
+        sha256 = "3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d";
       };
 
       jdk = rec {
-        changeset = "b5282042aae0";
+        changeset = "9448fff93286";
         url = "${hg_url}/jdk/archive/${changeset}.tar.gz";
-        sha256 = "ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5";
+        sha256 = "9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be";
       };
 
       langtools = rec {
-        changeset = "06eeb77dac24";
+        changeset = "8c26a3c39128";
         url = "${hg_url}/langtools/archive/${changeset}.tar.gz";
-        sha256 = "a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477";
+        sha256 = "5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b";
       };
 
       hotspot = rec {
-        changeset = "172674e0ab65";
+        changeset = "69b542696e5b";
         url = "${hg_url}/hotspot/archive/${changeset}.tar.gz";
-        sha256 = "2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0";
+        sha256 = "e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65";
       };
     };
   };

From 419a71e1e533fcc380f27d902194c8878882fa20 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 22 Mar 2014 18:27:23 +0100
Subject: [PATCH 0461/2033] spl, zfs: Add git versions, based on recent commits

Upstream has not been tagging new versions for a long time, but we need
compatibility with newer kernels. The 0.6.2 versions already have a bunch of
backported compatibility patches, but 3.14 kernels need even more.

Also, the git versions have fixed a bunch of crashes and other bugs, so perhaps
we should just bite the bullet and just use recent git versions (as sometimes
upstream recommends, when people run into bugs).

This adds a new "boot.zfs.useGit" boolean option, so that a user can
easily opt into using the git versions.
---
 nixos/modules/tasks/filesystems/zfs.nix | 39 +++++++++++++------
 pkgs/os-specific/linux/spl/git.nix      | 46 ++++++++++++++++++++++
 pkgs/os-specific/linux/zfs/git.nix      | 52 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  6 ++-
 4 files changed, 129 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/os-specific/linux/spl/git.nix
 create mode 100644 pkgs/os-specific/linux/zfs/git.nix

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 1d75a24692c..d7deb44c407 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -11,6 +11,7 @@ with lib;
 let
 
   cfgSpl = config.boot.spl;
+  cfgZfs = config.boot.zfs;
   cfgSnapshots = config.services.zfs.autoSnapshot;
 
   inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
@@ -21,8 +22,11 @@ let
 
   kernel = config.boot.kernelPackages;
 
+  splPkg = if cfgZfs.useGit then kernel.spl_git else kernel.spl;
+  zfsPkg = if cfgZfs.useGit then kernel.zfs_git else kernel.zfs;
+
   autosnapPkg = pkgs.zfstools.override {
-    zfs = config.boot.kernelPackages.zfs;
+    zfs = zfsPkg;
   };
 
   zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot";
@@ -47,6 +51,17 @@ in
       '';
     };
 
+    boot.zfs.useGit = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = ''
+        Use the git version of the SPL and ZFS packages.
+        Note that these are unreleased versions, with less testing, and therefore
+        may be more unstable.
+      '';
+    };
+
     services.zfs.autoSnapshot = {
       enable = mkOption {
         default = false;
@@ -111,7 +126,7 @@ in
     (mkIf enableZfs {
       boot = {
         kernelModules = [ "spl" "zfs" ] ;
-        extraModulePackages = [ kernel.zfs kernel.spl ];
+        extraModulePackages = [ splPkg zfsPkg ];
         extraModprobeConfig = mkIf (cfgSpl.hostid != "") ''
           options spl spl_hostid=${cfgSpl.hostid}
         '';
@@ -121,10 +136,10 @@ in
         kernelModules = [ "spl" "zfs" ] ;
         extraUtilsCommands =
           ''
-            cp -v ${kernel.zfs}/sbin/zfs $out/bin
-            cp -v ${kernel.zfs}/sbin/zdb $out/bin
-            cp -v ${kernel.zfs}/sbin/zpool $out/bin
-            cp -pdv ${kernel.zfs}/lib/lib*.so* $out/lib
+            cp -v ${zfsPkg}/sbin/zfs $out/bin
+            cp -v ${zfsPkg}/sbin/zdb $out/bin
+            cp -v ${zfsPkg}/sbin/zpool $out/bin
+            cp -pdv ${zfsPkg}/lib/lib*.so* $out/lib
             cp -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib
           '';
         postDeviceCommands =
@@ -139,7 +154,7 @@ in
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${kernel.zfs}/sbin/zpool import -f -a";
+          ExecStart = "${zfsPkg}/sbin/zpool import -f -a";
         };
         restartIfChanged = false;
       };
@@ -151,15 +166,15 @@ in
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = "${kernel.zfs}/sbin/zfs mount -a";
-          ExecStop = "${kernel.zfs}/sbin/zfs umount -a";
+          ExecStart = "${zfsPkg}/sbin/zfs mount -a";
+          ExecStop = "${zfsPkg}/sbin/zfs umount -a";
         };
         restartIfChanged = false;
       };
 
-      system.fsPackages = [ kernel.zfs ];                  # XXX: needed? zfs doesn't have (need) a fsck
-      environment.systemPackages = [ kernel.zfs ];
-      services.udev.packages = [ kernel.zfs ];             # to hook zvol naming, etc.
+      system.fsPackages = [ zfsPkg ];                  # XXX: needed? zfs doesn't have (need) a fsck
+      environment.systemPackages = [ zfsPkg ];
+      services.udev.packages = [ zfsPkg ];             # to hook zvol naming, etc.
     })
 
     (mkIf enableAutoSnapshots {
diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
new file mode 100644
index 00000000000..ba7ccc7348e
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/git.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchgit, kernel, perl, autoconf, automake, libtool, coreutils, gawk }:
+
+stdenv.mkDerivation {
+  name = "spl-0.6.3pre-${kernel.version}";
+  src = fetchgit {
+    url = git://github.com/zfsonlinux/spl.git;
+    rev = "89aa97059d7ddad668a5118aef7914743162a5e8";
+    sha256 = "1x4pba26zbyly8xd9q8s4av9v88ck0n9szxx72wzcn0s25rsyanx";
+  };
+
+  patches = [ ./install_prefix.patch ];
+
+  buildInputs = [ perl autoconf automake libtool ];
+
+  preConfigure = ''
+    ./autogen.sh
+
+    substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
+    substituteInPlace ./module/spl/spl-module.c  --replace /bin/mknod mknod
+
+    substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
+    substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+    substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
+  '';
+
+  configureFlags = ''
+     --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source
+     --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+
+    longDescription = ''
+      This kernel module is a porting layer for ZFS to work inside the linux
+      kernel.
+    '';
+
+    homepage = http://zfsonlinux.org/;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ wizeman ];
+  };
+}
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
new file mode 100644
index 00000000000..cc75011c7da
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/git.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, kernel, spl_git, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }:
+
+stdenv.mkDerivation {
+  name = "zfs-0.6.3pre-${kernel.version}";
+
+  src = fetchgit {
+    url = git://github.com/zfsonlinux/zfs.git;
+    rev = "de39ec11b885f97e6256324ee89eaf75af9852f6";
+    sha256 = "02hrhka9hg0vn4z20x7xzwrkr340pv9qwvwj8phjdm5ln321jh33";
+  };
+
+  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
+
+  buildInputs = [ spl_git perl autoconf automake libtool zlib libuuid coreutils ];
+
+  # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
+  NIX_CFLAGS_LINK = "-lgcc_s";
+
+  preConfigure = ''
+    ./autogen.sh
+
+    substituteInPlace ./module/zfs/zfs_ctldir.c    --replace "umount -t zfs"     "${utillinux}/bin/umount -t zfs"
+    substituteInPlace ./module/zfs/zfs_ctldir.c    --replace "mount -t zfs"      "${utillinux}/bin/mount -t zfs"
+    substituteInPlace ./lib/libzfs/libzfs_mount.c  --replace "/bin/umount"       "${utillinux}/bin/umount"
+    substituteInPlace ./lib/libzfs/libzfs_mount.c  --replace "/bin/mount"        "${utillinux}/bin/mount"
+    substituteInPlace ./udev/rules.d/*             --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
+    substituteInPlace ./cmd/ztest/ztest.c          --replace "/usr/sbin/ztest"   "$out/sbin/ztest"
+    substituteInPlace ./cmd/ztest/ztest.c          --replace "/usr/sbin/zdb"     "$out/sbin/zdb"
+  '';
+
+  configureFlags = ''
+    --disable-systemd
+    --with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source
+    --with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build
+    --with-spl=${spl_git}/libexec/spl
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "ZFS Filesystem Linux Kernel module";
+    longDescription = ''
+      ZFS is a filesystem that combines a logical volume manager with a
+      Copy-On-Write filesystem with data integrity detection and repair,
+      snapshotting, cloning, block devices, deduplication, and more.
+      '';
+    homepage = http://zfsonlinux.org/;
+    license = stdenv.lib.licenses.cddl;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ wizeman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 579e8d741d9..07345ee5a8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7078,7 +7078,8 @@ let
 
     psmouse_alps = callPackage ../os-specific/linux/psmouse-alps { };
 
-    spl = callPackage ../os-specific/linux/spl/default.nix { };
+    spl = callPackage ../os-specific/linux/spl { };
+    spl_git = callPackage ../os-specific/linux/spl/git.nix { };
 
     sysdig = callPackage ../os-specific/linux/sysdig {};
 
@@ -7094,7 +7095,8 @@ let
 
     virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { };
 
-    zfs = callPackage ../os-specific/linux/zfs/default.nix { };
+    zfs = callPackage ../os-specific/linux/zfs { };
+    zfs_git = callPackage ../os-specific/linux/zfs/git.nix { };
   };
 
   # Build the kernel modules for the some of the kernels.

From 6b1d20abe815c23e8685fe4556501ffa54b32f91 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Wed, 23 Apr 2014 10:06:19 +0200
Subject: [PATCH 0462/2033] haskell-msgpack: add version 0.7.2.5

---
 .../libraries/haskell/msgpack/default.nix     | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/msgpack/default.nix

diff --git a/pkgs/development/libraries/haskell/msgpack/default.nix b/pkgs/development/libraries/haskell/msgpack/default.nix
new file mode 100644
index 00000000000..4f84537e72e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/msgpack/default.nix
@@ -0,0 +1,24 @@
+{ cabal, attoparsec, blazeBuilder, deepseq, hashable, mtl
+, QuickCheck, testFramework, testFrameworkQuickcheck2, text
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "msgpack";
+  version = "0.7.2.5";
+  sha256 = "1iwibyv5aqp5h98x4s5pp3hj218l2k3vff87p727mh74f5j6l3s8";
+  buildDepends = [
+    attoparsec blazeBuilder deepseq hashable mtl text
+    unorderedContainers vector
+  ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "http://msgpack.org/";
+    description = "A Haskell implementation of MessagePack";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c241f9e44d..de006f60bc6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1795,6 +1795,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
+  msgpack = callPackage ../development/libraries/haskell/msgpack {};
+
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
   mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
   mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};

From 4587bbbca252e07dc692d7edf5a67fb4f0947de7 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Mon, 21 Apr 2014 13:37:18 -0430
Subject: [PATCH 0463/2033] pakcs: update hash for latest version.

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

diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 37acb4f6d1f..60071a8f6fa 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -6,7 +6,7 @@ let
 
   fsrc = fetchurl {
     url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
-    sha256 = "165f29zgb7ldl51zfwgc31fk6a67w0gznp5lhvb6i5m013g2ddi8";
+    sha256 = "0m9s6693svr57in8rhkvq9h2j0hiphki6jn0syzrzzs4ahb7i1gb";
   };
 
 in

From 4d765a456507e88ca7168c74ed7c3fec06a4fbf0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:07:36 +0200
Subject: [PATCH 0464/2033] haskell-cabal-meta: re-generate with cabal2nix

---
 pkgs/development/tools/haskell/cabal-meta/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/cabal-meta/default.nix b/pkgs/development/tools/haskell/cabal-meta/default.nix
index 62048e2893b..7aec5022720 100644
--- a/pkgs/development/tools/haskell/cabal-meta/default.nix
+++ b/pkgs/development/tools/haskell/cabal-meta/default.nix
@@ -6,9 +6,9 @@ cabal.mkDerivation (self: {
   sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk";
   isLibrary = true;
   isExecutable = true;
-  doCheck = false;
   buildDepends = [ shelly systemFileio systemFilepath text ];
   testDepends = [ hspec shelly systemFilepath text ];
+  doCheck = false;
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "build multiple packages at once";

From aeafc12d89ab97785727296ed5b42d4447a3a076 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:07:49 +0200
Subject: [PATCH 0465/2033] haskell-gtk2hs-buildtools: update to version
 0.12.5.2

---
 .../libraries/haskell/gtk2hs-buildtools/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 821b328b0a9..52bdebd8a40 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -1,12 +1,12 @@
-{ cabal, alex, filepath, happy, random }:
+{ cabal, alex, filepath, happy, hashtables, random }:
 
 cabal.mkDerivation (self: {
   pname = "gtk2hs-buildtools";
-  version = "0.12.5.1";
-  sha256 = "1zjm7y38089b57q3csgq7ydfm104ffhvsycszddkj0cgfgafshfm";
+  version = "0.12.5.2";
+  sha256 = "1w4mfwkiqil9xd1xl4himb6vnl66hxb7a4vch6wh3bfad880qyiw";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ filepath random ];
+  buildDepends = [ filepath hashtables random ];
   buildTools = [ alex happy ];
   meta = {
     homepage = "http://projects.haskell.org/gtk2hs/";

From c2516c30e32eab89a42e5d9ddca782596d9dc1f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:31 +0200
Subject: [PATCH 0466/2033] haskell-git-annex: update to version 5.20140412

---
 .../git-and-tools/git-annex/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index dcf76160ec6..8f042addf1d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -8,16 +8,16 @@
 , networkConduit, networkInfo, networkMulticast
 , networkProtocolXmpp, openssh, optparseApplicative, perl
 , QuickCheck, random, regexTdfa, rsync, SafeSemaphore, securemem
-, SHA, stm, tasty, tastyHunit, tastyQuickcheck, tastyRerun, text
-, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
-, warp, warpTls, which, xmlTypes, yesod, yesodCore, yesodDefault
-, yesodForm, yesodStatic
+, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
+, tastyRerun, text, time, transformers, unixCompat, utf8String
+, uuid, wai, waiLogger, warp, warpTls, which, xmlTypes, yesod
+, yesodCore, yesodDefault, yesodForm, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140405";
-  sha256 = "0nbfnv9z2jhx2jr2nma0y1znvbaa09rv1drl6wk27j6xsbiq3p3k";
+  version = "5.20140412";
+  sha256 = "0dnds35aq58q7by7is6yajqvpyg3fkpwrakgjc03z2529fyyw6gm";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -28,10 +28,10 @@ cabal.mkDerivation (self: {
     httpTypes IfElse json liftedBase MissingH MonadCatchIOTransformers
     monadControl mtl network networkConduit networkInfo
     networkMulticast networkProtocolXmpp optparseApplicative QuickCheck
-    random regexTdfa SafeSemaphore securemem SHA stm tasty tastyHunit
-    tastyQuickcheck tastyRerun text time transformers unixCompat
-    utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
-    yesodDefault yesodForm yesodStatic
+    random regexTdfa SafeSemaphore securemem SHA shakespeare stm tasty
+    tastyHunit tastyQuickcheck tastyRerun text time transformers
+    unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes
+    yesod yesodCore yesodDefault yesodForm yesodStatic
   ];
   buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
   configureFlags = "-fS3

From 9eaa3ef5a2e25d9153f596eeb469d37286e1e7fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:33 +0200
Subject: [PATCH 0467/2033] haskell-RepLib: update to version 0.5.3.2

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

diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index 15cba0c0b28..ca593bb2ab8 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
-  version = "0.5.3.1";
-  sha256 = "0lc1ma6h5wdfl4crnvg1vyvlx4xvps4l2nwb9dl6nyspmpjad807";
+  version = "0.5.3.2";
+  sha256 = "0adqq49kbdh0755694hrldsd9rm76bpj5ylmmli4fjxs203m5f5y";
   buildDepends = [ mtl typeEquality ];
   meta = {
     homepage = "http://code.google.com/p/replib/";

From d8e36fac62bcce880a6deaaf549f2a68fb599262 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:34 +0200
Subject: [PATCH 0468/2033] haskell-aeson: update to version 0.7.0.3

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

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 960314920a1..e7e35162111 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.7.0.2";
-  sha256 = "0li89xs4dlwc3ijs6w5gabjibj09x12qgxhzp7mch6gxjxwd3ihj";
+  version = "0.7.0.3";
+  sha256 = "0d2mgy35q7jkg18wh0ms7i26v74nj5mffa6z80bdblihizif6100";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
     text time unorderedContainers vector

From e138265a5bd1bcf9d9ae916fd4579d03fab51c55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:35 +0200
Subject: [PATCH 0469/2033] haskell-alsa-mixer: update to version 0.2.0.2

---
 pkgs/development/libraries/haskell/alsa-mixer/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
index 0e7ef5e2a9f..2b3961f5cf1 100644
--- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix
@@ -12,6 +12,5 @@ cabal.mkDerivation (self: {
     description = "Bindings to the ALSA simple mixer API";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = with self.stdenv.lib.maintainers; [ ttuegel ];
   };
 })

From 0ab1f4305bf9f709fa283e6ed024021df6b0c77b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:36 +0200
Subject: [PATCH 0470/2033] haskell-alsa-pcm: update to version 0.6.0.2

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

diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
index c4f39cdd7ee..7ac221299fd 100644
--- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix
+++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "alsa-pcm";
-  version = "0.6.0.1";
-  sha256 = "0gnq4p172sqmlks6aykzr5l2qx2shrs2fypcvs4g56c9zpk3c3ax";
+  version = "0.6.0.2";
+  sha256 = "0zckp83wdqb6nl2k63fapa5h4vf1xyvbaycd0ixwr9k7mw75q7b9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 6fa686c078642d5f2de8412ef888986980d76a82 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:37 +0200
Subject: [PATCH 0471/2033] haskell-atomic-primops: update to version 0.6.0.5

---
 .../libraries/haskell/atomic-primops/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix
index c5bc0dd2b47..59d02ce7649 100644
--- a/pkgs/development/libraries/haskell/atomic-primops/default.nix
+++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix
@@ -1,10 +1,10 @@
-{ cabal, Cabal, primitive }:
+{ cabal, primitive }:
 
 cabal.mkDerivation (self: {
   pname = "atomic-primops";
-  version = "0.6";
-  sha256 = "0jj4mv9vzk7s257gnjs00fza6shr7j9bv8p48gj61yncg0qdypiz";
-  buildDepends = [ Cabal primitive ];
+  version = "0.6.0.5";
+  sha256 = "0xyvadhmhk2b6y6p52cfbjx1hs3zfcwfa5wx6cypaq4yi3csyl5k";
+  buildDepends = [ primitive ];
   meta = {
     homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
     description = "A safe approach to CAS and other atomic ops in Haskell";

From 00bc025d05309640a82204c500b122afb612bda5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:39 +0200
Subject: [PATCH 0472/2033] haskell-chell-quickcheck: update to version 0.2.3

---
 .../libraries/haskell/chell-quickcheck/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
index 835747ee881..5025fcc403b 100644
--- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "chell-quickcheck";
-  version = "0.2.2";
-  sha256 = "05qshv9vcl05khxsxyks2z7dqd8dqafjsg3awkkdhviviv5p2fp8";
+  version = "0.2.3";
+  sha256 = "15j1wzhfyr9v8hy9d5lnr6jkrfr1zfb7dwgiy3ni90mvpf8x54yc";
   buildDepends = [ chell QuickCheck random ];
   meta = {
     homepage = "https://john-millikin.com/software/chell/";

From 2a3cb333508d2de33a9b1c7fde72e0ab9c880c44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:40 +0200
Subject: [PATCH 0473/2033] haskell-conduit-combinators: update to version
 0.2.4.1

---
 .../libraries/haskell/conduit-combinators/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index fdf5c4625fd..9439d36ecba 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.4";
-  sha256 = "0pxzvxd1j48l7j2anv61bxv1accl0jc6vdf9vv0l3s2358smzwwv";
+  version = "0.2.4.1";
+  sha256 = "00fb7dvpz2p4n14qdxai1178k63k24r1lvdjjlnbxabl7nm3717w";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

From 7acbb2938a73fac8dab92bd1bc33c969c833dd7f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:41 +0200
Subject: [PATCH 0474/2033] haskell-conduit-extra: update to version 1.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 67b4186e606..1bdc65672fd 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.0";
-  sha256 = "08s8nafsdkd4dwmi2vsid82z8iv178vm9jbb322ygnbpf2a9y96y";
+  version = "1.1.0.1";
+  sha256 = "1j1arx07aynziyc9b4bjd7wyydvi1nicdrv86jhyp1nd6zklj1m4";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet streamingCommons text transformers

From fef13a99f964beb17cc9da11e3f99de1de0c3f94 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:42 +0200
Subject: [PATCH 0475/2033] haskell-conduit: update to version 1.1.0.2

---
 .../libraries/haskell/conduit/default.nix         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index ac6211f2b38..8b15e8df37a 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -1,19 +1,16 @@
 { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl
-, QuickCheck, resourcet, text, textStreamDecode, transformers
-, transformersBase, void
+, QuickCheck, resourcet, transformers, transformersBase, void
 }:
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.0";
-  sha256 = "17y8fnvl9s3676sslhc04abs4zqh90l2rdcazxglv0sfrfsdgwnq";
+  version = "1.1.0.2";
+  sha256 = "16pcdwgh9g7p7ali3sp0zpx1cwdgvyfwhgwcinnmaixxr6fsqqay";
   buildDepends = [
-    exceptions liftedBase mmorph monadControl mtl resourcet text
-    textStreamDecode transformers transformersBase void
-  ];
-  testDepends = [
-    hspec mtl QuickCheck resourcet text transformers void
+    exceptions liftedBase mmorph monadControl mtl resourcet
+    transformers transformersBase void
   ];
+  testDepends = [ hspec mtl QuickCheck resourcet transformers void ];
   doCheck = false;
   meta = {
     homepage = "http://github.com/snoyberg/conduit";

From 7f72b38f3c20f4df11a669518b6f103520e12e2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:43 +0200
Subject: [PATCH 0476/2033] haskell-connection: update to version 0.2.1

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

diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix
index 69083520c18..4a2c8ff7792 100644
--- a/pkgs/development/libraries/haskell/connection/default.nix
+++ b/pkgs/development/libraries/haskell/connection/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "connection";
-  version = "0.2.0";
-  sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp";
+  version = "0.2.1";
+  sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy";
   buildDepends = [
     cprngAes dataDefaultClass network socks tls x509 x509Store
     x509System x509Validation

From 1983e40f106a9ff573c6eaa32d937e2ded589404 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:45 +0200
Subject: [PATCH 0477/2033] haskell-cookie: update to version 0.4.1.1

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

diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix
index b7dae5d4a9b..423cf4c156b 100644
--- a/pkgs/development/libraries/haskell/cookie/default.nix
+++ b/pkgs/development/libraries/haskell/cookie/default.nix
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, dataDefault, text, time }:
+{ cabal, blazeBuilder, dataDefault, deepseq, text, time }:
 
 cabal.mkDerivation (self: {
   pname = "cookie";
-  version = "0.4.0.1";
-  sha256 = "01k5gq9kwbrivkhr1sj8aw4cgf2c1xgwwajqvd435r0g99fpx5kk";
-  buildDepends = [ blazeBuilder dataDefault text time ];
+  version = "0.4.1.1";
+  sha256 = "1w1nh7h4kc9pr9kpi8fkrqiih37mp3gcnxf42r01nciq4sh4yi3m";
+  buildDepends = [ blazeBuilder dataDefault deepseq text time ];
   meta = {
     homepage = "http://github.com/snoyberg/cookie";
     description = "HTTP cookie parsing and rendering";

From b16fcdcddf24bfc5420fb8e0b7b9760931390ce7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:46 +0200
Subject: [PATCH 0478/2033] haskell-dataenc: update to version 0.14.0.6

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

diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 6eda9ca3c43..129d392d62d 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dataenc";
-  version = "0.14.0.5";
-  sha256 = "13gajqbayar7x8sq3rw93i277gqd0bx1i34spshlj4b41fraxc8w";
+  version = "0.14.0.6";
+  sha256 = "0635aspx65wwpky0kbnlj9ly4vjw5afzvdn9glnhfxq6m6yjzp8q";
   isLibrary = true;
   isExecutable = true;
   jailbreak = true;

From 7cc98529c7a43397a5633e482ac465cede042b1c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:47 +0200
Subject: [PATCH 0479/2033] haskell-derive: update to version 2.5.15

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

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 42ca82f4ac1..3e8cf02dddb 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.14";
-  sha256 = "1fihcd8l4z8d6rad8h39pg5gdb75h895c2xld9574fwp3bm0zl0c";
+  version = "2.5.15";
+  sha256 = "18r7n6bd3w5347yx6m352r8jbyn6qf2364mdz62891hdv7vqb629";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 50780aabe3dbfb2770d86bda36a35e5ed5dfe951 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:48 +0200
Subject: [PATCH 0480/2033] haskell-dns: update to version 1.2.2

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

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 97a120f2123..6bef995580c 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.2.1";
-  sha256 = "0xv8mj2x8ijqgi7gnh2shr7ns9qghiczm3lw9n37mxk02zbvw8h0";
+  version = "1.2.2";
+  sha256 = "0xba8bwxn5n3bh1qfbrmnrfsnf20iwa10acx1z4017jbnx0s025v";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit
     conduitExtra iproute mtl network random resourcet

From f6c8a17fb53ab16e9d431fa036f9b0d09d2f3d1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:50 +0200
Subject: [PATCH 0481/2033] haskell-esqueleto: update to version 1.3.12

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

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 9103480d48f..217b6f7a409 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.3.10";
-  sha256 = "0q333m7xaanxb1vzgf2yn6d7y3pgkbj9mjw5gnywms36v5zsfik7";
+  version = "1.3.12";
+  sha256 = "156wcdnjpvy0s65swncxsc8wg0ci0bnq4nsxkc6095wpn9pflnfg";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers

From d0967c1324965353340d82838ffb68ef39a81c97 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:51 +0200
Subject: [PATCH 0482/2033] haskell-explicit-exception: update to version
 0.1.7.2

---
 .../libraries/haskell/explicit-exception/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix
index 0f2385a004f..2542a4c1055 100644
--- a/pkgs/development/libraries/haskell/explicit-exception/default.nix
+++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "explicit-exception";
-  version = "0.1.7.1";
-  sha256 = "15p5pndam6byd3p8qlnn8pjdhb7rvn93fxa2m40x3wxh58ymkh14";
+  version = "0.1.7.2";
+  sha256 = "0zncj57mpngszl7jz3khhd4dajzis7aag0ad62hc8rkrv2j8f5q4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ transformers ];

From cf71fce3a278a91fbddd83cc70e8857b7b3e8911 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:52 +0200
Subject: [PATCH 0483/2033] haskell-fay: update to version 0.19.2.1

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

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index f7bf07b4fba..5ad9931709a 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.19.2";
-  sha256 = "08lq2x87gsf5szdj613k9h3qxzpb99hjhxnq3vggs2kf0ijp6xmh";
+  version = "0.19.2.1";
+  sha256 = "05d0vmcwhssrr50zhbxbn3yg7h1rcjiqc4dpy3dd8kxlw6aizwq3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3244e10c1b1a0f5d1fb39465bc24360ffc02b0c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:53 +0200
Subject: [PATCH 0484/2033] haskell-glib: update to version 0.12.5.4

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

diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
index 9ae07187f5a..25e668081d7 100644
--- a/pkgs/development/libraries/haskell/glib/default.nix
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "glib";
-  version = "0.12.5.3";
-  sha256 = "0hn55x0bzc6xxsd5fhlnh2mpdn8n80295i2irgbgxqc1wn226frc";
+  version = "0.12.5.4";
+  sha256 = "1jbqfcsmsghq67lwnk6yifs34lxvh6xfbzxzfryalifb4zglccz6";
   buildDepends = [ utf8String ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];

From fb74f950c04ef1ca1bc045e2248b28e075073056 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:54 +0200
Subject: [PATCH 0485/2033] haskell-gtk: update to version 0.12.5.7

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

diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
index 081573e7223..98d7f5b96cd 100644
--- a/pkgs/development/libraries/haskell/gtk/default.nix
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk";
-  version = "0.12.5.6";
-  sha256 = "06i6y7psl8fd7cy7jn0aqp98k876spr5vjgjxs8730pw3x17z6ld";
+  version = "0.12.5.7";
+  sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w";
   buildDepends = [ cairo glib mtl pango ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc pkgconfig ];

From 918ad1af5480ba8276db14550aaf2c3a1cb8245b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:56 +0200
Subject: [PATCH 0486/2033] haskell-happstack-server: update to version 7.3.5

---
 .../libraries/haskell/happstack/happstack-server.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 4b54a002ab0..723fdb0fdb9 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.4";
-  sha256 = "1k9614f0x5ravblb00xiy8z2nqi4k9jhp2vzm1vdpx9q8sg47h1p";
+  version = "7.3.5";
+  sha256 = "1n0pdishsngrri83flipfzmk0gn01n256rg7vrbn7kjl1aff9r1g";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath

From dd9b958765c9d41dabdd6a8626ae0ee9ebaa9aed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:57 +0200
Subject: [PATCH 0487/2033] haskell-haskell-names: update to version 0.3.3.1

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

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index 74cfc453099..d005793549c 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.3";
-  sha256 = "1f40dyrdb9c5iysmclql75l86zg3iisnyyiq5fkgixdafzsq31ir";
+  version = "0.3.3.1";
+  sha256 = "1xhh9bl0r2kxnp6c0x22ys7gcf357pgah07ayq9af6m90adyqhiw";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass

From d90cb9ebec1e801d48a1abce47ba18c2bd7b797e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:58 +0200
Subject: [PATCH 0488/2033] haskell-hledger-lib: update to version 0.22.2

---
 .../libraries/haskell/hledger-lib/default.nix   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 7e57f0d21e1..41baa284cb6 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -1,20 +1,19 @@
-{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec
-, prettyShow, regexpr, regexTdfa, safe, split, testFramework
+{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow
+, regexpr, regexTdfa, safe, split, testFramework
 , testFrameworkHunit, time, transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.22.1";
-  sha256 = "0kaa778swx4vw0rkhxd3h9h9qj13rzz24x92z139vad1n722gcw1";
+  version = "0.22.2";
+  sha256 = "183ypncr1bvab84h57aql27rgjaxka38a267873l1hpvpsrw61hf";
   buildDepends = [
-    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow regexpr
-    regexTdfa safe split time transformers utf8String
+    cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
+    safe split time transformers utf8String
   ];
   testDepends = [
-    cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow regexpr
-    regexTdfa safe split testFramework testFrameworkHunit time
-    transformers
+    cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
+    safe split testFramework testFrameworkHunit time transformers
   ];
   meta = {
     homepage = "http://hledger.org";

From 450c7b9bdf6266719730fcdea6e45355c97c2c6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:12:59 +0200
Subject: [PATCH 0489/2033] haskell-hledger-web: update to version 0.22.7

---
 .../libraries/haskell/hledger-web/default.nix | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 58328ae9cf5..22a02247474 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,28 +1,27 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
-, dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec
-, httpClient, httpConduit, HUnit, json, networkConduit, parsec
-, regexpr, safe, shakespeareText, text, time, transformers, wai
-, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore
-, yesodStatic, yesodTest
+, conduitExtra, dataDefault, filepath, hamlet, hjsmin, hledger
+, hledgerLib, hspec, httpClient, httpConduit, HUnit, json
+, networkConduit, parsec, regexpr, safe, shakespeareText, text
+, time, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml
+, yesod, yesodCore, yesodStatic, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.22.4";
-  sha256 = "07xz6ijg3nzzjair5gdjjryv5hs2rxws4maz22rrqnpf8wwjjc54";
+  version = "0.22.7";
+  sha256 = "0dxlprmymspjwxdr9sig483y8azd7z42sv6k6r35m74z7naga68y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath
-    hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json
-    networkConduit parsec regexpr safe shakespeareText text time
-    transformers wai waiExtra waiHandlerLaunch warp yaml yesod
-    yesodCore yesodStatic
+    blazeHtml blazeMarkup clientsession cmdargs conduitExtra
+    dataDefault filepath hamlet hjsmin hledger hledgerLib httpClient
+    httpConduit HUnit json networkConduit parsec regexpr safe
+    shakespeareText text time transformers wai waiExtra
+    waiHandlerLaunch warp yaml yesod yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];
   jailbreak = true;
   doCheck = false;
-  patches = [ ./build-fix.patch ];
   meta = {
     homepage = "http://hledger.org";
     description = "A web interface for the hledger accounting tool";

From a80ec739b565321643290e04c2002fc5f9720b02 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:01 +0200
Subject: [PATCH 0490/2033] haskell-hledger: update to version 0.22.2

---
 .../libraries/haskell/hledger/default.nix      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 17db5432991..7dc6bdf5ac8 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,23 +1,23 @@
-{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib
-, HUnit, mtl, parsec, prettyShow, regexpr, safe, shakespeareText
-, split, tabular, testFramework, testFrameworkHunit, text, time
+{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
+, parsec, prettyShow, regexpr, safe, shakespeareText, split
+, tabular, testFramework, testFrameworkHunit, text, time
 , transformers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.22.1";
-  sha256 = "1mlh5dlbfkqz41i7zaa4cybf75cg5mrp6sj48kwns0liaqyvav58";
+  version = "0.22.2";
+  sha256 = "08lk3gd332k5bhvr6db4z66f2rggzbdbhcb03sc5m0dbinawmib8";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec
+    cmdargs filepath haskeline hledgerLib HUnit mtl parsec prettyShow
     regexpr safe shakespeareText split tabular text time utf8String
   ];
   testDepends = [
-    cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl
-    parsec prettyShow regexpr safe shakespeareText split tabular
-    testFramework testFrameworkHunit text time transformers
+    cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
+    prettyShow regexpr safe shakespeareText split tabular testFramework
+    testFrameworkHunit text time transformers
   ];
   meta = {
     homepage = "http://hledger.org";

From 93ba77406712f553c317030299635498a3739f27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:02 +0200
Subject: [PATCH 0491/2033] haskell-hoogle: update to version 4.2.32

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

diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix
index 995a4ef5d9a..9c3ed9e778c 100644
--- a/pkgs/development/libraries/haskell/hoogle/default.nix
+++ b/pkgs/development/libraries/haskell/hoogle/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hoogle";
-  version = "4.2.31";
-  sha256 = "176lyj236ncq0lg7vbl4bbm1a98ficj82aranrhyxdjzmbk3i67x";
+  version = "4.2.32";
+  sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From ef5ef8b155af1d2107d52b1221b02052c58e6ee7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:03 +0200
Subject: [PATCH 0492/2033] haskell-http-client: update to version 0.3.1.1

---
 pkgs/development/libraries/haskell/http-client/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 8816ec91a83..a1a39a900e3 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.0.2";
-  sha256 = "1r858ml809c21q9q2kv0105y89cizncxym9mf1f0f165aa2hx71m";
+  version = "0.3.1.1";
+  sha256 = "1rnvbjkcblfmn1n40p5lanbcyl2ng5r98cmj0lkjg7vz6fq0c57r";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes
@@ -16,7 +16,8 @@ cabal.mkDerivation (self: {
   ];
   testDepends = [
     async base64Bytestring blazeBuilder caseInsensitive deepseq hspec
-    httpTypes monadControl network text time transformers zlib
+    httpTypes monadControl network streamingCommons text time
+    transformers zlib
   ];
   doCheck = false;
   meta = {

From 0325be8d50ef3bcae9198dc607a898ddfe068c5b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:04 +0200
Subject: [PATCH 0493/2033] haskell-http-conduit: update to version 2.1.1

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

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 1ea6ebafd8c..d0ee6945d1c 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.1.0";
-  sha256 = "1qlqhrrc130c8wvgbbbkb7qrm8gp48gkv5xanqgb26amvny98gsv";
+  version = "2.1.1";
+  sha256 = "1xdd7kdxr7jbic2j9rd6gvx637d24wr1lyfnaj02v16x9b0nydjm";
   buildDepends = [
     conduit httpClient httpClientTls httpTypes liftedBase monadControl
     mtl resourcet transformers

From 64f7da41cf963911b497fbecbe967c1826f75344 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:05 +0200
Subject: [PATCH 0494/2033] haskell-http-reverse-proxy: update to version
 0.3.1.6

---
 .../libraries/haskell/http-reverse-proxy/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index ff47ba14241..5c6da92953c 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.1.5";
-  sha256 = "0rzwh5ph23592qycriam932bgb6q2nvjr7wayqz0sjvvxv661bk0";
+  version = "0.3.1.6";
+  sha256 = "1ckxiabk685a47xy0khj6h05j26hsc5hlxfysbkmk2q70y0ljk7k";
   buildDepends = [
     async blazeBuilder caseInsensitive conduit conduitExtra
     dataDefaultClass httpClient httpTypes liftedBase monadControl

From 61072c89ab0f7c60d28f009dbef9e92c1624881a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:07 +0200
Subject: [PATCH 0495/2033] haskell-io-streams: update to version 1.1.4.3

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

diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index fcc39dfad57..4e361724681 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.2";
-  sha256 = "0x6d0j41wnxl2h9xzbybmzqrrna3hc17786k65cpiby2x3nlp799";
+  version = "1.1.4.3";
+  sha256 = "0qp63xfbfz5ymfn8l9fiy27z30fi4sq201zgsh9x2mkhp6z2yzld";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings

From b7223cbda7467b77186bfcbf4bdb7743f19aa2c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:08 +0200
Subject: [PATCH 0496/2033] haskell-language-c: update to version 0.4.5

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

diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix
index 188ca99a5be..7607b3bf3aa 100644
--- a/pkgs/development/libraries/haskell/language-c/default.nix
+++ b/pkgs/development/libraries/haskell/language-c/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c";
-  version = "0.4.4";
-  sha256 = "0pfadijrcfvxvdrwk8n54pqvpmi4qa5w7s0l9shxbkvpj0dmnp50";
+  version = "0.4.5";
+  sha256 = "0q0x1rm74g27ry4jja44hk8z0lqkwnimnxbcy54m2cphaxk7yjk4";
   buildDepends = [ filepath syb ];
   buildTools = [ alex happy ];
   meta = {

From 0615619335982d0c051058609474667789e485e7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:09 +0200
Subject: [PATCH 0497/2033] haskell-language-ecmascript: update to version
 0.16.2

---
 .../libraries/haskell/language-ecmascript/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
index 1a53881fd29..9d47c07554c 100644
--- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-ecmascript";
-  version = "0.16.1";
-  sha256 = "0pqb1r60jjmiwk9giaxnrp9a07h4a97kp6g0nznwpdy32x849gx3";
+  version = "0.16.2";
+  sha256 = "15jvq3wblx67hhvgblqzfdnks6x17hfnivifps5wfs9v1ljkiq1k";
   buildDepends = [
     dataDefaultClass Diff mtl parsec QuickCheck testingFeat uniplate
     wlPprint

From 94c86ba55ae5c3422001e7a35a1cb1671c9894d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:10 +0200
Subject: [PATCH 0498/2033] haskell-lifted-async: update to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 9eab08955f5..41478f2a1a2 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.1.1";
-  sha256 = "0hkqiplnvy14m881n4bzamvy1432bxy4k1j4rwl824w5fn2h5i74";
+  version = "0.1.2";
+  sha256 = "05ra09phkswxydr03f9xscrkxnv0yvp69376dl6lln7p5j45lmc3";
   buildDepends = [ async liftedBase monadControl transformersBase ];
   testDepends = [
     async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh

From c12db35f5736afc1bda51a4e1f4e6ff3e7de1760 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:11 +0200
Subject: [PATCH 0499/2033] haskell-linear: update to version 1.10.1.1

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

diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix
index 1abc63c8c4b..a1837b4baab 100644
--- a/pkgs/development/libraries/haskell/linear/default.nix
+++ b/pkgs/development/libraries/haskell/linear/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "linear";
-  version = "1.10";
-  sha256 = "1wl0hb58znc3n5f5jv0wm6g21p080zldlq954n0lm8sjwmv39cdx";
+  version = "1.10.1.1";
+  sha256 = "0falp5mpd9lifzz11dy3lvfph8n0i8n4mh5kk5kg974qvdvjilgq";
   buildDepends = [
     adjunctions binary distributive hashable lens reflection
     semigroupoids semigroups tagged transformers unorderedContainers

From 2bfb9a54580b221dbf913f917551f262cfbdd45f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:13 +0200
Subject: [PATCH 0500/2033] haskell-midi: update to version 0.2.1.2

---
 pkgs/development/libraries/haskell/midi/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix
index 9467b567f82..71593bd21cd 100644
--- a/pkgs/development/libraries/haskell/midi/default.nix
+++ b/pkgs/development/libraries/haskell/midi/default.nix
@@ -4,14 +4,16 @@
 
 cabal.mkDerivation (self: {
   pname = "midi";
-  version = "0.2.1.1";
-  sha256 = "11h4kr9a1jia1ghcyzgavcznw4771l00z736iibjpagw0b8fpip5";
-  isLibrary = true;
-  isExecutable = true;
+  version = "0.2.1.2";
+  sha256 = "077cxdazr97hjpq42l7hjn905pfhyshvaiwqjdfnzhjv6r48q4zk";
   buildDepends = [
     binary eventList explicitException monoidTransformer nonNegative
     QuickCheck random transformers utilityHt
   ];
+  testDepends = [
+    eventList explicitException nonNegative QuickCheck transformers
+    utilityHt
+  ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/MIDI";
     description = "Handling of MIDI messages and files";

From 9425cf9206457e88aee99d85e3f822cfdac23149 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:14 +0200
Subject: [PATCH 0501/2033] haskell-monoid-transformer: update to version 0.0.3

---
 .../libraries/haskell/monoid-transformer/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
index d4e5962ec85..5894eccd4b7 100644
--- a/pkgs/development/libraries/haskell/monoid-transformer/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-transformer";
-  version = "0.0.2";
-  sha256 = "0hd8jb1iw6lbgml3f08n680bdij56cjanpkr4fc1jr7qn6yzzb2j";
+  version = "0.0.3";
+  sha256 = "1f06ppvv50w5pacm4bs89zwkydih626cgbd2z6xqbp8cmhg6dj4l";
   meta = {
     description = "Monoid counterparts to some ubiquitous monad transformers";
     license = self.stdenv.lib.licenses.bsd3;

From a5fdc77c4c142ddffffbc3da850add4b0011ce0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:15 +0200
Subject: [PATCH 0502/2033] haskell-ncurses: update to version 0.2.8

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

diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
index f900e3c2ef9..b4e48f6e432 100644
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ncurses";
-  version = "0.2.7";
-  sha256 = "026p6b2apgi9r65py45h3rl57xgwzyamq511a0rsb7myzagw22vz";
+  version = "0.2.8";
+  sha256 = "0i8kbi8q0l6vka5i64aanhsid2yf8w2fj3fk33y7bv7kl791hynp";
   buildDepends = [ text transformers ];
   buildTools = [ c2hs ];
   extraLibraries = [ ncurses ];

From 6e3e9fce302e5b744963ebf9f82418ddefc38074 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:16 +0200
Subject: [PATCH 0503/2033] haskell-pcre-light: update to version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 71e0ddadb59..4ffabf4a1e2 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "pcre-light";
-  version = "0.4";
-  sha256 = "1xiikiap1bvx9czw64664vifdq64scx0yhfclh5m8mkvn3x6yzxk";
+  version = "0.4.0.1";
+  sha256 = "07r863fcxhxnlvld732r1d3kd797ki71wyizfklbz0ccdxqq8cqj";
   extraLibraries = [ pcre ];
   meta = {
-    homepage = "http://code.haskell.org/~dons/code/pcre-light";
+    homepage = "https://github.com/Daniel-Diaz/pcre-light";
     description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 2e36bcbb61cf0ac6e629d3d4ae14a0adf26847a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:18 +0200
Subject: [PATCH 0504/2033] haskell-pem: update to version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix
index 0c331e1bda5..410d9c3d4c4 100644
--- a/pkgs/development/libraries/haskell/pem/default.nix
+++ b/pkgs/development/libraries/haskell/pem/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pem";
-  version = "0.2.1";
-  sha256 = "05ln372ad89993v07q108l9al8jgjpzardpl02pziwwacdcj1j17";
+  version = "0.2.2";
+  sha256 = "162sk5sg22w21wqz5qv8kx6ibxp99v5p20g3nknhm1kddk3hha1p";
   buildDepends = [ base64Bytestring mtl ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit

From f5df3851af90f3b211fc5d70c9f894f4521427dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:19 +0200
Subject: [PATCH 0505/2033] haskell-pipes: update to version 4.1.1

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

diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index 3ca6969f159..3240f89d8ca 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "4.1.0";
-  sha256 = "1n10plmrjvmkyv502195mkms48y3lfp5gy08lhyhqqr7kn1gzkf0";
+  version = "4.1.1";
+  sha256 = "1ib7vs4x8ckajlg3nz9lx2snnwj75by90fbv4znwhwgrhj4h13dn";
   buildDepends = [ mmorph mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers

From 8455e7517395d9f69946795276b409ad04d69c21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:20 +0200
Subject: [PATCH 0506/2033] haskell-resourcet: update to version 1.1.2

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

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 7995227a8c0..a7bc937ca65 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "1.1.1";
-  sha256 = "0v80wlxpcikr41p8wxa2kr184ghp94bgb5fwym9c27k8djig2awy";
+  version = "1.1.2";
+  sha256 = "1hm53zq61m1va9djxy0vi3nwdl4qz26dzk8a55qh40cpkf45zggk";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase

From 808b19b3fc4e35e374c92318d074bdeef34a17b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:21 +0200
Subject: [PATCH 0507/2033] haskell-simple-reflect: update to version 0.3.2

---
 .../libraries/haskell/simple-reflect/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix
index 7a7f40c6d83..121677b79f1 100644
--- a/pkgs/development/libraries/haskell/simple-reflect/default.nix
+++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix
@@ -2,10 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "simple-reflect";
-  version = "0.3.1";
-  sha256 = "189pc7fk28bwl0mq6hw502kc048n203rb4vpf2wva490r36xiw6s";
+  version = "0.3.2";
+  sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
   meta = {
-    homepage = "http://twan.home.fmf.nl/blog/haskell/simple-reflection-of-expressions.details";
+    homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
     description = "Simple reflection of expressions containing variables";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 9d4cfd51d5493b3386c35880666d6f91f97b87ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:22 +0200
Subject: [PATCH 0508/2033] haskell-simple-sendfile: update to version 0.2.14

---
 .../libraries/haskell/simple-sendfile/default.nix  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
index 806feee295f..52c5fd7fe68 100644
--- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix
+++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix
@@ -1,11 +1,15 @@
-{ cabal, conduit, hspec, HUnit, network, networkConduit }:
+{ cabal, conduit, conduitExtra, hspec, HUnit, network
+, networkConduit, resourcet
+}:
 
 cabal.mkDerivation (self: {
   pname = "simple-sendfile";
-  version = "0.2.13";
-  sha256 = "03cgbzfhkih1ln1xb78r1hfh6zzjjj6763n9nzr9cj6bxs0fiqd3";
-  buildDepends = [ network ];
-  testDepends = [ conduit hspec HUnit network networkConduit ];
+  version = "0.2.14";
+  sha256 = "00k9cachx7y4811b71f8p468kx018hzvpvw6jgf7zmjhc9v922ni";
+  buildDepends = [ network resourcet ];
+  testDepends = [
+    conduit conduitExtra hspec HUnit network networkConduit resourcet
+  ];
   doCheck = false;
   meta = {
     description = "Cross platform library for the sendfile system call";

From d7e5724db1459d92942abbda9de4d14cc98d244d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:24 +0200
Subject: [PATCH 0509/2033] haskell-snap-loader-static: update to version
 0.9.0.2

---
 pkgs/development/libraries/haskell/snap/loader-static.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix
index e75ae50d6c8..c7fb496c036 100644
--- a/pkgs/development/libraries/haskell/snap/loader-static.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-static.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-loader-static";
-  version = "0.9.0.1";
-  sha256 = "0xlb8611r9l9ld97rs27nji7k1qvjg5i62b4al38xj6i0f2skyyi";
+  version = "0.9.0.2";
+  sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
   meta = {
     homepage = "http://snapframework.com/";
     description = "Snap: A Haskell Web Framework: static loader";

From fa61d4ae42ce3af6240d856c757e02bedcf0da9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:25 +0200
Subject: [PATCH 0510/2033] haskell-snap-server: update to version 0.9.4.3

---
 pkgs/development/libraries/haskell/snap/server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 4dca1dea284..2821d00be60 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.4.2";
-  sha256 = "05na8gqbqy0nznasaxfkp4hr7h0s6ypm8000mhn50d27v8nk526m";
+  version = "0.9.4.3";
+  sha256 = "1k2nb6ykj4yany8chjsiwwl4gaadshpdlsj2l5mvn14xz5y192d1";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network

From 92cc1addfd9af54388a8bfd811b98300d5a97698 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:26 +0200
Subject: [PATCH 0511/2033] haskell-svgcairo: update to version 0.12.5.2

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

diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix
index 3663b8b2ed6..248987d0c3b 100644
--- a/pkgs/development/libraries/haskell/svgcairo/default.nix
+++ b/pkgs/development/libraries/haskell/svgcairo/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "svgcairo";
-  version = "0.12.5.0";
-  sha256 = "1b5n96l8addif8a6yv21w95g83dpamr043yqm2wb7vaca8m82r28";
+  version = "0.12.5.2";
+  sha256 = "0l3903fzd5pk9wmxjdmx6vyym2r90b33hs6p2sfdks2lx352i94l";
   buildDepends = [ cairo glib mtl ];
   buildTools = [ gtk2hsBuildtools ];
   extraLibraries = [ libc ];

From 4817cf025334c8b2f2ff290fcc4328e5ac516a73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:27 +0200
Subject: [PATCH 0512/2033] haskell-syb-with-class: update to version 0.6.1.5

---
 pkgs/development/libraries/haskell/syb/syb-with-class.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
index c6a85e27df1..9d613601704 100644
--- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix
+++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb-with-class";
-  version = "0.6.1.4";
-  sha256 = "0fi6m1a4017422kdmj1vvvzbks79jkcldp20h2nb7jsf8zvimfkc";
+  version = "0.6.1.5";
+  sha256 = "1gn4p92jabgvbk7bg1nzjimyfzznl800bi9hw4ssvc7jqqnyw5zn";
   meta = {
     description = "Scrap Your Boilerplate With Class";
     license = self.stdenv.lib.licenses.bsd3;

From e73b6253f06971d0ae00312d0f0e6513f734bad3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:29 +0200
Subject: [PATCH 0513/2033] haskell-terminal-progress-bar: update to version
 0.0.1.4

---
 .../libraries/haskell/terminal-progress-bar/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
index d5e16e43d3a..3691615d016 100644
--- a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
+++ b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix
@@ -1,12 +1,12 @@
-{ cabal, baseUnicodeSymbols, HUnit, testFramework
+{ cabal, baseUnicodeSymbols, HUnit, stm, stmChans, testFramework
 , testFrameworkHunit
 }:
 
 cabal.mkDerivation (self: {
   pname = "terminal-progress-bar";
-  version = "0.0.1.3";
-  sha256 = "04glnz72ivnaqfhyxb5sc175yxiq7lf7xi1jhbk9gi95md00f1js";
-  buildDepends = [ baseUnicodeSymbols ];
+  version = "0.0.1.4";
+  sha256 = "0ldvii23ks446xrd27aklh8s8pn1yi3dzhhzl05gipjqbhq3lsx3";
+  buildDepends = [ baseUnicodeSymbols stm stmChans ];
   testDepends = [
     baseUnicodeSymbols HUnit testFramework testFrameworkHunit
   ];

From 8080a35f32ec430ca58fb95ac4f7aa685e0cc07c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:30 +0200
Subject: [PATCH 0514/2033] haskell-test-framework-quickcheck2: update to
 version 0.3.0.3

---
 .../libraries/haskell/test-framework-quickcheck2/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
index 627c9f6347a..a832664b28a 100644
--- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
+++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "test-framework-quickcheck2";
-  version = "0.3.0.2";
-  sha256 = "0zgsbmxidyv735jbgajczn25pnhwq66haaadhh6lxj2jsq5fnqpy";
+  version = "0.3.0.3";
+  sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
   buildDepends = [
     extensibleExceptions QuickCheck random testFramework
   ];

From d414e493757ad4c79b5a895904e38c590b717ba8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:31 +0200
Subject: [PATCH 0515/2033] haskell-testing-feat: update to version 0.4.0.2

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

diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix
index 5e6a8177d1a..c0e46360880 100644
--- a/pkgs/development/libraries/haskell/testing-feat/default.nix
+++ b/pkgs/development/libraries/haskell/testing-feat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "testing-feat";
-  version = "0.4.0.1";
-  sha256 = "1fqp5k8kwnn7qqggyy5scsxmkvd1pibc5sfs7v1myrp0azkc25cp";
+  version = "0.4.0.2";
+  sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j";
   buildDepends = [ mtl QuickCheck tagshare ];
   meta = {
     description = "Functional Enumeration of Algebraic Types";

From 17b1fd5652b336f9c009704a366783b24cca667f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:32 +0200
Subject: [PATCH 0516/2033] haskell-uulib: update to version 0.9.16

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

diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix
index 2521c44bec6..0f7ec86e246 100644
--- a/pkgs/development/libraries/haskell/uulib/default.nix
+++ b/pkgs/development/libraries/haskell/uulib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "uulib";
-  version = "0.9.15";
-  sha256 = "0433shh493c04qmi0sd9mfzpy198zi11gxdmcs6nz2gcnxm812zm";
+  version = "0.9.16";
+  sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
     description = "Haskell Utrecht Tools Library";

From 751fb11e26957fce07384db5ba2d5030a7f98ff7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:33 +0200
Subject: [PATCH 0517/2033] haskell-vcsgui: update to version 0.0.4

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

diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix
index b27f61323a2..b639527520b 100644
--- a/pkgs/development/libraries/haskell/vcsgui/default.nix
+++ b/pkgs/development/libraries/haskell/vcsgui/default.nix
@@ -1,12 +1,12 @@
-{ cabal, filepath, gtk3, MissingH, mtl, vcswrapper }:
+{ cabal, filepath, gtk3, mtl, vcswrapper }:
 
 cabal.mkDerivation (self: {
   pname = "vcsgui";
-  version = "0.0.2";
-  sha256 = "0kj06l9s4l791ffwdnh7j0nvjvgili18g2jl2ik81n28bzfyq1dx";
+  version = "0.0.4";
+  sha256 = "12hfdhnv3xc2dyqk76lyx5ggiygyap4hm50sd6qmwfjj3f2w6b98";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath gtk3 MissingH mtl vcswrapper ];
+  buildDepends = [ filepath gtk3 mtl vcswrapper ];
   meta = {
     homepage = "https://github.com/forste/haskellVCSGUI";
     description = "GUI library for source code management systems";

From 0f3cbb71ad6fbbcb263c19755bd9e0bcee5676a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:35 +0200
Subject: [PATCH 0518/2033] haskell-vcswrapper: update to version 0.0.4

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

diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix
index 33462522c29..d23620d9d68 100644
--- a/pkgs/development/libraries/haskell/vcswrapper/default.nix
+++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix
@@ -1,12 +1,12 @@
-{ cabal, filepath, hxt, MissingH, mtl, parsec }:
+{ cabal, filepath, hxt, mtl, parsec, split, text }:
 
 cabal.mkDerivation (self: {
   pname = "vcswrapper";
-  version = "0.0.3";
-  sha256 = "04gmiiv461qh8fypkkiynipn5jsjqvywkj17ldq5wag4qaspx97x";
+  version = "0.0.4";
+  sha256 = "130pmzxdsqv703k2g197vd5rl60fwkqqv2xck66ygb932wsq3fnk";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ filepath hxt MissingH mtl parsec ];
+  buildDepends = [ filepath hxt mtl parsec split text ];
   meta = {
     homepage = "https://github.com/forste/haskellVCSWrapper";
     description = "Wrapper for source code management systems";

From 40ecb7d787626c325e2e35540b033421e5db8bb2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:36 +0200
Subject: [PATCH 0519/2033] haskell-warp: update to version 2.1.4.1

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 75ccd0e6f5d..b86884415a5 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.4";
-  sha256 = "090xbjqwj8wzxiaal2jdsk7dbqv07c1cw32w7v8xxi2dkvv6nwbb";
+  version = "2.1.4.1";
+  sha256 = "0j9w74gk84w9khyg5whjkd21pllg4rw8hxfs65zmrvm1k94lwqkf";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra hashable httpDate httpTypes liftedBase network

From d698efaacedb6c4776b808bbe6762834b19e2aba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:37 +0200
Subject: [PATCH 0520/2033] haskell-yaml: update to version 0.8.8.2

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index 5b0d4ad3f47..edbd5afe20b 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.8.1";
-  sha256 = "1lkw05rx88jckzlkslb945zswn6g7i3vxsgxpj9pkcxvh3y9zagv";
+  version = "0.8.8.2";
+  sha256 = "0dqn5pzk3bh9pprnlp9ggmjdwbb1j9yyd6ihq7vwky5g4yrqbl8m";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 5d36a8cc53e25952273c19d057c5236e1785c2c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:38 +0200
Subject: [PATCH 0521/2033] haskell-yesod-bin: update to version 1.2.8.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 46b78fcbd8f..09da23de789 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.8";
-  sha256 = "0hic32k1ii1j2hrwxj7pc7vv26dmq8rv7h7as1fw0bwlysrnw8nm";
+  version = "1.2.8.1";
+  sha256 = "07cwfj01yq88qi99ww2l3mih894wp6s7j35img9wjpz3rsiayy6x";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 8ca9e5975d240ef26facb08405ad996d87796ad7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:39 +0200
Subject: [PATCH 0522/2033] haskell-yesod-core: update to version 1.2.14

---
 .../libraries/haskell/yesod-core/default.nix  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 5051eaff698..fbf633f7095 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -1,26 +1,26 @@
 { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml
 , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
-, conduitExtra, cookie, dataDefault, exceptions, fastLogger, hamlet
-, hspec, httpTypes, HUnit, liftedBase, monadControl, monadLogger
-, mtl, network, networkConduit, parsec, pathPieces, QuickCheck
-, random, resourcet, safe, shakespeare, shakespeareCss
-, shakespeareI18n, shakespeareJs, streamingCommons, text, time
-, transformers, transformersBase, unixCompat, vector, wai, waiExtra
-, waiLogger, waiTest, warp, yesodRoutes
+, conduitExtra, cookie, dataDefault, deepseq, exceptions
+, fastLogger, hamlet, hspec, httpTypes, HUnit, liftedBase
+, monadControl, monadLogger, mtl, network, networkConduit, parsec
+, pathPieces, QuickCheck, random, resourcet, safe, shakespeare
+, shakespeareCss, shakespeareI18n, shakespeareJs, streamingCommons
+, text, time, transformers, transformersBase, unixCompat, vector
+, wai, waiExtra, waiLogger, waiTest, warp, yesodRoutes
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.12";
-  sha256 = "0bgi140v2z25cfvcydzaif7id8mv341r8iclkiz0lbqxs7d29zxz";
+  version = "1.2.14";
+  sha256 = "1xffs62nhibmz5v8d3jh2dqcz5kryj1n1mv26p1rljrwjxz9i2hb";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie
-    dataDefault exceptions fastLogger hamlet httpTypes liftedBase
-    monadControl monadLogger mtl parsec pathPieces random resourcet
-    safe shakespeare shakespeareCss shakespeareI18n shakespeareJs text
-    time transformers transformersBase unixCompat vector wai waiExtra
-    waiLogger warp yesodRoutes
+    dataDefault deepseq exceptions fastLogger hamlet httpTypes
+    liftedBase monadControl monadLogger mtl parsec pathPieces random
+    resourcet safe shakespeare shakespeareCss shakespeareI18n
+    shakespeareJs text time transformers transformersBase unixCompat
+    vector wai waiExtra waiLogger warp yesodRoutes
   ];
   testDepends = [
     async blazeBuilder conduit conduitExtra hamlet hspec httpTypes

From c6d74cd5a6e973fcec2fb2641c89a0ea3ebed516 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:41 +0200
Subject: [PATCH 0523/2033] haskell-yesod-static: update to version 1.2.2.5

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

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 78d941b371b..3bc0a22a4a6 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.2.4";
-  sha256 = "1dpd175kd1yda2fs8zzs00j8nhdvzsgqywkkh934qz7zr7p1rawl";
+  version = "1.2.2.5";
+  sha256 = "0n084dnvrswfqsvy5kdiq4ajfna2hwyzbb9sn2lj4s8jyiw1fs61";
   buildDepends = [
     async base64Bytestring byteable conduit conduitExtra cryptohash
     cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes

From 0753d6447867873025cf81a87aad9433386265ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 Apr 2014 21:13:42 +0200
Subject: [PATCH 0524/2033] haskell-hlint: update to version 1.8.61

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

diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix
index 17ae7d508d3..69e880176a3 100644
--- a/pkgs/development/tools/haskell/hlint/default.nix
+++ b/pkgs/development/tools/haskell/hlint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.60";
-  sha256 = "10kc4g9sipd5758n3x2xndaw1c887263gvff0y395drfgqh5qxal";
+  version = "1.8.61";
+  sha256 = "08y8ny6dv14gxnzzr5f1hvs22m7y62yffyq2pzvw2aja8fbj5d2z";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 9050fc61686fd48fdc9dabe2faf3bd6ebfa6c0c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Apr 2014 12:49:00 +0200
Subject: [PATCH 0525/2033] kwallet: Rename to kwalletmanager

Upstream renamed this package:

http://lists.kde.org/?l=kde-i18n-doc&m=139215908204279
---
 pkgs/desktops/kde-4.12/kde-package/4.12.4.nix                   | 2 +-
 .../kde-4.12/kdeutils/{kwallet.nix => kwalletmanager.nix}       | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/desktops/kde-4.12/kdeutils/{kwallet.nix => kwalletmanager.nix} (100%)

diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
index 3ae55809e99..a007957cf0c 100644
--- a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
@@ -241,7 +241,7 @@ modules=[
     { name="kgpg";  }
     { name="kremotecontrol";  }
     { name="ktimer";  }
-    { name="kwallet";  }
+    { name="kwalletmanager";  }
     { name="print-manager"; sane="print_manager"; }
     { name="superkaramba";  }
     { name="sweeper";  }
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix
similarity index 100%
rename from pkgs/desktops/kde-4.12/kdeutils/kwallet.nix
rename to pkgs/desktops/kde-4.12/kdeutils/kwalletmanager.nix

From 66a43c01596b9bf80cfbf7a77ac5fc1fd6af16e2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 23 Apr 2014 08:02:18 -0400
Subject: [PATCH 0526/2033] Update version

---
 .version                       | 2 +-
 nixos/modules/misc/version.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.version b/.version
index af805b45bd8..d3a61dbd830 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-14.04
\ No newline at end of file
+14.10
\ No newline at end of file
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 67bafac4c45..53909b4e079 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -53,7 +53,7 @@ with lib;
       mkDefault (if pathExists fn then readFile fn else "master");
 
     # Note: code names must only increase in alphabetical order.
-    system.nixosCodeName = "Baboon";
+    system.nixosCodeName = "Caterpillar"
 
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the

From dbd332d147584d1b750c513bcda5fe280bfc7aef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Apr 2014 14:26:16 +0200
Subject: [PATCH 0527/2033] Fix meta.maintainer -> meta.maintainers

---
 pkgs/applications/audio/quodlibet/default.nix                   | 2 +-
 pkgs/applications/misc/fbreader/default.nix                     | 2 +-
 .../browsers/mozilla-plugins/flashplayer-11/default.nix         | 2 +-
 pkgs/development/libraries/c-ares/default.nix                   | 2 +-
 pkgs/development/libraries/http-parser/default.nix              | 2 +-
 pkgs/development/libraries/libunibreak/default.nix              | 2 +-
 pkgs/development/tools/build-managers/leiningen/default.nix     | 2 +-
 pkgs/tools/archivers/zip/default.nix                            | 2 +-
 pkgs/tools/audio/gvolicon/default.nix                           | 2 +-
 pkgs/tools/misc/autorandr/default.nix                           | 2 +-
 pkgs/tools/text/enscript/default.nix                            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index ea8ae88f022..38c679d7a3e 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -75,7 +75,7 @@ buildPythonPackage {
       & internet radio, and all major audio formats.
     '';
 
-    maintainer = [ stdenv.lib.maintainers.coroa ];
+    maintainers = [ stdenv.lib.maintainers.coroa ];
     homepage = http://code.google.com/p/quodlibet/;
   };
 }
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 612285c697c..2b193ef42cd 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     homepage = http://www.fbreader.org/;
     license = licenses.gpl3;
     platforms = platforms.linux; # possibly also on unix general
-    maintainer = [ maintainers.coroa ];
+    maintainers = [ maintainers.coroa ];
   }; 
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index a78ab7d27f7..d2e2995644f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;
-    maintainer = with stdenv.lib.maintainers; [ wizeman ];
+    maintainers = with stdenv.lib.maintainers; [ wizeman ];
     license = "unfree";
   };
 }
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index c1b23179a1d..58e7c17f249 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.mit;
 
-    maintainer = [ stdenv.lib.maintainers.shlevy ];
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 5ced635aa66..bb1f6b63084 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -43,6 +43,6 @@ in stdenv.mkDerivation {
 
     license = stdenv.lib.licenses.mit;
 
-    maintainer = [ stdenv.lib.maintainers.shlevy ];
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
   };
 }
diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix
index bf4d07c51cf..50bc0539589 100644
--- a/pkgs/development/libraries/libunibreak/default.nix
+++ b/pkgs/development/libraries/libunibreak/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard";
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainer = [ maintainers.coroa ];
+    maintainers = [ maintainers.coroa ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index ff21e518936..a5f34746fef 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.linux;
-    maintainer = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 2e3f111aba4..6c485173f85 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.info-zip.org;
     platforms = stdenv.lib.platforms.all;
-    maintainer = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 311e420c6a3..69c62985154 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/Unia/gvolicon";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainer = stdenv.lib.maintainers.bennofs;
+    maintainers = stdenv.lib.maintainers.bennofs;
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 960d85ab6be..deb915c9a5e 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -36,6 +36,6 @@ in
     meta = {
       description = "Automatic display configuration selector based on connected devices";
       homepage = https://github.com/wertarbyte/autorandr;
-      maintainer = [ stdenv.lib.maintainers.coroa ];
+      maintainers = [ stdenv.lib.maintainers.coroa ];
     };
   }
diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix
index f25c41b72b9..7bb7060d5c2 100644
--- a/pkgs/tools/text/enscript/default.nix
+++ b/pkgs/tools/text/enscript/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/enscript/;
 
-    maintainer = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From eb07baf75ce37abe8b816646412de57f5856f4b2 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 23 Apr 2014 14:14:54 +0100
Subject: [PATCH 0528/2033] Fixing evaluation of misc/version.nix

---
 nixos/modules/misc/version.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 53909b4e079..f4271cea853 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -53,7 +53,7 @@ with lib;
       mkDefault (if pathExists fn then readFile fn else "master");
 
     # Note: code names must only increase in alphabetical order.
-    system.nixosCodeName = "Caterpillar"
+    system.nixosCodeName = "Caterpillar";
 
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the

From 8ef1d4ecdbf1b895202ee6236c4a506247052b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 23 Apr 2014 15:58:54 +0200
Subject: [PATCH 0529/2033] Making nvidia build with linux 3.14. Patch not
 needed anymore.

---
 pkgs/os-specific/linux/nvidia-x11/default.nix       |  2 --
 pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch | 12 ------------
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2eb5c7e480a..2afbf12097c 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
 
-  patches = optional (kernel ? version && versionAtLeast kernel.version "3.14") ./kernel-3.14.patch;
-
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch b/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch
deleted file mode 100644
index 07fb7652d32..00000000000
--- a/pkgs/os-specific/linux/nvidia-x11/kernel-3.14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/kernel/nv-linux.h         2014-01-09 04:49:25.000000000 +0200
-+++ b/kernel/nv-linux.h         2014-02-05 16:46:55.552408568 +0200
-@@ -273,8 +273,7 @@
- #endif
- 
- #if !defined(NV_VMWARE) && defined(CONFIG_ACPI)
--#include <acpi/acpi.h>
--#include <acpi/acpi_drivers.h>
-+#include <linux/acpi.h>
- #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID)
- #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1
- #endif

From a3b1f48c5daf373c8fdfecb9d5ffd270475da6e9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 23 Apr 2014 10:45:00 -0400
Subject: [PATCH 0530/2033] Add gcc-4.9.0

---
 pkgs/development/compilers/gcc/4.9/builder.sh | 245 ++++++++
 .../development/compilers/gcc/4.9/default.nix | 530 ++++++++++++++++++
 .../compilers/gcc/4.9/gfortran-driving.patch  |  20 +
 .../compilers/gcc/4.9/gnat-cflags.patch       |  33 ++
 .../gcc/4.9/java-jvgenmain-link.patch         |  17 +
 .../compilers/gcc/4.9/libstdc++-target.patch  |  32 ++
 .../compilers/gcc/4.9/no-sys-dirs.patch       |  41 ++
 .../compilers/gcc/4.9/parallel-bconfig.patch  |  32 ++
 pkgs/top-level/all-packages.nix               |  35 ++
 9 files changed, 985 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/4.9/builder.sh
 create mode 100644 pkgs/development/compilers/gcc/4.9/default.nix
 create mode 100644 pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
 create mode 100644 pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
 create mode 100644 pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
 create mode 100644 pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
 create mode 100644 pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch
 create mode 100644 pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch

diff --git a/pkgs/development/compilers/gcc/4.9/builder.sh b/pkgs/development/compilers/gcc/4.9/builder.sh
new file mode 100644
index 00000000000..b781fa6c7ef
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/builder.sh
@@ -0,0 +1,245 @@
+source $stdenv/setup
+
+
+export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
+mkdir $NIX_FIXINC_DUMMY
+
+
+if test "$staticCompiler" = "1"; then
+    EXTRA_LDFLAGS="-static"
+else
+    EXTRA_LDFLAGS=""
+fi
+
+# GCC interprets empty paths as ".", which we don't want.
+if test -z "$CPATH"; then unset CPATH; fi
+if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
+echo "\$CPATH is \`$CPATH'"
+echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'"
+
+if test "$noSysDirs" = "1"; then
+
+    if test -e $NIX_GCC/nix-support/orig-libc; then
+
+        # Figure out what extra flags to pass to the gcc compilers
+        # being generated to make sure that they use our glibc.
+        extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)"
+        extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)"
+
+        # Use *real* header files, otherwise a limits.h is generated
+        # that does not include Glibc's limits.h (notably missing
+        # SSIZE_MAX, which breaks the build).
+        export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
+
+        # The path to the Glibc binaries such as `crti.o'.
+        glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"
+
+    else
+        # Hack: support impure environments.
+        extraFlags="-isystem /usr/include"
+        extraLDFlags="-L/usr/lib64 -L/usr/lib"
+        glibc_libdir="/usr/lib"
+        export NIX_FIXINC_DUMMY=/usr/include
+    fi
+
+    extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags"
+    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
+
+    # BOOT_CFLAGS defaults to `-g -O2'; since we override it below,
+    # make sure to explictly add them so that files compiled with the
+    # bootstrap compiler are optimized and (optionally) contain
+    # debugging information (info "(gccinstall) Building").
+    if test -n "$dontStrip"; then
+        extraFlags="-O2 -g $extraFlags"
+    else
+        # Don't pass `-g' at all; this saves space while building.
+        extraFlags="-O2 $extraFlags"
+    fi
+
+    EXTRA_FLAGS="$extraFlags"
+    for i in $extraLDFlags; do
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i"
+    done
+
+    if test -n "$targetConfig"; then
+        # Cross-compiling, we need gcc not to read ./specs in order to build
+        # the g++ compiler (after the specs for the cross-gcc are created).
+        # Having LIBRARY_PATH= makes gcc read the specs from ., and the build
+        # breaks. Having this variable comes from the default.nix code to bring
+        # gcj in.
+        unset LIBRARY_PATH
+        unset CPATH
+        if test -z "$crossStageStatic"; then
+            EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include"
+            EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib"
+        fi
+    else
+        if test -z "$NIX_GCC_CROSS"; then
+            EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS"
+            EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS"
+            EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS"
+        else
+            # This the case of cross-building the gcc.
+            # We need special flags for the target, different than those of the build
+            # Assertion:
+            test -e $NIX_GCC_CROSS/nix-support/orig-libc
+
+            # Figure out what extra flags to pass to the gcc compilers
+            # being generated to make sure that they use our glibc.
+            extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)"
+            extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)"
+
+            # Use *real* header files, otherwise a limits.h is generated
+            # that does not include Glibc's limits.h (notably missing
+            # SSIZE_MAX, which breaks the build).
+            NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include
+
+            # The path to the Glibc binaries such as `crti.o'.
+            glibc_dir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)"
+            glibc_libdir="$glibc_dir/lib"
+            configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include"
+
+            extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags"
+            extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags"
+
+            EXTRA_TARGET_CFLAGS="$extraFlags"
+            for i in $extraLDFlags; do
+                EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i"
+            done
+        fi
+    fi
+
+
+    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
+    # the startfiles.
+    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
+    # for the startfiles.
+    makeFlagsArray=( \
+        "${makeFlagsArray[@]}" \
+        NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
+        CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        CXXFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+        LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+        LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \
+        )
+
+    if test -z "$targetConfig"; then
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \
+            BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \
+            )
+    fi
+
+    if test -n "$targetConfig" -a "$crossStageStatic" == 1; then
+        # We don't want the gcc build to assume there will be a libc providing
+        # limits.h in this stagae
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            LIMITS_H_TEST=false \
+            )
+    else
+        makeFlagsArray=( \
+            "${makeFlagsArray[@]}" \
+            LIMITS_H_TEST=true \
+            )
+    fi
+fi
+
+if test -n "$targetConfig"; then
+    # The host strip will destroy some important details of the objects
+    dontStrip=1
+fi
+
+providedPreConfigure="$preConfigure";
+preConfigure() {
+    if test -n "$newlibSrc"; then
+        tar xvf "$newlibSrc" -C ..
+        ln -s ../newlib-*/newlib newlib
+        # Patch to get armvt5el working:
+        sed -i -e 's/ arm)/ arm*)/' newlib/configure.host
+    fi
+    # Bug - they packaged zlib
+    if test -d "zlib"; then
+        # This breaks the build without-headers, which should build only
+        # the target libgcc as target libraries.
+        # See 'configure:5370'
+        rm -Rf zlib
+    fi
+
+    if test -f "$NIX_GCC/nix-support/orig-libc"; then
+        # Patch the configure script so it finds glibc headers.  It's
+        # important for example in order not to get libssp built,
+        # because its functionality is in glibc already.
+        glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
+        sed -i \
+            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+            gcc/configure
+    fi
+
+    if test -n "$crossMingw" -a -n "$crossStageStatic"; then
+        mkdir -p ../mingw
+        # --with-build-sysroot expects that:
+        cp -R $libcCross/include ../mingw
+        configureFlags="$configureFlags --with-build-sysroot=`pwd`/.."
+    fi
+
+    # Eval the preConfigure script from nix expression.
+    eval $providedPreConfigure;
+    env;
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
+    configureScript=../$sourceRoot/configure
+}
+
+
+postConfigure() {
+    # Don't store the configure flags in the resulting executables.
+    sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile
+}
+
+
+postInstall() {
+    # Remove precompiled headers for now.  They are very big and
+    # probably not very useful yet.
+    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+
+    # Remove `fixincl' to prevent a retained dependency on the
+    # previous gcc.
+    rm -rf $out/libexec/gcc/*/*/install-tools
+    rm -rf $out/lib/gcc/*/*/install-tools
+
+    # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
+    rm -rf $out/bin/gccbug
+    # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
+    for i in $out/libexec/gcc/*/*/*; do
+        if PREV_RPATH=`patchelf --print-rpath $i`; then
+            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
+        fi
+    done
+
+    # Get rid of some "fixed" header files
+    rm -rf $out/lib/gcc/*/*/include/root
+
+    # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
+    for i in $out/bin/*-gcc*; do
+        if cmp -s $out/bin/gcc $i; then
+            ln -sfn gcc $i
+        fi
+    done
+
+    for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do
+        if cmp -s $out/bin/g++ $i; then
+            ln -sfn g++ $i
+        fi
+    done
+
+    eval "$postInstallGhdl"
+}
+
+genericBuild
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
new file mode 100644
index 00000000000..f00c42e421a
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -0,0 +1,530 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, mpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, ppl ? null, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true             # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# We enable the isl cloog backend.
+assert cloog != null -> isl != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "4.9.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+  /* gccinstall.info says that "parallel make is currently not supported since
+     collisions in profile collecting may occur".
+  */
+    enableParallelBuilding = !profiledCompiler;
+
+    patches = [ ]
+      ++ optional enableParallelBuilding ./parallel-bconfig.patch
+      ++ optional (cross != null) ./libstdc++-target.patch
+      # ++ optional noSysDirs ./no-sys-dirs.patch
+      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+      # target libraries and tools.
+      ++ optional langAda ./gnat-cflags.patch
+      ++ optional langFortran ./gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-3.1.3.jar;
+      sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && gtk != null;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = stdenv.platform.gcc.arch or null;
+        gccCpu = stdenv.platform.gcc.cpu or null;
+        gccAbi = stdenv.platform.gcc.abi or null;
+        gccFpu = stdenv.platform.gcc.fpu or null;
+        gccFloat = stdenv.platform.gcc.float or null;
+        gccMode = stdenv.platform.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode;
+
+    /* Cross-gcc settings */
+    crossMingw = cross != null && cross.libc == "msvcrt";
+    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossConfigureFlags = let
+        gccArch = stdenv.cross.gcc.arch or null;
+        gccCpu = stdenv.cross.gcc.cpu or null;
+        gccAbi = stdenv.cross.gcc.abi or null;
+        gccFpu = stdenv.cross.gcc.fpu or null;
+        gccFloat = stdenv.cross.gcc.float or null;
+        gccMode = stdenv.cross.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        "--target=${cross.config}" +
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode +
+        (if crossMingw && crossStageStatic then
+          " --with-headers=${libcCross}/include" +
+          " --with-gcc" +
+          " --with-gnu-as" +
+          " --with-gnu-ld" +
+          " --with-gnu-ld" +
+          " --disable-shared" +
+          " --disable-nls" +
+          " --disable-debug" +
+          " --enable-sjlj-exceptions" +
+          " --enable-threads=win32" +
+          " --disable-win32-registry"
+          else if crossStageStatic then
+          " --disable-libssp --disable-nls" +
+          " --without-headers" +
+          " --disable-threads " +
+          " --disable-libmudflap " +
+          " --disable-libgomp " +
+          " --disable-libquadmath" +
+          " --disable-shared" +
+          " --disable-decimal-float" # libdecnumber requires libc
+          else
+          (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"
+           else                " --with-headers=${libcCross}/include") +
+          # Ensure that -print-prog-name is able to find the correct programs.
+          (stdenv.lib.optionalString (crossMingw || crossDarwin) (
+            " --with-as=${binutilsCross}/bin/${cross.config}-as" +
+            " --with-ld=${binutilsCross}/bin/${cross.config}-ld"
+          )) +
+          " --enable-__cxa_atexit" +
+          " --enable-long-long" +
+          (if crossMingw then
+            " --enable-threads=win32" +
+            " --enable-sjlj-exceptions" +
+            " --enable-hash-synchronization" +
+            " --disable-libssp" +
+            " --disable-nls" +
+            " --with-dwarf2" +
+            # I think noone uses shared gcc libs in mingw, so we better do the same.
+            # In any case, mingw32 g++ linking is broken by default with shared libs,
+            # unless adding "-lsupc++" to any linking command. I don't know why.
+            " --disable-shared" +
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
+            else (if cross.libc == "uclibc" then
+              # In uclibc cases, libgomp needs an additional '-ldl'
+              # and as I don't know how to pass it, I disable libgomp.
+              " --disable-libgomp" else "") +
+            " --enable-threads=posix" +
+            " --enable-nls" +
+            " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+          );
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+  bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert gtk != null -> (filter (x: x == null) xlibs) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "0mqjxpw2klskls00lwx1k24pnyzm3whqxg3hk74c3sddgfllgc5r";
+  };
+
+  inherit patches;
+
+  postPatch =
+    if (stdenv.isGNU
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+        ''
+    else if cross != null || stdenv.gcc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.gcc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc}\3"|g'
+           done
+        ''
+    else null;
+
+  inherit noSysDirs staticCompiler langJava crossStageStatic
+    libcCross crossMingw;
+
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  buildInputs = [ gmp mpfr mpc libelf ]
+    ++ (optional (ppl != null) ppl)
+    ++ (optional (cloog != null) cloog)
+    ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
+    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+
+  preConfigure = ''
+    configureFlagsArray=(
+      ${stdenv.lib.optionalString (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic)
+        "'--with-host-libstdcxx=-lstdc++ -lgcc_s'"}
+      ${stdenv.lib.optionalString (ppl != null && stdenv.isSunOS)
+        "\"--with-host-libstdcxx=-Wl,-rpath,\$prefix/lib/amd64 -lstdc++\"
+         \"--with-boot-ldflags=-L../prev-x86_64-pc-solaris2.11/libstdc++-v3/src/.libs\""}
+    );
+    ${stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit)
+      ''
+        export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+        export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+        export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+        export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+      ''}
+    '';
+
+  dontDisableStatic = true;
+
+  configureFlags = "
+    ${if stdenv.isSunOS then
+      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+      # On Illumos/Solaris GNU as is preferred
+      " --with-gnu-as --without-gnu-ld "
+      else ""}
+    --enable-lto
+    ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${if ppl != null then "--with-ppl=${ppl} --disable-ppl-version-check" else ""}
+    ${optionalString (isl != null) "--with-isl=${isl}"}
+    ${optionalString (cloog != null) "--with-cloog=${cloog} --disable-cloog-version-check --enable-cloog-backend=isl"}
+    ${if langJava then
+      "--with-ecj-jar=${javaEcj} " +
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+      else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp=${gmp}
+    --with-mpfr=${mpfr}
+    --with-mpc=${mpc}
+    ${if libelf != null then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-static
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        ++ optional langGo       "go"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
+        )
+      )
+    }
+    ${if (stdenv ? glibc && cross == null)
+      then " --with-native-system-header-dir=${stdenv.glibc}/include"
+      else ""}
+    ${if langAda then " --enable-libada" else ""}
+    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+    ${if !bootstrap then "--disable-bootstrap" else ""}
+    ${if cross == null then platformFlags else ""}
+  ";
+
+  targetConfig = if cross != null then cross.config else null;
+
+  buildFlags = if bootstrap then
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+    else "";
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  crossAttrs = let
+    xgccArch = stdenv.cross.gcc.arch or null;
+    xgccCpu = stdenv.cross.gcc.cpu or null;
+    xgccAbi = stdenv.cross.gcc.abi or null;
+    xgccFpu = stdenv.cross.gcc.fpu or null;
+    xgccFloat = stdenv.cross.gcc.float or null;
+    xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
+    xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
+    xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
+    xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
+    xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
+  in {
+    AR = "${stdenv.cross.config}-ar";
+    LD = "${stdenv.cross.config}-ld";
+    CC = "${stdenv.cross.config}-gcc";
+    CXX = "${stdenv.cross.config}-gcc";
+    AR_FOR_TARGET = "${stdenv.cross.config}-ar";
+    LD_FOR_TARGET = "${stdenv.cross.config}-ld";
+    CC_FOR_TARGET = "${stdenv.cross.config}-gcc";
+    NM_FOR_TARGET = "${stdenv.cross.config}-nm";
+    CXX_FOR_TARGET = "${stdenv.cross.config}-g++";
+    # If we are making a cross compiler, cross != null
+    NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else "";
+    dontStrip = true;
+    configureFlags = ''
+      ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableShared then "" else "--disable-shared"}
+      ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
+      ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
+      ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+      --with-gmp=${gmp.crossDrv}
+      --with-mpfr=${mpfr.crossDrv}
+      --disable-libstdcxx-pch
+      --without-included-gettext
+      --with-system-zlib
+      --enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langAda      "ada"
+          ++ optional langVhdl     "vhdl"
+          ++ optional langGo       "go"
+          )
+        )
+      }
+      ${if langAda then " --enable-libada" else ""}
+      --target=${stdenv.cross.config}
+      ${xwithArch}
+      ${xwithCpu}
+      ${xwithAbi}
+      ${xwithFpu}
+      ${xwithFloat}
+    '';
+    buildFlags = "";
+  };
+
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = concatStrings
+            (intersperse ":" (map (x: x + "/include")
+                                  (optionals (zlib != null) [ zlib ]
+                                   ++ optionals langJava [ boehmgc ]
+                                   ++ optionals javaAwtGtk xlibs
+                                   ++ optionals javaAwtGtk [ gmp mpfr ]
+                                   ++ optional (libpthread != null) libpthread
+                                   ++ optional (libpthreadCross != null) libpthreadCross
+
+                                   # On GNU/Hurd glibc refers to Mach & Hurd
+                                   # headers.
+                                   ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" )
+                                        libcCross.propagatedBuildInputs)));
+
+  LIBRARY_PATH = concatStrings
+                   (intersperse ":" (map (x: x + "/lib")
+                                         (optionals (zlib != null) [ zlib ]
+                                          ++ optionals langJava [ boehmgc ]
+                                          ++ optionals javaAwtGtk xlibs
+                                          ++ optionals javaAwtGtk [ gmp mpfr ]
+                                          ++ optional (libpthread != null) libpthread)));
+
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
+    then "-idirafter ${libcCross}/include"
+    else null;
+
+  EXTRA_TARGET_LDFLAGS =
+    if cross != null && libcCross != null
+    then "-B${libcCross}/lib -Wl,-L${libcCross}/lib" +
+         (optionalString (libpthreadCross != null)
+           " -L${libpthreadCross}/lib -Wl,${libpthreadCross.TARGET_LDFLAGS}")
+    else null;
+
+  passthru =
+    { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; };
+
+  inherit enableParallelBuilding;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = "GPLv3+";  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ ludo viric shlevy simons ];
+
+    # Volunteers needed for the {Cyg,Dar}win ports of *PPL.
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+)
diff --git a/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch b/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
new file mode 100644
index 00000000000..70708886b40
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/gfortran-driving.patch
@@ -0,0 +1,20 @@
+This patch fixes interaction with Libtool.
+See <http://thread.gmane.org/gmane.comp.gcc.patches/258777>, for details.
+
+--- a/gcc/fortran/gfortranspec.c
++++ b/gcc/fortran/gfortranspec.c
+@@ -461,8 +461,15 @@ For more information about these matters, see the file named COPYING\n\n"));
+     {
+       fprintf (stderr, _("Driving:"));
+       for (i = 0; i < g77_newargc; i++)
++	{
++	  if (g77_new_decoded_options[i].opt_index == OPT_l)
++	    /* Make sure no white space is inserted after `-l'.  */
++	    fprintf (stderr, " -l%s",
++		     g77_new_decoded_options[i].canonical_option[1]);
++	  else
+ 	fprintf (stderr, " %s",
+ 		 g77_new_decoded_options[i].orig_option_with_args_text);
++	}
+       fprintf (stderr, "\n");
+     }
diff --git a/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch b/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
new file mode 100644
index 00000000000..bf2acf065e9
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/gnat-cflags.patch
@@ -0,0 +1,33 @@
+diff --git a/libada/Makefile.in b/libada/Makefile.in
+index f5057a0..337e0c6 100644
+--- a/libada/Makefile.in
++++ b/libada/Makefile.in
+@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN)
+ WARN_CFLAGS = @warn_cflags@
+ 
+ TARGET_LIBGCC2_CFLAGS=
+-GNATLIBCFLAGS= -g -O2
++GNATLIBCFLAGS= -g -O2 $(CFLAGS)
+ GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
+ 	-DIN_RTS @have_getipinfo@
+ 
+--- a/gcc/ada/gcc-interface/Makefile.in
++++ b/gcc/ada/gcc-interface/Makefile.in
+@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+ FORCE_DEBUG_ADAFLAGS = -g
+ GNATLIBFLAGS = -gnatpg -nostdinc
+-GNATLIBCFLAGS = -g -O2
++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET)
+ # Pretend that _Unwind_GetIPInfo is available for the target by default.  This
+ # should be autodetected during the configuration of libada and passed down to
+ # here, but we need something for --disable-libada and hope for the best.
+@@ -193,7 +193,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
+ # Link flags used to build gnat tools.  By default we prefer to statically
+ # link with libgcc to avoid a dependency on shared libgcc (which is tricky
+ # to deal with as it may conflict with the libgcc provided by the system).
+-GCC_LINK_FLAGS=-static-libgcc
++GCC_LINK_FLAGS=-static-libgcc $(CFLAGS_FOR_TARGET)
+ 
+ # End of variables for you to override.
+ 
diff --git a/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
new file mode 100644
index 00000000000..2612e8bfbbb
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/java-jvgenmain-link.patch
@@ -0,0 +1,17 @@
+The `jvgenmain' executable must be linked against `vec.o', among others,
+since it uses its vector API.
+
+--- gcc-4.3.3/gcc/java/Make-lang.in	2008-12-05 00:00:19.000000000 +0100
++++ gcc-4.3.3/gcc/java/Make-lang.in	2009-07-03 16:11:41.000000000 +0200
+@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB
+ 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
+ 		$(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS)
+ 
+-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS)
++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL)
+ 	rm -f $@
+-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS)
++	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS)
+ 
+ #
+ # Build hooks:
diff --git a/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch b/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
new file mode 100644
index 00000000000..fb622b39580
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/libstdc++-target.patch
@@ -0,0 +1,32 @@
+Patch to make the target libraries 'configure' scripts find the proper CPP.
+I noticed that building the mingw32 cross compiler.
+Looking at the build script for mingw in archlinux, I think that only nixos
+needs this patch. I don't know why.
+diff --git a/Makefile.in b/Makefile.in
+index 93f66b6..d691917 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
++	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
+ RAW_CXX_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+-	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ NORMAL_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+-	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ # Where to find GMP
+ HOST_GMPLIBS = @gmplibs@
diff --git a/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch
new file mode 100644
index 00000000000..79901703cb8
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/no-sys-dirs.patch
@@ -0,0 +1,41 @@
+diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c
+--- gcc-4.3.1-orig/gcc/cppdefault.c	2007-07-26 10:37:01.000000000 +0200
++++ gcc-4.3.1/gcc/cppdefault.c	2008-06-25 17:48:23.000000000 +0200
+@@ -41,6 +41,10 @@
+ # undef CROSS_INCLUDE_DIR
+ #endif
+ 
++#undef LOCAL_INCLUDE_DIR
++#undef SYSTEM_INCLUDE_DIR
++#undef STANDARD_INCLUDE_DIR
++
+ const struct default_include cpp_include_defaults[]
+ #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
+diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c
+--- gcc-4.3.1-orig/gcc/gcc.c	2008-03-02 23:55:19.000000000 +0100
++++ gcc-4.3.1/gcc/gcc.c	2008-06-25 17:52:53.000000000 +0200
+@@ -1478,10 +1478,10 @@
+ /* Default prefixes to attach to command names.  */
+ 
+ #ifndef STANDARD_STARTFILE_PREFIX_1
+-#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
++#define STANDARD_STARTFILE_PREFIX_1 ""
+ #endif
+ #ifndef STANDARD_STARTFILE_PREFIX_2
+-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
++#define STANDARD_STARTFILE_PREFIX_2 ""
+ #endif
+ 
+ #ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
+--- gcc-4.3.1-orig/gcc/Makefile.in	2008-05-11 20:54:15.000000000 +0200
++++ gcc-4.3.1/gcc/Makefile.in	2008-06-25 17:48:23.000000000 +0200
+@@ -3277,7 +3281,7 @@
+   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
+   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
+-  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
++  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
+   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
+   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+   -DPREFIX=\"$(prefix)/\" \
diff --git a/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch b/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch
new file mode 100644
index 00000000000..bc56ac698f5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/4.9/parallel-bconfig.patch
@@ -0,0 +1,32 @@
+Hacky work-around for highly parallel builds.
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57125
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index aad927c..182f666 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3908,21 +3908,21 @@ build/gengtype-lex.o: $(BCONFIG_H)
+ 
+ gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \
+   $(SYSTEM_H)
+-gengtype-parse.o: $(CONFIG_H)
++gengtype-parse.o: $(CONFIG_H) $(BCONFIG_H)
+ CFLAGS-gengtype-parse.o += -DGENERATOR_FILE
+ build/gengtype-parse.o: $(BCONFIG_H)
+ 
+ gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \
+   gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \
+   $(XREGEX_H)
+-gengtype-state.o: $(CONFIG_H)
++gengtype-state.o: $(CONFIG_H) $(BCONFIG_H)
+ CFLAGS-gengtype-state.o += -DGENERATOR_FILE
+ build/gengtype-state.o: $(BCONFIG_H)
+ 
+ gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h 	\
+   rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \
+   $(OBSTACK_H) $(XREGEX_H)
+-gengtype.o: $(CONFIG_H)
++gengtype.o: $(CONFIG_H) $(BCONFIG_H)
+ CFLAGS-gengtype.o += -DGENERATOR_FILE
+ build/gengtype.o: $(BCONFIG_H)
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07345ee5a8f..de155d48cc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2648,6 +2648,41 @@ let
     binutilsCross = null;
   }));
 
+  gcc49 = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+    libpthreadCross =
+      if crossSystem != null && crossSystem.config == "i586-pc-gnu"
+      then gnu.libpthreadCross
+      else null;
+  }));
+
+  gcc49_multi =
+    if system == "x86_64-linux" then lowPrio (
+      wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc49.gcc.override {
+        stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc.gcc);
+        profiledCompiler = false;
+        enableMultilib = true;
+      }))
+    else throw "Multilib gcc not supported on ‘${system}’";
+
+  gcc49_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.9 {
+    stripped = false;
+
+    inherit noSysDirs;
+    cross = null;
+    libcCross = null;
+    binutilsCross = null;
+  }));
+
   gccApple =
     assert stdenv.isDarwin;
     wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2-apple64) {

From b0a6bb414d9ad7521a0462fb1e48665d14e2decc Mon Sep 17 00:00:00 2001
From: Vincent Bernardoff <vb@luminar.eu.org>
Date: Wed, 23 Apr 2014 17:00:50 +0200
Subject: [PATCH 0531/2033] Updated react to 1.0.1

---
 .../ocaml-modules/react/default.nix           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index a69ef9d446c..6b0e694d54a 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,28 +1,30 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
+{stdenv, fetchurl, ocaml, findlib, opam}:
 
 stdenv.mkDerivation {
-  name = "ocaml-react-0.9.4";
+  name = "ocaml-react-1.0.1";
 
   src = fetchurl {
-    url = http://github.com/dbuenzli/react/archive/v0.9.4.tar.gz;
-    sha256 = "16k0kx93kd45s7pigkzvirfsbr22xhby0y88y86p473qxzc6ngrm";
+    url = "http://erratique.ch/software/react/releases/react-1.0.1.tbz";
+    sha256 = "007c9kzl0i6xvxnqj9jny4hgm28v9a1i079q53vl5hfb5f7h1mda";
   };
 
-  buildInputs = [ocaml findlib ocaml_oasis];
+  unpackCmd = "tar xjf $src";
+  buildInputs = [ocaml findlib opam];
 
   createFindlibDestdir = true;
 
-  configurePhase = "oasis setup && ocaml setup.ml -configure --prefix $out";
-  buildPhase     = "ocaml setup.ml -build";
-  installPhase   = "ocaml setup.ml -install";
+  configurePhase = "ocaml pkg/git.ml";
+  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
+  installPhase   = ''
+    opam-installer --script --prefix=$out react.install > install.sh
+    sh install.sh
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://erratique.ch/software/react;
     description = "Applicative events and signals for OCaml";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-    ];
+    maintainers = with maintainers; [ z77z vbmithr ];
   };
 }

From 347db30cb8e92ae91889757382bcaa0f07e2afe0 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 23 Apr 2014 17:51:14 +0200
Subject: [PATCH 0532/2033] nethogs: Add package

nethogs is a small 'net top' tool, grouping bandwidth by process.
---
 pkgs/tools/networking/nethogs/default.nix | 36 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/networking/nethogs/default.nix

diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
new file mode 100644
index 00000000000..9747dc58771
--- /dev/null
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, ncurses, libpcap }:
+
+stdenv.mkDerivation rec {
+  name = "nethogs-${version}";
+
+  version = "0.8.1-git";
+
+  src = fetchgit {
+    url = git://github.com/raboof/nethogs.git;
+    rev = "f6f9e890ea731b8acdcb8906642afae4cd96baa8";
+    sha256 = "0dj5sdyxdlssbnjbdf8k7x896m2zgyyg31g12dl5n6irqdrb5scf";
+  };
+
+  buildInputs = [ ncurses libpcap ];
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace "prefix := /usr/local" "prefix := $out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small 'net top' tool, grouping bandwidth by process";
+    longDescription = ''
+      NetHogs is a small 'net top' tool. Instead of breaking the traffic down
+      per protocol or per subnet, like most tools do, it groups bandwidth by
+      process. NetHogs does not rely on a special kernel module to be loaded.
+      If there's suddenly a lot of network traffic, you can fire up NetHogs
+      and immediately see which PID is causing this. This makes it easy to
+      identify programs that have gone wild and are suddenly taking up your
+      bandwidth.
+    '';
+    license = licenses.gpl2Plus;
+    homepage = http://nethogs.sourceforge.net/;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wizeman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de155d48cc4..b1c0d511880 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1503,6 +1503,8 @@ let
 
   netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
 
+  nethogs = callPackage ../tools/networking/nethogs { };
+
   netkittftp = callPackage ../tools/networking/netkit/tftp { };
 
   netpbm = callPackage ../tools/graphics/netpbm { };

From 83d0fd30786e42058bb205eee5901ea31571bbcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 23 Apr 2014 21:51:21 +0200
Subject: [PATCH 0533/2033] thrift: unbreak build

Add a tiny patch (already upstream) that fixes this build error:

  <flex>/lib/libfl.so: undefined reference to `yylex'
---
 pkgs/development/libraries/thrift/default.nix |  5 ++++
 pkgs/development/libraries/thrift/yylex.patch | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/thrift/yylex.patch

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index e1129d25ef4..191f9da99d1 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  # Fixes build error: <flex>/lib/libfl.so: undefined reference to `yylex'.
+  # Patch exists in upstream git repo, so it can be removed on the next version
+  # bump.
+  patches = [ ./yylex.patch ];
+
   # Workaround to make the python wrapper not drop this package:
   # pythonFull.override { extraLibs = [ thrift ]; }
   pythonPath = [];
diff --git a/pkgs/development/libraries/thrift/yylex.patch b/pkgs/development/libraries/thrift/yylex.patch
new file mode 100644
index 00000000000..3700bc6a436
--- /dev/null
+++ b/pkgs/development/libraries/thrift/yylex.patch
@@ -0,0 +1,23 @@
+Fixes build error:
+
+  <flex>/lib/libfl.so: undefined reference to `yylex'
+
+The same patch exists in upstream thrift git repo, commit
+ec8daae71004b3c2346bf12b2d74e52ed0815337
+"THRIFT-2386: Thrift refuses to link yylex".
+diff --git a/compiler/cpp/src/main.h b/compiler/cpp/src/main.h
+index 87af5f6..27285f5 100644
+--- a/compiler/cpp/src/main.h
++++ b/compiler/cpp/src/main.h
+@@ -28,8 +28,9 @@
+ /**
+  * Defined in the flex library
+  */
+-
+-int yylex(void);
++extern "C" {
++	int yylex(void);
++}
+ 
+ int yyparse(void);
+ 

From fcd67236f33f5a87b28e756cbcdc1cddadfd963e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 23 Apr 2014 23:19:48 +0200
Subject: [PATCH 0534/2033] accountsservice: fix creating data under /var/lib

---
 .../libraries/accountservice/default.nix      | 19 +++++++++++++++----
 .../accountservice/no-create-dirs.patch       | 13 +++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/accountservice/no-create-dirs.patch

diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountservice/default.nix
index 9734a6bc980..0ff5466e5c4 100644
--- a/pkgs/development/libraries/accountservice/default.nix
+++ b/pkgs/development/libraries/accountservice/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool
-, libtool, gobjectIntrospection, polkit, systemd }:
+{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper
+, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "accountsservice-0.6.35";
@@ -9,8 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5";
   };
 
-  buildInputs = [ pkgconfig glib intltool libtool
+  buildInputs = [ pkgconfig glib intltool libtool makeWrapper
                   gobjectIntrospection polkit systemd ];
 
-  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+                     "--localstatedir=/var" ];
+
+  patches = [ ./no-create-dirs.patch ];
+  patchFlags = "-p0";
+  
+  preFixup = ''
+    wrapProgram "$out/libexec/accounts-daemon" \
+      --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \
+      --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons"
+  '';
+
 }
diff --git a/pkgs/development/libraries/accountservice/no-create-dirs.patch b/pkgs/development/libraries/accountservice/no-create-dirs.patch
new file mode 100644
index 00000000000..a0c7ca23598
--- /dev/null
+++ b/pkgs/development/libraries/accountservice/no-create-dirs.patch
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig	2014-04-23 22:30:00.276005326 +0200
++++ src/Makefile.in	2014-04-23 22:30:16.809409113 +0200
+@@ -881,8 +881,8 @@
+ 	gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
+ 
+ install-data-hook:
+-	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
+-	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
++#	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
++#	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

From 925c75c68d72a51c858e59351e7b2b59affe9e5e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 22 Apr 2014 23:15:44 +0200
Subject: [PATCH 0535/2033] node.js - use bundled v8                           
      :14.04-bugfix:

node needs v8 3.14, which is no longer maintained.
They bundle an in-tree version which does receive backports.
---
 pkgs/development/web/nodejs/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 626cf6a55c4..9cbd7c46b52 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8_3_14, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -10,9 +10,12 @@ let
 
   # !!! Should we also do shared libuv?
   deps = {
-    v8 = v8_3_14;
     inherit openssl zlib http-parser;
     cares = c-ares;
+
+    # disabled system v8 because v8 3.14 no longer receives security fixes
+    # we fall back to nodejs' internal v8 copy which receives backports for now
+    # inherit v8
   };
 
   sharedConfigureFlags = name: [

From d2edc329e10fef1566b7b5cfb95e6b3b1fd1e49f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 22 Apr 2014 22:22:08 +0200
Subject: [PATCH 0536/2033] neoload: upgrade to 4.1.4 and fix mem issues

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

diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix
index 8b00d17ac7d..5b66ea75f65 100644
--- a/pkgs/development/tools/neoload/default.nix
+++ b/pkgs/development/tools/neoload/default.nix
@@ -31,15 +31,15 @@ let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = ''
     ''; };
 
 in stdenv.mkDerivation rec {
-  name = "neoload-4.1.3";
+  name = "neoload-4.1.4";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then
-      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x64.sh;
-        sha256 = "0qqp7iy6xpaqg535hk21yqmxi0inin5v160sa7nwxh41dq0li5xx"; }
+      { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh;
+        sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; }
     else
-      { url = http://www.neotys.com/documents/download/neoload/v4.1/neoload_4_1_3_linux_x86.sh;
-        sha256 = "0rvy6l9znha3wf8cn406lwvv2qshqnls9kasi68r4wgysr1hh662"; } );
+      { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh;
+        sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } );
 
   buildInputs = [ makeWrapper ];
   phases = [ "installPhase" ];
@@ -64,6 +64,8 @@ in stdenv.mkDerivation rec {
     export INSTALL4J_JAVA_HOME=${jre}
     bash -ic './installer -q -varfile response.varfile'
 
+    sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties
+
     for i in $out/bin/*; do
       wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \
                      --run 'chmod u+w ~/.install4j'

From 1a877418d4f02967c14394db9f83139892ec0465 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 23 Apr 2014 00:00:32 +0200
Subject: [PATCH 0537/2033] node-packages: upgrade all generated expressions

---
 pkgs/top-level/node-packages-generated.nix | 208 ++++++++++++---------
 1 file changed, 115 insertions(+), 93 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 194fb8ceaa9..356b736506d 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -145,14 +145,14 @@
     passthru.names = [ "StringScanner" ];
   };
   by-spec."abbrev"."1" =
-    self.by-version."abbrev"."1.0.4";
-  by-version."abbrev"."1.0.4" = lib.makeOverridable self.buildNodePackage {
-    name = "node-abbrev-1.0.4";
+    self.by-version."abbrev"."1.0.5";
+  by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage {
+    name = "node-abbrev-1.0.5";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.4.tgz";
-        name = "abbrev-1.0.4.tgz";
-        sha1 = "bd55ae5e413ba1722ee4caba1f6ea10414a59ecd";
+        url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
+        name = "abbrev-1.0.5.tgz";
+        sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
       })
     ];
     buildInputs =
@@ -164,9 +164,9 @@
     passthru.names = [ "abbrev" ];
   };
   by-spec."abbrev"."1.0.x" =
-    self.by-version."abbrev"."1.0.4";
+    self.by-version."abbrev"."1.0.5";
   by-spec."abbrev"."~1.0.4" =
-    self.by-version."abbrev"."1.0.4";
+    self.by-version."abbrev"."1.0.5";
   by-spec."accepts"."1.0.0" =
     self.by-version."accepts"."1.0.0";
   by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -1367,7 +1367,7 @@
     buildInputs =
       (self.nativeDeps."bower" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
       self.by-version."bower-config"."0.5.0"
       self.by-version."bower-endpoint-parser"."0.2.1"
@@ -1432,7 +1432,7 @@
     buildInputs =
       (self.nativeDeps."bower" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
       self.by-version."archy"."0.0.2"
       self.by-version."bower-config"."0.5.0"
       self.by-version."bower-endpoint-parser"."0.2.1"
@@ -1758,14 +1758,14 @@
   };
   "browserchannel" = self.by-version."browserchannel"."1.2.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."3.44.1";
-  by-version."browserify"."3.44.1" = lib.makeOverridable self.buildNodePackage {
-    name = "browserify-3.44.1";
+    self.by-version."browserify"."3.44.2";
+  by-version."browserify"."3.44.2" = lib.makeOverridable self.buildNodePackage {
+    name = "browserify-3.44.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.1.tgz";
-        name = "browserify-3.44.1.tgz";
-        sha1 = "e6ad85bd1e980e5c6aa30e27987536448dbc4d68";
+        url = "http://registry.npmjs.org/browserify/-/browserify-3.44.2.tgz";
+        name = "browserify-3.44.2.tgz";
+        sha1 = "ffa2788d06e8073ffd734d94c3ae272ca3dd630a";
       })
     ];
     buildInputs =
@@ -1813,7 +1813,7 @@
       self.by-version."timers-browserify"."1.0.1"
       self.by-version."tty-browserify"."0.0.0"
       self.by-version."umd"."2.0.0"
-      self.by-version."url"."0.7.9"
+      self.by-version."url"."0.10.1"
       self.by-version."util"."0.10.3"
       self.by-version."vm-browserify"."0.0.4"
     ];
@@ -1821,7 +1821,7 @@
     ];
     passthru.names = [ "browserify" ];
   };
-  "browserify" = self.by-version."browserify"."3.44.1";
+  "browserify" = self.by-version."browserify"."3.44.2";
   by-spec."browserify"."~3.38.0" =
     self.by-version."browserify"."3.38.1";
   by-version."browserify"."3.38.1" = lib.makeOverridable self.buildNodePackage {
@@ -3419,7 +3419,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."methods"."0.0.1"
       self.by-version."raw-body"."0.0.3"
       self.by-version."negotiator"."0.3.0"
@@ -3462,7 +3462,7 @@
       self.by-version."vhost"."1.0.0"
       self.by-version."bytes"."0.2.1"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3491,7 +3491,7 @@
       self.by-version."bytes"."0.1.0"
       self.by-version."send"."0.0.3"
       self.by-version."fresh"."0.1.0"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3520,7 +3520,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3549,7 +3549,7 @@
       self.by-version."bytes"."0.2.0"
       self.by-version."fresh"."0.1.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -3589,7 +3589,7 @@
       self.by-version."vhost"."1.0.0"
       self.by-version."bytes"."0.3.0"
       self.by-version."pause"."0.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."raw-body"."1.1.3"
       self.by-version."multiparty"."2.2.0"
     ];
@@ -3621,7 +3621,7 @@
       self.by-version."fresh"."0.2.0"
       self.by-version."pause"."0.0.1"
       self.by-version."uid2"."0.0.3"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."methods"."0.1.0"
       self.by-version."raw-body"."1.1.2"
       self.by-version."negotiator"."0.3.0"
@@ -3726,7 +3726,7 @@
     buildInputs =
       (self.nativeDeps."connect-timeout" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -4574,14 +4574,14 @@
     passthru.names = [ "dateformat" ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."0.8.0";
-  by-version."debug"."0.8.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-debug-0.8.0";
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-debug-0.8.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
-        name = "debug-0.8.0.tgz";
-        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
+        url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+        name = "debug-0.8.1.tgz";
+        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
       })
     ];
     buildInputs =
@@ -4631,13 +4631,13 @@
     passthru.names = [ "debug" ];
   };
   by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.8.0";
+    self.by-version."debug"."0.8.1";
   by-spec."debug"."~0.7.0" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.8" =
-    self.by-version."debug"."0.8.0";
+    self.by-version."debug"."0.8.1";
   by-spec."decompress"."^0.2.0" =
     self.by-version."decompress"."0.2.3";
   by-version."decompress"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -4653,7 +4653,7 @@
       (self.nativeDeps."decompress" or []);
     deps = [
       self.by-version."adm-zip"."0.4.4"
-      self.by-version."extname"."0.1.1"
+      self.by-version."extname"."0.1.2"
       self.by-version."get-stdin"."0.1.0"
       self.by-version."map-key"."0.1.1"
       self.by-version."mkdirp"."0.3.5"
@@ -6039,7 +6039,7 @@
       self.by-version."qs"."0.6.6"
       self.by-version."serve-static"."1.0.1"
       self.by-version."path-to-regexp"."0.1.2"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6093,7 +6093,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6123,7 +6123,7 @@
       self.by-version."methods"."0.1.0"
       self.by-version."send"."0.1.4"
       self.by-version."cookie-signature"."1.0.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6154,7 +6154,7 @@
       self.by-version."send"."0.2.0"
       self.by-version."cookie-signature"."1.0.3"
       self.by-version."merge-descriptors"."0.0.2"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6186,7 +6186,7 @@
       self.by-version."methods"."0.0.1"
       self.by-version."send"."0.1.0"
       self.by-version."cookie-signature"."1.0.0"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
     ];
     peerDependencies = [
     ];
@@ -6331,22 +6331,22 @@
   by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-spec."extname"."^0.1.1" =
-    self.by-version."extname"."0.1.1";
-  by-version."extname"."0.1.1" = lib.makeOverridable self.buildNodePackage {
-    name = "node-extname-0.1.1";
+    self.by-version."extname"."0.1.2";
+  by-version."extname"."0.1.2" = lib.makeOverridable self.buildNodePackage {
+    name = "extname-0.1.2";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/extname/-/extname-0.1.1.tgz";
-        name = "extname-0.1.1.tgz";
-        sha1 = "2274f61b52a963e1c8b2bc1a17673e51a2b4d0d3";
+        url = "http://registry.npmjs.org/extname/-/extname-0.1.2.tgz";
+        name = "extname-0.1.2.tgz";
+        sha1 = "de821aa0f01449d4b4043d4aeefa89a456bf3239";
       })
     ];
     buildInputs =
       (self.nativeDeps."extname" or []);
     deps = [
       self.by-version."ext-list"."0.1.0"
-      self.by-version."lodash"."2.4.1"
       self.by-version."map-key"."0.1.1"
+      self.by-version."underscore.string"."2.3.3"
     ];
     peerDependencies = [
     ];
@@ -9081,7 +9081,7 @@
       self.by-version."fileset"."0.1.5"
       self.by-version."which"."1.0.5"
       self.by-version."async"."0.2.10"
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
       self.by-version."wordwrap"."0.0.2"
       self.by-version."resolve"."0.6.3"
       self.by-version."js-yaml"."3.0.2"
@@ -9621,7 +9621,7 @@
       self.by-version."colors"."0.6.2"
       self.by-version."lodash"."2.4.1"
       self.by-version."mime"."1.2.11"
-      self.by-version."log4js"."0.6.13"
+      self.by-version."log4js"."0.6.14"
       self.by-version."useragent"."2.0.8"
       self.by-version."graceful-fs"."2.0.3"
       self.by-version."connect"."2.12.0"
@@ -10510,14 +10510,14 @@
     passthru.names = [ "log-driver" ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.13";
-  by-version."log4js"."0.6.13" = lib.makeOverridable self.buildNodePackage {
-    name = "node-log4js-0.6.13";
+    self.by-version."log4js"."0.6.14";
+  by-version."log4js"."0.6.14" = lib.makeOverridable self.buildNodePackage {
+    name = "node-log4js-0.6.14";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.13.tgz";
-        name = "log4js-0.6.13.tgz";
-        sha1 = "42676b039cc89881e374093ae16f29a42e607234";
+        url = "http://registry.npmjs.org/log4js/-/log4js-0.6.14.tgz";
+        name = "log4js-0.6.14.tgz";
+        sha1 = "7c26a0a25536b42bafa17fd937b87536fad3b229";
       })
     ];
     buildInputs =
@@ -11267,7 +11267,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -11294,7 +11294,7 @@
       self.by-version."growl"."1.7.0"
       self.by-version."jade"."0.26.3"
       self.by-version."diff"."1.0.7"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."glob"."3.2.3"
     ];
@@ -12400,7 +12400,7 @@
       self.by-version."glob"."3.2.9"
       self.by-version."rc"."0.3.5"
       self.by-version."strong-data-uri"."0.1.1"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."ws"."0.4.31"
       self.by-version."opener"."1.3.0"
       self.by-version."yargs"."1.1.3"
@@ -12685,7 +12685,7 @@
     buildInputs =
       (self.nativeDeps."nopt" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
     ];
     peerDependencies = [
     ];
@@ -12705,7 +12705,7 @@
     buildInputs =
       (self.nativeDeps."nopt" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
     ];
     peerDependencies = [
     ];
@@ -12729,7 +12729,7 @@
     buildInputs =
       (self.nativeDeps."nopt" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
     ];
     peerDependencies = [
     ];
@@ -12749,7 +12749,7 @@
     buildInputs =
       (self.nativeDeps."nopt" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
     ];
     peerDependencies = [
     ];
@@ -12795,7 +12795,7 @@
     buildInputs =
       (self.nativeDeps."npm" or []);
     deps = [
-      self.by-version."abbrev"."1.0.4"
+      self.by-version."abbrev"."1.0.5"
       self.by-version."ansi"."0.2.1"
       self.by-version."ansicolors"."0.3.2"
       self.by-version."ansistyles"."0.1.3"
@@ -13860,14 +13860,14 @@
     passthru.names = [ "pause" ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.7-3";
-  by-version."phantomjs"."1.9.7-3" = lib.makeOverridable self.buildNodePackage {
-    name = "phantomjs-1.9.7-3";
+    self.by-version."phantomjs"."1.9.7-4";
+  by-version."phantomjs"."1.9.7-4" = lib.makeOverridable self.buildNodePackage {
+    name = "phantomjs-1.9.7-4";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-3.tgz";
-        name = "phantomjs-1.9.7-3.tgz";
-        sha1 = "5deffc801452c4a44e65b02c26e8672617b9bdbf";
+        url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-4.tgz";
+        name = "phantomjs-1.9.7-4.tgz";
+        sha1 = "975b84f17b4b3bb28161d28303cb793b98c9d0dd";
       })
     ];
     buildInputs =
@@ -13885,9 +13885,9 @@
     ];
     passthru.names = [ "phantomjs" ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.7-3";
+  "phantomjs" = self.by-version."phantomjs"."1.9.7-4";
   by-spec."phantomjs"."~1.9.1-2" =
-    self.by-version."phantomjs"."1.9.7-3";
+    self.by-version."phantomjs"."1.9.7-4";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage {
@@ -14102,7 +14102,7 @@
     deps = [
       self.by-version."pkginfo"."0.3.0"
       self.by-version."read"."1.0.5"
-      self.by-version."revalidator"."0.1.6"
+      self.by-version."revalidator"."0.1.7"
       self.by-version."utile"."0.2.1"
       self.by-version."winston"."0.6.2"
     ];
@@ -14210,7 +14210,7 @@
     ];
     passthru.names = [ "ps-tree" ];
   };
-  by-spec."punycode".">=0.2.0" =
+  by-spec."punycode"."1.2.4" =
     self.by-version."punycode"."1.2.4";
   by-version."punycode"."1.2.4" = lib.makeOverridable self.buildNodePackage {
     name = "node-punycode-1.2.4";
@@ -14229,6 +14229,8 @@
     ];
     passthru.names = [ "punycode" ];
   };
+  by-spec."punycode".">=0.2.0" =
+    self.by-version."punycode"."1.2.4";
   by-spec."punycode".">=1.0.0 <1.1.0" =
     self.by-version."punycode"."1.0.0";
   by-version."punycode"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -15552,14 +15554,14 @@
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.0";
   by-spec."revalidator"."0.1.x" =
-    self.by-version."revalidator"."0.1.6";
-  by-version."revalidator"."0.1.6" = lib.makeOverridable self.buildNodePackage {
-    name = "node-revalidator-0.1.6";
+    self.by-version."revalidator"."0.1.7";
+  by-version."revalidator"."0.1.7" = lib.makeOverridable self.buildNodePackage {
+    name = "node-revalidator-0.1.7";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.6.tgz";
-        name = "revalidator-0.1.6.tgz";
-        sha1 = "0af2bab68d7d0e766fc4249660ebc2be28b594ba";
+        url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.7.tgz";
+        name = "revalidator-0.1.7.tgz";
+        sha1 = "f0b68b01bc5c5e0e9e6d864154d7098f24fec1db";
       })
     ];
     buildInputs =
@@ -15998,7 +16000,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.2"
       self.by-version."range-parser"."1.0.0"
@@ -16021,7 +16023,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16044,7 +16046,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.6"
       self.by-version."fresh"."0.1.0"
       self.by-version."range-parser"."0.0.4"
@@ -16067,7 +16069,7 @@
     buildInputs =
       (self.nativeDeps."send" or []);
     deps = [
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."mime"."1.2.11"
       self.by-version."fresh"."0.2.0"
       self.by-version."range-parser"."0.0.4"
@@ -16950,14 +16952,14 @@
     passthru.names = [ "stack-trace" ];
   };
   by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.2.0";
-  by-version."stackdriver-statsd-backend"."0.2.0" = lib.makeOverridable self.buildNodePackage {
-    name = "node-stackdriver-statsd-backend-0.2.0";
+    self.by-version."stackdriver-statsd-backend"."0.2.1";
+  by-version."stackdriver-statsd-backend"."0.2.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-stackdriver-statsd-backend-0.2.1";
     src = [
       (fetchurl {
-        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.0.tgz";
-        name = "stackdriver-statsd-backend-0.2.0.tgz";
-        sha1 = "6c81fc970f9da905970ef387cf1215fa23b05d73";
+        url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.1.tgz";
+        name = "stackdriver-statsd-backend-0.2.1.tgz";
+        sha1 = "3109661288821e79259b4d750a25d7159265dd8e";
       })
     ];
     buildInputs =
@@ -16968,7 +16970,7 @@
     ];
     passthru.names = [ "stackdriver-statsd-backend" ];
   };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.0";
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.1";
   by-spec."static-favicon"."1.0.0" =
     self.by-version."static-favicon"."1.0.0";
   by-version."static-favicon"."1.0.0" = lib.makeOverridable self.buildNodePackage {
@@ -17323,7 +17325,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
       self.by-version."circular-json"."0.1.6"
@@ -17349,7 +17351,7 @@
     deps = [
       self.by-version."css-parse"."1.7.0"
       self.by-version."mkdirp"."0.3.5"
-      self.by-version."debug"."0.8.0"
+      self.by-version."debug"."0.8.1"
       self.by-version."sax"."0.5.8"
       self.by-version."glob"."3.2.9"
     ];
@@ -18639,6 +18641,26 @@
   };
   by-spec."update-notifier"."~0.1.7" =
     self.by-version."update-notifier"."0.1.8";
+  by-spec."url"."~0.10.1" =
+    self.by-version."url"."0.10.1";
+  by-version."url"."0.10.1" = lib.makeOverridable self.buildNodePackage {
+    name = "node-url-0.10.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/url/-/url-0.10.1.tgz";
+        name = "url-0.10.1.tgz";
+        sha1 = "d8eba8f267cec7645ddd93d2cdcf2320c876d25b";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."url" or []);
+    deps = [
+      self.by-version."punycode"."1.2.4"
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "url" ];
+  };
   by-spec."url"."~0.7.9" =
     self.by-version."url"."0.7.9";
   by-version."url"."0.7.9" = lib.makeOverridable self.buildNodePackage {
@@ -19219,7 +19241,7 @@
       self.by-version."kew"."0.1.7"
       self.by-version."mkdirp"."0.3.5"
       self.by-version."npmconf"."0.1.14"
-      self.by-version."phantomjs"."1.9.7-3"
+      self.by-version."phantomjs"."1.9.7-4"
       self.by-version."tmp"."0.0.23"
       self.by-version."follow-redirects"."0.0.3"
     ];

From 7fec0b58324029f2afb30e7f8a8a0622c7552c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 10:52:42 +0200
Subject: [PATCH 0538/2033] Fixed pkgconfig support for poppler-qt4

---
 pkgs/development/libraries/poppler/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 1e1452f4578..b9412b37cba 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -66,7 +66,11 @@ let
     propagatedBuildInputs = [ qt4 poppler_glib ];
     patches = qtcairo_patches;
     NIX_LDFLAGS = "-lpoppler";
-    postConfigure = "cd qt4";
+    postConfigure = ''
+      mkdir -p "$out/lib/pkgconfig"
+      install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig"
+      cd qt4
+    '';
   };
 
 in { inherit poppler_glib poppler_qt4; } // poppler_glib

From 31b58dccfe162c43f56945f4444e7fa3a1d566da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 10:54:09 +0200
Subject: [PATCH 0539/2033] Added TeXmaker package : an advanced editor for
 latex

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

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
new file mode 100644
index 00000000000..16335a55065
--- /dev/null
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qt4, popplerQt4, zlib, pkgconfig, poppler}:
+
+stdenv.mkDerivation rec {
+  pname = "texmaker";
+  version = "4.1.1";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.xm1math.net/texmaker/${name}.tar.bz2";
+    sha256 = "1h5rxdq6f05wk3lnlw96fxwrb14k77cx1mwy648127h2c8nsgw4z";
+  };
+
+  buildInputs = [ qt4 popplerQt4 zlib ];
+
+  nativeBuildInputs = [ pkgconfig poppler ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${poppler}/include/poppler/) " # for poppler-config.h
+    qmake PREFIX=$out DESKTOPDIR=$out/share/applications ICONDIR=$out/share/pixmaps texmaker.pro
+  '';
+
+  meta = with stdenv.lib; {
+    description = "TeX and LaTeX editor";
+    longDescription=''
+	This editor is a full fledged IDE for TeX and
+	LaTeX editing with completion, structure viewer, preview,
+	spell checking and support of any compilation chain.
+	'';
+    homepage = "http://www.xm1math.net/texmaker/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cfouche ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d196199615..23675df7ac5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2055,6 +2055,8 @@ let
     guile = guile_1_8;
   };
 
+  texmaker = callPackage ../applications/editors/texmaker { };
+
   tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
 
   tinc = callPackage ../tools/networking/tinc { };

From 3701fdf0663ea48dc20deddc29bc8e1f543f25d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Thu, 24 Apr 2014 11:40:06 +0200
Subject: [PATCH 0540/2033] Adding myself to lib/maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 78355eff004..8a01b622158 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -23,6 +23,7 @@
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   bodil = "Bodil Stokke <nix@bodil.org>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
+  cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";

From a16098995a6f401b2d7178c522f24d45474469fc Mon Sep 17 00:00:00 2001
From: vi <me@vikramverma.com>
Date: Thu, 24 Apr 2014 17:41:40 +0800
Subject: [PATCH 0541/2033] New package: lists and its dependency, list-extras
 (Haskell.)

---
 .../libraries/haskell/listExtras/default.nix        | 13 +++++++++++++
 .../development/libraries/haskell/lists/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  4 ++++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/listExtras/default.nix
 create mode 100644 pkgs/development/libraries/haskell/lists/default.nix

diff --git a/pkgs/development/libraries/haskell/listExtras/default.nix b/pkgs/development/libraries/haskell/listExtras/default.nix
new file mode 100644
index 00000000000..21e1a7d7c69
--- /dev/null
+++ b/pkgs/development/libraries/haskell/listExtras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "list-extras";
+  version = "0.4.1.3";
+  sha256 = "16w10xgh2y76q8aj5pgw4zq5p2phjzf5g1bmkacrm8gbwkp4v71s";
+  meta = {
+    homepage = "http://code.haskell.org/~wren/";
+    description = "Common not-so-common functions for lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/lists/default.nix b/pkgs/development/libraries/haskell/lists/default.nix
new file mode 100644
index 00000000000..d7574da0fa7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/lists/default.nix
@@ -0,0 +1,13 @@
+{ cabal, listExtras, split }:
+
+cabal.mkDerivation (self: {
+  pname = "lists";
+  version = "0.4.2";
+  sha256 = "0qjziksh6gl6v8rzvqajkcbakbby5j3i4z2jk6w6zs89b93rwnln";
+  buildDepends = [ listExtras split ];
+  meta = {
+    description = "Functions for dealing with lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c241f9e44d..6f07bf51eee 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1673,6 +1673,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   List = callPackage ../development/libraries/haskell/List {};
 
+  lists = callPackage ../development/libraries/haskell/lists {};
+
+  listExtras = callPackage ../development/libraries/haskell/listExtras {};
+
   listTries = callPackage ../development/libraries/haskell/list-tries {};
 
   ListLike = callPackage ../development/libraries/haskell/ListLike {};

From 7336218a9eb6a348ca496a21a01722adffc8dfcd Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 24 Apr 2014 11:56:54 +0200
Subject: [PATCH 0542/2033] postfix: Add version 2.11.0 as nixpkgs.postfix211

I think this version should replace the current nixpkgs.postfix,
but it could potentially break stuff since the version jump is
big (2.8 -> 2.11).
---
 pkgs/servers/mail/postfix/2.11.nix            | 62 +++++++++++++++
 .../servers/mail/postfix/postfix-2.11.0.patch | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 140 insertions(+)
 create mode 100644 pkgs/servers/mail/postfix/2.11.nix
 create mode 100644 pkgs/servers/mail/postfix/postfix-2.11.0.patch

diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix
new file mode 100644
index 00000000000..7164ace791e
--- /dev/null
+++ b/pkgs/servers/mail/postfix/2.11.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, coreutils
+, findutils, gnugrep, gawk
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "postfix-${version}";
+
+  version = "2.11.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
+    sha256 = "0f0c6cv6j5m5n4bjp18llvbbxmzmhb70qw1z9vf7h9k6slr9s7fa";
+  };
+
+  patches = [ ./postfix-2.11.0.patch ];
+
+  buildInputs = [ makeWrapper gnused db openssl cyrus_sasl ];
+
+  preBuild = ''
+    sed -e '/^PATH=/d' -i postfix-install
+
+    export command_directory=$out/sbin
+    export config_directory=$out/etc/postfix
+    export daemon_directory=$out/libexec/postfix
+    export data_directory=/var/lib/postfix
+    export html_directory=$out/share/postfix/doc/html
+    export mailq_path=$out/bin/mailq
+    export manpage_directory=$out/share/man
+    export newaliases_path=$out/bin/newaliases
+    export queue_directory=/var/spool/postfix
+    export readme_directory=$out/share/postfix/doc
+    export sendmail_path=$out/bin/sendmail
+
+    make makefiles \
+      CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' \
+      AUXLIBS='-ldb -lnsl -lresolv -lsasl2 -lcrypto -lssl'
+  '';
+
+  installTargets = [ "non-interactive-package" ];
+
+  installFlags = [ " install_root=$out " ];
+
+  postInstall = ''
+    mkdir -p $out
+    mv -v ut/$out/* $out/
+    sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install
+    wrapProgram $out/libexec/postfix/post-install \
+      --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin
+    wrapProgram $out/libexec/postfix/postfix-script \
+      --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
+  '';
+
+  meta = {
+    homepage = "http://www.postfix.org/";
+    description = "A fast, easy to administer, and secure mail server";
+    license = stdenv.lib.licenses.bsdOriginal;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
+
+}
diff --git a/pkgs/servers/mail/postfix/postfix-2.11.0.patch b/pkgs/servers/mail/postfix/postfix-2.11.0.patch
new file mode 100644
index 00000000000..cdc4521c428
--- /dev/null
+++ b/pkgs/servers/mail/postfix/postfix-2.11.0.patch
@@ -0,0 +1,76 @@
+diff -ruN postfix-2.11.0-orig/makedefs postfix-2.11.0/makedefs
+--- postfix-2.11.0-orig/makedefs	2014-01-05 18:18:56.000000000 +0100
++++ postfix-2.11.0/makedefs	2014-04-24 09:27:58.193869491 +0200
+@@ -290,36 +290,6 @@
+ 		esac
+ 		;;
+     Linux.2*)	SYSTYPE=LINUX2
+-		case "$CCARGS" in
+-		 *-DNO_DB*) ;;
+-		 *-DHAS_DB*) ;;
+-		 *) if [ -f /usr/include/db.h ]
+-		    then
+-			: we are all set
+-		    elif [ -f /usr/include/db/db.h ]
+-		    then
+-			CCARGS="$CCARGS -I/usr/include/db"
+-		    else
+-			# No, we're not going to try db1 db2 db3 etc.
+-			# On a properly installed system, Postfix builds
+-			# by including <db.h> and by linking with -ldb
+-			echo "No <db.h> include file found." 1>&2
+-			echo "Install the appropriate db*-devel package first." 1>&2
+-			exit 1
+-		    fi
+-		    SYSLIBS="-ldb"
+-		    ;;
+-		esac
+-		for name in nsl resolv $GDBM_LIBS
+-		do
+-		    for lib in /usr/lib64 /lib64 /usr/lib /lib
+-		    do
+-			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+-			    SYSLIBS="$SYSLIBS -l$name"
+-			    break
+-			}
+-		    done
+-		done
+ 		# Kernel 2.4 added IPv6
+ 		case "$RELEASE" in
+ 		2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";;
+@@ -363,35 +333,6 @@
+ 		esac
+ 		;;
+     Linux.3*)	SYSTYPE=LINUX3
+-		case "$CCARGS" in
+-		 *-DNO_DB*) ;;
+-		 *-DHAS_DB*) ;;
+-		 *) if [ -f /usr/include/db.h ]
+-		    then
+-			: we are all set
+-		    elif [ -f /usr/include/db/db.h ]
+-		    then
+-			CCARGS="$CCARGS -I/usr/include/db"
+-		    else
+-			# On a properly installed system, Postfix builds
+-			# by including <db.h> and by linking with -ldb
+-			echo "No <db.h> include file found." 1>&2
+-			echo "Install the appropriate db*-devel package first." 1>&2
+-			exit 1
+-		    fi
+-		    SYSLIBS="-ldb"
+-		    ;;
+-		esac
+-		for name in nsl resolv
+-		do
+-		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
+-		    do
+-			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
+-			    SYSLIBS="$SYSLIBS -l$name"
+-			    break
+-			}
+-		    done
+-		done
+ 		;;
+      GNU.0*|GNU/kFreeBSD.[567]*)
+ 		SYSTYPE=GNU0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de155d48cc4..56b20ed10c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6530,6 +6530,8 @@ let
 
   postfix = callPackage ../servers/mail/postfix { };
 
+  postfix211 = callPackage ../servers/mail/postfix/2.11.nix { };
+
   pulseaudio = callPackage ../servers/pulseaudio {
     gconf = gnome.GConf;
     # The following are disabled in the default build, because if this

From a2fad897235fcad6e90c7d0b03a228786c46c9f9 Mon Sep 17 00:00:00 2001
From: robberer <robberer@freakmail.de>
Date: Wed, 23 Apr 2014 14:09:51 +0200
Subject: [PATCH 0543/2033] =?UTF-8?q?kde:=20=E2=80=9Ckdnssd=E2=80=9D=20pac?=
 =?UTF-8?q?kage=20is=20now=20called=20=E2=80=9Czeroconf-ioslave=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #2358.
---
 pkgs/desktops/kde-4.12/kde-package/4.12.4.nix                   | 2 +-
 .../kde-4.12/kdenetwork/{kdnssd.nix => zeroconf-ioslave.nix}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/desktops/kde-4.12/kdenetwork/{kdnssd.nix => zeroconf-ioslave.nix} (100%)

diff --git a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
index a007957cf0c..9b5a53cee48 100644
--- a/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.4.nix
@@ -220,7 +220,7 @@ modules=[
   pkgs=[
     { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
     { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kdnssd";  }
+    { name="zeroconf-ioslave";  }
     { name="kget";  }
     { name="kopete";  }
     { name="kppp";  }
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix
similarity index 100%
rename from pkgs/desktops/kde-4.12/kdenetwork/kdnssd.nix
rename to pkgs/desktops/kde-4.12/kdenetwork/zeroconf-ioslave.nix

From d4986b5fd3ee75d489828d8d7048d8eb60f14c21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Apr 2014 17:45:46 +0200
Subject: [PATCH 0544/2033] Don't create world-readable swapfiles

---
 nixos/modules/config/swap.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 427b2519cbd..ac1c32387c5 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -106,6 +106,7 @@ with utils;
                 if [ ! -e "${sw.device}" ]; then
                   fallocate -l ${toString sw.size}M "${sw.device}" ||
                     dd if=/dev/zero of="${sw.device}" bs=1M count=${toString sw.size}
+                  chmod 0600 ${sw.device}
                   mkswap ${sw.device}
                 fi
               '';

From 25af3671f9f33c066acd40702268b0fdb900b238 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 13:49:28 +0200
Subject: [PATCH 0545/2033] Remove some dead code

---
 nixos/modules/services/networking/dhcpcd.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 35a3cfff840..ce9b4a3b15d 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -44,17 +44,6 @@ let
   # Hook for emitting ip-up/ip-down events.
   exitHook = pkgs.writeText "dhcpcd.exit-hook"
     ''
-      #exec >> /var/log/dhcpcd 2>&1
-      #set -x
-
-      params="IFACE=$interface REASON=$reason"
-
-      # only works when interface is wireless and wpa_supplicant has a control socket
-      # but we allow it to fail silently
-      ${optionalString config.networking.wireless.enable ''
-        params+=" $(${pkgs.wpa_supplicant}/sbin/wpa_cli -i$interface status 2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)"
-      ''}
-
       if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
           # Restart ntpd.  We need to restart it to make sure that it
           # will actually do something: if ntpd cannot resolve the

From 2d8c0d24f206a3eb32cd86653fa6e70f8018929c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 15:08:31 +0200
Subject: [PATCH 0546/2033] dhcpcd: Fix segfaults

This fixes several problems in the dhcpcd service:

* A segfault during startup, due to a race with udev (dhcpcd would get
  an ADD event from udev, causing it to re-add an interface that it
  already had, leading to a segfault later on).

* A hang/segfault processing "dhcpcd rebind" (which NixOS calls after
  waking up from suspend).

Also, add "lo" to the list of ignored interfaces. It usually ignores
"lo", but apparently not when it gets an ADD event from udev.
---
 nixos/modules/services/networking/dhcpcd.nix  |  6 ++---
 .../networking/dhcpcd/check-interface.patch   | 24 +++++++++++++++++++
 pkgs/tools/networking/dhcpcd/default.nix      |  2 +-
 pkgs/tools/networking/dhcpcd/reload.patch     | 22 +++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/networking/dhcpcd/check-interface.patch
 create mode 100644 pkgs/tools/networking/dhcpcd/reload.patch

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index ce9b4a3b15d..757340b3c2c 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -36,7 +36,7 @@ let
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt) and c-* and ctmp-* (NixOS
       # containers).
-      denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet* c-* ctmp-*
+      denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* c-* ctmp-*
 
       ${config.networking.dhcpcd.extraConfig}
     '';
@@ -98,7 +98,6 @@ in
       { description = "DHCP Client";
 
         wantedBy = [ "network.target" ];
-        after = [ "systemd-udev-settle.service" ]; # FIXME
 
         # Stopping dhcpcd during a reconfiguration is undesirable
         # because it brings down the network interfaces configured by
@@ -112,9 +111,8 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --config ${dhcpcdConf}";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
-            StandardError = "null";
             Restart = "always";
           };
       };
diff --git a/pkgs/tools/networking/dhcpcd/check-interface.patch b/pkgs/tools/networking/dhcpcd/check-interface.patch
new file mode 100644
index 00000000000..2b732b740ad
--- /dev/null
+++ b/pkgs/tools/networking/dhcpcd/check-interface.patch
@@ -0,0 +1,24 @@
+Index: dhcpcd.c
+==================================================================
+--- a/dhcpcd.c
++++ b/dhcpcd.c
+@@ -747,14 +747,14 @@
+ 			if (ifp->hwlen != 0)
+ 				memcpy(ifl->hwaddr, ifp->hwaddr, ifl->hwlen);
+ 		} else {
+ 			TAILQ_REMOVE(ifs, ifp, next);
+ 			TAILQ_INSERT_TAIL(ctx->ifaces, ifp, next);
+-		}
+-		if (action == 1) {
+-			init_state(ifp, ctx->argc, ctx->argv);
+-			start_interface(ifp);
++			if (action == 1) {
++				init_state(ifp, ctx->argc, ctx->argv);
++				start_interface(ifp);
++			}
+ 		}
+ 	}
+ 
+ 	/* Free our discovered list */
+ 	while ((ifp = TAILQ_FIRST(ifs))) {
+
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index d247dbe38aa..40f6538750f 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1v2m5wdr6x5cz6i0n1y63am9dhj5j7ylrk717scjgwwjdbq1x75n";
   };
 
-  patches = [ ./lxc_ro_promote_secondaries.patch ];
+  patches = [ ./lxc_ro_promote_secondaries.patch ./reload.patch ./check-interface.patch ];
 
   buildInputs = [ pkgconfig udev ];
 
diff --git a/pkgs/tools/networking/dhcpcd/reload.patch b/pkgs/tools/networking/dhcpcd/reload.patch
new file mode 100644
index 00000000000..0ecb75a4476
--- /dev/null
+++ b/pkgs/tools/networking/dhcpcd/reload.patch
@@ -0,0 +1,22 @@
+--- a/dhcpcd.c
++++ b/dhcpcd.c
+@@ -143,16 +143,18 @@
+ 	if (ctx->ifac) {
+ 		for (ctx->ifac--; ctx->ifac >= 0; ctx->ifac--)
+ 			free(ctx->ifav[ctx->ifac]);
+ 		free(ctx->ifav);
+ 		ctx->ifav = NULL;
++		ctx->ifac = 0;
+ 	}
+ 	if (ctx->ifdc) {
+ 		for (ctx->ifdc--; ctx->ifdc >= 0; ctx->ifdc--)
+ 			free(ctx->ifdv[ctx->ifdc]);
+ 		free(ctx->ifdv);
+ 		ctx->ifdv = NULL;
++		ctx->ifdc = 0;
+ 	}
+ 
+ #ifdef INET
+ 	if (ctx->dhcp_opts) {
+ 		for (opt = ctx->dhcp_opts;
+

From 2b7e746c02861f7e10eee9a0d4e00d8dcb537a86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 15:18:46 +0200
Subject: [PATCH 0547/2033] Make the misc test a bit more robust

---
 nixos/tests/misc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 363be2cbb35..f3b5bbd1a1e 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -61,6 +61,7 @@ import ./make-test.nix {
 
       # Test whether hostname (and by extension nss_myhostname) works.
       subtest "hostname", sub {
+          $machine->waitForUnit("dhcpcd.service");
           $machine->succeed('[ "`hostname`" = machine ]');
           $machine->succeed('[ "`hostname -s`" = machine ]');
       };

From af72c7dddd0b82ff0f47240b2f0f35e44cbbf7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Thu, 24 Apr 2014 21:30:03 +0800
Subject: [PATCH 0548/2033] herbstluftwm: update to 0.6.2

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

diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix
index 3ce50a82915..7c4cb4934c9 100644
--- a/pkgs/applications/window-managers/herbstluftwm/default.nix
+++ b/pkgs/applications/window-managers/herbstluftwm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, glib, libX11, libXinerama }:
+{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }:
 
 stdenv.mkDerivation rec {
-  name = "herbstluftwm-0.5.2";
+  name = "herbstluftwm-0.6.2";
 
   src = fetchurl {
     url = "http://herbstluftwm.org/tarballs/${name}.tar.gz";
-    sha256 = "15crb77gw8p1h721r3dcgn0m1n03qk0g81rrnaqw8p7hz44k6gf5";
+    sha256 = "1b7h2zi0i9j17k1z62qw5zq7j9i8gv33pmcxnfiilzzfg8wmr7x8";
   };
 
   patchPhase = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
           config.mk
   '';
 
-  buildInputs = [ pkgconfig glib libX11 libXinerama ];
+  buildInputs = [ pkgconfig glib libX11 libXext libXinerama ];
 
   meta = {
     description = "A manual tiling window manager for X";

From d304b277bd7a8096b87691e756edfe5d8ed6674d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 15:40:55 +0200
Subject: [PATCH 0549/2033] Silence some Hydra evaluation warnings

---
 pkgs/applications/audio/clementine/default.nix                 | 1 +
 .../version-management/git-and-tools/git-bz/default.nix        | 1 +
 pkgs/applications/video/cc1394/default.nix                     | 1 +
 pkgs/games/rigsofrods/default.nix                              | 3 ++-
 pkgs/tools/networking/p2p/seeks/default.nix                    | 1 +
 pkgs/top-level/release.nix                                     | 2 --
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 4352e2e133a..5d4a3614e40 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -45,5 +45,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
+    hydraPlatforms = []; # libspotify is unfree
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 5e6b9fdc243..3a2270cf972 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.pierron ];
+    broken = true;
   };
 }
diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix
index df131f0e485..d555e1b7885 100644
--- a/pkgs/applications/video/cc1394/default.nix
+++ b/pkgs/applications/video/cc1394/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license = "BSD";
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = []; # because libdc1394avt is broken
   };
 }
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index 90ebab92942..809bcc930d2 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     homepage = http://rigsofrods.sourceforge.net/;
     license = "GPLv3";
     maintainers = with stdenv.lib.maintainers; [viric raskin];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
index 43c189f36a9..835744c6000 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation {
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cb22983e6c3..2915887ec11 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -311,7 +311,6 @@ let
       vice = linux;
       vim = linux;
       vimHugeX = linux;
-      VisualBoyAdvance = linux;
       vncrec = linux;
       vorbisTools = linux;
       vpnc = linux;
@@ -333,7 +332,6 @@ let
       xineUI = linux;
       xkeyboard_config = linux;
       xlockmore = linux;
-      xmltv = linux;
       xpdf = linux;
       xscreensaver = linux;
       xsel = linux;

From 019e9d8a3deada9dfab21897e73a46b9fa48a6cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 15:46:10 +0200
Subject: [PATCH 0550/2033] Fix simpleTest function

---
 nixos/lib/testing.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 8d17958b9d2..942a2158b15 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -196,6 +196,6 @@ rec {
       } // args);
 
 
-  simpleTest = as: (makeTest ({ ... }: as)).test;
+  simpleTest = as: (makeTest as).test;
 
 }

From af817ae0d8f0cdd414ae24a945ce9c4106352dad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 18:32:32 +0200
Subject: [PATCH 0551/2033] Try again

---
 nixos/tests/misc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index f3b5bbd1a1e..031fff2de58 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -62,6 +62,7 @@ import ./make-test.nix {
       # Test whether hostname (and by extension nss_myhostname) works.
       subtest "hostname", sub {
           $machine->waitForUnit("dhcpcd.service");
+          $machine->waitForUnit("network.target");
           $machine->succeed('[ "`hostname`" = machine ]');
           $machine->succeed('[ "`hostname -s`" = machine ]');
       };

From c7f2d87a5619d5850fe0464e934b4876677eff5d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 24 Apr 2014 13:06:01 -0400
Subject: [PATCH 0552/2033] Add haskell-http-kit

---
 .../libraries/haskell/http-kit/default.nix       | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/http-kit/default.nix

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
new file mode 100644
index 00000000000..6586b4d5ce2
--- /dev/null
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -0,0 +1,16 @@
+{ cabal, caseInsensitive, hspec, httpTypes, QuickCheck
+, quickcheckInstances
+}:
+
+cabal.mkDerivation (self: {
+  pname = "http-kit";
+  version = "0.2.0";
+  sha256 = "0pwcaf52abyjy3jknb7q18j50qd7arz7ck8xffbv9pbp0z7lfd6n";
+  buildDepends = [ caseInsensitive httpTypes ];
+  testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
+  meta = {
+    description = "A low-level HTTP library";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c241f9e44d..b7e78e09cc7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1374,6 +1374,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   httpCommon = callPackage ../development/libraries/haskell/http-common {};
 
+  httpKit = callPackage ../development/libraries/haskell/http-kit {};
+
   httpReverseProxy = callPackage ../development/libraries/haskell/http-reverse-proxy {};
 
   hackageDb = callPackage ../development/libraries/haskell/hackage-db {};

From d4cb80eaf43017e23cb77e7a8ce461398e2d3279 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 24 Apr 2014 13:21:46 -0400
Subject: [PATCH 0553/2033] sproxy: bump

---
 pkgs/tools/networking/sproxy/default.nix      |  29 ++-
 .../networking/sproxy/new-http-kit.patch      | 224 ++++++++++++++++++
 2 files changed, 240 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/tools/networking/sproxy/new-http-kit.patch

diff --git a/pkgs/tools/networking/sproxy/default.nix b/pkgs/tools/networking/sproxy/default.nix
index 342da193ffc..10ec9b40cd4 100644
--- a/pkgs/tools/networking/sproxy/default.nix
+++ b/pkgs/tools/networking/sproxy/default.nix
@@ -1,33 +1,36 @@
 { cabal, aeson, attoparsec, caseInsensitive, certificate
-, concurrentExtra, cryptoRandom, curl, dataDefault, hslogger, hspec
-, HTTP, httpTypes, interpolatedstringPerl6, mtl, network
-, optparseApplicative, postgresqlSimple, safe, SHA, split
-, stringConversions, time, tls, unorderedContainers, utf8String
-, x509, yaml, fetchurl
+, concurrentExtra, conduit, connection, cryptoRandom, curl
+, dataDefault, hslogger, hspec, httpConduit, httpKit, httpTypes
+, interpolatedstringPerl6, mtl, network, optparseApplicative
+, postgresqlSimple, safe, SHA, split, stringConversions, time, tls
+, unorderedContainers, utf8String, wai, warp, x509, yaml, fetchurl
 }:
 
 cabal.mkDerivation (self: {
   pname = "sproxy";
-  version = "0.7.4";
+  version = "0.8.0";
   src = fetchurl {
-    url = "https://github.com/zalora/sproxy/archive/0.7.4.tar.gz";
-    sha256 = "1zlsln0ihg7p8jk5gdvm9as6gk4fs8vaa547iq2yvna4c1wb4amr";
+    url = "https://github.com/zalora/sproxy/archive/0.8.0.tar.gz";
+    sha256 = "11xn4k509ck73pacyz2kh0924n2vy8rwakwd42dwbvhhysf47rdx";
   };
   isLibrary = false;
   isExecutable = true;
+  patches = [ ./new-http-kit.patch ];
+  doCheck = false;
   buildDepends = [
     aeson attoparsec caseInsensitive certificate concurrentExtra
-    cryptoRandom curl dataDefault hslogger HTTP httpTypes
+    cryptoRandom curl dataDefault hslogger httpKit httpTypes
     interpolatedstringPerl6 mtl network optparseApplicative
     postgresqlSimple safe SHA split stringConversions time tls
     unorderedContainers utf8String x509 yaml
   ];
   testDepends = [
     aeson attoparsec caseInsensitive certificate concurrentExtra
-    cryptoRandom curl dataDefault hslogger hspec HTTP httpTypes
-    interpolatedstringPerl6 mtl network optparseApplicative
-    postgresqlSimple safe SHA split stringConversions time tls
-    unorderedContainers utf8String x509 yaml
+    conduit connection cryptoRandom curl dataDefault hslogger hspec
+    httpConduit httpKit httpTypes interpolatedstringPerl6 mtl network
+    optparseApplicative postgresqlSimple safe SHA split
+    stringConversions time tls unorderedContainers utf8String wai warp
+    x509 yaml
   ];
   meta = {
     license = self.stdenv.lib.licenses.mit;
diff --git a/pkgs/tools/networking/sproxy/new-http-kit.patch b/pkgs/tools/networking/sproxy/new-http-kit.patch
new file mode 100644
index 00000000000..c15c3f3989a
--- /dev/null
+++ b/pkgs/tools/networking/sproxy/new-http-kit.patch
@@ -0,0 +1,224 @@
+From 383d2cbe240600a86ab99fdefcea4e913d171ec6 Mon Sep 17 00:00:00 2001
+From: Simon Hengel <sol@typeful.net>
+Date: Thu, 24 Apr 2014 22:51:02 +0800
+Subject: [PATCH] Depend on http-kit >= 0.2
+
+---
+ sproxy.cabal        |  2 +-
+ src/Authenticate.hs | 17 ++++++++---------
+ src/HTTP.hs         | 47 +++++++++--------------------------------------
+ src/Proxy.hs        | 32 ++++++++++++++------------------
+ 4 files changed, 32 insertions(+), 66 deletions(-)
+
+diff --git a/sproxy.cabal b/sproxy.cabal
+index 08e1d61..91adf5d 100644
+--- a/sproxy.cabal
++++ b/sproxy.cabal
+@@ -49,7 +49,7 @@ executable sproxy
+                        unix,
+                        utf8-string,
+                        x509,
+-                       http-kit,
++                       http-kit >= 0.2,
+                        yaml >= 0.8
+   default-language:    Haskell2010
+   ghc-options:         -Wall -threaded -O2
+diff --git a/src/Authenticate.hs b/src/Authenticate.hs
+index 7d4c218..15a69a9 100644
+--- a/src/Authenticate.hs
++++ b/src/Authenticate.hs
+@@ -30,8 +30,7 @@ import           System.Posix.Types (EpochTime)
+ import           System.Posix.Time (epochTime)
+ import           Data.Digest.Pure.SHA (hmacSha1, showDigest)
+ 
+-import           Network.HTTP.Toolkit.Header
+-import           Network.HTTP.Toolkit.Request
++import           Network.HTTP.Toolkit
+ 
+ import           Type
+ import           Cookies
+@@ -90,19 +89,19 @@ instance FromJSON UserInfo where
+ 
+ -- https://wiki.zalora.com/Main_Page -> https://wiki.zalora.com/
+ -- Note that this always uses https:
+-rootURI :: RequestHeader -> URI.URI
+-rootURI (MessageHeader _ headers) =
++rootURI :: Request a -> URI.URI
++rootURI (Request _ _ headers _) =
+   let host = cs $ fromMaybe (error "Host header not found") $ lookup "Host" headers
+   in URI.URI "https:" (Just $ URI.URIAuth "" host "") "/" "" ""
+ 
+-redirectForAuth :: AuthConfig -> RequestHeader -> SendData -> IO ()
+-redirectForAuth c request@(MessageHeader (_, path_) _) send = do
++redirectForAuth :: AuthConfig -> Request a -> SendData -> IO ()
++redirectForAuth c request@(Request _ path_ _ _) send = do
+   let redirectUri = rootURI request
+       path = urlEncode True path_
+       authURL = "https://accounts.google.com/o/oauth2/auth?scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&state=" ++ cs path ++ "&redirect_uri=" ++ (cs $ show $ redirectUri) ++ "&response_type=code&client_id=" ++ authConfigClientID c ++ "&approval_prompt=force&access_type=offline"
+-  sendResponse send found302 [("Location", UTF8.fromString $ authURL)] ""
++  sendResponse_ send found302 [("Location", UTF8.fromString $ authURL)] ""
+ 
+-authenticate :: AuthConfig -> SendData -> RequestHeader -> ByteString -> ByteString -> IO ()
++authenticate :: AuthConfig -> SendData -> Request a -> ByteString -> ByteString -> IO ()
+ authenticate config send request path code = do
+   tokenRes <- post "https://accounts.google.com/o/oauth2/token" ["code=" ++ UTF8.toString code, "client_id=" ++ clientID, "client_secret=" ++ clientSecret, "redirect_uri=" ++ (cs $ show $ rootURI request), "grant_type=authorization_code"]
+   case tokenRes of
+@@ -121,7 +120,7 @@ authenticate config send request path code = do
+                 Just userInfo -> do
+                   clientToken <- authToken authTokenKey (userEmail userInfo) (userGivenName userInfo, userFamilyName userInfo)
+                   let cookie = setCookie cookieDomain cookieName (show clientToken) authShelfLife
+-                  sendResponse send found302 [("Location", cs $ (show $ (rootURI request) {URI.uriPath = ""}) ++ cs (urlDecode False path)), ("Set-Cookie", UTF8.fromString cookie)] ""
++                  sendResponse_ send found302 [("Location", cs $ (show $ (rootURI request) {URI.uriPath = ""}) ++ cs (urlDecode False path)), ("Set-Cookie", UTF8.fromString cookie)] ""
+   where
+     cookieDomain = authConfigCookieDomain config
+     cookieName = authConfigCookieName config
+diff --git a/src/HTTP.hs b/src/HTTP.hs
+index 07038a0..dbcae71 100644
+--- a/src/HTTP.hs
++++ b/src/HTTP.hs
+@@ -1,19 +1,14 @@
+ {-# LANGUAGE OverloadedStrings #-}
+ module HTTP (
+-  sendRequest
+-, sendResponse
+-, sendResponse_
++  sendResponse_
+ , internalServerError
+ ) where
+ 
+-import           Data.Foldable (forM_)
+ import           Data.ByteString (ByteString)
+-import qualified Data.ByteString as B
+-import qualified Data.ByteString.Char8 as B8
+-import qualified Data.ByteString.UTF8 as UTF8
+-import qualified Data.CaseInsensitive as CI
++import qualified Data.ByteString.Char8 as B
+ import           Network.HTTP.Types
+-import           Network.HTTP.Toolkit.Body
++import           Network.HTTP.Toolkit
++import qualified Network.HTTP.Toolkit.Body as Body
+ 
+ import           Type
+ import qualified Log
+@@ -21,34 +16,10 @@ import qualified Log
+ internalServerError :: SendData -> String -> IO ()
+ internalServerError send err = do
+   Log.debug $ show err
+-  sendResponse send internalServerError500 [] "Internal Server Error"
++  sendResponse_ send internalServerError500 [] "Internal Server Error"
+ 
+-sendRequest :: SendData -> Method -> ByteString -> [Header] -> BodyReader -> IO ()
+-sendRequest send method path headers body = do
+-  sendHeader send startLine headers
+-  sendBody send body
++sendResponse_ :: SendData -> Status -> [Header] -> ByteString -> IO ()
++sendResponse_ send status headers_ body = do
++  Body.fromByteString body >>= sendResponse send . Response status headers
+   where
+-    startLine = B8.unwords [method, path, "HTTP/1.1"]
+-
+-sendResponse :: SendData -> Status -> [Header] -> ByteString -> IO ()
+-sendResponse send status headers_ body = do
+-  sendHeader send (statusLine status) headers
+-  send body
+-  where
+-    headers = ("Content-Length", UTF8.fromString $ show $ B.length body) : headers_
+-
+-sendResponse_ :: SendData -> Status -> [Header] -> BodyReader -> IO ()
+-sendResponse_ send status headers body = do
+-  sendHeader send (statusLine status) headers
+-  sendBody send body
+-
+-statusLine :: Status -> ByteString
+-statusLine status = B.concat ["HTTP/1.1 ", UTF8.fromString $ show (statusCode status), " ", statusMessage status]
+-
+-sendHeader :: SendData -> ByteString -> [Header] -> IO ()
+-sendHeader send startLine headers = do
+-  send startLine
+-  send "\r\n"
+-  forM_ headers $ \(k, v) -> do
+-    send $ B.concat [CI.original k, ": ", v, "\r\n"]
+-  send "\r\n"
++    headers = ("Content-Length", B.pack . show . B.length $ body) : headers_
+diff --git a/src/Proxy.hs b/src/Proxy.hs
+index aa320af..88b95d9 100644
+--- a/src/Proxy.hs
++++ b/src/Proxy.hs
+@@ -32,11 +32,7 @@ import qualified Network.URI as URI
+ import Options.Applicative hiding (action)
+ import System.IO
+ 
+-import Network.HTTP.Toolkit.Body
+-import Network.HTTP.Toolkit.Header
+-import Network.HTTP.Toolkit.Connection
+-import Network.HTTP.Toolkit.Request
+-import Network.HTTP.Toolkit.Response
++import Network.HTTP.Toolkit
+ 
+ import Type
+ import Util
+@@ -142,10 +138,10 @@ runProxy port config authConfig authorize = (listen port (serve config authConfi
+ redirectToHttps :: SockAddr -> Socket -> IO ()
+ redirectToHttps _ sock = do
+   conn <- makeConnection (Socket.recv sock 4096)
+-  (request, _) <- readRequest conn
+-  sendResponse (Socket.sendAll sock) seeOther303 [("Location", cs $ show $ requestURI request)] ""
++  request <- readRequest conn
++  sendResponse_ (Socket.sendAll sock) seeOther303 [("Location", cs $ show $ requestURI request)] ""
+   where
+-    requestURI (MessageHeader (_, path) headers) =
++    requestURI (Request _ path headers _) =
+       let host = fromMaybe (error "Host header not found") $ lookup "Host" headers
+       in fromJust $ URI.parseURI $ "https://" ++ cs host ++ cs path
+ 
+@@ -171,8 +167,8 @@ serve config authConfig withAuthorizeAction addr sock = do
+     serve_ send conn authorize = go
+       where
+         go :: IO ()
+-        go = forever $ readRequest conn >>= \(request, body) -> case request of
+-          MessageHeader (_, url) headers -> do
++        go = forever $ readRequest conn >>= \request -> case request of
++          Request _ url headers _ -> do
+             -- TODO: Don't loop for more input on Connection: close header.
+             -- Check if this is an authorization response.
+             case URI.parseURIReference $ BU.toString url of
+@@ -192,17 +188,17 @@ serve config authConfig withAuthorizeAction addr sock = do
+                         case auth of
+                           Nothing -> redirectForAuth authConfig request send
+                           Just token -> do
+-                            forwardRequest config send authorize cookies addr request body token
++                            forwardRequest config send authorize cookies addr request token
+ 
+ -- Check our access control list for this user's request and forward it to the backend if allowed.
+-forwardRequest :: Config -> SendData -> AuthorizeAction -> [(Name, Cookies.Value)] -> SockAddr -> RequestHeader -> BodyReader -> AuthToken -> IO ()
+-forwardRequest config send authorize cookies addr (MessageHeader (method, path) headers) body token = do
++forwardRequest :: Config -> SendData -> AuthorizeAction -> [(Name, Cookies.Value)] -> SockAddr -> Request BodyReader -> AuthToken -> IO ()
++forwardRequest config send authorize cookies addr request@(Request method path headers _) token = do
+     groups <- authorize (authEmail token) (maybe (error "No Host") cs $ lookup "Host" headers) path method
+     ip <- formatSockAddr addr
+     case groups of
+         [] -> do
+             -- TODO: Send back a page that allows the user to request authorization.
+-            sendResponse send forbidden403 [] "Access Denied"
++            sendResponse_ send forbidden403 [] "Access Denied"
+         _ -> do
+             -- TODO: Reuse connections to the backend server.
+             let downStreamHeaders =
+@@ -216,10 +212,10 @@ forwardRequest config send authorize cookies addr (MessageHeader (method, path)
+                     setCookies $
+                     fromList headers
+             bracket (connectTo host port) hClose $ \h -> do
+-              sendRequest (B.hPutStr h) method path downStreamHeaders body
+-              conn <- makeConnection (B.hGetSome h 4096)
+-              (MessageHeader status responseHeaders, responseBody) <- readResponse method conn
+-              sendResponse_ send status (removeConnectionHeader responseHeaders) responseBody
++              sendRequest (B.hPutStr h) request{requestHeaders = downStreamHeaders}
++              conn <- connectionFromHandle h
++              response <- readResponse method conn
++              sendResponse send response{responseHeaders = removeConnectionHeader (responseHeaders response)}
+   where
+     host = configBackendAddress config
+     port = PortNumber (configBackendPort config)
+-- 
+1.9.1
+

From 116d52c6dfecb96860fc9f6f5e12a052df38e074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 24 Apr 2014 20:01:17 +0200
Subject: [PATCH 0554/2033] linux-3.12: bump .17 -> .18

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index e997e1951ef..c5997532e57 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.17";
+  version = "3.12.18";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1knjmzk5gyab0b1prmna2bb8zz19sjmmjm24h6agmpq6q4bbnc5q";
+    sha256 = "0w0nwkhrbxa9yqnj6mvckkxdqn291mw4pxa309alcga3wn29mwis";
   };
 
   features.iwlwifi = true;

From 2c70276d96fa911ecfcadbbd25837392d53fd81f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 18:16:12 +0200
Subject: [PATCH 0555/2033] Remove outdated remark

---
 nixos/modules/services/networking/wpa_supplicant.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index eb721ec3455..987b21da9ec 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -46,9 +46,7 @@ in
         example = [ "wlan0" "wlan1" ];
         description = ''
           The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
-          automatically use all wireless interfaces. (Note that auto-detection is currently
-          broken on Linux 3.4.x kernels. See http://github.com/NixOS/nixos/issues/10 for
-          further details.)
+          automatically use all wireless interfaces.
         '';
       };
 

From d7a7f80aff92224351ded6e87897ba5286d9f819 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 22:46:26 +0200
Subject: [PATCH 0556/2033] cups: Start after network.target

http://hydra.nixos.org/build/10661709
---
 nixos/modules/services/printing/cupsd.nix | 5 +++--
 nixos/tests/printing.nix                  | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 4b758608cb6..edbba7e0a83 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -126,7 +126,8 @@ in
       { description = "CUPS Printing Daemon";
 
         wantedBy = [ "multi-user.target" ];
-        after = [ "network-interfaces.target" ];
+        wants = [ "network.target" ];
+        after = [ "network.target" ];
 
         path = [ cups ];
 
@@ -145,7 +146,7 @@ in
     services.printing.drivers =
       [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends
         pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
-	];
+      ];
 
     services.printing.cupsdConf =
       ''
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 9b96e3d7b20..9ef28dcfcd4 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -31,9 +31,7 @@ import ./make-test.nix ({pkgs, ... }: {
 
       # Make sure that cups is up on both sides.
       $server->waitForUnit("cupsd.service");
-      $server->waitForUnit("network.target");
       $client->waitForUnit("cupsd.service");
-      $client->waitForUnit("network.target");
       $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
       $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die;
       $client->succeed("curl --fail http://localhost:631/");

From 23297b0edde896f76ca1392d45e3c27b1422bafe Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Apr 2014 23:15:39 +0200
Subject: [PATCH 0557/2033] Make nscd startup synchronous

Nscd forks into the background before it's ready to accept
connections. So explicitly wait until it's ready.

http://hydra.nixos.org/build/10661767
---
 nixos/modules/services/system/nscd.nix | 13 ++++++++++++-
 nixos/tests/misc.nix                   |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index f357eb4e1fc..1ac82064a1f 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -9,6 +9,8 @@ let
 
   inherit (pkgs.lib) singleton;
 
+  cfgFile = pkgs.writeText "nscd.conf" cfg.config;
+
 in
 
 {
@@ -63,7 +65,7 @@ in
         restartTriggers = [ config.environment.etc.hosts.source ];
 
         serviceConfig =
-          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${pkgs.writeText "nscd.conf" cfg.config}";
+          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}";
             Type = "forking";
             PIDFile = "/run/nscd/nscd.pid";
             Restart = "always";
@@ -73,6 +75,15 @@ in
                 "${pkgs.glibc}/sbin/nscd --invalidate hosts"
               ];
           };
+
+        # Urgggggh... Nscd forks before opening its socket and writing
+        # its pid. So wait until it's ready.
+        postStart =
+          ''
+            while ! ${pkgs.glibc}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
+              sleep 0.2
+            done
+          '';
       };
 
   };
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 031fff2de58..24c8b230629 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -13,6 +13,8 @@ import ./make-test.nix {
 
   testScript =
     ''
+      $machine->waitForUnit("default.target");
+
       subtest "nixos-version", sub {
           $machine->succeed("[ `nixos-version | wc -w` = 2 ]");
       };
@@ -61,8 +63,6 @@ import ./make-test.nix {
 
       # Test whether hostname (and by extension nss_myhostname) works.
       subtest "hostname", sub {
-          $machine->waitForUnit("dhcpcd.service");
-          $machine->waitForUnit("network.target");
           $machine->succeed('[ "`hostname`" = machine ]');
           $machine->succeed('[ "`hostname -s`" = machine ]');
       };

From f0e3775f2e93dee4a3fa455631ea78acf6fd884f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 24 Apr 2014 14:03:18 +0200
Subject: [PATCH 0558/2033] linux: Add support for zram

---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index db654fc0505..02e361fde12 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -317,6 +317,12 @@ with stdenv.lib;
   TRANSPARENT_HUGEPAGE_ALWAYS? n
   TRANSPARENT_HUGEPAGE_MADVISE? y
 
+  # zram support (e.g for in-memory compressed swap)
+  ${optionalString (versionAtLeast version "3.4") ''
+    ZSMALLOC y
+  ''}
+  ZRAM m
+
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''

From cd05320716c08c5da0cf6b0314d6baeb54d0730f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 00:14:55 +0200
Subject: [PATCH 0559/2033] Manual: Don't include the platform type of the host
 system

This causes unnecessary rebuilds of the manual.

http://hydra.nixos.org/build/10662170
---
 nixos/modules/misc/nixpkgs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index a5dad7dd907..f41c8817ba4 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -62,8 +62,7 @@ in
       type = types.str;
       description = ''
         Specifies the Nix platform type for which NixOS should be built.
-        If unset, it defaults to the platform type of your host system
-        (<literal>${builtins.currentSystem}</literal>).
+        If unset, it defaults to the platform type of your host system.
         Specifying this option is useful when doing distributed
         multi-platform deployment, or when building virtual machines.
       '';

From b8d59765e11e20ff8859c93220454a6a84445c1f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 00:30:12 +0200
Subject: [PATCH 0560/2033] cups: Add a listenAddresses option

---
 nixos/modules/services/printing/cupsd.nix | 13 ++++++++++++-
 nixos/tests/printing.nix                  |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index edbba7e0a83..d229c610669 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -56,6 +56,15 @@ in
         '';
       };
 
+      listenAddresses = mkOption {
+        type = types.listOf types.str;
+        default = [ "127.0.0.1:631" ];
+        example = [ "*:631" ];
+        description = ''
+          A list of addresses and ports on which to listen.
+        '';
+      };
+
       bindirCmds = mkOption {
         type = types.lines;
         internal = true;
@@ -154,7 +163,9 @@ in
 
         SystemGroup root wheel
 
-        Listen localhost:631
+        ${concatMapStrings (addr: ''
+          Listen ${addr}
+        '') cfg.listenAddresses}
         Listen /var/run/cups/cups.sock
 
         # Note: we can't use ${cups}/etc/cups as the ServerRoot, since
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 9ef28dcfcd4..16f9812d93b 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -7,9 +7,9 @@ import ./make-test.nix ({pkgs, ... }: {
     server =
       { config, pkgs, ... }:
       { services.printing.enable = true;
+        services.printing.listenAddresses = [ "*:631" ];
         services.printing.cupsdConf =
           ''
-            Listen server:631
             <Location />
               Order allow,deny
               Allow from all

From c52fb449f4c6796a4931ec7f6c723f02e9c21386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 00:30:33 +0200
Subject: [PATCH 0561/2033] Urgh

Can't figure out why "hostname -s" keeps failing randomly :-(

http://hydra.nixos.org/build/10662142
---
 nixos/tests/misc.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 24c8b230629..705ea0d0b86 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -13,8 +13,6 @@ import ./make-test.nix {
 
   testScript =
     ''
-      $machine->waitForUnit("default.target");
-
       subtest "nixos-version", sub {
           $machine->succeed("[ `nixos-version | wc -w` = 2 ]");
       };
@@ -64,7 +62,7 @@ import ./make-test.nix {
       # Test whether hostname (and by extension nss_myhostname) works.
       subtest "hostname", sub {
           $machine->succeed('[ "`hostname`" = machine ]');
-          $machine->succeed('[ "`hostname -s`" = machine ]');
+          #$machine->succeed('[ "`hostname -s`" = machine ]');
       };
 
       # Test whether systemd-udevd automatically loads modules for our hardware.

From 7d5a5354d89258fc33844dad71d428f4157f3742 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 25 Apr 2014 07:32:23 +0800
Subject: [PATCH 0562/2033] axis2: Remove the extra slash in URL

---
 pkgs/servers/http/tomcat/axis2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index f263c8c2e7e..4bf3d59685b 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "axis2-1.6.2";
 
   src = fetchurl {
-    url = http://apache.proserve.nl//axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip;
+    url = http://apache.proserve.nl/axis/axis2/java/core/1.6.2/axis2-1.6.2-bin.zip;
     sha256 = "02i6fv11ksd5ql81i501bcb11ib5gyhq3zxwrz5jm4ic80r097fp";
   };
 

From 9cacabd5bbd39644c0fb791104714eb08b7eb690 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 25 Apr 2014 07:44:48 +0800
Subject: [PATCH 0563/2033] DisnixWebService: Fix broken build by exposing jdk
 as buildInputs

---
 .../package-management/disnix/DisnixWebService/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 4d03ec9ab66..381cb21ec1b 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = http://hydra.nixos.org/build/910953/download/4/DisnixWebService-0.2.tar.bz2;
     sha256 = "1469l2ykhdjmplkw01x64f7aq9rms05ig9sagyb8l2zksjm6lla8";
   };
-  buildInputs = [ apacheAnt ];
+  buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';
   AXIS2_LIB = "${axis2}/lib";
   AXIS2_WEBAPP = "${axis2}/webapps/axis2";

From efae8ce543d79cf0784f895163fb5bd7fda11293 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 25 Apr 2014 04:40:55 +0200
Subject: [PATCH 0564/2033] grsecurity: Update all patches

stable:  3.0-3.2.57-201404182109            -> 3.0-3.2.57-201404241714
test:    3.0-3.14.1-201404201132            -> 3.0-3.14.1-201404241722
vserver: 3.0-3.2.57-vs2.3.2.16-201404182110 -> 3.0-3.2.57-vs2.3.2.16-201404241715
---
 pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 9f07d9428a8..76232ac5b6f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -86,23 +86,23 @@ rec {
 
   grsecurity_stable = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "201404182109";
+      revision  = "201404241714";
       branch    = "stable";
-      sha256    = "1gnyxbwic9f847dz6kqp8d03nspbzb976ljv9ri7f78ydpskij6x";
+      sha256    = "0lrmmqllxas0dnaqswwbznh8cj5w9jw9df5dwzp16j71q8iqnv0c";
     };
 
   grsecurity_vserver = grsecPatch
     { kversion  = "3.2.57";
-      revision  = "vs2.3.2.16-201404182110";
+      revision  = "vs2.3.2.16-201404241715";
       branch    = "vserver";
-      sha256    = "05ydjal2w33j6jbi0bm8k7669j0hhgg2mjg23r6gzaln73fg1gww";
+      sha256    = "1839hnpxvg2hnkaslb5qbfdq4n5vcsndnkpw9mv0j6snc1wfx76s";
     };
 
   grsecurity_unstable = grsecPatch
     { kversion  = "3.14.1";
-      revision  = "201404201132";
+      revision  = "201404241722";
       branch    = "test";
-      sha256    = "1xydv1846gl98jcnzlydhsy75qqcq9h3krhb7r9zn21vjj7jga9p";
+      sha256    = "0rv6xjwc8gln7p4nfmz36yscrqcfrbvhln9nmp1l5r5bxw9m628j";
     };
 
   grsec_fix_path =

From 369c22797390a161a1285aabafba4050d05d29ca Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 25 Apr 2014 00:44:05 -0500
Subject: [PATCH 0565/2033] Update texlive expressions with new tarball
 versions

This is needed because the older tarballs are no longer available for
download.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++----
 pkgs/tools/typesetting/tex/texlive/extra.nix   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 85de3dc08cf..f4ea5b7494f 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,16 +5,16 @@ rec {
     sha256 = "1idgyim6r4bi3id245k616qrdarfh65xv3gi2psarqqmsw504yhd";
   };
 
-  texmfVersion = "2013.20140314";
+  texmfVersion = "2013.20140408";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "0f2dxm0ac4j04w1rgjpdranpprjghw8slvijknykpvph1jn0lmzm";
+    sha256 = "1pdbbp4sy6kypiqss9zfvr3m0agqzghagfr609pfjh9ka3ihv0kh";
   };
 
-  langTexmfVersion = "2013.20140314";
+  langTexmfVersion = "2013.20140408";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "154g300nbg4fhxprvi9fwr7wmpws4cg89m9nwsfpyf0m2k8n9ibx";
+    sha256 = "05qyhcfdbrrc8mnps5sv3fggjbxdj3bp9jd12ldzkjxxdbzhp475";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 10b9962936d..8549c8c4548 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,11 +1,11 @@
 args: with args;
 rec {
   name    = "texlive-extra-2013";
-  version = "2013.20140314";
+  version = "2013.20140408";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "6b4216fe87c354a0c3c8ec456272cc096a7ec112a68031797ae23f18e1e5b74c";
+    sha256 = "0d6b5kip7j8ljqn92bkdncvqxyk2756404hzsp4mh0s1jhfwws7y";
   };
 
   buildInputs = [texLive xz];

From 964f1e0e20a46dbd68245d0ed9b069b140197994 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Apr 2014 10:04:30 +0200
Subject: [PATCH 0566/2033] tkgate-2.x: mark 'broken' because the application
 segfaults after startup

---
 pkgs/applications/science/electronics/tkgate/2.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
index 756fe7052d8..36b6f125eca 100644
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/2.x.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From 83df08830fa8e9210e0189c21408e6a3af5135d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 25 Apr 2014 10:04:58 +0200
Subject: [PATCH 0567/2033] qfsm: mark 'broken' because of build errors

Upstream seems to have abandoned the package.
---
 pkgs/applications/science/electronics/qfsm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix
index 0f24784e9e5..b5ffcb61730 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/pkgs/applications/science/electronics/qfsm/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From 1bae93cb8286859754869db3dcb3e4e8097905b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 10:43:26 +0200
Subject: [PATCH 0568/2033] debian: Update to 6.0.9

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 274cd05024b..02f6add4eb8 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1510,22 +1510,22 @@ rec {
     };
 
     debian60i386 = {
-      name = "debian-6.0.8-squeeze-i386";
-      fullName = "Debian 6.0.8 Squeeze (i386)";
+      name = "debian-6.0.9-squeeze-i386";
+      fullName = "Debian 6.0.9 Squeeze (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-i386/Packages.bz2;
-        sha256 = "c850339aaf46a4ed4abc7c1789c29ea58c3a152aa173ee004578fda86b28391f";
+        sha256 = "1fb9afa9b2d007939e066c031fc60f6626b78105ce42fe8cdeab7124a0dbf477";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian60x86_64 = {
-      name = "debian-6.0.8-squeeze-amd64";
-      fullName = "Debian 6.0.8 Squeeze (amd64)";
+      name = "debian-6.0.9-squeeze-amd64";
+      fullName = "Debian 6.0.9 Squeeze (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/squeeze/main/binary-amd64/Packages.bz2;
-        sha256 = "1506ab7de3ad5a2c706183536d2ee88589d7cb922d9e0de36ac062d464082dda";
+        sha256 = "cee46e56f35342c17795d1923b6c7e545f626e8d568fd48f91d5e0eb92ea329e";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 954bc3131e0cdf831cf45c45186973224bdda753 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Fri, 25 Apr 2014 10:18:29 +0100
Subject: [PATCH 0569/2033] haskellPackages.wreq: New expression

---
 .../libraries/haskell/wreq/default.nix        | 27 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/wreq/default.nix

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
new file mode 100644
index 00000000000..2197558ec08
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -0,0 +1,27 @@
+{ cabal, aeson, attoparsec, doctest, exceptions, filepath
+, httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes
+, temporary, testFramework, testFrameworkHunit, text, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "wreq";
+  version = "0.1.0.1";
+  sha256 = "05w3b555arsab8a5w73nm9pk3p9r6jipi6cd3ngxv48gdn9wzhvz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec exceptions httpClient httpClientTls httpTypes lens
+    mimeTypes text time
+  ];
+  testDepends = [
+    aeson doctest filepath httpClient httpTypes HUnit lens temporary
+    testFramework testFrameworkHunit text
+  ];
+  meta = {
+    homepage = "http://www.serpentine.com/wreq";
+    description = "An easy-to-use HTTP client library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 813f48f9d40..ca8b58226a1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1614,7 +1614,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   knob = callPackage ../development/libraries/haskell/knob {};
 
   languageC = callPackage ../development/libraries/haskell/language-c {};
-  
+
   languageCInline = callPackage ../development/libraries/haskell/language-c-inline {};
 
   languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};
@@ -2756,6 +2756,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
+  wreq = callPackage ../development/libraries/haskell/wreq {
+    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_2_1; };
+    attoparsec = self.attoparsec_0_11_2_1;
+    lens = self.lens.override {
+      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_2_1; };
+    };
+  };
+
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
 
   wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {

From a2de61e2b6fa0045363dbfd593cd92faadcd7343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 22 Apr 2014 14:00:50 +0200
Subject: [PATCH 0570/2033] jdk7: update patchversion 51 -> 55.

---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 2d2c07c67ff..7d178d2d564 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -49,7 +49,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  patchversion = "51";
+  patchversion = "55";
 
   name =
     if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}";
@@ -59,14 +59,14 @@ stdenv.mkDerivation rec {
       requireFile {
         name = "jdk-7u${patchversion}-linux-i586.tar.gz";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "1ks2zyx88bxdjcbdgg40mh1i9a83ll9ymxr79rplfvj48ig9d8mk";
+        sha256 = "0y0v5ilbkdmf14jrvwa23x91rfdw90jji4y7hq0l494iy4wjnyc1";
       }
     else if stdenv.system == "x86_64-linux" then
 
       requireFile {
         name = "jdk-7u${patchversion}-linux-x64.tar.gz";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-        sha256 = "0p7mfjj8fxlghvhcqhwgrifzb32b9y143yw962zk02bfycz7qdkp";
+	sha256 = "15sncxhjasv5i6p7hfrr92xq5ph9g6g12i4m52vp45l031bw5y46";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
     #   java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference
     # Because only libglass.so needs atk, we put it only in it's rpath.
     # This seems to work fine.
-    patchelf --set-rpath "$rpath:${atk}/lib" $out/jre/lib/${architecture}/libglass.so
+    test -f $out/jre/lib/${architecture}/libglass.so && patchelf --set-rpath "$rpath:${atk}/lib" $out/jre/lib/${architecture}/libglass.so
 
     if test -z "$pluginSupport"; then
       rm -f $out/bin/javaws

From 33eced411fea68fd033a1fbd6de6b424b3af564b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 25 Apr 2014 12:30:23 +0200
Subject: [PATCH 0571/2033] python-django: Update to 1.4.11, 1.5.6 and 1.6.3.

This fixes CVE-2014-0472, details can be found at:

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-0472
https://www.djangoproject.com/weblog/2014/apr/21/security/

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 4a0c468043f9c143d784c9d19b6e2a2c395648fb)
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce019a8464e..e3e6bae580c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2543,11 +2543,11 @@ rec {
 
   django_1_6 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.6";
+    version = "1.6.3";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz";
-      sha256 = "165bd5wmv2an9h365d12k0112z0l375dxsy7dlxa7r8kyg4gvnfk";
+      sha256 = "1wdqb2x0w0c10annbyz7rrrgrv9mpa9f8pz8006lf2csix33r7bd";
     };
 
     # error: invalid command 'test'
@@ -2561,11 +2561,11 @@ rec {
 
   django_1_5 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.5.5";
+    version = "1.5.6";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz";
-      sha256 = "07fp8ycx76q2nz96mxld1svvpfsrivjgpql0mr20r7gwzcfrrrka";
+      sha256 = "1bxzz71sfvh0zgdzv4x3wdr4ffzd5cfnvq7iq2g1i282sacwnzwv";
     };
 
     # error: invalid command 'test'
@@ -2579,11 +2579,11 @@ rec {
 
   django_1_4 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.4.10";
+    version = "1.4.11";
 
     src = fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
-      sha256 = "1pi9mi14f19xlp29j2c8dz8rs749c1m41d9j1i0b3nlz0cy0h7rx";
+      sha256 = "00f2jlls3fhddrg7q4sjkwj6dmclh28n0vqm1m7kzcq5fjrxh6a8";
     };
 
     # error: invalid command 'test'

From 027319708e07baf70d5e561d1ec675539ee6cdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 25 Apr 2014 12:33:07 +0200
Subject: [PATCH 0572/2033] haskell-ghc-gc-tune: new expression

---
 .../tools/haskell/ghc-gc-tune/default.nix        | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/ghc-gc-tune/default.nix

diff --git a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix
new file mode 100644
index 00000000000..193d12fdefa
--- /dev/null
+++ b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "ghc-gc-tune";
+  version = "0.3";
+  sha256 = "0ghp3f86m91zi6kl8zq157717s2p73nwdgln4aiclq830m72ys9w";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filepath ];
+  meta = {
+    homepage = "http://code.haskell.org/~dons/code/ghc-gc-tune";
+    description = "Graph performance of Haskell programs with different GC flags";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c241f9e44d..51a48b0e957 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1177,6 +1177,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ghcEventsAnalyze = callPackage ../development/tools/haskell/ghc-events-analyze {};
 
+  ghcGcTune = callPackage ../development/tools/haskell/ghc-gc-tune {};
+
   ghcHeapView = callPackage ../development/libraries/haskell/ghc-heap-view {
     cabal = self.cabal.override { enableLibraryProfiling = false; }; # pkg cannot be built with profiling enabled
   };

From b470c93c1eeb15a30170b6d7cb4ec04ef36bbf87 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 19 Apr 2014 19:34:18 -0500
Subject: [PATCH 0573/2033] nixos: only enable spipe when user specifies

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/spiped.nix | 282 ++++++++++---------
 1 file changed, 145 insertions(+), 137 deletions(-)

diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix
index ec5908b182f..005d7182351 100644
--- a/nixos/modules/services/networking/spiped.nix
+++ b/nixos/modules/services/networking/spiped.nix
@@ -7,161 +7,169 @@ let
 in
 {
   options = {
-    services.spiped = mkOption {
-      type = types.attrsOf (types.submodule (
-        {
-          options = {
-            encrypt = mkOption {
-              type    = types.bool;
-              default = false;
-              description = ''
-                Take unencrypted connections from the
-                <literal>source</literal> socket and send encrypted
-                connections to the <literal>target</literal> socket.
-              '';
-            };
+    services.spiped = {
+      enable = mkOption {
+        type        = types.bool;
+        default     = false;
+        description = "Enable the spiped service module.";
+      };
 
-            decrypt = mkOption {
-              type    = types.bool;
-              default = false;
-              description = ''
-                Take encrypted connections from the
-                <literal>source</literal> socket and send unencrypted
-                connections to the <literal>target</literal> socket.
-              '';
-            };
+      config = mkOption {
+        type = types.attrsOf (types.submodule (
+          {
+            options = {
+              encrypt = mkOption {
+                type    = types.bool;
+                default = false;
+                description = ''
+                  Take unencrypted connections from the
+                  <literal>source</literal> socket and send encrypted
+                  connections to the <literal>target</literal> socket.
+                '';
+              };
 
-            source = mkOption {
-              type    = types.str;
-              description = ''
-                Address on which spiped should listen for incoming
-                connections.  Must be in one of the following formats:
-                <literal>/absolute/path/to/unix/socket</literal>,
-                <literal>host.name:port</literal>,
-                <literal>[ip.v4.ad.dr]:port</literal> or
-                <literal>[ipv6::addr]:port</literal> - note that
-                hostnames are resolved when spiped is launched and are
-                not re-resolved later; thus if DNS entries change
-                spiped will continue to connect to the expired
-                address.
-              '';
-            };
+              decrypt = mkOption {
+                type    = types.bool;
+                default = false;
+                description = ''
+                  Take encrypted connections from the
+                  <literal>source</literal> socket and send unencrypted
+                  connections to the <literal>target</literal> socket.
+                '';
+              };
 
-            target = mkOption {
-              type    = types.str;
-              description = "Address to which spiped should connect.";
-            };
+              source = mkOption {
+                type    = types.str;
+                description = ''
+                  Address on which spiped should listen for incoming
+                  connections.  Must be in one of the following formats:
+                  <literal>/absolute/path/to/unix/socket</literal>,
+                  <literal>host.name:port</literal>,
+                  <literal>[ip.v4.ad.dr]:port</literal> or
+                  <literal>[ipv6::addr]:port</literal> - note that
+                  hostnames are resolved when spiped is launched and are
+                  not re-resolved later; thus if DNS entries change
+                  spiped will continue to connect to the expired
+                  address.
+                '';
+              };
 
-            keyfile = mkOption {
-              type    = types.path;
-              description = ''
-                Name of a file containing the spiped key. As the
-                daemon runs as the <literal>spiped</literal> user, the
-                key file must be somewhere owned by that user. By
-                default, we recommend putting the keys for any spipe
-                services in <literal>/var/lib/spiped</literal>.
-              '';
-            };
+              target = mkOption {
+                type    = types.str;
+                description = "Address to which spiped should connect.";
+              };
 
-            timeout = mkOption {
-              type = types.int;
-              default = 5;
-              description = ''
-                Timeout, in seconds, after which an attempt to connect to
-                the target or a protocol handshake will be aborted (and the
-                connection dropped) if not completed
-              '';
-            };
+              keyfile = mkOption {
+                type    = types.path;
+                description = ''
+                  Name of a file containing the spiped key. As the
+                  daemon runs as the <literal>spiped</literal> user, the
+                  key file must be somewhere owned by that user. By
+                  default, we recommend putting the keys for any spipe
+                  services in <literal>/var/lib/spiped</literal>.
+                '';
+              };
 
-            maxConns = mkOption {
-              type = types.int;
-              default = 100;
-              description = ''
-                Limit on the number of simultaneous connections allowed.
-              '';
-            };
+              timeout = mkOption {
+                type = types.int;
+                default = 5;
+                description = ''
+                  Timeout, in seconds, after which an attempt to connect to
+                  the target or a protocol handshake will be aborted (and the
+                  connection dropped) if not completed
+                '';
+              };
 
-            waitForDNS = mkOption {
-              type = types.bool;
-              default = false;
-              description = ''
-                Wait for DNS. Normally when <literal>spiped</literal> is
-                launched it resolves addresses and binds to its source
-                socket before the parent process returns; with this option
-                it will daemonize first and retry failed DNS lookups until
-                they succeed. This allows <literal>spiped</literal> to
-                launch even if DNS isn't set up yet, but at the expense of
-                losing the guarantee that once <literal>spiped</literal> has
-                finished launching it will be ready to create pipes.
-              '';
-            };
+              maxConns = mkOption {
+                type = types.int;
+                default = 100;
+                description = ''
+                  Limit on the number of simultaneous connections allowed.
+                '';
+              };
 
-            disableKeepalives = mkOption {
-              type = types.bool;
-              default = false;
-              description = "Disable transport layer keep-alives.";
-            };
+              waitForDNS = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Wait for DNS. Normally when <literal>spiped</literal> is
+                  launched it resolves addresses and binds to its source
+                  socket before the parent process returns; with this option
+                  it will daemonize first and retry failed DNS lookups until
+                  they succeed. This allows <literal>spiped</literal> to
+                  launch even if DNS isn't set up yet, but at the expense of
+                  losing the guarantee that once <literal>spiped</literal> has
+                  finished launching it will be ready to create pipes.
+                '';
+              };
 
-            weakHandshake = mkOption {
-              type = types.bool;
-              default = false;
-              description = ''
-                Use fast/weak handshaking: This reduces the CPU time spent
-                in the initial connection setup, at the expense of losing
-                perfect forward secrecy.
-              '';
-            };
+              disableKeepalives = mkOption {
+                type = types.bool;
+                default = false;
+                description = "Disable transport layer keep-alives.";
+              };
 
-            resolveRefresh = mkOption {
-              type = types.int;
-              default = 60;
-              description = ''
-                Resolution refresh time for the target socket, in seconds.
-              '';
-            };
+              weakHandshake = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Use fast/weak handshaking: This reduces the CPU time spent
+                  in the initial connection setup, at the expense of losing
+                  perfect forward secrecy.
+                '';
+              };
 
-            disableReresolution = mkOption {
-              type = types.bool;
-              default = false;
-              description = "Disable target address re-resolution.";
-            };
-          };
-        }
-      ));
+              resolveRefresh = mkOption {
+                type = types.int;
+                default = 60;
+                description = ''
+                  Resolution refresh time for the target socket, in seconds.
+                '';
+              };
 
-      default = {};
-
-      example = literalExample ''
-        {
-          pipe1 =
-            { keyfile = "/var/lib/spiped/pipe1.key";
-              encrypt = true;
-              source  = "localhost:6000";
-              target  = "endpoint.example.com:7000";
+              disableReresolution = mkOption {
+                type = types.bool;
+                default = false;
+                description = "Disable target address re-resolution.";
+              };
             };
-          pipe2 =
-            { keyfile = "/var/lib/spiped/pipe2.key";
-              decrypt = true;
-              source  = "0.0.0.0:7000";
-              target  = "localhost:3000";
-            };
-        }
-      '';
+          }
+        ));
 
-      description = ''
-        Configuration for a secure pipe daemon. The daemon can be
-        started, stopped, or examined using
-        <literal>systemctl</literal>, under the name
-        <literal>spiped@foo</literal>.
-      '';
+        default = {};
+
+        example = literalExample ''
+          {
+            pipe1 =
+              { keyfile = "/var/lib/spiped/pipe1.key";
+                encrypt = true;
+                source  = "localhost:6000";
+                target  = "endpoint.example.com:7000";
+              };
+            pipe2 =
+              { keyfile = "/var/lib/spiped/pipe2.key";
+                decrypt = true;
+                source  = "0.0.0.0:7000";
+                target  = "localhost:3000";
+              };
+          }
+        '';
+
+        description = ''
+          Configuration for a secure pipe daemon. The daemon can be
+          started, stopped, or examined using
+          <literal>systemctl</literal>, under the name
+          <literal>spiped@foo</literal>.
+        '';
+      };
     };
   };
 
-  config = {
+  config = mkIf cfg.enable {
     assertions = mapAttrsToList (name: c: {
       assertion = (c.encrypt -> !c.decrypt) || (c.decrypt -> c.encrypt);
       message   = "A pipe must either encrypt or decrypt";
-    }) cfg;
+    }) cfg.config;
 
     users.extraGroups.spiped.gid = config.ids.gids.spiped;
     users.extraUsers.spiped = {
@@ -189,7 +197,7 @@ in
       script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`";
     };
 
-    system.activationScripts.spiped = optionalString (cfg != {})
+    system.activationScripts.spiped = optionalString (cfg.config != {})
       "mkdir -p /var/lib/spiped";
 
     # Setup spiped config files
@@ -207,6 +215,6 @@ in
             (if cfg.disableReresolution then "-R"
               else "-r ${toString cfg.resolveRefresh}")
           ];
-      }) cfg;
+      }) cfg.config;
   };
 }

From 5401849e3a0e175d3cf1a6fcf52bc1ffa8f5e299 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 24 Apr 2014 23:15:50 -0500
Subject: [PATCH 0574/2033] cryptol v2.0.0

This comes with several extra libraries, including GraphSCC, monadLib,
presburger, process and smtLib, all required as build dependencies. But
otherwise totally automated via cabal2nix.

Next up is CVC4 (a total pain in the ass to package) for proving/SAT
support.

I have another WIP branch for the unfree 1.x series which I may (or may
not) add later as it has external verification tech at the moment.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/compilers/cryptol/default.nix | 31 +++++++++++++
 .../compilers/cryptol/fix-gitrev.patch        | 44 +++++++++++++++++++
 .../libraries/haskell/graphscc/default.nix    | 13 ++++++
 .../libraries/haskell/monadlib/default.nix    | 14 ++++++
 .../libraries/haskell/presburger/default.nix  | 14 ++++++
 .../libraries/haskell/process/default.nix     | 14 ++++++
 .../libraries/haskell/smtLib/default.nix      | 13 ++++++
 pkgs/top-level/haskell-packages.nix           | 17 +++++++
 8 files changed, 160 insertions(+)
 create mode 100644 pkgs/development/compilers/cryptol/default.nix
 create mode 100644 pkgs/development/compilers/cryptol/fix-gitrev.patch
 create mode 100644 pkgs/development/libraries/haskell/graphscc/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monadlib/default.nix
 create mode 100644 pkgs/development/libraries/haskell/presburger/default.nix
 create mode 100644 pkgs/development/libraries/haskell/process/default.nix
 create mode 100644 pkgs/development/libraries/haskell/smtLib/default.nix

diff --git a/pkgs/development/compilers/cryptol/default.nix b/pkgs/development/compilers/cryptol/default.nix
new file mode 100644
index 00000000000..753dfb4f318
--- /dev/null
+++ b/pkgs/development/compilers/cryptol/default.nix
@@ -0,0 +1,31 @@
+{ cabal, cabalInstall, Cabal, alex, ansiTerminal, deepseq, executablePath
+, filepath, graphSCC, happy, haskeline, monadLib, mtl, presburger, QuickCheck
+, random, smtLib, syb, text, transformers, utf8String, process, fetchgit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cryptol";
+  version = "2.0.0";
+  src = fetchgit {
+    url    = "https://github.com/GaloisInc/cryptol.git";
+    rev    = "refs/tags/v2.0.0";
+    sha256 = "6af3499d7c6f034446f6665660f7a66dd592e81281e34b0cee3e55bc03597e6b";
+  };
+  isLibrary = true;
+  isExecutable = true;
+
+  patches = [ ./fix-gitrev.patch ];
+  buildDepends = [
+    ansiTerminal deepseq executablePath filepath graphSCC haskeline
+    monadLib mtl presburger QuickCheck random smtLib syb text
+    transformers utf8String process Cabal
+  ];
+  buildTools = [ alex happy cabalInstall ];
+  meta = {
+    description = "Cryptol: The Language of Cryptography";
+    homepage    = "https://cryptol.net";
+    license     = self.stdenv.lib.licenses.bsd3;
+    platforms   = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/development/compilers/cryptol/fix-gitrev.patch b/pkgs/development/compilers/cryptol/fix-gitrev.patch
new file mode 100644
index 00000000000..ab9a789baf2
--- /dev/null
+++ b/pkgs/development/compilers/cryptol/fix-gitrev.patch
@@ -0,0 +1,44 @@
+From 3ceec293f8e68314d872909b7de1d4a2c3ecba49 Mon Sep 17 00:00:00 2001
+From: Austin Seipp <aseipp@pobox.com>
+Date: Fri, 25 Apr 2014 00:24:39 -0500
+Subject: [PATCH] Add GitRev.hs to signify v2.0.0 release
+
+Signed-off-by: Austin Seipp <aseipp@pobox.com>
+---
+ cryptol.cabal |  2 +-
+ src/GitRev.hs | 10 ++++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+ create mode 100644 src/GitRev.hs
+
+diff --git a/cryptol.cabal b/cryptol.cabal
+index 2ba6e56..9acd1ef 100644
+--- a/cryptol.cabal
++++ b/cryptol.cabal
+@@ -6,7 +6,7 @@ Author:              Galois, Inc.
+ Maintainer:          cryptol@galois.com
+ Copyright:           2013-2014 Galois Inc.
+ Category:            Language
+-Build-type:          Configure
++Build-type:          Simple
+ Cabal-version:       >= 1.18
+ 
+ data-files:          lib/Cryptol.cry
+diff --git a/src/GitRev.hs b/src/GitRev.hs
+new file mode 100644
+index 0000000..1c767dc
+--- /dev/null
++++ b/src/GitRev.hs
+@@ -0,0 +1,10 @@
++module GitRev (hash, branch, dirty) where
++
++hash :: String
++hash = "bd578915eaba8c56fadc29fe30f5dcd212c63374"
++
++branch :: String
++branch = "Unknown"
++
++dirty :: Bool
++dirty = False
+-- 
+1.8.3.2
+
diff --git a/pkgs/development/libraries/haskell/graphscc/default.nix b/pkgs/development/libraries/haskell/graphscc/default.nix
new file mode 100644
index 00000000000..3f04e668a8f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/graphscc/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "GraphSCC";
+  version = "1.0.4";
+  sha256 = "1wbcx3wb02adb7l4nchxla3laliz0h5q074vfw4z0ic833k977bq";
+  meta = {
+    description = "Tarjan's algorithm for computing the strongly connected components of a graph";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix
new file mode 100644
index 00000000000..361e177aa01
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monadlib/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "monadLib";
+  version = "3.7.2";
+  sha256 = "01s7jfwzr4jmwz1k4bkxi38q8v364vg6fnn77n5v8zpbimcv3rds";
+  meta = {
+    homepage = "http://wiki.github.com/yav/monadlib";
+    description = "A collection of monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix
new file mode 100644
index 00000000000..f266cf6cdab
--- /dev/null
+++ b/pkgs/development/libraries/haskell/presburger/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "presburger";
+  version = "1.1";
+  sha256 = "0pb0rabhhzrrrsr8260lgjpp168pm8ldqwfqbc2i1wy95n7wxk7c";
+  meta = {
+    homepage = "http://github.com/yav/presburger";
+    description = "A decision procedure for quantifier-free linear arithmetic";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/process/default.nix b/pkgs/development/libraries/haskell/process/default.nix
new file mode 100644
index 00000000000..f3ae03da7c4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/process/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq, filepath }:
+
+cabal.mkDerivation (self: {
+  pname = "process";
+  version = "1.2.0.0";
+  sha256 = "02il5pxibf0q9b46v0lgdxyc2wlk5kg1v8223ry6brg41zpcj71q";
+  buildDepends = [ deepseq filepath ];
+  meta = {
+    description = "Process libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/smtLib/default.nix b/pkgs/development/libraries/haskell/smtLib/default.nix
new file mode 100644
index 00000000000..e1363d9063a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/smtLib/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "smtLib";
+  version = "1.0.7";
+  sha256 = "1jn2790x7g7n6jm5cfgd692n3l6iafyv0zyz40hx8ykcs4jh2rkf";
+  meta = {
+    description = "A library for working with the SMTLIB format";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.thoughtpolice ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3e4d410a154..05a459fb161 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1283,6 +1283,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   graphviz = callPackage ../development/libraries/haskell/graphviz {};
 
+  graphSCC = callPackage ../development/libraries/haskell/graphscc {};
+
   graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {};
 
   groups = callPackage ../development/libraries/haskell/groups {};
@@ -1770,6 +1772,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
 
+  monadLib = callPackage ../development/libraries/haskell/monadlib {};
+
   monadloc = callPackage ../development/libraries/haskell/monadloc {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
@@ -2061,12 +2065,16 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   pqueue = callPackage ../development/libraries/haskell/pqueue {};
 
+  process = callPackage ../development/libraries/haskell/process {};
+
   preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {};
 
   preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {};
 
   preprocessorTools = self.preprocessorTools_1_0_1;
 
+  presburger = callPackage ../development/libraries/haskell/presburger {};
+
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
@@ -2275,6 +2283,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   smallcheck = callPackage ../development/libraries/haskell/smallcheck {};
 
+  smtLib = callPackage ../development/libraries/haskell/smtLib {};
+
   smtpMail = callPackage ../development/libraries/haskell/smtp-mail {};
 
   smtpsGmail = callPackage ../development/libraries/haskell/smtps-gmail {};
@@ -2973,6 +2983,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   arbtt = callPackage ../applications/misc/arbtt {};
 
+  cryptol = callPackage ../development/compilers/cryptol {
+    QuickCheck   = self.QuickCheck_2_7_3;
+    text         = self.text_1_1_0_1;
+    cabalInstall = self.cabalInstall_1_18_0_3;
+    Cabal        = self.Cabal_1_18_1_3;
+  };
+
   darcs = callPackage ../applications/version-management/darcs {};
 
   idris_plain = callPackage ../development/compilers/idris {

From a3a2222fecb974891c6e54d33f3eec717cec9756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <ertesx@gmx.de>
Date: Fri, 25 Apr 2014 14:03:00 +0200
Subject: [PATCH 0575/2033] haskell: Added enumset 0.0.4 and jack 0.7.0.2.

---
 .../libraries/haskell/enumset/default.nix     | 23 ++++++++++++++
 .../libraries/haskell/jack/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 +++
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/enumset/default.nix
 create mode 100644 pkgs/development/libraries/haskell/jack/default.nix

diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix
new file mode 100644
index 00000000000..4f55049a0a9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/enumset/default.nix
@@ -0,0 +1,23 @@
+{ cabal, dataAccessor, storableRecord }:
+
+cabal.mkDerivation (self: {
+  pname = "enumset";
+  version = "0.0.4";
+  sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
+
+  isExecutable = false;
+  isLibrary = true;
+
+  buildDepends = [
+    dataAccessor
+    storableRecord
+  ];
+
+  meta = {
+    description = "Sets of enumeration values represented by machine words";
+    license     = self.stdenv.lib.licenses.bsd3;
+    platforms   = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ertes];
+  };
+
+})
diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
new file mode 100644
index 00000000000..ad63399fa4d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/jack/default.nix
@@ -0,0 +1,30 @@
+{ cabal, enumset, eventList, explicitException, jackaudio, midi,
+nonNegative, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "jack";
+  version = "0.7.0.2";
+  sha256 = "06mf1sw1lp81b3d4hsgc199m30drdnxzzlmsxg4p1yvydjfdk4gj";
+
+  isExecutable = false;
+  isLibrary = true;
+
+  pkgconfigDepends = [jackaudio];
+
+  buildDepends = [
+    enumset
+    eventList
+    explicitException
+    midi
+    nonNegative
+    transformers
+  ];
+
+  meta = {
+    description = "Bindings for the JACK Audio Connection Kit";
+    homepage    = "http://www.haskell.org/haskellwiki/JACK";
+    license     = self.stdenv.lib.licenses.gpl2Plus;
+    platforms   = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [ertes];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b7e78e09cc7..e2d396ddae5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1061,6 +1061,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   enummapsetTh = callPackage ../development/libraries/haskell/enummapset-th {};
 
+  enumset = callPackage ../development/libraries/haskell/enumset {};
+
   entropy = callPackage ../development/libraries/haskell/entropy {};
 
   erf = callPackage ../development/libraries/haskell/erf {};
@@ -1592,6 +1594,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   ixShapable = callPackage ../development/libraries/haskell/ix-shapable {};
 
+  jack = callPackage ../development/libraries/haskell/jack {};
+
   JuicyPixels = callPackage ../development/libraries/haskell/JuicyPixels {};
 
   jpeg = callPackage ../development/libraries/haskell/jpeg {};

From e85b164df89292c2cbcb619c7617b378407b1200 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 25 Apr 2014 08:19:45 -0400
Subject: [PATCH 0576/2033] Add php 5.3 variant with fpm support

---
 pkgs/development/interpreters/php/5.3.nix | 5 +++++
 pkgs/top-level/all-packages.nix           | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index f7bb29270c7..95120a4d9a2 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -172,6 +172,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       ftp = {
         configureFlags = ["--enable-ftp"];
       };
+
+      fpm = {
+        configureFlags = ["--enable-fpm"];
+      };
     };
 
   cfg = {
@@ -181,6 +185,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     curlSupport = config.php.curl or true;
     exifSupport = config.php.exif or true;
     ftpSupport = config.php.ftp or true;
+    fpmSupport = config.php.fpm or false;
     gdSupport = config.php.gd or true;
     gettextSupport = config.php.gettext or true;
     imapSupport = config.php.imap or false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fed56c49fe..c7c5d62e2e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3397,6 +3397,15 @@ let
 
   php53 = callPackage ../development/interpreters/php/5.3.nix { };
 
+  php_fpm53 = callPackage ../development/interpreters/php/5.3.nix {
+    config = config // {
+      php = (config.php or {}) // {
+        fpm = true;
+        apxs2 = false;
+      };
+    };
+  };
+
   php54 = callPackage ../development/interpreters/php/5.4.nix { };
 
   php_apc = callPackage ../development/libraries/php-apc { };

From 2d37f8ecf0a306c979769c2f70b5cd4d82e3a5dc Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Fri, 25 Apr 2014 16:12:36 +0200
Subject: [PATCH 0577/2033] Add tzdata Haskell package

---
 .../libraries/haskell/tzdata/default.nix      | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/tzdata/default.nix

diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix
new file mode 100644
index 00000000000..10d4f87141d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tzdata/default.nix
@@ -0,0 +1,20 @@
+{ cabal, filemanip, filepath, HUnit, MissingH, testFramework
+, testFrameworkHunit, testFrameworkTh, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tzdata";
+  version = "0.1.20140324.0";
+  sha256 = "19cw8wag2d5jx9dxia3gr8qjr3bh77a2kp7ksyqp58xxmvmsqdn4";
+  buildDepends = [ vector ];
+  testDepends = [
+    filemanip filepath HUnit MissingH testFramework testFrameworkHunit
+    testFrameworkTh
+  ];
+  meta = {
+    homepage = "https://github.com/nilcons/haskell-tzdata";
+    description = "Time zone database (as files and as a module)";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a6330f40ba..1bec85d1439 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2620,6 +2620,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
 
+  tzdata = callPackage ../development/libraries/haskell/tzdata {};
+
   unbound = callPackage ../development/libraries/haskell/unbound {};
 
   unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};

From 8bb3f19c6b5ed7e68332a6e565773008c16def6a Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Fri, 25 Apr 2014 16:19:12 +0200
Subject: [PATCH 0578/2033] Add tz Haskell package

---
 .../libraries/haskell/tz/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/tz/default.nix

diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix
new file mode 100644
index 00000000000..5239578f05a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/tz/default.nix
@@ -0,0 +1,23 @@
+{ cabal, binary, bindingsPosix, deepseq, HUnit, QuickCheck
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
+, testFrameworkTh, time, tzdata, vector
+, pkgs_tzdata
+}:
+
+cabal.mkDerivation (self: {
+  pname = "tz";
+  version = "0.0.0.5";
+  sha256 = "03s5vs08dj3r7rq78ncya6x6dazvr93gfylyynwybpai09l2y89v";
+  buildDepends = [ binary deepseq time tzdata vector ];
+  preCheck = "export TZDIR=${pkgs_tzdata}/share/zoneinfo";
+  testDepends = [
+    bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 testFrameworkTh time tzdata
+  ];
+  meta = {
+    homepage = "https://github.com/nilcons/haskell-tz";
+    description = "Efficient time zone handling";
+    license = self.stdenv.lib.licenses.asl20;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1bec85d1439..096d3bef231 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2620,6 +2620,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {};
 
+  tz = callPackage ../development/libraries/haskell/tz {
+    pkgs_tzdata = pkgs.tzdata;
+  };
+
   tzdata = callPackage ../development/libraries/haskell/tzdata {};
 
   unbound = callPackage ../development/libraries/haskell/unbound {};

From fec3b75e4bba045178bfb4b9ba1e2aa8c55447f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 17:04:51 +0200
Subject: [PATCH 0579/2033] =?UTF-8?q?Fix=20=E2=80=98nixos-container=20run?=
 =?UTF-8?q?=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By default, socat only waits 0.5s for the remote side to finish after
getting EOF on the local side. So don't close the local side, instead
wait for socat to exit when the remote side finishes.

http://hydra.nixos.org/build/10663282
---
 nixos/modules/virtualisation/nixos-container.pl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 2fd41a34096..8a1e6f927b3 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -212,18 +212,22 @@ elsif ($action eq "root-login") {
 
 elsif ($action eq "run") {
     shift @ARGV; shift @ARGV;
-    open(SOCAT, "|-", $socat, "unix:$root/var/lib/run-command.socket", "-");
+    my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
     print SOCAT join(' ', map { "'$_'" } @ARGV), "\n";
+    flush SOCAT;
+    waitpid($pid, 0);
     close(SOCAT);
 }
 
 elsif ($action eq "set-root-password") {
     # FIXME: don't get password from the command line.
     my $password = $ARGV[2] or die "$0: no password given\n";
-    open(SOCAT, "|-", $socat, "unix:$root/var/lib/run-command.socket", "-");
+    my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n";
     print SOCAT "passwd\n";
     print SOCAT "$password\n";
     print SOCAT "$password\n";
+    flush SOCAT;
+    waitpid($pid, 0);
     close(SOCAT);
 }
 

From 537c034e8fd4568de43c38de3becb985e7d33e63 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 17:08:58 +0200
Subject: [PATCH 0580/2033] Make some tests release-critical

---
 nixos/release-combined.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 32f52375000..2634172d83f 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -45,6 +45,7 @@ in rec {
         (all nixos.ova)
 
         # (all nixos.tests.efi-installer.simple)
+        (all nixos.tests.containers)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.installer.grub1)
@@ -60,6 +61,7 @@ in rec {
         (all nixos.tests.openssh)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
+        (all nixos.tests.simple)
         (all nixos.tests.udisks)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)

From 604a4b680cbb6b0c88041da356fff1f5f547909a Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 25 Apr 2014 11:18:18 -0400
Subject: [PATCH 0581/2033] capnproto: Add package

---
 lib/maintainers.nix                           |  1 +
 .../libraries/capnproto/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/capnproto/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c9648f2d642..4218d774217 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -26,6 +26,7 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
+  cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   emery = "Emery Hemingawy <emery@vfemail.net>";
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
new file mode 100644
index 00000000000..8a067f148d9
--- /dev/null
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "capnproto-0.4.1";
+
+  meta = with stdenv.lib; {
+    homepage    = "http://kentonv.github.io/capnproto";
+    description = "Cap'n Proto cerealization protocol";
+    longDescription = ''
+      Cap’n Proto is an insanely fast data interchange format and
+      capability-based RPC system. Think JSON, except binary. Or think Protocol
+      Buffers, except faster.
+    '';
+    license     = licenses.bsd2;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+
+  src = fetchurl {
+    url = "https://capnproto.org/capnproto-c++-0.4.1.tar.gz";
+    sha256 = "8453e8d508906062f113dbdfff552f41e08083ccf7c9407778a8d107675cd468";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fed56c49fe..db714b36357 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4132,6 +4132,8 @@ let
 
   caelum = callPackage ../development/libraries/caelum { };
 
+  capnproto = callPackage ../development/libraries/capnproto { };
+
   scmccid = callPackage ../development/libraries/scmccid { };
 
   ccrtp = callPackage ../development/libraries/ccrtp { };

From 7ddcd7b6b69c45739776db5f797a3956c8f5dd78 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 17:27:05 +0200
Subject: [PATCH 0582/2033] Give the KDE test more memory

---
 nixos/tests/kde4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 725759ab758..99a82a6b95d 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
     { imports = [ ./common/user-account.nix ];
 
-      virtualisation.memorySize = 768;
+      virtualisation.memorySize = 1024;
 
       services.xserver.enable = true;
 

From 37e6e08cdee082d9f60ab2900c960f2f594933a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Apr 2014 17:42:09 +0200
Subject: [PATCH 0583/2033] switch-to-configuration: Use systemctl's
 --no-legend flag

---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 4cea0c5910c..7c2d64d2e1a 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -65,12 +65,12 @@ $SIG{PIPE} = "IGNORE";
 sub getActiveUnits {
     # FIXME: use D-Bus or whatever to query this, since parsing the
     # output of list-units is likely to break.
-    my $lines = `LANG= @systemd@/bin/systemctl list-units --full`;
+    my $lines = `LANG= @systemd@/bin/systemctl list-units --full --no-legend`;
     my $res = {};
     foreach my $line (split '\n', $lines) {
         chomp $line;
         last if $line eq "";
-        $line =~ /^\*?\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
+        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
         next if $1 eq "UNIT";
         $res->{$1} = { load => $2, state => $3, substate => $4 };
     }

From e146a02d14cf1ff414b9e3a1151d6541485c9efb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 25 Apr 2014 06:51:24 -0500
Subject: [PATCH 0584/2033] nixpkgs: Add cryptol2 expression

This is just a convenient shorthand so people don't have to spell out
haskellPackages.cryptol

Note that the top-level expression is named 'cryptol2' but the package
isn't. That's because Cryptol is a library and other things could depend
on it (hence the vanilla name), but also the full name will be
disambiguated as 'haskell-cryptol-ghc7.6.3' anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4761d787fa5..01d120deb81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2461,6 +2461,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
+  cryptol2 = haskellPackages.cryptol;
+
   cython = pythonPackages.cython;
   cython3 = python3Packages.cython;
 

From ae1189379ef29e5a1c1d473c520be5146233014a Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 25 Apr 2014 18:21:58 +0200
Subject: [PATCH 0585/2033] cpuminer: Upgrade to 2.3.3

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

diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index 6b32d9531d3..c172930cfd2 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cpuminer-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
-    sha256 = "10xnb58w90kq8xgnkk0z99c0b9p9pxhkhkcs9dml5pgxfrlakckg";
+    sha256 = "17pjnb1nb8c1akr07hgac2pqd5fcv34f12g7iykbn9hgig5r1sxc";
   };
 
   buildInputs = [ curl jansson ];

From 5ebb896d5b8f822d100e97ccc298bc6cf02131c4 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 25 Apr 2014 14:33:01 -0400
Subject: [PATCH 0586/2033] pycapnp: Add package

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4761d787fa5..272839d3411 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6341,6 +6341,8 @@ let
 
   pycairo = pythonPackages.pycairo;
 
+  pycapnp = pythonPackages.pycapnp;
+
   pycrypto = pythonPackages.pycrypto;
 
   pycups = callPackage ../development/python-modules/pycups { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3e6bae580c..cbcc3a87e37 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5215,6 +5215,29 @@ rec {
     };
   };
 
+  pycapnp = buildPythonPackage rec {
+    name = "pycapnp-0.4.4";
+    homepage = "http://jparyani.github.io/pycapnp/index.html";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pycapnp/${name}.tar.gz";
+      sha256 = "33b2b79438bb9bf37097966e1c90403c34ab49be1eb647ee251b62f362ee3537";
+    };
+
+    buildInputs = with pkgs; [ capnproto cython ];
+
+    # import setuptools as soon as possible, to minimize monkeypatching mayhem.
+    postConfigure = ''
+      sed -i '2iimport setuptools' setup.py
+    '';
+
+    meta = with stdenv.lib; {
+      maintainers = with maintainers; [ cstrahan ];
+      license = stdenv.lib.licenses.bsd2;
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+
 
   pycryptopp = buildPythonPackage (rec {
     name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958";

From 6fa0f4f9041aec988713788fbd2717b1d14cca4a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 25 Apr 2014 18:59:50 +0000
Subject: [PATCH 0587/2033] Bump mpv to 0.3.8

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 903b9afdc4a..be796f8e0de 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -57,11 +57,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "1qmwmjvgdwh88l2caw2xy1d2h1cdg2w1hl4q5iwx2c0q7a99h41m";
+    sha256 = "0k77rq17mslpvvgr4mvkj9bd5s1yhsigwvzym8blr1brxkj9pk3b";
   };
 
   buildInputs = with stdenv.lib;

From 7c274bf9586105e359b40bb1b3b228182c8ae8c2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 18 Apr 2014 13:07:31 -0500
Subject: [PATCH 0588/2033] Add haskell-hmatrix-special-0.2.0

---
 .../libraries/haskell/hmatrix-special/default.nix  | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hmatrix-special/default.nix

diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
new file mode 100644
index 00000000000..4e9fccbdcd8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hmatrix-special/default.nix
@@ -0,0 +1,14 @@
+{ cabal, hmatrix }:
+
+cabal.mkDerivation (self: {
+  pname = "hmatrix-special";
+  version = "0.2.0";
+  sha256 = "0lp8mvagbzayq3r08wgk498n6d9vgb1skb8wzrzi5a1fc5j8m0wj";
+  buildDepends = [ hmatrix ];
+  meta = {
+    homepage = "http://perception.inf.um.es/hmatrix";
+    description = "Interface to GSL special functions";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7c241f9e44d..11c317d57a8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1426,6 +1426,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hmatrix = callPackage ../development/libraries/haskell/hmatrix {};
 
+  hmatrix-special = callPackage ../development/libraries/haskell/hmatrix-special {};
+
   hoauth = callPackage ../development/libraries/haskell/hoauth {};
 
   hoauth2 = callPackage ../development/libraries/haskell/hoauth2 {};

From e6359b4048dd2c542df594af1dc2b314cc0a13d6 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 26 Apr 2014 01:21:08 +0200
Subject: [PATCH 0589/2033] lvtk: Upgrade to 1.2.0 and switch to github tarball

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

diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 0abe3f0376b..7b296ea6d13 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lvtk-${version}";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "http://lvtoolkit.org/code/browse/lvtk/snapshot/${name}.tar.gz";
-    sha256 = "161l4n3a2kar2r5mn3zz6dbj1p2s6361ainrka3s74518z7yf42w";
+    url = "https://github.com/lvtk/lvtk/archive/${version}.tar.gz";
+    sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
   };
 
   buildInputs = [ boost gtkmm lv2 pkgconfig python ];

From 2eeba3a30057d3a60cc86a9414a08ad93ac28e73 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 25 Apr 2014 18:48:04 -0500
Subject: [PATCH 0590/2033] rxvt-unicode: add 256-color resources patch

---
 .../misc/rxvt_unicode/default.nix             |   5 +-
 .../rxvt-unicode-256-color-resources.patch    | 255 ++++++++++++++++++
 2 files changed, 259 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 2e3ef9f0d10..60e79ff204b 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -24,7 +24,10 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "terminfo" ];
 
-  patches = [ ./rxvt-unicode-9.06-font-width.patch ];
+  patches = [
+    ./rxvt-unicode-9.06-font-width.patch
+    ./rxvt-unicode-256-color-resources.patch
+  ];
 
   preConfigure =
     ''
diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch
new file mode 100644
index 00000000000..c8d2acfbdc5
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch
@@ -0,0 +1,255 @@
+diff --git a/src/xdefaults.C b/src/xdefaults.C
+index 23b6822..382f3b1 100644
+--- a/src/xdefaults.C
++++ b/src/xdefaults.C
+@@ -155,6 +155,250 @@ optList[] = {
+               RSTRG (Rs_color + minCOLOR + 5, "color5", "color"),
+               RSTRG (Rs_color + minCOLOR + 6, "color6", "color"),
+               RSTRG (Rs_color + minCOLOR + 7, "color7", "color"),
++              // 88 xterm colors
++              RSTRG (Rs_color + minCOLOR + 16, "color16", "color"),
++              RSTRG (Rs_color + minCOLOR + 17, "color17", "color"),
++              RSTRG (Rs_color + minCOLOR + 18, "color18", "color"),
++              RSTRG (Rs_color + minCOLOR + 19, "color19", "color"),
++              RSTRG (Rs_color + minCOLOR + 20, "color20", "color"),
++              RSTRG (Rs_color + minCOLOR + 21, "color21", "color"),
++              RSTRG (Rs_color + minCOLOR + 22, "color22", "color"),
++              RSTRG (Rs_color + minCOLOR + 23, "color23", "color"),
++              RSTRG (Rs_color + minCOLOR + 24, "color24", "color"),
++              RSTRG (Rs_color + minCOLOR + 25, "color25", "color"),
++              RSTRG (Rs_color + minCOLOR + 26, "color26", "color"),
++              RSTRG (Rs_color + minCOLOR + 27, "color27", "color"),
++              RSTRG (Rs_color + minCOLOR + 28, "color28", "color"),
++              RSTRG (Rs_color + minCOLOR + 29, "color29", "color"),
++              RSTRG (Rs_color + minCOLOR + 30, "color30", "color"),
++              RSTRG (Rs_color + minCOLOR + 31, "color31", "color"),
++              RSTRG (Rs_color + minCOLOR + 32, "color32", "color"),
++              RSTRG (Rs_color + minCOLOR + 33, "color33", "color"),
++              RSTRG (Rs_color + minCOLOR + 34, "color34", "color"),
++              RSTRG (Rs_color + minCOLOR + 35, "color35", "color"),
++              RSTRG (Rs_color + minCOLOR + 36, "color36", "color"),
++              RSTRG (Rs_color + minCOLOR + 37, "color37", "color"),
++              RSTRG (Rs_color + minCOLOR + 38, "color38", "color"),
++              RSTRG (Rs_color + minCOLOR + 39, "color39", "color"),
++              RSTRG (Rs_color + minCOLOR + 40, "color40", "color"),
++              RSTRG (Rs_color + minCOLOR + 41, "color41", "color"),
++              RSTRG (Rs_color + minCOLOR + 42, "color42", "color"),
++              RSTRG (Rs_color + minCOLOR + 43, "color43", "color"),
++              RSTRG (Rs_color + minCOLOR + 44, "color44", "color"),
++              RSTRG (Rs_color + minCOLOR + 45, "color45", "color"),
++              RSTRG (Rs_color + minCOLOR + 46, "color46", "color"),
++              RSTRG (Rs_color + minCOLOR + 47, "color47", "color"),
++              RSTRG (Rs_color + minCOLOR + 48, "color48", "color"),
++              RSTRG (Rs_color + minCOLOR + 49, "color49", "color"),
++              RSTRG (Rs_color + minCOLOR + 50, "color50", "color"),
++              RSTRG (Rs_color + minCOLOR + 51, "color51", "color"),
++              RSTRG (Rs_color + minCOLOR + 52, "color52", "color"),
++              RSTRG (Rs_color + minCOLOR + 53, "color53", "color"),
++              RSTRG (Rs_color + minCOLOR + 54, "color54", "color"),
++              RSTRG (Rs_color + minCOLOR + 55, "color55", "color"),
++              RSTRG (Rs_color + minCOLOR + 56, "color56", "color"),
++              RSTRG (Rs_color + minCOLOR + 57, "color57", "color"),
++              RSTRG (Rs_color + minCOLOR + 58, "color58", "color"),
++              RSTRG (Rs_color + minCOLOR + 59, "color59", "color"),
++              RSTRG (Rs_color + minCOLOR + 60, "color60", "color"),
++              RSTRG (Rs_color + minCOLOR + 61, "color61", "color"),
++              RSTRG (Rs_color + minCOLOR + 62, "color62", "color"),
++              RSTRG (Rs_color + minCOLOR + 63, "color63", "color"),
++              RSTRG (Rs_color + minCOLOR + 64, "color64", "color"),
++              RSTRG (Rs_color + minCOLOR + 65, "color65", "color"),
++              RSTRG (Rs_color + minCOLOR + 66, "color66", "color"),
++              RSTRG (Rs_color + minCOLOR + 67, "color67", "color"),
++              RSTRG (Rs_color + minCOLOR + 68, "color68", "color"),
++              RSTRG (Rs_color + minCOLOR + 69, "color69", "color"),
++              RSTRG (Rs_color + minCOLOR + 70, "color70", "color"),
++              RSTRG (Rs_color + minCOLOR + 71, "color71", "color"),
++              RSTRG (Rs_color + minCOLOR + 72, "color72", "color"),
++              RSTRG (Rs_color + minCOLOR + 73, "color73", "color"),
++              RSTRG (Rs_color + minCOLOR + 74, "color74", "color"),
++              RSTRG (Rs_color + minCOLOR + 75, "color75", "color"),
++              RSTRG (Rs_color + minCOLOR + 76, "color76", "color"),
++              RSTRG (Rs_color + minCOLOR + 77, "color77", "color"),
++              RSTRG (Rs_color + minCOLOR + 78, "color78", "color"),
++              RSTRG (Rs_color + minCOLOR + 79, "color79", "color"),
++              RSTRG (Rs_color + minCOLOR + 80, "color80", "color"),
++              RSTRG (Rs_color + minCOLOR + 81, "color81", "color"),
++              RSTRG (Rs_color + minCOLOR + 82, "color82", "color"),
++              RSTRG (Rs_color + minCOLOR + 83, "color83", "color"),
++              RSTRG (Rs_color + minCOLOR + 84, "color84", "color"),
++              RSTRG (Rs_color + minCOLOR + 85, "color85", "color"),
++              RSTRG (Rs_color + minCOLOR + 86, "color86", "color"),
++              RSTRG (Rs_color + minCOLOR + 87, "color87", "color"),
++#if USE_256_COLORS
++              // 256 xterm colors
++              RSTRG (Rs_color + minCOLOR + 88, "color88", "color"),
++              RSTRG (Rs_color + minCOLOR + 89, "color89", "color"),
++              RSTRG (Rs_color + minCOLOR + 90, "color90", "color"),
++              RSTRG (Rs_color + minCOLOR + 91, "color91", "color"),
++              RSTRG (Rs_color + minCOLOR + 92, "color92", "color"),
++              RSTRG (Rs_color + minCOLOR + 93, "color93", "color"),
++              RSTRG (Rs_color + minCOLOR + 94, "color94", "color"),
++              RSTRG (Rs_color + minCOLOR + 95, "color95", "color"),
++              RSTRG (Rs_color + minCOLOR + 96, "color96", "color"),
++              RSTRG (Rs_color + minCOLOR + 97, "color97", "color"),
++              RSTRG (Rs_color + minCOLOR + 98, "color98", "color"),
++              RSTRG (Rs_color + minCOLOR + 99, "color99", "color"),
++              RSTRG (Rs_color + minCOLOR + 100, "color100", "color"),
++              RSTRG (Rs_color + minCOLOR + 101, "color101", "color"),
++              RSTRG (Rs_color + minCOLOR + 102, "color102", "color"),
++              RSTRG (Rs_color + minCOLOR + 103, "color103", "color"),
++              RSTRG (Rs_color + minCOLOR + 104, "color104", "color"),
++              RSTRG (Rs_color + minCOLOR + 105, "color105", "color"),
++              RSTRG (Rs_color + minCOLOR + 106, "color106", "color"),
++              RSTRG (Rs_color + minCOLOR + 107, "color107", "color"),
++              RSTRG (Rs_color + minCOLOR + 108, "color108", "color"),
++              RSTRG (Rs_color + minCOLOR + 109, "color109", "color"),
++              RSTRG (Rs_color + minCOLOR + 110, "color110", "color"),
++              RSTRG (Rs_color + minCOLOR + 111, "color111", "color"),
++              RSTRG (Rs_color + minCOLOR + 112, "color112", "color"),
++              RSTRG (Rs_color + minCOLOR + 113, "color113", "color"),
++              RSTRG (Rs_color + minCOLOR + 114, "color114", "color"),
++              RSTRG (Rs_color + minCOLOR + 115, "color115", "color"),
++              RSTRG (Rs_color + minCOLOR + 116, "color116", "color"),
++              RSTRG (Rs_color + minCOLOR + 117, "color117", "color"),
++              RSTRG (Rs_color + minCOLOR + 118, "color118", "color"),
++              RSTRG (Rs_color + minCOLOR + 119, "color119", "color"),
++              RSTRG (Rs_color + minCOLOR + 120, "color120", "color"),
++              RSTRG (Rs_color + minCOLOR + 121, "color121", "color"),
++              RSTRG (Rs_color + minCOLOR + 122, "color122", "color"),
++              RSTRG (Rs_color + minCOLOR + 123, "color123", "color"),
++              RSTRG (Rs_color + minCOLOR + 124, "color124", "color"),
++              RSTRG (Rs_color + minCOLOR + 125, "color125", "color"),
++              RSTRG (Rs_color + minCOLOR + 126, "color126", "color"),
++              RSTRG (Rs_color + minCOLOR + 127, "color127", "color"),
++              RSTRG (Rs_color + minCOLOR + 128, "color128", "color"),
++              RSTRG (Rs_color + minCOLOR + 129, "color129", "color"),
++              RSTRG (Rs_color + minCOLOR + 130, "color130", "color"),
++              RSTRG (Rs_color + minCOLOR + 131, "color131", "color"),
++              RSTRG (Rs_color + minCOLOR + 132, "color132", "color"),
++              RSTRG (Rs_color + minCOLOR + 133, "color133", "color"),
++              RSTRG (Rs_color + minCOLOR + 134, "color134", "color"),
++              RSTRG (Rs_color + minCOLOR + 135, "color135", "color"),
++              RSTRG (Rs_color + minCOLOR + 136, "color136", "color"),
++              RSTRG (Rs_color + minCOLOR + 137, "color137", "color"),
++              RSTRG (Rs_color + minCOLOR + 138, "color138", "color"),
++              RSTRG (Rs_color + minCOLOR + 139, "color139", "color"),
++              RSTRG (Rs_color + minCOLOR + 140, "color140", "color"),
++              RSTRG (Rs_color + minCOLOR + 141, "color141", "color"),
++              RSTRG (Rs_color + minCOLOR + 142, "color142", "color"),
++              RSTRG (Rs_color + minCOLOR + 143, "color143", "color"),
++              RSTRG (Rs_color + minCOLOR + 144, "color144", "color"),
++              RSTRG (Rs_color + minCOLOR + 145, "color145", "color"),
++              RSTRG (Rs_color + minCOLOR + 146, "color146", "color"),
++              RSTRG (Rs_color + minCOLOR + 147, "color147", "color"),
++              RSTRG (Rs_color + minCOLOR + 148, "color148", "color"),
++              RSTRG (Rs_color + minCOLOR + 149, "color149", "color"),
++              RSTRG (Rs_color + minCOLOR + 150, "color150", "color"),
++              RSTRG (Rs_color + minCOLOR + 151, "color151", "color"),
++              RSTRG (Rs_color + minCOLOR + 152, "color152", "color"),
++              RSTRG (Rs_color + minCOLOR + 153, "color153", "color"),
++              RSTRG (Rs_color + minCOLOR + 154, "color154", "color"),
++              RSTRG (Rs_color + minCOLOR + 155, "color155", "color"),
++              RSTRG (Rs_color + minCOLOR + 156, "color156", "color"),
++              RSTRG (Rs_color + minCOLOR + 157, "color157", "color"),
++              RSTRG (Rs_color + minCOLOR + 158, "color158", "color"),
++              RSTRG (Rs_color + minCOLOR + 159, "color159", "color"),
++              RSTRG (Rs_color + minCOLOR + 160, "color160", "color"),
++              RSTRG (Rs_color + minCOLOR + 161, "color161", "color"),
++              RSTRG (Rs_color + minCOLOR + 162, "color162", "color"),
++              RSTRG (Rs_color + minCOLOR + 163, "color163", "color"),
++              RSTRG (Rs_color + minCOLOR + 164, "color164", "color"),
++              RSTRG (Rs_color + minCOLOR + 165, "color165", "color"),
++              RSTRG (Rs_color + minCOLOR + 166, "color166", "color"),
++              RSTRG (Rs_color + minCOLOR + 167, "color167", "color"),
++              RSTRG (Rs_color + minCOLOR + 168, "color168", "color"),
++              RSTRG (Rs_color + minCOLOR + 169, "color169", "color"),
++              RSTRG (Rs_color + minCOLOR + 170, "color170", "color"),
++              RSTRG (Rs_color + minCOLOR + 171, "color171", "color"),
++              RSTRG (Rs_color + minCOLOR + 172, "color172", "color"),
++              RSTRG (Rs_color + minCOLOR + 173, "color173", "color"),
++              RSTRG (Rs_color + minCOLOR + 174, "color174", "color"),
++              RSTRG (Rs_color + minCOLOR + 175, "color175", "color"),
++              RSTRG (Rs_color + minCOLOR + 176, "color176", "color"),
++              RSTRG (Rs_color + minCOLOR + 177, "color177", "color"),
++              RSTRG (Rs_color + minCOLOR + 178, "color178", "color"),
++              RSTRG (Rs_color + minCOLOR + 179, "color179", "color"),
++              RSTRG (Rs_color + minCOLOR + 180, "color180", "color"),
++              RSTRG (Rs_color + minCOLOR + 181, "color181", "color"),
++              RSTRG (Rs_color + minCOLOR + 182, "color182", "color"),
++              RSTRG (Rs_color + minCOLOR + 183, "color183", "color"),
++              RSTRG (Rs_color + minCOLOR + 184, "color184", "color"),
++              RSTRG (Rs_color + minCOLOR + 185, "color185", "color"),
++              RSTRG (Rs_color + minCOLOR + 186, "color186", "color"),
++              RSTRG (Rs_color + minCOLOR + 187, "color187", "color"),
++              RSTRG (Rs_color + minCOLOR + 188, "color188", "color"),
++              RSTRG (Rs_color + minCOLOR + 189, "color189", "color"),
++              RSTRG (Rs_color + minCOLOR + 190, "color190", "color"),
++              RSTRG (Rs_color + minCOLOR + 191, "color191", "color"),
++              RSTRG (Rs_color + minCOLOR + 192, "color192", "color"),
++              RSTRG (Rs_color + minCOLOR + 193, "color193", "color"),
++              RSTRG (Rs_color + minCOLOR + 194, "color194", "color"),
++              RSTRG (Rs_color + minCOLOR + 195, "color195", "color"),
++              RSTRG (Rs_color + minCOLOR + 196, "color196", "color"),
++              RSTRG (Rs_color + minCOLOR + 197, "color197", "color"),
++              RSTRG (Rs_color + minCOLOR + 198, "color198", "color"),
++              RSTRG (Rs_color + minCOLOR + 199, "color199", "color"),
++              RSTRG (Rs_color + minCOLOR + 200, "color200", "color"),
++              RSTRG (Rs_color + minCOLOR + 201, "color201", "color"),
++              RSTRG (Rs_color + minCOLOR + 202, "color202", "color"),
++              RSTRG (Rs_color + minCOLOR + 203, "color203", "color"),
++              RSTRG (Rs_color + minCOLOR + 204, "color204", "color"),
++              RSTRG (Rs_color + minCOLOR + 205, "color205", "color"),
++              RSTRG (Rs_color + minCOLOR + 206, "color206", "color"),
++              RSTRG (Rs_color + minCOLOR + 207, "color207", "color"),
++              RSTRG (Rs_color + minCOLOR + 208, "color208", "color"),
++              RSTRG (Rs_color + minCOLOR + 209, "color209", "color"),
++              RSTRG (Rs_color + minCOLOR + 210, "color210", "color"),
++              RSTRG (Rs_color + minCOLOR + 211, "color211", "color"),
++              RSTRG (Rs_color + minCOLOR + 212, "color212", "color"),
++              RSTRG (Rs_color + minCOLOR + 213, "color213", "color"),
++              RSTRG (Rs_color + minCOLOR + 214, "color214", "color"),
++              RSTRG (Rs_color + minCOLOR + 215, "color215", "color"),
++              RSTRG (Rs_color + minCOLOR + 216, "color216", "color"),
++              RSTRG (Rs_color + minCOLOR + 217, "color217", "color"),
++              RSTRG (Rs_color + minCOLOR + 218, "color218", "color"),
++              RSTRG (Rs_color + minCOLOR + 219, "color219", "color"),
++              RSTRG (Rs_color + minCOLOR + 220, "color220", "color"),
++              RSTRG (Rs_color + minCOLOR + 221, "color221", "color"),
++              RSTRG (Rs_color + minCOLOR + 222, "color222", "color"),
++              RSTRG (Rs_color + minCOLOR + 223, "color223", "color"),
++              RSTRG (Rs_color + minCOLOR + 224, "color224", "color"),
++              RSTRG (Rs_color + minCOLOR + 225, "color225", "color"),
++              RSTRG (Rs_color + minCOLOR + 226, "color226", "color"),
++              RSTRG (Rs_color + minCOLOR + 227, "color227", "color"),
++              RSTRG (Rs_color + minCOLOR + 228, "color228", "color"),
++              RSTRG (Rs_color + minCOLOR + 229, "color229", "color"),
++              RSTRG (Rs_color + minCOLOR + 230, "color230", "color"),
++              RSTRG (Rs_color + minCOLOR + 231, "color231", "color"),
++              RSTRG (Rs_color + minCOLOR + 232, "color232", "color"),
++              RSTRG (Rs_color + minCOLOR + 233, "color233", "color"),
++              RSTRG (Rs_color + minCOLOR + 234, "color234", "color"),
++              RSTRG (Rs_color + minCOLOR + 235, "color235", "color"),
++              RSTRG (Rs_color + minCOLOR + 236, "color236", "color"),
++              RSTRG (Rs_color + minCOLOR + 237, "color237", "color"),
++              RSTRG (Rs_color + minCOLOR + 238, "color238", "color"),
++              RSTRG (Rs_color + minCOLOR + 239, "color239", "color"),
++              RSTRG (Rs_color + minCOLOR + 240, "color240", "color"),
++              RSTRG (Rs_color + minCOLOR + 241, "color241", "color"),
++              RSTRG (Rs_color + minCOLOR + 242, "color242", "color"),
++              RSTRG (Rs_color + minCOLOR + 243, "color243", "color"),
++              RSTRG (Rs_color + minCOLOR + 244, "color244", "color"),
++              RSTRG (Rs_color + minCOLOR + 245, "color245", "color"),
++              RSTRG (Rs_color + minCOLOR + 246, "color246", "color"),
++              RSTRG (Rs_color + minCOLOR + 247, "color247", "color"),
++              RSTRG (Rs_color + minCOLOR + 248, "color248", "color"),
++              RSTRG (Rs_color + minCOLOR + 249, "color249", "color"),
++              RSTRG (Rs_color + minCOLOR + 250, "color250", "color"),
++              RSTRG (Rs_color + minCOLOR + 251, "color251", "color"),
++              RSTRG (Rs_color + minCOLOR + 252, "color252", "color"),
++              RSTRG (Rs_color + minCOLOR + 253, "color253", "color"),
++              RSTRG (Rs_color + minCOLOR + 254, "color254", "color"),
++              RSTRG (Rs_color + minCOLOR + 255, "color255", "color"),
++#endif
+               RSTRG (Rs_color + minBrightCOLOR + 0, "color8", "color"),
+               RSTRG (Rs_color + minBrightCOLOR + 1, "color9", "color"),
+               RSTRG (Rs_color + minBrightCOLOR + 2, "color10", "color"),

From 20c395d8aac553f7f2f87f9853e963682f11353e Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sat, 26 Apr 2014 02:04:18 +0200
Subject: [PATCH 0591/2033] chatzilla: Use latest firefox's xulrunner

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d76d68ef5b..2d89ff13ade 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7739,9 +7739,7 @@ let
     amdappsdk = amdappsdk28;
   };
 
-  chatzilla = callPackage ../applications/networking/irc/chatzilla {
-    xulrunner = firefox36Pkgs.xulrunner;
-  };
+  chatzilla = callPackage ../applications/networking/irc/chatzilla { };
 
   chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
     channel = "stable";

From 63b3cf669bdf9a67768ea563da865477a34c2672 Mon Sep 17 00:00:00 2001
From: Sterling Stein <scubed2@gmail.com>
Date: Fri, 25 Apr 2014 20:13:12 -0700
Subject: [PATCH 0592/2033] Add subtitle option for ffmpeg.

---
 pkgs/development/libraries/ffmpeg/2.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 919972efb3c..7ffc3a077ef 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, config, pkgconfig, yasm, zlib, bzip2, alsaLib, texinfo, perl
-, lame, speex, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
+, lame, speex, libass, libtheora, libvorbis, libvpx, x264, xvidcore, libopus
 , libvdpau, libva, faac, libdc1394, libXext, libXfixes, SDL
 , freetype, fontconfig, fdk_aac, gnutls
 }:
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "153kfk8rzrfxx930rrk417b2m695dvy47v4hci3nd49iggx9jzz1";
   };
 
+  subtitleSupport = config.ffmpeg.subtitle or true;
   mp3Support = config.ffmpeg.mp3 or true;
   speexSupport = config.ffmpeg.speex or true;
   theoraSupport = config.ffmpeg.theora or true;
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
     "--enable-avresample"
     "--enable-runtime-cpudetect"
   ]
+    ++ stdenv.lib.optional subtitleSupport "--enable-libass"
     ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
     ++ stdenv.lib.optional speexSupport "--enable-libspeex"
     ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
@@ -59,6 +61,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
 
   buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
+    ++ stdenv.lib.optional subtitleSupport libass
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora

From 0b99e20a3cbaa2d25a34b0327fc9219d202c41f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sat, 26 Apr 2014 12:53:56 +0800
Subject: [PATCH 0593/2033] love: update 0.9.0 -> 0.9.1

Changelog:
  https://www.love2d.org/wiki/0.9.1
---
 pkgs/development/interpreters/love/0.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
index b635b5e477c..38fdcd2a0a6 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -5,10 +5,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "love-0.9.0";
+  name = "love-0.9.1";
   src = fetchurl {
     url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
-    sha256 = "048n94584cnmdaf2rshakdzbj1lz2yd7k08aiykkpz13aaa283ag";
+    sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
   };
 
   buildInputs = [

From 4e15dbe34ce864b31295b8791dc8a444378bf1ab Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 26 Apr 2014 00:13:36 -0500
Subject: [PATCH 0594/2033] btsync: 1.3.87 -> 1.3.93

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index d0611d5b602..384215cbf9f 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "16jdnip51fsnc2g0vib2zb4f06z5p1myzv9brrp42lq63l4skylj"
-    else if stdenv.system == "i686-linux" then "15bspn9frm2n7bzj7pdgbpd7gjjcxp0yx2sksa4ly6wmlv9lvf1j"
+  sha256 = if stdenv.system == "x86_64-linux" then "0q91fwzvb5ybl43z9nirnk3bs13z0z5vf0cqdyynqwa93an6wiaq"
+    else if stdenv.system == "i686-linux" then "1y7i9p7fs23ksv8qhcb5gxlrm0wxs090jvdm58war13bg9656fvj"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "1.3.87";
+  version = "1.3.93";
 
   src  = fetchurl {
     url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";

From 74efbde57c4eedad4d285bd9d9e2829078a93259 Mon Sep 17 00:00:00 2001
From: vi <me@vikramverma.com>
Date: Sat, 26 Apr 2014 16:17:04 +0800
Subject: [PATCH 0595/2033] Derivation for the Haskell library, "bv".

---
 pkgs/development/libraries/haskell/bv/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/bv/default.nix

diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix
new file mode 100644
index 00000000000..d99779f8cd4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bv/default.nix
@@ -0,0 +1,15 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bv";
+  version = "0.2.2";
+  sha256 = "0d5hscjakp7dwifa4l8xikyip45y402kf9pbmpfmmnybja23zhg0";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    homepage = "http://bitbucket.org/iago/bv-haskell";
+    description = "Bit-vector arithmetic library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a6330f40ba..4afd94addae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -687,6 +687,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   boomerang = callPackage ../development/libraries/haskell/boomerang {};
 
+  bv = callPackage ../development/libraries/haskell/bv {};
+
   byteable = callPackage ../development/libraries/haskell/byteable {};
 
   bytedump = callPackage ../development/libraries/haskell/bytedump {};

From 083a407d0472e896c3f8662e0fa2daf62c4b9308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 26 Apr 2014 12:14:44 +0200
Subject: [PATCH 0596/2033] pythonPackages.pyramid: 1.4.5 -> 1.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cbcc3a87e37..9447aa6114b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1990,11 +1990,11 @@ rec {
 
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.4.5";
+    name = "pyramid-1.5";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
-      md5 = "321731aad69e9788b7819e257a50be1a";
+      md5 = "8747658dcbab709a9c491e43d3b0d58b";
     };
 
     buildInputs = [
@@ -2006,8 +2006,6 @@ rec {
     ] ++ optional isPy26 unittest2;
 
     propagatedBuildInputs = [
-      chameleon
-      Mako
       paste_deploy
       repoze_lru
       repoze_sphinx_autointerface

From cd31cff9f465c5845018a5269ce9a877c831cde3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 26 Apr 2014 13:31:07 +0200
Subject: [PATCH 0597/2033] Make gnome3 test as release critical

---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 2634172d83f..15b5b2b8b7b 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,6 +48,7 @@ in rec {
         (all nixos.tests.containers)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
+        (all nixos.tests.gnome3)
         (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)

From 3c08cdce486b8fcffe191f132bd3b26d04684bb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Apr 2014 15:54:18 +0200
Subject: [PATCH 0598/2033] gtk-gnutella: mark as "broken"

The current version doesn't compile with the latest GCC any more.
---
 pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index b8878c4fa36..7eefb516e1c 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
     homepage = "http://gtk-gnutella.sourceforge.net/";
     description = "a server/client for Gnutella";
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    broken = true;
   };
 }

From 34a1db9202d2b5ce2f9e487e0e2522ce1b01895b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Apr 2014 15:54:40 +0200
Subject: [PATCH 0599/2033] tkgate: update meta.platforms settings for the new
 logic

---
 pkgs/applications/science/electronics/tkgate/1.x.nix | 2 +-
 pkgs/applications/science/electronics/tkgate/2.x.nix | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index 7c04c85fdb7..07c266c62c5 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.tkgate.org/";
     license = "GPLv2+";
     maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
index 36b6f125eca..fdb9e9b5692 100644
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/2.x.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
     homepage = "http://www.tkgate.org/";
     license = "GPLv2+";
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
     broken = true;
   };
 }

From 06f59807e65f6f41ffb4fdb8c2848689c7bacd30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 Apr 2014 15:54:52 +0200
Subject: [PATCH 0600/2033] qfsm: update meta.platforms settings for the new
 logic

---
 pkgs/applications/science/electronics/qfsm/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix
index b5ffcb61730..160c530e722 100644
--- a/pkgs/applications/science/electronics/qfsm/default.nix
+++ b/pkgs/applications/science/electronics/qfsm/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
     description = "Graphical editor for finite state machines";
     homepage = "http://qfsm.sourceforge.net/";
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
     broken = true;
   };
 }

From 9ef104cbad052dc619a88cd632f336fbdb9bd4cf Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 26 Apr 2014 12:51:08 -0500
Subject: [PATCH 0601/2033] cryptol-mode: 0.1.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../editors/emacs-modes/cryptol/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/cryptol/default.nix b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
index 3290041178e..5b408ad7999 100644
--- a/pkgs/applications/editors/emacs-modes/cryptol/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cryptol/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchgit, emacs }:
+{ stdenv, fetchurl, emacs }:
 
 stdenv.mkDerivation rec {
   name    = "cryptol-mode-${version}";
-  version = "20141010";
+  version = "0.1.0";
 
-  src = fetchgit {
-    url    = "https://github.com/thoughtpolice/cryptol-mode.git";
-    rev    = "50075d49d7c4ec4b03ce31b634424410262c1ad4";
-    sha256 = "6ecd4904b7f3b1cd0721591ce45f16fe11cd1dd5fd7af8110d1f84b133ed4aec";
+  src = fetchurl {
+    url    = "https://github.com/thoughtpolice/cryptol-mode/archive/v${version}.tar.gz";
+    sha256 = "1qyrqvfgpg1nyk1clv7v94r3amm02613hrak5732xzn6iak81cc0";
   };
 
   buildInputs = [ emacs ];

From 9a77b8e64f41cbfe682dc2bdaa8635ee01d41013 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 25 Apr 2014 18:35:18 +0000
Subject: [PATCH 0602/2033] tibia: version 10.38

Closes #2396
---
 lib/maintainers.nix             |  1 +
 pkgs/games/tibia/default.nix    | 58 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/tibia/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4218d774217..0acb04b1486 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -32,6 +32,7 @@
   emery = "Emery Hemingawy <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
+  fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
   garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
new file mode 100644
index 00000000000..5cf451e9201
--- /dev/null
+++ b/pkgs/games/tibia/default.nix
@@ -0,0 +1,58 @@
+{stdenv, fetchurl, patchelf, glibc, libX11, mesa}:
+
+with stdenv.lib;
+assert stdenv.isi686;
+stdenv.mkDerivation {
+  name = "tibia-10.38";
+
+  src = fetchurl {
+    url = http://static.tibia.com/download/tibia1038.tgz;
+    sha256 = "13mxsdh0p0bhdiv5p0hbfdx4a5ha2fv9p2yvn6250z9plfi9xq2h";
+  };
+
+  shell = stdenv.shell;
+
+  # These binaries come stripped already and trying to strip after the
+  # files are in $out/res and after patchelf just breaks them.
+  # Strangely it works if the files are in $out but then nix doesn't
+  # put them in our PATH. We set all the files to $out/res because
+  # we'll be using a wrapper to start the program which will go into
+  # $out/bin.
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -pv $out/res
+    cp -r ./* $out/res
+
+    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
+             --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${mesa}/lib \
+             "$out/res/Tibia" || true
+
+    # We've patchelf'd the files. The main ‘Tibia’ binary is a bit
+    # dumb so it looks for ‘./Tibia.dat’. This requires us to be in
+    # the same directory as the file itself but that's very tedious,
+    # especially with nix which changes store hashes. Here we generate
+    # a simple wrapper that we put in $out/bin which will do the
+    # directory changing for us.
+
+    mkdir -pv $out/bin
+
+    # The wrapper script itself. We use $LD_LIBRARY_PATH for libGL.
+    cat << EOF > "$out/bin/Tibia"
+    #!${stdenv.shell}
+    cd $out/res
+    ${glibc}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@"
+    EOF
+
+    chmod +x $out/bin/Tibia
+
+  '';
+
+  meta = {
+    description = "Top-down MMORPG set in a fantasy setting";
+    homepage = "http://tibia.com";
+    license = "unfree";
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    platforms = ["i686-linux"];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36d52bbb213..45ba490702e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9897,6 +9897,8 @@ let
 
   tennix = callPackage ../games/tennix { };
 
+  tibia = callPackage ../games/tibia { };
+
   tintin = callPackage ../games/tintin { };
 
   tpm = callPackage ../games/thePenguinMachine { };

From 9d15c568d8a169489579d3f169f60eb49c03d0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 26 Apr 2014 21:15:06 +0200
Subject: [PATCH 0603/2033] Fix whitespace

---
 pkgs/development/compilers/jdk/jdk7-linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix
index 7d178d2d564..f8b65166ea6 100644
--- a/pkgs/development/compilers/jdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk7-linux.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
       requireFile {
         name = "jdk-7u${patchversion}-linux-x64.tar.gz";
         url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-	sha256 = "15sncxhjasv5i6p7hfrr92xq5ph9g6g12i4m52vp45l031bw5y46";
+        sha256 = "15sncxhjasv5i6p7hfrr92xq5ph9g6g12i4m52vp45l031bw5y46";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";

From 64754519d9b0c7a15ef61e408d86b9240078f960 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 25 Apr 2014 18:09:13 -0400
Subject: [PATCH 0604/2033] libmx: Add package

---
 pkgs/development/libraries/libmx/default.nix | 60 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/libraries/libmx/default.nix

diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix
new file mode 100644
index 00000000000..ab2a2d2afdd
--- /dev/null
+++ b/pkgs/development/libraries/libmx/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl
+, libtool, pkgconfig, automake, autoconf, intltool
+, glib, gobjectIntrospection, gtk2, gtk_doc
+, clutter, clutter_gtk
+}:
+
+stdenv.mkDerivation rec {
+  name = "libmx-${version}";
+  version = "1.4.7";
+
+  src = fetchurl {
+    url = "https://github.com/clutter-project/mx/archive/${version}.tar.gz";
+    sha256 = "8a7514ea33c1dec7251d0141e24a702e7701dc9f00348cbcf1816925b7f74dbc";
+  };
+
+  # remove the following superfluous checks
+  preConfigure = ''
+    substituteInPlace "autogen.sh" \
+      --replace '`which intltoolize`' '"x"' \
+      --replace '`which gtkdocize`' '"x"' \
+      --replace '`which autoreconf`' '"x"'
+  '';
+
+  configureFlags = [ "--enable-introspection"
+                     "--without-startup-notification"
+                     "--without-dbus"
+                     "--without-glade"
+                     "--without-clutter-imcontext"
+                     "--without-clutter-gesture"
+                   ];
+
+  configureScript = "sh autogen.sh";
+
+  buildInputs = [
+    pkgconfig automake autoconf libtool
+    intltool
+    gobjectIntrospection glib
+    gtk2 gtk_doc clutter clutter_gtk
+  ];
+
+  # patch to resolve GL errors
+  # source : https://github.com/clutter-project/mx/pull/62
+  preBuild = ''
+    sed -i 's/GLushort/gushort/g' mx/mx-deform-texture.c
+    sed -i 's/GLfloat/gfloat/g' mx/mx-texture-frame.c
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.clutter-project.org/;
+    description = "A Clutter-based toolkit";
+    longDescription =
+      ''Mx is a widget toolkit using Clutter that provides a set of standard
+        interface elements, including buttons, progress bars, scroll bars and
+        others. It also implements some standard managers. One other interesting
+        feature is the possibility setting style properties from a CSS format
+        file.'';
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4761d787fa5..f4229d6d9e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5150,6 +5150,8 @@ let
 
   libmusicbrainz = libmusicbrainz3;
 
+  libmx = callPackage ../development/libraries/libmx { };
+
   libnet = callPackage ../development/libraries/libnet { };
 
   libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { };

From 22f73bfd85f7dc5d458fe65439b6ad967e1ec75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 26 Apr 2014 23:26:23 +0200
Subject: [PATCH 0605/2033] Enable encrypted backing devices in fileystem
 configurations

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/tasks/encrypted-devices.nix | 69 +++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 nixos/modules/tasks/encrypted-devices.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a769914499d..58d3478afb4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -311,6 +311,7 @@
   ./tasks/filesystems/vfat.nix
   ./tasks/filesystems/xfs.nix
   ./tasks/filesystems/zfs.nix
+  ./tasks/encrypted-devices.nix
   ./tasks/kbd.nix
   ./tasks/lvm.nix
   ./tasks/network-interfaces.nix
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
new file mode 100644
index 00000000000..e80762a170c
--- /dev/null
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, modulesPath, ... }:
+
+with pkgs.lib;
+
+let
+  fileSystems = attrValues config.fileSystems ++ config.swapDevices;
+  encDevs = filter (dev: dev.encrypted.enable) fileSystems;
+  keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
+  isIn = needle: haystack: filter (p: p == needle) haystack != [];
+  anyEncrypted =
+    fold (j: v: v || j.encrypted.enable) false encDevs;
+
+  encryptedFSOptions = {
+
+    encrypted = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry";
+      };
+
+      blkDev = mkOption {
+        default = null;
+        example = "/dev/sda1";
+        type = types.uniq (types.nullOr types.string);
+        description = "Location of the backing encrypted device";
+      };
+
+      label = mkOption {
+        default = null;
+        example = "rootfs";
+        type = types.uniq (types.nullOr types.string);
+        description = "Label of the backing encrypted device";
+      };
+
+      keyFile = mkOption {
+        default = null;
+        example = "/root/.swapkey";
+        type = types.uniq (types.nullOr types.string);
+        description = "File system location of keyfile";
+      };
+    };
+  };
+in
+
+{
+
+  options = {
+    fileSystems = mkOption {
+      options = [encryptedFSOptions];
+    };
+    swapDevices = mkOption {
+      options = [encryptedFSOptions];
+    };
+  };
+
+  config = mkIf anyEncrypted {
+    boot.initrd = {
+      luks = {
+        devices =
+          map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) encDevs;
+        cryptoModules = [ "aes" "sha256" "sha1" "xts" ];
+      };
+      postMountCommands =
+        concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.label};\n") keyedEncDevs;
+    };
+  };
+}
+

From 67b0c3e1a6a31f4c43b16e6f6d4e016576bd0791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 27 Apr 2014 12:20:59 +0200
Subject: [PATCH 0606/2033] pythonPackages.chameleon: 2.11 -> 2.15

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9447aa6114b..ba305e961e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2440,11 +2440,11 @@ rec {
 
 
   chameleon = buildPythonPackage rec {
-    name = "Chameleon-2.11";
+    name = "Chameleon-2.15";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz";
-      md5 = "df72458bf3dd26a744dcff5ad555c34b";
+      md5 = "0214647152fcfcb9ce357624f8f9f203";
     };
 
     buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ];

From 92f7781f00f4fed209143b10b0e33ec3470af342 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 27 Apr 2014 08:41:40 -0500
Subject: [PATCH 0607/2033] kernel/grsecurity: stable/longterm/testing updates

kernels:

  - longterm: 3.4.87  -> 3.4.88
  - longterm: 3.10.37 -> 3.10.38
  - stable:   3.13.10 -> 3.13.11
  - stable:   3.14.1  -> 3.14.2

grsecurity:

  - test: 3.0-3.14.1-201404241722 -> 3.0-3.14.2-201404270907

NOTE: technically the 3.13 stable kernel is now EOL. However, it will
become the long-term grsecurity stable kernel, and will have ongoing
support from Canonical.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.13.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 pkgs/os-specific/linux/kernel/patches.nix    | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 138dad2eda5..c6a20ec26dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.37";
+  version = "3.10.38";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0dh52s9jdvgs75dai5zqlx52xahdrscp048yd96x699hcl3g99d7";
+    sha256 = "1y4aalwf8nh3g5x59zgfjrzs1y4x2cv6c5c981db0ixbn963nbpx";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.13.nix b/pkgs/os-specific/linux/kernel/linux-3.13.nix
index e63756a8c68..d84cec235ce 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.13.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.13.10";
+  version = "3.13.11";
   extraMeta.branch = "3.13";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "00j7123r4zxypas5bs5c8girii6jrz5dwg4zzicgj3gj3frirah3";
+    sha256 = "1nhi5m0nnrb7v2gqpa3181p32k5hm5jwkf647vs80r14750gxlpw";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index e81619becdf..0a1775d32c1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.1";
+  version = "3.14.2";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1njm8gvlj7cq0m1051yxszl4f63383a7sv1na13hkqkv36kipgqx";
+    sha256 = "0grf6hksx4gidqim05blsnvk5037y852smr8mn0hcnbwvvp1hxal";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 07712b4d01c..5585c6ee07a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.87";
+  version = "3.4.88";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1b7isypwjnhvdqsjnq2gsylfasjk560fq0klx18gj3kvyx6ijmqd";
+    sha256 = "0l2ccrsr7ga6rhjb58vq7xxhym7n90m7n181hwpi707wikhz80rd";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 76232ac5b6f..de1f65e2905 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -99,10 +99,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.14.1";
-      revision  = "201404241722";
+    { kversion  = "3.14.2";
+      revision  = "201404270907";
       branch    = "test";
-      sha256    = "0rv6xjwc8gln7p4nfmz36yscrqcfrbvhln9nmp1l5r5bxw9m628j";
+      sha256    = "18hb6k873smhh65cxnmnd3qg9ysw5qlj7yb6m18aam6p77d6krsc";
     };
 
   grsec_fix_path =

From e590c0a867e84f3bdf59ff596b763c1d40d3f77f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 27 Apr 2014 11:24:09 -0500
Subject: [PATCH 0608/2033] ats/ats2: clean-up, adopt, add Hydra packages

This also bumps ATS2 to version 0.0.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/ats/default.nix  | 36 ++++++---------------
 pkgs/development/compilers/ats2/default.nix | 17 +++++-----
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/compilers/ats/default.nix b/pkgs/development/compilers/ats/default.nix
index a5ed478a879..6f15c0599ef 100644
--- a/pkgs/development/compilers/ats/default.nix
+++ b/pkgs/development/compilers/ats/default.nix
@@ -1,41 +1,23 @@
 { stdenv, fetchurl, gmp }:
 
-let version = "0.2.11"; in stdenv.mkDerivation {
-  name = "ats-anairiats-${version}";
+stdenv.mkDerivation rec {
+  name    = "ats-${version}";
+  version = "0.2.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats-lang/ats-lang-anairiats-${version}.tgz";
     sha256 = "0rqykyx5whichx85jr4l4c9fdan0qsdd4kwd7a81k3l07zbd9fc6";
   };
+
   # this is necessary because atxt files usually include some .hats files
   patches = [ ./install-atsdoc-hats-files.patch ];
-
   buildInputs = [ gmp ];
 
   meta = {
-    description = "A statically typed programming language that unifies implementation with formal specification";
-    homepage = http://www.ats-lang.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    longDescription =
-      ''        
-        ATS is a programming language with a highly expressive type system
-	rooted in the framework Applied Type System. In particular, both
-	dependent types and linear types are available in ATS. The current
-	implementation of ATS (ATS/Anairiats) is written in ATS itself. It can
-	be as efficient as C/C++ and supports a variety of programming
-	paradigms.
-
-	In addition, ATS contains a component ATS/LF that supports a form of
-	(interactive) theorem proving, where proofs are constructed as total
-	functions. With this component, ATS advocates a programming style that
-	combines programming with theorem proving. Furthermore, this component
-	may be used as a logical framework to encode various deduction systems
-	and their (meta-)properties.
-
-	This package contains the compiler atsopt, the frontend atscc,
-	and the lexer atslex.
-      '';
+    description = "Functional programming language with dependent types";
+    homepage    = "http://www.ats-lang.org";
+    license     = stdenv.lib.licenses.gpl3Plus;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
-
-  platforms = stdenv.lib.platforms.all;
 }
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index c1c71b0dfe2..1f6a8b6c6e0 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl, gmp }:
 
-let version = "0.0.6"; in stdenv.mkDerivation {
-  name = "ats2-postiats-${version}";
+stdenv.mkDerivation rec {
+  name    = "ats2-${version}";
+  version = "0.0.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "110a4drzf656j9s5yfvxj1cwgh5g9ysnh40cv8y9qfjjkki8vd5b";
+    sha256 = "1cv7caaf9fj6z3kln02ikkbmcy42324v39lzx3cf6qcsywwpm8fx";
   };
 
   buildInputs = [ gmp ];
 
   meta = {
-    description = "A statically typed programming language that unifies implementation with formal specification";
-    homepage = http://www.ats-lang.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
+    description = "Functional programming language with dependent types";
+    homepage    = "http://www.ats-lang.org";
+    license     = stdenv.lib.licenses.gpl3Plus;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
-
-  platforms = stdenv.lib.platforms.all;
 }

From d8f8f317269d74e7e201051e77e16f7533d1e4b6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 27 Apr 2014 16:39:11 +0200
Subject: [PATCH 0609/2033] chromium: Fix desktop icon and duplicate entry.

This should fix the desktop icon location for both desktop entries (the
one from the Chromium derivation itself and the wrapper) and renames the
name of the file so that it gets overridden by the wrappers desktop item
so we don't end up having two of them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 9e906191afe..44fd3c69e53 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -39,9 +39,9 @@ let
   };
 
   desktopItem = makeDesktopItem {
-    name = "Chromium";
+    name = "chromium";
     exec = "chromium";
-    icon = "chromium";
+    icon = "${chromium.browser}/share/icons/hicolor/48x48/apps/chromium.png";
     comment = "An open source web browser from Google";
     desktopName = "Chromium";
     genericName = "Web browser";
@@ -74,6 +74,7 @@ in stdenv.mkDerivation {
       --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \
       --add-flags "${chromium.plugins.flagsEnabled}"
 
+    ln -s "${chromium.browser}/share/icons" "$out/share/icons"
     cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
   '';
 

From da0c8f33efe1eb1ae9f47f5a3fdf6f4d2c461aa9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 27 Apr 2014 13:05:35 -0500
Subject: [PATCH 0610/2033] nixpkgs: yices 2.2.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/yices/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/science/logic/yices/default.nix

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
new file mode 100644
index 00000000000..5a1a4ef1992
--- /dev/null
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
+in
+stdenv.mkDerivation rec {
+  name    = "yices-${version}";
+  version = "2.2.1";
+
+  src =
+    if stdenv.system == "i686-linux"
+    then fetchurl {
+      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-i686-pc-linux-gnu-static-gmp.tar.gz&accept=I+accept";
+      name = "yices-${version}-i686.tar.gz";
+      sha256 = "12jzk3kqlbqa5x6rl92cpzj7dch7gm7fnbj72wifvwgdj4zyhrra";
+    }
+    else fetchurl {
+      url = "http://yices.csl.sri.com/cgi-bin/yices2-newdownload.cgi?file=yices-2.2.1-x86_64-unknown-linux-gnu-static-gmp.tar.gz&accept=I+accept";
+      name = "yices-${version}-x86_64.tar.gz";
+      sha256 = "0fpmihf6ykcg4qbsimkamgcwp4sl1xyxmz7q28ily91rd905ijaj";
+    };
+
+  buildPhase = false;
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/include
+    cd bin     && mv * $out/bin     && cd ..
+    cd lib     && mv * $out/lib     && cd ..
+    cd include && mv * $out/include && cd ..
+
+    patchelf --set-rpath ${libPath} $out/lib/libyices.so.${version}
+  '';
+
+  meta = {
+    description = "Yices is a high-performance theorem prover and SMT solver";
+    homepage    = "http://yices.csl.sri.com";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45ba490702e..06f5211d9b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10356,6 +10356,8 @@ let
 
   tptp = callPackage ../applications/science/logic/tptp {};
 
+  yices = callPackage ../applications/science/logic/yices {};
+
   z3 = callPackage ../applications/science/logic/z3 {};
 
   boolector   = boolector15;

From 68598530456af239bd4bb2c1346d29d7fe7b280f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 27 Apr 2014 20:15:59 +0200
Subject: [PATCH 0611/2033] psmisc: (from upstream) Typo in fuser makes -M on
 all the time

---
 ...ypo-in-fuser-makes-M-on-all-the-time.patch | 44 +++++++++++++++++++
 pkgs/os-specific/linux/psmisc/default.nix     |  3 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch

diff --git a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
new file mode 100644
index 00000000000..2bb93955aea
--- /dev/null
+++ b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
@@ -0,0 +1,44 @@
+From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
+From: Brad Jorsch <anomie@users.sourceforge.net>
+Date: Fri, 28 Feb 2014 21:55:02 +1100
+Subject: [PATCH] Typo in fuser makes -M on all the time
+
+Brad found that fuser had the -M option on all the time.
+A simple but significant typo caused this, thanks the the patch.
+
+Bug-Debian: http://bugs.debian.org/740275
+
+Signed-off-by: Craig Small <csmall@enc.com.au>
+---
+ ChangeLog   | 4 ++++
+ src/fuser.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index fd1cccf..e5f784c 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++Changes in 22.22
++================
++	* Fixed typo in fuser which has -M on Debian #740275
++
+ Changes in 22.21
+ ================
+ 	* Missing comma in fuser(1) added Debian #702391
+diff --git a/src/fuser.c b/src/fuser.c
+index b485f65..389b302 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
+ 		usage(_("No process specification given"));
+ 
+ 	/* Check if -M flag was used and if so check mounts */
+-	if (opts * OPT_ISMOUNTPOINT) {
++	if (opts & OPT_ISMOUNTPOINT) {
+ 	    check_mountpoints(&mounts, &names_head, &names_tail);
+ 	}
+ 
+-- 
+1.9.2
+
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 1215c5261f4..5cf5e9a542d 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses];
 
+  # From upstream, will be in next release.
+  patches = [ ./0001-Typo-in-fuser-makes-M-on-all-the-time.patch ];
+
   meta = {
     homepage = http://psmisc.sourceforge.net/;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";

From 0f1f2115e91edb65ad3b4edea08ffeb96665a5c1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 27 Apr 2014 13:25:19 -0500
Subject: [PATCH 0612/2033] hol_light: fix script, upgrade to r189

This also tweaks the version number to just use the SVN revision (rather
than date), since it's unambiguous and increasing anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../editors/emacs-modes/hol_light/default.nix | 19 +++++++------
 .../science/logic/hol_light/default.nix       | 28 ++++++++-----------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
index 24eba20be6c..c32669239f8 100644
--- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix
+++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix
@@ -1,15 +1,12 @@
-{stdenv, fetchsvn}:
+{ stdenv, fetchsvn }:
 
-let
-  revision = "73";
-in
-
-stdenv.mkDerivation {
-  name = "hol_light_mode-${revision}";
+stdenv.mkDerivation rec {
+  name    = "hol_light-mode-${version}";
+  version = "73";
 
   src = fetchsvn {
     url = http://seanmcl-ocaml-lib.googlecode.com/svn/trunk/workshop/software/emacs;
-    rev = revision;
+    rev = version;
     sha256 = "3ca83098960439da149a47e1caff32536601559a77f04822be742a390c67feb7";
   };
 
@@ -20,6 +17,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "A HOL Light mode for emacs";
+    description = "A HOL Light mode for Emacs";
+    homepage    = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
+    license     = stdenv.lib.licenses.gpl2Plus;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 54c7174bde7..3e6440ea977 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,19 +1,20 @@
-{stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}:
+{ stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5 }:
 
 let
   start_script = ''
     #!/bin/sh
     cd "$out/lib/hol_light"
-    exec ${ocaml}/bin/ocaml -I "camlp5 -where" -init make.ml
+    exec ${ocaml}/bin/ocaml -I \`${camlp5}/bin/camlp5 -where\` -init make.ml
   '';
 in
+stdenv.mkDerivation rec {
+  name     = "hol_light-${version}";
+  version  = "189";
 
-stdenv.mkDerivation {
-  name = "hol_light-20140112";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "179";
-    sha256 = "1j402s7142fj09bjijrkargwx03fvbdwmn0hgzzmi6s4p1y7gww0";
+    rev = version;
+    sha256 = "1v10l64rs7da2kag3wlb651i09pn83icy9n5z84j8h1iwlxzajdh";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];
@@ -27,16 +28,9 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Interactive theorem prover based on Higher-Order Logic";
-    longDescription = ''
-      HOL Light is a computer program to help users prove interesting
-      mathematical theorems completely formally in Higher-Order Logic.  It sets
-      a very exacting standard of correctness, but provides a number of
-      automated tools and pre-proved mathematical theorems (e.g., about
-      arithmetic, basic set theory and real analysis) to save the user work.
-      It is also fully programmable, so users can extend it with new theorems
-      and inference rules without compromising its soundness.
-    '';
-    homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
-    license = stdenv.lib.licenses.bsd2;
+    homepage    = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
+    license     = stdenv.lib.licenses.bsd2;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From 111e1536e58eb4f61d7a40bb33bb11383d8278f0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 27 Apr 2014 13:51:54 -0500
Subject: [PATCH 0613/2033] nixpkgs: remove cb1cat

Brice Minaud reported a simple attack on the CBEAM Pi permutation
function, resulting in it being withdrawn from CAESAR. :(

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/cb1cat/default.nix | 24 ------------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/tools/security/cb1cat/default.nix

diff --git a/pkgs/tools/security/cb1cat/default.nix b/pkgs/tools/security/cb1cat/default.nix
deleted file mode 100644
index 546ace2d8ed..00000000000
--- a/pkgs/tools/security/cb1cat/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name    = "cb1cat-${version}";
-  version = "20140403153000";
-
-  src = fetchurl {
-    url    = "https://www.cblnk.com/cb1cat/dist/${name}.tgz";
-    sha256 = "1zi0rxbgmp6vkcarg493gfgn7pnfdpz0iplcgslbc45n2bxkv70q";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv cb1cat $out/bin
-  '';
-
-  meta = {
-    description = "cryptographic tool based on the CBEAMr1 sponge function";
-    homepage    = "https://www.cblnk.com/cb1cat/";
-    license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06f5211d9b9..033c80e66ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -426,8 +426,6 @@ let
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
-  cb1cat = callPackage ../tools/security/cb1cat { };
-
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aircrackng = callPackage ../tools/networking/aircrack-ng { };

From ad1ce14a68379755886bca3b67a1dceb82d9b9db Mon Sep 17 00:00:00 2001
From: "Luis G. Torres" <lgtorres42@gmail.com>
Date: Sun, 27 Apr 2014 23:47:06 +0200
Subject: [PATCH 0614/2033] eigen: upgrading version to 3.2.1

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 8a1cca4bdd4..72a140ed371 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  v = "3.2.0";
+  v = "3.2.1";
 in
 stdenv.mkDerivation {
   name = "eigen-${v}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
     name = "eigen-${v}.tar.bz2";
-    sha256 = "1dpshkcqjz3ckad56mkk1agbnlq0rk2d0wv14zwjg4lk1nb7h7q1";
+    sha256 = "12ljdirih9n3cf8hy00in285c2ccah7mgalmmr8gc3ldwznz5rk6";
   };
   
   nativeBuildInputs = [ cmake ];

From 39b5a0c3a29ce48d99bb870b5e42cae17e462ce9 Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sun, 27 Apr 2014 22:20:37 -0700
Subject: [PATCH 0615/2033] libgnurl, a fork of libcurl used by GNUnet

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

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
new file mode 100644
index 00000000000..f055b4f5a95
--- /dev/null
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "7.35.0";
+
+  name = "libgnurl-${version}";
+
+  src = fetchurl {
+    url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
+    sha256 = "0dzj22f5z6ppjj1aq1bml64iwbzzcd8w1qy3bgpk6gnzqslsxknf";
+  };
+
+  preConfigure = ''
+    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fork of libcurl used by GNUnet";
+    homepage    = https://gnunet.org/gnurl;
+    maintainers = with maintainers; [ falsifian ];
+    hydraPlatforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 033c80e66ae..7e4e50a2d06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4945,6 +4945,8 @@ let
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libgnurl = callPackage ../development/libraries/libgnurl { };
+
   libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };

From c372dc74c2bd583d7b05996cb5a9fc8fc8af19bf Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Sun, 27 Apr 2014 22:50:59 -0700
Subject: [PATCH 0616/2033] gnunet: add libgnurl and GnuTLS as dependencies

libgnurl is essential for bootstrapping (needed to download a hostlist).
GnuTLS is needed by gnunet-gns-proxy.

Also sort dependencies alphabetically.
---
 pkgs/applications/networking/p2p/gnunet/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index bbb3561bae9..bcd0eb503f6 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, libunistring, libidn
-, makeWrapper }:
+{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
+, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
+, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
   name = "gnunet-0.10.1";
@@ -12,9 +11,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libextractor libmicrohttpd libgcrypt gmp curl libtool
-    zlib adns sqlite libxml2 ncurses libidn
-    pkgconfig gettext libunistring makeWrapper
+    adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
+    libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
+    pkgconfig sqlite zlib
   ];
 
   preConfigure = ''

From 6eaced35820f4c575dd545fb721abd74f248c8cb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 08:16:27 +0200
Subject: [PATCH 0617/2033] Don't mount /sys/fs/fuse/connections and
 /sys/kernel/config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These fail to mount if you don't have the appropriate kernel support,
and this confuses NixOps' ‘check’ command. We should teach NixOps not
to complain about non-essential mount points, but in the meantime it's
better to turn them off.
---
 nixos/modules/system/boot/systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 52ba31cdeed..9a0f48fe170 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -103,8 +103,8 @@ let
       "dev-hugepages.mount"
       "dev-mqueue.mount"
       "proc-sys-fs-binfmt_misc.mount"
-      "sys-fs-fuse-connections.mount"
-      "sys-kernel-config.mount"
+      #"sys-fs-fuse-connections.mount"
+      #"sys-kernel-config.mount"
       "sys-kernel-debug.mount"
 
       # Maintaining state across reboots.

From 56b4b841ae45c9fb512096852d06410e7ebe45d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 08:28:44 +0200
Subject: [PATCH 0618/2033] switch-to-configuration: Use old systemctl to stop
 units

Otherwise, when switching from systemd 203 to 212, you get errors like:

  Failed to stop remote-fs.target: Bad message
  Failed to stop systemd-udevd-control.socket: Bad message
  ...
---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 7c2d64d2e1a..7bce06cf3b5 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -65,7 +65,7 @@ $SIG{PIPE} = "IGNORE";
 sub getActiveUnits {
     # FIXME: use D-Bus or whatever to query this, since parsing the
     # output of list-units is likely to break.
-    my $lines = `LANG= @systemd@/bin/systemctl list-units --full --no-legend`;
+    my $lines = `LANG= systemctl list-units --full --no-legend`;
     my $res = {};
     foreach my $line (split '\n', $lines) {
         chomp $line;
@@ -297,7 +297,7 @@ foreach my $device (keys %$prevSwaps) {
 if (scalar @unitsToStop > 0) {
     @unitsToStop = unique(@unitsToStop);
     print STDERR "stopping the following units: ", join(", ", sort(@unitsToStop)), "\n";
-    system("@systemd@/bin/systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
+    system("systemctl", "stop", "--", @unitsToStop); # FIXME: ignore errors?
 }
 
 print STDERR "NOT restarting the following units: ", join(", ", sort(@unitsToSkip)), "\n"

From d62130066588f4f12d8e0d24895679e670b57dd6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 09:13:57 +0200
Subject: [PATCH 0619/2033] Revert "Don't mount /sys/fs/fuse/connections and
 /sys/kernel/config"

This reverts commit 6eaced35820f4c575dd545fb721abd74f248c8cb. Doesn't
work very well, e.g. if you actually have the FUSE module loaded. And
in any case it's already fixed in NixOps.
---
 nixos/modules/system/boot/systemd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 9a0f48fe170..52ba31cdeed 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -103,8 +103,8 @@ let
       "dev-hugepages.mount"
       "dev-mqueue.mount"
       "proc-sys-fs-binfmt_misc.mount"
-      #"sys-fs-fuse-connections.mount"
-      #"sys-kernel-config.mount"
+      "sys-fs-fuse-connections.mount"
+      "sys-kernel-config.mount"
       "sys-kernel-debug.mount"
 
       # Maintaining state across reboots.

From 9cb0a79538795f07de305d8279da9c005e90d9a8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 28 Apr 2014 09:24:21 +0000
Subject: [PATCH 0620/2033] livestreamer: version 1.8.0

A test fails with Python 3.4 so we ignore that one.
---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ba305e961e0..01c4f826f5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4522,6 +4522,30 @@ rec {
     };
   };
 
+  livestreamer = if isPy34 then null else (buildPythonPackage {
+    #version = "1.8.0";
+    name = "livestreamer-1.8.0";
+
+    src = fetchurl {
+      url = "https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz";
+      sha256 = "0fzpznbnhzrqawxdljvyml5251wbr3nifdrvnmh2b8vz356js4l8";
+    };
+
+    buildInputs = [ pkgs.makeWrapper ];
+    propagatedBuildInputs = [ requests ];
+    postInstall = ''
+      wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
+    '';
+
+    meta = {
+      homepage = http://livestreamer.tanuki.se;
+      description = ''
+        Livestreamer is CLI program that extracts streams from various
+        services and pipes them into a video player of choice.
+      '';
+      license = "bsd";
+    };
+  });
 
   oauth2 = buildPythonPackage (rec {
     name = "oauth2-1.5.211";

From 692fc6fdc19180c8b27d8495339b25e77258ce4f Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 28 Apr 2014 15:35:20 +0800
Subject: [PATCH 0621/2033] Update haskell-http-kit to version 0.2.1

Closes #2430

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/haskell/http-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
index 6586b4d5ce2..f4dcdc204be 100644
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-kit";
-  version = "0.2.0";
-  sha256 = "0pwcaf52abyjy3jknb7q18j50qd7arz7ck8xffbv9pbp0z7lfd6n";
+  version = "0.2.1";
+  sha256 = "1x3wqjbgs605wrl2dgvszdkvpkfrin4j9azkaa57hza6bgwpidra";
   buildDepends = [ caseInsensitive httpTypes ];
   testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
   meta = {

From 62b883070b5877f8406a033c7c3867c1b53866ba Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 28 Apr 2014 15:51:24 +0800
Subject: [PATCH 0622/2033] Update haskell-base-compat to version 0.5.0

Closes #2431

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/libraries/haskell/base-compat/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix
index 5ee81698eb5..83cde5c0512 100644
--- a/pkgs/development/libraries/haskell/base-compat/default.nix
+++ b/pkgs/development/libraries/haskell/base-compat/default.nix
@@ -1,11 +1,11 @@
-{ cabal, errorcallEqInstance, hspec, setenv }:
+{ cabal, errorcallEqInstance, hspec, QuickCheck, setenv }:
 
 cabal.mkDerivation (self: {
   pname = "base-compat";
-  version = "0.4.2";
-  sha256 = "0rcra6bgx955c2yd52y6v7lmlm5r86sdmii3qapx6yghqhdslzry";
+  version = "0.5.0";
+  sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1";
   buildDepends = [ errorcallEqInstance setenv ];
-  testDepends = [ hspec setenv ];
+  testDepends = [ hspec QuickCheck ];
   meta = {
     description = "A compatibility layer for base";
     license = self.stdenv.lib.licenses.mit;

From 379c8ba2376f74100b37d2d63549741037773e5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 12:01:10 +0200
Subject: [PATCH 0623/2033] polkit: Restart using systemctl

The use of pkill is now particularly bad due to containers (it might
kill processes in containers).
---
 nixos/modules/security/polkit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 5933cdc0cec..df42d5a3e02 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -101,7 +101,7 @@ in
 
         # Force polkitd to be restarted so that it reloads its
         # configuration.
-        ${pkgs.procps}/bin/pkill -INT -u root -x polkitd
+        ${config.systemd.package}/bin/systemctl try-restart polkit.service
       '';
 
     users.extraUsers.polkituser = {

From c6f76861dc1ce45998bdcd25a817542161cf6248 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 12:01:33 +0200
Subject: [PATCH 0624/2033] Update release notes

---
 nixos/doc/manual/release-notes.xml | 94 +++++++++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 7995497708e..bacd97e0dc4 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -1,4 +1,5 @@
 <appendix xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
           xml:id="ch-release-notes">
 
 <title>Release notes</title>
@@ -9,8 +10,9 @@
 
 <title>Release 14.04 (“Baboon”, 2014/04/??)</title>
 
-<para>This is the second stable release branch of NixOS.  The main
-enhancements are the following:
+<para>This is the second stable release branch of NixOS.  In addition
+to numerous new and upgraded packages and modules, this release has
+the following highlights:
 
 <itemizedlist>
 
@@ -18,9 +20,63 @@ enhancements are the following:
   <xref linkend="sec-uefi-installation"/> for
   details.</para></listitem>
 
+  <listitem><para>Systemd has been updated to version 212, which has
+  <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
+  improvements</link>. NixOS now automatically starts systemd user
+  instances when you log in. You can define global user units through
+  the <option>systemd.unit.*</option> options.</para></listitem>
+
   <listitem><para>NixOS is now based on Glibc 2.19 and GCC
   4.8.</para></listitem>
 
+  <listitem><para>The default Linux kernel has been updated to
+  3.12.</para></listitem>
+
+  <listitem><para>KDE has been updated to 4.12.</para></listitem>
+
+  <listitem><para>Nix has been updated to 1.7 (<link
+  xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).</para></listitem>
+
+  <listitem><para>NixOS now supports fully declarative management of
+  users and groups. If you set <option>users.mutableUsers</option> to
+  <literal>false</literal>, then the contents of
+  <filename>/etc/passwd</filename> and <filename>/etc/group</filename>
+  will be <link
+  xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link>
+  to your NixOS configuration. For instance, if you remove a user from
+  <option>users.extraUsers</option> and run
+  <command>nixos-rebuild</command>, the user account will cease to
+  exist. Also, imperative commands for managing users and groups, such
+  as <command>useradd</command>, are no longer available. If
+  <option>users.mutableUsers</option> is <literal>true</literal> (the
+  default), then behaviour is unchanged from NixOS
+  13.10.</para></listitem>
+
+  <listitem><para>NixOS now has basic container support, meaning you
+  can easily run a NixOS instance as a container in a NixOS host
+  system. These containers are suitable for testing and
+  experimentation but not production use, since they’re not fully
+  isolated from the host. See <xref linkend="ch-containers"/> for
+  details.</para></listitem>
+
+  <listitem><para>Systemd units provided by packages can now be
+  overridden from the NixOS configuration. For instance, if a package
+  <literal>foo</literal> provides systemd units, you can say:
+
+<programlisting>
+systemd.packages = [ pkgs.foo ];
+</programlisting>
+
+  to enable those units. You can then set or override unit options in
+  the usual way, e.g.
+
+<programlisting>
+systemd.services.foo.wantedBy = [ "multi-user.target" ];
+systemd.services.foo.serviceConfig.MemoryLimit = "512M";
+</programlisting>
+
+  </para></listitem>
+
 </itemizedlist>
 
 </para>
@@ -47,6 +103,18 @@ error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:
 
   </para></listitem>
 
+  <listitem><para>The Adobe Flash player is no longer enabled by
+  default in the Firefox and Chromium wrappers. To enable it, you must
+  set:
+
+<programlisting>
+nixpkgs.config.allowUnfree = true;
+nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox
+nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium
+</programlisting>
+
+  </para></listitem>
+
   <listitem><para>The firewall is now enabled by default. If you don’t
   want this, you need to disable it explicitly:
 
@@ -65,6 +133,28 @@ networking.firewall.enable = false;
   sets a default for the option
   <option>services.mysql.package</option>.</para></listitem>
 
+  <listitem><para>Package variants are now differentiated by suffixing
+  the name, rather than the version. For instance,
+  <filename>sqlite-3.8.4.3-interactive</filename> is now called
+  <filename>sqlite-interactive-3.8.4.3</filename>. This ensures that
+  <literal>nix-env -i sqlite</literal> is unambiguous, and that
+  <literal>nix-env -u</literal> won’t “upgrade”
+  <literal>sqlite</literal> to <literal>sqlite-interactive</literal>
+  or vice versa. Notably, this change affects the Firefox wrapper
+  (which provides plugins), as it is now called
+  <literal>firefox-wrapper</literal>. So when using
+  <command>nix-env</command>, you should do <literal>nix-env -e
+  firefox; nix-env -i firefox-wrapper</literal> if you want to keep
+  using the wrapper. This change does not affect declarative package
+  management, since attribute names like
+  <literal>pkgs.firefoxWrapper</literal> were already
+  unambiguous.</para></listitem>
+
+  <listitem><para>The symlink <filename>/etc/ca-bundle.crt</filename>
+  is gone. Programs should instead use the environment variable
+  <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
+  <filename>/etc/ssl/certs/ca-bundle.crt</filename>).</para></listitem>
+
 </itemizedlist>
 
 </para>

From aa02b2cfb1983602c2c55c03d9787f3b6e31da82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 12:37:19 +0200
Subject: [PATCH 0625/2033] Bump some mentions of 13.10

---
 nixos/doc/manual/installation.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 03540aa83aa..6cf69386e56 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -473,7 +473,7 @@ been built.  These channels are:
 <itemizedlist>
   <listitem>
     <para>Stable channels, such as <literal
-    xlink:href="http://nixos.org/channels/nixos-13.10">nixos-13.10</literal>.
+    xlink:href="http://nixos.org/channels/nixos-14.04">nixos-14.04</literal>.
     These only get conservative bug fixes and package upgrades.  For
     instance, a channel update may cause the Linux kernel on your
     system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but
@@ -499,8 +499,8 @@ appliances.)</para>
 
 <para>When you first install NixOS, you’re automatically subscribed to
 the NixOS channel that corresponds to your installation source.   For
-instance, if you installed from a 13.10 ISO, you will be subscribed to
-the <literal>nixos-13.10</literal> channel.  To see which NixOS
+instance, if you installed from a 14.04 ISO, you will be subscribed to
+the <literal>nixos-14.04</literal> channel.  To see which NixOS
 channel you’re subscribed to, run the following as root:
 
 <screen>
@@ -515,10 +515,10 @@ $ nix-channel --add http://nixos.org/channels/<replaceable>channel-name</replace
 </screen>
 
 (Be sure to include the <literal>nixos</literal> parameter at the
-end.)  For instance, to use the NixOS 13.10 stable channel:
+end.)  For instance, to use the NixOS 14.04 stable channel:
 
 <screen>
-$ nix-channel --add http://nixos.org/channels/nixos-13.10 nixos
+$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos
 </screen>
 
 But it you want to live on the bleeding edge:

From 0af5d11a6fbdf541ec4ecd87a90516c233e5e5c8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 14:34:34 +0200
Subject: [PATCH 0626/2033] qemu-image: Remove (obsolete)

---
 .../virtualization/qemu/linux-img/default.nix | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/qemu/linux-img/default.nix

diff --git a/pkgs/applications/virtualization/qemu/linux-img/default.nix b/pkgs/applications/virtualization/qemu/linux-img/default.nix
deleted file mode 100644
index 58a2b29c259..00000000000
--- a/pkgs/applications/virtualization/qemu/linux-img/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "qemu-linux-image-0.2";
-
-  src = fetchurl {
-    url = http://wiki.qemu.org/download/linux-0.2.img.bz2;
-    sha256 = "08xlwy1908chpc4fsqy2v13zi25dapk0ybrd43fj95v67kdj5hj1";
-  };
-
-  unpackPhase = "true";
-
-  installPhase =
-    ''
-      mkdir -p $out/share/qemu-images
-      bunzip2 < $src > $out/share/qemu-images/linux-0.2.img
-    '';
-
-  meta = {
-    description = "QEMU sample Linux disk image";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 033c80e66ae..2cb412f4ddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9013,8 +9013,6 @@ let
 
   qemu = callPackage ../applications/virtualization/qemu { };
 
-  qemuImage = callPackage ../applications/virtualization/qemu/linux-img { };
-
   qmmp = callPackage ../applications/audio/qmmp { };
 
   qsampler = callPackage ../applications/audio/qsampler { };

From 39faed1f2f1b0bbb767785d916712790e78fcb5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 14:37:46 +0200
Subject: [PATCH 0627/2033] qemu: Apply patch for CVE-2014-0150, CVE-2014-2894

---
 .../virtualization/qemu/cve-2014-0150.patch        | 14 ++++++++++++++
 .../virtualization/qemu/cve-2014-2894.patch        | 14 ++++++++++++++
 pkgs/applications/virtualization/qemu/default.nix  |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/virtualization/qemu/cve-2014-0150.patch
 create mode 100644 pkgs/applications/virtualization/qemu/cve-2014-2894.patch

diff --git a/pkgs/applications/virtualization/qemu/cve-2014-0150.patch b/pkgs/applications/virtualization/qemu/cve-2014-0150.patch
new file mode 100644
index 00000000000..a086b369321
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/cve-2014-0150.patch
@@ -0,0 +1,14 @@
+
+diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
+index 439477b..33bd233 100644
+--- a/hw/net/virtio-net.c
++++ b/hw/net/virtio-net.c
+ <at>  <at>  -677,7 +677,7  <at>  <at>  static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd,
+         goto error;
+     }
+
+-    if (in_use + mac_data.entries <= MAC_TABLE_ENTRIES) {
++    if (mac_data.entries <= MAC_TABLE_ENTRIES - in_use) {
+         s = iov_to_buf(iov, iov_cnt, 0, &macs[in_use * ETH_ALEN],
+                        mac_data.entries * ETH_ALEN);
+         if (s != mac_data.entries * ETH_ALEN) {
diff --git a/pkgs/applications/virtualization/qemu/cve-2014-2894.patch b/pkgs/applications/virtualization/qemu/cve-2014-2894.patch
new file mode 100644
index 00000000000..4f4bcfc06ad
--- /dev/null
+++ b/pkgs/applications/virtualization/qemu/cve-2014-2894.patch
@@ -0,0 +1,14 @@
+
+diff --git a/hw/ide/core.c b/hw/ide/core.c
+index e1dfe54..c943a4d 100644
+--- a/hw/ide/core.c
++++ b/hw/ide/core.c
+@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
+         case 2: /* extended self test */
+             s->smart_selftest_count++;
+             if (s->smart_selftest_count > 21) {
+-                s->smart_selftest_count = 0;
++                s->smart_selftest_count = 1;
+             }
+             n = 2 + (s->smart_selftest_count - 1) * 24;
+             s->smart_selftest_data[n] = s->sector;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b6e28d44411..ac9b3448a14 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x5y06zhp0gc97g1sb98vf7dkawg63xywv0mbnpfnbi20jh452fn";
   };
 
+  patches = [ ./cve-2014-0150.patch ./cve-2014-2894.patch ];
+
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
       vde2 alsaLib texinfo libuuid flex bison makeWrapper

From 17336efdd8fcfdb830429683684e167d6443bd11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 14:45:54 +0200
Subject: [PATCH 0628/2033] apr: Update to 1.5.1

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

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index e248dbd649e..c2737b20eff 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.5.0";
+  name = "apr-1.5.1";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    md5 = "cc93bd2c12d0d037f68e21cc6385dc31";
+    sha256 = "1b4qw686bwjn19iyb0lg918q23xxd6s2gnyczhjq992d3m1vwjp9";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];

From de1c182b0ab3a0e0efe30ea9ac41934bd378eae5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 7 Nov 2013 14:42:44 +0000
Subject: [PATCH 0629/2033] Fix EC2 creation script for latest nixops

(cherry picked from commit 361eb3a5f50aba4ecfe08bf37640179dfc2e6453)
---
 nixos/maintainers/scripts/ec2/amazon-base-config.nix |  5 +++++
 nixos/maintainers/scripts/ec2/create-ebs-amis.py     | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 nixos/maintainers/scripts/ec2/amazon-base-config.nix

diff --git a/nixos/maintainers/scripts/ec2/amazon-base-config.nix b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
new file mode 100644
index 00000000000..d23f15e828b
--- /dev/null
+++ b/nixos/maintainers/scripts/ec2/amazon-base-config.nix
@@ -0,0 +1,5 @@
+{ modulesPath, ...}:
+{
+  imports = [ "${modulesPath}/virtualisation/amazon-config.nix" ];
+  services.journald.rateLimitBurst = 0;
+}
diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index eab111a2665..4e1aea65980 100755
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@@ -8,9 +8,11 @@ import nixops.util
 from nixops import deployment
 from boto.ec2.blockdevicemapping import BlockDeviceMapping, BlockDeviceType
 import boto.ec2
+from nixops.statefile import StateFile, get_default_state_file
 
 parser = argparse.ArgumentParser(description='Create an EBS-backed NixOS AMI')
 parser.add_argument('--region', dest='region', required=True, help='EC2 region to create the image in')
+parser.add_argument('--channel', dest='channel', default="13.10", help='Channel to use')
 parser.add_argument('--keep', dest='keep', action='store_true', help='Keep NixOps machine after use')
 parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM image')
 parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")
@@ -37,11 +39,11 @@ f.write('''{{
 '''.format(args.region, ebs_size))
 f.close()
 
-db = deployment.open_database(deployment.get_default_state_file())
+db = StateFile(get_default_state_file())
 try:
-    depl = deployment.open_deployment(db, "ebs-creator")
+    depl = db.open_deployment("ebs-creator")
 except Exception:
-    depl = deployment.create_deployment(db)
+    depl = db.create_deployment()
     depl.name = "ebs-creator"
 depl.auto_response = "y"
 depl.nix_exprs = [os.path.abspath("./ebs-creator.nix"), os.path.abspath("./ebs-creator-config.nix")]
@@ -64,7 +66,7 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
-m.run_command("nix-channel --add http://nixos.org/channels/nixos-unstable")
+m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel))
 m.run_command("nix-channel --update")
 m.run_command("nixos-rebuild switch")
 version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0]

From 2ca913c5093365538730015f09306349db93764f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 18:33:39 +0200
Subject: [PATCH 0630/2033] Add some packages to the channel

---
 pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix | 7 +++++--
 pkgs/desktops/xfce/applications/xfce4-notifyd.nix          | 2 ++
 pkgs/top-level/release.nix                                 | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
index fffffcb0c2d..315f6ff9c5a 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
 
 stdenv.mkDerivation rec {
-  #name = "gnome-icon-theme-3.4.0";
   name = "gnome-icon-theme-2.91.93";
 
   src = fetchurl {
@@ -9,6 +8,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2";
     sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
   };
-  
+
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
index ace7aa7a2c7..d39778c9371 100644
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
@@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
     homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
     description = "Notification daemon for Xfce";
     license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2915887ec11..fd990ebf17e 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -421,7 +421,9 @@ let
         xf86videointel = linux;
         xf86videonv = linux;
         xf86videovesa = linux;
+        xf86videovmware = linux;
         xfs = linux;
+        xinput = linux;
         xkbcomp = linux;
         xlsclients = linux;
         xmessage = linux;

From 9eff988bbf897541256590f9f79daf9f68f1e805 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 18:49:18 +0200
Subject: [PATCH 0631/2033] haskell-enumset: re-generate with cabal2nix

---
 .../libraries/haskell/enumset/default.nix       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix
index 4f55049a0a9..0bb03c67898 100644
--- a/pkgs/development/libraries/haskell/enumset/default.nix
+++ b/pkgs/development/libraries/haskell/enumset/default.nix
@@ -4,20 +4,11 @@ cabal.mkDerivation (self: {
   pname = "enumset";
   version = "0.0.4";
   sha256 = "1dzwxi7i757zdf68v470n8dwn1g8kg51w3c1mwqyxwq85650805w";
-
-  isExecutable = false;
-  isLibrary = true;
-
-  buildDepends = [
-    dataAccessor
-    storableRecord
-  ];
-
+  buildDepends = [ dataAccessor storableRecord ];
   meta = {
     description = "Sets of enumeration values represented by machine words";
-    license     = self.stdenv.lib.licenses.bsd3;
-    platforms   = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ertes];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ertes ];
   };
-
 })

From 5ac35c0f3b019f6d9b871309ebe89046044b35b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 18:54:22 +0200
Subject: [PATCH 0632/2033] haskell-tz: fix build (of the test suite)

---
 pkgs/development/libraries/haskell/tz/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix
index 5239578f05a..95cd928a99e 100644
--- a/pkgs/development/libraries/haskell/tz/default.nix
+++ b/pkgs/development/libraries/haskell/tz/default.nix
@@ -1,7 +1,6 @@
-{ cabal, binary, bindingsPosix, deepseq, HUnit, QuickCheck
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkTh, time, tzdata, vector
-, pkgs_tzdata
+{ cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata
+, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector
 }:
 
 cabal.mkDerivation (self: {
@@ -9,11 +8,11 @@ cabal.mkDerivation (self: {
   version = "0.0.0.5";
   sha256 = "03s5vs08dj3r7rq78ncya6x6dazvr93gfylyynwybpai09l2y89v";
   buildDepends = [ binary deepseq time tzdata vector ];
-  preCheck = "export TZDIR=${pkgs_tzdata}/share/zoneinfo";
   testDepends = [
     bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkTh time tzdata
   ];
+  preConfigure = "export TZDIR=${pkgs_tzdata}/share/zoneinfo";
   meta = {
     homepage = "https://github.com/nilcons/haskell-tz";
     description = "Efficient time zone handling";

From 11fc857e30104949ef4b41fb6e8d703ab2a3ec50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 18:57:09 +0200
Subject: [PATCH 0633/2033] haskell-jack: re-generate with cabal2nix

---
 .../libraries/haskell/jack/default.nix        | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix
index ad63399fa4d..3b8be28e790 100644
--- a/pkgs/development/libraries/haskell/jack/default.nix
+++ b/pkgs/development/libraries/haskell/jack/default.nix
@@ -1,30 +1,22 @@
-{ cabal, enumset, eventList, explicitException, jackaudio, midi,
-nonNegative, transformers }:
+{ cabal, enumset, eventList, explicitException, jackaudio, midi
+, nonNegative, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "jack";
   version = "0.7.0.2";
   sha256 = "06mf1sw1lp81b3d4hsgc199m30drdnxzzlmsxg4p1yvydjfdk4gj";
-
-  isExecutable = false;
   isLibrary = true;
-
-  pkgconfigDepends = [jackaudio];
-
+  isExecutable = true;
   buildDepends = [
-    enumset
-    eventList
-    explicitException
-    midi
-    nonNegative
-    transformers
+    enumset eventList explicitException midi nonNegative transformers
   ];
-
+  pkgconfigDepends = [ jackaudio ];
   meta = {
+    homepage = "http://www.haskell.org/haskellwiki/JACK";
     description = "Bindings for the JACK Audio Connection Kit";
-    homepage    = "http://www.haskell.org/haskellwiki/JACK";
-    license     = self.stdenv.lib.licenses.gpl2Plus;
-    platforms   = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ertes];
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ertes ];
   };
 })

From 93846bef592247580b5076c077ba76f84b42934d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:00:27 +0200
Subject: [PATCH 0634/2033] haskell-hfsevents: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/hfsevents/default.nix b/pkgs/development/libraries/haskell/hfsevents/default.nix
index 624420fb0ca..3f4b1355c61 100644
--- a/pkgs/development/libraries/haskell/hfsevents/default.nix
+++ b/pkgs/development/libraries/haskell/hfsevents/default.nix
@@ -1,4 +1,4 @@
-{ cabal, cereal, mtl, text, gccApple }:
+{ cabal, cereal, gccApple, mtl, text }:
 
 cabal.mkDerivation (self: {
   pname = "hfsevents";

From 685ca50650a466a32358db32c846aa0b452b27bf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 19:12:48 +0200
Subject: [PATCH 0635/2033] gpm: Depend on /dev/input/mice

---
 nixos/modules/services/hardware/udev.nix | 3 +++
 nixos/modules/services/ttys/gpm.nix      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 507752dabcf..f28c00a8e4e 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -20,6 +20,9 @@ let
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
     KERNEL=="kqemu",                MODE="0666"
+
+    # Needed for gpm.
+    KERNEL=="input/mice", TAG+="systemd"
   '';
 
   # Perform substitutions in all udev rules files.
diff --git a/nixos/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index 03b0f39824d..1c0fcf8f16c 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
@@ -44,7 +44,7 @@ in
       { description = "Console Mouse Daemon";
 
         wantedBy = [ "multi-user.target" ];
-        requires = [ "getty.target" ];
+        requires = [ "dev-input-mice.device" ];
 
         serviceConfig.ExecStart = "@${pkgs.gpm}/sbin/gpm gpm -m /dev/input/mice -t ${cfg.protocol}";
         serviceConfig.Type = "forking";

From f5cd4eef1136c617ef66e40191e1333261102bc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 19:13:04 +0200
Subject: [PATCH 0636/2033] cpufreq: Don't fail if the CPU doesn't support
 frequency setting

---
 nixos/modules/tasks/cpu-freq.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index eb1dfe5f6be..a8c63c13428 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -41,13 +41,12 @@ in
       after = [ "systemd-modules-load.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [ cpupower ];
-      script = ''
-        cpupower frequency-set -g ${cfg.cpuFreqGovernor}
-      '';
       unitConfig.ConditionVirtualization = false;
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = "yes";
+        ExecStart = "${cpupower}/bin/cpupower frequency-set -g ${cfg.cpuFreqGovernor}";
+        SuccessExitStatus = "0 237";
       };
     };
 

From cbfba813fe22b80e82bfa6fd5c10db6624130774 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 20:10:49 +0200
Subject: [PATCH 0637/2033] wpa_supplicant: Restart when wlan devices
 (dis)appear

---
 nixos/modules/services/networking/wpa_supplicant.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 987b21da9ec..771eeecd772 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -90,11 +90,11 @@ in
 
     services.dbus.packages = [ pkgs.wpa_supplicant ];
 
+    # FIXME: start a separate wpa_supplicant instance per interface.
     jobs.wpa_supplicant =
       { description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
-        after = [ "systemd-udev-settle.service" ];
 
         path = [ pkgs.wpa_supplicant ];
 
@@ -133,6 +133,12 @@ in
     assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
                     message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
 
+    # Restart wpa_supplicant when a wlan device appears or disappears.
+    services.udev.extraRules =
+      ''
+        ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
+      '';
+
   };
 
 }

From aaa0304a45c8f1f9898bcbd355631407c26b5615 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Apr 2014 13:46:16 -0500
Subject: [PATCH 0638/2033] nixpkgs: verifast 13.11.14

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/verifast/default.nix        | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/science/logic/verifast/default.nix

diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
new file mode 100644
index 00000000000..71c5faf4bc8
--- /dev/null
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype
+, fontconfig, libxml2, gnome2 }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo
+      freetype fontconfig libxml2 gnome2.gtksourceview
+    ];
+
+  patchLib = x: extra: "patchelf --set-rpath ${libPath}:${extra} ${x}";
+  patchExe = x: extra: ''
+    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath}:${extra} ${x}
+  '';
+in
+stdenv.mkDerivation rec {
+  name    = "verifast-${version}";
+  version = "13.11.14";
+
+  src = fetchurl {
+    url    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/verifast-13.11.14.tar.gz";
+    sha256 = "1ahay7achjsfz59d3b6vl1v91gr5j34vb494isqw3fsw5l8jd9p7";
+  };
+
+  dontStrip = true;
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -R bin $out/libexec
+
+    ${patchLib "$out/libexec/libz3-gmp.so"  "$out/libexec"}
+    ${patchExe "$out/libexec/vfide-core"    "$out/libexec"}
+    ${patchExe "$out/libexec/verifast-core" "$out/libexec"}
+
+    ln -s $out/libexec/verifast-core $out/bin/verifast
+    ln -s $out/libexec/vfide-core    $out/bin/vfide
+  '';
+
+  phases = "unpackPhase installPhase";
+
+  meta = {
+    description = "Verification for C and Java programs via separation logic";
+    homepage    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = [ "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cb412f4ddf..091d27edece 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10352,6 +10352,8 @@ let
 
   tptp = callPackage ../applications/science/logic/tptp {};
 
+  verifast = callPackage_i686 ../applications/science/logic/verifast {};
+
   yices = callPackage ../applications/science/logic/yices {};
 
   z3 = callPackage ../applications/science/logic/z3 {};

From fec91fd092dff0173e3716435391d7ec13ea6588 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Apr 2014 15:27:40 -0500
Subject: [PATCH 0639/2033] fmod: 4.44.32 -> 4.44.33

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/fmod/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index ba9bb286cdf..12480bc33ae 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -3,16 +3,21 @@
 assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
 let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.libc stdenv.gcc.gcc ] + ":${stdenv.gcc.gcc}/lib64";
+  patchLib = x: "patchelf --set-rpath ${libPath} ${x}";
 in
 stdenv.mkDerivation rec {
   name    = "fmod-${version}";
-  version = "4.44.32";
+  version = "4.44.33";
 
   src = fetchurl {
-    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44432linux.tar.gz";
-    sha256 = "071m2snzz5vc5ca7dvsf6w31nrgk5k9xb6mp7yzqdj4bkjad2hyd";
+    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44433linux.tar.gz";
+    sha256 = "0s17jb7hbavglw0kiwak74ilppsalx53flc23sh4402ci7jg7qhk";
   };
 
+  dontStrip = true;
   buildPhase = "true";
   installPhase = ''
     mkdir -p $out/lib $out/include/fmodex
@@ -20,6 +25,9 @@ stdenv.mkDerivation rec {
     cd api/inc && cp * $out/include/fmodex && cd ../lib
     cp libfmodex${bits}-${version}.so  $out/lib/libfmodex.so
     cp libfmodexL${bits}-${version}.so $out/lib/libfmodexL.so
+
+    ${patchLib "$out/lib/libfmodex.so"}
+    ${patchLib "$out/lib/libfmodexL.so"}
   '';
 
   meta = {

From f060e592cf37107eb61276cc6b163b27f7b6046d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 23:20:31 +0200
Subject: [PATCH 0640/2033] desktops/cinnamon/*.nix: mark as broken per
 https://github.com/NixOS/nixpkgs/issues/2384

---
 pkgs/desktops/cinnamon/cinnamon-control-center.nix  | 9 +++++----
 pkgs/desktops/cinnamon/cinnamon-desktop.nix         | 3 ++-
 pkgs/desktops/cinnamon/cinnamon-session.nix         | 7 ++++---
 pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix | 7 ++++---
 pkgs/desktops/cinnamon/cinnamon-translations.nix    | 5 +++--
 pkgs/desktops/cinnamon/cjs.nix                      | 2 ++
 pkgs/desktops/cinnamon/muffin.nix                   | 9 +++++----
 7 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
index ab2f389b4f5..6eced78ed11 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
@@ -1,4 +1,4 @@
- 
+
 { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
 gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, pulseaudio, isocodes, krb5,
 libxkbfile}:
@@ -24,17 +24,18 @@ stdenv.mkDerivation {
     intltool libxslt gtk3 cinnamon-desktop
     libnotify gnome-menus libxml2 systemd
     upower cinnamon-settings-daemon colord
-    polkit ibus libcanberra_gtk3 pulseaudio 
+    polkit ibus libcanberra_gtk3 pulseaudio
     isocodes krb5 libxkbfile ];
 
   preBuild = "patchShebangs ./scripts";
-  
+
   meta = {
     homepage = "http://cinnamon.linuxmint.com";
     description = "The cinnamon session files" ;
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
index d3cf04e835d..8ead149fc2b 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-
diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
index 534fa11f046..d84438b7bd1 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     gtk3 dbus_glib upower json_glib
     intltool systemd xorg.xtrans
     makeWrapper
-    cinnamon-desktop/*gschemas*/
+    cinnamon-desktop /*gschemas*/
    ];
 
   preBuild = "patchShebangs ./scripts";
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   postFixup  = ''
     rm $out/share/icons/hicolor/icon-theme.cache
 
-    for f in "$out"/bin/*; do
+    for f in "$out/bin/"*; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
index c397a9758e2..ca220fd9d85 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3, 
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3,
 libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, pulseaudio, upower, libcanberra_gtk3, colord,
 systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   #ToDo: missing org.cinnamon.gschema.xml, probably not packaged yet
   postFixup  = ''
-    for f in "$out"/libexec/*; do
+    for f in "$out/libexec/"*; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
@@ -47,6 +47,7 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
index a68a905f92e..91a7acdef82 100644
--- a/pkgs/desktops/cinnamon/cinnamon-translations.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-translations.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   installPhase =
     ''
       mkdir -pv $out/share/cinnamon/locale
-      cp -av mo-export/* $out/share/cinnamon/locale/
+      cp -av "mo-export/"* $out/share/cinnamon/locale/
     '';
 
   meta = {
@@ -22,6 +22,7 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-
diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix
index 3747262cdf4..5d584761565 100644
--- a/pkgs/desktops/cinnamon/cjs.nix
+++ b/pkgs/desktops/cinnamon/cjs.nix
@@ -36,5 +36,7 @@ stdenv.mkDerivation rec {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
diff --git a/pkgs/desktops/cinnamon/muffin.nix b/pkgs/desktops/cinnamon/muffin.nix
index 97796f32476..a1fd6b97ac1 100644
--- a/pkgs/desktops/cinnamon/muffin.nix
+++ b/pkgs/desktops/cinnamon/muffin.nix
@@ -1,4 +1,4 @@
- 
+
 { stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3,intltool,
 cinnamon-desktop, clutter, cogl, zenity, python, gnome_doc_utils, makeWrapper}:
 
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
 
 
   postFixup  = ''
-    
-    for f in "$out"/bin/*; do
+
+    for f in "$out/bin/"*; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
@@ -41,6 +41,7 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.roelof ];
+
+    broken = true;
   };
 }
-

From 4353220202332cb3714e1f07592401b22bd7e719 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Apr 2014 23:57:13 +0200
Subject: [PATCH 0641/2033] polkit: Remove unnecessary restart

There already is a restart trigger that takes care of this.
---
 nixos/modules/security/polkit.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index df42d5a3e02..95b659d96f0 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -98,10 +98,6 @@ in
       ''
         # Probably no more needed, clean up
         rm -rf /var/lib/{polkit-1,PolicyKit}
-
-        # Force polkitd to be restarted so that it reloads its
-        # configuration.
-        ${config.systemd.package}/bin/systemctl try-restart polkit.service
       '';
 
     users.extraUsers.polkituser = {

From ec13d61cbf3f55e9e20b2221ac41a554e0884be3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Apr 2014 17:32:49 -0500
Subject: [PATCH 0642/2033] minecraft-server: 1.7.5 -> 1.7.9

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/games/minecraft-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index bfa5a69dfc3..40ae606934d 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -4,11 +4,11 @@ with import <nixpkgs> {};
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.7.5";
+  version = "1.7.9";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "0f3sh3fws02yl4xqa8qrvn0cchfp0hymqrf30c5syzzcz9w4l8pq";
+    sha256 = "088aqqifgzz8g6aars3kvsdvvrjp0lqxw9qmai48rky20l6ibfgp";
   };
 
   installPhase = ''

From 7faaa9e6daa79f40ae3725e97c463746d079f3ae Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Apr 2014 17:32:58 -0500
Subject: [PATCH 0643/2033] lockdep: 3.14 -> 3.14.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/lockdep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 77cb43a7b53..82318871e57 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "lockdep-${version}";
-  version = "3.14";
+  version = "3.14.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa";
+    sha256 = "0grf6hksx4gidqim05blsnvk5037y852smr8mn0hcnbwvvp1hxal";
   };
 
   preConfigure = "cd tools/lib/lockdep";

From 9242ed1fe297daf144fd4034af95d4fb0f0e3fa9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 28 Apr 2014 18:15:14 -0500
Subject: [PATCH 0644/2033] nixos: refactor tarsnap module

The Tarsnap module is now far more flexible, allowing individual
archives with individual options to be specified at will, allowing
granular backup schedules, etc.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 310 +++++++++++++---------
 1 file changed, 180 insertions(+), 130 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 1966242e3dc..1b0bcadca15 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -7,9 +7,9 @@ let
 
   optionalNullStr = e: v: if e == null then "" else v;
 
-  configFile = pkgs.writeText "tarsnap.conf" ''
-    cachedir ${cfg.cachedir}
-    keyfile  ${cfg.keyfile}
+  configFile = cfg: ''
+    cachedir ${config.services.tarsnap.cachedir}
+    keyfile  ${config.services.tarsnap.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
     ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes}
@@ -39,15 +39,15 @@ in
         '';
       };
 
-      label = mkOption {
-        type = types.str;
-        default = "nixos";
+      keyfile = mkOption {
+        type = types.path;
+        default = "/root/tarsnap.key";
         description = ''
-          Specifies the label for archives created by Tarsnap. The
-          full name will be
-          <literal>label-$(date+"%Y%m%d%H%M%S")</literal>. For
-          example, by default your backups will look similar to
-          <literal>nixos-20140301011501</literal>.
+          Path to the keyfile which identifies the machine
+          associated with your Tarsnap account. This file can
+          be created using the
+          <literal>tarsnap-keygen</literal> utility, and
+          providing your Tarsnap login credentials.
         '';
       };
 
@@ -55,122 +55,158 @@ in
         type    = types.path;
         default = "/var/cache/tarsnap";
         description = ''
-          Tarsnap operations use a "cache directory" which allows
-          Tarsnap to identify which blocks of data have been
-          previously stored; this directory is specified via the
-          <literal>cachedir</literal> option. If the cache directory
-          is lost or out of date, tarsnap creation/deletion operations
-          will exit with an error message instructing you to run
-          <literal>tarsnap --fsck</literal> to regenerate the cache
-          directory.
+          Tarsnap operations use a "cache directory" which
+          allows Tarsnap to identify which blocks of data have
+          been previously stored; this directory is specified
+          via the <literal>cachedir</literal> option. If the
+          cache directory is lost or out of date, tarsnap
+          creation/deletion operations will exit with an error
+          message instructing you to run <literal>tarsnap
+          --fsck</literal> to regenerate the cache directory.
         '';
       };
 
-      keyfile = mkOption {
-        type = types.path;
-        default = "/root/tarsnap.key";
-        description = ''
-          Path to the keyfile which identifies the machine associated
-          with your Tarsnap account. This file can be created using
-          the <literal>tarsnap-keygen</literal> utility, and providing
-          your Tarsnap login credentials.
+      config = mkOption {
+        type = types.attrsOf (types.submodule (
+          {
+            options = {
+              nodump = mkOption {
+                type = types.bool;
+                default = true;
+                description = ''
+                  If set to <literal>true</literal>, then don't
+                  archive files which have the
+                  <literal>nodump</literal> flag set.
+                '';
+              };
+
+              printStats = mkOption {
+                type = types.bool;
+                default = true;
+                description = "Print statistics when creating archives.";
+              };
+
+              checkpointBytes = mkOption {
+                type = types.nullOr types.str;
+                default = "1G";
+                description = ''
+                  Create a checkpoint per a particular amount of
+                  uploaded data. By default, Tarsnap will create
+                  checkpoints once per GB of data uploaded. At
+                  minimum, <literal>checkpointBytes</literal> must be
+                  1GB.
+
+                  Can also be set to <literal>null</literal> to
+                  disable checkpointing.
+                '';
+              };
+
+              period = mkOption {
+                type = types.str;
+                default = "15 01 * * *";
+                description = ''
+                  This option defines (in the format used by cron)
+                  when tarsnap is run for backups. The default is to
+                  backup the specified paths at 01:15 at night every
+                  day.
+                '';
+              };
+
+              aggressiveNetworking = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Aggressive network behaviour: Use multiple TCP
+                  connections when writing archives.  Use of this
+                  option is recommended only in cases where TCP
+                  congestion control is known to be the limiting
+                  factor in upload performance.
+                '';
+              };
+
+              directories = mkOption {
+                type = types.listOf types.path;
+                default = [];
+                description = "List of filesystem paths to archive.";
+              };
+
+              excludes = mkOption {
+                type = types.listOf types.str;
+                default = [];
+                description = ''
+                  Exclude files and directories matching the specified
+                  patterns.
+                '';
+              };
+
+              includes = mkOption {
+                type = types.listOf types.str;
+                default = [];
+                description = ''
+                  Include only files and directories matching the
+                  specified patterns.
+
+                  Note that exclusions specified via
+                  <literal>excludes</literal> take precedence over
+                  inclusions.
+                '';
+              };
+
+              lowmem = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Attempt to reduce tarsnap memory consumption.  This
+                  option will slow down the process of creating
+                  archives, but may help on systems where the average
+                  size of files being backed up is less than 1 MB.
+                '';
+              };
+
+              verylowmem = mkOption {
+                type = types.bool;
+                default = false;
+                description = ''
+                  Try even harder to reduce tarsnap memory
+                  consumption.  This can significantly slow down
+                  tarsnap, but reduces its memory usage by an
+                  additional factor of 2 beyond what the
+                  <literal>lowmem</literal> option does.
+                '';
+              };
+            };
+          }
+        ));
+
+        default = {};
+
+        example = literalExample ''
+          {
+            nixos =
+              { directories = [ "/home" "/root/ssl" ];
+              };
+
+            gamedata =
+              { directories = [ "/var/lib/minecraft "];
+                period      = "*/30 * * * *";
+              };
+          }
         '';
-      };
 
-      nodump = mkOption {
-        type = types.bool;
-        default = true;
         description = ''
-          If set to <literal>true</literal>, then don't archive files
-          which have the <literal>nodump</literal> flag set.
-        '';
-      };
-
-      printStats = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Print statistics when creating archives.";
-      };
-
-      checkpointBytes = mkOption {
-        type = types.nullOr types.str;
-        default = "1G";
-        description = ''
-          Create a checkpoint per a particular amount of uploaded
-          data. By default, Tarsnap will create checkpoints once per
-          GB of data uploaded. At minimum,
-          <literal>checkpointBytes</literal> must be 1GB.
-
-          Can also be set to <literal>null</literal> to disable
-          checkpointing.
-        '';
-      };
-
-      period = mkOption {
-        type = types.str;
-        default = "15 01 * * *";
-        description = ''
-          This option defines (in the format used by cron) when
-          tarsnap is run for backups. The default is to backup the
-          specified paths at 01:15 at night every day.
-        '';
-      };
-
-      aggressiveNetworking = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Aggressive network behaviour: Use multiple TCP connections
-          when writing archives.  Use of this option is recommended
-          only in cases where TCP congestion control is known to be
-          the limiting factor in upload performance.
-        '';
-      };
-
-      directories = mkOption {
-        type = types.listOf types.path;
-        default = [];
-        description = "List of filesystem paths to archive.";
-      };
-
-      excludes = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Exclude files and directories matching the specified patterns.
-        '';
-      };
-
-      includes = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Include only files and directories matching the specified patterns.
-
-          Note that exclusions specified via
-          <literal>excludes</literal> take precedence over inclusions.
-        '';
-      };
-
-      lowmem = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Attempt to reduce tarsnap memory consumption.  This option
-          will slow down the process of creating archives, but may
-          help on systems where the average size of files being backed
-          up is less than 1 MB.
-        '';
-      };
-
-      verylowmem = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Try even harder to reduce tarsnap memory consumption.  This
-          can significantly slow down tarsnap, but reduces its memory
-          usage by an additional factor of 2 beyond what the
-          <literal>lowmem</literal> option does.
+          Configuration of a Tarsnap archive. In the example, your
+          machine will have two tarsnap archives:
+          <literal>gamedata</literal> (backed up every 30 minutes) and
+          <literal>nixos</literal> (backed up at 1:15 AM every night by
+          default). You can control individual archive backups using
+          <literal>systemctl</literal>, using the
+          <literal>tarsnap@nixos</literal> or
+          <literal>tarsnap@gamedata</literal> units. For example,
+          <literal>systemctl start tarsnap@nixos</literal> will
+          immediately create a new NixOS archive. By default, archives
+          are suffixed with the timestamp of when they were started,
+          down to second resolution. This means you can use GNU
+          <literal>sort</literal> to sort output easily.
         '';
       };
     };
@@ -178,26 +214,40 @@ in
 
   config = mkIf cfg.enable {
     assertions =
-      [ { assertion = cfg.directories != [];
+      (mapAttrsToList (name: cfg:
+        { assertion = cfg.directories != [];
           message = "Must specify directories for Tarsnap to back up";
-        }
+        }) cfg.config) ++
+      (mapAttrsToList (name: cfg:
         { assertion = cfg.lowmem -> !cfg.verylowmem && (cfg.verylowmem -> !cfg.lowmem);
           message = "You cannot set both lowmem and verylowmem";
-        }
-      ];
+        }) cfg.config);
+
+    systemd.services."tarsnap@" = {
+      description = "Tarsnap Backup of '%i'";
+      requires    = [ "network.target" ];
 
-    systemd.services.tarsnap-backup = {
-      description = "Tarsnap Backup process";
       path = [ pkgs.tarsnap pkgs.coreutils ];
+      scriptArgs = "%i";
       script = ''
         mkdir -p -m 0755 $(dirname ${cfg.cachedir})
         mkdir -p -m 0600 ${cfg.cachedir}
-        exec tarsnap --configfile ${configFile} -c -f ${cfg.label}-$(date +"%Y%m%d%H%M%S") ${concatStringsSep " " cfg.directories}
+        DIRS=`cat /etc/tarsnap/$1.dirs`
+        exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
       '';
     };
 
-    services.cron.systemCronJobs = optional cfg.enable
-      "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap-backup.service";
+    services.cron.systemCronJobs = mapAttrsToList (name: cfg:
+      "${cfg.period} root ${config.systemd.package}/bin/systemctl start tarsnap@${name}"
+    ) cfg.config;
+
+    environment.etc =
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
+        { text = configFile cfg;
+        }) cfg.config) //
+      (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs"
+        { text = concatStringsSep " " cfg.directories;
+        }) cfg.config);
 
     environment.systemPackages = [ pkgs.tarsnap ];
   };

From 192ef70a7c8ed366362ad8b13c45e7ad1235bb11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:11:33 +0200
Subject: [PATCH 0645/2033] haskell-prelude-extras: add version 0.4

---
 .../libraries/haskell/prelude-extras/default.nix    | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/prelude-extras/default.nix

diff --git a/pkgs/development/libraries/haskell/prelude-extras/default.nix b/pkgs/development/libraries/haskell/prelude-extras/default.nix
new file mode 100644
index 00000000000..33275952e0d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/prelude-extras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "prelude-extras";
+  version = "0.4";
+  sha256 = "0mzsc9pzcamaa7i3g9hkajy35sbpqdjrflv6r98r8hhlr0yrdjan";
+  meta = {
+    homepage = "http://github.com/ekmett/prelude-extras";
+    description = "Haskell 98 - higher order versions of Prelude classes";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2a97b83efec..3e97bb2ff0e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2077,6 +2077,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   process = callPackage ../development/libraries/haskell/process {};
 
+  preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};
+
   preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {};
 
   preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {};

From 2bf7311b3f06e2d7176ece09887d175994f1beea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:13:37 +0200
Subject: [PATCH 0646/2033] haskell-packages.nix: cosmetic

---
 pkgs/top-level/haskell-packages.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3e97bb2ff0e..4496c7d23b1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2097,8 +2097,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 
-  primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix   {};
-  primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix   {};
+  primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
+  primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {};
   primitive = self.primitive_0_5_0_1;
 
   profunctors = callPackage ../development/libraries/haskell/profunctors {};
@@ -2192,14 +2192,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   reflection = callPackage ../development/libraries/haskell/reflection {};
 
   regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
-  regexBase_0_93_1   = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix   {};
-  regexBase_0_93_2   = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix   {};
+  regexBase_0_93_1   = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
+  regexBase_0_93_2   = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};
   regexBase = self.regexBase_0_93_2;
 
   regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {};
-  regexCompat_0_92     = callPackage ../development/libraries/haskell/regex-compat/0.92.nix     {};
-  regexCompat_0_93_1   = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix   {};
-  regexCompat_0_95_1   = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix   {};
+  regexCompat_0_92     = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {};
+  regexCompat_0_93_1   = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {};
+  regexCompat_0_95_1   = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {};
   regexCompat93 = self.regexCompat_0_93_1;
   regexCompat = self.regexCompat_0_71_0_1;
 
@@ -2702,8 +2702,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vect = callPackage ../development/libraries/haskell/vect {};
 
-  vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix  {};
-  vector_0_10_9_1  = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix  {};
+  vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
+  vector_0_10_9_1  = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {};
   vector = self.vector_0_10_9_1;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
@@ -3074,9 +3074,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {};
 
-  cabalInstall_0_6_2  = callPackage ../tools/package-management/cabal-install/0.6.2.nix  {};
-  cabalInstall_0_8_0  = callPackage ../tools/package-management/cabal-install/0.8.0.nix  {};
-  cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix  {};
+  cabalInstall_0_6_2  = callPackage ../tools/package-management/cabal-install/0.6.2.nix {};
+  cabalInstall_0_8_0  = callPackage ../tools/package-management/cabal-install/0.8.0.nix {};
+  cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};

From e8ba2d4dedd0c4cc3242c10df1c613f6861700fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:14:19 +0200
Subject: [PATCH 0647/2033] haskell-packages.nix: switch ghc-head to
 cabal-install 1.20.x.x

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4496c7d23b1..02e6472479d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     vector       = self.vector_0_10_9_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_18_0_3;
+    cabalInstall = self.cabalInstall_1_20_0_0;
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_14_2;
     happy        = self.happy_1_19_3;
@@ -3086,7 +3086,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_1_20_0_0 = callPackage ../tools/package-management/cabal-install/1.20.0.0.nix {
     Cabal = self.Cabal_1_20_0_0;
   };
-  cabalInstall = self.cabalInstall_1_18_0_3;
+  cabalInstall = self.cabalInstall_1_20_0_0;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
     hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; };

From 3f23727e095e7ed040debf8bdfc97636ddd3ab14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:16:59 +0200
Subject: [PATCH 0648/2033] haskell-arbtt: update to version 0.8

---
 pkgs/applications/misc/arbtt/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 92b8cb4f295..b8c56baf956 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -1,21 +1,26 @@
-{ cabal, binary, bytestringProgress, deepseq, filepath
-, libXScrnSaver, parsec, pcreLight, strict, terminalProgressBar
-, time, transformers, utf8String, X11
+{ cabal, aeson, binary, bytestringProgress, deepseq, filepath
+, HUnit, libXScrnSaver, parsec, pcreLight, processExtras, strict
+, tasty, tastyGolden, tastyHunit, terminalProgressBar, time
+, transformers, utf8String, X11
 }:
 
 cabal.mkDerivation (self: {
   pname = "arbtt";
-  version = "0.7";
-  sha256 = "05q31fsyrbkcx0mlf2r91zgmpma5sl2a7100h7qsa882sijc2ybn";
+  version = "0.8";
+  sha256 = "0anjcg8ikd3jxc5rb3k215wj7ar4kg2plv8sdr8hv64758xkc5q9";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    binary bytestringProgress deepseq filepath parsec pcreLight strict
-    terminalProgressBar time transformers utf8String X11
+    aeson binary bytestringProgress deepseq filepath parsec pcreLight
+    strict terminalProgressBar time transformers utf8String X11
+  ];
+  testDepends = [
+    binary deepseq HUnit parsec pcreLight processExtras tasty
+    tastyGolden tastyHunit time transformers utf8String
   ];
   extraLibraries = [ libXScrnSaver ];
   meta = {
-    homepage = "http://www.joachim-breitner.de/projects#arbtt";
+    homepage = "http://arbtt.nomeata.de/";
     description = "Automatic Rule-Based Time Tracker";
     license = "GPL";
     platforms = self.ghc.meta.platforms;

From 6c5d7a63ac23186338aeb50360e58d4297372955 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:01 +0200
Subject: [PATCH 0649/2033] haskell-sloane: update to version 1.7

---
 pkgs/applications/science/math/sloane/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
index 1e318bd8a79..2f56534a4d3 100644
--- a/pkgs/applications/science/math/sloane/default.nix
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -1,12 +1,17 @@
-{ cabal, ansiTerminal, cmdargs, HTTP, terminalSize, url }:
+{ cabal, ansiTerminal, cmdargs, filepath, HTTP, network
+, stringsearch, terminalSize, time, zlib
+}:
 
 cabal.mkDerivation (self: {
   pname = "sloane";
-  version = "1.6";
-  sha256 = "0my3j53bda3s8zxnm6is1align4k082wwsfg2y1i75js5z9kwmzy";
+  version = "1.7";
+  sha256 = "1xy22cdswb5blvdsz8l7irfj6msl85v7gpl9ymcx985gj4z0l2ik";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ ansiTerminal cmdargs HTTP terminalSize url ];
+  buildDepends = [
+    ansiTerminal cmdargs filepath HTTP network stringsearch
+    terminalSize time zlib
+  ];
   postInstall = ''
     mkdir -p $out/share/man/man1
     cp sloane.1 $out/share/man/man1/
@@ -16,6 +21,6 @@ cabal.mkDerivation (self: {
     description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ akc ];
+    maintainers = [ self.stdenv.lib.maintainers.akc ];
   };
 })

From 551cae1aa00835d05deedf70e2ba0aec05d4ee75 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:02 +0200
Subject: [PATCH 0650/2033] haskell-git-annex: update to version 5.20140421

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 8f042addf1d..cc000398855 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -16,8 +16,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140412";
-  sha256 = "0dnds35aq58q7by7is6yajqvpyg3fkpwrakgjc03z2529fyyw6gm";
+  version = "5.20140421";
+  sha256 = "1ahn62gmgszssl2ni7b6rran548wjkb10035hrgvag6dwiiyik9g";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From ad784bb2f256f0aadb99d3286de8916236c25c9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:03 +0200
Subject: [PATCH 0651/2033] haskell-active: update to version 0.1.0.13

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

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 7bfb0a045ee..4de6f255196 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.12";
-  sha256 = "0ra0wnpyc23sz2w9qk6afcxsrva55nv9vyv70dvw6xhc82vi3khs";
+  version = "0.1.0.13";
+  sha256 = "12ljr12xj1kpj5llxfyigwf6340m17bx56a6qmrn580fshic670z";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace

From f012c2b1314db6aab1344af2317777bd1668d0ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:05 +0200
Subject: [PATCH 0652/2033] haskell-bifunctors: update to version 4.1.1.1

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

diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix
index 5d13f3a384e..df15bd93a40 100644
--- a/pkgs/development/libraries/haskell/bifunctors/default.nix
+++ b/pkgs/development/libraries/haskell/bifunctors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bifunctors";
-  version = "4.1.1";
-  sha256 = "0apdnhfqn3xyi99d5ybc51y2i0gpxix5hlaqxgpbzr4b0zkk7c4w";
+  version = "4.1.1.1";
+  sha256 = "0b31q6ypndaj6fa9cnkld5k0x3lncp9i28vfkkh6vv4jnnjd6pqi";
   buildDepends = [ semigroupoids semigroups tagged ];
   meta = {
     homepage = "http://github.com/ekmett/bifunctors/";

From e7721d70270a15075814763b1fe03d042e3b0f7e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:06 +0200
Subject: [PATCH 0653/2033] haskell-blaze-markup: update to version 0.6.1.0

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

diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix
index 904808b78c8..07dfe2eb477 100644
--- a/pkgs/development/libraries/haskell/blaze-markup/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-markup";
-  version = "0.6.0.0";
-  sha256 = "1f54i570cqbyqkrsq4qd2bky88pdwg9lv84c6aaf2c21552dbvii";
+  version = "0.6.1.0";
+  sha256 = "0ydk34y1j8bssdiqw6m70383dh4khbcac3jd7fpr37cx7ighlp7l";
   buildDepends = [ blazeBuilder text ];
   testDepends = [
     blazeBuilder HUnit QuickCheck testFramework testFrameworkHunit

From a0265900f53c1d23a4ed015a65e1ed31aa7fa7d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:07 +0200
Subject: [PATCH 0654/2033] haskell-c2hs: update to version 0.17.2

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

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 9313deaf840..efde2daedeb 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -1,16 +1,16 @@
 { cabal, filepath, HUnit, languageC, shelly, testFramework
-, testFrameworkHunit, text
+, testFrameworkHunit, text, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.16.6";
-  sha256 = "1yf7mcslkf6m1nizifqva8j5sxnw87bg60dw8mfgpmqvrzpbxizm";
+  version = "0.17.2";
+  sha256 = "1xrk0izdy5akjgmg9k4l9ccmmgv1avwh152pfpc1xm2rrwrg4bxk";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath languageC ];
   testDepends = [
-    filepath HUnit shelly testFramework testFrameworkHunit text
+    filepath HUnit shelly testFramework testFrameworkHunit text yaml
   ];
   jailbreak = true;
   doCheck = false;

From f4524394b0f71311eb8c4534c44cd422d37179ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:09 +0200
Subject: [PATCH 0655/2033] haskell-cereal-conduit: update to version 0.7.2.2

---
 .../libraries/haskell/cereal-conduit/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
index fa13321fff7..56c4a01d9d8 100644
--- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "cereal-conduit";
-  version = "0.7.2.1";
-  sha256 = "1qjx5y8hznpanchhjfrmi0r6vmiqsj0lh9x09n563gschs8dfisw";
+  version = "0.7.2.2";
+  sha256 = "1syqilka5rv2j3yp419f2wdrcfw8js6i2p7qif4yxvlkm2hkvzzk";
   buildDepends = [ cereal conduit resourcet transformers ];
   testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
   meta = {
-    homepage = "https://github.com/litherum/cereal-conduit";
+    homepage = "https://github.com/snoyberg/conduit";
     description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 8f607fca3ab014f858193e2c4d09477e698b56b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:10 +0200
Subject: [PATCH 0656/2033] haskell-conduit-combinators: update to version
 0.2.5

---
 .../libraries/haskell/conduit-combinators/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index 9439d36ecba..b88b15cef67 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.4.1";
-  sha256 = "00fb7dvpz2p4n14qdxai1178k63k24r1lvdjjlnbxabl7nm3717w";
+  version = "0.2.5";
+  sha256 = "1by9jjflascchs7gf53fk5srv3ihrir8jqac6zyq74fjclx3b6z0";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

From 310c4299a915658fe032eef62408f0f303168696 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:11 +0200
Subject: [PATCH 0657/2033] haskell-conduit-extra: update to version 1.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 1bdc65672fd..1f6f2c1e24c 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.0.1";
-  sha256 = "1j1arx07aynziyc9b4bjd7wyydvi1nicdrv86jhyp1nd6zklj1m4";
+  version = "1.1.0.2";
+  sha256 = "0n2k1cz04wkhw7l6qh1zm5dmarml9bbyf8zl6430j0mw5i4hwxr2";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet streamingCommons text transformers

From 1f8334eacf0fbd6b9026b9054e5fb554fafdfe80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:13 +0200
Subject: [PATCH 0658/2033] haskell-conduit: update to version 1.1.1

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 8b15e8df37a..cdc5e4e56ff 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.0.2";
-  sha256 = "16pcdwgh9g7p7ali3sp0zpx1cwdgvyfwhgwcinnmaixxr6fsqqay";
+  version = "1.1.1";
+  sha256 = "0k6b8khy3h5qnhgqk4xjghhryi5a830qznqlas89p0yw5qsqgish";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From cc8959c86a704b028cba30f8e99f0b282e52ceac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:14 +0200
Subject: [PATCH 0659/2033] haskell-contravariant: update to version 0.5

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

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index d38058a25de..48dfaa44385 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.4.4";
-  sha256 = "1b4422wpcyvrf4r7rr8c8wa008f5ykaxs17vr4plp91rcczr87s4";
+  version = "0.5";
+  sha256 = "0jw66irh3mjpbd25jh4pzy73jxfaghvlqkngqa1vd0v2i99j6sap";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From f3802557928640445eb04ed7b06a388186d36729 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:15 +0200
Subject: [PATCH 0660/2033] haskell-cuda: update to version 0.6.0.0

---
 pkgs/development/libraries/haskell/cuda/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index e6ac9ee99ef..0f5233d9660 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cuda";
-  version = "0.5.1.1";
-  sha256 = "0bz1pfcxxvq1s47nrwgj9cqmr20p9n3hh2hilih8083hnjjwh40x";
+  version = "0.6.0.0";
+  sha256 = "0zvyvk5yhwz7nl613yvfl32xnv9kgfdwbb0whyd6nrm663xa352y";
   buildTools = [ c2hs ];
   extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ];
   doCheck = false;
@@ -35,7 +35,6 @@ cabal.mkDerivation (self: {
     description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From 740470e6a427c690d1be426e71f2d6372ac9385a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:17 +0200
Subject: [PATCH 0661/2033] haskell-data-ordlist: update to version 0.4.6.1

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

diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix
index ca506bc01e9..1de08938680 100644
--- a/pkgs/development/libraries/haskell/data-ordlist/default.nix
+++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "data-ordlist";
-  version = "0.4.6";
-  sha256 = "13gsvqifwlxcz10x704fy26288l0km2kfdlh4w9hl31a9vd427sx";
+  version = "0.4.6.1";
+  sha256 = "1qrvyin5567br99zfip7krdy6snnbm5z5jdi6ghmk0cfmhmyrwy3";
   meta = {
     description = "Set and bag operations on ordered lists";
     license = self.stdenv.lib.licenses.bsd3;

From 80454adf7925032aea9ae360a60987d4cd4e8867 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:18 +0200
Subject: [PATCH 0662/2033] haskell-dataenc: update to version 0.14.0.7

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

diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix
index 129d392d62d..8c7303776f8 100644
--- a/pkgs/development/libraries/haskell/dataenc/default.nix
+++ b/pkgs/development/libraries/haskell/dataenc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dataenc";
-  version = "0.14.0.6";
-  sha256 = "0635aspx65wwpky0kbnlj9ly4vjw5afzvdn9glnhfxq6m6yjzp8q";
+  version = "0.14.0.7";
+  sha256 = "1wwgm7wakkz6v94lyxyd3yi21l3h28sss4xxdb3d770vmjhp1lzr";
   isLibrary = true;
   isExecutable = true;
   jailbreak = true;

From e2ecbc0267c04f7d9cc7fe19f8a26712dd6e4ac3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:19 +0200
Subject: [PATCH 0663/2033] haskell-direct-sqlite: update to version 2.3.13

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

diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
index 14be91cd1bf..5d4adbc60df 100644
--- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix
+++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "direct-sqlite";
-  version = "2.3.12";
-  sha256 = "14dcgmn3mfx69qx412dc8cxa4ia3adsf8gm5q4yscpp8rf78m178";
+  version = "2.3.13";
+  sha256 = "0d16jmls41cwyzg91fpd32dv8vvx1v3ilypv1wd7ya8j08fwfvdn";
   buildDepends = [ text ];
   testDepends = [ base16Bytestring HUnit text ];
   meta = {

From 8ae402a4a6467c14a7971941275a70fe1e893799 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:21 +0200
Subject: [PATCH 0664/2033] haskell-distributive: update to version 0.4.3.2

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

diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index 053f938ae56..e6ef8e06c8c 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributive";
-  version = "0.4.3.1";
-  sha256 = "17ny7nlxg6x08f88dyl15wsdhgi0cgafxdsl5wdw5vv6y0jsrx27";
+  version = "0.4.3.2";
+  sha256 = "16d16ddd5i2pf5q6lkix4g1a1a6l7al6ximwp7jrvifaqcyr5inj";
   buildDepends = [ tagged transformers transformersCompat ];
   testDepends = [ doctest filepath ];
   meta = {

From b9d4464af6a67ffdb02ce986e9ce5cc976ef574b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:22 +0200
Subject: [PATCH 0665/2033] haskell-esqueleto: update to version 1.4

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

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 217b6f7a409..3ff5dd6d3f3 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.3.12";
-  sha256 = "156wcdnjpvy0s65swncxsc8wg0ci0bnq4nsxkc6095wpn9pflnfg";
+  version = "1.4";
+  sha256 = "1v9fjcslp4jwzgan758327q60h8x3xf8bwca57fy0n1z1pqdn8s9";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers

From 75289fbc31153b2b9bd5985c16b7134e51cd1d0a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:23 +0200
Subject: [PATCH 0666/2033] haskell-extensible-effects: update to version 1.6.0

---
 .../libraries/haskell/extensible-effects/default.nix       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix
index f97b5cd5e28..ba511f0b6a2 100644
--- a/pkgs/development/libraries/haskell/extensible-effects/default.nix
+++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix
@@ -1,11 +1,12 @@
 { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit
-, testFrameworkQuickcheck2
+, testFrameworkQuickcheck2, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "extensible-effects";
-  version = "1.2.1";
-  sha256 = "066977hjhcg44v47hkjpf2gs48xsry74l4h8hp753jsvbfsv0030";
+  version = "1.6.0";
+  sha256 = "08g2py6iywwpsr09v6hfhq6ihjp1yq3aibz8jlqhsmagjjjxgfsq";
+  buildDepends = [ transformers transformersBase ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2

From 27be932ff3547f848f6ab5cad314e465f0bfb7fd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:25 +0200
Subject: [PATCH 0667/2033] haskell-filestore: update to version 0.6.0.2

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

diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix
index d0056dd9c35..4aebded770e 100644
--- a/pkgs/development/libraries/haskell/filestore/default.nix
+++ b/pkgs/development/libraries/haskell/filestore/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "filestore";
-  version = "0.6.0.1";
-  sha256 = "1la30bimcjngcv5dyx1a9x8lr8c4zs0dp4kzh8y5mjf8snky1avf";
+  version = "0.6.0.2";
+  sha256 = "0dbn358gxg13lxlpqyczcn5g5kvzrz7lv17qsmr53hvmxz8mricr";
   buildDepends = [ Diff filepath parsec split time utf8String xml ];
   testDepends = [ Diff filepath HUnit mtl time ];
   jailbreak = true;

From 5926fec3f9cd286a9f49648f260678a1b73b28f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:26 +0200
Subject: [PATCH 0668/2033] haskell-free: update to version 4.7.1

---
 pkgs/development/libraries/haskell/free/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index 1c7c236ba64..ba2c09ff019 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -1,14 +1,14 @@
-{ cabal, bifunctors, comonad, distributive, mtl, profunctors
-, semigroupoids, semigroups, transformers
+{ cabal, bifunctors, comonad, distributive, mtl, preludeExtras
+, profunctors, semigroupoids, semigroups, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "free";
-  version = "4.6.1";
-  sha256 = "0xmnxp6x7b6pp2ap7jrjhz00cm30v334i9dcxc14d3r070h7l73w";
+  version = "4.7.1";
+  sha256 = "14qvc153g7n8fkl2giyyya8l7fs4limgnm18hdw5dpj841kwxgzm";
   buildDepends = [
-    bifunctors comonad distributive mtl profunctors semigroupoids
-    semigroups transformers
+    bifunctors comonad distributive mtl preludeExtras profunctors
+    semigroupoids semigroups transformers
   ];
   meta = {
     homepage = "http://github.com/ekmett/free/";

From 6f47302eadd9eb9d04cec5644e7687b0e5e8a958 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:28 +0200
Subject: [PATCH 0669/2033] haskell-hamlet: update to version 1.2.0

---
 .../libraries/haskell/hamlet/default.nix        | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index 445fb67386e..dd773f41581 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -1,20 +1,13 @@
-{ cabal, blazeBuilder, blazeHtml, blazeMarkup, failure, hspec
-, HUnit, parsec, shakespeare, systemFileio, systemFilepath, text
-, time
-}:
+{ cabal, shakespeare }:
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "1.1.9.2";
-  sha256 = "122wfkk23a2bvz29hrgxj24k6cf315fwdbz70ih3nclawh0bhani";
-  buildDepends = [
-    blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare
-    systemFileio systemFilepath text time
-  ];
-  testDepends = [ blazeHtml blazeMarkup hspec HUnit parsec text ];
+  version = "1.2.0";
+  sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
+  buildDepends = [ shakespeare ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Haml-like template files that are compile-time checked";
+    description = "Haml-like template files that are compile-time checked (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 0e1af854bb2ebe52368232e7999c18145ed494ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:29 +0200
Subject: [PATCH 0670/2033] haskell-happstack-hamlet: update to version 7.0.4

---
 .../libraries/haskell/happstack/happstack-hamlet.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index c191c428780..d8a1b0ef6fc 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -1,10 +1,10 @@
-{ cabal, hamlet, happstackServer, text }:
+{ cabal, happstackServer, shakespeare, text }:
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "7.0.3";
-  sha256 = "0z4phykm2wxpdga47sdg76v7vmy32kav4nscizlkl648qjrx9k3r";
-  buildDepends = [ hamlet happstackServer text ];
+  version = "7.0.4";
+  sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
+  buildDepends = [ happstackServer shakespeare text ];
   meta = {
     homepage = "http://www.happstack.com/";
     description = "Support for Hamlet HTML templates in Happstack";

From 01494efdd684b9dc499bc2a0c3b72e837db6c91e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:30 +0200
Subject: [PATCH 0671/2033] haskell-haskell-names: update to version 0.3.3.2

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

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index d005793549c..c10ba3c904d 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.3.1";
-  sha256 = "1xhh9bl0r2kxnp6c0x22ys7gcf357pgah07ayq9af6m90adyqhiw";
+  version = "0.3.3.2";
+  sha256 = "0dg31b9bm3p4fxajqk4wp29vlcbhcwm9f4hwc4f9pyhxv2s8i77p";
   buildDepends = [
     aeson Cabal dataLens dataLensTemplate filepath haskellPackages
     haskellSrcExts hseCpp mtl tagged transformers traverseWithClass

From f80d29805a31aaaa2cea0711ed809d7b67d60ef8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:32 +0200
Subject: [PATCH 0672/2033] haskell-haskell-src-exts: update to version
 1.15.0.1

---
 .../libraries/haskell/haskell-src-exts/default.nix    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index 270353b7f76..b5522101764 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
@@ -1,14 +1,15 @@
-{ cabal, cpphs, filepath, happy, smallcheck, tasty, tastyHunit
-, tastySmallcheck
+{ cabal, cpphs, filemanip, filepath, happy, mtl, smallcheck, syb
+, tasty, tastyGolden, tastySmallcheck
 }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-exts";
-  version = "1.14.0.1";
-  sha256 = "1bsqjj4hy8mqprs44yfy1c96678w9q708yc40g5ygqfyhg0hd29s";
+  version = "1.15.0.1";
+  sha256 = "0xp5i06c478vn5m504ax5dfa7p5zc0kflbdkm2ijdzc779lpbx45";
   buildDepends = [ cpphs ];
   testDepends = [
-    filepath smallcheck tasty tastyHunit tastySmallcheck
+    filemanip filepath mtl smallcheck syb tasty tastyGolden
+    tastySmallcheck
   ];
   buildTools = [ happy ];
   doCheck = false;

From c7bd8255a69c3fcaea5d2f8e6d03bdb55fa56b15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:33 +0200
Subject: [PATCH 0673/2033] haskell-hinotify: update to version 0.3.7

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

diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix
index bd706339c02..d33a294effd 100644
--- a/pkgs/development/libraries/haskell/hinotify/default.nix
+++ b/pkgs/development/libraries/haskell/hinotify/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hinotify";
-  version = "0.3.6";
-  sha256 = "0vzn9z90z9zk7g9pvbrgm6xyb4b5x2dai1c70fvmdi3w4h2x17zw";
+  version = "0.3.7";
+  sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
   meta = {
     homepage = "https://github.com/kolmodin/hinotify.git";
     description = "Haskell binding to inotify";

From 5717591f43bec741d4c40a48908753453291ebb7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:34 +0200
Subject: [PATCH 0674/2033] haskell-hslua: update to version 0.3.12

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

diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix
index a0b336f24f3..c528c22bdfb 100644
--- a/pkgs/development/libraries/haskell/hslua/default.nix
+++ b/pkgs/development/libraries/haskell/hslua/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslua";
-  version = "0.3.10";
-  sha256 = "1d79sp9xmzbq74jk7kj81j0z4vm813fkkxkpbyzg07x649i6q0v2";
+  version = "0.3.12";
+  sha256 = "1cn6qxhvh8bxr9fisr4m4mqk6qwj69as63fkpf77a1xhmk31qlrf";
   buildDepends = [ mtl ];
   pkgconfigDepends = [ lua ];
   configureFlags = "-fsystem-lua";

From e74db96100dfcfdfc2e6c18287dfa1ccc6c2ac33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:36 +0200
Subject: [PATCH 0675/2033] haskell-hspec-meta: update to version 1.9.3

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

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index c522dc9f968..f2104437bce 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.9.2";
-  sha256 = "0df54njh3i2gq10rkibqaq36xzv16pd2pp18wy28w6x5xff5hvm5";
+  version = "1.9.3";
+  sha256 = "11x2yh4nqcg77pyszygfla0i20l3f1cxvix4va6rqzcbksc51lvd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From da7cc3a1f1b753a6f954f12123003aafd5c0f9f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:37 +0200
Subject: [PATCH 0676/2033] haskell-hspec: update to version 1.9.3

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

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 8d316caf4c8..71dc1fc1c81 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.9.2";
-  sha256 = "0q8a1n03d70l86l2yy98j180xbnfq0ijgcf5llv439b65lc4zcyf";
+  version = "1.9.3";
+  sha256 = "0i5dlcp3f8w6fsizywp5y6isll82g68l3p3vxv6z4zzy87xwbr7d";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4a1340c780a2be16fb44fea0e7697cb17a32f541 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:38 +0200
Subject: [PATCH 0677/2033] haskell-http-client: update to version 0.3.2

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index a1a39a900e3..d266d34e690 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.1.1";
-  sha256 = "1rnvbjkcblfmn1n40p5lanbcyl2ng5r98cmj0lkjg7vz6fq0c57r";
+  version = "0.3.2";
+  sha256 = "1afis0j3yvrgisxj8ajz6ha6yw7xgwgcnh9mdy3p3blr3nbdxv8c";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From 9aab7494bc6e4e54143f25a413cbd6b4c19d1e5c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:40 +0200
Subject: [PATCH 0678/2033] haskell-http-conduit: update to version 2.1.2

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

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index d0ee6945d1c..fc6762c877e 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "2.1.1";
-  sha256 = "1xdd7kdxr7jbic2j9rd6gvx637d24wr1lyfnaj02v16x9b0nydjm";
+  version = "2.1.2";
+  sha256 = "11g79yfgm2fzcy7gwk9f5np4p6fknsbjkm858v8khb4a1gmbrqvn";
   buildDepends = [
     conduit httpClient httpClientTls httpTypes liftedBase monadControl
     mtl resourcet transformers

From fe5f31bdb11c068f412772b22b724402d7a6ddbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:43 +0200
Subject: [PATCH 0679/2033] haskell-mime-mail: update to version 0.4.5.2

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

diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix
index 80fc8e1b4af..88eabe59e3f 100644
--- a/pkgs/development/libraries/haskell/mime-mail/default.nix
+++ b/pkgs/development/libraries/haskell/mime-mail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mime-mail";
-  version = "0.4.5.1";
-  sha256 = "01r6dxdp3183ahggda6dizdz1c3qpmpyxn6csalzvss52ds4ilsf";
+  version = "0.4.5.2";
+  sha256 = "0s5fj20n3lc2hn1mqpsvai63pgrl7vhqv26psdzqdwl70w9c04zf";
   buildDepends = [
     base64Bytestring blazeBuilder filepath random text
   ];

From cee7a67810547a1343f96ce5beab11b041a4dddc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:44 +0200
Subject: [PATCH 0680/2033] haskell-monads-tf: update to version 0.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix
index f51fd8c840a..b57a432fcab 100644
--- a/pkgs/development/libraries/haskell/monads-tf/default.nix
+++ b/pkgs/development/libraries/haskell/monads-tf/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monads-tf";
-  version = "0.1.0.1";
-  sha256 = "19za12iazwrbqwpxy6lkj01dwm921386ryxgdqvcqisn8cj6jm1v";
+  version = "0.1.0.2";
+  sha256 = "0z07z2lfm3l93fx0qhfd98j76d1rksi5llq67l5v09pm8da4jvyb";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad classes, using type families";

From 9131908d53ba385cae976a463a2856d6afb67169 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:45 +0200
Subject: [PATCH 0681/2033] haskell-nats: update to version 0.1.3

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

diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
index 91cc79f52b8..93ff65db67f 100644
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "nats";
-  version = "0.1.2";
-  sha256 = "1r4083p8sbnqs74l8faqfs1i97k8bql762l55pbmapy0p1xrkzka";
+  version = "0.1.3";
+  sha256 = "1kh7wvgjqq39f0dp2pnbazvr1zp6anb1ksgx3q1m1x0qgxkj0xxz";
   meta = {
     homepage = "http://github.com/ekmett/nats/";
-    description = "Haskell 98 natural numbers";
+    description = "Natural numbers";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From d2a0bde63fc1114e226c2c66d46ba65c6e00d557 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:46 +0200
Subject: [PATCH 0682/2033] haskell-permutation: update to version 0.5.0.4

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

diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix
index 4f38dfcaa12..f44ab16f563 100644
--- a/pkgs/development/libraries/haskell/permutation/default.nix
+++ b/pkgs/development/libraries/haskell/permutation/default.nix
@@ -2,11 +2,11 @@
 
 cabal.mkDerivation (self: {
   pname = "permutation";
-  version = "0.4.1";
-  sha256 = "0fgw4ivs8sa18fyphwr3mzp2v7ha2nz2yf3a7jmz9ymqdf2xws97";
+  version = "0.5.0.4";
+  sha256 = "0kl5yw1as2y8yf2ac2f6v7g8k7mzjqw5fdh18a6m3jfhjw9rcqf7";
   doCheck = false;
   meta = {
-    homepage = "http://stat.stanford.edu/~patperry/code/permutation";
+    homepage = "https://github.com/spacekitteh/permutation";
     description = "A library for permutations and combinations";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 65ac678f1b51f59f6d6ce3e4b445f88e663fa01d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:48 +0200
Subject: [PATCH 0683/2033] haskell-persistent-postgresql: update to version
 1.3.1

---
 .../libraries/haskell/persistent-postgresql/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 85b1a10b5ba..3667c33e81c 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.0.5";
-  sha256 = "0abk38jzc7k93wrzn3pq90xj0mqln4nqrgzmmy0d3p4gmbzmnnia";
+  version = "1.3.1";
+  sha256 = "19wmz9xd1jdmysr7zhlxf6z9v7pfgy0d3g7szifk8wjq8ai57lny";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple resourcet text time transformers

From 0823af1708b8dfb4cf3f88b822aa7e814f1d61ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:49 +0200
Subject: [PATCH 0684/2033] haskell-pointedlist: update to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix
index 881beafaca0..a7b23cd85af 100644
--- a/pkgs/development/libraries/haskell/pointedlist/default.nix
+++ b/pkgs/development/libraries/haskell/pointedlist/default.nix
@@ -1,10 +1,10 @@
-{ cabal, binary, derive }:
+{ cabal, binary }:
 
 cabal.mkDerivation (self: {
   pname = "pointedlist";
-  version = "0.6";
-  sha256 = "16sfw77w46f7rjd1lpdfzi1bdgf81siy2sj71xqkqbsz6cvkjakg";
-  buildDepends = [ binary derive ];
+  version = "0.6.1";
+  sha256 = "16xsrzqql7i4z6a3xy07sqnbyqdmcar1jiacla58y4mvkkwb0g3l";
+  buildDepends = [ binary ];
   meta = {
     description = "A zipper-like comonad which works as a list, tracking a position";
     license = self.stdenv.lib.licenses.bsd3;

From 7841191a84b78d2ee30293b87efcf4746756dad6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:50 +0200
Subject: [PATCH 0685/2033] haskell-regular: update to version 0.3.4.3

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

diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix
index 8a3e740491c..97920780533 100644
--- a/pkgs/development/libraries/haskell/regular/default.nix
+++ b/pkgs/development/libraries/haskell/regular/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "regular";
-  version = "0.3.4.2";
-  sha256 = "0fshjpbgabdcsa9a4cjmvfrzy7db4s679rprdbrhhfwf5xiszs2s";
+  version = "0.3.4.3";
+  sha256 = "12pc58agqb4fi0riwxjf0kykn1z12273q8dcdd0fh2x1ddxwgg2r";
   meta = {
     description = "Generic programming library for regular datatypes";
     license = self.stdenv.lib.licenses.bsd3;

From d043573059da80f258838c0ac4ec57d0bdbe0c60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:52 +0200
Subject: [PATCH 0686/2033] haskell-retry: update to version 0.4

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

diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
index d57898593b2..40fe5dffe87 100644
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -1,13 +1,12 @@
-{ cabal, dataDefault, liftedBase, monadControl, transformers }:
+{ cabal, dataDefault, exceptions, transformers }:
 
 cabal.mkDerivation (self: {
   pname = "retry";
-  version = "0.3.0.0";
-  sha256 = "00yjk5784h4w1cckw17w1k5r94acc3ycnprk642ndgggz3lxm36n";
-  buildDepends = [
-    dataDefault liftedBase monadControl transformers
-  ];
+  version = "0.4";
+  sha256 = "16njq924b5n7jyfc059dbypp529gqlc9qnzd7wjk4m7dpm5bww67";
+  buildDepends = [ dataDefault exceptions transformers ];
   meta = {
+    homepage = "http://github.com/Soostone/retry";
     description = "Retry combinators for monadic actions that may fail";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From b6d3a73d5275016455d5e2f125363e02e790145c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:54 +0200
Subject: [PATCH 0687/2033] haskell-shakespeare-css: update to version 1.1.0

---
 .../libraries/haskell/shakespeare-css/default.nix     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 8f06ee67361..e84ef82171a 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -1,14 +1,13 @@
-{ cabal, hspec, HUnit, parsec, shakespeare, text, transformers }:
+{ cabal, shakespeare }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "1.0.7.4";
-  sha256 = "1lb3w0498bdsd2cmz2ns11dv5abif0wsilbqy0ymfb1dgl2rbpmz";
-  buildDepends = [ parsec shakespeare text transformers ];
-  testDepends = [ hspec HUnit shakespeare text ];
+  version = "1.1.0";
+  sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
+  buildDepends = [ shakespeare ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into css at compile time";
+    description = "Stick your haskell variables into css at compile time. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 90ad782cc58a0b203cf85672bd8433408f02c044 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:56 +0200
Subject: [PATCH 0688/2033] haskell-shakespeare-i18n: update to version 1.1.0

---
 .../libraries/haskell/shakespeare-i18n/default.nix    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 5d7cb8c4abe..411868ce76b 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -1,14 +1,13 @@
-{ cabal, hspec, parsec, shakespeare, text }:
+{ cabal, shakespeare }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-i18n";
-  version = "1.0.0.5";
-  sha256 = "0f6i9pxr1lmqwcarb48swhrgab8hpkr46cv16psmbq67dr6h1dgf";
-  buildDepends = [ parsec shakespeare text ];
-  testDepends = [ hspec text ];
+  version = "1.1.0";
+  sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
+  buildDepends = [ shakespeare ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "A type-based approach to internationalization";
+    description = "A type-based approach to internationalization. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From 8884a80caf601d62cc2853b7576dccd26846f579 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:57 +0200
Subject: [PATCH 0689/2033] haskell-shakespeare-js: update to version 1.3.0

---
 .../libraries/haskell/shakespeare-js/default.nix      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index 12dcea223a9..b98b8331a51 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -1,14 +1,13 @@
-{ cabal, aeson, hspec, HUnit, shakespeare, text }:
+{ cabal, shakespeare }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "1.2.0.4";
-  sha256 = "1y7bqv3yrlzbhd5s8w36z6vcc9jk5b9i8chhsqda5qay85rd0ipz";
-  buildDepends = [ aeson shakespeare text ];
-  testDepends = [ aeson hspec HUnit shakespeare text ];
+  version = "1.3.0";
+  sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
+  buildDepends = [ shakespeare ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Stick your haskell variables into javascript/coffeescript at compile time";
+    description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From fa92bc88ca5777e3d11ecd5cc749c09e4c5716e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:58 +0200
Subject: [PATCH 0690/2033] haskell-shakespeare-text: update to version 1.1.0

---
 .../libraries/haskell/shakespeare-text/default.nix    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index fa5b91dd469..924e4a9891f 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -1,14 +1,13 @@
-{ cabal, hspec, HUnit, shakespeare, text }:
+{ cabal, shakespeare }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "1.0.2";
-  sha256 = "0vhk5g5pm3gz8gzr7cbvkp920x4lmb9pkb9k6yhlj8wfb93bg93q";
-  buildDepends = [ shakespeare text ];
-  testDepends = [ hspec HUnit text ];
+  version = "1.1.0";
+  sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
+  buildDepends = [ shakespeare ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
-    description = "Interpolation with quasi-quotation: put variables strings";
+    description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];

From e9aa6c017a854838dcb5761b3a946c0663d30fc3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:17:59 +0200
Subject: [PATCH 0691/2033] haskell-shakespeare: update to version 2.0.0.3

---
 .../libraries/haskell/shakespeare/default.nix    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 0a0a8f18b03..54b93e10923 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -1,12 +1,18 @@
-{ cabal, hspec, parsec, systemFileio, systemFilepath, text, time }:
+{ cabal, aeson, blazeHtml, blazeMarkup, exceptions, hspec, HUnit
+, parsec, systemFileio, systemFilepath, text, time, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "1.2.1.1";
-  sha256 = "1if3mfkcdfls17pcfgn8grxykq8ia91i7qr4q6m1gy6q4gqs6fkg";
-  buildDepends = [ parsec systemFileio systemFilepath text time ];
+  version = "2.0.0.3";
+  sha256 = "12dmhcv404bh7kn04d175bj2b0fadz4sjypwsq151mlhakr13x85";
+  buildDepends = [
+    aeson blazeHtml blazeMarkup exceptions parsec systemFileio
+    systemFilepath text time transformers
+  ];
   testDepends = [
-    hspec parsec systemFileio systemFilepath text time
+    aeson blazeHtml blazeMarkup exceptions hspec HUnit parsec
+    systemFileio systemFilepath text time transformers
   ];
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";

From 63ec22b6b49bc83d2d5b9133614595c49af9e736 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:01 +0200
Subject: [PATCH 0692/2033] haskell-sized-types: update to version 0.5.0

---
 .../libraries/haskell/sized-types/default.nix            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix
index 672b2c090ef..3fc69552e11 100644
--- a/pkgs/development/libraries/haskell/sized-types/default.nix
+++ b/pkgs/development/libraries/haskell/sized-types/default.nix
@@ -1,14 +1,15 @@
-{ cabal }:
+{ cabal, singletons }:
 
 cabal.mkDerivation (self: {
   pname = "sized-types";
-  version = "0.3.4.0";
-  sha256 = "0fpk7xpqzzylxbnxhz56lxzfnrhfibn0x7ahxl91x6biysnh714c";
+  version = "0.5.0";
+  sha256 = "1cvgw2plzgpddg2p74hylx499dv4hn2nc8s085mnayp5n9jkn8md";
   isLibrary = true;
   isExecutable = true;
+  buildDepends = [ singletons ];
   meta = {
     homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
-    description = "Sized types in Haskell";
+    description = "Sized types in Haskell using the GHC Nat kind";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 466f5ce6395bdd7fddb672976f4c33b1de36dd03 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:02 +0200
Subject: [PATCH 0693/2033] haskell-smtps-gmail: update to version 1.2.0

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

diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
index eb8d97805a0..6361c9bd79a 100644
--- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix
+++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "smtps-gmail";
-  version = "1.1.1";
-  sha256 = "1ccj9rmbplh0c7h6rpg3ry213nb1lrhf7hm2vl7kq9lv0nb7cy97";
+  version = "1.2.0";
+  sha256 = "1gg3cglfsyfffh3b5cyrk3pnb8jg5s8s4yjzykdnfyjrdp1080xz";
   buildDepends = [
     base64Bytestring cprngAes dataDefault filepath mimeMail network
     stringsearch text tls

From 8ebb8079850458c037544c9cb5a299b6ac68542a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:03 +0200
Subject: [PATCH 0694/2033] haskell-snap-cors: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
index d805817838a..2af0a45a63e 100644
--- a/pkgs/development/libraries/haskell/snap-cors/default.nix
+++ b/pkgs/development/libraries/haskell/snap-cors/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-cors";
-  version = "1.2.2";
-  sha256 = "1f32sj7y87lr0wjs3j3ynh95c4j4yx4fzizbgdfnjai1apcjkhcs";
+  version = "1.2.3";
+  sha256 = "0frm1jghm5n1pivcdx45cf7nymny25ijfslg52cm75m55d4l2lvv";
   buildDepends = [
     attoparsec caseInsensitive hashable network snap text transformers
     unorderedContainers

From fd5cf61924022348252c4904cf77a433ef86c134 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:04 +0200
Subject: [PATCH 0695/2033] haskell-snap-server: update to version 0.9.4.4

---
 pkgs/development/libraries/haskell/snap/server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix
index 2821d00be60..0f9a05177d6 100644
--- a/pkgs/development/libraries/haskell/snap/server.nix
+++ b/pkgs/development/libraries/haskell/snap/server.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-server";
-  version = "0.9.4.3";
-  sha256 = "1k2nb6ykj4yany8chjsiwwl4gaadshpdlsj2l5mvn14xz5y192d1";
+  version = "0.9.4.4";
+  sha256 = "1y53baxyn6z6g4vc3j66w60s0vxdblkg8az712iw2030q2brilg2";
   buildDepends = [
     attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
     caseInsensitive enumerator MonadCatchIOTransformers mtl network

From 4cc210e79370a94e8ff9c4eb851d3aa85d06f827 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:05 +0200
Subject: [PATCH 0696/2033] haskell-sqlite-simple: update to version 0.4.6.1

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

diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
index d6d8d43bf24..b8dadb93b7f 100644
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sqlite-simple";
-  version = "0.4.5.2";
-  sha256 = "04080ak589n0abisb6bzsmycrh3l8sh0ipcl1gcsvvfd4x83c9yi";
+  version = "0.4.6.1";
+  sha256 = "0xmrqdwnkbfr4l610qs2fs2l00dyc00v9cphiwqfrqprljg6qb4y";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual directSqlite text time
     transformers

From 8825b68758e4c72b602c08043bc6ff54b9716b41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:07 +0200
Subject: [PATCH 0697/2033] haskell-streaming-commons: update to version 0.1.2

---
 .../haskell/streaming-commons/default.nix          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index 4bcb46887bc..a12f7254187 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -1,13 +1,15 @@
-{ cabal, async, deepseq, hspec, network, QuickCheck, text
-, transformers, zlib
+{ cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
+, text, transformers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.1";
-  sha256 = "1mzpdhdc5kq9pfpsjs6v1j1qa1pdj1ca4s32z4bjq751jayj6ds6";
-  buildDepends = [ network text transformers zlib ];
-  testDepends = [ async deepseq hspec network QuickCheck text zlib ];
+  version = "0.1.2";
+  sha256 = "1n1gav19bc9ifgwhlz4qlrnpgq0fk4x98v6s19zxr88v89rlxdd7";
+  buildDepends = [ blazeBuilder network text transformers zlib ];
+  testDepends = [
+    async blazeBuilder deepseq hspec network QuickCheck text zlib
+  ];
   meta = {
     homepage = "https://github.com/fpco/streaming-commons";
     description = "Common lower-level functions needed by various streaming data libraries";

From e4186ad25cd637bbae9a5e653e6c84f69b4561b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:08 +0200
Subject: [PATCH 0698/2033] haskell-stylish-haskell: update to version 0.5.10.0

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

diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
index 83dd3d9d3bc..31501e26a80 100644
--- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stylish-haskell";
-  version = "0.5.9.1";
-  sha256 = "0wh0n63nywwzlp9glgm10jyidlcyl944ylnfg5phiahr39946x6y";
+  version = "0.5.10.0";
+  sha256 = "12sba4bbc1qzicvavlbf4wqj7xs2pk0z3ha70xsvldszhyav9zj9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 74e12c231be1501b712df938394ff481cd23f773 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:09 +0200
Subject: [PATCH 0699/2033] haskell-syntactic: update to version 1.12.1

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

diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix
index e18cf7b5937..39fbeebd33c 100644
--- a/pkgs/development/libraries/haskell/syntactic/default.nix
+++ b/pkgs/development/libraries/haskell/syntactic/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syntactic";
-  version = "1.11";
-  sha256 = "1j4k4qwi17x9z0cjf9adndaj5wbs8prs36xpz2icf7mlwcr9pvrz";
+  version = "1.12.1";
+  sha256 = "0p68jgfwzr9mvgrcjdj3235109nhpaichm5irj9m29076axrsb94";
   buildDepends = [
     constraints dataHash mtl transformers treeView tuple
   ];

From a9f35c5e679e6f65a4db65a6aae157fbe85805ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:10 +0200
Subject: [PATCH 0700/2033] haskell-tagged: update to version 0.7.2

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

diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix
index d62033e8d16..48a963dc869 100644
--- a/pkgs/development/libraries/haskell/tagged/default.nix
+++ b/pkgs/development/libraries/haskell/tagged/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tagged";
-  version = "0.7.1";
-  sha256 = "036k5k44971fq6zdxc36kkic9ma93mcas7zk48i32s60iznnfc6v";
+  version = "0.7.2";
+  sha256 = "06w7gss2vqnly2zijf0hkq60jx13nsxwsjsnyfbn25r4f6gjsnq5";
   meta = {
     homepage = "http://github.com/ekmett/tagged";
     description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";

From 76f369772fae0f39a930362db94212ed333e6b3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:12 +0200
Subject: [PATCH 0701/2033] haskell-twitter-types: update to version
 0.2.20140424

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

diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix
index 05c37c02f41..0d40217c3d5 100644
--- a/pkgs/development/libraries/haskell/twitter-types/default.nix
+++ b/pkgs/development/libraries/haskell/twitter-types/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "twitter-types";
-  version = "0.2.20140407";
-  sha256 = "171m7fqq82g630r1x5advq04qfkdljvc8d8ygyafr2x44ss2a996";
+  version = "0.2.20140424";
+  sha256 = "0ap2l3mclcilm58awz0fdayzcs7fckv69l6xdklp1yqyj6i7zk9a";
   buildDepends = [ aeson httpTypes text unorderedContainers ];
   testDepends = [
     aeson attoparsec httpTypes HUnit shakespeare testFramework

From 73bfdbf69f3836f40b577c44d0d0f2e86d6ee4e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:13 +0200
Subject: [PATCH 0702/2033] haskell-wai-test: update to version 2.0.1.2

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

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index e55bf8805e3..6f976005466 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "2.0.1.1";
-  sha256 = "08mkn6v8kxlcn2qb5rz9m5mqzl9wy43mxs2jzl1gavkf9bhwc93s";
+  version = "2.0.1.2";
+  sha256 = "11mkzh5wlfhdrwzqhsbcl3qnbawmks4vxr1vv0s2ny50q5na41ln";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra cookie deepseq httpTypes network text transformers wai

From 045b7d77a1846fe6358981b717370a443830b395 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:14 +0200
Subject: [PATCH 0703/2033] haskell-warp-tls: update to version 2.0.5

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

diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix
index cca9da9eb3d..e9e7ae39380 100644
--- a/pkgs/development/libraries/haskell/warp-tls/default.nix
+++ b/pkgs/development/libraries/haskell/warp-tls/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp-tls";
-  version = "2.0.3.3";
-  sha256 = "03fjghsa9zvrvg7ickph577zzr62n91gsb99v9k47s4nd2xri2rj";
+  version = "2.0.5";
+  sha256 = "11nc5drys75mjfqww87rs2clhxpx485q008y42f2ymj7s5856db4";
   buildDepends = [
     conduit conduitExtra cprngAes dataDefaultClass network
     networkConduit resourcet streamingCommons tls transformers wai warp

From b0ea67aa871444dbf7dc7d459cc65934d8b25113 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:15 +0200
Subject: [PATCH 0704/2033] haskell-warp: update to version 2.1.5

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index b86884415a5..53291b70aa8 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.4.1";
-  sha256 = "0j9w74gk84w9khyg5whjkd21pllg4rw8hxfs65zmrvm1k94lwqkf";
+  version = "2.1.5";
+  sha256 = "1lny4lzc58g9zydn46dvrq4rpqyr2rfsjr4vwxhdmn8rql7jasyc";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra hashable httpDate httpTypes liftedBase network

From b39407d997a1f2846c813b3a0986e4a1868cf6a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:17 +0200
Subject: [PATCH 0705/2033] haskell-websockets: update to version 0.8.2.2

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

diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index cc5caddb6ec..774b17140e1 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.2.1";
-  sha256 = "0ayh20a6xj3ab9ld3lmrazx94vbbf1xn65nxcpkq7cvm8ggim7a6";
+  version = "0.8.2.2";
+  sha256 = "16q4znki5f4133cgwcs8wqgx6ljl8x59khrsdsi646nclb3lyl0a";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text

From 0c7b8142da982dd8cefb01067812937fbbe744ba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:18 +0200
Subject: [PATCH 0706/2033] haskell-x509-system: update to version 1.4.5

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

diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix
index 36d1f5bd706..c5467722294 100644
--- a/pkgs/development/libraries/haskell/x509-system/default.nix
+++ b/pkgs/development/libraries/haskell/x509-system/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "x509-system";
-  version = "1.4.2";
-  sha256 = "1r22ignmwkv1z26bmnwh7prqy69cln26pfyyaf5r2vw8s66rgl39";
+  version = "1.4.5";
+  sha256 = "0pwn624n6fagg9rw2p09x2k212rc8167jhqz6z5wf6m7y56ql28x";
   buildDepends = [ filepath mtl pem time x509 x509Store ];
   meta = {
     homepage = "http://github.com/vincenthz/hs-certificate";

From c1d56bb242ca5a75355e2553581eb8bf452464ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:19 +0200
Subject: [PATCH 0707/2033] haskell-xml-hamlet: update to version 0.4.0.8

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

diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
index 346891cc68d..16e4abfa2cd 100644
--- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-hamlet";
-  version = "0.4.0.7";
-  sha256 = "05rygs3ja3zc87az151mkbm4llrnshzrqf1mfpbwx4ysfgjkvq7b";
+  version = "0.4.0.8";
+  sha256 = "10hc4a6lqifiinm9rf1ziw35bjnjgkd5mhagg9anvz35hhr7bbrr";
   buildDepends = [ parsec shakespeare text xmlConduit ];
   testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
   meta = {

From 91af4b57accd763edbeee2b713a66938b5dd2e4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:20 +0200
Subject: [PATCH 0708/2033] haskell-yesod-bin: update to version 1.2.9.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 09da23de789..0b64573d0ae 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -5,13 +5,13 @@
 , projectTemplate, resourcet, shakespeare, shakespeareCss
 , shakespeareJs, shakespeareText, split, streamingCommons
 , systemFileio, systemFilepath, tar, text, time, transformers
-, unixCompat, unorderedContainers, wai, warp, yaml, zlib
+, unixCompat, unorderedContainers, wai, waiExtra, warp, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.8.1";
-  sha256 = "07cwfj01yq88qi99ww2l3mih894wp6s7j35img9wjpz3rsiayy6x";
+  version = "1.2.9.1";
+  sha256 = "0x7r960sq6r3lds0sgjvrp8z6b275iggr0isny0b6rz5ynwd6bcz";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
@@ -21,7 +21,7 @@ cabal.mkDerivation (self: {
     optparseApplicative parsec projectTemplate resourcet shakespeare
     shakespeareCss shakespeareJs shakespeareText split streamingCommons
     systemFileio systemFilepath tar text time transformers unixCompat
-    unorderedContainers wai warp yaml zlib
+    unorderedContainers wai waiExtra warp yaml zlib
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From 247b903b6896bf5bece7761826c9bd8cb178e5a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:21 +0200
Subject: [PATCH 0709/2033] haskell-yesod-core: update to version 1.2.15

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index fbf633f7095..761f36fcb22 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.14";
-  sha256 = "1xffs62nhibmz5v8d3jh2dqcz5kryj1n1mv26p1rljrwjxz9i2hb";
+  version = "1.2.15";
+  sha256 = "06y95hbahrd23wwmprnhwglvg5arj0xw3r6cv3n2h93zrlfsb5b5";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie

From 2b1fc1ad1ba56e21818d2ab08cdda52582afcf15 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:23 +0200
Subject: [PATCH 0710/2033] haskell-yesod-test: update to version 1.2.1.4

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

diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index 9a9cdc4e295..d943d12de41 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.1.2";
-  sha256 = "12b747sd5rrypv1i2b5rpa3qgpnzibwjw7rlv02hyz8g7kf6wvbm";
+  version = "1.2.1.4";
+  sha256 = "1m3fh0s46s2d7q876bvqj1iww7s7nhpcjsnj1547hm7ymfsa29r8";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     yesodCore
   ];
   testDepends = [
-    hspec htmlConduit HUnit text xmlConduit yesodCore yesodForm
+    hspec htmlConduit HUnit text wai xmlConduit yesodCore yesodForm
   ];
   meta = {
     homepage = "http://www.yesodweb.com";

From d163de3bdb334ef7333990f7307e054afb22c451 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:24 +0200
Subject: [PATCH 0711/2033] haskell-zip-archive: update to version 0.2.2.1

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

diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix
index d76de048bab..44a14259b40 100644
--- a/pkgs/development/libraries/haskell/zip-archive/default.nix
+++ b/pkgs/development/libraries/haskell/zip-archive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zip-archive";
-  version = "0.2.2";
-  sha256 = "10br64sn7wmssimxssqmjd43br8y63l5szn2wg30d957a9zgdk60";
+  version = "0.2.2.1";
+  sha256 = "0w9l3kdlwkc3yvyxb152s9qwzmc0kjp6d1cbk7yfkpw3081qgckn";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary digest filepath mtl text time zlib ];

From 1a06bcc109e9499e4b71375e1698d88809e56713 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 19:18:25 +0200
Subject: [PATCH 0712/2033] haskell-packunused: update to version 0.1.1.2

---
 .../development/tools/haskell/packunused/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix
index 35d318d36ba..8acee158683 100644
--- a/pkgs/development/tools/haskell/packunused/default.nix
+++ b/pkgs/development/tools/haskell/packunused/default.nix
@@ -1,12 +1,16 @@
-{ cabal, Cabal, cmdargs, filepath, haskellSrcExts }:
+{ cabal, Cabal, filepath, haskellSrcExts, optparseApplicative
+, split
+}:
 
 cabal.mkDerivation (self: {
   pname = "packunused";
-  version = "0.1.0.1";
-  sha256 = "130717k4rknj5jl904cmb4h09msp4xjj84w6iwzc10lz736dk3jd";
+  version = "0.1.1.2";
+  sha256 = "1kp004lh6sa4gjqm37ldgk70jbncrnr76rk9c77464cnj6ajxmlm";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ Cabal cmdargs filepath haskellSrcExts ];
+  buildDepends = [
+    Cabal filepath haskellSrcExts optparseApplicative split
+  ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/hvr/packunused";

From 50d5d8b33fb98f5ff7929c0dadd2d3922724137a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Apr 2014 23:03:50 +0200
Subject: [PATCH 0713/2033] The hamlet and shakespeare-* packages are
 deprecated and no longer export any code. This means that we cannot run the
 Haddock phase.

---
 pkgs/development/libraries/haskell/hamlet/default.nix           | 1 +
 pkgs/development/libraries/haskell/shakespeare-css/default.nix  | 1 +
 pkgs/development/libraries/haskell/shakespeare-i18n/default.nix | 1 +
 pkgs/development/libraries/haskell/shakespeare-js/default.nix   | 1 +
 pkgs/development/libraries/haskell/shakespeare-text/default.nix | 1 +
 5 files changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix
index dd773f41581..c3e58cf34dc 100644
--- a/pkgs/development/libraries/haskell/hamlet/default.nix
+++ b/pkgs/development/libraries/haskell/hamlet/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.2.0";
   sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
   buildDepends = [ shakespeare ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Haml-like template files that are compile-time checked (deprecated)";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index e84ef82171a..349b5d6cdbd 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
   buildDepends = [ shakespeare ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Stick your haskell variables into css at compile time. (deprecated)";
diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
index 411868ce76b..43af98f65aa 100644
--- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
   buildDepends = [ shakespeare ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "A type-based approach to internationalization. (deprecated)";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index b98b8331a51..40e7cd17b23 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.3.0";
   sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
   buildDepends = [ shakespeare ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 924e4a9891f..b299b7c7030 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.1.0";
   sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
   buildDepends = [ shakespeare ];
+  noHaddock = true;
   meta = {
     homepage = "http://www.yesodweb.com/book/shakespearean-templates";
     description = "Interpolation with quasi-quotation: put variables strings (deprecated)";

From 920a734a153b767c31d661959437515c4d2a17ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Apr 2014 09:27:01 +0200
Subject: [PATCH 0714/2033] qt48: bugfix update 4.8.5 -> .6

Some patches dropped, as they seemed included.
---
 .../development/libraries/qt-4.x/4.8/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 1bd027f5298..1679b4953e7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -16,7 +16,7 @@ with stdenv.lib;
 
 let
   v_maj = "4.8";
-  v_min = "5";
+  v_min = "6";
   vers = "${v_maj}.${v_min}";
 in
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qt/"
       + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz";
-    sha256 = "0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb";
+    sha256 = "0b036iqgmbbv37dgwwfihw3mihjbnw3kb5kaisdy0qi8nn8xs54b";
   };
 
   # The version property must be kept because it will be included into the QtSDK package name
@@ -49,16 +49,6 @@ stdenv.mkDerivation rec {
 
   patches =
     [ ./glib-2.32.patch
-      (fetchurl {
-        name = "CVE-2013-4549.patch";
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/CVE-2013-4549.patch?h=packages/qt4";
-        sha256 = "0xz60fmspzvsyhd0f013pvh2bbm87976128fphbckfcwiqr1hanw";
-      })
-      (fetchurl {
-        name = "libmng2.patch";
-        url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/libmng2.patch?h=packages/qt4";
-        sha256 = "1sgnrl3qzr370ad5bqc66f7sp0gk046jnsy1811x24f16cs04xzh";
-      })
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
         inherit cups icu libXfixes;
@@ -183,7 +173,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage    = http://qt-project.org/;
     description = "A cross-platform application framework for C++";
-    license     = "GPL/LGPL";
+    license     = licenses.lgpl21Plus; # or gpl3
     maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
     platforms   = platforms.linux;
   };

From 2dfbe554213a007fc01ebd1a86d8637de8fe7191 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 10:13:21 +0200
Subject: [PATCH 0715/2033] Remove use of obsolete flags

---
 nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index ad791d7d958..8fe8b90d823 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -8,8 +8,6 @@ let
   subversion = pkgs.subversion.override (origArgs: {
     bdbSupport = true;
     httpServer = true;
-    sslSupport = true;
-    compressionSupport = true;
     pythonBindings = true;
   });
 

From 05468f9b7893b4cdfdf093b271d54606a3457174 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 10:43:38 +0200
Subject: [PATCH 0716/2033] Bring back the isSystemUser option

---
 nixos/modules/config/users-groups.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 8b8f6bd909e..7daab98f7be 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -55,13 +55,27 @@ let
         type = with types; nullOr int;
         default = null;
         description = ''
-          The account UID. If the <literal>mutableUsers</literal> option
+          The account UID. If the <option>mutableUsers</option> option
           is false, the UID cannot be null. Otherwise, the UID might be
           null, in which case a free UID is picked on activation (by the
           useradd command).
         '';
       };
 
+      isSystemUser = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Indicates if the user is a system user or not. This option
+          only has an effect if <option>mutableUsers</option> is
+          <literal>true</literal> and <option>uid</option> is
+          <option>null</option>, in which case it determines whether
+          the user's UID is allocated in the range for system users
+          (below 500) or in the range for normal users (starting at
+          1000).
+        '';
+      };
+
       group = mkOption {
         type = types.str;
         default = "nogroup";
@@ -459,17 +473,16 @@ in {
         '';
         groupadd = n: g: ''
           if [ -z "$(getent group "${g.name}")" ]; then
-            echo "Adding group ${g.name}"
             ${pkgs.shadow}/sbin/groupadd "${g.name}"
           fi
         '';
         useradd = n: u: ''
           if ! id "${u.name}" &>/dev/null; then
-            echo "Adding user ${u.name}"
             ${pkgs.shadow}/sbin/useradd \
               -g "${u.group}" \
               -s "${u.shell}" \
               -d "${u.home}" \
+              ${optionalString u.isSystemUser "--system"} \
               "${u.name}"
             echo "${u.name}:x" | ${pkgs.shadow}/sbin/chpasswd -e
           fi

From 0e23a175de3687df8232fe118cbe87f04228ff28 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 10:45:06 +0200
Subject: [PATCH 0717/2033] Allocate system uids/gids between 400 and 500

Previously it was between 100 and 500, but this can already collide
with the static uids/guid in misc/ids.nix.
---
 nixos/modules/misc/ids.nix        | 8 ++++----
 nixos/modules/programs/shadow.nix | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2d9ea1450ff..d653ac51143 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -129,10 +129,10 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
-      hydra     = 122;
-      spiped    = 123;
+      hydra = 122;
+      spiped = 123;
 
-      # When adding a uid, make sure it doesn't match an existing gid.
+      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
       nixbld = 30000; # start of range of uids
       nobody = 65534;
@@ -237,7 +237,7 @@
       hydra = 122;
       spiped = 123;
 
-      # When adding a gid, make sure it doesn't match an existing uid.
+      # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
       users = 100;
       nixbld = 30000;
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index a2435099499..27a18c726a3 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -10,12 +10,12 @@ let
     ''
       DEFAULT_HOME yes
 
-      SYS_UID_MIN  100
+      SYS_UID_MIN  400
       SYS_UID_MAX  499
       UID_MIN      1000
       UID_MAX      29999
 
-      SYS_GID_MIN  100
+      SYS_GID_MIN  400
       SYS_GID_MAX  499
       GID_MIN      1000
       GID_MAX      29999

From a142d68b4391fc78cf8c3d4f86300e10c3bf730e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 10:51:42 +0200
Subject: [PATCH 0718/2033] Fix some uid/gid attributes to match the actual
 user/group name

---
 nixos/modules/misc/ids.nix                           | 12 ++++++------
 nixos/modules/services/databases/4store-endpoint.nix |  2 +-
 nixos/modules/services/databases/4store.nix          |  2 +-
 nixos/modules/services/games/ghost-one.nix           |  4 ++--
 nixos/modules/services/misc/folding-at-home.nix      |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d653ac51143..3f6aaa15bb4 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -52,13 +52,13 @@
       osgi = 34;
       tor = 35;
       cups = 36;
-      foldingAtHome = 37;
+      foldingathome = 37;
       sabnzbd = 38;
       kdm = 39;
-      ghostOne = 40;
+      ghostone = 40;
       git = 41;
-      fourStore = 42;
-      fourStoreEndpoint = 43;
+      fourstore = 42;
+      fourstorehttp = 43;
       virtuoso = 44;
       rtkit = 45;
       dovecot2 = 46;
@@ -173,8 +173,8 @@
       osgi = 34;
       ghostOne = 40;
       git = 41;
-      fourStore = 42;
-      fourStoreEndpoint = 43;
+      fourstore = 42;
+      fourstorehttpd = 43;
       virtuoso = 44;
       dovecot2 = 46;
       prayer = 49;
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 68913f15f95..f2d64b6891d 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -54,7 +54,7 @@ with lib;
 
     users.extraUsers = singleton
       { name = endpointUser;
-        uid = config.ids.uids.fourStoreEndpoint;
+        uid = config.ids.uids.fourstorehttp;
         description = "4Store SPARQL endpoint user";
 #        home = stateDir;
       };
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 1725672a659..469fef69c95 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -45,7 +45,7 @@ with lib;
 
     users.extraUsers = singleton
       { name = fourStoreUser;
-        uid = config.ids.uids.fourStore;
+        uid = config.ids.uids.fourstore;
         description = "4Store database user";
         home = stateDir;
       };
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
index 7a3ecebec39..07d7287ed88 100644
--- a/nixos/modules/services/games/ghost-one.nix
+++ b/nixos/modules/services/games/ghost-one.nix
@@ -57,14 +57,14 @@ in
 
     users.extraUsers = singleton
       { name = ghostUser;
-        uid = config.ids.uids.ghostOne;
+        uid = config.ids.uids.ghostone;
         description = "Ghost One game server user";
         home = stateDir;
       };
 
     users.extraGroups = singleton
       { name = ghostUser;
-        gid = config.ids.gids.ghostOne;
+        gid = config.ids.gids.ghostone;
       };
 
     services.ghostOne.config = ''
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 0093e3c0c33..392d2d1f002 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -44,7 +44,7 @@ in {
 
     users.extraUsers = singleton
       { name = fahUser;
-        uid = config.ids.uids.foldingAtHome;
+        uid = config.ids.uids.foldingathome;
         description = "Folding@Home user";
         home = stateDir;
       };

From 936481a12e805896e524f9b790f4f36d0300194b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 20 Apr 2014 20:06:54 -0500
Subject: [PATCH 0719/2033] nixos: Add support for changing supported systems

release.nix and release-combined.nix current hardcode the systems which
they are built for. This change introduces an argument to the
expressions called supportedSystems, which allows the builder to choose
which architectures he wants to build. By default, this uses the same
linux x86_64 and i686 architectures.
---
 nixos/release-combined.nix | 5 ++---
 nixos/release.nix          | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 15b5b2b8b7b..8a62bce80a2 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -1,6 +1,7 @@
 { nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 , stableBranch ? false
+, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
 
 let
@@ -23,10 +24,8 @@ in rec {
   });
 
   nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
-    inherit officialRelease;
+    inherit officialRelease supportedSystems;
     nixpkgs = nixpkgsSrc;
-    # Only do Linux builds.
-    supportedSystems = [ "x86_64-linux" "i686-linux" ];
   })) [ "unstable" ];
 
   tested = pkgs.releaseTools.aggregate {
diff --git a/nixos/release.nix b/nixos/release.nix
index 4a10ff39ed0..81a5f06f403 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,7 @@
 { nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 , stableBranch ? false
+, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
 
 let
@@ -10,9 +11,7 @@ let
     if officialRelease then ""
     else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
-  systems = [ "x86_64-linux" "i686-linux" ];
-
-  forAllSystems = pkgs.lib.genAttrs systems;
+  forAllSystems = pkgs.lib.genAttrs supportedSystems;
 
   callTest = fn: args: forAllSystems (system: import fn ({ inherit system; } // args));
 

From 8dc287b88c7adeeda1c08345cc0ce7fce7ba536a Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Mon, 28 Apr 2014 21:23:23 +0400
Subject: [PATCH 0720/2033] Let users install fonts to their HOME directory

---
 pkgs/development/libraries/fontconfig/make-fonts-conf.xsl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 073e4165931..59071ce9e22 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -32,6 +32,9 @@
         <dir><xsl:value-of select="." /></dir>
         <xsl:text>&#0010;</xsl:text>
       </xsl:for-each>
+      <dir prefix="xdg">fonts</dir>
+      <!-- the following element will be removed in the future -->
+      <dir>~/.fonts</dir>
 
     </fontconfig>
 

From d6c2dcd98cd822e88c31eb7732209714a043dac4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 12:14:51 +0200
Subject: [PATCH 0721/2033] Remove redundant ~/.fonts element from the font
 search path

---
 nixos/modules/config/fonts/fonts.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index 16df197d87f..b6ec5c91695 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -11,8 +11,6 @@ with lib;
       # TODO: find another name for it.
       fonts = mkOption {
         default = [
-          # - the user's .fonts directory
-          "~/.fonts"
           # - the user's current profile
           "~/.nix-profile/lib/X11/fonts"
           "~/.nix-profile/share/fonts"

From 5ae8ed381c5439fb226d1d4f4dbbbf01f446f9a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 12:25:29 +0200
Subject: [PATCH 0722/2033] Shut up warning about missing fonts.dtd

---
 pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index bf94bfa34d2..f9cd096f559 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -1,13 +1,14 @@
-{runCommand, libxslt, fontconfig, fontDirectories}:
+{ runCommand, libxslt, fontconfig, fontDirectories }:
 
 runCommand "fonts.conf"
-  { 
-    buildInputs = [libxslt];
+  {
+    buildInputs = [ libxslt fontconfig ];
     inherit fontDirectories;
   }
   ''
     xsltproc --stringparam fontDirectories "$fontDirectories" \
       --stringparam fontconfig "${fontconfig}" \
+      --path ${fontconfig}/share/xml/fontconfig \
       ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \
       > $out
   ''

From e6b5c0121f2cdaaf1e63b16c74337bb87aae42b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 12:25:47 +0200
Subject: [PATCH 0723/2033] Obsolete fonts.extraFonts

You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.
---
 nixos/modules/config/fonts/corefonts.nix      |  2 +-
 nixos/modules/config/fonts/fonts.nix          | 52 +++++++++----------
 nixos/modules/config/fonts/ghostscript.nix    |  2 +-
 nixos/modules/rename.nix                      |  1 +
 .../services/x11/desktop-managers/gnome3.nix  |  2 +-
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
index 51a6676fe4a..ad797087932 100644
--- a/nixos/modules/config/fonts/corefonts.nix
+++ b/nixos/modules/config/fonts/corefonts.nix
@@ -25,7 +25,7 @@ with lib;
 
   config = mkIf config.fonts.enableCoreFonts {
 
-    fonts.extraFonts = [ pkgs.corefonts ];
+    fonts.fonts = [ pkgs.corefonts ];
 
   };
 
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index b6ec5c91695..ac804bef7fe 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -10,38 +10,36 @@ with lib;
 
       # TODO: find another name for it.
       fonts = mkOption {
-        default = [
-          # - the user's current profile
-          "~/.nix-profile/lib/X11/fonts"
-          "~/.nix-profile/share/fonts"
-          # - the default profile
-          "/nix/var/nix/profiles/default/lib/X11/fonts"
-          "/nix/var/nix/profiles/default/share/fonts"
-        ];
-        description = "List of primary font paths.";
-        apply = list: list ++ [
-          # - a few statically built locations
-          pkgs.xorg.fontbhttf
-          pkgs.xorg.fontbhlucidatypewriter100dpi
-          pkgs.xorg.fontbhlucidatypewriter75dpi
-          pkgs.ttf_bitstream_vera
-          pkgs.freefont_ttf
-          pkgs.liberation_ttf
-          pkgs.xorg.fontbh100dpi
-          pkgs.xorg.fontmiscmisc
-          pkgs.xorg.fontcursormisc
-        ]
-        ++ config.fonts.extraFonts;
-      };
-
-      extraFonts = mkOption {
-        default = [];
         example = [ pkgs.dejavu_fonts ];
-        description = "List of packages with additional fonts.";
+        description = "List of primary font paths.";
+        apply = list: list ++
+          [ # - the user's current profile
+            "~/.nix-profile/lib/X11/fonts"
+            "~/.nix-profile/share/fonts"
+            # - the default profile
+            "/nix/var/nix/profiles/default/lib/X11/fonts"
+            "/nix/var/nix/profiles/default/share/fonts"
+          ];
       };
 
     };
 
   };
 
+  config = {
+
+    fonts.fonts =
+      [ pkgs.xorg.fontbhttf
+        pkgs.xorg.fontbhlucidatypewriter100dpi
+        pkgs.xorg.fontbhlucidatypewriter75dpi
+        pkgs.ttf_bitstream_vera
+        pkgs.freefont_ttf
+        pkgs.liberation_ttf
+        pkgs.xorg.fontbh100dpi
+        pkgs.xorg.fontmiscmisc
+        pkgs.xorg.fontcursormisc
+      ];
+
+  };
+
 }
diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix
index a41f00a76c5..1c62a525de9 100644
--- a/nixos/modules/config/fonts/ghostscript.nix
+++ b/nixos/modules/config/fonts/ghostscript.nix
@@ -25,7 +25,7 @@ with lib;
 
   config = mkIf config.fonts.enableGhostscriptFonts {
 
-    fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
+    fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
 
   };
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0a67aeb81e5..ae0b4003fee 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -74,6 +74,7 @@ in zipModules ([]
 ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]
 ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]
 ++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
+++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
 
 ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
 ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d258614cc08..8c17b27dc37 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -64,7 +64,7 @@ in {
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
-    fonts.extraFonts = [ pkgs.dejavu_fonts ];
+    fonts.fonts = [ pkgs.dejavu_fonts ];
 
     services.xserver.desktopManager.session = singleton
       { name = "gnome3";

From 6cb6694f8b8832a04107e4731b2df3f3e9fbf58a Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Tue, 29 Apr 2014 20:24:14 +0800
Subject: [PATCH 0724/2033] Update haskell-http-kit to version 0.2.2

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

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
index f4dcdc204be..5e25f44057f 100644
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-kit";
-  version = "0.2.1";
-  sha256 = "1x3wqjbgs605wrl2dgvszdkvpkfrin4j9azkaa57hza6bgwpidra";
+  version = "0.2.2";
+  sha256 = "09pq3wzcg8piil6bcp713dfscrfald155456dfir9dljviamhvsv";
   buildDepends = [ caseInsensitive httpTypes ];
   testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
   meta = {

From 3fe96bcca168b8b3ca9b9cb56f2568c338b0936d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 12:58:54 +0200
Subject: [PATCH 0725/2033] Rename hardware.opengl.videoDrivers back to
 services.xserver.videoDrivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #2379.
The new name was a misnomer because the values really are X11 video
drivers (e.g. ‘cirrus’ or ‘nvidia’), not OpenGL implementations. That
it's also used to set an OpenGL implementation for kmscon is just
confusing overloading.
---
 nixos/doc/manual/configuration.xml            |  4 +-
 nixos/modules/hardware/opengl.nix             | 52 +++++++++----------
 .../cd-dvd/system-tarball-sheevaplug.nix      |  3 +-
 .../installer/tools/nixos-generate-config.pl  |  2 +-
 nixos/modules/installer/virtualbox-demo.nix   |  2 +-
 nixos/modules/rename.nix                      |  2 +-
 .../modules/services/x11/terminal-server.nix  |  2 +-
 nixos/modules/services/x11/xserver.nix        | 18 +++++--
 nixos/modules/virtualisation/qemu-vm.nix      |  2 +-
 .../virtualisation/virtualbox-guest.nix       |  2 +-
 10 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml
index 0ffee826dc4..803a3393d15 100644
--- a/nixos/doc/manual/configuration.xml
+++ b/nixos/doc/manual/configuration.xml
@@ -1195,7 +1195,7 @@ driver from a set of X.org drivers (such as <literal>vesa</literal>
 and <literal>intel</literal>).  You can also specify a driver
 manually, e.g.
 <programlisting>
-hardware.opengl.videoDrivers = [ "r128" ];
+services.xserver.videoDrivers = [ "r128" ];
 </programlisting>
 to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
 
@@ -1238,7 +1238,7 @@ $ systemctl start display-manager.service
 has better 3D performance than the X.org drivers.  It is not enabled
 by default because it’s not free software.  You can enable it as follows:
 <programlisting>
-hardware.opengl.videoDrivers = [ "nvidia" ];
+services.xserver.videoDrivers = [ "nvidia" ];
 </programlisting>
 You may need to reboot after enabling this driver to prevent a clash
 with other kernel modules.</para>
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 485ac008dd8..b2c97f0bfad 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -1,14 +1,21 @@
-{ config, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, pkgs_i686, ... }:
+
+with lib;
+
 let
-  inherit (pkgs.lib) mkOption types mkIf optional optionals elem optionalString optionalAttrs;
 
   cfg = config.hardware.opengl;
 
   kernelPackages = config.boot.kernelPackages;
-in {
+
+  videoDrivers = config.services.xserver.videoDrivers;
+
+in
+
+{
   options = {
     hardware.opengl.enable = mkOption {
-      description = "Whether this configuration requires opengl.";
+      description = "Whether this configuration requires OpenGL.";
       type = types.bool;
       default = false;
       internal = true;
@@ -45,18 +52,6 @@ in {
       '';
     };
 
-
-    hardware.opengl.videoDrivers = mkOption {
-      type = types.listOf types.str;
-      # !!! We'd like "nv" here, but it segfaults the X server.
-      default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
-      example = [ "vesa" ];
-      description = ''
-        The names of the opengl video drivers the configuration
-        supports. They will be tried in order until one that
-        supports your card is found.
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -71,21 +66,21 @@ in {
       ${optionalString (pkgs.stdenv.isi686) "ln -sf opengl-driver /run/opengl-driver-32"}
     ''
       #TODO:  The OpenGL driver should depend on what's detected at runtime.
-     +( if elem "nvidia" cfg.videoDrivers then
+     +( if elem "nvidia" videoDrivers then
           ''
             ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
             ${optionalString cfg.driSupport32Bit
               "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
           ''
-        else if elem "nvidiaLegacy173" cfg.videoDrivers then
+        else if elem "nvidiaLegacy173" videoDrivers then
           "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
-        else if elem "nvidiaLegacy304" cfg.videoDrivers then
+        else if elem "nvidiaLegacy304" videoDrivers then
           ''
             ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
             ${optionalString cfg.driSupport32Bit
               "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
           ''
-        else if elem "ati_unfree" cfg.videoDrivers then
+        else if elem "ati_unfree" videoDrivers then
           "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
         else
           let
@@ -109,19 +104,20 @@ in {
       [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
 
     boot.extraModulePackages =
-      optional (elem "nvidia" cfg.videoDrivers) kernelPackages.nvidia_x11 ++
-      optional (elem "nvidiaLegacy173" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy173 ++
-      optional (elem "nvidiaLegacy304" cfg.videoDrivers) kernelPackages.nvidia_x11_legacy304 ++
-      optional (elem "virtualbox" cfg.videoDrivers) kernelPackages.virtualboxGuestAdditions ++
-      optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
+      optional (elem "nvidia" videoDrivers) kernelPackages.nvidia_x11 ++
+      optional (elem "nvidiaLegacy173" videoDrivers) kernelPackages.nvidia_x11_legacy173 ++
+      optional (elem "nvidiaLegacy304" videoDrivers) kernelPackages.nvidia_x11_legacy304 ++
+      optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions ++
+      optional (elem "ati_unfree" videoDrivers) kernelPackages.ati_drivers_x11;
 
     boot.blacklistedKernelModules =
-      optionals (elem "nvidia" cfg.videoDrivers) [ "nouveau" "nvidiafb" ];
+      optionals (elem "nvidia" videoDrivers) [ "nouveau" "nvidiafb" ];
 
-    environment.etc =  (optionalAttrs (elem "ati_unfree" cfg.videoDrivers) {
+    environment.etc =
+      (optionalAttrs (elem "ati_unfree" videoDrivers) {
         "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
       })
-      // (optionalAttrs (elem "nvidia" cfg.videoDrivers) {
+      // (optionalAttrs (elem "nvidia" videoDrivers) {
         "OpenCL/vendors/nvidia.icd".source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
       });
   };
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 1008bd5d3d0..3626308bff8 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -138,7 +138,8 @@ in
   };
 
   # Setting vesa, we don't get the nvidia driver, which can't work in arm.
-  hardware.opengl.videoDrivers = [ "vesa" ];
+  services.xserver.videoDrivers = [ "vesa" ];
+
   services.nixosManual.enable = false;
 
   # Include the firmware for various wireless cards.
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index da1d2688277..89f112cc6bf 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -165,7 +165,7 @@ foreach my $path (glob "/sys/bus/pci/devices/*") {
     pciCheck $path;
 }
 
-push @attrs, "hardware.opengl.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
+push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDriver;
 
 
 # Idem for USB devices.
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 0a52cbea289..f68f8dc40aa 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -15,5 +15,5 @@ with lib;
 
   # Add some more video drivers to give X11 a shot at working in
   # VMware and QEMU.
-  hardware.opengl.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
+  services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" ];
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ae0b4003fee..1a0c7c0168c 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -121,7 +121,7 @@ in zipModules ([]
 ++ obsolete [ "services" "xserver" "driSupport" ] [ "hardware" "opengl" "driSupport" ]
 ++ obsolete [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ]
 ++ obsolete [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
-++ obsolete [ "services" "xserver" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ]
+++ obsolete [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ]
 
 ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]
 
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index bdc23c0acd1..a036e085b0b 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -27,7 +27,7 @@ in
   config = {
 
     services.xserver.enable = true;
-    hardware.opengl.videoDrivers = [];
+    services.xserver.videoDrivers = [];
 
     # Enable KDM.  Any display manager will do as long as it supports XDMCP.
     services.xserver.displayManager.kdm.enable = true;
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 65f93b54499..941d08c4641 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -24,7 +24,7 @@ let
     intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; };
   };
 
-  driverNames = config.hardware.opengl.videoDrivers;
+  driverNames = cfg.videoDrivers;
 
   needsAcpid =
      (elem "nvidia" driverNames) ||
@@ -181,6 +181,18 @@ in
         '';
       };
 
+      videoDrivers = mkOption {
+        type = types.listOf types.str;
+        # !!! We'd like "nv" here, but it segfaults the X server.
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
+        example = [ "vesa" ];
+        description = ''
+          The names of the video drivers the configuration
+          supports. They will be tried in order until one that
+          supports your card is found.
+        '';
+      };
+
       videoDriver = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -188,7 +200,7 @@ in
         description = ''
           The name of the video driver for your graphics card.  This
           option is obsolete; please set the
-          <option>hardware.opengl.videoDrivers</option> instead.
+          <option>services.xserver.videoDrivers</option> instead.
         '';
       };
 
@@ -386,7 +398,7 @@ in
 
   config = mkIf cfg.enable {
     hardware.opengl.enable = true;
-    hardware.opengl.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
+    services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
 
     assertions =
       [ { assertion = !(config.programs.ssh.startAgent && cfg.startGnuPGAgent);
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6605b94439b..323f1bfc57e 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -386,7 +386,7 @@ in
 
     # When building a regular system configuration, override whatever
     # video driver the host uses.
-    hardware.opengl.videoDrivers = mkVMOverride [ "vesa" ];
+    services.xserver.videoDrivers = mkVMOverride [ "vesa" ];
     services.xserver.defaultDepth = mkVMOverride 0;
     services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ];
     services.xserver.monitorSection =
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index 96354f1d81d..b3847daf12c 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -54,7 +54,7 @@ optionalAttrs (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) # ugly...
         serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
       };
 
-    hardware.opengl.videoDrivers = mkOverride 50 [ "virtualbox" ];
+    services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
 
     services.xserver.config =
       ''

From 02cef04c8187f12fd160d5fedf0ec8a928f02639 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 14:16:34 +0200
Subject: [PATCH 0726/2033] Move the NVIDIA support into its own module

Previously all card-specific stuff was scattered across xserver.nix
and opengl.nix, which is ugly. Now it can be kept together in a single
card-specific module. This required the addition of a few internal
options:

- services.xserver.drivers: A list of { name, driverName, modules,
  libPath } sets.

- hardware.opengl.package: The OpenGL implementation. Note that there
  can be only one OpenGL implementation at a time in a system
  configuration (i.e. no dynamic detection).

- hardware.opengl.package32: The 32-bit OpenGL implementation.
---
 nixos/modules/hardware/opengl.nix       | 102 ++++++++++++------------
 nixos/modules/hardware/video/nvidia.nix |  54 +++++++++++++
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/x11/xserver.nix  |  80 +++++++++----------
 4 files changed, 142 insertions(+), 95 deletions(-)
 create mode 100644 nixos/modules/hardware/video/nvidia.nix

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index b2c97f0bfad..2d5643d4d94 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -10,6 +10,15 @@ let
 
   videoDrivers = config.services.xserver.videoDrivers;
 
+  makePackage = p: p.buildEnv {
+    name = "mesa-drivers+txc-${p.mesa_drivers.version}";
+    paths =
+      [ p.mesa_drivers
+        p.mesa_noglu # mainly for libGL
+        (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
+      ];
+  };
+
 in
 
 {
@@ -52,73 +61,64 @@ in
       '';
     };
 
+    hardware.opengl.package = mkOption {
+      type = types.package;
+      internal = true;
+      description = ''
+        The package that provides the OpenGL implementation.
+      '';
+    };
+
+    hardware.opengl.package32 = mkOption {
+      type = types.package;
+      internal = true;
+      description = ''
+        The package that provides the 32-bit OpenGL implementation on
+        64-bit systems.  Used when <option>driSupport32Bit</option> is
+        set.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
+
     assertions = pkgs.lib.singleton {
       assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
-      message = "Option driSupport32Bit only makes sens on a 64-bit system.";
+      message = "Option driSupport32Bit only makes sense on a 64-bit system.";
     };
 
-    system.activationScripts.setup-opengl.deps = [];
-    system.activationScripts.setup-opengl.text = ''
-      rm -f /run/opengl-driver{,-32}
-      ${optionalString (pkgs.stdenv.isi686) "ln -sf opengl-driver /run/opengl-driver-32"}
-    ''
-      #TODO:  The OpenGL driver should depend on what's detected at runtime.
-     +( if elem "nvidia" videoDrivers then
-          ''
-            ln -sf ${kernelPackages.nvidia_x11} /run/opengl-driver
-            ${optionalString cfg.driSupport32Bit
-              "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
-          ''
-        else if elem "nvidiaLegacy173" videoDrivers then
-          "ln -sf ${kernelPackages.nvidia_x11_legacy173} /run/opengl-driver"
-        else if elem "nvidiaLegacy304" videoDrivers then
-          ''
-            ln -sf ${kernelPackages.nvidia_x11_legacy304} /run/opengl-driver
-            ${optionalString cfg.driSupport32Bit
-              "ln -sf ${pkgs_i686.linuxPackages.nvidia_x11_legacy304.override { libsOnly = true; kernel = null; } } /run/opengl-driver-32"}
-          ''
-        else if elem "ati_unfree" videoDrivers then
-          "ln -sf ${kernelPackages.ati_drivers_x11} /run/opengl-driver"
-        else
-          let
-            lib_fun = p: p.buildEnv {
-              name = "mesa-drivers+txc-${p.mesa_drivers.version}";
-              paths = [
-                p.mesa_drivers
-                p.mesa_noglu # mainly for libGL
-                (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
-              ];
-            };
-          in
-          ''
-            ${optionalString cfg.driSupport "ln -sf ${lib_fun pkgs} /run/opengl-driver"}
-            ${optionalString cfg.driSupport32Bit
-              "ln -sf ${lib_fun pkgs_i686} /run/opengl-driver-32"}
-          ''
-      );
+    system.activationScripts.setup-opengl =
+      ''
+        ln -sfn ${cfg.package} /run/opengl-driver
+        ${if pkgs.stdenv.isi686 then ''
+          ln -sfn opengl-driver /run/opengl-driver-32
+        '' else if cfg.driSupport32Bit then ''
+          ln -sfn ${cfg.package32} /run/opengl-driver-32
+        '' else ''
+          rm -f /run/opengl-driver-32
+        ''}
+      '';
 
     environment.variables.LD_LIBRARY_PATH =
       [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
 
+    # FIXME: move this into card-specific modules.
+    hardware.opengl.package = mkDefault
+      (if elem "ati_unfree" videoDrivers then
+        kernelPackages.ati_drivers_x11
+      else
+        makePackage pkgs);
+
+    hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
+
     boot.extraModulePackages =
-      optional (elem "nvidia" videoDrivers) kernelPackages.nvidia_x11 ++
-      optional (elem "nvidiaLegacy173" videoDrivers) kernelPackages.nvidia_x11_legacy173 ++
-      optional (elem "nvidiaLegacy304" videoDrivers) kernelPackages.nvidia_x11_legacy304 ++
       optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" videoDrivers) kernelPackages.ati_drivers_x11;
 
-    boot.blacklistedKernelModules =
-      optionals (elem "nvidia" videoDrivers) [ "nouveau" "nvidiafb" ];
-
     environment.etc =
-      (optionalAttrs (elem "ati_unfree" videoDrivers) {
+      optionalAttrs (elem "ati_unfree" videoDrivers) {
         "ati".source = "${kernelPackages.ati_drivers_x11}/etc/ati";
-      })
-      // (optionalAttrs (elem "nvidia" videoDrivers) {
-        "OpenCL/vendors/nvidia.icd".source = "${kernelPackages.nvidia_x11}/lib/vendors/nvidia.icd";
-      });
+      };
   };
 }
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
new file mode 100644
index 00000000000..0ca5558ee10
--- /dev/null
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -0,0 +1,54 @@
+# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
+
+{ config, lib, pkgs, pkgs_i686, ... }:
+
+with lib;
+
+let
+
+  drivers = config.services.xserver.videoDrivers;
+
+  # FIXME: should introduce an option like
+  # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA
+  # driver.
+  enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers || elem "nvidiaLegacy304" drivers;
+
+  nvidia_x11 =
+    if elem "nvidia" drivers then
+      config.boot.kernelPackages.nvidia_x11
+    else if elem "nvidiaLegacy173" drivers then
+      config.boot.kernelPackages.nvidia_x11_legacy173
+    else if elem "nvidiaLegacy304" videoDrivers then
+      config.boot.kernelPackages.nvidia_x11_legacy304
+    else throw "impossible";
+
+in
+
+{
+
+  config = mkIf enabled {
+
+    services.xserver.drivers = singleton
+      { name = "nvidia"; modules = [ nvidia_x11 ]; libPath = [ nvidia_x11 ]; };
+
+    services.xserver.screenSection =
+      ''
+        Option "RandRRotation" "on"
+      '';
+
+    hardware.opengl.package = nvidia_x11;
+    hardware.opengl.package32 = pkgs_i686.linuxPackages.nvidia_x11.override { libsOnly = true; kernel = null; };
+
+    environment.systemPackages = [ nvidia_x11 ];
+
+    boot.extraModulePackages = [ nvidia_x11 ];
+
+    boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];
+
+    services.acpid.enable = true;
+
+    environment.etc."OpenCL/vendors/nvidia.icd".source = "${nvidia_x11}/lib/vendors/nvidia.icd";
+
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a769914499d..b95f30b7916 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -32,6 +32,7 @@
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
   ./hardware/video/bumblebee.nix
+  ./hardware/video/nvidia.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
   ./misc/assertions.nix
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 941d08c4641..dc3aa9d15cc 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -11,30 +11,16 @@ let
   xorg = pkgs.xorg;
 
 
-  # Map video driver names to driver packages.
+  # Map video driver names to driver packages. FIXME: move into card-specific modules.
   knownVideoDrivers = {
     ati_unfree   = { modules = [ kernelPackages.ati_drivers_x11 ]; driverName = "fglrx"; };
     nouveau       = { modules = [ pkgs.xf86_video_nouveau ]; };
-    nvidia       = { modules = [ kernelPackages.nvidia_x11 ]; };
-    nvidiaLegacy173 = { modules = [ kernelPackages.nvidia_x11_legacy173 ]; driverName = "nvidia"; };
-    nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; };
     unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
     virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
     ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; };
     intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; };
   };
 
-  driverNames = cfg.videoDrivers;
-
-  needsAcpid =
-     (elem "nvidia" driverNames) ||
-     (elem "nvidiaLegacy173" driverNames) ||
-     (elem "nvidiaLegacy304" driverNames);
-
-  drivers = flip map driverNames
-    (name: { inherit name; driverName = name; } //
-      attrByPath [name] (if (hasAttr ("xf86video" + name) xorg) then { modules = [(getAttr ("xf86video" + name) xorg) ]; } else throw "unknown video driver `${name}'") knownVideoDrivers);
-
   fontsForXServer =
     config.fonts.fonts ++
     # We don't want these fonts in fonts.conf, because then modern,
@@ -79,7 +65,6 @@ let
     monitors = foldl mkMonitor [] xrandrHeads;
   in concatMapStrings (getAttr "value") monitors;
 
-
   configFile = pkgs.stdenv.mkDerivation {
     name = "xserver.conf";
 
@@ -204,6 +189,15 @@ in
         '';
       };
 
+      drivers = mkOption {
+        type = types.listOf types.attrs;
+        internal = true;
+        description = ''
+          A list of attribute sets specifying drivers to be loaded by
+          the X11 server.
+        '';
+      };
+
       vaapiDrivers = mkOption {
         type = types.listOf types.path;
         default = [ ];
@@ -397,9 +391,21 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    hardware.opengl.enable = true;
+
+    hardware.opengl.enable = mkDefault true;
+
     services.xserver.videoDrivers = mkIf (cfg.videoDriver != null) [ cfg.videoDriver ];
 
+    # FIXME: somehow check for unknown driver names.
+    services.xserver.drivers = flip concatMap cfg.videoDrivers (name:
+      let driver =
+        attrByPath [name]
+          (if (hasAttr ("xf86video" + name) xorg)
+           then { modules = [(getAttr ("xf86video" + name) xorg) ]; }
+           else null)
+          knownVideoDrivers;
+      in optional (driver != null) ({ inherit name; driverName = name; } // driver));
+
     assertions =
       [ { assertion = !(config.programs.ssh.startAgent && cfg.startGnuPGAgent);
           message =
@@ -438,24 +444,18 @@ in
         pkgs.xterm
         pkgs.xdg_utils
       ]
-      ++ optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11
-      ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173
-      ++ optional (elem "nvidiaLegacy304" driverNames) kernelPackages.nvidia_x11_legacy304
-      ++ optional (elem "virtualbox" driverNames) xorg.xrefresh
-      ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
-
-    services.acpid.enable = mkIf needsAcpid true;
+      ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh
+      ++ optional (elem "ati_unfree" cfg.videoDrivers) kernelPackages.ati_drivers_x11;
 
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
     systemd.defaultUnit = mkIf cfg.autorun "graphical.target";
 
-    systemd.services."display-manager" =
+    systemd.services.display-manager =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "local-fs.target" ]
-                ++ optional needsAcpid "acpid.service";
+        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" ];
 
         restartIfChanged = false;
 
@@ -463,15 +463,11 @@ in
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
             XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
-          } // optionalAttrs (elem "nvidia" driverNames) {
-            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11}/lib";
-          } // optionalAttrs (elem "nvidiaLegacy173" driverNames) {
-            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy173}/lib";
-          } // optionalAttrs (elem "nvidiaLegacy304" driverNames) {
-            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.nvidia_x11_legacy304}/lib";
-          } // optionalAttrs (elem "ati_unfree" driverNames) {
-            LD_LIBRARY_PATH = "${xorg.libX11}/lib:${xorg.libXext}/lib:${kernelPackages.ati_drivers_x11}/lib:${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux";
-            #XORG_DRI_DRIVER_PATH = "${kernelPackages.ati_drivers_x11}/lib/dri"; # is ignored because ati drivers ship their own unpatched libglx.so !
+            LD_LIBRARY_PATH = concatStringsSep ":" (
+              [ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ]
+              ++ optionals (elem "ati_unfree" cfg.videoDrivers)
+                [ "${kernelPackages.ati_drivers_x11}/lib" "${kernelPackages.ati_drivers_x11}/X11R6/lib64/modules/linux" ]
+              ++ concatLists (catAttrs "libPath" cfg.drivers));
           } // cfg.displayManager.job.environment;
 
         preStart =
@@ -501,7 +497,7 @@ in
       ] ++ optional (!cfg.enableTCP) "-nolisten tcp";
 
     services.xserver.modules =
-      concatLists (catAttrs "modules" drivers) ++
+      concatLists (catAttrs "modules" cfg.drivers) ++
       [ xorg.xorgserver
         xorg.xf86inputevdev
       ];
@@ -537,7 +533,7 @@ in
           ${cfg.serverLayoutSection}
           # Reference the Screen sections for each driver.  This will
           # cause the X server to try each in turn.
-          ${flip concatMapStrings drivers (d: ''
+          ${flip concatMapStrings cfg.drivers (d: ''
             Screen "Screen-${d.name}[0]"
           '')}
         EndSection
@@ -551,11 +547,11 @@ in
 
         # For each supported driver, add a "Device" and "Screen"
         # section.
-        ${flip concatMapStrings drivers (driver: ''
+        ${flip concatMapStrings cfg.drivers (driver: ''
 
           Section "Device"
             Identifier "Device-${driver.name}[0]"
-            Driver "${driver.driverName}"
+            Driver "${driver.driverName or driver.name}"
             ${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""}
             ${cfg.deviceSection}
             ${xrandrDeviceSection}
@@ -574,10 +570,6 @@ in
               DefaultDepth ${toString cfg.defaultDepth}
             ''}
 
-            ${optionalString (driver.name == "nvidia") ''
-              Option "RandRRotation" "on"
-            ''}
-
             ${optionalString
                 (driver.name != "virtualbox" &&
                  (cfg.resolutions != [] ||

From 0b2dd3a12fca27a185f9c5518acb7d73d140e1e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 14:40:19 +0200
Subject: [PATCH 0727/2033] Xfce: Don't depend on GTK+ 3 by default

Given that Xfce is intended as a light-weight desktop environment,
pulling in two versions of GTK+ by default is not ideal.
---
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index 0a30d8ac48b..8252548b856 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, enableGtk3Support ? false, gtk3 }:
 
 stdenv.mkDerivation rec {
   p_name  = "gtk-xfce-engine";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   #TODO: gtk3
-  buildInputs = [ pkgconfig intltool gtk gtk3 ];
+  buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk;
 
   meta = {
     homepage = http://www.xfce.org/;

From 501d532188bcabe5c1684880779ee62c31520f15 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 15:29:52 +0200
Subject: [PATCH 0728/2033] Add a test for automounting

---
 nixos/tests/misc.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 705ea0d0b86..e33581b4d2d 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -3,12 +3,23 @@
 import ./make-test.nix {
 
   machine =
-    { config, pkgs, ... }:
-    { swapDevices = pkgs.lib.mkOverride 0
+    { config, lib, pkgs, ... }:
+    with lib;
+    { swapDevices = mkOverride 0
         [ { device = "/root/swapfile"; size = 128; } ];
-      environment.variables.EDITOR = pkgs.lib.mkOverride 0 "emacs";
-      services.nixosManual.enable = pkgs.lib.mkOverride 0 true;
+      environment.variables.EDITOR = mkOverride 0 "emacs";
+      services.nixosManual.enable = mkOverride 0 true;
       systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
+      fileSystems = mkVMOverride { "/tmp2" =
+        { device = "none";
+          fsType = "tmpfs";
+          options = "mode=1777,noauto";
+        };
+      };
+      systemd.automounts = singleton
+        { wantedBy = [ "multi-user.target" ];
+          where = "/tmp2";
+        };
     };
 
   testScript =
@@ -80,6 +91,13 @@ import ./make-test.nix {
           $machine->succeed('systemctl start systemd-tmpfiles-clean');
           $machine->fail('[ -e /tmp/foo ]');
       };
+
+      # Test whether automounting works.
+      subtest "automount", sub {
+          $machine->fail("grep '/tmp2 tmpfs' /proc/mounts");
+          $machine->succeed("touch /tmp2/x");
+          $machine->succeed("grep '/tmp2 tmpfs' /proc/mounts");
+      };
     '';
 
 }

From bfc524664af0bd48d86eadc621fe61916092d529 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 15:30:10 +0200
Subject: [PATCH 0729/2033] Disable autofs module

It appears to be unmaintained and untested. Also, systemd provides
automount functionality so it's probably not needed anymore.
---
 nixos/modules/module-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b95f30b7916..f98b621111f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -136,7 +136,7 @@
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
-  ./services/misc/autofs.nix
+  #./services/misc/autofs.nix
   ./services/misc/cgminer.nix
   ./services/misc/dictd.nix
   ./services/misc/disnix.nix

From c2c90bf2bb77d5e094d74ab1835314f7f9ffa1fc Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 29 Apr 2014 15:57:31 +0200
Subject: [PATCH 0730/2033] tzdata: fix 'posix' symlink

---
 pkgs/data/misc/tzdata/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 57b1dddbda5..67246bb6409 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      mv $out/share/zoneinfo-posix $out/share/zoneinfo/posix
+      rm $out/share/zoneinfo-posix
+      ln -s . $out/share/zoneinfo/posix
       mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
 
       ensureDir "$lib/include"

From dc224baba1f04495b23b17dbf7c75abf7f58ba1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 16:13:15 +0200
Subject: [PATCH 0731/2033] tzdata: Update to 2014b

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

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 67246bb6409..4403649af05 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2013g"; in
+let version = "2014b"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0krsgncjnk64g3xshj5xd3znskcx9wwy20g1wmm2lwycincx7kdn";
+        sha256 = "1d8w5g7fy8nrdj092cwmxdxw6rk3bzwpxqpz6l5sra2kqbhg7qfi";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "0ysqm72xm9vcykqg9zgry69w6gr3i6b6mpbvgfmwyrdvb6s5ihy7";
+        sha256 = "12x7ahbjxc3sj4ykcvx5c7kw1nbn6ywm8wzq6303y3l8qyqd7nmm";
       })
     ];
 

From 1f2228cdc10807ed3b7ee0888b5cc8b6800e87b3 Mon Sep 17 00:00:00 2001
From: Mihaly Barasz <klao@nilcons.com>
Date: Tue, 29 Apr 2014 16:06:48 +0200
Subject: [PATCH 0732/2033] tzdata: use symlinks instead of hardlinks

Hard links are not handled by nar, so installing from binary cache
unnecessarily duplicates data. Also, it's more common to use symlinks for the
tzdata package in other distributions.
---
 pkgs/data/misc/tzdata/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 4403649af05..afee316d0bf 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   sourceRoot = ".";
   outputs = [ "out" "lib" ];
 
-  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk";
+  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
 
   postInstall =
     ''

From 89595fbcea79af385fea634db504827bb0121508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Tue, 22 Apr 2014 23:26:27 +0200
Subject: [PATCH 0733/2033] Creation of a new package for texstudio, an editor
 for LaTeX documents

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

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
new file mode 100644
index 00000000000..2a2d25ab3f7
--- /dev/null
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt, popplerQt4, phonon }:
+
+stdenv.mkDerivation rec {
+  pname = "texstudio";
+  version = "2.7.0";
+  name = "${pname}-${version}";
+  altname="Texstudio";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/texstudio/${altname} ${version}/${name}.tar.gz";
+    sha1 = "0a5960689f2f9daef93391b96321ccc8c2e94c38";
+  };
+
+  buildInputs = [ qt popplerQt4 phonon ];
+
+  preConfigure = "qmake -r PREFIX=$out";
+
+  meta = with stdenv.lib; {
+    description = "Fork of TeXMaker, this editor is a full fledged IDE for LaTeX editing with completion, structure viewer, preview and support of any compilation chain.";
+    homepage = "http://texstudio.sourceforge.net/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48341b9a89d..b63567029ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2059,6 +2059,8 @@ let
 
   texmaker = callPackage ../applications/editors/texmaker { };
 
+  texstudio = callPackage ../applications/editors/texstudio { qt = qt4; };
+
   tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
 
   tinc = callPackage ../tools/networking/tinc { };

From ed3a809a3dab44585c5c78a2a6f78776427fcacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Wed, 23 Apr 2014 11:58:54 +0200
Subject: [PATCH 0734/2033] Add the necessary preConfigure so that TeXstudio
 compile (find poppler-qt4.h)

---
 pkgs/applications/editors/texstudio/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 2a2d25ab3f7..20e8e4bba3e 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt, popplerQt4, phonon }:
+{ stdenv, fetchurl, qt, popplerQt4, zlib}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -7,13 +7,16 @@ stdenv.mkDerivation rec {
   altname="Texstudio";
 
   src = fetchurl {
-    url = "mirror://sourceforge/texstudio/${altname} ${version}/${name}.tar.gz";
-    sha1 = "0a5960689f2f9daef93391b96321ccc8c2e94c38";
+    url = "mirror://sourceforge/texstudio/${name}.tar.gz";
+    sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
   };
 
-  buildInputs = [ qt popplerQt4 phonon ];
+  buildInputs = [ qt popplerQt4 zlib ];
 
-  preConfigure = "qmake -r PREFIX=$out";
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) "
+    qmake PREFIX=$out texstudio.pro
+  '';
 
   meta = with stdenv.lib; {
     description = "Fork of TeXMaker, this editor is a full fledged IDE for LaTeX editing with completion, structure viewer, preview and support of any compilation chain.";

From ce82a2d6d91f3e9d7472eac047d9b34c8e557be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Wed, 23 Apr 2014 12:09:25 +0200
Subject: [PATCH 0735/2033] Cleaning up the description and fixing qt to qt4

---
 pkgs/applications/editors/texstudio/default.nix | 11 ++++++++---
 pkgs/top-level/all-packages.nix                 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 20e8e4bba3e..01f290d9df8 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt, popplerQt4, zlib}:
+{ stdenv, fetchurl, qt4, popplerQt4, zlib}:
 
 stdenv.mkDerivation rec {
   pname = "texstudio";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "167d78nfk265jjvl129nr70v8ladb2rav2qyhw7ngr6m54gak831";
   };
 
-  buildInputs = [ qt popplerQt4 zlib ];
+  buildInputs = [ qt4 popplerQt4 zlib ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${popplerQt4}/include/poppler/qt4) "
@@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Fork of TeXMaker, this editor is a full fledged IDE for LaTeX editing with completion, structure viewer, preview and support of any compilation chain.";
+    description = "TeX and LaTeX editor";
+    longDescription=''
+	Fork of TeXMaker, this editor is a full fledged IDE for 
+	LaTeX editing with completion, structure viewer, preview,
+	spell checking and support of any compilation chain.
+	'';
     homepage = "http://texstudio.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b63567029ea..725a3452b57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2059,7 +2059,7 @@ let
 
   texmaker = callPackage ../applications/editors/texmaker { };
 
-  texstudio = callPackage ../applications/editors/texstudio { qt = qt4; };
+  texstudio = callPackage ../applications/editors/texstudio { };
 
   tiled-qt = callPackage ../applications/editors/tiled-qt { qt = qt4; };
 

From 600bd22f270ae4842d599d2799998f6a2c7b61ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chadda=C3=AF=20Fouch=C3=A9?= <chaddai.fouche@gmail.com>
Date: Wed, 23 Apr 2014 14:37:00 +0200
Subject: [PATCH 0736/2033] Adding myself as maintainer of texstudio

---
 pkgs/applications/editors/texstudio/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 01f290d9df8..cd7f0b78c23 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     homepage = "http://texstudio.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ cfouche ];
   };
 }

From c8f82b4ee8338383af53a24290d9e9e46a8d8aa3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Apr 2014 10:34:28 -0500
Subject: [PATCH 0737/2033] spark: 0.9.0 -> 0.9.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../networking/cluster/spark/default.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 61f2d0c6e20..1e9fe918a2e 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name    = "spark-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchurl {
-    url    = "http://d3kbcqa49mib13.cloudfront.net/${name}-incubating-bin-cdh4.tgz";
-    sha256 = "0dgirq2ws25accijijanqij6d1mwxkrcqkmq1xsslfpz26svs1w1";
+    url    = "http://d3kbcqa49mib13.cloudfront.net/${name}-bin-cdh4.tgz";
+    sha256 = "1k3954srx3km3ckmfi6wn8rldrljxc039g0pf5m3azgkmaz0gld5";
   };
 
   unpackPhase = ''tar zxf $src'';
 
-  untarDir = "spark-${version}-incubating-bin-cdh4";
+  untarDir = "${name}-bin-cdh4";
   installPhase = ''
     set -x
     mkdir -p $out/lib $out/bin
@@ -118,10 +118,11 @@ stdenv.mkDerivation rec {
   phases = "unpackPhase installPhase";
 
   meta = {
-    description = "Spark cluster computing";
-    homepage    = "http://spark.incubator.apache.org";
-    license     = stdenv.lib.licenses.asl20;
-    platforms   = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    description      = "Lightning-fast cluster computing";
+    homepage         = "http://spark.apache.org";
+    license          = stdenv.lib.licenses.asl20;
+    platforms        = stdenv.lib.platforms.all;
+    maintainers      = [ stdenv.lib.maintainers.thoughtpolice ];
+    repositories.git = git://git.apache.org/spark.git;
   };
 }

From 1235f693ee54221ef5f27c2256215f961d971393 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 18:45:53 +0200
Subject: [PATCH 0738/2033] firefox: Update to 29.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 02560595b6d..2cb884e2e2d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,14 +17,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "28.0";
+  firefoxVersion = "29.0";
 
-  xulVersion = "28.0"; # this attribute is used by other packages
+  xulVersion = "29.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "f78517836ceca0cd2a0d3db1f282985c616e3fae";
+    sha1 = "db8fa9a4863bd7427115adec01b7db0e494dffa6";
   };
 
   commonConfigureFlags =

From 90dac235bb409e5795aa460b34388c455178035c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 18:57:04 +0200
Subject: [PATCH 0739/2033] =?UTF-8?q?Remove=20the=20option=20=E2=80=98prog?=
 =?UTF-8?q?rams.bash.enable=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NixOS has a pervasive dependency on bash. For instance, the X11
session script sources /etc/profile to get a reasonable
environment. Thus we should not provide an option to disable bash.

Also, enabling zsh no longer sets ‘users.defaultUserShell’ to zsh, to
prevent a collision with bash's definition of the same
option. (Changing the default shell is also something that should be
left to the user.)
---
 nixos/modules/programs/bash/bash.nix | 4 +++-
 nixos/modules/programs/zsh/zsh.nix   | 2 +-
 nixos/modules/rename.nix             | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 9584f07b094..c5c0f9d0121 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -40,6 +40,7 @@ in
 
     programs.bash = {
 
+      /*
       enable = mkOption {
         default = true;
         description = ''
@@ -52,6 +53,7 @@ in
         '';
         type = types.bool;
       };
+      */
 
       shellAliases = mkOption {
         default = config.environment.shellAliases // { which = "type -P"; };
@@ -114,7 +116,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = /* mkIf cfg.enable */ {
 
     programs.bash = {
 
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 7bcf8da2c65..a3efad288ac 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -168,7 +168,7 @@ in
 
     environment.systemPackages = [ pkgs.zsh ];
 
-    users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";
+    #users.defaultUserShell = mkDefault "/run/current-system/sw/bin/zsh";
 
     environment.shells =
       [ "/run/current-system/sw/bin/zsh"
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 1a0c7c0168c..0ee2caa28ea 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -128,5 +128,6 @@ in zipModules ([]
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]
+++ obsolete' [ "programs" "bash" "enable" ]
 
 )

From b802924af1d8e5d2362e965c437908161e9ec971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 29 Apr 2014 19:11:04 +0200
Subject: [PATCH 0740/2033] xfce: fix typo introduced in recent commit
 (s/gtk/gtk3/)

Fix typo introduced in commit 0b2dd3a12fca27a185f9c5518acb7d73d140e1e5
(Xfce: Don't depend on GTK+ 3 by default).
---
 pkgs/desktops/xfce/core/gtk-xfce-engine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
index 8252548b856..5004f2aaf47 100644
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   #TODO: gtk3
-  buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk;
+  buildInputs = [ pkgconfig intltool gtk ] ++ stdenv.lib.optional enableGtk3Support gtk3;
 
   meta = {
     homepage = http://www.xfce.org/;

From 3685bf378fb64d98a64c8fbf7fc9904ed2e98a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 18 Mar 2014 13:40:16 +0100
Subject: [PATCH 0741/2033] haskell: new expression cabal-bounds

---
 .../tools/haskell/cabal-bounds/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/cabal-bounds/default.nix

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
new file mode 100644
index 00000000000..4cd6adf5ab9
--- /dev/null
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -0,0 +1,23 @@
+{ cabal, Cabal, cmdargs, either, filepath, lens, strict, tasty
+, tastyGolden, transformers, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-bounds";
+  version = "0.4.1";
+  sha256 = "09l9ii26li178sw0rm49w4dhfkf46g4sjjdy4frmc74isvnzkpwj";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    Cabal cmdargs either lens strict transformers unorderedContainers
+  ];
+  testDepends = [ filepath tasty tastyGolden ];
+  doCheck = false;
+  jailbreak = true;
+
+  meta = {
+    description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 02e6472479d..3eec6e54b09 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3066,6 +3066,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
 
+  cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
+    Cabal = self.Cabal_1_18_1_3;
+  };
+
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
 
   cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};

From fe4bc3cc80bb20125726707b712991dca9c70c03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 29 Apr 2014 20:40:28 +0200
Subject: [PATCH 0742/2033] Fix evaluation error

http://hydra.nixos.org/build/10697257
---
 pkgs/applications/science/math/sage/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 0fd8621b0e0..ced8b6f95bb 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export SAGE_NUM_THREADS=$NIX_BUILD_CORES
     sed -i 's/if ! [ -d "$HOME" ]/if [ -d "$HOME" ]/' src/bin/sage-env
-  '' ++ stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i "s/ld_version = try_run('ld  -v')/ld_version = 'Apple'/" \
       build/pkgs/atlas/configuration.py
   '';

From ab53d469f82c9b8998d52e7987576cb967ea443b Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 29 Apr 2014 01:12:13 +0200
Subject: [PATCH 0743/2033] erlang: enable and fix builds on darwin

---
 pkgs/development/interpreters/erlang/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
index 077eaa9093b..7dc71ed6546 100644
--- a/pkgs/development/interpreters/erlang/default.nix
+++ b/pkgs/development/interpreters/erlang/default.nix
@@ -4,6 +4,8 @@
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "erlang-" + version;
   version = "R16B02";
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags = "--with-ssl=${openssl}";
+  configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
 
   postInstall = ''
     ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
@@ -49,9 +51,9 @@ stdenv.mkDerivation rec {
       tolerance.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.unix;
     # Note: Maintainer of prev. erlang version was simons. If he wants
     # to continue maintaining erlang I'm totally ok with that.
-    maintainers = [ stdenv.lib.maintainers.the-kenny ];
+    maintainers = [ maintainers.the-kenny ];
   };
 }

From ca3c2b7b2a35fe41cab573cc25496a7efd765758 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 29 Apr 2014 01:12:44 +0200
Subject: [PATCH 0744/2033] rabbitmq_server: enable builds on darwin

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 45a6c2189db..da0ec89cbc6 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.rabbitmq.com/;
     description = "An implementation of the AMQP messaging protocol";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 7896a84849284e2bd274632691eb1f2f97aecaaf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 25 Apr 2014 19:04:47 -0500
Subject: [PATCH 0745/2033] qvim: add lua support

---
 pkgs/applications/editors/vim/qvim.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 15a147319a1..2357e23bf01 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -61,7 +61,17 @@ composableDerivation {
 
       // edf { name = "tcl"; enable = { nativeBuildInputs = [tcl]; }; } #Include Tcl interpreter.
       // edf { name = "ruby"; feat = "rubyinterp"; enable = { nativeBuildInputs = [ruby]; };} #Include Ruby interpreter.
-      // edf { name = "lua" ; feat = "luainterp"; enable = { nativeBuildInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
+      // edf {
+        name = "lua";
+        feat = "luainterp";
+        enable = {
+          nativeBuildInputs = [lua];
+          configureFlags = [
+            "--with-lua-prefix=${args.lua}"
+            "--enable-luainterp"
+          ];
+        };
+      }
       // edf { name = "cscope"; } #Include cscope interface.
       // edf { name = "workshop"; } #Include Sun Visual Workshop support.
       // edf { name = "netbeans"; } #Disable NetBeans integration support.
@@ -76,6 +86,7 @@ composableDerivation {
       ;
 
   cfg = {
+    luaSupport       = config.vim.lua or true;
     pythonSupport    = config.vim.python or true;
     rubySupport      = config.vim.ruby or true;
     nlsSupport       = config.vim.nls or false;

From cbfbd01cd7a483562930a03b4ae6e8647307a199 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 29 Apr 2014 11:37:51 +0200
Subject: [PATCH 0746/2033] nodejs: fix on i686-linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes this:

  creating  ./config.gypi
  creating  ./config.mk
  building
  make flags: SHELL=/nix/store/fp0nwhj932kscakw1gbnlmmk8pdfv9sq-bash-4.2-p45/bin/bash
  building out/Makefile
  /nix/store/vh2zy8l2797yl3mri35y8jnhc81w9hm1-python-2.7.6/bin/python tools/gyp_node.py -f make
  /bin/sh: which: command not found
  gyp: Call to '(echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true' returned exit status 0.
  make: *** [out/Makefile] Error 1

[Bjørn: add build error to commit message.]
---
 pkgs/development/web/nodejs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 9cbd7c46b52..44a7890e21f 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand }:
+{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares, pkgconfig, runCommand, which }:
 
 let
   dtrace = runCommand "dtrace-native" {} ''
@@ -45,7 +45,7 @@ in stdenv.mkDerivation {
     (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
   '' else null;
 
-  buildInputs = [ python ]
+  buildInputs = [ python which ]
     ++ (optional stdenv.isLinux utillinux)
     ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
   setupHook = ./setup-hook.sh;

From 1d3b5874ad60fc09d71f51cffb84ce9fd8ccc34b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Apr 2014 16:00:34 -0500
Subject: [PATCH 0747/2033] nixpkgs: cov-build 7.0.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/analysis/cov-build/default.nix      | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/cov-build/default.nix

diff --git a/pkgs/development/tools/analysis/cov-build/default.nix b/pkgs/development/tools/analysis/cov-build/default.nix
new file mode 100644
index 00000000000..fef98f1e04a
--- /dev/null
+++ b/pkgs/development/tools/analysis/cov-build/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, requireFile }:
+
+let
+  message = ''
+    Register an account at https://scan.coverity.com, download the
+    build tools, and add it to the nix store with nix-prefetch-url
+  '';
+in
+stdenv.mkDerivation rec {
+  name    = "cov-build-${version}";
+  version = "7.0.2";
+
+  src =
+    if stdenv.system == "i686-linux"
+    then requireFile {
+      name = "cov-analysis-linux32-${version}.tar.gz";
+      sha256 = "0i06wbd7blgx9adh9w09by4i18vwmldfp9ix97a5dph2cjymsviy";
+      inherit message;
+    }
+    else requireFile {
+      name = "cov-analysis-linux64-${version}.tar.gz";
+      sha256 = "0iby75p0g8gv7b501xav47milr8m9781h0hcgm1ch6x3qj6irqd8";
+      inherit message;
+    };
+
+  dontStrip = true;
+  buildPhase = false;
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+    mv * $out/libexec
+    for x in cov-build cov-capture cov-configure cov-emit cov-emit-java \
+      cov-export-cva cov-extract-scm cov-help cov-import-scm cov-link \
+      cov-internal-clang cov-internal-emit-clang cov-internal-nm \
+      cov-internal-emit-java-bytecode cov-internal-reduce cov-translate \
+      cov-preprocess cov-internal-pid-to-db cov-manage-emit \
+      cov-manage-history; do
+        ln -s $out/libexec/bin/$x $out/bin/$x;
+    done
+  '';
+
+  meta = {
+    description = "Coverity Scan build tools";
+    homepage    = "https://scan.coverity.com";
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48341b9a89d..20bf5027c1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3723,6 +3723,8 @@ let
 
   cflow = callPackage ../development/tools/misc/cflow { };
 
+  cov-build = callPackage ../development/tools/analysis/cov-build {};
+
   cppcheck = callPackage ../development/tools/analysis/cppcheck { };
 
   cscope = callPackage ../development/tools/misc/cscope { };

From d9d76f1a3a2959b014a5c1db99bf78ae17143311 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Apr 2014 17:50:20 -0500
Subject: [PATCH 0748/2033] cryptol: add 1.8.x expression

This also includes support for the verification tools I'm using. Cryptol
2 is still the default obviously.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/cryptol/1.8.x.nix  | 112 ++++++++++++++++++
 .../cryptol/{default.nix => 2.0.x.nix}        |   0
 pkgs/top-level/all-packages.nix               |   1 +
 pkgs/top-level/haskell-packages.nix           |   2 +-
 4 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/cryptol/1.8.x.nix
 rename pkgs/development/compilers/cryptol/{default.nix => 2.0.x.nix} (100%)

diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix
new file mode 100644
index 00000000000..a2ca675a55f
--- /dev/null
+++ b/pkgs/development/compilers/cryptol/1.8.x.nix
@@ -0,0 +1,112 @@
+{ stdenv, requireFile, gmp4, ncurses, zlib, makeWrapper }:
+
+let
+  name    = "cryptol-${version}-${rev}";
+  version = "1.8.27";
+  rev     = "1";
+  lss-ver = "lss-0.2d";
+  jss-ver = "jss-0.4";
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.gcc.libc
+      stdenv.gcc.gcc
+      gmp4
+      ncurses
+      zlib
+    ] + ":${stdenv.gcc.gcc}/lib64";
+
+  cryptol-bin =
+    if stdenv.system == "i686-linux"
+    then requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${name}-i386-centos6-linux.tar.gz";
+      sha256 = "131jkj3nh29rwwq5w5sfdf5jrb3c7ayjp4709v1zh84q4d6b35nf";
+    }
+    else requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${name}-x86_64-centos6-linux.tar.gz";
+      sha256 = "1dmkns8s6r2d6pvh176w8k3891frik6hmcr2ibghk4l6qr6gwarx";
+    };
+
+  lss-bin =
+    if stdenv.system == "i686-linux"
+    then requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${lss-ver}-centos6-32.tar.gz";
+      sha256 = "015ssw3v523wwzkma0qbpj3jnyzckab5q00ypdz0gr3kjcxn5rxg";
+    }
+    else requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${lss-ver}-centos6-64.tar.gz";
+      sha256 = "1zjy4xi8v3m6g8ydm9q6dgzg5xn0xc3a4zsll5plbhngprgwxcxm";
+    };
+
+  jss-bin =
+    if stdenv.system == "i686-linux"
+    then requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${jss-ver}-centos5-32.tar.gz";
+      sha256 = "1rlj14fbh9k3yvals8jsarczwl51fh6zjaic0pnhpc9s4p0pnjbr";
+    }
+    else requireFile {
+      url    = "https://www.galois.com/cryptol";
+      name   = "${jss-ver}-centos5-64.tar.gz";
+      sha256 = "0smarm2pi3jz4c8jas9gwcbghc6vc375vrwxbdj1mqx4awlhnz1n";
+    };
+
+in
+stdenv.mkDerivation rec {
+  inherit name version cryptol-bin jss-bin lss-bin;
+
+  src = [ cryptol-bin lss-bin jss-bin ];
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = ''
+    tar xf ${cryptol-bin}
+    tar xf ${lss-bin}
+    tar xf ${jss-bin}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share $out/libexec
+
+    # Move Cryptol
+    mv cryptol-${version}/bin $out
+    mv cryptol-${version}/lib $out
+    mv cryptol-${version}/man $out/share
+    rm -f $out/bin/cryptol-2
+
+    # Move JSS
+    # Create a wrapper for jss to keep the .jar out of the way
+    mv ${jss-ver}/bin/jss $out/libexec
+    mv ${jss-ver}/bin/galois.jar $out/libexec
+    makeWrapper $out/libexec/jss $out/bin/jss --run "cd $out/libexec"
+    mv ${jss-ver}/doc/jss.1 $out/share/man/man1
+
+    # Move LSS
+    mv ${lss-ver}/bin/lss $out/bin
+    mv ${lss-ver}/sym-api $out/include
+
+    # Hack around lack of libtinfo in NixOS
+    ln -s ${ncurses}/lib/libncursesw.so.5.9 $out/lib/libtinfo.so.5
+    ln -s ${stdenv.gcc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0
+  '';
+
+  fixupPhase = ''
+    for x in bin/cryptol bin/edif2verilog bin/copy-iverilog bin/symbolic_netlist bin/jaig bin/vvp-galois bin/lss libexec/jss; do
+      patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        --set-rpath "$out/lib:${libPath}" $out/$x
+      patchelf --shrink-rpath $out/$x
+    done
+  '';
+
+  phases = "unpackPhase installPhase fixupPhase";
+
+  meta = {
+    description = "Cryptol: The Language of Cryptography";
+    homepage    = "https://cryptol.net";
+    license     = stdenv.lib.licenses.unfree;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/development/compilers/cryptol/default.nix b/pkgs/development/compilers/cryptol/2.0.x.nix
similarity index 100%
rename from pkgs/development/compilers/cryptol/default.nix
rename to pkgs/development/compilers/cryptol/2.0.x.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20bf5027c1a..0d3d293bbb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2461,6 +2461,7 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
+  cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
   cryptol2 = haskellPackages.cryptol;
 
   cython = pythonPackages.cython;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 02e6472479d..dd7510e4c3f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3001,7 +3001,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   arbtt = callPackage ../applications/misc/arbtt {};
 
-  cryptol = callPackage ../development/compilers/cryptol {
+  cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix {
     QuickCheck   = self.QuickCheck_2_7_3;
     text         = self.text_1_1_0_1;
     cabalInstall = self.cabalInstall_1_18_0_3;

From 52514efb1691bd671a73bdddcc481675253318de Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Apr 2014 17:54:37 -0500
Subject: [PATCH 0749/2033] cryptol: Replace URLs with something meaningful

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/cryptol/1.8.x.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix
index a2ca675a55f..db216d1dad4 100644
--- a/pkgs/development/compilers/cryptol/1.8.x.nix
+++ b/pkgs/development/compilers/cryptol/1.8.x.nix
@@ -18,12 +18,12 @@ let
   cryptol-bin =
     if stdenv.system == "i686-linux"
     then requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${name}-i386-centos6-linux.tar.gz";
       sha256 = "131jkj3nh29rwwq5w5sfdf5jrb3c7ayjp4709v1zh84q4d6b35nf";
     }
     else requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${name}-x86_64-centos6-linux.tar.gz";
       sha256 = "1dmkns8s6r2d6pvh176w8k3891frik6hmcr2ibghk4l6qr6gwarx";
     };
@@ -31,12 +31,12 @@ let
   lss-bin =
     if stdenv.system == "i686-linux"
     then requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${lss-ver}-centos6-32.tar.gz";
       sha256 = "015ssw3v523wwzkma0qbpj3jnyzckab5q00ypdz0gr3kjcxn5rxg";
     }
     else requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${lss-ver}-centos6-64.tar.gz";
       sha256 = "1zjy4xi8v3m6g8ydm9q6dgzg5xn0xc3a4zsll5plbhngprgwxcxm";
     };
@@ -44,12 +44,12 @@ let
   jss-bin =
     if stdenv.system == "i686-linux"
     then requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${jss-ver}-centos5-32.tar.gz";
       sha256 = "1rlj14fbh9k3yvals8jsarczwl51fh6zjaic0pnhpc9s4p0pnjbr";
     }
     else requireFile {
-      url    = "https://www.galois.com/cryptol";
+      url    = "http://cryptol.net";
       name   = "${jss-ver}-centos5-64.tar.gz";
       sha256 = "0smarm2pi3jz4c8jas9gwcbghc6vc375vrwxbdj1mqx4awlhnz1n";
     };

From 3c3256e4a87d1b0beb9322ad662d56f85b818724 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 29 Apr 2014 19:36:43 -0500
Subject: [PATCH 0750/2033] nixpkgs: clang-analyzer 3.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/analysis/clang-analyzer/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/clang-analyzer/default.nix

diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
new file mode 100644
index 00000000000..b61c3e569c8
--- /dev/null
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name    = "clang-analyzer-${version}";
+  version = "3.4";
+
+  src = fetchurl {
+    url    = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz";
+    sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92";
+  };
+
+  buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+    cp -R tools/scan-view  $out/libexec
+    cp -R tools/scan-build $out/libexec
+
+    makeWrapper $out/libexec/scan-view/scan-view $out/bin/scan-view
+    makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build --add-flags "--use-cc=${clang}/bin/clang" --add-flags "--use-c++=${clang}/bin/clang++" --add-flags "--use-analyzer=${llvmPackages.clang}/bin/clang"
+  '';
+
+  meta = {
+    description = "Clang Static Analyzer";
+    homepage    = "http://clang-analyzer.llvm.org";
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3d293bbb9..aaec8affc7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2431,6 +2431,11 @@ let
   clang_32 = wrapClang (clangUnwrapped llvm_32 ../development/compilers/llvm/3.2/clang.nix);
   clang_31 = wrapClang (clangUnwrapped llvm_31 ../development/compilers/llvm/3.1/clang.nix);
 
+  clangAnalyzer = callPackage ../development/tools/analysis/clang-analyzer {
+    clang = clang_34;
+    llvmPackages = llvmPackages_34;
+  };
+
   clangUnwrapped = llvm: pkg: callPackage pkg {
       stdenv = if stdenv.isDarwin
          then stdenvAdapters.overrideGCC stdenv gccApple

From fed7a430204c5ad3138be64f92c07760ab4c75a7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 30 Apr 2014 11:15:36 +0200
Subject: [PATCH 0751/2033] Update nixops 1.1.1 to 1.2.

---
 pkgs/tools/package-management/nixops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index b23c8139309..b85591b0695 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
 { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.1.1";
+  name = "nixops-1.2";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "0hb77cf9l8qcjp6a1gzkzv7k10j5zvp23ilxgx5x6j93602d5jwb";
+    sha256 = "06cf54c62a810cac5013d57d31707f0a6381b409485503a94a57ce6d8a1ac12b";
   };
 
   buildInputs = [ libxslt ];

From 077ecf43e52c68e47887a6bf89511d20e03aa12a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 09:40:18 +0200
Subject: [PATCH 0752/2033] Installer test: Remove fileSystems argument

The config function unintentionally ignored its fileSystems
argument. However, things still worked thanks to the magic of
nixos-generate-config. Yay!
---
 nixos/tests/installer.nix | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 43bea22d852..ca8974c168c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -34,7 +34,7 @@ let
 
 
   # The configuration to install.
-  config = { fileSystems, testChannel, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
+  config = { testChannel, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -54,16 +54,6 @@ let
       }
     '';
 
-  rootFS =
-    ''
-      fileSystems."/".device = "/dev/disk/by-label/nixos";
-    '';
-
-  bootFS =
-    ''
-      fileSystems."/boot".device = "/dev/disk/by-label/boot";
-    '';
-
 
   # Configuration of a web server that simulates the Nixpkgs channel
   # distribution server.
@@ -90,9 +80,8 @@ let
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
-  # partitions and filesystems, and a configuration.nix fragment
-  # `fileSystems'.
-  testScriptFun = { createPartitions, fileSystems, testChannel, grubVersion, grubDevice }:
+  # partitions and filesystems.
+  testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice }:
     let iface = if grubVersion == 1 then "scsi" else "virtio"; in
     ''
       createDisk("harddisk", 4 * 1024);
@@ -148,7 +137,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ config { inherit fileSystems testChannel grubVersion grubDevice; } }",
+          "${ config { inherit testChannel grubVersion grubDevice; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -192,12 +181,12 @@ let
 
 
   makeInstallerTest =
-    { createPartitions, fileSystems, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+    { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
     makeTest {
       inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions fileSystems testChannel grubVersion grubDevice;
+        inherit createPartitions testChannel grubVersion grubDevice;
       };
     };
 
@@ -223,7 +212,6 @@ in {
               "mount LABEL=nixos /mnt",
           );
         '';
-      fileSystems = rootFS;
       testChannel = true;
     };
 
@@ -246,7 +234,6 @@ in {
               "mount LABEL=boot /mnt/boot",
           );
         '';
-      fileSystems = rootFS + bootFS;
     };
 
   # Create two physical LVM partitions combined into one volume group
@@ -271,7 +258,6 @@ in {
               "mount LABEL=nixos /mnt",
           );
         '';
-      fileSystems = rootFS;
     };
 
   swraid = makeInstallerTest
@@ -304,7 +290,6 @@ in {
               "mdadm -W /dev/md1",
           );
         '';
-      fileSystems = rootFS + bootFS;
     };
 
   # Test a basic install using GRUB 1.
@@ -323,7 +308,6 @@ in {
           );
 
         '';
-      fileSystems = rootFS;
       grubVersion = 1;
       grubDevice = "/dev/sda";
     };

From 956f464fff861cee4a38945b20d9fc12c00f99ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 10:09:47 +0200
Subject: [PATCH 0753/2033] Remove obsolete zsh help text

---
 nixos/modules/programs/zsh/zsh.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a3efad288ac..1857371ebe8 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -26,11 +26,6 @@ in
         default = false;
         description = ''
           Whenever to configure Zsh as an interactive shell.
-          Note that this tries to make Zsh the default
-          <option>users.defaultUserShell</option>,
-          which in turn means that you might need to explicitly
-          set this variable if you have another shell configured
-          with NixOS.
         '';
         type = types.bool;
       };

From 8c75ae38386a659f5e5a5dfbada9b5b614faacde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 11:17:30 +0200
Subject: [PATCH 0754/2033] nixos-generate-config: Use systemd-detect-virt
 instead of dmidecode

Dmidecode fails in our EFI test with the error "SMBIOS entry point
missing". But we don't need dmidecode because we have already have
systemd-detect-virt.
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 7 ++++---
 nixos/modules/installer/tools/tools.nix                | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 89f112cc6bf..b1958f32e55 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -218,18 +218,19 @@ foreach my $path (glob "/sys/class/block/*") {
 }
 
 
-my $dmi = `@dmidecode@/sbin/dmidecode`;
+my $virt = `systemd-detect-virt`;
+chomp $virt;
 
 
 # Check if we're a VirtualBox guest.  If so, enable the guest
 # additions.
-if ($dmi =~ /Manufacturer: innotek/) {
+if ($virt eq "oracle") {
     push @attrs, "services.virtualbox.enable = true;"
 }
 
 
 # Likewise for QEMU.
-if ($dmi =~ /Manufacturer: Bochs/) {
+if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
     push @imports, "<nixpkgs/nixos/modules/profiles/qemu-guest.nix>";
 }
 
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 7dbcc261485..5ebf05e340f 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,7 +38,6 @@ let
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
-    inherit (pkgs) dmidecode;
   };
 
   nixos-option = makeProg {

From e9be441b62418783a1ea051588772889a7ac71d4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 11:24:46 +0200
Subject: [PATCH 0755/2033] Merge the EFI test into tests/installer.nix

---
 nixos/release-combined.nix    |   1 +
 nixos/release.nix             |   1 +
 nixos/tests/efi-installer.nix | 126 ----------------------------------
 nixos/tests/installer.nix     |  82 +++++++++++++++++-----
 4 files changed, 66 insertions(+), 144 deletions(-)
 delete mode 100644 nixos/tests/efi-installer.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 8a62bce80a2..05664e068f8 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,6 +48,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
+        (all nixos.tests.installer.efi)
         (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)
diff --git a/nixos/release.nix b/nixos/release.nix
index 81a5f06f403..0ce39dff24f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -217,6 +217,7 @@ in rec {
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
+  tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test);
   tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test);
   tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
diff --git a/nixos/tests/efi-installer.nix b/nixos/tests/efi-installer.nix
deleted file mode 100644
index 990f2b84a6c..00000000000
--- a/nixos/tests/efi-installer.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-# !!! Merge into normal install tests once all livecds are EFIable
-{ pkgs, system, ... }:
-
-with pkgs.lib;
-with import ../lib/qemu-flags.nix;
-
-let
-
-  # Build the ISO.  This is the regular installation CD but with test
-  # instrumentation.
-  iso =
-    (import ../lib/eval-config.nix {
-      inherit system;
-      modules =
-        [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
-          ../modules/testing/test-instrumentation.nix
-          { key = "serial";
-
-            # The test cannot access the network, so any sources we
-            # need must be included in the ISO.
-            isoImage.storeContents =
-              [ pkgs.glibcLocales
-                pkgs.sudo
-                pkgs.docbook5
-                pkgs.docbook5_xsl
-                pkgs.grub
-                pkgs.perlPackages.XMLLibXML
-                pkgs.unionfs-fuse
-                pkgs.gummiboot
-                pkgs.libxslt
-              ];
-          }
-        ];
-    }).config.system.build.isoImage;
-
-
-  # The config to install
-  config = builtins.toFile "configuration.nix" ''
-    { pkgs, ... }: {
-      imports = [ ./hardware-configuration.nix <nixos/modules/testing/test-instrumentation.nix> ];
-      boot.loader.grub.enable = false;
-      boot.loader.efi.canTouchEfiVariables = true;
-      boot.loader.gummiboot.enable = true;
-      fonts.enableFontConfig = false;
-    }
-  '';
-
-  biosDir = pkgs.runCommand "ovmf-bios" {} ''
-    mkdir $out
-    ln -s ${pkgs.OVMF}/FV/OVMF.fd $out/bios.bin
-  '';
-
-in {
-  simple = {
-    inherit iso;
-    nodes = {};
-    testScript = ''
-      createDisk("harddisk", 4 * 1024);
-
-      my $machine = createMachine({ hda => "harddisk",
-        hdaInterface => "scsi",
-        cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"}'});
-      $machine->start;
-
-      # Make sure that we get a login prompt etc.
-      $machine->succeed("echo hello");
-      $machine->waitForUnit("rogue");
-      $machine->waitForUnit("nixos-manual");
-
-      # Partition the disk.
-      $machine->succeed(
-          "sgdisk -Z /dev/sda",
-          "sgdisk -n 1:0:+256M -N 2 -t 1:ef00 -t 2:8300 -c 1:boot -c 2:root /dev/sda",
-          "mkfs.vfat -n BOOT /dev/sda1",
-          "mkfs.ext3 -L nixos /dev/sda2",
-          "mount LABEL=nixos /mnt",
-          "mkdir /mnt/boot",
-          "mount LABEL=BOOT /mnt/boot",
-      );
-
-      # Create the NixOS configuration.
-      $machine->succeed(
-          "nixos-generate-config --root /mnt",
-      );
-
-      $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
-
-      $machine->copyFileFromHost(
-          "${config}",
-          "/mnt/etc/nixos/configuration.nix");
-
-      # Perform the installation.
-      $machine->succeed("nixos-install >&2");
-
-      # Do it again to make sure it's idempotent.
-      $machine->succeed("nixos-install >&2");
-
-      $machine->shutdown;
-
-      # Now see if we can boot the installation.
-      my $machine = createMachine({ #hda => "harddisk",
-#       hdaInterface => "virtio",
-#       !!! OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
-        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} -m 512 -hda ' . Cwd::abs_path('harddisk')});
-
-      # Did /boot get mounted, if appropriate?
-      $machine->waitForUnit("local-fs.target");
-      $machine->succeed("test -e /boot/efi");
-
-      $machine->succeed("nix-env -i coreutils >&2");
-      $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
-          or die "nix-env failed";
-
-      $machine->succeed("nixos-rebuild switch >&2");
-
-      $machine->shutdown;
-
-      my $machine = createMachine({ #hda => "harddisk",
-#       hdaInterface => "virtio",
-        qemuFlags => '-L ${biosDir} ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} -hda ' . Cwd::abs_path('harddisk')});
-      $machine->waitForUnit("network.target");
-      $machine->shutdown;
-    '';
-  };
-}
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index ca8974c168c..d453633bed0 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -27,6 +27,7 @@ let
                 pkgs.grub
                 pkgs.perlPackages.XMLLibXML
                 pkgs.unionfs-fuse
+                pkgs.gummiboot
               ];
           }
         ];
@@ -34,7 +35,7 @@ let
 
 
   # The configuration to install.
-  config = { testChannel, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
+  makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix"
     ''
       { config, pkgs, modulesPath, ... }:
 
@@ -43,12 +44,18 @@ let
             <nixpkgs/nixos/modules/testing/test-instrumentation.nix>
           ];
 
-        boot.loader.grub.version = ${toString grubVersion};
-        ${optionalString (grubVersion == 1) ''
-          boot.loader.grub.splashImage = null;
+        ${if useEFI then ''
+          boot.loader.grub.enable = false;
+          boot.loader.efi.canTouchEfiVariables = true;
+          boot.loader.gummiboot.enable = true;
+        '' else ''
+          boot.loader.grub.version = ${toString grubVersion};
+          ${optionalString (grubVersion == 1) ''
+            boot.loader.grub.splashImage = null;
+          ''}
+          boot.loader.grub.device = "${grubDevice}";
+          boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         ''}
-        boot.loader.grub.device = "${grubDevice}";
-        boot.loader.grub.extraConfig = "serial; terminal_output.serial";
 
         environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
       }
@@ -77,19 +84,32 @@ let
   channelContents = [ pkgs.rlwrap ];
 
 
+  efiBios = pkgs.runCommand "ovmf-bios" {} ''
+    mkdir $out
+    ln -s ${pkgs.OVMF}/FV/OVMF.fd $out/bios.bin
+  '';
+
+
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
   # a test script fragment `createPartitions', which must create
   # partitions and filesystems.
-  testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice }:
-    let iface = if grubVersion == 1 then "scsi" else "virtio"; in
+  testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }:
+    let
+      # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
+      iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
+      qemuFlags =
+        (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") +
+        (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} '');
+      hdFlags = optionalString (!useEFI)
+        ''hda => "harddisk", hdaInterface => "${iface}", '';
+    in
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = createMachine({ hda => "harddisk",
-        hdaInterface => "${iface}",
+      my $machine = createMachine({ ${hdFlags}
         cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => '${optionalString testChannel (toString (qemuNICFlags 1 1 2))} ${optionalString (iso.system == "x86_64-linux") "-cpu kvm64"}'});
+        qemuFlags => "${qemuFlags} ${optionalString testChannel (toString (qemuNICFlags 1 1 2))}" });
       $machine->start;
 
       ${optionalString testChannel ''
@@ -137,7 +157,7 @@ let
       $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2");
 
       $machine->copyFileFromHost(
-          "${ config { inherit testChannel grubVersion grubDevice; } }",
+          "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }",
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
@@ -149,20 +169,27 @@ let
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-      my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
+      my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
 
-      # Did /boot get mounted, if appropriate?
+      # Did /boot get mounted?
       $machine->waitForUnit("local-fs.target");
-      $machine->succeed("test -e /boot/grub");
+
+      ${if useEFI then ''
+        $machine->succeed("test -e /boot/efi");
+      '' else ''
+        $machine->succeed("test -e /boot/grub");
+      ''}
 
       # Did the swap device get activated?
       $machine->waitForUnit("swap.target");
       $machine->succeed("cat /proc/swaps | grep -q /dev");
 
+      # Check whether the channel works.
       $machine->succeed("nix-env -i coreutils >&2");
       $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 
+      # Check whether nixos-rebuild works.
       $machine->succeed("nixos-rebuild switch >&2");
 
       # Test nixos-option.
@@ -174,19 +201,19 @@ let
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
-      my $machine = createMachine({ hda => "harddisk", hdaInterface => "${iface}" });
+      my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
       $machine->waitForUnit("network.target");
       $machine->shutdown;
     '';
 
 
   makeInstallerTest =
-    { createPartitions, testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
+    { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }:
     makeTest {
       inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
       testScript = testScriptFun {
-        inherit createPartitions testChannel grubVersion grubDevice;
+        inherit createPartitions testChannel useEFI grubVersion grubDevice;
       };
     };
 
@@ -312,6 +339,25 @@ in {
       grubDevice = "/dev/sda";
     };
 
+  # Test an EFI install.
+  efi = makeInstallerTest
+    { createPartitions =
+        ''
+          $machine->succeed(
+              "sgdisk -Z /dev/sda",
+              "sgdisk -n 1:0:+256M -n 2:0:+1024M -N 3 -t 1:ef00 -t 2:8200 -t 3:8300 -c 1:boot -c 2:swap -c 3:root /dev/sda",
+              "mkfs.vfat -n BOOT /dev/sda1",
+              "mkswap /dev/sda2 -L swap",
+              "swapon -L swap",
+              "mkfs.ext3 -L nixos /dev/sda3",
+              "mount LABEL=nixos /mnt",
+              "mkdir /mnt/boot",
+              "mount LABEL=BOOT /mnt/boot",
+          );
+        '';
+      useEFI = true;
+    };
+
   # Rebuild the CD configuration with a little modification.
   rebuildCD = makeTest
     { inherit iso;

From 9bb209a3bdc6299fae90f372e7cc516c59c1aee5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 11:41:39 +0200
Subject: [PATCH 0756/2033] gummiboot: Automatically disable GRUB

---
 nixos/doc/manual/installation.xml                        | 3 +--
 nixos/modules/installer/tools/nixos-generate-config.pl   | 1 -
 nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 ++
 nixos/tests/installer.nix                                | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index 6cf69386e56..dcbb20b19ee 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -318,8 +318,7 @@ changes:
   </listitem>
   <listitem>
     <para>You must set <option>boot.loader.gummiboot.enable</option> to
-    <literal>true</literal>, and <option>boot.loader.grub.enable</option>
-    to <literal>false</literal>. <command>nixos-generate-config</command>
+    <literal>true</literal>. <command>nixos-generate-config</command>
     should do this automatically for new configurations when booted in
     UEFI mode.</para>
   </listitem>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index b1958f32e55..c4d25a67a0f 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -402,7 +402,6 @@ if ($showHardwareConfig) {
         if (-e "/sys/firmware/efi/efivars") {
             $bootLoaderConfig = <<EOF;
   # Use the gummiboot efi boot loader.
-  boot.loader.grub.enable = false;
   boot.loader.gummiboot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 EOF
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 19c613a7c94..e7a481e90a7 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -54,6 +54,8 @@ in {
       }
     ];
 
+    boot.loader.grub.enable = mkDefault false;
+
     system = {
       build.installBootLoader = gummibootBuilder;
 
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d453633bed0..72665607149 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -45,7 +45,6 @@ let
           ];
 
         ${if useEFI then ''
-          boot.loader.grub.enable = false;
           boot.loader.efi.canTouchEfiVariables = true;
           boot.loader.gummiboot.enable = true;
         '' else ''

From 728d3476baa63c0d2b0a9be9d70db852ea7a2fd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 13:53:12 +0200
Subject: [PATCH 0757/2033] systemd: Require some more kernel features

---
 nixos/modules/system/boot/systemd.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 52ba31cdeed..764d7775e98 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -767,9 +767,11 @@ in
     systemd.user.units =
       mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services;
 
-    system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled [
-      "CGROUPS" "AUTOFS4_FS" "DEVTMPFS"
-    ];
+    system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled
+      [ "DEVTMPFS" "CGROUPS" "INOTIFY_USER" "SIGNALFD" "TIMERFD" "EPOLL" "NET"
+        "SYSFS" "PROC_FS" "FHANDLE" "DMIID" "AUTOFS4_FS" "TMPFS_POSIX_ACL"
+        "TMPFS_XATTR" "SECCOMP"
+      ];
 
     environment.shellAliases =
       { start = "systemctl start";

From 437962ebb29208ae854a162b91723688295b3e9c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 14:51:27 +0200
Subject: [PATCH 0758/2033] Installer test: Unmount filesystems after
 installation

Hopefully fixes failures like:

  http://hydra.nixos.org/build/10712833

This shouldn't be necessary, but it might be that the use of unionfs
is interfering with a clean shutdown.
---
 nixos/tests/installer.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 72665607149..b019882900d 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -165,6 +165,10 @@ let
       # Do it again to make sure it's idempotent.
       $machine->succeed("nixos-install >&2");
 
+      $machine->succeed("umount /mnt/boot || true");
+      $machine->succeed("umount /mnt");
+      $machine->succeed("sync");
+
       $machine->shutdown;
 
       # Now see if we can boot the installation.

From 27d47f3983e3de1a901b15f9b3590ad8c27ac8f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 14:59:46 +0200
Subject: [PATCH 0759/2033] Fix the simple installer test

http://hydra.nixos.org/build/10712818
---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index b019882900d..782df7eab2a 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -108,7 +108,7 @@ let
 
       my $machine = createMachine({ ${hdFlags}
         cdrom => glob("${iso}/iso/*.iso"),
-        qemuFlags => "${qemuFlags} ${optionalString testChannel (toString (qemuNICFlags 1 1 2))}" });
+        qemuFlags => "${qemuFlags} " . '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}' });
       $machine->start;
 
       ${optionalString testChannel ''

From 0ac20f072612bedd7769b905df1140a414820bf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 15:51:48 +0200
Subject: [PATCH 0760/2033] flashplayer: Update to 11.2.202.356

CVE-2014-0515
---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index d2e2995644f..a7002dec2f6 100644
--- 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.350";
+  version = "11.2.202.356";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0f5y05c0acvdzd7a7qi93kd17byazf9swm6gml5rph5bc25aw77l";
+        sha256 = "1g09a9fvm3wm2zi885q2kc2rwq0a7ywc637i31pzfic6kij10ps5";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -58,7 +58,7 @@ let
       } else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0nsrj56xbpn8r4365zby8qbc38cl2anb5ky0h7jwyh7xyrs9xmml";
+        sha256 = "1r7sbwfbgq7c5jhginsc95rihdcjsfzrbx0kxgwv7sk2jc7x8hhb";
       }
     else throw "Flash Player is not supported on this platform";
 

From 88a8ec37d3459448302bab4b84c69e00e04ec5bf Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sat, 8 Mar 2014 19:56:47 +0100
Subject: [PATCH 0761/2033] modernize nixos-generate-config

---
 .../installer/tools/nixos-generate-config.pl    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index bf7cdcd3711..f3aaa176ac2 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -429,6 +429,12 @@ $bootLoaderConfig
   #   defaultLocale = "en_US.UTF-8";
   # };
 
+  # List packages installed in system profile. To search by name, run:
+  # $ nix-env -qaP | grep wget
+  # environment.systemPackages = with pkgs; [
+  #   wget
+  # ];
+
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.
@@ -445,6 +451,17 @@ $bootLoaderConfig
   # Enable the KDE Desktop Environment.
   # services.xserver.displayManager.kdm.enable = true;
   # services.xserver.desktopManager.kde4.enable = true;
+
+  # Define your user and don't forget to set password with passwd
+  # users.extraUsers.guest = {
+  #   name = "guest";
+  #   group = "users";
+  #   uid = 1000;
+  #   createHome = true;
+  #   home = "/home/guest";
+  #   shell = "/run/current-system/sw/bin/bash";
+  # };
+
 }
 EOF
     } else {

From 05decd49ff35b247132585f74f291ed70d56958e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 16:16:16 +0200
Subject: [PATCH 0762/2033] Handle Zabbix agent and server both being enabled

This gave an error about the zabbix user uid being defined multiple
times.
---
 nixos/modules/services/monitoring/zabbix-agent.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/zabbix-agent.nix b/nixos/modules/services/monitoring/zabbix-agent.nix
index 481298f763a..a943075be0c 100644
--- a/nixos/modules/services/monitoring/zabbix-agent.nix
+++ b/nixos/modules/services/monitoring/zabbix-agent.nix
@@ -67,11 +67,11 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers = mkIf (!config.services.zabbixServer.enable) (singleton
       { name = "zabbix";
         uid = config.ids.uids.zabbix;
         description = "Zabbix daemon user";
-      };
+      });
 
     systemd.services."zabbix-agent" =
       { description = "Zabbix Agent";

From 26d03000c250d0286c31becdf773f78adacf49ac Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 30 Apr 2014 10:21:29 -0400
Subject: [PATCH 0763/2033] Actually use services.mysql.port

Fixes #1315
---
 nixos/modules/services/databases/mysql.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 1ca45d90f89..b94a3fbf3de 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -21,6 +21,7 @@ let
   myCnf = pkgs.writeText "my.cnf"
   ''
     [mysqld]
+    port = ${toString cfg.port}
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
     ${optionalString (cfg.replication.role == "slave" && !is55)

From 1d8f7e63b08331a32649199a3dd88281cd924800 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 16:39:56 +0200
Subject: [PATCH 0764/2033] Punctuation

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 2a532fe15ce..fe191047b87 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -462,7 +462,7 @@ $bootLoaderConfig
   # services.xserver.displayManager.kdm.enable = true;
   # services.xserver.desktopManager.kde4.enable = true;
 
-  # Define your user and don't forget to set password with passwd
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   # users.extraUsers.guest = {
   #   name = "guest";
   #   group = "users";

From a96f4920d51b96d700090b1671cbd1660e65bf99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 16:48:20 +0200
Subject: [PATCH 0765/2033] Don't make the EFI tests release-critical

They're failing on i686: http://hydra.nixos.org/build/10712961
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 05664e068f8..4cc418f8888 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,7 +48,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
-        (all nixos.tests.installer.efi)
+        #(all nixos.tests.installer.efi)
         (all nixos.tests.installer.grub1)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.separateBoot)

From 8f5ebe495ca2a298456faf87fdf0be77761e9cb1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 17:02:12 +0200
Subject: [PATCH 0766/2033] chatzilla: Update to 0.9.90.1

Also, make it work with recent Firefoxes.
---
 .../networking/irc/chatzilla/default.nix             | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 5d16c979f6a..2010d064f0d 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "chatzilla-0.9.88";
-  
+  name = "chatzilla-0.9.90.1";
+
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}-xr.zip";
-    sha256 = "041jpjl7wnbhqm2f8bf2pwp6igjapmy74swac94h54n644wl5nz0";
+    url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp";
+    sha256 = "0z38jig91h10cb14rvs30rpg2pgn3v890nyxyy8lxzbv5ncxmngw";
   };
 
   buildInputs = [ unzip makeWrapper ];
@@ -17,10 +17,14 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \
       --add-flags $out/libexec/chatzilla/application.ini
+
+    sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/'
   '';
 
   meta = {
     homepage = http://chatzilla.hacksrus.com/;
     description = "Stand-alone version of Chatzilla, an IRC client";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From be0f5eb45c2bf95dc46725da271bd1cd3e2d54e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 18:23:42 +0200
Subject: [PATCH 0767/2033] qemu-guest.nix: Load virtio_rng

This allows the guest to have a paravirtualized RNG, if the host
provides it.
---
 nixos/modules/profiles/qemu-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 0a92b7ace50..79890aa7f17 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -5,7 +5,7 @@
 
 {
   boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "9p" "9pnet_virtio" ];
-  boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" ];
+  boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ];
 
   boot.initrd.postDeviceCommands =
     ''

From 31fc4c6aa44b2a6cfa5c6427cad874a70a399765 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 30 Apr 2014 20:31:40 +0200
Subject: [PATCH 0768/2033] Shea told me composableDerivation is hard to
 understand.

Thus comment it and why it was written long time ago until it'll get replaced piecewise.
---
 lib/composable-derivation.nix | 75 +++++++++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 8 deletions(-)

diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix
index 1099bd152bf..8e8faae3982 100644
--- a/lib/composable-derivation.nix
+++ b/lib/composable-derivation.nix
@@ -1,15 +1,74 @@
 {lib, pkgs} :
 let inherit (lib) nv nvs; in
 {
-  # see for example:
-  # - development/interpreters/php_configurable/default.nix
-  # - .. search composableDerivation in all-packages.nix ..
+
+  # composableDerivation basically mixes these features:
+  # - fix function
+  # - mergeAttrBy
+  # - provides shortcuts for "options" such as "--enable-foo" and adding
+  #   buildInputs, see php example
   #
-  # You should be able to override anything you like easily
-  # grep the mailinglist by title "python proposal" (dec 08)
-  # -> http://mail.cs.uu.nl/pipermail/nix-dev/2008-December/001571.html
-  # to see why this got complicated when using all its features
-  # TODO add newer example using new syntax (kernel derivation proposal -> mailinglist)
+  # It predates styles which are common today, such as
+  #  * the config attr
+  #  * mkDerivation.override feature
+  #  * overrideDerivation (lib/customization.nix)
+  #
+  # Some of the most more important usage examples (which could be rewritten if it was important):
+  # * php
+  # * postgis
+  # * vim_configurable
+  #
+  # A minimal example illustrating most features would look like this:
+  # let base = composableDerivation { (fixed : let inherit (fixed.fixed) name in {
+  #    src = fetchurl {
+  #    }
+  #    buildInputs = [A];
+  #    preConfigre = "echo ${name}";
+  #    # attention, "name" attr is missing, thus you cannot instantiate "base".
+  # }
+  # in {
+  #  # These all add name attribute, thus you can instantiate those:
+  #  v1 = base.merge   ({ name = "foo-add-B"; buildInputs = [B]; });       // B gets merged into buildInputs
+  #  v2 = base.merge   ({ name = "mix-in-pre-configure-lines" preConfigre = ""; });
+  #  v3 = base.replace ({ name = "foo-no-A-only-B;" buildInputs = [B]; });
+  # }
+  #
+  # So yes, you can think about it being something like nixos modules, and
+  # you'd be merging "features" in one at a time using .merge or .replace
+  # Thanks Shea for telling me that I rethink the documentation ..
+  #
+  # issues:
+  # * its complicated to understand
+  # * some "features" such as exact merge behaviour are burried in mergeAttrBy
+  #   and defaultOverridableDelayableArgs assuming the default behaviour does
+  #   the right thing in the common case
+  # * Eelco once said using such fix style functions are slow to evaluate
+  # * Too quick & dirty. Hard to understand for others. The benefit was that
+  #   you were able to create a kernel builder like base derivation and replace
+  #   / add patches the way you want without having to declare function arguments
+  #
+  # nice features:
+  # declaring "optional featuers" is modular. For instance:
+  #   flags.curl = {
+  #     configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"];
+  #     buildInputs = [curl openssl];
+  #   };
+  #   flags.other = { .. }
+  # (Example taken from PHP)
+  #
+  # alternative styles / related features:
+  #  * Eg see function supporting building the kernel
+  #  * versionedDerivation (discussion about this is still going on - or ended)
+  #  * composedArgsAndFun
+  #  * mkDerivation.override
+  #  * overrideDerivation
+  #  * using { .., *Support ? false }: like configurable options.
+  # To find those examples use grep
+  #
+  # To sum up: It exists for historical reasons - and for most commonly used
+  # tasks the alternatives should be used
+  #
+  # If you have questions about this code ping Marc Weber.
   composableDerivation = {
         mkDerivation ? pkgs.stdenv.mkDerivation,
 

From 0ea20bef3c43825c6577069d06524c3481fd7378 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 23:13:45 +0200
Subject: [PATCH 0769/2033] Set release date

---
 nixos/doc/manual/release-notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index bacd97e0dc4..81edcdd7bfc 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -8,7 +8,7 @@
 
 <section xml:id="sec-release-14.04">
 
-<title>Release 14.04 (“Baboon”, 2014/04/??)</title>
+<title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
 <para>This is the second stable release branch of NixOS.  In addition
 to numerous new and upgraded packages and modules, this release has

From 3988f438ef730b7a44bc3eb6baf7992946e479b4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 30 Apr 2014 17:19:34 -0400
Subject: [PATCH 0770/2033] Add expression for the Haskell posix-paths library

---
 .../libraries/haskell/posix-paths/default.nix       | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/posix-paths/default.nix

diff --git a/pkgs/development/libraries/haskell/posix-paths/default.nix b/pkgs/development/libraries/haskell/posix-paths/default.nix
new file mode 100644
index 00000000000..96775121acb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/posix-paths/default.nix
@@ -0,0 +1,13 @@
+{ cabal, doctest, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "posix-paths";
+  version = "0.2.0.3";
+  sha256 = "16r0sd2m9xzzkrvj6qvc7z3yc8r83kpx724v5wifphcri3scvznv";
+  testDepends = [ doctest HUnit QuickCheck ];
+  meta = {
+    description = "POSIX filepath/directory functionality";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd7510e4c3f..be46cb9ca7f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2065,6 +2065,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     libc = pkgs.stdenv.gcc.libc;
   };
 
+  posixPaths = callPackage ../development/libraries/haskell/posix-paths {};
+
   postgresqlLibpq = callPackage ../development/libraries/haskell/postgresql-libpq {
     inherit (pkgs) postgresql;
   };

From c9ebb42573c8da5dcb6ba9125b1dceb582c20728 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Apr 2014 23:19:50 +0200
Subject: [PATCH 0771/2033] Disable the rabbitmq test

It frequently gets stuck in an infinite loop, delaying releases for
many hours.
---
 nixos/release.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0ce39dff24f..4caabd97839 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -240,7 +240,6 @@ in rec {
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   tests.quake3 = callTest tests/quake3.nix {};
-  tests.rabbitmq = callTest tests/rabbitmq.nix {};
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};

From 444538ca8f4a118dcfb05ec46cce8c6888528425 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 30 Apr 2014 22:48:51 +0200
Subject: [PATCH 0772/2033] syncthing: Bump to 0.8.2.

Tested this in two containers running 0.7.1 before. Upgraded fine and
kept working without configuration changes.
---
 pkgs/applications/networking/syncthing/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 50bc61eeeff..e658264e5cb 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "syncthing-${version}";
-  version = "0.7.1";
+  version = "0.8.2";
 
   src = fetchgit {
     url = "git://github.com/calmh/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1rja837kimiq15km8cridbm5yxvkm6mkvkwywdi76qf9rm0pcjl1";
+    sha256 = "1yhl0mk6f2cyib82jyzwz20iw1l5pxppmlgw5xn9pkmqm53wp4z4";
   };
 
   buildInputs = [ go ];
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     cp -r "./scanner" "./dependencies/src/github.com/calmh/syncthing"
     cp -r "./mc" "./dependencies/src/github.com/calmh/syncthing"
     cp -r "./xdr" "./dependencies/src/github.com/calmh/syncthing"
+    cp -r "./upnp" "./dependencies/src/github.com/calmh/syncthing"
 
     export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies"
 

From 81a6fcd84770cc638d6260dbd7647363c34f409c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 30 Apr 2014 22:50:25 +0200
Subject: [PATCH 0773/2033] anki: update from 2.0.22 to 2.0.26

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

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 720be6fb1d2..77891f43881 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -6,13 +6,13 @@
 
 let
     py = pythonPackages;
-    version = "2.0.22";
+    version = "2.0.26";
 in
 stdenv.mkDerivation rec {
     name = "anki-${version}";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1bnjzf8050hrs3iiaak0m07sxj07vqic677llg2g6iarg9ws8x26";
+      sha256 = "0w1dn2v6mbyq4dfyjskx51qwfqy6jpskpg4v5pzrv30big274p4q";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]

From 397682be6b7ebc062645ad8682d99886da8b6172 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 30 Apr 2014 23:36:05 +0200
Subject: [PATCH 0774/2033] Bump pass(word-store) to 1.6.1.

...and also simplify the expression massively.
---
 pkgs/tools/security/pass/default.nix | 21 ++++++++-------------
 pkgs/top-level/all-packages.nix      |  4 +++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index e78002837c7..eac9de2a306 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -3,12 +3,12 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.6.1";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1";
+    sha256 = "108856223w225xnqmcps6r5dn7sgqc4c3kfa1hd6piskdials59w";
   };
 
   buildInputs = [ makeWrapper ];
@@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    # link zsh and fish completions
-    sed -ie '22s/^#//' Makefile
-    sed -ie '25s/^#//' Makefile
-    sed -i 's/find /find -L /' contrib/pass.zsh-completion
     mkdir -p "$out/share/zsh/site-functions"
     mkdir -p "$out/share/fish/completions"
 
-    # use gnused
-    sed -i 's/sed -i ""/sed -i /' Makefile
+    # Install Emacs Mode. NOTE: We can't install the necessary
+    # dependencies (s.el and f.el) here. The user has to do this
+    # himself.
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
 
-    SYSCONFDIR="$out/etc" PREFIX="$out" make install
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # use nix-supplied getopt
-    sed -ie '34c GETOPT="${getopt}/bin/getopt"' \
-      "$out/lib/password-store.platform.sh"
+    PREFIX="$out" make install
   '';
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaec8affc7b..fc9528cbe75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -489,7 +489,9 @@ let
 
   otool = callPackage ../os-specific/darwin/otool { };
 
-  pass = callPackage ../tools/security/pass { };
+  pass = callPackage ../tools/security/pass {
+    gnupg = gnupg1compat;
+  };
 
   setfile = callPackage ../os-specific/darwin/setfile { };
 

From a21486d990a3e320ae0875b2eb60f523e01f2d3b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 30 Apr 2014 23:51:36 +0200
Subject: [PATCH 0775/2033] Erlang: Update from R16B02 to 17.0.

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

diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/default.nix
index 7dc71ed6546..5c59fddc1ef 100644
--- a/pkgs/development/interpreters/erlang/default.nix
+++ b/pkgs/development/interpreters/erlang/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "erlang-" + version;
-  version = "R16B02";
+  version = "17.0";
 
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
-    sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a";
+    sha256 = "1nyaka6238vh4kdgaynmg8hm5y5zj7hhyl1c971d2pjylsm2nzr9";
   };
 
   buildInputs =

From 1ac43838898a3cb7889618632297772fd0c2d093 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 30 Apr 2014 23:52:02 +0200
Subject: [PATCH 0776/2033] elixir: update from 0.12.4 to 0.13.0

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 698c75cfd16..7064d25532a 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.12.4";
+  version = "0.13.0";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0f9jbijby8alwn9yv1fncr2yn0pghdqsvixkdcd6s8yvjyhylm1l";
+    sha256 = "070jhv38d5f694gn4lgkzx3vcs495jnlgkrp6b3159zbri1mhz5b";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From 2d7fe682129aacda8b633417167a414a79a95bf2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:25:45 -0500
Subject: [PATCH 0777/2033] lablgtk: remove old patch

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../ocaml-modules/lablgtk/META.patch          | 64 -------------------
 .../ocaml-modules/lablgtk/default.nix         |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/lablgtk/META.patch

diff --git a/pkgs/development/ocaml-modules/lablgtk/META.patch b/pkgs/development/ocaml-modules/lablgtk/META.patch
deleted file mode 100644
index d2b7b500c69..00000000000
--- a/pkgs/development/ocaml-modules/lablgtk/META.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN zzz/lablgtk-2.14.1/META lablgtk-2.14.1/META
---- zzz/lablgtk-2.14.1/META	2009-02-12 21:39:14.000000000 -0500
-+++ lablgtk-2.14.1/META	2010-09-07 19:48:06.454452726 -0400
-@@ -1,8 +1,52 @@
--requires=""
--version="2.12.0"
--archive(byte)="lablgtk.cma"
--archive(byte,init)="lablgtk.cma gtkInit.cmo"
--archive(native)="lablgtk.cmxa"
--archive(native,init)="lablgtk.cmxa gtkInit.cmx"
--linkopts=""
--directory="+lablgtk2"
-+version="2.14.1"
-+requires(mt) = "threads"
-+requires(mt,mt_vm) = "threads.vm"
-+requires(mt,mt_posix) = "threads.posix"
-+archive(byte) = "lablgtk.cma"
-+archive(native) = "lablgtk.cmxa"
-+archive(byte,mt) += "gtkThread.cmo"
-+archive(native,mt) += "gtkThread.cmx"
-+
-+package "init" (
-+  requires = "lablgtk2"
-+  archive(byte) = "gtkInit.cmo"
-+  archive(native) = "gtkInit.cmx"
-+)
-+
-+package "glade" (
-+  requires = "lablgtk2"
-+  archive(byte) = "lablglade.cma"
-+  archive(native) = "lablglade.cmxa"
-+)
-+
-+package "gtkspell" (
-+  requires = "lablgtk2"
-+  archive(byte) = "lablgtkspell.cma"
-+  archive(native) = "lablgtkspell.cmxa"
-+)
-+
-+package "gnomecanvas" (
-+  archive(byte)	= "lablgnomecanvas.cma"
-+  archive(native) = "lablgnomecanvas.cmxa"
-+)
-+
-+package "gnomeui" (
-+  archive(byte) = "lablgnomeui.cma"
-+  archive(native) = "lablgnomeui.cmxa"
-+)
-+
-+package "panel" (
-+  archive(byte) = "lablpanel.cma"
-+  archive(native) = "lablpanel.cmxa"
-+)
-+
-+package "rsvg" (
-+  archive(byte) = "lablrsvg.cma"
-+  archive(native) = "lablrsvg.cmxa"
-+)
-+
-+package "gtksourceview" (
-+  requires = "lablgtk2"
-+  archive(byte) = "lablgtksourceview2.cma"
-+  archive(native) = "lablgtksourceview2.cmxa"
-+)
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index a62f4ab9ae9..392cf5c9772 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview];
 
-  # patches = [ ./META.patch ];
-
   configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib";
   buildFlags = "world";
 

From 02351691ba90ac0decb17378596dba44db1afe1a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:26:35 -0500
Subject: [PATCH 0778/2033] ocaml-packages: add zarith 1.2.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../ocaml-modules/zarith/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/zarith/default.nix

diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
new file mode 100644
index 00000000000..a05ff43a3df
--- /dev/null
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gmp, perl }:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+in
+stdenv.mkDerivation rec {
+  name = "zarith-${version}";
+  version = "1.2.1";
+
+  src = fetchurl {
+    url = "http://forge.ocamlcore.org/frs/download.php/1199/${name}.tgz";
+    sha256 = "0i21bsx41br0jgw8xmlpnky5zamzqkpbykrq0z53z7ar77602s4i";
+  };
+
+  buildInputs = [ ocaml findlib pkgconfig gmp perl ];
+
+  configurePhase = ''
+    ./configure -installdir $out/lib/ocaml/${ocaml_version}/site-lib
+  '';
+  preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib";
+
+  meta = {
+    description = "fast, arbitrary precision OCaml integers";
+    homepage    = "http://forge.ocamlcore.org/projects/zarith";
+    license     = stdenv.lib.licenses.lgpl2;
+    platforms   = ocaml.meta.platforms;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc9528cbe75..5663024f75a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3168,6 +3168,8 @@ let
     opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
     opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
     opam = opam_1_1;
+
+    zarith = callPackage ../development/ocaml-modules/zarith { };
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;

From d1a32414cd22b8929951fc17ef35af46ac8032e7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:27:05 -0500
Subject: [PATCH 0779/2033] nixpkgs: add ltl2ba 1.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/ltl2ba/default.nix          | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/science/logic/ltl2ba/default.nix

diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
new file mode 100644
index 00000000000..cdadd18ac9f
--- /dev/null
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -0,0 +1,24 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "ltl2ba-${version}";
+  version = "1.1";
+
+  src = fetchurl {
+    url    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/${name}.tar.gz";
+    sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv ltl2ba $out/bin
+  '';
+
+  meta = {
+    description = "fast translation from LTL formulae to Buchi automata";
+    homepage    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba";
+    license     = stdenv.lib.licenses.gpl2Plus;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5663024f75a..601be9d3620 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10336,6 +10336,8 @@ let
 
   logisim = callPackage ../applications/science/logic/logisim {};
 
+  ltl2ba = callPackage ../applications/science/logic/ltl2ba {};
+
   matita = callPackage ../applications/science/logic/matita {
     ocaml = ocaml_3_11_2;
     inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http

From 5f702d52f49e2a28e3344e1ddb19208dc1da6f82 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:28:23 -0500
Subject: [PATCH 0780/2033] ocamlgraph: upgrade to 1.8.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../ocaml-modules/ocamlgraph/default.nix      |   6 +-
 .../0004-Port-to-OCamlgraph-1.8.5.patch       | 254 ++++++++++++++++++
 .../0007-Port-to-OCamlgraph-1.8.2.patch       |  64 -----
 3 files changed, 257 insertions(+), 67 deletions(-)
 create mode 100644 pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
 delete mode 100644 pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch

diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 997ca220610..9f411dd2a6f 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "1.8.2";
+  version = "1.8.5";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz";
-    sha256 = "e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6";
+    sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi";
   };
 
   buildInputs = [ ocaml findlib ocamlPackages.lablgtk ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   postPatch = ''
     sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml_version}/site-lib/ocamlgraph@' Makefile.in
     sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2@' configure Makefile.in
-    sed -i 's@-I +lablgtk2@-I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
+    sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml_version}/site-lib/stublibs@' configure Makefile.in editor/Makefile
   '';
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch b/pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
new file mode 100644
index 00000000000..798d17fd369
--- /dev/null
+++ b/pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
@@ -0,0 +1,254 @@
+From: Mehdi Dogguy <mehdi@debian.org>
+Date: Sun, 27 Apr 2014 13:46:16 +0200
+Subject: Port to OCamlgraph 1.8.5
+
+---
+ src/impact/reason_graph.ml          |    2 +-
+ src/kernel/stmts_graph.ml           |   10 +++++-----
+ src/logic/property_status.ml        |    8 ++++----
+ src/misc/service_graph.ml           |    4 ++--
+ src/pdg_types/pdgTypes.ml           |    6 +++---
+ src/postdominators/print.ml         |    2 +-
+ src/semantic_callgraph/register.ml  |    4 ++--
+ src/slicing/printSlice.ml           |   10 +++++-----
+ src/syntactic_callgraph/register.ml |    4 ++--
+ src/wp/cil2cfg.ml                   |   12 ++++++------
+ 10 files changed, 31 insertions(+), 31 deletions(-)
+
+diff --git a/src/impact/reason_graph.ml b/src/impact/reason_graph.ml
+index eabacb0..ce19b4a 100644
+--- a/src/impact/reason_graph.ml
++++ b/src/impact/reason_graph.ml
+@@ -139,7 +139,7 @@ module Printer (X: AdditionalInfo) = struct
+ 
+   let graph_attributes _ = [`Label "Impact graph"]
+ 
+-  let default_vertex_attributes _g = [`Style [`Filled]; `Shape `Box]
++  let default_vertex_attributes _g = [`Style `Filled; `Shape `Box]
+   let default_edge_attributes _g = []
+ 
+   let vertex_attributes v =
+diff --git a/src/kernel/stmts_graph.ml b/src/kernel/stmts_graph.ml
+index a8fe121..16059c3 100644
+--- a/src/kernel/stmts_graph.ml
++++ b/src/kernel/stmts_graph.ml
+@@ -157,12 +157,12 @@ module TP = struct
+ 
+   let vertex_attributes s =
+     match s.skind with
+-    | Loop _ -> [`Color 0xFF0000; `Style [`Filled]]
+-    | If _ -> [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond]
+-    | Return _ -> [`Color 0x0000FF; `Style [`Filled]]
++    | Loop _ -> [`Color 0xFF0000; `Style `Filled]
++    | If _ -> [`Color 0x00FF00; `Style `Filled; `Shape `Diamond]
++    | Return _ -> [`Color 0x0000FF; `Style `Filled]
+     | Block _ -> [`Shape `Box; `Fontsize 8]
+-    | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style [`Filled]]
+-    | Instr (Skip _) -> [`Color 0x00FFFF ; `Style [`Filled]]
++    | Goto _ -> [`Shape `Diamond; `Color 0x00FFFF ; `Style `Filled]
++    | Instr (Skip _) -> [`Color 0x00FFFF ; `Style `Filled]
+     | _ -> []
+   let default_vertex_attributes _ = []
+ 
+diff --git a/src/logic/property_status.ml b/src/logic/property_status.ml
+index f7c278d..47485f6 100644
+--- a/src/logic/property_status.ml
++++ b/src/logic/property_status.ml
+@@ -1481,12 +1481,12 @@ module Consolidation_graph = struct
+                 let s = get_status p in
+ 		let color = status_color p s in
+                 let style = match s with
+-                  | Never_tried -> [`Style [`Bold]; `Width 0.8 ]
+-                  | _ -> [`Style [`Filled]]
++                  | Never_tried -> [`Style `Bold; `Width 0.8 ]
++                  | _ -> [`Style `Filled]
+                 in
+ 		style @ [ label v; `Color color; `Shape `Box ]
+               | Emitter _ as v -> 
+-		[ label v; `Shape `Diamond; `Color 0xb0c4de; `Style [`Filled] ]
++		[ label v; `Shape `Diamond; `Color 0xb0c4de; `Style `Filled ]
+               | Tuning_parameter _ as v ->
+ 		[ label v; (*`Style `Dotted;*) `Color 0xb0c4de;  ]
+ 	      (*| Correctness_parameter _ (*as v*) -> assert false (*[ label v; `Color 0xb0c4de ]*)*)
+@@ -1495,7 +1495,7 @@ module Consolidation_graph = struct
+ 	      | None -> []
+ 	      | Some s ->
+ 		let c = emitted_status_color s in
+-		[ `Color c; `Fontcolor c; `Style [`Bold] ]
++		[ `Color c; `Fontcolor c; `Style `Bold ]
+ 
+         let default_vertex_attributes _ = []
+         let default_edge_attributes _ = []
+diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml
+index 4f866c5..d158028 100644
+--- a/src/misc/service_graph.ml
++++ b/src/misc/service_graph.ml
+@@ -289,7 +289,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]"
+         color e
+       else
+         match CallG.E.label e with
+-        | Inter_services -> [ `Style [`Invis] ]
++        | Inter_services -> [ `Style `Invis ]
+         | Inter_functions | Both -> color e
+ 
+     let default_edge_attributes _ = []
+@@ -303,7 +303,7 @@ Src root:%s in %s (is_root:%b) Dst:%s in %s (is_root:%b) [2d case]"
+           sg_attributes =
+             [ `Label ("S " ^ cs);
+               `Color (Extlib.number_to_color id);
+-              `Style [`Bold] ] }
++              `Style `Bold ] }
+ 
+   end
+ 
+diff --git a/src/pdg_types/pdgTypes.ml b/src/pdg_types/pdgTypes.ml
+index 05754e4..74cdebf 100644
+--- a/src/pdg_types/pdgTypes.ml
++++ b/src/pdg_types/pdgTypes.ml
+@@ -626,7 +626,7 @@ module Pdg = struct
+ 
+     let graph_attributes _ = [`Rankdir `TopToBottom ]
+ 
+-    let default_vertex_attributes _ = [`Style [`Filled]]
++    let default_vertex_attributes _ = [`Style `Filled]
+     let vertex_name v = string_of_int (Node.id v)
+ 
+     let vertex_attributes v =
+@@ -711,13 +711,13 @@ module Pdg = struct
+         if Dpd.is_ctrl d then (`Arrowtail `Odot)::attrib else attrib
+       in
+       let attrib =
+-        if Dpd.is_addr d then (`Style [`Dotted])::attrib else attrib
++        if Dpd.is_addr d then (`Style `Dotted)::attrib else attrib
+       in
+         attrib
+ 
+     let get_subgraph v =
+       let mk_subgraph name attrib =
+-        let attrib = (`Style [`Filled]) :: attrib in
++        let attrib = (`Style `Filled) :: attrib in
+         Some { Graph.Graphviz.DotAttributes.sg_name= name;
+                sg_parent = None;
+                sg_attributes = attrib }
+diff --git a/src/postdominators/print.ml b/src/postdominators/print.ml
+index f2e3a25..15f4ff2 100644
+--- a/src/postdominators/print.ml
++++ b/src/postdominators/print.ml
+@@ -63,7 +63,7 @@ module Printer = struct
+ 
+   let graph_attributes (title, _) = [`Label title]
+ 
+-  let default_vertex_attributes _g = [`Style [`Filled]]
++  let default_vertex_attributes _g = [`Style `Filled]
+   let default_edge_attributes _g = []
+ 
+   let vertex_attributes (s, has_postdom) =
+diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml
+index 1c79dcc..071f061 100644
+--- a/src/semantic_callgraph/register.ml
++++ b/src/semantic_callgraph/register.ml
+@@ -102,8 +102,8 @@ module Service =
+          let name = Kernel_function.get_name
+          let attributes v =
+            [ `Style
+-               [if Kernel_function.is_definition v then `Bold
+-                else `Dotted] ]
++               (if Kernel_function.is_definition v then `Bold
++                else `Dotted) ]
+          let entry_point () =
+            try Some (fst (Globals.entry_point ()))
+            with Globals.No_such_entry_point _ -> None
+diff --git a/src/slicing/printSlice.ml b/src/slicing/printSlice.ml
+index c5363f9..211e0bb 100644
+--- a/src/slicing/printSlice.ml
++++ b/src/slicing/printSlice.ml
+@@ -227,7 +227,7 @@ module PrintProject = struct
+ 
+   let graph_attributes (name, _) = [`Label name]
+ 
+-  let default_vertex_attributes _ = [`Style [`Filled]]
++  let default_vertex_attributes _ = [`Style `Filled]
+ 
+   let vertex_name v = match v with
+     | Src fi -> SlicingMacros.fi_name fi
+@@ -280,16 +280,16 @@ module PrintProject = struct
+ 
+   let edge_attributes (e, call) =
+     let attrib = match e with
+-    | (Src _, Src _) -> [`Style [`Invis]]
+-    | (OptSliceCallers _, _) -> [`Style [`Invis]]
+-    | (_, OptSliceCallers _) -> [`Style [`Invis]]
++    | (Src _, Src _) -> [`Style `Invis]
++    | (OptSliceCallers _, _) -> [`Style `Invis]
++    | (_, OptSliceCallers _) -> [`Style `Invis]
+     | _ -> []
+     in match call with None -> attrib
+       | Some call -> (`Label (string_of_int call.sid)):: attrib
+ 
+   let get_subgraph v =
+     let mk_subgraph name attrib =
+-      let attrib = (*(`Label name) ::*) (`Style [`Filled]) :: attrib in
++      let attrib = (*(`Label name) ::*) (`Style `Filled) :: attrib in
+           Some { Graph.Graphviz.DotAttributes.sg_name= name;
+                  sg_parent = None;
+                  sg_attributes = attrib }
+diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml
+index d4669c4..d41980e 100644
+--- a/src/syntactic_callgraph/register.ml
++++ b/src/syntactic_callgraph/register.ml
+@@ -37,8 +37,8 @@ module Service =
+          let name v = nodeName v.cnInfo
+          let attributes v =
+            [ match v.cnInfo with
+-             | NIVar (_,b) when not !b -> `Style [`Dotted]
+-             | _ -> `Style [`Bold] ]
++             | NIVar (_,b) when not !b -> `Style `Dotted
++             | _ -> `Style `Bold ]
+          let equal v1 v2 = id v1 = id v2
+ 	 let compare v1 v2 = 
+ 	   let i1 = id v1 in
+diff --git a/src/wp/cil2cfg.ml b/src/wp/cil2cfg.ml
+index 6d8cf09..ba5f410 100644
+--- a/src/wp/cil2cfg.ml
++++ b/src/wp/cil2cfg.ml
+@@ -1278,9 +1278,9 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
+       | Vstart | Vend | Vexit -> [`Color 0x0000FF; `Shape `Doublecircle]
+       | VfctIn | VfctOut -> [`Color 0x0000FF; `Shape `Box]
+       | VblkIn _ | VblkOut _ -> [`Shape `Box]
+-      | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style [`Filled]]
++      | Vloop _ | Vloop2 _ -> [`Color 0xFF0000; `Style `Filled]
+       | Vtest _ | Vswitch _ ->
+-        [`Color 0x00FF00; `Style [`Filled]; `Shape `Diamond]
++        [`Color 0x00FF00; `Style `Filled; `Shape `Diamond]
+       | Vcall _ | Vstmt _ -> []
+     in (`Label (String.escaped label))::attr
+ 
+@@ -1290,15 +1290,15 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
+     let attr = [] in
+     let attr = (`Label (String.escaped (PE.edge_txt e)))::attr in
+     let attr =
+-      if is_back_edge e then (`Constraint false)::(`Style [`Bold])::attr
++      if is_back_edge e then (`Constraint false)::(`Style `Bold)::attr
+       else attr
+     in
+     let attr = match (edge_type e) with
+       | Ethen | EbackThen -> (`Color 0x00FF00)::attr
+       | Eelse | EbackElse -> (`Color 0xFF0000)::attr
+-      | Ecase [] -> (`Color 0x0000FF)::(`Style [`Dashed])::attr
++      | Ecase [] -> (`Color 0x0000FF)::(`Style `Dashed)::attr
+       | Ecase _ -> (`Color 0x0000FF)::attr
+-      | Enext -> (`Style [`Dotted])::attr
++      | Enext -> (`Style `Dotted)::attr
+       | Eback -> attr (* see is_back_edge above *)
+       | Enone -> attr
+     in
+@@ -1308,7 +1308,7 @@ module Printer (PE : sig val edge_txt : edge -> string end) = struct
+ 
+   let get_subgraph v =
+      let mk_subgraph name attrib =
+-      let attrib = (`Style [`Filled]) :: attrib in
++      let attrib = (`Style `Filled) :: attrib in
+           Some { Graph.Graphviz.DotAttributes.sg_name= name;
+                  sg_parent = None;
+                  sg_attributes = attrib }
+-- 
diff --git a/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch b/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch
deleted file mode 100644
index 1c16e1794ab..00000000000
--- a/pkgs/development/tools/misc/frama-c/0007-Port-to-OCamlgraph-1.8.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Wed, 16 May 2012 14:48:40 +0200
-Subject: Port to OCamlgraph 1.8.2
-
- o Graph.Topological: as of OCamlgraph 1.8.2, the input graph must
-   implement Sig.COMPARABLE instead of Sig.HASHABLE
----
- src/misc/service_graph.ml           |    2 +-
- src/misc/service_graph.mli          |    2 +-
- src/semantic_callgraph/register.ml  |    1 +
- src/syntactic_callgraph/register.ml |    1 +
- 4 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/misc/service_graph.ml b/src/misc/service_graph.ml
-index f30a1be..567698f 100644
---- a/src/misc/service_graph.ml
-+++ b/src/misc/service_graph.ml
-@@ -24,7 +24,7 @@ module Make
-   (G: sig
-      type t
-      module V: sig
--       include Graph.Sig.HASHABLE
-+       include Graph.Sig.COMPARABLE
-        val id: t -> int
-        val name: t -> string
-        val attributes: t -> Graph.Graphviz.DotAttributes.vertex list
-diff --git a/src/misc/service_graph.mli b/src/misc/service_graph.mli
-index 5ebb570..8006977 100644
---- a/src/misc/service_graph.mli
-+++ b/src/misc/service_graph.mli
-@@ -28,7 +28,7 @@ module Make
-   (G: sig
-      type t
-      module V: sig
--       include Graph.Sig.HASHABLE
-+       include Graph.Sig.COMPARABLE
-        val id: t -> int
-          (** assume is >= 0 and unique for each vertices of the graph *)
-        val name: t -> string
-diff --git a/src/semantic_callgraph/register.ml b/src/semantic_callgraph/register.ml
-index 0b3b4df..064dca8 100644
---- a/src/semantic_callgraph/register.ml
-+++ b/src/semantic_callgraph/register.ml
-@@ -107,6 +107,7 @@ module Service =
-                (if Kernel_function.is_definition v then `Bold
-                 else `Dotted) ]
-          let equal = Kernel_function.equal
-+         let compare v1 v2 = Datatype.Int.compare (id v1) (id v2)
-          let hash = Kernel_function.hash
-          let entry_point () =
-            try Some (fst (Globals.entry_point ()))
-diff --git a/src/syntactic_callgraph/register.ml b/src/syntactic_callgraph/register.ml
-index 4efb594..d9d78b9 100644
---- a/src/syntactic_callgraph/register.ml
-+++ b/src/syntactic_callgraph/register.ml
-@@ -41,6 +41,7 @@ module Service =
-              | NIVar (_,b) when not !b -> `Style `Dotted
-              | _ -> `Style `Bold ]
-          let equal v1 v2 = id v1 = id v2
-+         let compare v1 v2 = Datatype.Int.compare (id v1) (id v2)
-          let hash = id
-          let entry_point () = !entry_point_ref
-        end
--- 

From 4ee4f76176856c2d0e11dbd1b1a00836d3ba9ee0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:28:52 -0500
Subject: [PATCH 0781/2033] nixpkgs: add why3 0.83

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/why3/default.nix            | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/logic/why3/default.nix

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
new file mode 100644
index 00000000000..71ff1cc7fb4
--- /dev/null
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -0,0 +1,22 @@
+{ fetchurl, stdenv, ocaml, ocamlPackages, coq }:
+
+stdenv.mkDerivation rec {
+  name    = "why3-${version}";
+  version = "0.83";
+
+  src = fetchurl {
+    url    = "https://gforge.inria.fr/frs/download.php/33490/${name}.tar.gz";
+    sha256 = "1jcs5vj91ppbgh4q4hch89b63wgakjhg35pm3r4jwhp377lnggya";
+  };
+
+  buildInputs = with ocamlPackages;
+    [ coq ocaml findlib lablgtk ocamlgraph zarith ];
+
+  meta = {
+    description = "why is a software verification platform";
+    homepage    = "http://why3.lri.fr/";
+    license     = stdenv.lib.licenses.lgpl21;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 601be9d3620..2c7fbe28469 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10372,6 +10372,8 @@ let
 
   verifast = callPackage_i686 ../applications/science/logic/verifast {};
 
+  why3 = callPackage ../applications/science/logic/why3 {};
+
   yices = callPackage ../applications/science/logic/yices {};
 
   z3 = callPackage ../applications/science/logic/z3 {};

From 6d52463bd338ebe3bdb1aeed6b6557d219c37788 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:29:42 -0500
Subject: [PATCH 0782/2033] nixpkgs: add alt-ergo 0.95.2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 lib/licenses.nix                              |  6 +++++
 .../science/logic/alt-ergo/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/science/logic/alt-ergo/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 20c1b220031..c2a02bd1b9a 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -260,4 +260,10 @@
     fullName  = "Sleepycat Public License";
     url       = "https://en.wikipedia.org/wiki/Sleepycat_License";
   };
+
+  cecill-c = {
+    shortName = "CeCILL-C";
+    fullName  = "CEA CNRS INRIA Logiciel Libre";
+    url       = "http://www.cecill.info/licences.en.html";
+  };
 }
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
new file mode 100644
index 00000000000..2a95d0cd65b
--- /dev/null
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, ocaml, ocamlPackages, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "alt-ergo-${version}";
+  version = "0.95.2";
+
+  src = fetchurl {
+    url    = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz";
+    name   = "${name}.tar.gz";
+    sha256 = "1b7f0rh3jgm67g0x2m3wv7gnnqmz9cjlrfm136z56ihlkhsd8v2s";
+  };
+
+  buildInputs = with ocamlPackages;
+    [ ocaml findlib ocamlgraph zarith lablgtk gmp ];
+
+  meta = {
+    description = "Alt-Ergo is a high-performance theorem prover and SMT solver";
+    homepage    = "http://alt-ergo.ocamlpro.com/";
+    license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c7fbe28469..90123a6d826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10294,6 +10294,8 @@ let
 
   ### SCIENCE/LOGIC
 
+  alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
+
   coq = callPackage ../applications/science/logic/coq {
     inherit (ocamlPackages) findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;

From 628e914f2b59f7096c41780e373767f1a767147d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 02:30:12 -0500
Subject: [PATCH 0783/2033] frama-c: overhaul, upgrade to 20140301-Neon

This massively upgrades the frama-c package to be far more useful,
including support for a lot more plugins, including Jessie.

Jessie unfortunately requires that its plugin is installed alongside
frama-c, so we install why2 (where it lives) along with frama-c now.
This increases the size, but makes it much more useful.

In the future, it may be possible to split out the build such that why2
is a separate expression and frama-c only installs the plugin, rather
than all of why2. However, right now this is fine.

Furthermore, why3 is now a dependency - the Jessie plugin can use
either, and defaults to Why3 now. Per the design, Frama-C can also go
from Why2->Why3 as well.

We also make Coq and Alt-Ergo dependencies, so that out-of-the-box users
get at least one SMT solver and a prover for support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/misc/frama-c/default.nix            | 93 ++++++++++++-------
 1 file changed, 61 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/tools/misc/frama-c/default.nix b/pkgs/development/tools/misc/frama-c/default.nix
index ede316b4b7b..baa63855a0a 100644
--- a/pkgs/development/tools/misc/frama-c/default.nix
+++ b/pkgs/development/tools/misc/frama-c/default.nix
@@ -1,37 +1,53 @@
-# Note on a potential dependency-bloat:
-# Frama-c ships with several plugins that have dependencies on other
-# software. Not providing the dependencies has as effect that certain
-# plugins will not be available.
-# I've included the dependencies that are well-supported by nixpkgs
-# and seem useful in general. Not included are:
-#   alt-ergo, ltl2ba, otags, why-dp
+{ stdenv, fetchurl, ncurses, ocamlPackages, graphviz
+, ltl2ba, coq, alt-ergo, gmp, why3 }:
 
-{ stdenv, fetchurl, ncurses, ocamlPackages, coq, graphviz }:
-
-let
-
-  version = "20111001";
-  sha256 = "8afad848321c958fab265045cd152482e77ce7c175ee7c9af2d4bec57a1bc671";
-
-in stdenv.mkDerivation {
-  name = "frama-c-${version}";
+stdenv.mkDerivation rec {
+  name    = "frama-c-${version}";
+  version = "20140301";
+  slang   = "Neon";
 
   src = fetchurl {
-    url = "http://frama-c.com/download/frama-c-Nitrogen-${version}.tar.gz";
-    inherit sha256;
+    url    = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz";
+    sha256 = "0ca7ky7vs34did1j64v6d8gcp2irzw3rr5qgv47jhmidbipn1865";
+  };
+
+  why2 = fetchurl {
+    url    = "http://why.lri.fr/download/why-2.34.tar.gz";
+    sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg";
   };
 
   buildInputs = with ocamlPackages; [
-    ncurses ocaml findlib ocamlgraph
-    lablgtk coq graphviz  # optional dependencies
+    ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph gmp
+    lablgtk coq graphviz zarith why3 zarith
   ];
 
-  patches = [
-    # this patch comes from the debian frama-c package, and was
-    # posted on the frama-c issue tracker.
-    ./0007-Port-to-OCamlgraph-1.8.2.patch
-  ];
 
+  enableParallelBuilding = true;
+  configureFlags = [ "--disable-local-ocamlgraph" ];
+
+  unpackPhase = ''
+    tar xf $src
+    tar xf $why2
+  '';
+
+  buildPhase = ''
+    cd frama*
+    ./configure --prefix=$out
+    make -j$NIX_BUILD_CORES
+    make install
+    cd ../why*
+    FRAMAC=$out/bin/frama-c ./configure --prefix=$out
+    make
+    make install
+  '';
+
+
+  # Taken from Debian Sid
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746091
+  patches = ./0004-Port-to-OCamlgraph-1.8.5.patch;
+
+  # Enter frama-c directory before patching
+  prePatch = ''cd frama*'';
   postPatch = ''
     # strip absolute paths to /usr/bin
     for file in ./configure ./share/Makefile.common ./src/*/configure; do
@@ -49,19 +65,32 @@ in stdenv.mkDerivation {
       --replace '$OCAMLLIB/ocamlgraph' "$OCAMLGRAPH_HOME" \
       --replace '$OCAMLLIB/lablgtk2' "$LABLGTK_HOME" \
       --replace '+ocamlgraph' "$OCAMLGRAPH_HOME" \
-      --replace '1.8)' '*)'
     substituteInPlace ./Makefile --replace '+lablgtk2' "$LABLGTK_HOME" \
       --replace '$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES))' \
                 '$(patsubst /%,.,$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES)))'
+
+    substituteInPlace ./src/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba'
+
+    cd ../why*
+    substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c"
+    substituteInPlace ./jc/jc_make.ml --replace ' why-dp '       " $out/bin/why-dp "
+    substituteInPlace ./jc/jc_make.ml --replace "?= why@\n"      "?= $out/bin/why@\n"
+    substituteInPlace ./jc/jc_make.ml --replace ' gwhy-bin@'     " $out/bin/gwhy-bin@"
+    substituteInPlace ./jc/jc_make.ml --replace ' why3 '         " ${why3}/bin/why3 "
+    substituteInPlace ./jc/jc_make.ml --replace ' why3ide '      " ${why3}/bin/why3ide "
+    substituteInPlace ./jc/jc_make.ml --replace ' why3replayer ' " ${why3}/bin/why3replayer "
+    substituteInPlace ./jc/jc_make.ml --replace ' why3ml '       " ${why3}/bin/why3ml "
+    substituteInPlace ./jc/jc_make.ml --replace ' coqdep@'       " ${coq}/bin/coqdep@"
+    substituteInPlace ./jc/jc_make.ml --replace 'coqc'           " ${coq}/bin/coqc"
+    substituteInPlace ./frama-c-plugin/register.ml --replace ' jessie ' " $out/bin/jessie "
+    cd ..
   '';
 
   meta = {
     description = "Frama-C is an extensible tool for source-code analysis of C software";
-
-    homepage = http://frama-c.com/;
-    license = "GPLv2";
-
-    maintainers = [ stdenv.lib.maintainers.amiddelk ];
-    platforms = stdenv.lib.platforms.gnu;
+    homepage    = http://frama-c.com/;
+    license     = stdenv.lib.licenses.lgpl21;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ];
+    platforms   = stdenv.lib.platforms.linux;
   };
 }

From 4de63577767614195bdae7a8849665fa1b3f4573 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 10:42:53 +0200
Subject: [PATCH 0784/2033] Remove mysterious line

---
 maintainers/scripts/copy-tarballs.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
index 0746fb21069..b7178fb7d71 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -75,7 +75,6 @@ foreach my $file (@{$data->{list}->{attrs}}) {
     waitpid($pid, 0) or die;
     if ($? != 0) {
         print STDERR "failed to fetch $url: $?\n";
-        last if $? >> 8 == 255;
         next;
     }
     <$fh>; my $storePath = <$fh>; chomp $storePath;

From 6c69ad3a97cbf5afeb764afcffa3de0e5622521c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 10:51:15 +0200
Subject: [PATCH 0785/2033] Fix meta.license attribute

---
 pkgs/tools/backup/wal-e/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index b1cc248e1a5..c272f0e8378 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -26,7 +26,7 @@ pythonPackages.buildPythonPackage rec {
     description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
     homepage = https://github.com/wal-e/wal-e;
     maintainers = [ stdenv.lib.maintainers.rickynils ];
-    licenses = stdenv.lib.licenses.bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 7e36ddf766783891ebcc50a8c461b316db42f01c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 10:57:52 +0200
Subject: [PATCH 0786/2033] afflib: Fix broken URL

Also, use stdenv.mkDerivation and drop unusued libewf dependency.
---
 pkgs/development/libraries/afflib/default.nix | 54 +++++--------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index a5fdafe7914..7c1c5dfd7b7 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -1,48 +1,20 @@
-x@{builderDefsPackage
-  , libewf, zlib, curl, expat, fuse, openssl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, zlib, curl, expat, fuse, openssl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="afflib";
-    version="3.6.12";
-    name="${baseName}-${version}";
-    url="http://afflib.org/downloads/${name}.tar.gz";
-    hash="1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "afflib-3.6.12";
+
+  src = fetchurl {
+    url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz";
+    sha256 = "1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ zlib curl expat fuse openssl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
   meta = {
+    homepage = http://afflib.sourceforge.net/;
     description = "Advanced forensic format library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.bsdOriginal;
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsdOriginal;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://afflib.org/";
-    };
-  };
-}) x
-
+}

From ba332accc2e4c2d18d3abb268d7ecf7bd301307c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 11:45:35 +0200
Subject: [PATCH 0787/2033] php: Update to 5.4.27

CVE-2013-7345, CVE-2014-1943, CVE-2014-2270, CVE-2013-6712
---
 pkgs/development/interpreters/php/5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index cc6e34b76fe..5aabb61586e 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.23";
+  version = "5.4.27";
 
   name = "php-${version}";
 
@@ -240,7 +240,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
       "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror"
     ];
-    sha256 = "1k4iplqqcaqkmyq10h6a5qcpkfpkd05r2kclxw9n9qdrm47hfz5f";
+    md5 = "1c6e99187d25023411b663ea09f145ee";
     name = "php-${version}.tar.bz2";
   };
 

From 65a78e16f1485d3d100c9e42458dd13f579d5484 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 11:48:56 +0200
Subject: [PATCH 0788/2033] httpd: Update to 2.2.27

CVE-2013-6438, CVE-2014-0098
---
 pkgs/servers/http/apache-httpd/2.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 64dd15be3df..e5e2e2215b4 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.26";
+  version = "2.2.27";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "1dj29cl2bsk8ir8hxw0ajhbpbrrmsh8mwqfc1ipiqgv7slyqx45g";
+    sha256 = "0iw19y6knijinqwvv4q16fgq5xq8nwxdg14wrrbc0mfasvg76n90";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
@@ -59,6 +59,6 @@ stdenv.mkDerivation rec {
     homepage    = http://httpd.apache.org/;
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons lovek323 ];
+    maintainers = with stdenv.lib.maintainers; [ eelco simons lovek323 ];
   };
 }

From c10a424bdd82beea337c62359bca151458cd35e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:56:45 +0200
Subject: [PATCH 0789/2033] ledger-2.6.3: rename the derivation to "ledger2" to
 allow installing this version instead of ledger 3.x (which doesn't support
 reading GNUCash files)

Discussed in <https://github.com/NixOS/nixpkgs/pull/2305>.
---
 pkgs/applications/office/ledger/2.6.3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix
index ca71ceeca66..69015dfb2d7 100644
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ b/pkgs/applications/office/ledger/2.6.3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, emacs, gmp, pcre, expat }:
 
 stdenv.mkDerivation rec {
-  name = "ledger-2.6.3";
+  name = "ledger2-2.6.3";
 
   src = fetchurl {
     url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz";

From b9921ab08abe3e425de80dadde66048a861efaa6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:58:30 +0200
Subject: [PATCH 0790/2033] ledger-3.0.nix: cosmetic fix of syntax highlighting
 in Emacs

---
 pkgs/applications/office/ledger/3.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix
index 44cf87b7929..21f77ea1ea4 100644
--- a/pkgs/applications/office/ledger/3.0.nix
+++ b/pkgs/applications/office/ledger/3.0.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   # broken in ledger...
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
-    cp -v $src/lisp/*.el $out/share/emacs/site-lisp/
+    cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/
   '';
 
   meta = {

From d4e1bd4aa65cc9c301f1903f2226151b236a6a8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 1 May 2014 12:56:01 +0200
Subject: [PATCH 0791/2033] libreoffice: fix build after mesa update

This is because it uses vanilla pkgconfig,
so it needs Reqires.private deps from mesa during configuration.
---
 pkgs/applications/office/libreoffice/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5918f0612ce..f4da232c747 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -257,6 +257,7 @@ stdenv.mkDerivation rec {
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libmspub libixion liborcus liblangtag
+      libxshmfence
     ];
 
   meta = with stdenv.lib; {

From a986bbf4ba569e4e88fe2cb34728d0b691495dd5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 13:48:01 +0200
Subject: [PATCH 0792/2033] postgresql: Update to latest versions

---
 pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.2.x.nix | 4 ++--
 pkgs/servers/sql/postgresql/9.3.x.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix
index 58d7159034a..5151299e3b9 100644
--- a/pkgs/servers/sql/postgresql/8.4.x.nix
+++ b/pkgs/servers/sql/postgresql/8.4.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, ncurses, readline }:
 
-let version = "8.4.20"; in
+let version = "8.4.21"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "e84e46083a6accd2bf37f0bd7253415649afcafc49f2564bc8481c10ed90d7c1";
+    sha256 = "388f67e59f2a16c27e84f50656f5d755adf3d0a883138366d091aa0c727c1e2c";
   };
 
   buildInputs = [ zlib ncurses readline ];
diff --git a/pkgs/servers/sql/postgresql/9.0.x.nix b/pkgs/servers/sql/postgresql/9.0.x.nix
index 033328cbcfe..00c614021b6 100644
--- a/pkgs/servers/sql/postgresql/9.0.x.nix
+++ b/pkgs/servers/sql/postgresql/9.0.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.0.16"; in
+let version = "9.0.17"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "900f6ab00fc36c94b17430e7cb22499708025da1e34d7a70aefaf9a875f0fabf";
+    sha256 = "d2f6d09cf941e7cbab6ee399f14080dbe822af58fda9fd132efb05c2b7d160ad";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix
index 7e876322808..8d714c6f5a6 100644
--- a/pkgs/servers/sql/postgresql/9.1.x.nix
+++ b/pkgs/servers/sql/postgresql/9.1.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.1.12"; in
+let version = "9.1.13"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "0b267ebab5feb39ad6ef945b9588787886e7f7e5284467921d18cc7b76bcb383";
+    sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.2.x.nix b/pkgs/servers/sql/postgresql/9.2.x.nix
index da0516a9618..8b0ce0f7bb2 100644
--- a/pkgs/servers/sql/postgresql/9.2.x.nix
+++ b/pkgs/servers/sql/postgresql/9.2.x.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, zlib, readline }:
 
-let version = "9.2.7"; in
+let version = "9.2.8"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "83c042c3f61c69b176d3e4344e59104f844bc8b8628dad2bb9022a64cf5afe86";
+    sha256 = "568ba482340219097475cce9ab744766889692ee7c9df886563e8292d66ed87c";
   };
 
   buildInputs = [ zlib readline ];
diff --git a/pkgs/servers/sql/postgresql/9.3.x.nix b/pkgs/servers/sql/postgresql/9.3.x.nix
index 672eeb8da6e..50ea799099c 100644
--- a/pkgs/servers/sql/postgresql/9.3.x.nix
+++ b/pkgs/servers/sql/postgresql/9.3.x.nix
@@ -2,14 +2,14 @@
 
 with stdenv.lib;
 
-let version = "9.3.3"; in
+let version = "9.3.4"; in
 
 stdenv.mkDerivation rec {
   name = "postgresql-${version}";
 
   src = fetchurl {
     url = "mirror://postgresql/source/v${version}/${name}.tar.bz2";
-    sha256 = "e925d8abe7157bd8bece6b7c0dd0c343d87a2b4336f85f4681ce596af99c3879";
+    sha256 = "9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621";
   };
 
   buildInputs = [ zlib readline ] ++ optionals (!stdenv.isDarwin) [ libossp_uuid ];

From c4f66df29a21beeaa64da62ac7f97aeab3eb95e2 Mon Sep 17 00:00:00 2001
From: Tom Dimiduk <tom@dimiduk.net>
Date: Thu, 1 May 2014 07:52:21 -0400
Subject: [PATCH 0793/2033] add zeromq4 and zeromq4-haskell

---
 .../haskell/zeromq4-haskell/default.nix       | 20 +++++++++++++++++++
 pkgs/development/libraries/zeromq/4.x.nix     | 18 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 pkgs/top-level/haskell-packages.nix           |  2 ++
 4 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
 create mode 100644 pkgs/development/libraries/zeromq/4.x.nix

diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
new file mode 100644
index 00000000000..e9a19c8fb97
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
@@ -0,0 +1,20 @@
+{ cabal, async, exceptions, QuickCheck, semigroups, tasty
+, tastyHunit, tastyQuickcheck, transformers, zeromq
+}:
+
+cabal.mkDerivation (self: {
+  pname = "zeromq4-haskell";
+  version = "0.5";
+  sha256 = "1gimkcaa1n9c85v44yl4n3ljh0xv23pwgbds5g1x8n47x8s0ak9g";
+  buildDepends = [ async exceptions semigroups transformers ];
+  testDepends = [
+    async QuickCheck tasty tastyHunit tastyQuickcheck
+  ];
+  pkgconfigDepends = [ zeromq ];
+  meta = {
+    homepage = "http://github.com/twittner/zeromq-haskell/";
+    description = "Bindings to ZeroMQ 4.x";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
new file mode 100644
index 00000000000..f06f0b5fbec
--- /dev/null
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
+  name = "zeromq-4.0.4";
+
+  src = fetchurl {
+    url = "http://download.zeromq.org/${name}.tar.gz";
+    sha256 = "1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399";
+  };
+
+  buildInputs = [ libuuid ];
+
+  meta = {
+    branch = "4";
+    homepage = "http://www.zeromq.org";
+    description = "The Intelligent Transport Layer";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55bdd52635c..69c1a6734bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6165,6 +6165,7 @@ let
 
   zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {};
   zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
+  zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
 
 
   ### DEVELOPMENT / LIBRARIES / JAVA
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be46cb9ca7f..847194b4d21 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2887,6 +2887,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   zeromq3Haskell = callPackage ../development/libraries/haskell/zeromq3-haskell { zeromq = pkgs.zeromq3; };
 
+  zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; };
+
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
   zipper = callPackage ../development/libraries/haskell/zipper {};

From cb45ecad3455e2d420b0117624187ce3ecd4810f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 14:16:58 +0200
Subject: [PATCH 0794/2033] systemd: Look for fsck.* in the right place

Fixes #2464.
---
 pkgs/os-specific/linux/systemd/default.nix |  2 +-
 pkgs/os-specific/linux/systemd/fixes.patch | 35 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 262fde74984..147bc2352af 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
       "--with-tty-gid=3" # tty in NixOS has gid 3
       "--disable-networkd" # enable/use eventually
       "--enable-compat-libs" # get rid of this eventually
+      "--disable-tests"
     ];
 
   preConfigure =
@@ -59,7 +60,6 @@ stdenv.mkDerivation rec {
           --replace /bin/umount ${utillinux}/bin/umount \
           --replace /sbin/swapon ${utillinux}/sbin/swapon \
           --replace /sbin/swapoff ${utillinux}/sbin/swapoff \
-          --replace /sbin/fsck ${utillinux}/sbin/fsck \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
           --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 2004204e442..562db98f5e8 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -94,6 +94,28 @@ index d1258f0..0311812 100644
  #ifndef HAVE_SPLIT_USR
                      || path_equal(m->path, "/usr")
  #endif
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
+index 18f2aca..2a2b1ea 100644
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
+@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
+ 
+         type = udev_device_get_property_value(udev_device, "ID_FS_TYPE");
+         if (type) {
+-                const char *checker = strappenda("/sbin/fsck.", type);
++                const char *checker = strappenda("/run/current-system/sw/sbin/fsck.", type);
+                 r = access(checker, X_OK);
+                 if (r < 0) {
+                         if (errno == ENOENT) {
+@@ -302,7 +302,7 @@ int main(int argc, char *argv[]) {
+                         return EXIT_FAILURE;
+                 }
+ 
+-        cmdline[i++] = "/sbin/fsck";
++        cmdline[i++] = "/run/current-system/sw/sbin/fsck";
+         cmdline[i++] = "-a";
+         cmdline[i++] = "-T";
+         cmdline[i++] = "-l";
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
 index 9a9ed9d..9e46e18 100644
 --- a/src/nspawn/nspawn.c
@@ -129,6 +151,19 @@ index d61ecdf..228a3a4 100644
                  if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
                          continue;
  
+diff --git a/src/shared/generator.c b/src/shared/generator.c
+index 6110303..e679cb1 100644
+--- a/src/shared/generator.c
++++ b/src/shared/generator.c
+@@ -48,7 +48,7 @@ int generator_write_fsck_deps(
+                 const char *checker;
+                 int r;
+ 
+-                checker = strappenda("/sbin/fsck.", fstype);
++                checker = strappenda("/run/current-system/sw/sbin/fsck.", fstype);
+                 r = access(checker, X_OK);
+                 if (r < 0) {
+                         log_warning("Checking was requested for %s, but %s cannot be used: %m", what, checker);
 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
 index 0887bc3..6b502ce 100644
 --- a/src/systemctl/systemctl.c

From d4ceed5f2aaa2a03782ec7449e7e57ccbe7eedd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 14:36:39 +0200
Subject: [PATCH 0795/2033] haskell-hspec: the limitation on QuickCheck 2.7 has
 been lifted recently

---
 pkgs/top-level/haskell-packages.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 847194b4d21..96ee08c539e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1495,19 +1495,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {};
 
-  hspec = callPackage ../development/libraries/haskell/hspec {
-    QuickCheck = self.QuickCheck_2_7_3;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; };
-  };
+  hspec = callPackage ../development/libraries/haskell/hspec {};
 
   hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {};
 
   hspecExpectationsLens = callPackage ../development/libraries/haskell/hspec-expectations-lens {};
 
-  hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {
-    QuickCheck = self.QuickCheck_2_7_3;
-    quickcheckIo = self.quickcheckIo.override { QuickCheck = self.QuickCheck_2_7_3; };
-  };
+  hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {};
 
   hstatsd = callPackage ../development/libraries/haskell/hstatsd {};
 

From e914f157288dea280431e80e99e3bf7892601187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 1 May 2014 14:50:01 +0200
Subject: [PATCH 0796/2033] haskell-cabal-bounds: avoid rebuild of Cabal

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3eec6e54b09..dc39671fc76 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3067,7 +3067,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
 
   cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
-    Cabal = self.Cabal_1_18_1_3;
+    Cabal = if pkgs.stdenv.lib.versionAtLeast "7.8" ghc.version
+              then null
+              else self.Cabal_1_18_1_3;
   };
 
   cabalDev = callPackage ../development/tools/haskell/cabal-dev {};

From 8310c6a4031f9a0ba66c6c677e672ee7ee4a65d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 1 May 2014 14:55:19 +0200
Subject: [PATCH 0797/2033] haskell-cabal-bounds: use versionOlder

for some reason, versionAtLeast doesn't work
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7e3151c9558..cfa3c8673c3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3065,7 +3065,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalDelete = callPackage ../development/tools/haskell/cabal-delete {};
 
   cabalBounds = callPackage ../development/tools/haskell/cabal-bounds {
-    Cabal = if pkgs.stdenv.lib.versionAtLeast "7.8" ghc.version
+    Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version
               then null
               else self.Cabal_1_18_1_3;
   };

From 3b616e378a81129ad69a56322506d6f45e6358b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 14:52:07 +0200
Subject: [PATCH 0798/2033] release.nix: Drop officialRelease flag

---
 nixos/release-combined.nix | 7 +++----
 nixos/release.nix          | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 4cc418f8888..090d8400f1c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
-, officialRelease ? false
+{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
 , supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
@@ -19,12 +18,12 @@ let
 in rec {
 
   nixos = removeMaintainers (import ./release.nix {
-    inherit officialRelease stableBranch;
+    inherit stableBranch;
     nixpkgs = nixpkgsSrc;
   });
 
   nixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
-    inherit officialRelease supportedSystems;
+    inherit supportedSystems;
     nixpkgs = nixpkgsSrc;
   })) [ "unstable" ];
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 4caabd97839..30f87aaa4f2 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,5 +1,4 @@
-{ nixpkgs ? { outPath = ./..; revCount = 5678; shortRev = "gfedcba"; }
-, officialRelease ? false
+{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
 , supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
@@ -8,8 +7,7 @@ let
 
   version = builtins.readFile ../.version;
   versionSuffix =
-    if officialRelease then ""
-    else (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
 
   forAllSystems = pkgs.lib.genAttrs supportedSystems;
 

From 0b091e1286c8a6f449b81f572573b08f1a3e06a5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 May 2014 15:04:37 +0200
Subject: [PATCH 0799/2033] Mark builds from git explicitly

---
 nixos/modules/installer/tools/get-version-suffix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix
index 461fbf4d3d8..b8972cd57d2 100644
--- a/nixos/modules/installer/tools/get-version-suffix
+++ b/nixos/modules/installer/tools/get-version-suffix
@@ -17,6 +17,6 @@ getVersion() {
 if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
     getVersion $nixpkgs
     if [ -n "$rev" ]; then
-        echo "pre-$rev"
+        echo ".git.$rev"
     fi
 fi

From eaedf303a001619f7c257a048b96cdcf2f54dda9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 1 May 2014 15:13:26 +0200
Subject: [PATCH 0800/2033] Add RHEL7 to vm functions.

---
 pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 02f6add4eb8..9deeaeedccf 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1117,6 +1117,18 @@ rec {
       packages = commonCentOSPackages;
     };
 
+    rhel7x86_64 = {
+      name = "rhel-7rc-x86_64";
+      fullName = "RHEL 7 rc (x86_64)";
+      packagesList = fetchurl {
+        url = http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os/repodata/81f41fc6206a8477235dc7b5099ffe0867f71802415d66d6c0a213a41cae27c3-primary.xml.gz;
+        sha256 = "1hr7mqfa84x2q3b6cpa108cgfrq8zsghkdf7blipg13a4331zx41";
+      };
+      urlPrefix = http://ftp.redhat.com/redhat/rhel/rc/7/Server/x86_64/os ;
+      archs = ["noarch" "x86_64"];
+      packages = commonRHELPackages;
+    };
+
   };
 
 
@@ -1606,6 +1618,28 @@ rec {
     "unzip"
   ];
 
+  commonRHELPackages = [
+    "autoconf"
+    "automake"
+    "basesystem"
+    "bzip2"
+    "curl"
+    "diffutils"
+    "findutils"
+    "gawk"
+    "gcc-c++"
+    "gzip"
+    "make"
+    "patch"
+    "perl"
+    "pkgconfig"
+    "procps-ng"
+    "rpm"
+    "rpm-build"
+    "tar"
+    "unzip"
+  ];
+
   /* Common packages for openSUSE images. */
   commonOpenSUSEPackages = [
     "aaa_base"

From 3b1a171c0588d38f4127c10811976787c785fd62 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sat, 26 Apr 2014 16:09:48 -0400
Subject: [PATCH 0801/2033] qtbitcointrader: initial expression

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

diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix
new file mode 100644
index 00000000000..38606d79873
--- /dev/null
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, qt4 }:
+
+let
+  version = "1.07.98";
+in
+stdenv.mkDerivation {
+  name = "qtbitcointrader-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bitcointrader/SRC/QtBitcoinTrader-${version}.tar.gz";
+    sha256 = "1irz17q71fx64dfkmgajlyva7d1wifv4bxgb2iwz7d69rvhzaqzx";
+  };
+
+  buildInputs = [ qt4 ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/src";
+
+  configurePhase = ''
+    qmake \
+      PREFIX=$out \
+      DESKTOPDIR=$out/share/applications \
+      ICONDIR=$out/share/pixmaps \
+        QtBitcoinTrader_Desktop.pro
+  '';
+
+  meta = {
+    description = "Secure bitcoin trading client";
+    homepage = http://qtopentrader.com;
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
+    maintainers = [ stdenv.lib.maintainers.emery ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69c1a6734bd..0a6ff055ff0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9638,6 +9638,8 @@ let
 
   qgis = callPackage ../applications/misc/qgis {};
 
+  qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
+
   ykpers = callPackage ../applications/misc/ykpers {};
 
   yoshimi = callPackage ../applications/audio/yoshimi {

From 4fe2f9805120800b83752f3d29a8d3db18677d0a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 09:14:05 -0500
Subject: [PATCH 0802/2033] zarith: fix perl path

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/ocaml-modules/zarith/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index a05ff43a3df..10ac88bcb90 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml findlib pkgconfig gmp perl ];
 
+  patchPhase = ''
+    substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl'
+  '';
   configurePhase = ''
     ./configure -installdir $out/lib/ocaml/${ocaml_version}/site-lib
   '';

From 9683c6e80611e142ca657e106d0eea97f119d488 Mon Sep 17 00:00:00 2001
From: robberer <robberer@freakmail.de>
Date: Thu, 1 May 2014 16:37:14 +0200
Subject: [PATCH 0803/2033] add nvidia-uvm module which is necessary for
 blender GPU support

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 51144bc1051..47fb7a4d90e 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -20,6 +20,9 @@ buildPhase() {
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
         make SYSSRC=$sysSrc SYSOUT=$sysOut module
+        cd uvm
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module
+        cd ..
         cd ..
     fi
 }
@@ -56,6 +59,7 @@ installPhase() {
         # Install the kernel module.
         mkdir -p $out/lib/modules/$kernelVersion/misc
         cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc
+        cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc
 
         # Install the X driver.
         mkdir -p $out/lib/xorg/modules

From e4630c1d41d513eb709bddb39043da84442235a7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 May 2014 10:56:55 -0400
Subject: [PATCH 0804/2033] grub: Allow setting the boot root explicitly

If /boot is a btrfs subvolume, it will be on a different device than /
but not be at the root from grub's perspective. This should be fixed in
a nicer way by #2449, but that can't go into 14.04.
---
 nixos/modules/system/boot/loader/grub/grub.nix        | 11 ++++++++++-
 nixos/modules/system/boot/loader/grub/install-grub.pl |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index a3b09223cbb..0cc060db8f9 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -25,7 +25,7 @@ let
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
-        default devices;
+        default devices explicitBootRoot;
       path = (makeSearchPath "bin" [
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils
       ]) + ":" + (makeSearchPath "sbin" [
@@ -209,6 +209,15 @@ in
         '';
       };
 
+      explicitBootRoot = mkOption {
+        default = "";
+        type = types.str;
+        description = ''
+          The relative path of /boot within the parent volume. Leave empty
+          if /boot is not a btrfs subvolume.
+        '';
+      };
+
     };
 
   };
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index a83733db63b..c3aa8518b8b 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -39,6 +39,7 @@ my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
 my $timeout = int(get("timeout"));
 my $defaultEntry = int(get("default"));
+my $explicitBootRoot = get("explicitBootRoot");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -61,6 +62,10 @@ if (stat("/")->dev != stat("/boot")->dev) {
     $copyKernels = 1;
 }
 
+if ($explicitBootRoot ne "") {
+    $bootRoot = $explicitBootRoot;
+}
+
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";

From ab2cd34076cceef0288a05b40afee1160c44d40b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 May 2014 11:30:20 -0400
Subject: [PATCH 0805/2033] Add enum option type

---
 lib/types.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/types.nix b/lib/types.nix
index baf8aa5e574..6ce54bfae4e 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -194,6 +194,12 @@ rec {
             args = { name = ""; }; }).options;
       };
 
+    enum = values: mkOptionType {
+      name = "one of ${concatStringsSep ", " values}.";
+      check = flip elem values;
+      merge = mergeOneOption;
+    };
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.

From da4adc2a4f9ef292b3923b2e60372027929ebb9e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 1 May 2014 11:46:44 -0400
Subject: [PATCH 0806/2033] Fix description to match convention

---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 6ce54bfae4e..f5700ab0269 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -195,7 +195,7 @@ rec {
       };
 
     enum = values: mkOptionType {
-      name = "one of ${concatStringsSep ", " values}.";
+      name = "one of ${concatStringsSep ", " values}";
       check = flip elem values;
       merge = mergeOneOption;
     };

From ea1a9445bbb18a01e2f7e801a5133452c7faec57 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 1 May 2014 18:32:28 +0200
Subject: [PATCH 0807/2033] Added gnome 3.10 to the release notes

---
 nixos/doc/manual/release-notes.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 81edcdd7bfc..836cb5c19f4 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -34,6 +34,8 @@ the following highlights:
 
   <listitem><para>KDE has been updated to 4.12.</para></listitem>
 
+  <listitem><para>GNOME 3.10 experimental support has been added.</para></listitem>
+
   <listitem><para>Nix has been updated to 1.7 (<link
   xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).</para></listitem>
 

From 1d2278f480d9235b19bcfeb6f948484ec2e4057b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 1 May 2014 18:36:48 +0200
Subject: [PATCH 0808/2033] pypy: disable sqlite3 tests (failing due to sqlite
 bump)

---
 pkgs/development/interpreters/pypy/2.2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix
index 2fee7bc74df..427e06eca13 100644
--- a/pkgs/development/interpreters/pypy/2.2/default.nix
+++ b/pkgs/development/interpreters/pypy/2.2/default.nix
@@ -59,7 +59,8 @@ let
        # disable socket because it has two actual network tests that fail
        # disable test_mhlib because it fails for unknown reason
        # disable test_multiprocessing due to transient errors
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python
+       # disable sqlite3 due to https://bugs.pypy.org/issue1740
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_shutil -test_mhlib -test_multiprocessing' lib-python
     '';
 
     installPhase = ''

From 39c3cb1d99b4a880fe27625e02c87caac634f6cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:28 +0200
Subject: [PATCH 0809/2033] haskell-groom: add version 0.1.2

---
 .../development/libraries/haskell/groom/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/groom/default.nix

diff --git a/pkgs/development/libraries/haskell/groom/default.nix b/pkgs/development/libraries/haskell/groom/default.nix
new file mode 100644
index 00000000000..d3772b022d7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/groom/default.nix
@@ -0,0 +1,13 @@
+{ cabal, haskellSrcExts }:
+
+cabal.mkDerivation (self: {
+  pname = "groom";
+  version = "0.1.2";
+  sha256 = "045hzpnf17rp1ib6q3gcznl9b7ivz5zmv0gh7qfg726kr8i030hf";
+  buildDepends = [ haskellSrcExts ];
+  meta = {
+    description = "Pretty printing for well-behaved Show instances";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cfa3c8673c3..1bac65a3c94 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1293,6 +1293,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   graphWrapper = callPackage ../development/libraries/haskell/graph-wrapper {};
 
+  groom = callPackage ../development/libraries/haskell/groom {};
+
   groups = callPackage ../development/libraries/haskell/groups {};
 
   groupoids = callPackage ../development/libraries/haskell/groupoids {};

From e81ac36bff8576c32821f4e57989580af81ae458 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:40 +0200
Subject: [PATCH 0810/2033] haskell-spoon: add version 0.3.1

---
 .../development/libraries/haskell/spoon/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/spoon/default.nix

diff --git a/pkgs/development/libraries/haskell/spoon/default.nix b/pkgs/development/libraries/haskell/spoon/default.nix
new file mode 100644
index 00000000000..bc631e69d52
--- /dev/null
+++ b/pkgs/development/libraries/haskell/spoon/default.nix
@@ -0,0 +1,13 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "spoon";
+  version = "0.3.1";
+  sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr";
+  buildDepends = [ deepseq ];
+  meta = {
+    description = "Catch errors thrown from pure computations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1bac65a3c94..fdbbcfed076 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2321,6 +2321,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   sparse = callPackage ../development/libraries/haskell/sparse {};
 
+  spoon = callPackage ../development/libraries/haskell/spoon {};
+
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
 
   stateref = callPackage ../development/libraries/haskell/stateref {};

From 4700996bc789b2e799022537896a19d131fb71b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:44 +0200
Subject: [PATCH 0811/2033] haskell-sloane: update to version 1.7.1

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

diff --git a/pkgs/applications/science/math/sloane/default.nix b/pkgs/applications/science/math/sloane/default.nix
index 2f56534a4d3..2e7768e2d95 100644
--- a/pkgs/applications/science/math/sloane/default.nix
+++ b/pkgs/applications/science/math/sloane/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sloane";
-  version = "1.7";
-  sha256 = "1xy22cdswb5blvdsz8l7irfj6msl85v7gpl9ymcx985gj4z0l2ik";
+  version = "1.7.1";
+  sha256 = "0d6k33rhp1ixrwdfwy31m39kbk8z81biwzwmkp01fvpgwm96p3va";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 7452e8b4eb679ea34cd9c091611835be4d1f1402 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:46 +0200
Subject: [PATCH 0812/2033] haskell-Elm: update to version 0.12.1.3

---
 pkgs/development/compilers/elm/elm.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index bc9f73b2849..9fe18cdaf30 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.12";
-  sha256 = "1gmhnpcfv49bdifvz70fif71947q482pd1dbs5c84m8sn7c5n3ss";
+  version = "0.12.1.3";
+  sha256 = "1p4py4qyxsp25qa8141ywfh0qnvdid4v7xlbqkk8aafxccb7lsm9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -17,16 +17,13 @@ cabal.mkDerivation (self: {
     unionFind unorderedContainers
   ];
   testDepends = [
-    aeson binary blazeHtml blazeMarkup cmdargs filemanip filepath HUnit
-    indents languageEcmascript mtl pandoc parsec QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 text
-    transformers unionFind unorderedContainers
+    aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
+    filepath HUnit indents languageEcmascript mtl pandoc parsec
+    QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text transformers unionFind
+    unorderedContainers
   ];
   doCheck = false;
-  preConfigure = ''
-    rm -f Setup.hs
-    echo -e "import Distribution.Simple\nmain=defaultMain\n" > Setup.hs
-  '';
   meta = {
     homepage = "http://elm-lang.org";
     description = "The Elm language module";

From 87f8a70f9cbd0e88d6d71ed7cd52970e776a42fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:47 +0200
Subject: [PATCH 0813/2033] haskell-blaze-html: update to version 0.7.0.2

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

diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 81b00235673..d061ecf5486 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.7.0.1";
-  sha256 = "05z0a6x49f56bazkcdxpdi2a7pyzsiv7qc72grcz9sqjz1d6yagh";
+  version = "0.7.0.2";
+  sha256 = "0yqgm5nrryx0qlz9qhpbfxvkwjdbl9876v4gnn0src81j9dzcx2v";
   buildDepends = [ blazeBuilder blazeMarkup text ];
   testDepends = [
     blazeBuilder blazeMarkup HUnit QuickCheck testFramework

From 42e324c5371caa552f7902a98bc6f2017c5d9d1f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:48 +0200
Subject: [PATCH 0814/2033] haskell-cassava: update to version 0.4.0.0

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

diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix
index 5127ca1c8e8..604cd9b3ed6 100644
--- a/pkgs/development/libraries/haskell/cassava/default.nix
+++ b/pkgs/development/libraries/haskell/cassava/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cassava";
-  version = "0.3.0.1";
-  sha256 = "1lsbdhdz6hy6lfnhhp36mbjd9m0w8iv50sd9mj0dj9b4izgdav16";
+  version = "0.4.0.0";
+  sha256 = "0w3npv3403n9rl9nmn8ngp04js28bvsb5c4js17sy1gqgsakqdrl";
   buildDepends = [
     attoparsec blazeBuilder deepseq text unorderedContainers vector
   ];

From 14edbe559779e043aa6f7b20ae35b236148054d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:49 +0200
Subject: [PATCH 0815/2033] haskell-fay-base: update to version 0.19.1.2

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

diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix
index fae2c8ee93f..417a0516bd8 100644
--- a/pkgs/development/libraries/haskell/fay-base/default.nix
+++ b/pkgs/development/libraries/haskell/fay-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-base";
-  version = "0.19.1.1";
-  sha256 = "1qn48aj7j33gvb6vmz986cqi41zvh62sbmmvwgyhpmrhsfkm5wkz";
+  version = "0.19.1.2";
+  sha256 = "0y2gpyh0gama6mz0rfvqdgpf7wfwx7r8k0cdfh60kjcxr029dx5i";
   buildDepends = [ fay ];
   meta = {
     homepage = "https://github.com/faylang/fay-base";

From 45af6556f69eefc11de545e8eb829cd97ba1c27b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:50 +0200
Subject: [PATCH 0816/2033] haskell-fay: update to version 0.20.0.0

---
 .../libraries/haskell/fay/default.nix         | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index 5ad9931709a..4a9bfe93e68 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -1,23 +1,21 @@
-{ cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath
-, ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit
-, languageEcmascript, mtl, optparseApplicative, prettyShow, safe
-, scientific, sourcemap, split, syb, testFramework
-, testFrameworkHunit, testFrameworkTh, text, time, uniplate
+{ cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom
+, haskellNames, haskellPackages, haskellSrcExts, languageEcmascript
+, mtl, optparseApplicative, safe, sourcemap, split, spoon, syb
+, tasty, tastyHunit, tastyTh, text, transformers, uniplate
 , unorderedContainers, utf8String, vector
 }:
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.19.2.1";
-  sha256 = "05d0vmcwhssrr50zhbxbn3yg7h1rcjiqc4dpy3dd8kxlw6aizwq3";
+  version = "0.20.0.0";
+  sha256 = "04rjmn280f87xlzv4h9as3cxnwaapfvpvq7zaig2rrw0l342pxy0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths
-    haskellNames haskellPackages haskellSrcExts HUnit
-    languageEcmascript mtl optparseApplicative prettyShow safe
-    scientific sourcemap split syb testFramework testFrameworkHunit
-    testFrameworkTh text time uniplate unorderedContainers utf8String
+    aeson attoparsec dataDefault filepath ghcPaths groom haskellNames
+    haskellPackages haskellSrcExts languageEcmascript mtl
+    optparseApplicative safe sourcemap split spoon syb tasty tastyHunit
+    tastyTh text transformers uniplate unorderedContainers utf8String
     vector
   ];
   meta = {

From 84c41f46f74da7e59e031138b72f8a9f154c2e9a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:51 +0200
Subject: [PATCH 0817/2033] haskell-ghc-mod: update to version 4.1.0

---
 .../libraries/haskell/ghc-mod/default.nix        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 185f70785e5..f087511eb8c 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,20 +1,20 @@
-{ cabal, Cabal, convertible, doctest, emacs, filepath, ghcSybUtils
-, hlint, hspec, ioChoice, syb, time, transformers
+{ cabal, Cabal, convertible, deepseq, doctest, emacs, filepath
+, ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.0.2";
-  sha256 = "10ndlydx0ymz8fbcgjjnzyak7lly34012bsghwj0i0dc5ja1pic8";
+  version = "4.1.0";
+  sha256 = "18vzcpafdxai9k8lxaiw9g9mf964ipjwil6kvw50gj1lfgvjlfqm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal convertible filepath ghcSybUtils hlint ioChoice syb time
-    transformers
+    Cabal convertible deepseq filepath ghcSybUtils hlint ioChoice syb
+    time transformers
   ];
   testDepends = [
-    Cabal convertible doctest filepath ghcSybUtils hlint hspec ioChoice
-    syb time transformers
+    Cabal convertible deepseq doctest filepath ghcSybUtils hlint hspec
+    ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
   postInstall = ''

From a1952b5e13fea9de119aace8e6b2bde47673c456 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:52 +0200
Subject: [PATCH 0818/2033] haskell-hledger-web: update to version 0.22.8

---
 .../libraries/haskell/hledger-web/default.nix       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 22a02247474..8851b54e4ef 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -1,22 +1,23 @@
 { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs
 , conduitExtra, dataDefault, filepath, hamlet, hjsmin, hledger
 , hledgerLib, hspec, httpClient, httpConduit, HUnit, json
-, networkConduit, parsec, regexpr, safe, shakespeareText, text
-, time, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml
-, yesod, yesodCore, yesodStatic, yesodTest
+, networkConduit, parsec, regexpr, safe, shakespeare
+, shakespeareText, text, time, transformers, wai, waiExtra
+, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic
+, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.22.7";
-  sha256 = "0dxlprmymspjwxdr9sig483y8azd7z42sv6k6r35m74z7naga68y";
+  version = "0.22.8";
+  sha256 = "0588r4hgy7800jla5jma96a7pmm64b116w6ffid9v5j52qjxyhf3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     blazeHtml blazeMarkup clientsession cmdargs conduitExtra
     dataDefault filepath hamlet hjsmin hledger hledgerLib httpClient
     httpConduit HUnit json networkConduit parsec regexpr safe
-    shakespeareText text time transformers wai waiExtra
+    shakespeare shakespeareText text time transformers wai waiExtra
     waiHandlerLaunch warp yaml yesod yesodCore yesodStatic
   ];
   testDepends = [ hspec yesod yesodTest ];

From 3b6b967b9de08219f2dbf548493a5ffff2ed9d21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:53 +0200
Subject: [PATCH 0819/2033] haskell-hspec-meta: update to version 1.9.4

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

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index f2104437bce..ce450c7f55c 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.9.3";
-  sha256 = "11x2yh4nqcg77pyszygfla0i20l3f1cxvix4va6rqzcbksc51lvd";
+  version = "1.9.4";
+  sha256 = "0x2r8aqwpjdcykhd9hwxnz9a42x9rbkhjygz9af4wvlmifv1kwfm";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 62a775df6130e6b0a0c8b087415120bf646f4d1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:54 +0200
Subject: [PATCH 0820/2033] haskell-hspec: update to version 1.9.4

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

diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index 71dc1fc1c81..deb9d3562f3 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.9.3";
-  sha256 = "0i5dlcp3f8w6fsizywp5y6isll82g68l3p3vxv6z4zzy87xwbr7d";
+  version = "1.9.4";
+  sha256 = "1dvh1hy0jh55z3br5c5cz56bni5czvqcplarjcyanbvqsd05xyll";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 705888c629bf60ff19ee72ee81dfb738906ca173 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:55 +0200
Subject: [PATCH 0821/2033] haskell-http-client: update to version 0.3.2.1

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index d266d34e690..2a6ec370b90 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.2";
-  sha256 = "1afis0j3yvrgisxj8ajz6ha6yw7xgwgcnh9mdy3p3blr3nbdxv8c";
+  version = "0.3.2.1";
+  sha256 = "1ww88nwgpmjmqmni4lfzlv7z9y2772kd2d3m635mh412ygigsszs";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From 8fc6f1a080cae7f4fa3b316a2a6892d9d987d2bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:56 +0200
Subject: [PATCH 0822/2033] haskell-language-javascript: update to version
 0.5.13

---
 .../libraries/haskell/language-javascript/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix
index 647c3be498d..8b83b64f9c9 100644
--- a/pkgs/development/libraries/haskell/language-javascript/default.nix
+++ b/pkgs/development/libraries/haskell/language-javascript/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-javascript";
-  version = "0.5.12";
-  sha256 = "1zzgjxqgfl6k2z4cwh0961ipfc5fminfdg2162g45h2nrv63mq05";
+  version = "0.5.13";
+  sha256 = "0h46wfh5xi3gbiaplx3ikmj7mfcwm1d37i5c9n3qfsmmkac29n2w";
   buildDepends = [ blazeBuilder mtl utf8String ];
   testDepends = [
     blazeBuilder Cabal HUnit mtl QuickCheck testFramework

From 9921686058d1126449c84c51aa841b2434e50d12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:57 +0200
Subject: [PATCH 0823/2033] haskell-largeword: update to version 1.2.2

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

diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index 18ea22d6cd0..aeb24ca278d 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "largeword";
-  version = "1.1.1";
-  sha256 = "0dizzyicfj41cmdr9s0k75gf7cqbd2z1qk9kkvlq6rcz0249fz0x";
+  version = "1.2.2";
+  sha256 = "04l55q2q8k7q8cz5gwmb9sc211pgqazjwvgs0np1xi9z9d7ylcjg";
   buildDepends = [ binary ];
   testDepends = [
     binary HUnit QuickCheck testFramework testFrameworkHunit

From c4eb80e485a76ba050ff3a71ab501dcbe1fc3e52 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:58 +0200
Subject: [PATCH 0824/2033] haskell-lifted-async: update to version 0.2.0

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

diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix
index 41478f2a1a2..f65c35fb2ae 100644
--- a/pkgs/development/libraries/haskell/lifted-async/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-async/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lifted-async";
-  version = "0.1.2";
-  sha256 = "05ra09phkswxydr03f9xscrkxnv0yvp69376dl6lln7p5j45lmc3";
+  version = "0.2.0";
+  sha256 = "1s8gz630v9xag0d5pjjwvfff87wvyy1w86ah7mvnylkarbdsac6l";
   buildDepends = [ async liftedBase monadControl transformersBase ];
   testDepends = [
     async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh

From e942079d4654b78e4c5b0d702590db218dc395e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:19:59 +0200
Subject: [PATCH 0825/2033] haskell-mono-traversable: update to version 0.5.0

---
 .../libraries/haskell/mono-traversable/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index 113a4b67b41..43dd75154ed 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.4.0.4";
-  sha256 = "1ikrdhr4f3755xim6j9db60a9y0mpdnljmck84qh47yk2axfp0n9";
+  version = "0.5.0";
+  sha256 = "1dbsysg7r32ni15rvm21g41ivcgggns8nx9r797bbkid9n8fs1ja";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms

From f1ce1480df7802131e54a474e8f6eb8dce5772d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:00 +0200
Subject: [PATCH 0826/2033] haskell-nanospec: update to version 0.2.0

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

diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix
index b7f498a35c8..367d24f3226 100644
--- a/pkgs/development/libraries/haskell/nanospec/default.nix
+++ b/pkgs/development/libraries/haskell/nanospec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "nanospec";
-  version = "0.1.0";
-  sha256 = "16qpn199p8nrllg800zryhb8795jgk78znng5fjq1raj8l3snjk0";
+  version = "0.2.0";
+  sha256 = "0g10l86cv33r58zxn2bprqlm80i7g86bwzhn9jqg9s81xc0aw2qv";
   testDepends = [ hspec silently ];
   doCheck = false;
   meta = {

From 07b80292a0e62492f842d48dc9db99fe88fbac50 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:01 +0200
Subject: [PATCH 0827/2033] haskell-pandoc-types: update to version 1.12.3.3

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

diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix
index ee41d76a417..28b4acbfe1d 100644
--- a/pkgs/development/libraries/haskell/pandoc-types/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-types";
-  version = "1.12.3.2";
-  sha256 = "1jgab8ccyyr8ygm6y0wbr3vvwdg5gkp1b6014dk8ryqb2dmkmikc";
+  version = "1.12.3.3";
+  sha256 = "1rw641w8xdisnbni5glxqxgfjps6p8vpnvprd4zgsjqn71397pdk";
   buildDepends = [ aeson syb ];
   meta = {
     homepage = "http://johnmacfarlane.net/pandoc";

From eead385738728c6590d214924599fc09367758e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:02 +0200
Subject: [PATCH 0828/2033] haskell-snap-cors: update to version 1.2.4

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

diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix
index 2af0a45a63e..338e2c4693f 100644
--- a/pkgs/development/libraries/haskell/snap-cors/default.nix
+++ b/pkgs/development/libraries/haskell/snap-cors/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-cors";
-  version = "1.2.3";
-  sha256 = "0frm1jghm5n1pivcdx45cf7nymny25ijfslg52cm75m55d4l2lvv";
+  version = "1.2.4";
+  sha256 = "0mg5sjvrcs60s8k28vgi49vbgfpswkcd7i7yyfi1n1649vqb69mb";
   buildDepends = [
     attoparsec caseInsensitive hashable network snap text transformers
     unorderedContainers

From 373defe9cd9c567f915da0dd6e5328d26f9e0409 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:04 +0200
Subject: [PATCH 0829/2033] haskell-sqlite-simple: update to version 0.4.7.0

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

diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
index b8dadb93b7f..d8a76210d08 100644
--- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix
+++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "sqlite-simple";
-  version = "0.4.6.1";
-  sha256 = "0xmrqdwnkbfr4l610qs2fs2l00dyc00v9cphiwqfrqprljg6qb4y";
+  version = "0.4.7.0";
+  sha256 = "128b8n66j729g9mwndv5m3plww6av7hin7dmwsbs19v8klcaf4f5";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual directSqlite text time
     transformers

From cf871089b55c1bb7579946c75c0965b0a70d54de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:05 +0200
Subject: [PATCH 0830/2033] haskell-warp: update to version 2.1.5.1

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 53291b70aa8..6a41f6e5bdf 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.5";
-  sha256 = "1lny4lzc58g9zydn46dvrq4rpqyr2rfsjr4vwxhdmn8rql7jasyc";
+  version = "2.1.5.1";
+  sha256 = "1dx911y3nr2ixsn3zdp1rd97rydnvixr9chs3nmmkswzdg3qihvl";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra hashable httpDate httpTypes liftedBase network

From b5113c90a495d14954b2d5c3b29a9497dc20be8c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 12:20:06 +0200
Subject: [PATCH 0831/2033] haskell-yesod-form: update to version 1.3.8.3

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index 42e1f13242e..a38751f9340 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.8.2";
-  sha256 = "0sx2rk4z4hzwz3nzcg487wm5bdpdm612ikp0slfph1wkzc39h12a";
+  version = "1.3.8.3";
+  sha256 = "0fw2hza78z3cv2d9laawi60vjd9msk7a6im3wsq3vbbfh6rh5br9";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet

From 74a9767c5e9cad13bbdd16d778e237cffdf818f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 22:17:45 +0200
Subject: [PATCH 0832/2033] haskell-libmpd: jailbreak to fix build with recent
 versions of 'text'

---
 pkgs/development/libraries/haskell/libmpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index 7402d6f31db..bc2f494852d 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     dataDefault hspec HUnit mtl network QuickCheck text time utf8String
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/joachifm/libmpd-haskell";
     description = "An MPD client library";

From a77e38045491a9a49dc3e6483a97cd8f06b8d90f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 22:18:14 +0200
Subject: [PATCH 0833/2033] xmonad-contrib: patch to fix build with GHC 7.8.2

---
 pkgs/applications/window-managers/xmonad/xmonad-contrib.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 5c00ddf0fd1..8eedafb94c7 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -9,6 +9,9 @@ cabal.mkDerivation (self: {
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
+  patchPhase = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.8" self.ghc.version) ''
+    sed -i -e 's|ForeignFunctionInterface|AllowAmbiguousTypes, ForeignFunctionInterface|' xmonad-contrib.cabal
+  '';
   meta = {
     homepage = "http://xmonad.org/";
     description = "Third party extensions for xmonad";

From d6dd5688a25b913095117f4113168c145d43a890 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 22:56:44 +0200
Subject: [PATCH 0834/2033] haskell-ghc-mod: disable test suite to fix build
 with GHC 7.8.2

https://github.com/kazu-yamamoto/ghc-mod/issues/242
---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index f087511eb8c..a4c576999bd 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -33,6 +33,7 @@ cabal.mkDerivation (self: {
     EOF
     chmod +x $out/bin/ghc-mod
   '';
+  doCheck = false;
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell Programming";

From 8b67834bf32cebaaa9f98e2312a395f4cac03475 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 22:57:09 +0200
Subject: [PATCH 0835/2033] haskell-ghc-mod: make sure GHC <7.8 and >7.8 pick
 the same datadir install path

---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index a4c576999bd..1f96f9365b5 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
+  configureFlags = "--datasubdir=${self.pname}-${self.version}";
   postInstall = ''
     cd $out/share/$pname-$version
     make

From 5849a91e8dfba9fa1d4bd10b75aa65e2ce2296da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:14:55 +0200
Subject: [PATCH 0836/2033] pkgs/build-support/cabal: revert "the release
 version of GHC 7.8.x no longer requires"

This reverts commit a2a398fbda842594ab17d0b98f68dba4c51e49e8. The
issue *does* still exist in GHC 7.8.2. Compiled binaries have no -rpath
into their own install directory ("$out") and thus cannot find their own
shared libraries. To work around this issue, we pass an explicit -rpath
argument at configure time. We do that only on Linux, though, because
-rpath is known to cause trouble on Darwin, which was the reason I
originally reverted that patch.
---
 pkgs/build-support/cabal/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index ed7ca30db13..45bd5567fc4 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -195,6 +195,10 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
                 done
               done
 
+              ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
+                configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
+              ''}
+
               echo "configure flags: $extraConfigureFlags $configureFlags"
               ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
                 --libsubdir='$pkgid' $extraConfigureFlags $configureFlags 2>&1 \

From 78c33177ce93cf0ce4142b1e19e7583ebd96e7b9 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 27 Apr 2014 17:01:06 -0500
Subject: [PATCH 0837/2033] ssh: Support knownHost public keys as strings

---
 .../modules/services/networking/ssh/sshd.nix  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 554cc6a1c3f..4a60e59b20b 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -18,9 +18,9 @@ let
   knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
 
   knownHostsFile = pkgs.writeText "ssh_known_hosts" (
-    flip concatMapStrings knownHosts (h:
-      "${concatStringsSep "," h.hostNames} ${readFile h.publicKeyFile}"
-    )
+    flip concatMapStrings knownHosts (h: ''
+      ${concatStringsSep "," h.hostNames} ${if h.publicKey != null then h.publicKey else readFile h.publicKeyFile}
+    '')
   );
 
   userOptions = {
@@ -218,7 +218,18 @@ in
               the host's ssh service.
             '';
           };
+          publicKey = mkOption {
+            default = null;
+            type = types.nullOr types.string;
+            description = ''
+              The public key data for the host. You can fetch a public key
+              from a running SSH server with the <command>ssh-keyscan</command>
+              command.
+            '';
+          };
           publicKeyFile = mkOption {
+            default = null;
+            type = types.nullOr types.unspecified;
             description = ''
               The path to the public key file for the host. The public
               key file is read at build time and saved in the Nix store.
@@ -367,7 +378,12 @@ in
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
-                    message = "cannot enable X11 forwarding without setting xauth location";}];
+                    message = "cannot enable X11 forwarding without setting xauth location";}]
+      ++ flip mapAttrsToList cfg.knownHosts (name: data: {
+        assertion = (data.publicKey == null && data.publicKeyFile != null) ||
+                    (data.publicKey != null && data.publicKeyFile == null);
+        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+      });
 
   };
 

From 1396f624f46b406e82fcea825962af3f50c747c1 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 1 May 2014 16:27:16 -0500
Subject: [PATCH 0838/2033] sshd: Fix typing for options which take paths

---
 nixos/modules/services/networking/ssh/sshd.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 4a60e59b20b..e4b29a0b909 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -39,7 +39,7 @@ let
       };
 
       keyFiles = mkOption {
-        type = types.listOf types.unspecified;
+        type = types.listOf types.path;
         default = [];
         description = ''
           A list of files each containing one OpenSSH public key that should be
@@ -182,7 +182,7 @@ in
       };
 
       authorizedKeysFiles = mkOption {
-        type = types.listOf types.unspecified;
+        type = types.listOf types.str;
         default = [];
         description = "Files from with authorized keys are read.";
       };
@@ -220,7 +220,7 @@ in
           };
           publicKey = mkOption {
             default = null;
-            type = types.nullOr types.string;
+            type = types.nullOr types.str;
             description = ''
               The public key data for the host. You can fetch a public key
               from a running SSH server with the <command>ssh-keyscan</command>
@@ -229,7 +229,7 @@ in
           };
           publicKeyFile = mkOption {
             default = null;
-            type = types.nullOr types.unspecified;
+            type = types.nullOr types.path;
             description = ''
               The path to the public key file for the host. The public
               key file is read at build time and saved in the Nix store.

From baa1543dbc718558b7788c3d96bfb15bb48263a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:38:20 +0200
Subject: [PATCH 0839/2033] cabal-bounds: re-generate with cabal2nix

---
 pkgs/development/tools/haskell/cabal-bounds/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index 4cd6adf5ab9..aabc9b010f5 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -12,9 +12,8 @@ cabal.mkDerivation (self: {
     Cabal cmdargs either lens strict transformers unorderedContainers
   ];
   testDepends = [ filepath tasty tastyGolden ];
-  doCheck = false;
   jailbreak = true;
-
+  doCheck = false;
   meta = {
     description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
     license = self.stdenv.lib.licenses.bsd3;

From 303ddfab4c7d2bd0180a413413289548fe1c5c24 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:40:13 +0200
Subject: [PATCH 0840/2033] haskell-ghc-mod: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 1f96f9365b5..feaf0c9be6e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     ioChoice syb time transformers
   ];
   buildTools = [ emacs ];
+  doCheck = false;
   configureFlags = "--datasubdir=${self.pname}-${self.version}";
   postInstall = ''
     cd $out/share/$pname-$version
@@ -34,7 +35,6 @@ cabal.mkDerivation (self: {
     EOF
     chmod +x $out/bin/ghc-mod
   '';
-  doCheck = false;
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
     description = "Happy Haskell Programming";

From 8946e91fad9b49078d161fe3c4a1084f437784d8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 17:00:49 -0500
Subject: [PATCH 0841/2033] btsync: remove unneeded assertion

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/btsync.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 8b288a713c6..898aed82591 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -237,12 +237,6 @@ in
         { assertion = cfg.apiKey != "" -> cfg.enableWebUI;
           message   = "If you're using an API key, you must enable the web server.";
         }
-        # TODO FIXME: the README says not specifying the login/pass means it
-        # should disable authentication, but apparently it doesn't?
-        { assertion = cfg.enableWebUI -> cfg.httpLogin != "" && cfg.httpPass != "";
-          message   = "If using the web UI, you must configure a login/password.";
-        }
-        # TODO FIXME: assert the existence of sharedFolder directories?
       ];
 
     users.extraUsers.btsync = {

From 145dcdc539764b293bcd2915a114cd9d22e7acaf Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 19:08:36 -0500
Subject: [PATCH 0842/2033] Add licenses for CompCert/Z3

Both of these allow for binary redistribution.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 lib/licenses.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index c2a02bd1b9a..68f91f80685 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -266,4 +266,16 @@
     fullName  = "CEA CNRS INRIA Logiciel Libre";
     url       = "http://www.cecill.info/licences.en.html";
   };
+
+  msrla = {
+    shortName = "MSR-LA";
+    fullName  = "Microsoft Research License Agreement";
+    url       = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt";
+  };
+
+  inria = {
+    shortName = "INRIA-NCLA";
+    fullName  = "INRIA Non-Commercial License Agreement";
+    url       = "http://compcert.inria.fr/doc/LICENSE";
+  };
 }

From 7d58646b08912222fe72b188f9dc317c554bacee Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 19:09:24 -0500
Subject: [PATCH 0843/2033] z3/verifast: update license

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/verifast/default.nix | 2 +-
 pkgs/applications/science/logic/z3/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 71c5faf4bc8..a2959892ddb 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Verification for C and Java programs via separation logic";
     homepage    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = stdenv.lib.licenses.msrla;
     platforms   = [ "i686-linux" ];
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index eeef03eb161..7a87cb5e8be 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Z3 is a high-performance theorem prover and SMT solver";
     homepage    = "http://z3.codeplex.com";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = stdenv.lib.licenses.msrla;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };

From 0c51a4ac98ecb43bc729588d0eb3df21481a4e05 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 19:09:37 -0500
Subject: [PATCH 0844/2033] nixpkgs: add CompCert

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../compilers/compcert/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/compcert/default.nix

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
new file mode 100644
index 00000000000..c181e34217a
--- /dev/null
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, coq, ocaml, gcc }:
+
+stdenv.mkDerivation rec {
+  name    = "compcert-${version}";
+  version = "2.2";
+
+  src = fetchurl {
+    url    = "http://compcert.inria.fr/release/${name}.tgz";
+    sha256 = "0zhqx9mixlsycckl6wq6yrd795byj1jz7m4njcgfv29cx33j1nrk";
+  };
+
+  buildInputs = [ coq ocaml ];
+
+  enableParallelBuilding = true;
+  configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux";
+
+  meta = {
+    description = "Formally verified C compiler";
+    homepage    = "http://compcert.inria.fr";
+    license     = stdenv.lib.licenses.inria;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a6ff055ff0..e416cd41682 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2470,6 +2470,8 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
+  compcert = callPackage_i686 ../development/compilers/compcert {};
+
   cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});
   cryptol2 = haskellPackages.cryptol;
 

From f21d61955897fa055cc6ac38fa73134808eb87e7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 1 May 2014 19:14:08 -0500
Subject: [PATCH 0845/2033] nixpkgs: move frama-c to a more appropriate
 directory

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../frama-c/0004-Port-to-OCamlgraph-1.8.5.patch                 | 0
 pkgs/development/tools/{misc => analysis}/frama-c/default.nix   | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/tools/{misc => analysis}/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch (100%)
 rename pkgs/development/tools/{misc => analysis}/frama-c/default.nix (100%)

diff --git a/pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch b/pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
similarity index 100%
rename from pkgs/development/tools/misc/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
rename to pkgs/development/tools/analysis/frama-c/0004-Port-to-OCamlgraph-1.8.5.patch
diff --git a/pkgs/development/tools/misc/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
similarity index 100%
rename from pkgs/development/tools/misc/frama-c/default.nix
rename to pkgs/development/tools/analysis/frama-c/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e416cd41682..03c98daf737 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3729,7 +3729,7 @@ let
 
   coccinelle = callPackage ../development/tools/misc/coccinelle { };
 
-  framac = callPackage ../development/tools/misc/frama-c { };
+  framac = callPackage ../development/tools/analysis/frama-c { };
 
   cppi = callPackage ../development/tools/misc/cppi { };
 

From b553d116161dd9fa461d2b70328504095666c496 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 00:41:47 -0500
Subject: [PATCH 0846/2033] btsync: Default to no login/password for the Web UI

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/btsync.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 898aed82591..5d0e17c293e 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -164,6 +164,7 @@ in
       httpLogin = mkOption {
         type = types.str;
         example = "allyourbase";
+        default = "";
         description = ''
           HTTP web login username.
         '';
@@ -172,6 +173,7 @@ in
       httpPass = mkOption {
         type = types.str;
         example = "arebelongtous";
+        default = "";
         description = ''
           HTTP web login password.
         '';

From e67cc9ba075f2873d7fb79852c668ed4446cf3f9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 00:42:40 -0500
Subject: [PATCH 0847/2033] nginx: build http_stub_status module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/http/nginx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 757d4cb9566..dbe823bed81 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation rec {
     "--with-http_dav_module"
     "--with-http_gzip_static_module"
     "--with-http_secure_link_module"
+    "--with-http_stub_status_module"
     "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"

From 368a677c97f038f819c30d9ef0eb548b91ca1554 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 00:43:27 -0500
Subject: [PATCH 0848/2033] nixos: overhaul datadog module

This overhauls the Datadog module a bit to be much more useful. In
particular, it adds support for nginx and postgresql monitoring
integrations to dd-agent. These have to exist in separate files under
/etc/dd-agent, so the module just exposes then as separate options. In
the future, more integrations could be added this way.

In the process of doing this, I also had to rename the dd-agent user to
datadog. Note the UIDs did not change, so this is strictly backwards
compatible. The reason for this is to make it easier to create a
'datadog' postgres user with access to pg_stats, as 'dd-agent' typically
isn't a valid username. This allows the out of the box configurations to
be used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/misc/ids.nix                    |   4 +-
 .../modules/services/monitoring/dd-agent.nix  | 105 ++++++++++++++----
 pkgs/tools/networking/dd-agent/default.nix    |  24 ++--
 3 files changed, 98 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 3f6aaa15bb4..207da2a39bf 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -84,7 +84,7 @@
       postgres = 71;
       smbguest = 74;
       varnish = 75;
-      dd-agent = 76;
+      datadog = 76;
       lighttpd = 77;
       lightdm = 78;
       freenet = 79;
@@ -201,7 +201,7 @@
       vboxsf = 73;
       smbguest = 74;
       varnish = 75;
-      dd-agent = 76;
+      datadog = 76;
       lighttpd = 77;
       lightdm = 78;
       freenet = 79;
diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index bddf102ee51..5794ee7fe53 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -5,54 +5,113 @@ with lib;
 let
   cfg = config.services.dd-agent;
 
-  datadog_conf = pkgs.runCommand "datadog.conf" {} ''
-    sed -e 's|^api_key:|api_key: ${cfg.api_key}|' ${optionalString (cfg.hostname != null)
-      "-e 's|^#hostname: mymachine.mydomain|hostname: ${cfg.hostname}|'"
-    } ${pkgs.dd-agent}/etc/dd-agent/datadog.conf.example > $out
+  ddConf = pkgs.writeText "datadog.conf" ''
+    [Main]
+    dd_url: https://app.datadoghq.com
+    skip_ssl_validation: no
+    api_key: ${cfg.api_key}
+    ${optionalString (cfg.hostname != null) "hostname: ${cfg.hostname}"}
+
+    collector_log_file: /var/log/datadog/collector.log
+    forwarder_log_file: /var/log/datadog/forwarder.log
+    dogstatsd_log_file: /var/log/datadog/dogstatsd.log
+    pup_log_file:       /var/log/datadog/pup.log
+
+    # proxy_host: my-proxy.com
+    # proxy_port: 3128
+    # proxy_user: user
+    # proxy_password: password
+
+    # tags: mytag0, mytag1
+
+    # collect_ec2_tags: no
+    # recent_point_threshold: 30
+    # use_mount: no
+    # listen_port: 17123
+    # graphite_listen_port: 17124
+    # non_local_traffic: no
+    # use_curl_http_client: False
+    # bind_host: localhost
+
+    # use_pup: no
+    # pup_port: 17125
+    # pup_interface: localhost
+    # pup_url: http://localhost:17125
+
+    # dogstatsd_port : 8125
+    # dogstatsd_interval : 10
+    # dogstatsd_normalize : yes
+    # statsd_forward_host: address_of_own_statsd_server
+    # statsd_forward_port: 8125
+
+    # device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
+
+    # ganglia_host: localhost
+    # ganglia_port: 8651
   '';
+
+  postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
+  nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
+
+  etcfiles =
+    [ { source = ddConf;
+        target = "dd-agent/datadog.conf";
+      } ] ++
+    (optional (cfg.postgresqlConfig != null)
+      { source = postgresqlConfig;
+        target = "dd-agent/conf.d/postgres.yaml";
+      }) ++
+    (optional (cfg.nginxConfig != null)
+      { source = nginxConfig;
+        target = "dd-agent/conf.d/nginx.yaml";
+      });
+
 in {
   options.services.dd-agent = {
     enable = mkOption {
       description = "Whether to enable the dd-agent montioring service";
-
       default = false;
-
       type = types.bool;
     };
 
-    # !!! This gets stored in the store (world-readable), wish we had https://github.com/NixOS/nix/issues/8
     api_key = mkOption {
       description = "The Datadog API key to associate the agent with your account";
-
       example = "ae0aa6a8f08efa988ba0a17578f009ab";
-
       type = types.str;
     };
 
     hostname = mkOption {
       description = "The hostname to show in the Datadog dashboard (optional)";
-
       default = null;
-
       example = "mymachine.mydomain";
+      type = types.uniq (types.nullOr types.string);
+    };
 
+    postgresqlConfig = mkOption {
+      description = "Datadog PostgreSQL integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+    };
+
+    nginxConfig = mkOption {
+      description = "Datadog nginx integration configuration";
+      default = null;
       type = types.uniq (types.nullOr types.string);
     };
   };
 
   config = mkIf cfg.enable {
-    environment.etc = [ { source = datadog_conf; target = "dd-agent/datadog.conf"; } ];
     environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
 
-    users.extraUsers."dd-agent" = {
+    users.extraUsers.datadog = {
       description = "Datadog Agent User";
-      uid = config.ids.uids.dd-agent;
-      group = "dd-agent";
+      uid = config.ids.uids.datadog;
+      group = "datadog";
       home = "/var/log/datadog/";
       createHome = true;
     };
 
-    users.extraGroups.dd-agent.gid = config.ids.gids.dd-agent;
+    users.extraGroups.datadog.gid = config.ids.gids.datadog;
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
@@ -60,12 +119,12 @@ in {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
-        User = "dd-agent";
-        Group = "dd-agent";
+        User = "datadog";
+        Group = "datadog";
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent datadog_conf ];
+      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
     };
 
     systemd.services.dogstatsd = {
@@ -74,14 +133,16 @@ in {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
-        User = "dd-agent";
-        Group = "dd-agent";
+        User = "datadog";
+        Group = "datadog";
         Type = "forking";
         PIDFile = "/tmp/dogstatsd.pid";
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent datadog_conf ];
+      restartTriggers = [ pkgs.dd-agent ddConf postgresqlConfig nginxConfig ];
     };
+
+    environment.etc = etcfiles;
   };
 }
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 87290d4061a..1edfc02bb38 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, python, sysstat, unzip, tornado, makeWrapper }:
+{ stdenv, fetchurl, python, pythonPackages, sysstat, unzip, tornado
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
     version = "4.2.1";
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
       sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
     };
 
-    buildInputs = [ python unzip makeWrapper ];
+    buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
     propagatedBuildInputs = [ python tornado ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
@@ -21,18 +22,19 @@ stdenv.mkDerivation rec {
     postInstall = ''
       mv $out/usr/* $out
       rmdir $out/usr
-      wrapProgram $out/bin/dd-forwarder --prefix PYTHONPATH : $PYTHONPATH
+      wrapProgram $out/bin/dd-forwarder \
+        --prefix PYTHONPATH : $PYTHONPATH
+      wrapProgram $out/bin/dd-agent \
+        --prefix PYTHONPATH : $PYTHONPATH
+      wrapProgram $out/bin/dogstatsd \
+        --prefix PYTHONPATH : $PYTHONPATH
     '';
 
     meta = {
       description = "Event collector for the DataDog analysis service";
-
-      homepage = http://www.datadoghq.com;
-
-      maintainers = [ stdenv.lib.maintainers.iElectric ];
-
-      license = stdenv.lib.licenses.bsd3;
-
-      platforms = stdenv.lib.platforms.all;
+      homepage    = http://www.datadoghq.com;
+      license     = stdenv.lib.licenses.bsd3;
+      platforms   = stdenv.lib.platforms.all;
+      maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ];
     };
 }

From b10f4af8f95d9010cb1757e04a10423e8289e165 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 01:18:44 -0500
Subject: [PATCH 0849/2033] nginx: upgrade to 1.6.0, expose many more modules

By default, we now build all the optional nginx modules, including the
out-of-band ones like moreheaders and rtmp support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/http/nginx/default.nix | 50 ++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix     |  7 +++-
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index dbe823bed81..3dc38575136 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,38 +1,39 @@
 { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, expat
+, gd, geoip
 , rtmp ? false
 , fullWebDAV ? false
 , syslog ? false
 , moreheaders ? false}:
 
 let
-  version = "1.4.7";
+  version = "1.6.0";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "09mnw4f1yk64f21xq4k65x4r76pmrszyzc4iixkr0w41fr5gzf13";
+    sha256 = "06pwmg4qyd1sirpyl47s6qp94qc8a36dlkaw5pgv7s63l5bxffll";
   };
 
   rtmp-ext = fetchgit {
-    url = git://github.com/arut/nginx-rtmp-module.git;
-    rev = "1cfb7aeb582789f3b15a03da5b662d1811e2a3f1";
-    sha256 = "03ikfd2l8mzsjwx896l07rdrw5jn7jjfdiyl572yb9jfrnk48fwi";
+    url = https://github.com/arut/nginx-rtmp-module.git;
+    rev = "8c2229cce5d4d4574e8fb7b130281497f746f0fa";
+    sha256 = "6caea2a13161345c3fc963679730be54cebebddf1406ac7d4ef4ce72ac0b90b0";
   };
 
   dav-ext = fetchgit {
-    url = git://github.com/arut/nginx-dav-ext-module.git;
-    rev = "54cebc1f21fc13391aae692c6cce672fa7986f9d";
-    sha256 = "1dvpq1fg5rslnl05z8jc39sgnvh3akam9qxfl033akpczq1bh8nq";
+    url = "https://github.com/arut/nginx-dav-ext-module";
+    rev = "89d582d31ab624ff1c6a4cec0c1a52839507b323";
+    sha256 = "2175f83a291347504770d2a4bb5069999e9f7408697bd49464b6b54e994493e1";
   };
 
   syslog-ext = fetchgit {
     url = https://github.com/yaoweibin/nginx_syslog_patch.git;
-    rev = "165affd9741f0e30c4c8225da5e487d33832aca3";
-    sha256 = "14dkkafjnbapp6jnvrjg9ip46j00cr8pqc2g7374z9aj7hrvdvhs";
+    rev = "690a054a0e440323bba58ed3be12d705d3fb9cf2";
+    sha256 = "0678bc2960dfa31adfc2997c079947c32dde28d6785ee423fa7f5badbb925fbe";
   };
 
   moreheaders-ext = fetchgit {
-    url = https://github.com/agentzh/headers-more-nginx-module.git;
-    rev = "refs/tags/v0.23";
-    sha256 = "12pbjgsxnvcf2ff2i2qdn39q4cm5czlgrng96j8ml4cgxvnbdh39";
+    url = https://github.com/openresty/headers-more-nginx-module.git;
+    rev = "0c6e05d3125a97892a250e9ba8b7674163ba500b";
+    sha256 = "e121d97fd3c81c64e6cbf6902bbcbdb01be9ac985c6832d40434379d5e998eaf";
   };
 in
 
@@ -40,19 +41,30 @@ stdenv.mkDerivation rec {
   name = "nginx-${version}";
   src = mainSrc;
 
-  buildInputs = [ openssl zlib pcre libxml2 libxslt
+  buildInputs =
+    [ openssl zlib pcre libxml2 libxslt gd geoip
     ] ++ stdenv.lib.optional fullWebDAV expat;
 
-  patches = if syslog then [ "${syslog-ext}/syslog_1.4.0.patch" ] else [];
+  patches = if syslog then [ "${syslog-ext}/syslog_1.5.6.patch" ] else [];
 
   configureFlags = [
     "--with-http_ssl_module"
     "--with-http_spdy_module"
+    "--with-http_realip_module"
+    "--with-http_addition_module"
     "--with-http_xslt_module"
+    "--with-http_image_filter_module"
+    "--with-http_geoip_module"
     "--with-http_sub_module"
     "--with-http_dav_module"
+    "--with-http_flv_module"
+    "--with-http_mp4_module"
+    "--with-http_gunzip_module"
     "--with-http_gzip_static_module"
+    "--with-http_auth_request_module"
+    "--with-http_random_index_module"
     "--with-http_secure_link_module"
+    "--with-http_degradation_module"
     "--with-http_stub_status_module"
     "--with-ipv6"
     # Install destination problems
@@ -72,9 +84,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A reverse proxy and lightweight webserver";
-    homepage = http://nginx.org;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    platforms = stdenv.lib.platforms.all;
-    inherit version;
+    homepage    = http://nginx.org;
+    license     = stdenv.lib.licenses.bsd2;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03c98daf737..6d9ba2cc899 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6552,7 +6552,12 @@ let
 
   myserver = callPackage ../servers/http/myserver { };
 
-  nginx = callPackage ../servers/http/nginx { };
+  nginx = callPackage ../servers/http/nginx {
+    rtmp        = true;
+    fullWebDAV  = true;
+    syslog      = true;
+    moreheaders = true;
+  };
 
   ngircd = callPackage ../servers/irc/ngircd { };
 

From e4dead31714a15a0a4dfd847a0bded0f9e88ac5c Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Fri, 2 May 2014 14:57:46 +0800
Subject: [PATCH 0850/2033] Update haskell-hspec to version 0.9.5

---
 pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++--
 pkgs/development/libraries/haskell/hspec/default.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix
index ce450c7f55c..612f4989848 100644
--- a/pkgs/development/libraries/haskell/hspec-meta/default.nix
+++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec-meta";
-  version = "1.9.4";
-  sha256 = "0x2r8aqwpjdcykhd9hwxnz9a42x9rbkhjygz9af4wvlmifv1kwfm";
+  version = "1.9.5";
+  sha256 = "0y39z9r5icz62dd7hvr3lwdcqas526w4m5rcd1468fp7rlz3402j";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix
index deb9d3562f3..b6d9365446d 100644
--- a/pkgs/development/libraries/haskell/hspec/default.nix
+++ b/pkgs/development/libraries/haskell/hspec/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hspec";
-  version = "1.9.4";
-  sha256 = "1dvh1hy0jh55z3br5c5cz56bni5czvqcplarjcyanbvqsd05xyll";
+  version = "1.9.5";
+  sha256 = "0y9gbm5rwwn80yzdllh1amaih4vxa61i9dzym88jr2kkwjrhxay4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From eef9a8ac2a30b495ff7184382ed0dbd73b3b88e4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 2 May 2014 14:32:47 +0400
Subject: [PATCH 0851/2033] On my system OpenGL with bumblebee seems to require
 libudev in LD_LIBRARY_PATH. Fix that, fix bumblebee module loading and make
 the socket group configurable

---
 nixos/modules/hardware/opengl.nix          |  1 +
 nixos/modules/hardware/video/bumblebee.nix | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 2d5643d4d94..096f7e2c097 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -16,6 +16,7 @@ let
       [ p.mesa_drivers
         p.mesa_noglu # mainly for libGL
         (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
+	p.udev
       ];
   };
 
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index f06139adc44..52dea798f87 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -17,6 +17,12 @@ with lib;
         Only nvidia driver is supported so far.
       '';
     };
+    hardware.bumblebee.group = mkOption {
+      default = "wheel";
+      example = "video";
+      type = types.uniq types.str;
+      description = ''Group for bumblebee socket'';
+    };
   };
 
   config = mkIf config.hardware.bumblebee.enable {
@@ -29,13 +35,15 @@ with lib;
     systemd.services.bumblebeed = {
       description = "Bumblebee Hybrid Graphics Switcher";
       wantedBy = [ "display-manager.service" ];
-      script = "bumblebeed --use-syslog";
+      script = "bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
       path = [ kernel.bbswitch pkgs.bumblebee ];
       serviceConfig = {
         Restart = "always";
         RestartSec = 60;
         CPUSchedulingPolicy = "idle";
       };
+      environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/";
+      environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
     };
   };
 }

From e1c448e91af2dce8449ec008c8e5145fda4cfa3c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 17:41:00 +0200
Subject: [PATCH 0852/2033] gtkhtml: added gnome3 4.6 version

---
 pkgs/desktops/gnome-3/default.nix              |  2 ++
 pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/misc/gtkhtml/default.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 34c663a779c..d192efbda3c 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -184,4 +184,6 @@ rec {
   gexiv2 = callPackage ./misc/gexiv2 { };
 
   gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+
+  gtkhtml = callPackage ./misc/gtkhtml { };
 }
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
new file mode 100644
index 00000000000..5e27b474cbd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, gnome3, enchant, isocodes }:
+
+stdenv.mkDerivation rec {
+  name = "gtkhtml-4.6.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz";
+    sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd";
+  };
+
+  buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  propagatedBuildInputs = [ enchant isocodes ];
+
+}

From 3377bbf4e914707944d8ebb15347d7c06c2c9099 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 17:41:44 +0200
Subject: [PATCH 0853/2033] evolution-data-server: update to 3.10.4

---
 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index 9e7d0cb3da0..685f8c24e7c 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -3,11 +3,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-3.10.2";
+  name = "evolution-data-server-3.10.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
-    sha256 = "1fgchc1gzrhhzgn4zf9par4yz72m82j871kf7pky458mh4c4sf0g";
+    sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d";
   };
 
   buildInputs = with gnome3;

From d6206ccceb624312a26b680b219b75c47ad8e33b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 17:42:11 +0200
Subject: [PATCH 0854/2033] evolution: new package

Personal information management application that provides integrated mail,
calendaring and address book functionality

https://wiki.gnome.org/Apps/Evolution
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/evolution/default.nix        | 48 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/evolution/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 8c17b27dc37..1a8af58ee72 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -129,6 +129,7 @@ in {
         gnome3.gnome_terminal
         gnome3.gnome-user-docs
 
+        gnome3.evolution
         gnome3.file-roller
         gnome3.gedit
         gnome3.gnome-music
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
new file mode 100644
index 00000000000..ee62c951b4c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify
+, makeWrapper, itstool, shared_mime_info, libical, db
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
+, libcanberra_gtk3, bogofilter, gst_all_1, procps }:
+
+stdenv.mkDerivation rec {
+  name = "evolution-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz";
+    sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
+                  gnome3.evolution_data_server libsecret libical
+                  webkitgtk shared_mime_info gnome3.gnome_desktop
+                  libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  nss nspr libnotify procps highlight gnome3.libgweather
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/evolution" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Evolution;
+    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d192efbda3c..164fb9b27f1 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -153,6 +153,8 @@ rec {
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
+  evolution = callPackage ./apps/evolution { };
+
   file-roller = callPackage ./apps/file-roller { };
 
   gedit = callPackage ./apps/gedit { };

From 4229053cb0a8d63dd03c4bf2853b519532663f08 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 20:07:01 +0200
Subject: [PATCH 0855/2033] gnome-photos: new package

Photos is an application to access, organize and share your photos with GNOME 3

https://wiki.gnome.org/Apps/Photos
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/gnome-photos/default.nix     | 44 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 1a8af58ee72..f14bce04caa 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -134,6 +134,7 @@ in {
         gnome3.gedit
         gnome3.gnome-music
         gnome3.gnome-tweak-tool
+        gnome3.gnome-photos
       ] config.environment.gnome3.excludePackages);
 
     # Needed for themes and backgrounds
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
new file mode 100644
index 00000000000..68d4e3690f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, intltool, fetchurl, exempi, libxml2
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gegl, babl, lcms2
+, desktop_file_utils, gmp
+, gnome3, librsvg, gdk_pixbuf, libexif }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-photos-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz";
+    sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi
+                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
+                  gnome3.gnome_online_accounts gnome3.gnome_desktop
+                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-photos" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Photos;
+    description = "Photos is an application to access, organize and share your photos with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 164fb9b27f1..0aaf9d9dd11 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -165,6 +165,8 @@ rec {
 
   gnome-music = callPackage ./apps/gnome-music { };
 
+  gnome-photos = callPackage ./apps/gnome-photos { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From ea1e72196fb070e769a7974cddc69e2dc4080461 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 21:33:20 +0200
Subject: [PATCH 0856/2033] gnome-online-miners: use grilo plugins

---
 .../gnome-3/core/gnome-online-miners/default.nix     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
index 06e7781b72f..4c904bf40f6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl }:
+, libsoup, json_glib, gmp, openssl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gnome-online-miners-3.10.3";
@@ -12,11 +12,19 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.gnome_online_accounts
+                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
+                  gnome3.gnome_online_accounts makeWrapper
                   gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
 
   enableParallelBuilding = true;
 
+  preFixup = ''
+    for f in $out/libexec/*; do
+      wrapProgram "$f" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
     description = "A set of crawlers that go through your online content and index them locally in Tracker";

From 85175de878d241a627f318d69d085999c45b5550 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 23:31:50 +0200
Subject: [PATCH 0857/2033] libgweather: fix zoneinfo path

---
 pkgs/desktops/gnome-3/core/libgweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 62ae5964365..c480a59e453 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk }:
+, pango, gdk_pixbuf, atk, tzdata }:
 
 stdenv.mkDerivation rec {
   name = "libgweather-3.10.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
 
-  configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else "";
+  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
   propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
   nativeBuildInputs = [ pkgconfig intltool ];
 

From fbfccea0e8592699bf4c32ea4c07513fcca43b11 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 23:32:32 +0200
Subject: [PATCH 0858/2033] geoclue2: add dbus service

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/desktops/geoclue2.nix  | 39 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 nixos/modules/services/desktops/geoclue2.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f98b621111f..994c86041a8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -99,6 +99,7 @@
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
   ./services/desktops/accountservice.nix
+  ./services/desktops/geoclue2.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/evolution-data-server.nix
   ./services/desktops/gnome3/gnome-documents.nix
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
new file mode 100644
index 00000000000..6bdd5edff1f
--- /dev/null
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -0,0 +1,39 @@
+# GeoClue 2 daemon.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.geoclue2 = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable GeoClue 2 daemon, a DBus service
+          that provides location informationfor accessing.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.geoclue2.enable {
+
+    environment.systemPackages = [ pkgs.geoclue2 ];
+
+    services.dbus.packages = [ pkgs.geoclue2 ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index f14bce04caa..a8d07304c45 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -50,6 +50,7 @@ in {
     security.polkit.enable = true;
     services.udisks2.enable = true;
     services.accounts-daemon.enable = true;
+    services.geoclue2.enable = mkDefault true;
     services.gnome3.at-spi2-core.enable = true;
     services.gnome3.evolution-data-server.enable = true;
     services.gnome3.gnome-documents.enable = mkDefault true;

From b3fe998fdb8f8a46b67c92ab6c0fbd9100b8c34a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 24 Apr 2014 23:33:42 +0200
Subject: [PATCH 0859/2033] gnome-clocks: new package

Clock application designed for GNOME 3

https://wiki.gnome.org/Apps/Clocks
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../gnome-3/apps/gnome-clocks/default.nix     | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index a8d07304c45..979c9571f94 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -133,6 +133,7 @@ in {
         gnome3.evolution
         gnome3.file-roller
         gnome3.gedit
+        gnome3.gnome-clocks
         gnome3.gnome-music
         gnome3.gnome-tweak-tool
         gnome3.gnome-photos
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
new file mode 100644
index 00000000000..c39f731e028
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, libgweather, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libcanberra_gtk3, libtool
+, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-clocks-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-clocks/3.10/${name}.tar.xz";
+    sha256 = "5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
+                  libgweather libnotify libtool
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-clocks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Clocks;
+    description = "Clock application designed for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 0aaf9d9dd11..9da8f773fc8 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -161,6 +161,8 @@ rec {
 
   glade = callPackage ./apps/glade { };
 
+  gnome-clocks = callPackage ./apps/gnome-clocks { };
+
   gnome-documents = callPackage ./apps/gnome-documents { };
 
   gnome-music = callPackage ./apps/gnome-music { };

From 63cdda1f4ec6a2a2e189b3901302e57fa4dc0e32 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 2 May 2014 17:39:18 +0200
Subject: [PATCH 0860/2033] zeitgeist: new package

Zeitgeist is a service which logs the users's activities and events

https://launchpad.net/zeitgeist
---
 .../libraries/zeitgeist/dbus_glib.patch       | 10 +++++
 .../libraries/zeitgeist/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/libraries/zeitgeist/dbus_glib.patch
 create mode 100644 pkgs/development/libraries/zeitgeist/default.nix

diff --git a/pkgs/development/libraries/zeitgeist/dbus_glib.patch b/pkgs/development/libraries/zeitgeist/dbus_glib.patch
new file mode 100644
index 00000000000..872ea0db31b
--- /dev/null
+++ b/pkgs/development/libraries/zeitgeist/dbus_glib.patch
@@ -0,0 +1,10 @@
+--- configure.ac	2014-01-27 22:45:42.000000000 +0100
++++ configure.ac.new	2014-05-02 17:25:45.813491239 +0200
+@@ -151,6 +151,7 @@
+                             gio-2.0 >= $GLIB_REQUIRED
+                             gio-unix-2.0 >= $GLIB_REQUIRED
+                             gtk+-3.0 >= $GTK_REQUIRED
++                            dbus-glib-1
+                             json-glib-1.0 >= $JSON_GLIB_REQUIRED"
+ 
+ AC_ARG_ENABLE([datahub],
diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
new file mode 100644
index 00000000000..92fbe81a32e
--- /dev/null
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala
+, intltool, libtool, python, dbus_libs, telepathy_glib
+, gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "zeitgeist-0.0.14";
+
+  src = fetchurl {
+    url = "https://github.com/seiflotfy/zeitgeist/archive/v0.9.15.tar.gz";
+    sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  configureScript = "./autogen.sh";
+
+  configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
+
+  buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool
+                  libtool python dbus_libs telepathy_glib vala dbus_glib
+                  gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ];
+
+  prePatch = "patchShebangs .";
+
+  patches = [ ./dbus_glib.patch ];
+
+  patchFlags = [ "-p0" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://launchpad.net/zeitgeist;
+    description = "Zeitgeist is a service which logs the users's activities and events";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69c1a6734bd..5f33b7f6bc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6155,6 +6155,8 @@ let
     inherit ncurses flex bison autoconf automake m4 coreutils;
   };
 
+  zeitgeist = callPackage ../development/libraries/zeitgeist { };
+
   zlib = callPackage ../development/libraries/zlib {
     fetchurl = fetchurlBoot;
   };

From 4ca985a7e3ad04299b9b39b22a827453b2dfde1c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 2 May 2014 17:40:41 +0200
Subject: [PATCH 0861/2033] bijiben: new package

Note editor designed to remain simple to use

https://wiki.gnome.org/Apps/Bijiben
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../desktops/gnome-3/apps/bijiben/default.nix | 41 +++++++++++++++++++
 pkgs/desktops/gnome-3/default.nix             |  2 +
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/apps/bijiben/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 979c9571f94..3f48035f6bb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -130,6 +130,7 @@ in {
         gnome3.gnome_terminal
         gnome3.gnome-user-docs
 
+        gnome3.bijiben
         gnome3.evolution
         gnome3.file-roller
         gnome3.gedit
diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
new file mode 100644
index 00000000000..ef460112d21
--- /dev/null
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, hicolor_icon_theme, makeWrapper, itstool
+, clutter_gtk, libuuid, webkitgtk, zeitgeist
+, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "bijiben-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz";
+    sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig glib intltool itstool libxml2
+                  clutter_gtk libuuid webkitgtk gnome3.tracker
+                  gnome3.gnome_online_accounts zeitgeist
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/bijiben" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
+    description = "Note editor designed to remain simple to use";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 9da8f773fc8..2cb28e0c307 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -153,6 +153,8 @@ rec {
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
 
+  bijiben = callPackage ./apps/bijiben { };
+
   evolution = callPackage ./apps/evolution { };
 
   file-roller = callPackage ./apps/file-roller { };

From feddcfaf1eeed310b5d3eb5cd44ddfbe62cbe443 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 2 May 2014 20:50:58 +0400
Subject: [PATCH 0862/2033] Readding Erlang R16B02: R17 is a major update and
 it breaks Ejabberd.

---
 .../interpreters/erlang/R16B02.nix            | 59 +++++++++++++++++++
 .../erlang/{default.nix => R17.nix}           |  0
 pkgs/top-level/all-packages.nix               |  8 ++-
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/erlang/R16B02.nix
 rename pkgs/development/interpreters/erlang/{default.nix => R17.nix} (100%)

diff --git a/pkgs/development/interpreters/erlang/R16B02.nix b/pkgs/development/interpreters/erlang/R16B02.nix
new file mode 100644
index 00000000000..7dc71ed6546
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R16B02.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
+, gnused, gawk, makeWrapper
+, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }:
+
+assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "erlang-" + version;
+  version = "R16B02";
+
+  src = fetchurl {
+    url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
+    sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a";
+  };
+
+  buildInputs =
+    [ perl gnum4 ncurses openssl makeWrapper
+    ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ];
+
+  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+
+  preConfigure = ''
+    export HOME=$PWD/../
+    sed -e s@/bin/pwd@pwd@g -i otp_build
+  '';
+
+  configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
+
+  postInstall = ''
+    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+  '';
+
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
+  '';
+
+  meta = {
+    homepage = "http://www.erlang.org/";
+    description = "Programming language used for massively scalable soft real-time systems";
+
+    longDescription = ''
+      Erlang is a programming language used to build massively scalable
+      soft real-time systems with requirements on high availability.
+      Some of its uses are in telecoms, banking, e-commerce, computer
+      telephony and instant messaging. Erlang's runtime system has
+      built-in support for concurrency, distribution and fault
+      tolerance.
+    '';
+
+    platforms = platforms.unix;
+    # Note: Maintainer of prev. erlang version was simons. If he wants
+    # to continue maintaining erlang I'm totally ok with that.
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/development/interpreters/erlang/default.nix b/pkgs/development/interpreters/erlang/R17.nix
similarity index 100%
rename from pkgs/development/interpreters/erlang/default.nix
rename to pkgs/development/interpreters/erlang/R17.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d9ba2cc899..54c61561da8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3315,7 +3315,9 @@ let
 
   erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
   erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { };
-  erlang = callPackage ../development/interpreters/erlang/default.nix { };
+  erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { };
+  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
+  erlang = erlangR17;
 
   rebar = callPackage ../development/tools/build-managers/rebar { };
 
@@ -6486,7 +6488,9 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
-  ejabberd = callPackage ../servers/xmpp/ejabberd { };
+  ejabberd = callPackage ../servers/xmpp/ejabberd { 
+    erlang = erlangR16B02;
+  };
 
   elasticmq = callPackage ../servers/elasticmq { };
 

From 193d73d2d3ea63aa2a1961a5e5b7ace15dd83183 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 28 Apr 2014 19:31:46 +0000
Subject: [PATCH 0863/2033] tibia: version 10.39

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 5cf451e9201..a7ded109526 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.38";
+  name = "tibia-10.39";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1038.tgz;
-    sha256 = "13mxsdh0p0bhdiv5p0hbfdx4a5ha2fv9p2yvn6250z9plfi9xq2h";
+    url = http://static.tibia.com/download/tibia1039.tgz;
+    sha256 = "0401sdg2b4jb6350z841f9xjipi37z4z82bc72rs0chgdp363n79";
   };
 
   shell = stdenv.shell;
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
     patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
              --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${mesa}/lib \
-             "$out/res/Tibia" || true
+             "$out/res/Tibia"
 
     # We've patchelf'd the files. The main ‘Tibia’ binary is a bit
     # dumb so it looks for ‘./Tibia.dat’. This requires us to be in
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "Top-down MMORPG set in a fantasy setting";
+    description = "Top-down MMORPG set in a fantasy world";
     homepage = "http://tibia.com";
     license = "unfree";
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];

From fb778b705fb24dd68651b0cf312f4412c56db213 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 2 May 2014 13:43:34 -0500
Subject: [PATCH 0864/2033] Add expression for Haskell library 'these'

---
 .../libraries/haskell/these/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/these/default.nix

diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix
new file mode 100644
index 00000000000..4962ace783c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/these/default.nix
@@ -0,0 +1,19 @@
+{ cabal, bifunctors, mtl, profunctors, semigroupoids, semigroups
+, transformers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "these";
+  version = "0.4.2";
+  sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7";
+  buildDepends = [
+    bifunctors mtl profunctors semigroupoids semigroups transformers
+    vector
+  ];
+  meta = {
+    homepage = "https://github.com/isomorphism/these";
+    description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd7510e4c3f..08793d972f9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2551,6 +2551,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   tfRandom = callPackage ../development/libraries/haskell/tf-random {};
 
+  these = callPackage ../development/libraries/haskell/these {};
+
   thespian = callPackage ../development/libraries/haskell/thespian {};
 
   thDesugar = callPackage ../development/libraries/haskell/th-desugar {};

From 27a0d56514b7449ea1715b703bd1a667b4a7e9be Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 13:21:50 -0500
Subject: [PATCH 0865/2033] compcert: Fix Hydra platforms

Copy-pasta error, and compcert doesn't really make sense on Darwin or
64bit linux (it's callPackage_i686 anyway).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/compcert/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index c181e34217a..c4af878ba76 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
     license     = stdenv.lib.licenses.inria;
-    platforms   = stdenv.lib.platforms.unix;
+    platforms   = [ "i686-linux" ];
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From 59528d9f0e7bef27acafe7cb6eaf5273aef2dcfa Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 13:22:48 -0500
Subject: [PATCH 0866/2033] clang-analyzer: respect $NIX_CFLAGS_COMPILE

When using scan-build, you're often going to want to use it in the
context of a Nix expression with buildInputs, and the default wrapper
scripts will put things like include locations for those inputs
$NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the
analyzer - while the link flags aren't relevant, the include flags are.

This is because the analyzer executable that gets run by scan-build is
*not* clang-wrapper, but the actual clang executable, so it doesn't
implicitly add such arguments. The build is two-stage - it runs the real
clang wrapper once, and then the analyzer once.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 ...scan-build-to-use-NIX_CFLAGS_COMPILE.patch | 33 +++++++++++++++++++
 .../tools/analysis/clang-analyzer/default.nix |  8 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch

diff --git a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
new file mode 100644
index 00000000000..bcb3ac1d146
--- /dev/null
+++ b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch
@@ -0,0 +1,33 @@
+From 6ab08bc1c889e4fb9a39432b1a654eaa19ee65eb Mon Sep 17 00:00:00 2001
+From: Austin Seipp <aseipp@pobox.com>
+Date: Fri, 2 May 2014 12:28:23 -0500
+Subject: [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
+
+Signed-off-by: Austin Seipp <aseipp@pobox.com>
+---
+ tools/scan-build/ccc-analyzer | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer
+index b463ec0..9d39dd0 100755
+--- a/tools/scan-build/ccc-analyzer
++++ b/tools/scan-build/ccc-analyzer
+@@ -207,6 +207,15 @@ sub Analyze {
+       push @Args, "-Xclang", "-analyzer-viz-egraph-ubigraph";
+     }
+ 
++
++    # Add Nix flags to analysis
++    if (defined $ENV{'NIX_CFLAGS_COMPILE'}) {
++      my @nixArgs = split(/\s+/, $ENV{'NIX_CFLAGS_COMPILE'});
++      foreach my $nixArg (@nixArgs) {
++        push @Args, $nixArg;
++      }
++    }
++
+     my $AnalysisArgs = GetCCArgs("--analyze", \@Args);
+     @CmdArgs = @$AnalysisArgs;
+   }
+-- 
+1.8.3.2
+
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index b61c3e569c8..50583f65f60 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92";
   };
 
+  patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
   buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
   buildPhase = "true";
 
@@ -18,7 +19,10 @@ stdenv.mkDerivation rec {
     cp -R tools/scan-build $out/libexec
 
     makeWrapper $out/libexec/scan-view/scan-view $out/bin/scan-view
-    makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build --add-flags "--use-cc=${clang}/bin/clang" --add-flags "--use-c++=${clang}/bin/clang++" --add-flags "--use-analyzer=${llvmPackages.clang}/bin/clang"
+    makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build \
+      --add-flags "--use-cc=${clang}/bin/clang" \
+      --add-flags "--use-c++=${clang}/bin/clang++" \
+      --add-flags "--use-analyzer='${llvmPackages.clang}/bin/clang'"
   '';
 
   meta = {
@@ -28,4 +32,4 @@ stdenv.mkDerivation rec {
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
-}
\ No newline at end of file
+}

From 76b05b163001a26807f3d2f52434b482777967c1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 2 May 2014 13:26:41 -0500
Subject: [PATCH 0867/2033] releaseTools: add {clang,coverity}Analysis tools

These two expressions greatly simplify using the clang-analyzer or
Coverity static analyzer on your C/C++ projects. In fact, they are
identical to nixBuild in every way out of the box, and should 'Just
Work' providing your code can be compiled with Clang already.

The trick is that when running 'make', we actually just alias it to the
appropriate scan build tool, and add a post-build hook that will bundle
up the results appropriately and unalias it.

For Clang, we put the results in $out/analysis and add an 'analysis'
report to $out/nix-support/hydra-build-products pointing to the result
HTML - this means that if the analyzer finds any bugs, the HTML results
will automatically show up Hydra for easy viewing.

For Coverity, it's slightly different. Instead we run the build tool and
after we're done, we tar up the results in a format that Coverity Scan's
service understands. We put the tarball in $out/tarballs under the name
'foo-cov-int.xz' and add an entry for the file to hydra-build-products
as well for easy viewing.

Of course for Coverity you must then upload the build. A Hydra plugin to
do this is on the way, and it will automatically pick up the
cov-int.tar.xz for uploading.

Note that coverityAnalysis requires allowUnfree = true;, as well as the
cov-build tools, which you can download from https://scan.coverity.com -
they're not linked to your account or anything, it's just an annoying
registration wall.

Note this is a first draft. In particular, scan-build fixes the C/C++
compiler to be Clang, and it's perfectly reasonable to want to use Clang
for the analyzer but have scan-build invoke GCC instead.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/build-support/release/default.nix   | 10 ++++
 pkgs/build-support/release/nix-build.nix | 63 ++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index 6288935ec2a..d36707dc60f 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -31,6 +31,16 @@ rec {
       doCoverageAnalysis = true;
     } // args);
 
+  clangAnalysis = args: nixBuild (
+    { inherit clangAnalyzer;
+      doClangAnalysis = true;
+    } // args);
+
+  coverityAnalysis = args: nixBuild (
+    { inherit cov-build xz;
+      doCoverityAnalysis = true;
+    } // args);
+
   gcovReport = args: import ./gcov-report.nix (
     { inherit runCommand lcov rsync;
     } // args);
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index 8ebae24c673..b80c9242ed2 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -8,6 +8,8 @@
 { buildOutOfSourceTree ? false
 , preConfigure ? null
 , doCoverageAnalysis ? false
+, doClangAnalysis ? false
+, doCoverityAnalysis ? false
 , lcovFilter ? []
 , lcovExtraTraceFiles ? []
 , src, stdenv
@@ -18,6 +20,9 @@
 , buildInputs ? []
 , ... } @ args:
 
+let
+  doingAnalysis = doCoverageAnalysis || doClangAnalysis || doCoverityAnalysis;
+in
 stdenv.mkDerivation (
 
   {
@@ -25,8 +30,8 @@ stdenv.mkDerivation (
     doCheck = true;
 
     # When doing coverage analysis, we don't care about the result.
-    dontInstall = doCoverageAnalysis;
-    useTempPrefix = doCoverageAnalysis;
+    dontInstall = doingAnalysis;
+    useTempPrefix = doingAnalysis;
 
     showBuildStats = true;
 
@@ -37,6 +42,29 @@ stdenv.mkDerivation (
         if test -e $origSrc/nix-support/hydra-release-name; then
           cp $origSrc/nix-support/hydra-release-name $out/nix-support/hydra-release-name
         fi
+
+        # Package up Coverity analysis results
+        if [ ! -z "${toString doCoverityAnalysis}" ]; then
+          if [ -d "_coverity_$name/cov-int" ]; then
+            mkdir -p $out/tarballs
+            NAME=`cat $out/nix-support/hydra-release-name`
+            cd _coverity_$name
+            tar caf $out/tarballs/$NAME-coverity-int.xz cov-int
+            echo "file cov-build $out/tarballs/$NAME-coverity-int.xz" >> $out/nix-support/hydra-build-products
+          fi
+        fi
+
+        # Package up Clang analysis results
+        if [ ! -z "${toString doClangAnalysis}" ]; then
+          if [ ! -z "`ls _clang_analyze_$name`" ]; then
+            cd  _clang_analyze_$name && mv * $out/analysis
+          else
+            mkdir -p $out/analysis
+            echo "No bugs found." >> $out/analysis/index.html
+          fi
+
+          echo "report analysis $out/analysis" >> $out/nix-support/hydra-build-products
+        fi
       '';
 
     failureHook = (stdenv.lib.optionalString (failureHook != null) failureHook) +
@@ -64,11 +92,33 @@ stdenv.mkDerivation (
       src=$(findTarballs $src | head -1)
     '';
 
+    preHook = ''
+      # Perform Coverity Analysis
+      if [ ! -z "${toString doCoverityAnalysis}" ]; then
+        shopt -s expand_aliases
+        mkdir _coverity_$name
+        alias make="cov-build --dir _coverity_$name/cov-int make"
+      fi
+
+      # Perform Clang Analysis
+      if [ ! -z "${toString doClangAnalysis}" ]; then
+        shopt -s expand_aliases
+        alias make="scan-build -o _clang_analyze_$name --html-title='Scan results for $name' make"
+      fi
+    '';
+
+    # Clean up after analysis
+    postBuild = ''
+      if [ ! -z "${toString (doCoverityAnalysis || doClangAnalysis)}" ]; then
+        unalias make
+      fi
+    '';
+
     initPhase = ''
       mkdir -p $out/nix-support
       echo "$system" > $out/nix-support/system
 
-      if [ -z "${toString doCoverageAnalysis}" ]; then
+      if [ -z "${toString doingAnalysis}" ]; then
           for i in $outputs; do
               if [ "$i" = out ]; then j=none; else j="$i"; fi
               mkdir -p ''${!i}/nix-support
@@ -79,7 +129,12 @@ stdenv.mkDerivation (
 
     prePhases = ["initPhase"] ++ prePhases;
 
-    buildInputs = buildInputs ++ stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport;
+    buildInputs =
+      buildInputs ++
+      (stdenv.lib.optional doCoverageAnalysis args.makeGCOVReport) ++
+      (stdenv.lib.optional doClangAnalysis args.clangAnalyzer) ++
+      (stdenv.lib.optional doCoverityAnalysis args.cov-build) ++
+      (stdenv.lib.optional doCoverityAnalysis args.xz);
 
     lcovFilter = ["/nix/store/*"] ++ lcovFilter;
 

From af0139d7d4713a4e68cce0d8e7f53d2313a75cdd Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 30 Apr 2014 22:35:12 +0900
Subject: [PATCH 0868/2033] Update thunderbird-bin to version 24.5.0

---
 .../mailreaders/thunderbird-bin/default.nix   | 224 +++++++++---------
 1 file changed, 113 insertions(+), 111 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 1e8a7e301ed..c801c0f69b0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -33,119 +33,121 @@
 }:
 
 let
-  version = "24.4.0";
+  version = "24.5.0";
 
   sources = [
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "dd570da273c047e0b4bf29a7ed4bb4356dcbdd8de62ecb65fcddfecaf156966f"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "f96c30ad874adf10608f818e0d986070b2a577de4d9aeb6c8dc7ea1ccd6e72f1"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "8a50ff6a4f0d2bf68f989c2d3e0bca75c9fbcfc73c37b6cc16d935c1e3c1a9cf"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "ace08104be64c038f5337e5178a79cb3f909c233f8722f7d54db04aef87935f9"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "793c07b33e861a5e29ce906a9764d980a82238b7c078391b96480592f526f323"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "98f2a5390572df625e0600ab224d5171d0357e187a3743ad72ec94d31533d993"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "7d2fbb1ecad6e7a81c481a6697429809dc76809bba537ab8bc576b19ba5938f5"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "a0a551d1790969b11ad2dcfc277f487645abff2497f2e9104235e77c45e5120c"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "cb2a5549c3cdc9e159181cb9417c7f53158820f722e48d3ce2e4dcf10dea32d2"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "e395d07fb7b13443ccc97433d38a8845969cf854ace807950a364319c17861d6"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "8637d47dfb9b685a1034f5449d3481a5c62f74158f1a6318fe94504ad779dbb2"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "f36f6d2041a110ffc621249e6d92ec09f3b2bb7a1cf08b7892a0eb998b8a2bb3"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "427a09458fe0d631a360b871db637d33bc0ad443ec443b7193db409321ab72da"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "8531078cb31cb3035fdfd7397159cd42a6439868e954e1c9bd6eb7f9cd564bdb"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "6fea39c9416357ec2902ed3dff84650a683dbe136790fa83cbca5d8bf869dc48"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "c9e8d50e04dccd647ef7a566e68a3fe8374f86e9c1b7fe2001e3690270c5e7b9"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "41debf8c221063c4a5eafc3b769aabada6f3cebf35a354b7837c2ad737fa9b0f"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "77aa022e8c58dc60595f4600849da795faea4c20da6d5514f57e1b0033cda27c"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "05ec3d776de6060a82eea595b022b73c05ab7016419be5989929bd10ae282d27"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "471288d8660536508fe04b236eb72a7c245d27cadd59841a9bab0e73db271005"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "901c0097fb8072a37787a77758a0d6a2ced66acdf5a3588a0a6df3584034c309"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "da658a5f18a7162d513f8e0aac8d1648b18404bac7888a2f66c850f2084a54c5"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "61c637e3b63a10d3c3eff91e9dcbd8558887a41d8e359aa637541bc4424a328a"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dcf399192062a7e3075125f550b0889fb4943c595814b8f6e755e9aa7e4656b1"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "376ab51e3c424db7e235b2e94494d48ce2fa9a8f1fbf5ef5cf9e367bbaf7422d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "57917aa608131da4d569e791fc8167f4df54975b74c64d6df641858400dd4c1b"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "47ecdb633bf1b246df84e796395a668fd98ac52a82177507da010b0174aa74d8"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "9155d96fb14795bc5a22e10105ba0226a7b9c87a4d6ffa5cf7835dc77d69fa30"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "3c41656512f1859b28abdf81d356dd90b720efd489d7021270114a9d28c54b38"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "bad476b65d71744b9562a8548ca6cd608da92e62f45057688fef29ac77eb060e"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "06fdb2df4bcca189736fc6ae2fee6ba87f6b19d0b64f21bdb2b07e478fe6a0ba"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "f110d0940905e2cbe4ab14c1370ff88e533e030fb5a408bf4f06f517351d5979"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "02bbb72fea711772d0dba0137641acb9f0293313a552e554443118324737fba4"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "3a94fc161e98282691d668b68b3a8e7bf035dc87ec0d07be6eb1844b2a79cd39"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "3f9c44306991554cf48fee4da86dec6ab06cb863baa8157d7adf29f6f8b0119f"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "9883bfa54e331c17338bdf7e835a0a0f71a9366ad99ddc0fda12fd9d062f071b"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "60e59c9b9ac78cba5604a051784a8721f84bfd10899d9575a4591ae4e5c48afc"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "d16908d799fe667032d317b01db91cdfcd0b23654061203df84f5cb67d6ae837"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "21e209179135fd97207e878c415d112e6c01bd7686f45eef2891cd8508dd8f9c"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "c8463a38d5fc454ad80a519a9828c1c8808688aa140b5d5276b53a659ae7bf7d"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "22d6d90cd7490e36ef5df2106ba84bcd49038cecf70a60cebd4bf552a01bfdd7"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "5a7fcc013bcd09d327e40e5b0001057067f9e509e52f38681893f1a16cf8520a"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "14c7d9a846a5d2a409089a16afdc97309d6818f97097d73757245b29cdeb73ae"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "e4d3b093da2d80e2a2c02be8d03831c6a89e8969d3261a39f153a6d96f20c7eb"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "73515b65314f8aa28fdb8708e821c01ba6edab5474e5140266b8ee8c0206807f"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7dd646cde4969243178237ea7fdf7b3c7c369e735a42f21292e8fcc3bce2c6ac"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "3fdf3750727f47628ffe4e7b28e8b7f180194be5985f4a10c703d3322a563e55"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "e4385cded8a13776890320780c6aa265c9562a6301f8f5ee7f4fbeb4aa54acf8"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "ada94d6612f20642e6294a17334afb8d31b419132e725618a376728a6028454e"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "bcbb85910f983145ff8df79574087cebaac6537600aa9a479f55298a7d6bc1c2"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "0f41a925ee5c3ad59f24a6b59eed066d1fb37ea8ec81ab4bac70280437be2589"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "9038e0358bb63a147835cacf91a7e7db888fc7b93662cca4919110e2a5daed76"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "24af2ffa71d5810f8e947de27e77a70310c22dc1cc89640b67416fe74a4a14b3"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "62cfce68247f5afd2c68a97ed230b515c1515ecd279a753bf9c728c552683f6c"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "a5e2d72cb0841848cd5a947d4cda2e84db1eae97a0735974690176ccd966eeea"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "f1d539fe69b8121205c5411096554cab41ae4f42a2018af6ba020a2d8fe660dc"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "6eacbd0b4b9f47f67818d6021600b5dddc79d2a38edac5c47f61ac039ed5cdb6"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "fcc86ac738b190012d38d32c6cee3c35d57f6a3b80867c0107f4b8a2717961bb"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "9b668a501c7da55c630761dbf89ae8fe2e32038af8ce4c10fc646eae7c2d08e2"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "f610b7d4a34635e7c3b5c355873b65558537224d5a241b92605a49499ba4d5e6"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "185ee26eb9a33ba534805b5b3547b3524bf11c94614adc252f7d17b41279d312"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "1be85c39fa8b09a6bc2b11a47d04f0447628c3ed8a775d27c8e04577627ed63e"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "e868d431d77b419bae6fcc7e1e137815ca8cbad6673074469005c606023d7983"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "fa4db6ff8047a5e11411e507df4f84baac5511a1709d5685a2a6e8da0d2e1f25"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "40c1eeabbd9d877750bee7f5f4a6b6f2108aa364ace8eefff26806a5bafca5eb"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "4bdff4418bc0c9acc7d3b00ccc6500d51e65a501c2438e99e22c03bbeb36dfff"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "541b5f434e6354bb6a4c50abb828a49383b1d1a9fb31d6b99c1f052ef73bc2f2"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "9e954408406762e55fd40487cad589c876285145931f8a12ff6ced29d9583cde"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "06a57772563456d5283b9a36b9e6cbb5efb4f33e4ea29ac2446055e0a965b8c9"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "42a8d995ac906c7fb4a1952db62d1717aa7c4660a2e7e794da3aae6aaac6f9c9"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6fed1e74c6323d2909caf471ca733df46224afcb0c632d5fa0f0d80d6157efd3"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "c29d8ff69ec2a8b5f508b7c56cd8679fe3b322f7e2e87f10303fd8bca1b93230"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "a69a7ceb4fa85cc43c367f1ddebafa76808e83d3044c158287a5923b82fc3093"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "e38e75976891204fde647d389b6c89c807d378a534d6e04582024755a3cb6139"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "39a0d3f865c462b5d3ae569825befd61dbf3ee5a6b2b81d3b9d31f4c98cf7b72"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "3ccedf1ad79135d825f762dd09da88be23901591b27ea7e61a887d5398284a46"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "ea29e40d41442ab373855acd7b40927fc5a0408f9d3bb4a0c6a2021cd8b0fca2"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "f6170909b6527e935584673a17d1245c33142a755a9db45dda2de240871fc6c0"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "15531f4e4652d533fd8cb8d3be8b5e24717240160d885629eecc7f08d8cd0701"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "9100cdf6ba87959dfbdf756c925f6a2f35fc0c6ed453625a23eccc48f0bdf331"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "9bd00e4e2634e9f922d6c1d4ef82dcba53f88fa6d7d1986037665a42109d39d2"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "e2ca3832625efa908c6d88627960e1d98255d14095a36033cddaa50065172da0"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "676120061a33c1bbbd381ea1d84b271c6e21d4a531ba776f67f7a02fd91fb99e"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "c69d6b8a8de474e460c89ba442e25aa39fe761225f7c4b12eb1df88021a6b6c3"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5a6af10060b8ea8acd3955a4056765574873e9341e4627ddcbf9811724f5eac0"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "92ce7cb5db9d94e291d7275b8817640c68dc061a3947317cba76ceb263a4b614"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "39849a4d38a96ebca9727b65093c36d8d50cadddcdea7ea404ee4aeff10fec0d"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "fa42ef419e173181166c6797e37571df6b7c25797a5caf8ca44c34b4f2faacdb"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "2c9c81db8c15116e6061de0b44dcb34579ce305ca30af284cf9eac52630fef55"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "b253607b29565169d74c491772ba2887c3e2c0dfcc3a7cedf91afa0bb073ff72"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "03e7781cd0c3fef0596e55ba8a711ef8b8f300e48297ef3cad7885b2b118864f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "18fe799b1b675e5513ddf9edbe845bfaaafd67162e9d34250a31d0ee05bc9bba"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "4fd1be2d2c6a703544b82bf977ea63df3e295c16c9ea97573ee57945e07639ee"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "e96f7302d47897c3fc58a2777aed666aca29641500e912cee1bc59406df8e500"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ede709c9e6014edbc543511d99a61acfb0d40b796ed5ab42267ae7f8efb6583c"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "fbfc0d476817c7076a72fd6fe2519c6a347fb062f696a8fe0c969182750d1d11"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "d30dda991111ae5bbf7252d889cef53258317d3570e56360db3d7676a8fc7602"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "eba61a1417ba4cb4885732d2eb621f5a385b4b433f706d52bd1b401d2298985e"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "92dc3a2aaf30c5bb16462ee7d73a5df6f8b5d2d1530f5d1fb4b90460e84dc77f"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "e5db15f32c819d3b0e670ac975d7afc118915abeaf4a9f0a02a5b67c490605d7"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "0c689f622a0770a0b0d8f87d35513f9fbc110ca507d0b8b3bd426f763a0f77c4"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "f49e5f3bf1b4616f52e82c480f9a4752269f393d79de2274fc0562cfe9fef1ea"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "06100c2a82b3c31ea85f1f1d8856db62f2a73142fd1263e3db5df679f8843d8f"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "8358a935935215fea5eb75c69cf63bb5fc5c22bcce76939cfb804f3ee9f89e54"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "16a0f71efcf71640234501e3c8a3bd1befe15e1bb0bacc83ff590d6c780a0e5b"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "d5d0371ade5603cb725d6677983df037da06acb13207550b8a1a88c2948e992b"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "287b1fda3bb2d8d27ea22ea4c8c21d7ee0b3a5d439ea32e72dfc882fd64c5765"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3bddd9f4e742ad80bb6d35f3db8ea50cd496ad1be06003e67b4fcc290945bab8"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "5a5cb16f45d1c3ccd9e0fd0b21a7b55e90b49f0b37cd550bd89cb6c00d92046c"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "aea52fd5f8d8d5b720e1fde907b9a7b7638b384b71d01295b08749df06c578bc"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "a5d7a95ed93277c5e7191f868df343d1a1d14e6c692cac1e6069fd9ee7177273"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "b3100ead31d208968edd5b8545b641d0db9692d31a63e07fa9c391dca61de8a4"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "059ed2a01afabebc7bd28cc79841debcaaa0bf015f28145c719396d4e612f535"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "75874c6fcabb21332095562b9f86b7c6b668efdfb09904b83fa20743e1740790"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "7eda8e02a15284a0e6814072a0212457a25bcfef5058e1c376fc22facb2970f1"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "9fb0150098810b152ecf95e0826a3bac1dbffdfd2f8f2ce400841cb4981e3f3d"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "6929e9c0580e62cffb3bfffb1398f35b7ac59dcc3d76a4a5c49a20cfb72e6d60"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "19e2098131a6e280f1f8e8bae7c623ebe1081b0ea0dea81ebbaea51111774729"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30f95bf5d5974ab417ff5a24fad78687b88b3f16e2337a3a4a22dd4f1d670c7a"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "85000f577549ccf35b2a43dc3a79264b78d100dce1e0cfd3418a0ec1f87cff90"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "ef31dbfc1cc4528ee762e384d5e12fb6383f57ea34d4d1625975a2341d5004da"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "d2f8330081a203477c6fc6007230f3893290c17aab4ba9e8ed591ddc337dd73c"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "86be66b6f8075cd85470e60a1e278fb7992fbd130b6481f0ebc21e9ad46c647f"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "a2b19e3ce3a747e4b1e5b52d463e3f5822e8e120a7e043d83057746552fa9867"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "632ece525a79537acad192f8ec37fbb1e3423bcf64b1af5d18da34f1410ffbae"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f45e4701d4b81e4a5a052b5759616540317b9e89e241dc97ad1ffc39b18abaed"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "9befe92c296b57c7a7b97ecb6eb23803c93949056177df72bc111c6e18d497f0"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "343ef548a102a63a96b1a10745ff7866f30ac6524d4f7a2ced1be3cb3bd9f64c"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "010c9225f56a3d9f552f77502daf2e70e88e45f85b39f183907741ad773cf811"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "ed60c8dd0abda8c8cabdf34fcb96d39463cde9cdf1247af44438da7586490120"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "03affa186bb66fabd9b61d0e53cb7f75aa13702a58fd2dd551e6da1b6e9cfd87"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "d60419e5ebeec445e8efc8d9db59d093060be86af140605c8019a8f24680c4bb"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "e1b6c1f3f30ea522410f947c9cf331e3d580a1620af63401186d435707a041d8"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "6d873704a2cbeb2549dd2e55b8c915292b7167ce2f5022defd3bb2c0ad29da58"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "6441f90eda22808c37bca023748efee7735cf9b18b1d21ce75878c10da8baad7"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a54afdf7dcadb94bfe2bc6ea3d6232d311568a74ed3fd93becff9cd57063ff0c"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "989f400b587a75160a4ef1b6913819e0bd2c8b0689753b233943e61412bdba4d"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "c294e1a4173dd14222d0edba31c529a3f9005412de728b1a17602e2a89c84af8"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "f6eac1108efaaa0c5f34c4856e7db5236c60b8aba7c99558b32b4e60f1df3dea"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "74132bc1e0fbe03c462399860168928bb1bca20ee1b0bf9a80262538ce320f57"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "09fea4be7480ae51d7d68bc4b044c4d4a79e405893c4952ae083a8f417b99b85"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "c8c5d621d975cfeb22695e589dd69a360d1b1dc6a4d0f52afc3b778835fbdb55"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "19af889a9205d99080aa1a0afc7c75d0c43a970f864d4cefb956cc37c618b7d7"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "0074802e84cab6ad21de7d960709ba15531705f4ff60bf141a917edb5295c201"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "ae301f557be17b60290ee0910053fc99ab367fd6a68b4f0c27e1e80316fea95d"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "567009788743148001e842418bfa520275ae6ed39857fd99da90ea37f6635008"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "0491d2760611a5709c23df1a3ae618b4bc069c4af5ce2b2b7ae491bac390c058"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "64e4cfe3e899cbd71ac3c3b6052d742bae4215704eeffb51f27c93f98ec7f3cb"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "9d72a5fdc02ce45030bf44d7d8b31274cfb3579efc93d064824e6909fef2ed81"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "f04d7404ce637abd3d807484422970852db0253da3da0a0654f3bea213f352a3"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "853112a5c6fda45afed60a9c9f2d5f9fe972d21b092ae83cc4a3796f1be90b91"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "36b0cef0ba9e483b13ce5f9fd12e7bc11e2bd0270b5b34e5b2690e79248724b5"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "fcb07754340c2558e94ce44ac6e1577fb4cd155577b6bece74ceb61b2bf204b1"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "cc842860d7abfc114c0db47d832508a70ea1ff0bc726fc58ccb875c245689d2b"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "325e8a27d49b1748ac7b5c2070d32df0d66c8d9b1b651136d500d2bb4bfefe14"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "dd4c6aad88ac32d6175320bd82026ae6b1c4f7b44fe04904743c7e7e3d270642"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "cbf801085b4a7a3b2ac84790b176fbea8e254b13776bd19413d4c5b6522645ea"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "9d60e3a8b5756bc3d3a9148dee458c28bed9bf1fac29587bd7e95318a78f59d8"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "4361a3dc02a0dc8a26716a96aa47f0c529e0942658fcd16b472d03ae1f0f50d7"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "b23b33c823ee55daa5a3f90a9f1f616fb8ea67be912182b6118521541f7039fa"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "3d2e37fbdd5af291bc90666460258b61e4b499007ad9bba5e6e48b3b3f9cb068"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "a7b904317bcf046f9139c415f1c453b66e355b31291211dc8dac76200902ac11"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8802522b5db21a9230ae856f90013d80a466a8c2caed35079318ece7028120cd"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "43e899856a625d8dea84c79c0c7d1dfa15f286da628cec9f99c351139de1831e"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "6ff994c056189d13a0c36cde5925e45ba3ba52ccab61486b338a1753eafc09c8"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "287e89ba01280eb778b1cf1f2fd9859610b46f2abfe369fe54d4af8cc1f675ac"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "5ee6ea3e48d526af3ef29ef374b40a0cafb299d32c1d6af4684382b8b171f88c"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "aae33e6b2e75a9db69d17d356bc49e026bf39199cd1612ce42aa41a102a1ac03"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "3a54ac3fc738e02c8ed9b7a730624497fab15dee4f9f82e84a526dd5600e300a"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "cc99d99214e6d847fc885af036783fe3c1b2a55b04c758bbb2fd5bd0a39463ff"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "804485d204392b52b4bfdbb28804f729614c53fa692a89e58f97161c89809bf0"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "8bdce5e6f97c2747ff209acee7fad24f2dc0e07801ee30754370bb0450d383f7"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "61ab133865b2c62ea88154917ddf1383a3157b96ac3b073568e392036874f5d7"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "695ef59b94626f03151c8bd68ea799b0ae5e879a57f8185af5557799211bda1f"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "014e8604790af3fa4af504986b86dc0de4bd2e53267548c01bb85e48bc90ffc5"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "8c803b613526d39618c8e82d9f981293ebb6799136697488ef4d10eb2a485808"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "bfc828d3882588a9909fef1d6731a6bc1636eaf53342a57d56e3fbc975133869"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "f25bc7dacd28fd2c907565ab608d504abcc2896118e4cd8813de28c75d26c569"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "cb94f869fa63215686465bb29a8c05f80611cd60a82d7cbded6ddf55577172e1"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "ecb185013de3d55cfafaa156821308453a90a123b99d122ea4ef7a29e7d7fab5"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "8719216b8cc0293d8aa23c04e2d663dfef515a7bc1b6e06a5f03bed3d6fb3b6a"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "f6617cf98b49d28ae7fa8e7d022587c6ed8138c758ff088c5abc78f7bdd52613"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "b0e57d139f359850558f40bad00b2c4e69da8e9d73ec9aa7d180b9f33d970449"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "2efcfe4b366f7ff5dc95c45cb229aeed316315fe4554651e5d0239985cd64fdb"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "3d579ed8e18d98c446a5f069d6d2e94a3ee234c75feffbaf99f561ef7bd45a2e"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "04090e4b4b412f79d1879340c36e36c65e4f23fde5dc545b4d855c8497ca47f7"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "9d202dd10b626ed9753ac5e243c14f6b1eee76e8edd40389f56003c4e8816c83"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "3b82124d8956e83657b30347ef3b5e44cf3813c1b02998b197c817c6528423c0"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "65ebb88e9e544c38a9d85a70a1920ed9c6ec03452762f98cb2fe104912074b44"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "fba7f18daee4832b9851615a0597dbde98a5271c5882d56ab4c1e0cb6d8c4783"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "e0ffc4b23cbf4a92768eff507335dffb92fad26d02662adf77e0ccff4f4b6c8b"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "555e30eaa6942543c7b1cd3569a6480016be5826a474a76c2ba8e2078d6d5b83"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "38bf63ae8365fbe1ca88b683d94c21cd5620a7397b3b344c0e4e938287311ec3"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "328cb7395e61924240f8e29399bf1d64179bce5bb911595cda422b741d9b6f34"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "8df9749d8dbe4218910026a8e4c4145b1f155903e577a16758d15eefbc2715f9"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "99cd036facc18242e5ab5df00a480e5c7c779b50fa95eac191bbebfa7343a270"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "4ce33a17b148329334e596186d274b9c262a779e7190f9777dd0673df12f7b4c"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "c22cd896e651b2e664128411710a80a33471319951f5aff3cfc86ff86de39a86"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "30351a15f43f905bf69e578d9ce14506ade61e805e34097f81bf8ac50f1f9ee9"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "c8930d6ebff4f7429af5daf72648651162543fa000acad0fb63179c2c3f150e6"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "10c61d7e3bc592f23811d5a06fcdc892a088cbef7fc3298e8ed9937dc7518b37"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "81483f6bdc85eb244904d3a8328d81391be24ea2ae7604cb00bbf922025afd89"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "8ac202a6eb0a3f08e9c34502b26b0cf1a85ab43850658cce7042f0afd5f9f50a"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "23fc8634b6dfa984c530292f7f01f9a2d43b196a8092f93cc435abd7a8d131de"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "9c96c0935b7a0124059caea758ba3319cc3a5977e542965f663d2daa54f5a32e"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "2d64f970c70f34bd726296b8aa2db243c245d2c36167a36de7032ae17fc1ccb2"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "1b0d6476248896b9224c5c69a944084677df45e273508bf8d629eb14b57662a9"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "05977173bdd460eab1ff5a7065067b4074417297e38dbc70c6cceedca0c933b5"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "3ef8950e8aa9f130aa66a1ad2cfdd21c2ba9572ef3e0d868d7a8fbf1ef8e3291"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "be101ca34d96577ccc6ba715235eefa9dd065f04a651e9a35786f9edb6278a98"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "d5b35faa3e0e09af778aebec4b33f39bbce98465a39edb2da15197671b777abe"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "995c1abcd5357cfda831d07ad6e0b762fbabda61601a58122acc2e8942fb944a"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "6c5b0df0a1448fcf1cebc8d82072d5653cb0432e2f787179526bae4cef774352"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "86f3ce21bc863eb8f3e0099d9386e0f38ad8b2c8e29a79e47bfda37acecd991f"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "0a21d13abb629549df74d956cc1c5f99c879980fbee2d269e1532610aebb404c"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "29cbf72f4990eb55d30a85a767d01c8077ab89af69eba3b7299d43871aaa165e"; }
+    { locale = "xpi"; arch = "linux-i686"; sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; }
+    { locale = "xpi"; arch = "linux-x86_64"; sha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "1527b8e9f245c96d0104f0b7d5c8dc696036fbb80067d14a1eee9a423ddd9368"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "ae294571b8433b646b5d65a0cb1ab7f42295b17369f5ec82c2383c654df28e20"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "98e5c8f912d1a03f5c0a2f14b63f350823d15f1253e15a318b61227ba82fec0e"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "49ee58ad3978113e10de520eb094fc9c0f4d740ca6c0a0e07d5743e313163d0f"; }
   ];
 
   arch = if stdenv.system == "i686-linux"

From eb3662183913d0179c97c1a8c2bfb462f5a47296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:45:21 +0800
Subject: [PATCH 0869/2033] dvtm: update from 0.10 to 0.11

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

diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index 9cefa11ce69..55e8367538a 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dvtm-0.10";
+  name = "dvtm-0.11";
 
   meta = {
     description = "Dynamic virtual terminal manager";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0lb6p06jfaz1z07k0v2gipzx67swf7rijz17g5ndhng2g0jqfl3p";
+    sha256 = "11zb5wnvmcx8np2886hwaqijvhdw8l87lldxhgqikw2ncpgrz8h1";
   };
 
   buildInputs = [ ncurses ];

From 6324296900361fc06741fef8d548b0c4ad145999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:49:56 +0800
Subject: [PATCH 0870/2033] gst-libav: update from 1.2.3 to 1.2.4

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

diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index ee2cb8830b0..699f30a0530 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -6,7 +6,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.2.3";
+  name = "gst-libav-1.2.4";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "1mmwyp6wahrx73zxiv67bwh9dqp7fn86igy4rkv0vx2m17hzpizb";
+    sha256 = "0dzhs73vzl0kvrj0y6w8vg1bnh9mmcly5qnr94rbjbgwcc6lhs9a";
   };
 
   configureFlags = stdenv.lib.optionalString withSystemLibav

From 98dd37afad10a68acc0d581a907ecb1637ae1bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:50:39 +0800
Subject: [PATCH 0871/2033] gst-plugins-bad: update from 1.2.3 to 1.2.4

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

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index eed4c12f254..b6001779a75 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -10,7 +10,7 @@
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.2.3";
+  name = "gst-plugins-bad-1.2.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "1317hik9fdmy300p7c2y3aw43y6v9dr8f1906zm7s876m48pjpar";
+    sha256 = "1jifzrgr4y3566d2lq30fibcd4rb8z8vpqnr2gihbmymr4z16k4q";
   };
 
   nativeBuildInputs = [ pkgconfig python ];

From cd5702da472720470d0356faf472a46b18fba111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:51:05 +0800
Subject: [PATCH 0872/2033] gst-plugins-good: update from 1.2.3 to 1.2.4

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

diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 090c84600ab..d0f989a22d6 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.2.3";
+  name = "gst-plugins-good-1.2.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "0w74hms2zg0rnhilj9cbhx9wfiryrkcvhr1g90scrg8mllv3bcxz";
+    sha256 = "1lr0yk352jrcgxadi9mvjgkli7xiwwnc15by71w5wbiw75l07jf9";
   };
 
   nativeBuildInputs = [ pkgconfig python ];

From 69c4dae3794193dda650a2d917b7a4bf0265b946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:51:24 +0800
Subject: [PATCH 0873/2033] gst-plugins-ugly: update from 1.2.3 to 1.2.4

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

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 4f16fa4259c..7f161f141a9 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.2.3";
+  name = "gst-plugins-ugly-1.2.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "0fzbazgqrbyckbh2xqlzslzmm638bddp1fw8cc19kr7f0xv0lysk";
+    sha256 = "1a4fk0mv21az5wz2wz0xmd0w13y2nhhbdispsj2q6yym8xmggxjf";
   };
 
   nativeBuildInputs = [ pkgconfig python ];

From b57c9ed9d5f446cc829c70f4101a956dd6dfe47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:51:46 +0800
Subject: [PATCH 0874/2033] gstreamer: update from 1.2.3 to 1.2.4

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

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 881f31c66a6..37b69efaa81 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.2.3";
+  name = "gstreamer-1.2.4";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "1syqn0kki5disx01q3y0z6p5qhr2a5g388wc6s649cw4lcbri6hg";
+    sha256 = "0aa93cqzrhm1z7rkzk343p251ifvih0d0l8xsng2ra3hg1xacz0y";
   };
 
   nativeBuildInputs = [

From 4080e415cae58c086f11fafe55ee9d978189133a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:52:27 +0800
Subject: [PATCH 0875/2033] mate-icon-theme: update from 1.6.2 to 1.6.3

---
 pkgs/misc/themes/mate-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix
index fe19a45b2ac..ba732c6521f 100644
--- a/pkgs/misc/themes/mate-icon-theme/default.nix
+++ b/pkgs/misc/themes/mate-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
 
 stdenv.mkDerivation {
-  name = "mate-icon-theme-1.6.2";
+  name = "mate-icon-theme-1.6.3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.2.tar.xz";
-    sha256 = "1ahijywk6vj8yyiglqdpc56dkczyj1v99ziblaaclmhi4sxxb5jm";
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.3.tar.xz";
+    sha256 = "1r3qkx4k9svmxdg453r9d3hs47cgagxsngzi8rp6yry0c9bw5r5w";
   };
 
   buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];

From f6b989e6f35fbdf5eaa9e2fc65a736b37ccaa98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:52:46 +0800
Subject: [PATCH 0876/2033] mate-themes: update from 1.6.2 to 1.6.3

---
 pkgs/misc/themes/mate-themes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix
index 32d1a24cbf4..f7559ee2126 100644
--- a/pkgs/misc/themes/mate-themes/default.nix
+++ b/pkgs/misc/themes/mate-themes/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
 
 stdenv.mkDerivation {
-  name = "mate-themes-1.6.2";
+  name = "mate-themes-1.6.3";
 
   src = fetchurl {
-    url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.2.tar.xz";
-    sha256 = "145mjdijjvkpjjgqdfwjp30jvvs0qzxlnh15q6mig8df6drg5fn6";
+    url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.3.tar.xz";
+    sha256 = "1wakr9z3byw1yvnbaxg8cpfhp1bp1fmnaz742738m0fx6bzznj9i";
   };
 
   buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];

From cccaf8c09142502e6aac2469769dea539150a4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:53:03 +0800
Subject: [PATCH 0877/2033] midori: update from 0.5.7 to 0.5.8

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

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index d3135e0be8e..5410800fabf 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.5.7";
+  version = "0.5.8";
 in
 stdenv.mkDerivation rec {
   name = "midori-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2";
-    sha256 = "0k8bppicgzm97g5x8ahvpw9wvg2f1mq093qp8biwr858m0mbnx98";
+    sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg";
   };
 
   buildInputs = [

From da98b7d65e2c79aaef76c766b5eea6fc2932f2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 16:53:29 +0800
Subject: [PATCH 0878/2033] renpy: update from 6.17.3 to 6.17.4

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

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 237e58b5f93..d3630888f64 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "renpy-6.17.3";
+  name = "renpy-6.17.4";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.3/renpy-6.17.3-source.tar.bz2";
-    sha256 = "1707xrjmnr4a209jqm4zkda0jyjd76f679g7d51g7vd5cs46s6ph";
+    url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2";
+    sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp";
   };
 
   buildInputs = [

From 388d32d966fc25c4c3bf355f41e00eea031454dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 29 Apr 2014 17:15:10 +0800
Subject: [PATCH 0879/2033] gst-plugins-bad: build with wildmidi and fluidsynth

remove timidity, the plugin does not build at all
---
 pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index b6001779a75..dfef29c558a 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -3,7 +3,7 @@
 , faad2, libass, libkate, libmms
 , libmodplug, mpeg2dec, mpg123 
 , openjpeg, libopus, librsvg
-, timidity, libvdpau, wayland
+, wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
 }:
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123 
     openjpeg libopus librsvg
-    timidity libvdpau wayland
+    wildmidi fluidsynth libvdpau wayland
     libwebp xvidcore gnutls
   ] ++ stdenv.lib.optional faacSupport faac;
 }

From 6548fbfb281c31658d22aaa0439287a77c9bf658 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 3 May 2014 00:19:55 +0400
Subject: [PATCH 0880/2033] Use the working source for GNU ARch

---
 pkgs/applications/version-management/arch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index 350b842a095..3dd8b9f860d 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "tla-1.3.5";
   
   src = fetchurl {
-    url = "mirror://gnu/gnu-arch/" + name + ".tar.gz";
+    url = "ftp://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz";
     sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0";
   };
 

From 87304674a648a6297e04b2b50a6290181cb2b541 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 3 May 2014 00:42:12 +0400
Subject: [PATCH 0881/2033] Update JWM to an easily available version

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

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 57e6ecf1749..73c5e5df81a 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype,
   fontconfig }:
 
-stdenv.mkDerivation {
-  name = "jwm-2.0.1";
+stdenv.mkDerivation rec {
+  name = "jwm-2.2.2";
   
   src = fetchurl {
-     url = http://www.joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2;
-     sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
+     url = "http://www.joewing.net/programs/jwm/releases/${name}.tar.xz";
+     sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln";
   };
 
   buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype 

From 4c55ae85888f4cddd4af2ffea3ac05fa0751ddaf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 3 May 2014 00:53:46 +0400
Subject: [PATCH 0882/2033] Update TPTP and make URL set robust to moving old
 versions to archive

---
 pkgs/applications/science/logic/tptp/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 68d1cca7e73..ef00b135c27 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -11,15 +11,19 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="TPTP";
-    version="5.4.0";
+    version="6.0.0";
     name="${baseName}-${version}";
-    url="http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz";
-    hash="0rvrmh3vw4bk7mj29bx1pi76g2bsqyc13gsnpa1cbjs5pzyhm780";
+    urls=
+    [
+    "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
+    "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
+    ];
+    hash="0jnjkqdz937c7mkxvh9wc3byw5h1k19jss058fbzdxxc2hkwq1af";
   };
 in
 rec {
   src = a.fetchurl {
-    url = sourceInfo.url;
+    urls = sourceInfo.urls;
     sha256 = sourceInfo.hash;
   };
 

From aea5277ca2005b279f75dc295cf9e8e0765439aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 3 May 2014 01:08:15 +0400
Subject: [PATCH 0883/2033] Switch Axel to a publically accessible download
 source

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

diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 8a6d63d164c..4103d17bfa2 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -3,8 +3,11 @@
 stdenv.mkDerivation {
   name = "axel-2.4";
   src = fetchurl {
-    url = https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2;
-    sha256 = "ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612";
+    urls = [
+      #https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2
+      mirror://debian/pool/main/a/axel/axel_2.4.orig.tar.gz
+    ];
+    sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im";
   };
 
   meta = {

From 7d788d5e4f5d627dcd1dc1cac315b99747da2be6 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 2 May 2014 19:15:38 -0500
Subject: [PATCH 0884/2033] Add expression for the Agda standard library

---
 .../compilers/Agda-stdlib/default.nix         | 26 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/compilers/Agda-stdlib/default.nix

diff --git a/pkgs/development/compilers/Agda-stdlib/default.nix b/pkgs/development/compilers/Agda-stdlib/default.nix
new file mode 100644
index 00000000000..d71713674f7
--- /dev/null
+++ b/pkgs/development/compilers/Agda-stdlib/default.nix
@@ -0,0 +1,26 @@
+{ cabal, fetchurl }:
+
+cabal.mkDerivation (self: {
+  pname = "Agda-stdlib";
+  version = "0.7";
+
+  src = fetchurl {
+    url = "http://www.cse.chalmers.se/~nad/software/lib-0.7.tar.gz";
+    sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3";
+  };
+
+  preConfigure = "cd ffi";
+
+  postInstall = ''
+      mkdir -p $out/share
+      cp -pR ../src $out/share/agda
+  '';
+
+  meta = {
+    homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
+    description = "A standard library for use with the Agda compiler.";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
+  };
+})
\ No newline at end of file
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dd7510e4c3f..5d361062121 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2919,6 +2919,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
 
+  AgdaStdLib = callPackage ../development/compilers/Agda-stdlib {};
+
   uhc = callPackage ../development/compilers/uhc {};
 
   epic = callPackage ../development/compilers/epic {};

From 2b11ec44e8fc33231a44ac99733d0f12e76b265a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:53 +0200
Subject: [PATCH 0885/2033] haskell-hledger-irr: update to version 0.1.1.4

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

diff --git a/pkgs/applications/office/hledger-irr/default.nix b/pkgs/applications/office/hledger-irr/default.nix
index 430b93011a3..303c6486381 100644
--- a/pkgs/applications/office/hledger-irr/default.nix
+++ b/pkgs/applications/office/hledger-irr/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-irr";
-  version = "0.1.1.3";
-  sha256 = "0vjf478b9msmgr1nxyy8pgc9mvn61i768ypcr5gbinsnsr9kxqsm";
+  version = "0.1.1.4";
+  sha256 = "0nqd8br86d71dpwq7p8956q74pgqdimid42xikp9zvf632x2s8ax";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal hledgerLib statistics time ];

From 084cec94045c1f9be4905539e4809f1bc5bc8fad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:54 +0200
Subject: [PATCH 0886/2033] haskell-arithmoi: update to version 0.4.1.0

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

diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix
index 082745fadf0..e4d1f522bc1 100644
--- a/pkgs/development/libraries/haskell/arithmoi/default.nix
+++ b/pkgs/development/libraries/haskell/arithmoi/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "arithmoi";
-  version = "0.4.0.4";
-  sha256 = "1v8qn0gjvlds6ljm9sfzzi5w3gsf7x63z0r7hcs1rvn0n3acwz6y";
+  version = "0.4.1.0";
+  sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq";
   buildDepends = [ mtl random ];
   meta = {
     homepage = "https://bitbucket.org/dafis/arithmoi";

From 48f2ae7dec3dbf026b8479dac124d3e70dfee5eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:55 +0200
Subject: [PATCH 0887/2033] haskell-classy-prelude-conduit: update to version
 0.9.1

---
 .../libraries/haskell/classy-prelude-conduit/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index 5324054423b..e63f2e8ac78 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.9.0";
-  sha256 = "1lvi5n2km6l2saspiczpkvaq6670bp658kn83s334h6s6wlba3dz";
+  version = "0.9.1";
+  sha256 = "1y3jxhly9y1yhr2qz3b1jf6sg4s0mwq9xq1mp765wa20hmwjayvg";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void

From b4893842d2c966b4a9acc82c7c84a5dc529f533f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:56 +0200
Subject: [PATCH 0888/2033] haskell-classy-prelude: update to version 0.9.1

---
 .../libraries/haskell/classy-prelude/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index 4c142a23f3a..f64235c8602 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -1,16 +1,16 @@
-{ cabal, basicPrelude, chunkedData, enclosedExceptions, hashable
-, hspec, liftedBase, monoTraversable, QuickCheck, semigroups, stm
-, systemFilepath, text, time, transformers, unorderedContainers
-, vector, vectorInstances
+{ cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions
+, hashable, hspec, liftedBase, monoTraversable, QuickCheck
+, semigroups, stm, systemFilepath, text, time, transformers
+, unorderedContainers, vector, vectorInstances
 }:
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.9.0";
-  sha256 = "1y4440jy7x9ns4kyb638f5lfa1h3vq3wwcwzkpswr8rf8f7z1bj6";
+  version = "0.9.1";
+  sha256 = "08rcfgr2mjgjvacmyih693pvq9jwfj9nshkazw8x6wlzlwr56ag8";
   buildDepends = [
-    basicPrelude chunkedData enclosedExceptions hashable liftedBase
-    monoTraversable semigroups stm systemFilepath text time
+    basicPrelude chunkedData enclosedExceptions exceptions hashable
+    liftedBase monoTraversable semigroups stm systemFilepath text time
     transformers unorderedContainers vector vectorInstances
   ];
   testDepends = [

From 6fe44baced248e05f62570b6f72a0e6276f93a2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:58 +0200
Subject: [PATCH 0889/2033] haskell-conduit-combinators: update to version
 0.2.5.1

---
 .../libraries/haskell/conduit-combinators/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index b88b15cef67..dc0e872a032 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.5";
-  sha256 = "1by9jjflascchs7gf53fk5srv3ihrir8jqac6zyq74fjclx3b6z0";
+  version = "0.2.5.1";
+  sha256 = "1xz8vh9pvh3897lnv1vs69g079q6qvbh334gpfnkc5lb7hvdw7qv";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

From 6e58bbe32b74c69e3b0f74b594410da1637712b5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:43:59 +0200
Subject: [PATCH 0890/2033] haskell-conduit-extra: update to version 1.1.0.3

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

diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix
index 1f6f2c1e24c..eb07ffc480f 100644
--- a/pkgs/development/libraries/haskell/conduit-extra/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-extra";
-  version = "1.1.0.2";
-  sha256 = "0n2k1cz04wkhw7l6qh1zm5dmarml9bbyf8zl6430j0mw5i4hwxr2";
+  version = "1.1.0.3";
+  sha256 = "117lirx05pgpmys6dlknkcni3znrvqyhmj6djqxnqbjcn3ynhqdk";
   buildDepends = [
     attoparsec blazeBuilder conduit filepath monadControl network
     primitive resourcet streamingCommons text transformers

From 92c9b2eb8fcf32b832bafe471ddf6adb37c72a80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:44:00 +0200
Subject: [PATCH 0891/2033] haskell-conduit: update to version 1.1.1.1

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index cdc5e4e56ff..e4c15c7900a 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.1";
-  sha256 = "0k6b8khy3h5qnhgqk4xjghhryi5a830qznqlas89p0yw5qsqgish";
+  version = "1.1.1.1";
+  sha256 = "18i96faiik16375y2ysnfkfnrjgir4dnbq3w5ykzhrvw43z8pm7g";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From 7cbf87792a3d744f428d2b8a78e5c1f31ac6c3d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:44:01 +0200
Subject: [PATCH 0892/2033] haskell-hledger-lib: update to version 0.23

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

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 41baa284cb6..47c55e22c30 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.22.2";
-  sha256 = "183ypncr1bvab84h57aql27rgjaxka38a267873l1hpvpsrw61hf";
+  version = "0.23";
+  sha256 = "1zyg4py321lvgy1al4flyxrmsz0vj8z2y99v9k5fa8s8rfa1qxvl";
   buildDepends = [
     cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
     safe split time transformers utf8String

From bad008d48a567fdea57dfdcb68245fa6a5756231 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:44:03 +0200
Subject: [PATCH 0893/2033] haskell-hledger-web: update to version 0.23

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

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index 8851b54e4ef..b63c1f9b8e2 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.22.8";
-  sha256 = "0588r4hgy7800jla5jma96a7pmm64b116w6ffid9v5j52qjxyhf3";
+  version = "0.23";
+  sha256 = "1g1brcwkzs3nz5sllsv4zqyz97vydfbbdhbvgh0x9fgxd89qc3cj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 49503c10c7a56317a94a47a3301b0540202f3b49 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:44:04 +0200
Subject: [PATCH 0894/2033] haskell-hledger: update to version 0.23

---
 .../libraries/haskell/hledger/default.nix       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 7dc6bdf5ac8..51475ea73dd 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -1,23 +1,24 @@
 { cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl
-, parsec, prettyShow, regexpr, safe, shakespeareText, split
-, tabular, testFramework, testFrameworkHunit, text, time
-, transformers, utf8String
+, parsec, prettyShow, regexpr, safe, shakespeare, shakespeareText
+, split, tabular, testFramework, testFrameworkHunit, text, time
+, transformers, utf8String, wizards
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.22.2";
-  sha256 = "08lk3gd332k5bhvr6db4z66f2rggzbdbhcb03sc5m0dbinawmib8";
+  version = "0.23";
+  sha256 = "1cylviyz3n6kcsdcr1vx699v6fn1878n4z8y8cnxawq2daz4xhpk";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     cmdargs filepath haskeline hledgerLib HUnit mtl parsec prettyShow
-    regexpr safe shakespeareText split tabular text time utf8String
+    regexpr safe shakespeare shakespeareText split tabular text time
+    utf8String wizards
   ];
   testDepends = [
     cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec
-    prettyShow regexpr safe shakespeareText split tabular testFramework
-    testFrameworkHunit text time transformers
+    prettyShow regexpr safe shakespeare shakespeareText split tabular
+    testFramework testFrameworkHunit text time transformers wizards
   ];
   meta = {
     homepage = "http://hledger.org";

From ca35c44408c2f485f43507f396facf28c10364be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 May 2014 23:44:05 +0200
Subject: [PATCH 0895/2033] haskell-streaming-commons: update to version
 0.1.2.1

---
 .../libraries/haskell/streaming-commons/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index a12f7254187..dcef167cd82 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.2";
-  sha256 = "1n1gav19bc9ifgwhlz4qlrnpgq0fk4x98v6s19zxr88v89rlxdd7";
+  version = "0.1.2.1";
+  sha256 = "1skixb3cc47sfnq9w6r1qdw6d78wirrv4llrwikih0w7h0i8aqmx";
   buildDepends = [ blazeBuilder network text transformers zlib ];
   testDepends = [
     async blazeBuilder deepseq hspec network QuickCheck text zlib

From 062e2567c913430aea5d3e26021618bba1aedf62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 10:30:47 +0200
Subject: [PATCH 0896/2033] curl: minor update 7.35.0 -> 7.36.0, including CVE
 fixes

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 10bfc0e21ec..3d23d7950fb 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -13,11 +13,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.35.0";
+  name = "curl-7.36.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "10qdzk3lfdpg8lvg8wfiqbfjp5yxyv25y1y2679vgwal2iqd2x6p";
+    sha256 = "1kfgygvmxgaakxl2f3h3jlar23n6xmvg03ybm36pqsydkfw85ghz";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -30,8 +30,10 @@ stdenv.mkDerivation rec {
     optional sslSupport openssl ++
     optional scpSupport libssh2;
 
+  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
   preConfigure = ''
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+    rm src/tool_hugehelp.c
   '';
 
   configureFlags = [

From e0be3df0eb06d5bb8f5949a826febf6b878ddc68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 10:21:48 +0200
Subject: [PATCH 0897/2033] harfbuzz: minor update 0.9.27 -> .28

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index f564c4bf1bd..2e596b17af3 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.27";
+  name = "harfbuzz-0.9.28";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "1ns7njbm45fjbc9p7gcpjc606ax120ab0i9cbx6v3mcq3kllln08";
+    sha256 = "0j70ppl2qrfx8yzdl8ki63wcxgrlhkyl31p1a6bhmbqqh32zfrx5";
   };
 
   configureFlags = [

From 3bb121e50eda9b80e3132c53251b93f3b4166b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 10:22:12 +0200
Subject: [PATCH 0898/2033] dbus: minor update 1.8.0 -> .2

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index d0e2f2e3dbf..06e75b0a7ad 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 let
-  version = "1.8.0";
-  sha256 = "04qbsyw92279hfkwic5h6jc5999p87qsaqqgc6zcqddmh9r8r7vn";
+  version = "1.8.2";
+  sha256 = "025f7dnhr4gy5vcqsvn78x2bk382ldvf4x3ryd9wkbb5250zg2an";
 
   inherit (stdenv) lib;
 

From 8c918bdc2c3235058f317b65ab79f7c9414747f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 11:27:10 +0200
Subject: [PATCH 0899/2033] rsync: fix CVE-2014-2855 by upstream patch

---
 pkgs/applications/networking/sync/rsync/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 5265faf87b6..0b3343b6731 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -20,7 +20,12 @@ stdenv.mkDerivation rec {
   };
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
-  patches = [] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
+  patches = [(fetchurl {
+      url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a";
+      sha256 = "1jpwwdf07naqxc8fv1lspc95jgk50j5j3wvf037bjay2qzpwjmvf";
+      name = "CVE-2014-2855.patch";
+    })]
+    ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
 
   buildInputs = stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];

From 6faa50e11d3daec0772391834c7f67fa8fad9a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 11:38:20 +0200
Subject: [PATCH 0900/2033] libmms: bugfix update, including CVE-2014-2892

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

diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix
index 0f6d220861c..441b4ea7f9a 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/pkgs/development/libraries/libmms/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, glib, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libmms-0.6.2";
+  name = "libmms-0.6.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmms/${name}.tar.gz";
-    sha256 = "0cm4gq5jm8wj04biai6cyvlvdwv286vb3ycyzi870z9d2xi1p4q1";
+    sha256 = "0kvhxr5hkabj9v7ah2rzkbirndfqdijd9hp8v52c1z6bxddf019w";
   };
 
   buildInputs = [ glib ];

From ab7e2f1dc52ea8e4c33434e8d29dd99d02414551 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 2 May 2014 03:42:56 +0200
Subject: [PATCH 0901/2033] haskell-HTTP: update to version 4000.2.13

---
 .../libraries/haskell/HTTP/{4000.2.12.nix => 4000.2.13.nix} | 6 ++----
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.12.nix => 4000.2.13.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.12.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.12.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
index b42703a403f..e3c4282b5ae 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.12.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
@@ -5,15 +5,13 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.12";
-  sha256 = "0zaynz8s70xzqxxrr8yjxwc7qspd4q2ig1vqjz1p4qqm72rs3jwl";
+  version = "4000.2.13";
+  sha256 = "1lff45nad6j2bc6waav1z95na0bif2figxiw86g2w741p7idxyy4";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
     network pureMD5 split testFramework testFrameworkHunit wai warp
   ];
-  jailbreak = true;
-  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 23d3f14d091..be8646838cc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     haskellSrc   = self.haskellSrc_1_0_1_6;
     hashable     = self.hashable_1_2_1_0;
     html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_12;
+    HTTP         = self.HTTP_4000_2_13;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_3_1;
     network      = self.network_2_4_2_2;
@@ -1370,8 +1370,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_12 = callPackage ../development/libraries/haskell/HTTP/4000.2.12.nix {};
-  HTTP = self.HTTP_4000_2_12;
+  HTTP_4000_2_13 = callPackage ../development/libraries/haskell/HTTP/4000.2.13.nix {};
+  HTTP = self.HTTP_4000_2_13;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 64d662e0568ee541cf87a6c7092dd810af579c0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 12:37:17 +0200
Subject: [PATCH 0902/2033] Agda: move compiler and standard library into a
 common directory

Also renamed AgdaStdLib attribute to AgdaStdlib, since upstream doesn't
seem to capitalize that name.
---
 .../default.nix => agda/agda-executable.nix}                 | 0
 .../{Agda-stdlib/default.nix => agda/agda-stdlib.nix}        | 0
 pkgs/top-level/haskell-packages.nix                          | 5 ++---
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/development/compilers/{Agda-executable/default.nix => agda/agda-executable.nix} (100%)
 rename pkgs/development/compilers/{Agda-stdlib/default.nix => agda/agda-stdlib.nix} (100%)

diff --git a/pkgs/development/compilers/Agda-executable/default.nix b/pkgs/development/compilers/agda/agda-executable.nix
similarity index 100%
rename from pkgs/development/compilers/Agda-executable/default.nix
rename to pkgs/development/compilers/agda/agda-executable.nix
diff --git a/pkgs/development/compilers/Agda-stdlib/default.nix b/pkgs/development/compilers/agda/agda-stdlib.nix
similarity index 100%
rename from pkgs/development/compilers/Agda-stdlib/default.nix
rename to pkgs/development/compilers/agda/agda-stdlib.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 234b630ece9..f9cb9d0f398 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2921,9 +2921,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   # Compilers.
 
-  AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
-
-  AgdaStdLib = callPackage ../development/compilers/Agda-stdlib {};
+  AgdaExecutable = callPackage ../development/compilers/agda/agda-executable.nix {};
+  AgdaStdlib = callPackage ../development/compilers/agda/agda-stdlib.nix {};
 
   uhc = callPackage ../development/compilers/uhc {};
 

From 73e82b9e078b2bf518a1a18aa6a2e0a0164d291a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 3 May 2014 15:12:51 +0200
Subject: [PATCH 0903/2033] s/config.allowUnfree = true/allowUnfree = true/

---
 pkgs/stdenv/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b0031178bbd..14da127b9e0 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -62,7 +62,7 @@ let
             Package ‘${attrs.name}’ in ${pos'} has an unfree license, refusing to evaluate. You can set
               { nixpkgs.config.allowUnfree = true; }
             in configuration.nix to override this. If you use Nix standalone, you can add
-              { config.allowUnfree = true; }
+              { allowUnfree = true; }
             to ~/.nixpkgs/config.nix or pass
               --arg config '{ allowUnfree = true; }'
             on the command line.''

From 849f6788acd5abc5cde63e02f1129ad8aa16bd05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 3 May 2014 15:14:36 +0200
Subject: [PATCH 0904/2033] darktable: update from 1.4.1 to 1.4.2

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

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index d4983ca04d8..c4e2a7534af 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.4.2";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
-    sha256 = "1pkixhiyyjx5wx4dlkvabga9glcx374f1ic2kxmzzdprfm6kkqfd";
+    sha256 = "02875rnabw5m9aqfls59901889iyxkmm4xk445fvh1v06dp1lcf1";
   };
 
   buildInputs =

From 599f9a09fe4a3d703ec7af19317db0e448a3b1fb Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Sat, 3 May 2014 17:36:03 +0300
Subject: [PATCH 0905/2033] haskell: bump ekg to 0.4, add ekg-core

---
 .../libraries/haskell/ekg-core/default.nix         | 14 ++++++++++++++
 pkgs/development/libraries/haskell/ekg/default.nix | 12 ++++++------
 pkgs/top-level/haskell-packages.nix                |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/ekg-core/default.nix

diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix
new file mode 100644
index 00000000000..6c332f832cd
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ekg-core/default.nix
@@ -0,0 +1,14 @@
+{ cabal, text, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "ekg-core";
+  version = "0.1.0.0";
+  sha256 = "19ghqj9zbb198d45bw7k9mlf2z57yq74wgbkp62b9li2ndbcpdzh";
+  buildDepends = [ text unorderedContainers ];
+  meta = {
+    homepage = "https://github.com/tibbe/ekg-core";
+    description = "Tracking of system metrics";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix
index 28ef546163a..3f564a72a0a 100644
--- a/pkgs/development/libraries/haskell/ekg/default.nix
+++ b/pkgs/development/libraries/haskell/ekg/default.nix
@@ -1,14 +1,14 @@
-{ cabal, aeson, filepath, network, snapCore, snapServer, text, time
-, transformers, unorderedContainers
+{ cabal, aeson, ekgCore, filepath, network, snapCore, snapServer
+, text, time, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "ekg";
-  version = "0.3.1.4";
-  sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i";
+  version = "0.4.0.0";
+  sha256 = "1w448w17yp80zmb27yl90k3gz0nx3wxj52488lclmiapr6q4fgp8";
   buildDepends = [
-    aeson filepath network snapCore snapServer text time transformers
-    unorderedContainers
+    aeson ekgCore filepath network snapCore snapServer text time
+    transformers unorderedContainers
   ];
   meta = {
     homepage = "https://github.com/tibbe/ekg";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f9cb9d0f398..e92fec5f775 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1039,6 +1039,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   editline = self.editline_0_2_1_1;
 
   ekg = callPackage ../development/libraries/haskell/ekg {};
+  ekgCore = callPackage ../development/libraries/haskell/ekg-core {};
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 

From 47090c9bdc079c36a9ffeb36c1b12de288018755 Mon Sep 17 00:00:00 2001
From: Alex Berg <chexxor@gmail.com>
Date: Sat, 3 May 2014 17:00:06 +0200
Subject: [PATCH 0906/2033] Bump docker version to 0.10.0.

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 40385d9d36a..d951fe124c9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "0m4s21dxd1bj08xrmi7iw77djj3cpxvjsin12p6v6v1qnigm18ww";
+    sha256 = "14gmx119hd3j0c6rbks2mm83hk46s5wnnyvj8rhn25h0yp39pm5q";
   };
 
   phases = ["unpackPhase" "preBuild" "buildPhase" "installPhase"];

From f3e0a293387975014c9a71ef370743cea27ff18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 3 May 2014 17:12:06 +0200
Subject: [PATCH 0907/2033] aubio: update from 0.4.0 to 0.4.1

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

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 180de0e0bd5..53ff6572052 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.0";
+  name = "aubio-0.4.1";
 
   src = fetchurl {
     url = "http://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "18ik5nn8n984f0wnrwdfhc06b8blqgm9b2hrm7hc9m0rr039mpj9";
+    sha256 = "15f6nf76y7iyl2kl4ny7ky0zpxfxr8j3902afvd6ydnnkh5dzmr5";
   };
 
   buildInputs = [

From 2be1b4c0348fe2398942faf0abea21ac0f92855c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 May 2014 10:51:26 -0500
Subject: [PATCH 0908/2033] build-support/vm: add Ubuntu 14.04 Trusty Tahir

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 9deeaeedccf..08f00073fa3 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1477,6 +1477,40 @@ rec {
       packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
     };
 
+    ubuntu1404i386 = {
+      name = "ubuntu-14.04-trusty-i386";
+      fullName = "Ubuntu 14.04 Trusty (i386)";
+      packagesLists =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2;
+            sha256 = "1bld2z47cc8adlqgfib1hypj5zwdqalhizzgpmkr3rmmb095lbma";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2;
+            sha256 = "03xqi9vd653hdf31a2l6p3zqfmywwvwlsc54dymxji8ppj7mcgkz";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
+    ubuntu1404x86_64 = {
+      name = "ubuntu-14.04-trusty-amd64";
+      fullName = "Ubuntu 14.04 Trusty (amd64)";
+      packagesList =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2;
+            sha256 = "11cw9flmnq3wappmwk87h19jzyrsan15h6p0mmb30ypnrqaz7g9j";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2;
+            sha256 = "06nn3ci8s7zgwharxm76bcbqmnqknpds67zffylyii5hgmbjcnxm";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
     debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";

From 0ff68e81b95e288f94c2f5fe823d81b65025b3ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 2 May 2014 12:13:00 +0200
Subject: [PATCH 0909/2033] debian: Update to 7.5

[Note from Austin: I think @edolstra forgot to merge this to master.]

(cherry picked from commit 02b056c5b180b4b8ba22ddc3061d78258e2ef98f on
release-14.04)
---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 08f00073fa3..836deaf8b4d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1582,22 +1582,22 @@ rec {
     debian70x86_64 = debian7x86_64;
 
     debian7i386 = {
-      name = "debian-7.4-wheezy-i386";
-      fullName = "Debian 7.4 Wheezy (i386)";
+      name = "debian-7.5-wheezy-i386";
+      fullName = "Debian 7.5 Wheezy (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
-        sha256 = "9f19822c82e25cd149f82b0d16fdbc00d1080db7f34e41de456498dc7c54f2b4";
+        sha256 = "c4896c30c9a483354714d50f19d0779b72a218ce4f817f9ec8554f9664137993";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian7x86_64 = {
-      name = "debian-7.4-wheezy-amd64";
-      fullName = "Debian 7.4 Wheezy (amd64)";
+      name = "debian-7.5-wheezy-amd64";
+      fullName = "Debian 7.5 Wheezy (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
-        sha256 = "160ee0917693bc2e8f69b233c220857f35a70d906540d99d2779def576daf5f7";
+        sha256 = "f3b78aac7d2bdfc3896fdd2087affd0e16bafbf35945106b196483f5fb303d52";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 13b246b221f095a9879fb55f6cdbb153b5ccf4ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:05:55 +0200
Subject: [PATCH 0910/2033] ghc-head: update snapshot to 7.9.20140430 (and
 download the tarball from Debian)

https://github.com/NixOS/nixpkgs/pull/2480
---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index cc220eb7b1c..a357a090e35 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
 
 stdenv.mkDerivation rec {
-  version = "7.9.20140313";
+  version = "7.9.20140430";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://cryp.to/${name}.tar.xz";
-    sha256 = "03i9ajgzlp2y0qq7qnmyji6vdcgx2xnsyrc2zbqbziinf86igwhi";
+    url = "http://deb.haskell.org/dailies/2014-05-01/ghc_7.9.20140430.orig.tar.bz2";
+    sha256 = "072c1d71idi7jw711icn1wz4q64laasvb0ii8xvg5mbhi9szbwk4";
   };
 
   buildInputs = [ ghc perl gmp ncurses happy alex ];

From eca445a408e9233ef3bddeefb066eb4eab30c167 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:18:17 +0200
Subject: [PATCH 0911/2033] Bootstrap ghc-head with GHC 7.6.3 to see if that
 solves our weird compiler errors:

  compiler/simplCore/CoreMonad.lhs:835:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `A.Alternative CoreM'

  compiler/simplCore/CoreMonad.lhs:841:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `MonadPlus CoreM'
---
 pkgs/top-level/haskell-defaults.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 5a84b4339e2..f9b9560bf14 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -413,7 +413,7 @@
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   packages_ghcHEAD =
     packages { ghcPath = ../development/compilers/ghc/head.nix;
-               ghcBinary = ghc742Binary;
+               ghcBinary = pkgs.haskellPackages.ghcPlain;
                prefFun = ghcHEADPrefs;
                extraArgs = {
                  happy = pkgs.haskellPackages.happy_1_19_2;

From f9f19ee938117b9421bab65b277f3353ee549a60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:29 +0200
Subject: [PATCH 0912/2033] haskell-xmonad-contrib: update to version 0.11.3

---
 .../applications/window-managers/xmonad/xmonad-contrib.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
index 8eedafb94c7..ca2e9e34e14 100644
--- a/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
+++ b/pkgs/applications/window-managers/xmonad/xmonad-contrib.nix
@@ -4,14 +4,11 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.11.2";
-  sha256 = "0qlc732m6mhvx7g10r69hk5x460kjv2r04s91cnn5yfiia1qfpai";
+  version = "0.11.3";
+  sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];
-  patchPhase = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.8" self.ghc.version) ''
-    sed -i -e 's|ForeignFunctionInterface|AllowAmbiguousTypes, ForeignFunctionInterface|' xmonad-contrib.cabal
-  '';
   meta = {
     homepage = "http://xmonad.org/";
     description = "Third party extensions for xmonad";

From 0f6bd32324097b123bad1dc80972925ccbe23591 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:46 +0200
Subject: [PATCH 0913/2033] haskell-Hipmunk: update to version 5.2.0.14

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

diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
index faaed63399a..9ffb5640e9d 100644
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Hipmunk";
-  version = "5.2.0.13";
-  sha256 = "0ddf7cbwaswyszq9rs5jq353npbry8l2cc7p5wq9wq97yplz10bc";
+  version = "5.2.0.14";
+  sha256 = "1jzsalib2y6r4aw7d10v3pgapmnj1knvq3fyad3w5d11qmvx9zwc";
   buildDepends = [ StateVar transformers ];
   meta = {
     homepage = "https://github.com/meteficha/Hipmunk";

From 3a784a6b8c232ccd921671ec2935cd865659d80c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:47 +0200
Subject: [PATCH 0914/2033] haskell-JuicyPixels: update to version 3.1.5.1

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

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 95831927a30..8f922a5b7b9 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.5";
-  sha256 = "1dcqqmj7skx17mwaf0sayqdknnz9w6q2y8z3c8ixmbjyg4jh6a66";
+  version = "3.1.5.1";
+  sha256 = "0i6q9dkansphnymfrmbsqd0mdbf9vwc7xn7vxp0ds3y8gg1jzhiw";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];

From b851ea759e888868a3016f74d38d728ed0b5a40d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:49 +0200
Subject: [PATCH 0915/2033] haskell-ghc-events: update to version 0.4.3.0

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

diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
index a13f56e4b53..4f908200c88 100644
--- a/pkgs/development/libraries/haskell/ghc-events/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-events";
-  version = "0.4.2.0";
-  sha256 = "0209r9g5w4ifsaw3dkfra6kma1vyk50dc306an72mcwnp4l7dv4l";
+  version = "0.4.3.0";
+  sha256 = "128p651hp8v1i0iaccmfh3ap6lajcrzdihjb853s71pgnpal6izr";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary mtl ];

From 9953352f3e25ccf9bfb9f90f5c95e1735d226abb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:50 +0200
Subject: [PATCH 0916/2033] haskell-github: update to version 0.8

---
 pkgs/development/libraries/haskell/github/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 5fd23514583..41ee872bb31 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,17 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.4";
-  sha256 = "1yalhixisjv1n9ihik3h6ya25f0066dd422nbpfysj9093hv3a5w";
+  version = "0.8";
+  sha256 = "0lzz7q2gjiq4z8yi1sb981m220qnwjizk9hqv09yfj5a4grqfchf";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure
     hashable HTTP httpConduit httpTypes network text time
     unorderedContainers vector
   ];
   jailbreak = true;
-  patchPhase = ''
-    sed -i -e '/^import Data.Conduit (ResourceT)/d' Github/Private.hs
-  '';
   meta = {
     homepage = "https://github.com/fpco/github";
     description = "Access to the Github API, v3";

From f899787872816735860c67e4a33a1f737578fb98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:51 +0200
Subject: [PATCH 0917/2033] haskell-libmpd: update to version 0.8.0.3

---
 .../libraries/haskell/libmpd/default.nix           | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix
index bc2f494852d..2c31b2efea8 100644
--- a/pkgs/development/libraries/haskell/libmpd/default.nix
+++ b/pkgs/development/libraries/haskell/libmpd/default.nix
@@ -1,18 +1,20 @@
-{ cabal, dataDefault, filepath, hspec, HUnit, mtl, network
-, QuickCheck, text, time, utf8String
+{ cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl
+, network, QuickCheck, text, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "libmpd";
-  version = "0.8.0.2";
-  sha256 = "1phlbb5lsapw2hb0db7906ddlmvnpyk1xbgxvl9zp9zfd0sn40aj";
-  buildDepends = [ filepath mtl network text time utf8String ];
+  version = "0.8.0.3";
+  sha256 = "0xbbk2rg6awfz5ak20956nriifga81ndk7n58lbbf5i86380akwz";
+  buildDepends = [
+    attoparsec dataDefault filepath mtl network text time utf8String
+  ];
   testDepends = [
     dataDefault hspec HUnit mtl network QuickCheck text time utf8String
   ];
   jailbreak = true;
   meta = {
-    homepage = "http://github.com/joachifm/libmpd-haskell";
+    homepage = "http://github.com/joachifm/libmpd-haskell#readme";
     description = "An MPD client library";
     license = "LGPL";
     platforms = self.ghc.meta.platforms;

From 45165186dc0a67badc863d876661cdb6284c41a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:52 +0200
Subject: [PATCH 0918/2033] haskell-logging: update to version 1.4.1

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

diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix
index 7cfcf147957..7fa30c1cb3a 100644
--- a/pkgs/development/libraries/haskell/logging/default.nix
+++ b/pkgs/development/libraries/haskell/logging/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "logging";
-  version = "1.4.0";
-  sha256 = "0xkk6j9wa5n0qg0wp7a9bwaz328hrjk1fwanpa515hh3gvz62g94";
+  version = "1.4.1";
+  sha256 = "15mhpafv797f8aifjyjb5nc0fkd7if7bvx5hx9mzxycdzlk28gfp";
   buildDepends = [
     binary fastLogger liftedBase monadControl monadLogger pcreLight
     text time transformers vectorSpace

From e0a257ae5994e8d1631a790a8e42d5a9ce5679fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:54 +0200
Subject: [PATCH 0919/2033] haskell-monad-extras: update to version 0.5.8

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

diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix
index 9a66c5ab983..e8a7af28613 100644
--- a/pkgs/development/libraries/haskell/monad-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monad-extras/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-extras";
-  version = "0.5.7";
-  sha256 = "0dqj3n3ki679b6z5y7qw084chbahlqmj2vgj7yx0v552bl0ylzyj";
+  version = "0.5.8";
+  sha256 = "1h7gjdmbdjw2k49xlflca88bxiid7gxl8l9gzmywybllff376npl";
   buildDepends = [
     mmorph monadControl stm transformers transformersBase
   ];

From 3aa5ae8f31a6056c8cb65a5d5e35c2efb32d90e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:55 +0200
Subject: [PATCH 0920/2033] haskell-pcre-light: update to version 0.4.0.2

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

diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix
index 4ffabf4a1e2..33333e2d698 100644
--- a/pkgs/development/libraries/haskell/pcre-light/default.nix
+++ b/pkgs/development/libraries/haskell/pcre-light/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pcre-light";
-  version = "0.4.0.1";
-  sha256 = "07r863fcxhxnlvld732r1d3kd797ki71wyizfklbz0ccdxqq8cqj";
+  version = "0.4.0.2";
+  sha256 = "0baq46d3k376mhh98gkfi6phndk8ba25c2kll9zms1y07mn3bnnx";
   extraLibraries = [ pcre ];
   meta = {
     homepage = "https://github.com/Daniel-Diaz/pcre-light";

From 1940a891123e159ba549ad3b57321eb350dce1f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:56 +0200
Subject: [PATCH 0921/2033] haskell-stringable: update to version 0.1.3

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

diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix
index 663b198b2ee..8e955f10f19 100644
--- a/pkgs/development/libraries/haskell/stringable/default.nix
+++ b/pkgs/development/libraries/haskell/stringable/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stringable";
-  version = "0.1.2";
-  sha256 = "17lhry3x90s88lplbv2kvzyak8wrc9r80czng5s3dirmyp9rn5gs";
+  version = "0.1.3";
+  sha256 = "10jsvbiqbmnbipv1566k5mqkpgfyrzbk8m7b18rqjb5m3qg9dbz7";
   buildDepends = [ systemFilepath text ];
   meta = {
     description = "A Stringable type class, in the spirit of Foldable and Traversable";

From 0e4d6747ee7e613c86fb0486a8f6706250be85a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:57 +0200
Subject: [PATCH 0922/2033] haskell-HaRe: update to version 0.7.2.3

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

diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix
index 7cbc6630584..0bcb19968ba 100644
--- a/pkgs/development/tools/haskell/HaRe/default.nix
+++ b/pkgs/development/tools/haskell/HaRe/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HaRe";
-  version = "0.7.2.2";
-  sha256 = "0w9cjs3r99k4mf835higcsllk0h8lbich1v9wb2pvwbqi3i9r0sp";
+  version = "0.7.2.3";
+  sha256 = "1zhwi568asgwvsbqrcglwa6jmbm85m3fi94mklb40ib149k4il1s";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0cb0810c96558073745586f4174436c14f872cf4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:44:58 +0200
Subject: [PATCH 0923/2033] haskell-hslogger: update to version 1.2.4

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

diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix
index a851b8912c7..deb97d85fdc 100644
--- a/pkgs/development/tools/haskell/hslogger/default.nix
+++ b/pkgs/development/tools/haskell/hslogger/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hslogger";
-  version = "1.2.3";
-  sha256 = "0rmijkrf24srcg8zgizf5vidpsgr4171wbzbwgrg66l704mkkb7m";
+  version = "1.2.4";
+  sha256 = "0r0c7wqz49lzxg7sakkw6nwmxnyzhqscxvnxiqwkwsgv3q2sh3wc";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl network time ];

From c0d742110f0d8c20493dedfedb12cf86060d1018 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:45:00 +0200
Subject: [PATCH 0924/2033] haskell-threadscope: update to version 0.2.3

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

diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
index 4928c40e129..afc904ecf95 100644
--- a/pkgs/development/tools/haskell/threadscope/default.nix
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threadscope";
-  version = "0.2.2";
-  sha256 = "07cmza391hjq77lx8m9g2287bzsh5ffka3s07fr49v6x6hivsic3";
+  version = "0.2.3";
+  sha256 = "07kbkcckxfsb50zks8jgw2g0ary63hymicq5lqrm5jjaarjb80gr";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 074c128fec4c17a1b2ac5f4c6f7d996ed1c14522 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:46:10 +0200
Subject: [PATCH 0925/2033] haskell-attoparsec: update to version 0.11.3.0

---
 .../haskell/attoparsec/{0.11.2.1.nix => 0.11.3.0.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/attoparsec/{0.11.2.1.nix => 0.11.3.0.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix
rename to pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix
index 2a2117a1a05..2a46c5a6b8d 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.2.1.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.11.2.1";
-  sha256 = "1grvmhxiqn02wbng0wd9zqc4c51wrbxar1b26agc3p9i09ngbs1w";
+  version = "0.11.3.0";
+  sha256 = "1vnkm5pf0a381is4i0zyi41p4jv184lqpv1z9aadsnavpg0841qs";
   buildDepends = [ deepseq scientific text ];
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2 text
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e92fec5f775..e26e8330554 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   haskellPlatformArgs_future = self : {
     inherit (self) cabal ghc;
     async        = self.async_2_0_1_5;
-    attoparsec   = self.attoparsec_0_11_2_1;
+    attoparsec   = self.attoparsec_0_11_3_0;
     caseInsensitive = self.caseInsensitive_1_2_0_0;
     cgi          = self.cgi_3001_1_8_5;
     fgl          = self.fgl_5_4_2_4;
@@ -593,8 +593,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   attoLisp = callPackage ../development/libraries/haskell/atto-lisp {};
 
   attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
-  attoparsec_0_11_2_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.2.1.nix {};
-  attoparsec = self.attoparsec_0_10_4_0;
+  attoparsec_0_11_3_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.0.nix {};
+  attoparsec = self.attoparsec_0_11_3_0;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
 

From eb7958247afac339531caf3074ed15a51099afd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:47:16 +0200
Subject: [PATCH 0926/2033] haskell-unordered-containers: update to version
 0.2.4.0

---
 .../unordered-containers/{0.2.3.3.nix => 0.2.4.0.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/unordered-containers/{0.2.3.3.nix => 0.2.4.0.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.3.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/unordered-containers/0.2.3.3.nix
rename to pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix
index 03cdd824d29..80d4686fef3 100644
--- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.3.nix
+++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unordered-containers";
-  version = "0.2.3.3";
-  sha256 = "09sn19fk4smhf4zi3326wy2a62lh231k2nm8jd64j51arch42sdi";
+  version = "0.2.4.0";
+  sha256 = "1x6djgmawzq8i8spib729pdlpnxyi4gz4p08lyn6jhfqjq6fpsil";
   buildDepends = [ deepseq hashable ];
   testDepends = [
     ChasingBottoms hashable HUnit QuickCheck testFramework
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e26e8330554..22ca42cecea 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -169,7 +169,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     syb          = self.syb_0_4_1;
     text         = self.text_1_1_0_1;
     transformers = self.transformers_0_3_0_0;   # this has become a core package in GHC 7.7
-    unorderedContainers = self.unorderedContainers_0_2_3_3;
+    unorderedContainers = self.unorderedContainers_0_2_4_0;
     vector       = self.vector_0_10_9_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
@@ -2658,8 +2658,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   unlambda = callPackage ../development/libraries/haskell/unlambda {};
 
   unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {};
-  unorderedContainers_0_2_3_3 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.3.nix {};
-  unorderedContainers = self.unorderedContainers_0_2_3_3;
+  unorderedContainers_0_2_4_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.4.0.nix {};
+  unorderedContainers = self.unorderedContainers_0_2_4_0;
 
   uri = callPackage ../development/libraries/haskell/uri {};
 

From c1705e8b335634d92ab576ca07516288f48d86b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:48:47 +0200
Subject: [PATCH 0927/2033] haskell-fgl: add version 5.5.0.1

---
 .../development/libraries/haskell/fgl/5.5.0.0.nix | 15 +++++++++++++++
 .../development/libraries/haskell/fgl/5.5.0.1.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  5 +++--
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/fgl/5.5.0.0.nix
 create mode 100644 pkgs/development/libraries/haskell/fgl/5.5.0.1.nix

diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix
new file mode 100644
index 00000000000..d475a9cb312
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "fgl";
+  version = "5.5.0.0";
+  sha256 = "1kdqxbpsaka97rx0c7czlc1nfi72mdxs46gnqa8p0wxn1vx437g3";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
+    description = "Martin Erwig's Functional Graph Library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix
new file mode 100644
index 00000000000..b9a582fd7b5
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix
@@ -0,0 +1,15 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "fgl";
+  version = "5.5.0.1";
+  sha256 = "0qw70f5hfrxmrx49wx8vk2f5cam7jbpb20mp4i0ybcwdld5ncqda";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://web.engr.oregonstate.edu/~erwig/fgl/haskell";
+    description = "Martin Erwig's Functional Graph Library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 22ca42cecea..46719bd4506 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -145,7 +145,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     attoparsec   = self.attoparsec_0_11_3_0;
     caseInsensitive = self.caseInsensitive_1_2_0_0;
     cgi          = self.cgi_3001_1_8_5;
-    fgl          = self.fgl_5_4_2_4;
+    fgl          = self.fgl_5_5_0_1;
     GLUT         = self.GLUT_2_5_1_0;
     GLURaw       = self.GLURaw_1_4_0_0;
     haskellSrc   = self.haskellSrc_1_0_1_6;
@@ -1151,7 +1151,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {};
   fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {};
   fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {};
-  fgl = self.fgl_5_4_2_4;
+  fgl_5_5_0_1 = callPackage ../development/libraries/haskell/fgl/5.5.0.1.nix {};
+  fgl = self.fgl_5_5_0_1;
 
   fglVisualize = callPackage ../development/libraries/haskell/fgl-visualize {};
 

From dd1dd06b8831f51d4899858aad31808683e9e187 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:49:42 +0200
Subject: [PATCH 0928/2033] haskell-text: update to version 1.1.1.1

---
 .../libraries/haskell/text/{1.1.0.1.nix => 1.1.1.1.nix}     | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/text/{1.1.0.1.nix => 1.1.1.1.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/text/1.1.0.1.nix b/pkgs/development/libraries/haskell/text/1.1.1.1.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/text/1.1.0.1.nix
rename to pkgs/development/libraries/haskell/text/1.1.1.1.nix
index eecb54f3c68..b9cc3cf14ae 100644
--- a/pkgs/development/libraries/haskell/text/1.1.0.1.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.1.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "1.1.0.1";
-  sha256 = "1f0zicvflfd17mr2h9s9idhi0215m2y208jbnh4fx1yj6snnvalw";
+  version = "1.1.1.1";
+  sha256 = "10d3j73cvjyhs8lcgzzalzwci42qf866iqvhyf7qik8ym793m4y9";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 46719bd4506..d58852f8af7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -167,7 +167,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     split        = self.split_0_2_2;
     stm          = self.stm_2_4_3;
     syb          = self.syb_0_4_1;
-    text         = self.text_1_1_0_1;
+    text         = self.text_1_1_1_1;
     transformers = self.transformers_0_3_0_0;   # this has become a core package in GHC 7.7
     unorderedContainers = self.unorderedContainers_0_2_4_0;
     vector       = self.vector_0_10_9_1;
@@ -2542,8 +2542,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
   text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {};
   text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {};
-  text_1_1_0_1 = callPackage ../development/libraries/haskell/text/1.1.0.1.nix {};
-  text = self.text_1_1_0_1;
+  text_1_1_1_1 = callPackage ../development/libraries/haskell/text/1.1.1.1.nix {};
+  text = self.text_1_1_1_1;
 
   textFormat = callPackage ../development/libraries/haskell/text-format {};
 

From 4b307a7b96627e072237391253b322add6fb9b5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 11:52:06 +0200
Subject: [PATCH 0929/2033] haskell-network: update to version 2.5.0.0

---
 .../libraries/haskell/network/{2.4.2.2.nix => 2.5.0.0.nix}  | 4 ++--
 pkgs/top-level/haskell-packages.nix                         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/libraries/haskell/network/{2.4.2.2.nix => 2.5.0.0.nix} (85%)

diff --git a/pkgs/development/libraries/haskell/network/2.4.2.2.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/network/2.4.2.2.nix
rename to pkgs/development/libraries/haskell/network/2.5.0.0.nix
index 390529b6a76..f042b4b7008 100644
--- a/pkgs/development/libraries/haskell/network/2.4.2.2.nix
+++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network";
-  version = "2.4.2.2";
-  sha256 = "0bxfy6irh5050ykhwfwzl5fnqi74j7x6k4ni7ahw2zwjy3qafc5x";
+  version = "2.5.0.0";
+  sha256 = "1x90fdzfigqq2vbjqg73p4vyy7p1z0apj79cpl7i9v9amxa6y5mj";
   buildDepends = [ parsec ];
   testDepends = [
     HUnit testFramework testFrameworkHunit testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d58852f8af7..87be3ee67d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -154,7 +154,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     HTTP         = self.HTTP_4000_2_13;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_3_1;
-    network      = self.network_2_4_2_2;
+    network      = self.network_2_5_0_0;
     OpenGL       = self.OpenGL_2_9_1_0;
     OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
     parallel     = self.parallel_3_2_0_4;
@@ -1882,8 +1882,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   network_2_3_0_13 = callPackage ../development/libraries/haskell/network/2.3.0.13.nix {};
   network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {};
   network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {};
-  network_2_4_2_2 = callPackage ../development/libraries/haskell/network/2.4.2.2.nix {};
-  network = self.network_2_4_2_2;
+  network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {};
+  network = self.network_2_5_0_0;
 
   networkConduit = callPackage ../development/libraries/haskell/network-conduit {};
   networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {};

From 1bfeca7a902e1adce680136aa018cefd80d3094d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 12:06:45 +0200
Subject: [PATCH 0930/2033] haddock-2.14.2: re-generate with cabal2nix

Fixes <https://github.com/NixOS/nixpkgs/issues/2481>.
---
 pkgs/development/tools/documentation/haddock/2.14.2.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix
index c4677f202dd..af611de4b9f 100644
--- a/pkgs/development/tools/documentation/haddock/2.14.2.nix
+++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix
@@ -1,5 +1,5 @@
-{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, hspec
-, QuickCheck, xhtml
+{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck
+, xhtml
 }:
 
 cabal.mkDerivation (self: {
@@ -10,7 +10,6 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ];
   testDepends = [ Cabal deepseq filepath hspec QuickCheck ];
-  buildTools = [ alex happy ];
   doCheck = false;
   meta = {
     homepage = "http://www.haskell.org/haddock/";

From 208e7cae1aa08fee29e252242f811335f997c604 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 3 May 2014 20:22:12 +0200
Subject: [PATCH 0931/2033] happy-1.19.3: patch code to build with ghc-head

https://github.com/simonmar/happy/issues/20
---
 pkgs/development/tools/parsing/happy/1.19.3.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix
index b1a03fa3b9f..c43806cd2df 100644
--- a/pkgs/development/tools/parsing/happy/1.19.3.nix
+++ b/pkgs/development/tools/parsing/happy/1.19.3.nix
@@ -8,6 +8,10 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ perl ];
+  preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) ''
+    sed -i -e 's|extensions: |extensions: FlexibleContexts, |' happy.cabal
+    sed -i -e 's|> import System.Exit|> import System.Exit ( exitWith, ExitCode(..) )|' src/Main.lhs
+  '';
   meta = {
     homepage = "http://www.haskell.org/happy/";
     description = "Happy is a parser generator for Haskell";

From d96f262166fe0d6cd62d301007e743581ec4a05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 17:17:34 +0200
Subject: [PATCH 0932/2033] json-c: update to 0.12, fixing CVE-2013-{6370,6371}

---
 pkgs/development/libraries/json-c/default.nix | 24 ++++++++++++++-----
 .../libraries/json-c/unused-variable.patch    | 18 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++----
 3 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/json-c/unused-variable.patch

diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index 78100521584..ad425f2a381 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -1,20 +1,32 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "json-c-0.9";
+  name = "json-c-0.12";
   src = fetchurl {
-    url = "http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz";
-    sha256 = "0xcl8cwzm860f8m0cdzyw6slwcddni4mraw4shvr3qgqkdn4hakh";
+    url    = "https://s3.amazonaws.com/json-c_releases/releases/${name}-nodoc.tar.gz";
+    sha256 = "0dgvjjyb9xva63l6sy70sdch2w4ryvacdmfd3fg2f2v13lqx5mkg";
   };
+
+  patches = [ ./unused-variable.patch ];
+
+  buildInputs = [ autoreconfHook ]; # won't configure without it, no idea why
+
+  # compatibility hack (for mypaint at least)
+  postInstall = ''
+    ln -s json-c.pc "$out/lib/pkgconfig/json.pc"
+  '';
+
   meta = with stdenv.lib; {
-    homepage = "http://oss.metaparadigm.com/json-c/";
     description = "A JSON implementation in C";
+    homepage    = https://github.com/json-c/json-c/wiki;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+
     longDescription = ''
       JSON-C implements a reference counting object model that allows you to
       easily construct JSON objects in C, output them as JSON formatted strings
       and parse JSON formatted strings back into the C representation of JSON
       objects.
     '';
-    hydraPlatforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/json-c/unused-variable.patch b/pkgs/development/libraries/json-c/unused-variable.patch
new file mode 100644
index 00000000000..1726234c526
--- /dev/null
+++ b/pkgs/development/libraries/json-c/unused-variable.patch
@@ -0,0 +1,18 @@
+See https://groups.google.com/forum/#!topic/json-c/TYodemkG338
+diff --git a/json_tokener.c b/json_tokener.c
+index 19de8ef..32bc8af 100644
+--- a/json_tokener.c
++++ b/json_tokener.c
+@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
+ 
+     case json_tokener_state_inf: /* aka starts with 'i' */
+       {
+-	int size;
+ 	int size_inf;
+ 	int is_negative = 0;
+ 
+ 	printbuf_memappend_fast(tok->pb, &c, 1);
+-	size = json_min(tok->st_pos+1, json_null_str_len);
+ 	size_inf = json_min(tok->st_pos+1, json_inf_str_len);
+ 	char *infbuf = tok->pb->buf;
+ 	if (*infbuf == '-')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c61561da8..93405dd8001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1112,7 +1112,9 @@ let
    */
   graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
 
-  grive = callPackage ../tools/filesystems/grive { };
+  grive = callPackage ../tools/filesystems/grive {
+    json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
+  };
 
   groff = callPackage ../tools/text/groff {
     ghostscript = null;
@@ -4788,9 +4790,8 @@ let
 
   json_glib = callPackage ../development/libraries/json-glib { };
 
-  json-c-0-9 = callPackage ../development/libraries/json-c { };
-  json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { };
-  json_c = json-c-0-9;
+  json-c-0-11 = callPackage ../development/libraries/json-c/0.11.nix { }; # vulnerable
+  json_c = callPackage ../development/libraries/json-c { };
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
 

From 07aaea85d4a56a7b25a07440df348fa99e0c2061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 May 2014 17:25:20 +0200
Subject: [PATCH 0933/2033] pam: upstream patch to fix CVE-2014-2583

---
 .../os-specific/linux/pam/CVE-2014-2583.patch | 49 +++++++++++++++++++
 pkgs/os-specific/linux/pam/default.nix        |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pam/CVE-2014-2583.patch

diff --git a/pkgs/os-specific/linux/pam/CVE-2014-2583.patch b/pkgs/os-specific/linux/pam/CVE-2014-2583.patch
new file mode 100644
index 00000000000..25b1f7549fa
--- /dev/null
+++ b/pkgs/os-specific/linux/pam/CVE-2014-2583.patch
@@ -0,0 +1,49 @@
+From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Wed, 26 Mar 2014 22:17:23 +0000
+Subject: pam_timestamp: fix potential directory traversal issue (ticket #27)
+
+pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of
+the timestamp pathname it creates, so extra care should be taken to
+avoid potential directory traversal issues.
+
+* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat
+"." and ".." tty values as invalid.
+(get_ruser): Treat "." and ".." ruser values, as well as any ruser
+value containing '/', as invalid.
+
+Fixes CVE-2014-2583.
+
+Reported-by: Sebastian Krahmer <krahmer@suse.de>
+
+diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c
+index 5193733..b3f08b1 100644
+--- a/modules/pam_timestamp/pam_timestamp.c
++++ b/modules/pam_timestamp/pam_timestamp.c
+@@ -158,7 +158,7 @@ check_tty(const char *tty)
+ 		tty = strrchr(tty, '/') + 1;
+ 	}
+ 	/* Make sure the tty wasn't actually a directory (no basename). */
+-	if (strlen(tty) == 0) {
++	if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) {
+ 		return NULL;
+ 	}
+ 	return tty;
+@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen)
+ 		if (pwd != NULL) {
+ 			ruser = pwd->pw_name;
+ 		}
++	} else {
++		/*
++		 * This ruser is used by format_timestamp_name as a component
++		 * of constructed timestamp pathname, so ".", "..", and '/'
++		 * are disallowed to avoid potential path traversal issues.
++		 */
++		if (!strcmp(ruser, ".") ||
++		    !strcmp(ruser, "..") ||
++		    strchr(ruser, '/')) {
++			ruser = NULL;
++		}
+ 	}
+ 	if (ruser == NULL || strlen(ruser) >= ruserbuflen) {
+ 		*ruserbuf = '\0';
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index afc125556fe..43b8204f50c 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0m8ygb40l1c13nsd4hkj1yh4p1ldawhhg8pyjqj9w5kd4cxg5cf4";
   };
 
+  patches = [ ./CVE-2014-2583.patch ];
+
   nativeBuildInputs = [ flex ];
 
   buildInputs = [ cracklib ];

From 70b39119c34fe73f4c0e46dfc8eeed8570ec847d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 3 May 2014 14:09:22 +0200
Subject: [PATCH 0934/2033] qwt: add version 6.x (we already have 5.x)

'qgis', one of the few 'qwt' dependees in nixpkgs, fails to build with
qwt 6. So I'm not moving the default version away from 5.x. Also, not
changing the default allows easy/safe cherry-picking to the stable
branch.
---
 pkgs/development/libraries/qwt/6.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/qwt/6.nix

diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
new file mode 100644
index 00000000000..c1386277526
--- /dev/null
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qwt-6.1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qwt/${name}.tar.bz2";
+    sha256 = "00klw6jsn8z3dnhxg52pqg3hg5mw2sih8prwjxm1hzcivgqxkqx7";
+  };
+
+  propagatedBuildInputs = [ qt4 ];
+
+  postPatch = ''
+    sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
+  '';
+
+  configurePhase = "qmake -after doc.path=$out/share/doc/${name} -r";
+
+  meta = with stdenv.lib; {
+    description = "Qt widgets for technical applications";
+    homepage = http://qwt.sourceforge.net/;
+    # LGPL 2.1 plus a few exceptions (more liberal)
+    license = "Qwt License, Version 1.0";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93405dd8001..b92341445d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5776,6 +5776,8 @@ let
 
   qwt = callPackage ../development/libraries/qwt {};
 
+  qwt6 = callPackage ../development/libraries/qwt/6.nix { };
+
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
 
   raul = callPackage ../development/libraries/audio/raul { };

From ead35d9d042db1cc85394a69039238453708600e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:55:46 +0200
Subject: [PATCH 0935/2033] Add wmertens to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cf0743fa403..f64b087e55d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -91,6 +91,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
+  wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";

From ac80d4541997132d55b5af3707257f605dd897fd Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:15:16 +0200
Subject: [PATCH 0936/2033] a52dec: Add patches from Handbrake project

this project hasn't been updated in 10 years, so adding patches that
don't break the API should be ok.

Patches:
- A00: Make a52-state-t public
- A01: Make it thread-safe (changing internal API by adding state
objects)
- A02: Quell common error
- A03: Fix for automake vs autoconf
---
 .../a52dec/A00-a52-state-t-public.patch       | 152 ++++++
 .../libraries/a52dec/A01-thread-safe.patch    | 462 ++++++++++++++++++
 .../libraries/a52dec/A02-imdct-shutup.patch   |  11 +
 .../libraries/a52dec/A03-automake.patch       |  12 +
 pkgs/development/libraries/a52dec/default.nix |  10 +-
 5 files changed, 646 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
 create mode 100644 pkgs/development/libraries/a52dec/A01-thread-safe.patch
 create mode 100644 pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
 create mode 100644 pkgs/development/libraries/a52dec/A03-automake.patch

diff --git a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
new file mode 100644
index 00000000000..5e0af3577d6
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
@@ -0,0 +1,152 @@
+diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
+--- a52dec.old/include/a52.h	2002-01-28 06:37:54.000000000 +0100
++++ a52dec.new/include/a52.h	2012-07-16 14:13:35.000000000 +0200
+@@ -30,7 +30,71 @@
+ typedef double sample_t;
+ #endif
+ 
+-typedef struct a52_state_s a52_state_t;
++typedef struct {
++    uint8_t bai;              /* fine SNR offset, fast gain */
++    uint8_t deltbae;          /* delta bit allocation exists */
++    int8_t deltba[50];        /* per-band delta bit allocation */
++} ba_t;
++
++typedef struct {
++    uint8_t exp[256];         /* decoded channel exponents */
++    int8_t bap[256];          /* derived channel bit allocation */
++} expbap_t;
++
++typedef struct {
++    uint8_t fscod;            /* sample rate */
++    uint8_t halfrate;         /* halfrate factor */
++    uint8_t acmod;            /* coded channels */
++    uint8_t lfeon;            /* coded lfe channel */
++    sample_t clev;            /* centre channel mix level */
++    sample_t slev;            /* surround channels mix level */
++
++    int output;               /* type of output */
++    sample_t level;           /* output level */
++    sample_t bias;            /* output bias */
++
++    int dynrnge;              /* apply dynamic range */
++    sample_t dynrng;          /* dynamic range */
++    void * dynrngdata;        /* dynamic range callback funtion and data */
++    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
++
++    uint8_t chincpl;          /* channel coupled */
++    uint8_t phsflginu;        /* phase flags in use (stereo only) */
++    uint8_t cplstrtmant;      /* coupling channel start mantissa */
++    uint8_t cplendmant;       /* coupling channel end mantissa */
++    uint32_t cplbndstrc;      /* coupling band structure */
++    sample_t cplco[5][18];    /* coupling coordinates */
++
++    /* derived information */
++    uint8_t cplstrtbnd;       /* coupling start band (for bit allocation) */
++    uint8_t ncplbnd;          /* number of coupling bands */
++
++    uint8_t rematflg;         /* stereo rematrixing */
++
++    uint8_t endmant[5];       /* channel end mantissa */
++
++    uint16_t bai;             /* bit allocation information */
++
++    uint32_t * buffer_start;
++    uint16_t lfsr_state;      /* dither state */
++    uint32_t bits_left;
++    uint32_t current_word;
++
++    uint8_t csnroffst;        /* coarse SNR offset */
++    ba_t cplba;               /* coupling bit allocation parameters */
++    ba_t ba[5];               /* channel bit allocation parameters */
++    ba_t lfeba;               /* lfe bit allocation parameters */
++
++    uint8_t cplfleak;         /* coupling fast leak init */
++    uint8_t cplsleak;         /* coupling slow leak init */
++
++    expbap_t cpl_expbap;
++    expbap_t fbw_expbap[5];
++    expbap_t lfe_expbap;
++
++    sample_t * samples;
++    int downmixed;
++} a52_state_t;
+ 
+ #define A52_CHANNEL 0
+ #define A52_MONO 1
+diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
+--- a52dec.old/liba52/a52_internal.h	2002-07-28 03:52:06.000000000 +0200
++++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:11:47.000000000 +0200
+@@ -21,72 +21,6 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-typedef struct {
+-    uint8_t bai;		/* fine SNR offset, fast gain */
+-    uint8_t deltbae;		/* delta bit allocation exists */
+-    int8_t deltba[50];		/* per-band delta bit allocation */
+-} ba_t;
+-
+-typedef struct {
+-    uint8_t exp[256];		/* decoded channel exponents */
+-    int8_t bap[256];		/* derived channel bit allocation */
+-} expbap_t;
+-
+-struct a52_state_s {
+-    uint8_t fscod;		/* sample rate */
+-    uint8_t halfrate;		/* halfrate factor */
+-    uint8_t acmod;		/* coded channels */
+-    uint8_t lfeon;		/* coded lfe channel */
+-    sample_t clev;		/* centre channel mix level */
+-    sample_t slev;		/* surround channels mix level */
+-
+-    int output;			/* type of output */
+-    sample_t level;		/* output level */
+-    sample_t bias;		/* output bias */
+-
+-    int dynrnge;		/* apply dynamic range */
+-    sample_t dynrng;		/* dynamic range */
+-    void * dynrngdata;		/* dynamic range callback funtion and data */
+-    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
+-
+-    uint8_t chincpl;		/* channel coupled */
+-    uint8_t phsflginu;		/* phase flags in use (stereo only) */
+-    uint8_t cplstrtmant;	/* coupling channel start mantissa */
+-    uint8_t cplendmant;		/* coupling channel end mantissa */
+-    uint32_t cplbndstrc;	/* coupling band structure */
+-    sample_t cplco[5][18];	/* coupling coordinates */
+-
+-    /* derived information */
+-    uint8_t cplstrtbnd;		/* coupling start band (for bit allocation) */
+-    uint8_t ncplbnd;		/* number of coupling bands */
+-
+-    uint8_t rematflg;		/* stereo rematrixing */
+-
+-    uint8_t endmant[5];		/* channel end mantissa */
+-
+-    uint16_t bai;		/* bit allocation information */
+-
+-    uint32_t * buffer_start;
+-    uint16_t lfsr_state;	/* dither state */
+-    uint32_t bits_left;
+-    uint32_t current_word;
+-
+-    uint8_t csnroffst;		/* coarse SNR offset */
+-    ba_t cplba;			/* coupling bit allocation parameters */
+-    ba_t ba[5];			/* channel bit allocation parameters */
+-    ba_t lfeba;			/* lfe bit allocation parameters */
+-
+-    uint8_t cplfleak;		/* coupling fast leak init */
+-    uint8_t cplsleak;		/* coupling slow leak init */
+-
+-    expbap_t cpl_expbap;
+-    expbap_t fbw_expbap[5];
+-    expbap_t lfe_expbap;
+-
+-    sample_t * samples;
+-    int downmixed;
+-};
+-
+ #define LEVEL_PLUS6DB 2.0
+ #define LEVEL_PLUS3DB 1.4142135623730951
+ #define LEVEL_3DB 0.7071067811865476
diff --git a/pkgs/development/libraries/a52dec/A01-thread-safe.patch b/pkgs/development/libraries/a52dec/A01-thread-safe.patch
new file mode 100644
index 00000000000..4ca2d1a0873
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/A01-thread-safe.patch
@@ -0,0 +1,462 @@
+diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
+--- a52dec.old/include/a52.h	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/include/a52.h	2012-07-16 14:31:37.000000000 +0200
+@@ -42,6 +42,11 @@
+ } expbap_t;
+ 
+ typedef struct {
++    sample_t real;
++    sample_t imag;
++} complex_t;
++
++typedef struct {
+     uint8_t fscod;            /* sample rate */
+     uint8_t halfrate;         /* halfrate factor */
+     uint8_t acmod;            /* coded channels */
+@@ -94,6 +99,20 @@
+ 
+     sample_t * samples;
+     int downmixed;
++
++    /* Root values for IFFT */
++    sample_t * roots16;           // size 3
++    sample_t * roots32;           // size 7
++    sample_t * roots64;           // size 15
++    sample_t * roots128;          // size 31
++
++    /* Twiddle factors for IMDCT */
++    complex_t * pre1;             // size 128
++    complex_t * post1;            // size 64
++    complex_t * pre2;             // size 64
++    complex_t * post2;            // size 32
++
++    sample_t * a52_imdct_window;  // size 256
+ } a52_state_t;
+ 
+ #define A52_CHANNEL 0
+diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
+--- a52dec.old/liba52/a52_internal.h	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:28:33.000000000 +0200
+@@ -49,6 +49,6 @@
+ 		  sample_t clev, sample_t slev);
+ void a52_upmix (sample_t * samples, int acmod, int output);
+ 
+-void a52_imdct_init (uint32_t mm_accel);
+-void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias);
+-void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias);
++void a52_imdct_init (a52_state_t * state, uint32_t mm_accel);
++void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
++void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
+diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c
+--- a52dec.old/liba52/imdct.c	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/imdct.c	2012-07-16 14:33:00.000000000 +0200
+@@ -40,11 +40,6 @@
+ #include "a52_internal.h"
+ #include "mm_accel.h"
+ 
+-typedef struct complex_s {
+-    sample_t real;
+-    sample_t imag;
+-} complex_t;
+-
+ static uint8_t fftorder[] = {
+       0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176,
+       8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88,
+@@ -56,22 +51,8 @@
+       6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
+ };
+ 
+-/* Root values for IFFT */
+-static sample_t roots16[3];
+-static sample_t roots32[7];
+-static sample_t roots64[15];
+-static sample_t roots128[31];
+-
+-/* Twiddle factors for IMDCT */
+-static complex_t pre1[128];
+-static complex_t post1[64];
+-static complex_t pre2[64];
+-static complex_t post2[32];
+-
+-static sample_t a52_imdct_window[256];
+-
+-static void (* ifft128) (complex_t * buf);
+-static void (* ifft64) (complex_t * buf);
++static void (* ifft128) (a52_state_t * state, complex_t * buf);
++static void (* ifft64) (a52_state_t * state, complex_t * buf);
+ 
+ static inline void ifft2 (complex_t * buf)
+ {
+@@ -167,7 +148,7 @@
+     a1.imag += tmp4;				\
+ } while (0)
+ 
+-static inline void ifft8 (complex_t * buf)
++static inline void ifft8 (a52_state_t * state, complex_t * buf)
+ {
+     double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
+ 
+@@ -175,7 +156,7 @@
+     ifft2 (buf + 4);
+     ifft2 (buf + 6);
+     BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]);
+-    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
++    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], state->roots16[1]);
+ }
+ 
+ static void ifft_pass (complex_t * buf, sample_t * weight, int n)
+@@ -205,66 +186,66 @@
+     } while (--i);
+ }
+ 
+-static void ifft16 (complex_t * buf)
++static void ifft16 (a52_state_t * state, complex_t * buf)
+ {
+-    ifft8 (buf);
++    ifft8 (state, buf);
+     ifft4 (buf + 8);
+     ifft4 (buf + 12);
+-    ifft_pass (buf, roots16 - 4, 4);
++    ifft_pass (buf, state->roots16 - 4, 4);
+ }
+ 
+-static void ifft32 (complex_t * buf)
++static void ifft32 (a52_state_t * state, complex_t * buf)
+ {
+-    ifft16 (buf);
+-    ifft8 (buf + 16);
+-    ifft8 (buf + 24);
+-    ifft_pass (buf, roots32 - 8, 8);
++    ifft16 (state, buf);
++    ifft8 (state, buf + 16);
++    ifft8 (state, buf + 24);
++    ifft_pass (buf, state->roots32 - 8, 8);
+ }
+ 
+-static void ifft64_c (complex_t * buf)
++static void ifft64_c (a52_state_t * state, complex_t * buf)
+ {
+-    ifft32 (buf);
+-    ifft16 (buf + 32);
+-    ifft16 (buf + 48);
+-    ifft_pass (buf, roots64 - 16, 16);
++    ifft32 (state, buf);
++    ifft16 (state, buf + 32);
++    ifft16 (state, buf + 48);
++    ifft_pass (buf, state->roots64 - 16, 16);
+ }
+ 
+-static void ifft128_c (complex_t * buf)
++static void ifft128_c (a52_state_t * state, complex_t * buf)
+ {
+-    ifft32 (buf);
+-    ifft16 (buf + 32);
+-    ifft16 (buf + 48);
+-    ifft_pass (buf, roots64 - 16, 16);
++    ifft32 (state, buf);
++    ifft16 (state, buf + 32);
++    ifft16 (state, buf + 48);
++    ifft_pass (buf, state->roots64 - 16, 16);
+ 
+-    ifft32 (buf + 64);
+-    ifft32 (buf + 96);
+-    ifft_pass (buf, roots128 - 32, 32);
++    ifft32 (state, buf + 64);
++    ifft32 (state, buf + 96);
++    ifft_pass (buf, state->roots128 - 32, 32);
+ }
+ 
+-void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias)
++void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
+ {
+     int i, k;
+     sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2;
+-    const sample_t * window = a52_imdct_window;
++    const sample_t * window = state->a52_imdct_window;
+     complex_t buf[128];
+ 	
+     for (i = 0; i < 128; i++) {
+ 	k = fftorder[i];
+-	t_r = pre1[i].real;
+-	t_i = pre1[i].imag;
++	t_r = state->pre1[i].real;
++	t_i = state->pre1[i].imag;
+ 
+ 	buf[i].real = t_i * data[255-k] + t_r * data[k];
+ 	buf[i].imag = t_r * data[255-k] - t_i * data[k];
+     }
+ 
+-    ifft128 (buf);
++    ifft128 (state, buf);
+ 
+     /* Post IFFT complex multiply plus IFFT complex conjugate*/
+     /* Window and convert to real valued signal */
+     for (i = 0; i < 64; i++) {
+ 	/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
+-	t_r = post1[i].real;
+-	t_i = post1[i].imag;
++	t_r = state->post1[i].real;
++	t_i = state->post1[i].imag;
+ 
+ 	a_r = t_r * buf[i].real     + t_i * buf[i].imag;
+ 	a_i = t_i * buf[i].real     - t_r * buf[i].imag;
+@@ -285,18 +266,18 @@
+     }
+ }
+ 
+-void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
++void a52_imdct_256(a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
+ {
+     int i, k;
+     sample_t t_r, t_i, a_r, a_i, b_r, b_i, c_r, c_i, d_r, d_i, w_1, w_2;
+-    const sample_t * window = a52_imdct_window;
++    const sample_t * window = state->a52_imdct_window;
+     complex_t buf1[64], buf2[64];
+ 
+     /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
+     for (i = 0; i < 64; i++) {
+ 	k = fftorder[i];
+-	t_r = pre2[i].real;
+-	t_i = pre2[i].imag;
++	t_r = state->pre2[i].real;
++	t_i = state->pre2[i].imag;
+ 
+ 	buf1[i].real = t_i * data[254-k] + t_r * data[k];
+ 	buf1[i].imag = t_r * data[254-k] - t_i * data[k];
+@@ -305,15 +286,15 @@
+ 	buf2[i].imag = t_r * data[255-k] - t_i * data[k+1];
+     }
+ 
+-    ifft64 (buf1);
+-    ifft64 (buf2);
++    ifft64 (state, buf1);
++    ifft64 (state, buf2);
+ 
+     /* Post IFFT complex multiply */
+     /* Window and convert to real valued signal */
+     for (i = 0; i < 32; i++) {
+ 	/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
+-	t_r = post2[i].real;
+-	t_i = post2[i].imag;
++	t_r = state->post2[i].real;
++	t_i = state->post2[i].imag;
+ 
+ 	a_r = t_r * buf1[i].real    + t_i * buf1[i].imag;
+ 	a_i = t_i * buf1[i].real    - t_r * buf1[i].imag;
+@@ -362,7 +343,7 @@
+     return bessel;
+ }
+ 
+-void a52_imdct_init (uint32_t mm_accel)
++void a52_imdct_init (a52_state_t * state, uint32_t mm_accel)
+ {
+     int i, k;
+     double sum;
+@@ -371,50 +352,50 @@
+     sum = 0;
+     for (i = 0; i < 256; i++) {
+ 	sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256));
+-	a52_imdct_window[i] = sum;
++	state->a52_imdct_window[i] = sum;
+     }
+     sum++;
+     for (i = 0; i < 256; i++)
+-	a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum);
++	state->a52_imdct_window[i] = sqrt (state->a52_imdct_window[i] / sum);
+ 
+     for (i = 0; i < 3; i++)
+-	roots16[i] = cos ((M_PI / 8) * (i + 1));
++	state->roots16[i] = cos ((M_PI / 8) * (i + 1));
+ 
+     for (i = 0; i < 7; i++)
+-	roots32[i] = cos ((M_PI / 16) * (i + 1));
++	state->roots32[i] = cos ((M_PI / 16) * (i + 1));
+ 
+     for (i = 0; i < 15; i++)
+-	roots64[i] = cos ((M_PI / 32) * (i + 1));
++	state->roots64[i] = cos ((M_PI / 32) * (i + 1));
+ 
+     for (i = 0; i < 31; i++)
+-	roots128[i] = cos ((M_PI / 64) * (i + 1));
++	state->roots128[i] = cos ((M_PI / 64) * (i + 1));
+ 
+     for (i = 0; i < 64; i++) {
+ 	k = fftorder[i] / 2 + 64;
+-	pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
+-	pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
++	state->pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
++	state->pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
+     }
+ 
+     for (i = 64; i < 128; i++) {
+ 	k = fftorder[i] / 2 + 64;
+-	pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
+-	pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
++	state->pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
++	state->pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
+     }
+ 
+     for (i = 0; i < 64; i++) {
+-	post1[i].real = cos ((M_PI / 256) * (i + 0.5));
+-	post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
++	state->post1[i].real = cos ((M_PI / 256) * (i + 0.5));
++	state->post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
+     }
+ 
+     for (i = 0; i < 64; i++) {
+ 	k = fftorder[i] / 4;
+-	pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
+-	pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
++	state->pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
++	state->pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
+     }
+ 
+     for (i = 0; i < 32; i++) {
+-	post2[i].real = cos ((M_PI / 128) * (i + 0.5));
+-	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
++	state->post2[i].real = cos ((M_PI / 128) * (i + 0.5));
++	state->post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
+     }
+ 
+ #ifdef LIBA52_DJBFFT
+diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c
+--- a52dec.old/liba52/parse.c	2012-07-16 14:24:14.000000000 +0200
++++ a52dec.new/liba52/parse.c	2012-07-16 14:33:00.000000000 +0200
+@@ -56,16 +56,53 @@
+     a52_state_t * state;
+     int i;
+ 
+-    state = malloc (sizeof (a52_state_t));
++    state = calloc (1, sizeof (a52_state_t));
+     if (state == NULL)
+ 	return NULL;
+ 
+     state->samples = memalign (16, 256 * 12 * sizeof (sample_t));
+     if (state->samples == NULL) {
+-	free (state);
+-	return NULL;
++        goto fail;
+     }
+ 
++    /* Root values for IFFT */
++    state->roots16 = memalign (16, 3 * sizeof (sample_t));
++    if (state->roots16 == NULL)
++        goto fail;
++
++    state->roots32 = memalign (16, 7 * sizeof (sample_t));
++    if (state->roots32 == NULL)
++        goto fail;
++
++    state->roots64 = memalign (16, 15 * sizeof (sample_t));
++    if (state->roots64 == NULL)
++        goto fail;
++
++    state->roots128 = memalign (16, 31 * sizeof (sample_t));
++    if (state->roots128 == NULL)
++        goto fail;
++
++    /* Twiddle factors for IMDCT */
++    state->pre1 = memalign (16, 128 * sizeof (complex_t));
++    if (state->pre1 == NULL)
++        goto fail;
++
++    state->post1 = memalign (16, 64 * sizeof (complex_t));
++    if (state->post1 == NULL)
++        goto fail;
++
++    state->pre2 = memalign (16, 64 * sizeof (complex_t));
++    if (state->pre2 == NULL)
++        goto fail;
++
++    state->post2 = memalign (16, 32 * sizeof (complex_t));
++    if (state->post2 == NULL)
++        goto fail;
++
++    state->a52_imdct_window = memalign (16, 256 * sizeof (sample_t));
++    if (state->a52_imdct_window == NULL)
++        goto fail;
++
+     for (i = 0; i < 256 * 12; i++)
+ 	state->samples[i] = 0;
+ 
+@@ -73,9 +110,27 @@
+ 
+     state->lfsr_state = 1;
+ 
+-    a52_imdct_init (mm_accel);
++    a52_imdct_init (state, mm_accel);
+ 
+     return state;
++
++fail:
++    if ( state )
++    {
++        free (state->a52_imdct_window);
++        free (state->post2);
++        free (state->pre2);
++        free (state->post1);
++        free (state->pre1);
++        free (state->roots128);
++        free (state->roots64);
++        free (state->roots32);
++        free (state->roots16);
++        free (state->samples);
++        free (state);
++    }
++    return NULL;
++
+ }
+ 
+ sample_t * a52_samples (a52_state_t * state)
+@@ -825,7 +880,7 @@
+ 		       state->dynrng, 0, 7);
+ 	    for (i = 7; i < 256; i++)
+ 		(samples-256)[i] = 0;
+-	    a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias);
++	    a52_imdct_512 (state, samples - 256, samples + 1536 - 256, state->bias);
+ 	} else {
+ 	    /* just skip the LFE coefficients */
+ 	    coeff_get (state, samples + 1280, &state->lfe_expbap, &quantizer,
+@@ -854,10 +909,10 @@
+ 
+ 	    if (coeff[i]) {
+ 		if (blksw[i])
+-		    a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
++		    a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
+ 				   bias);
+ 		else 
+-		    a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
++		    a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
+ 				   bias);
+ 	    } else {
+ 		int j;
+@@ -883,11 +938,11 @@
+ 
+ 	if (blksw[0])
+ 	    for (i = 0; i < nfchans; i++)
+-		a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
++		a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
+ 			       state->bias);
+ 	else 
+ 	    for (i = 0; i < nfchans; i++)
+-		a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
++		a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
+ 			       state->bias);
+     }
+ 
+@@ -896,6 +951,15 @@
+ 
+ void a52_free (a52_state_t * state)
+ {
++    free (state->a52_imdct_window);
++    free (state->post2);
++    free (state->pre2);
++    free (state->post1);
++    free (state->pre1);
++    free (state->roots128);
++    free (state->roots64);
++    free (state->roots32);
++    free (state->roots16);
+     free (state->samples);
+     free (state);
+ }
diff --git a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
new file mode 100644
index 00000000000..a22e5979e66
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
@@ -0,0 +1,11 @@
+diff -Naur a52dec_original/liba52/imdct.c a52dec_patched/liba52/imdct.c
+--- a52dec.old/liba52/imdct.c	2002-07-28 03:52:07.000000000 +0200
++++ a52dec.new/liba52/imdct.c	2011-07-15 20:29:09.000000000 +0200
+@@ -425,7 +425,6 @@
+     } else
+ #endif
+     {
+-	fprintf (stderr, "No accelerated IMDCT transform found\n");
+ 	ifft128 = ifft128_c;
+ 	ifft64 = ifft64_c;
+     }
diff --git a/pkgs/development/libraries/a52dec/A03-automake.patch b/pkgs/development/libraries/a52dec/A03-automake.patch
new file mode 100644
index 00000000000..142091dc695
--- /dev/null
+++ b/pkgs/development/libraries/a52dec/A03-automake.patch
@@ -0,0 +1,12 @@
+diff -Naur a52dec.orig/configure.in a52dec/configure.in
+--- a52dec.orig/configure.in	2002-07-27 23:50:20.000000000 -0400
++++ a52dec/configure.in	2013-01-28 21:06:27.000000000 -0500
+@@ -6,7 +6,7 @@
+ AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
+     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
+ AM_INIT_AUTOMAKE([a52dec],[0.7.4])
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADER(include/config.h)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ 
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 84a87df03e4..7d5c5fab393 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "a52dec-0.7.4";
+  name = "a52dec-0.7.4p4";
   
   src = fetchurl {
     url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-fpic";
 
+  # From Handbrake
+  patches = [
+    ./A00-a52-state-t-public.patch
+    ./A01-thread-safe.patch
+    ./A02-imdct-shutup.patch
+    ./A03-automake.patch
+  ];
+
   meta = {
     description = "ATSC A/52 stream decoder";
     homepage = http://liba52.sourceforge.net/;

From 66216ea6db71c59505b1144432233f6fbb1d1561 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:17:40 +0200
Subject: [PATCH 0937/2033] libbluray: Add patch from Handbrake project

- A01: Make it smarter about filtering duplicates
---
 .../libraries/libbluray/A01-filter-dup.patch  | 80 +++++++++++++++++++
 .../libraries/libbluray/default.nix           |  5 +-
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libbluray/A01-filter-dup.patch

diff --git a/pkgs/development/libraries/libbluray/A01-filter-dup.patch b/pkgs/development/libraries/libbluray/A01-filter-dup.patch
new file mode 100644
index 00000000000..608f8dd1b49
--- /dev/null
+++ b/pkgs/development/libraries/libbluray/A01-filter-dup.patch
@@ -0,0 +1,80 @@
+diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c
+index c8dc307..26d0000 100644
+--- a/src/libbluray/bdnav/navigation.c
++++ b/src/libbluray/bdnav/navigation.c
+@@ -32,9 +32,25 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b)
++{
++    if (a->stream_type == b->stream_type &&
++        a->coding_type == b->coding_type &&
++        a->pid         == b->pid         &&
++        a->subpath_id  == b->subpath_id  &&
++        a->subclip_id  == b->subclip_id  &&
++        a->format      == b->format      &&
++        a->rate        == b->rate        &&
++        a->char_code   == b->char_code   &&
++        memcmp(a->lang, b->lang, 4) == 0) {
++        return 1;
++    }
++    return 0;
++}
++
+ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+ {
+-    unsigned ii, jj;
++    unsigned ii, jj, kk;
+ 
+     for (ii = 0; ii < count; ii++) {
+         if (pl->list_count != pl_list[ii]->list_count) {
+@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl)
+                 pi1->out_time != pi2->out_time) {
+                 break;
+             }
++            if (pi1->stn.num_video           != pi2->stn.num_video           ||
++                pi1->stn.num_audio           != pi2->stn.num_audio           ||
++                pi1->stn.num_pg              != pi2->stn.num_pg              || 
++                pi1->stn.num_ig              != pi2->stn.num_ig              ||
++                pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio ||
++                pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) {
++                break;
++            }
++            for (kk = 0; kk < pi1->stn.num_video; kk++) {
++                if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_audio; kk++) {
++                if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_pg; kk++) {
++                if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_ig; kk++) {
++                if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) {
++                if (!_stream_cmp(&pi1->stn.secondary_audio[kk],
++                                 &pi2->stn.secondary_audio[kk])) {
++                    goto next;
++                }
++            }
++            for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) {
++                if (!_stream_cmp(&pi1->stn.secondary_video[kk],
++                                 &pi2->stn.secondary_video[kk])) {
++                    goto next;
++                }
++            }
+         }
++next:
+         if (jj != pl->list_count) {
+             continue;
+         }
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 6c139242f3e..f0eea80e89d 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -11,7 +11,7 @@ let baseName = "libbluray";
 in
 
 stdenv.mkDerivation {
-  name = "${baseName}-${version}";
+  name = "${baseName}-${version}p1";
 
   src = fetchgit {
     url = git://git.videolan.org/libbluray.git;
@@ -26,6 +26,9 @@ stdenv.mkDerivation {
   preConfigure = "./bootstrap";
   configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
 
+  # From Handbrake
+  patches = [ ./A01-filter-dup.patch ];
+
   meta = {
     homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";

From c02f80375f9bcc550f3e8b530262c85e585e516a Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:23:13 +0200
Subject: [PATCH 0938/2033] libdvd{read,nav}: Version bump and patch from
 Handbrake project

- API-compatible version bumps to latest upstream
Patches:
- A08: Adds API call to duplicate a DVD VM to libdvdnav
- P00: Skip making examples
---
 .../libraries/libdvdnav/A08-dvdnav-dup.patch  | 137 ++++++++++++++++++
 .../libdvdnav/P00-mingw-no-examples.patch     |  21 +++
 .../libraries/libdvdnav/default.nix           |  16 +-
 .../libraries/libdvdread/default.nix          |  16 +-
 4 files changed, 175 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
 create mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch

diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
new file mode 100644
index 00000000000..c0991b43555
--- /dev/null
+++ b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
@@ -0,0 +1,137 @@
+Index: src/dvdnav.c
+===================================================================
+--- libdvdnav.orig/src/dvdnav.c	(revision 1168)
++++ libdvdnav/src/dvdnav.c	(working copy)
+@@ -71,6 +71,67 @@
+   return DVDNAV_STATUS_OK;
+ }
+ 
++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) {
++  dvdnav_t *this;
++
++  (*dest) = NULL;
++  this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
++  if(!this)
++    return DVDNAV_STATUS_ERR;
++
++  memcpy(this, src, sizeof(dvdnav_t));
++  this->file = NULL;
++
++  pthread_mutex_init(&this->vm_lock, NULL);
++
++  this->vm = vm_new_copy(src->vm);
++  if(!this->vm) {
++    printerr("Error initialising the DVD VM.");
++    pthread_mutex_destroy(&this->vm_lock);
++    free(this);
++    return DVDNAV_STATUS_ERR;
++  }
++
++  /* Start the read-ahead cache. */
++  this->cache = dvdnav_read_cache_new(this);
++
++  (*dest) = this;
++  return DVDNAV_STATUS_OK;
++}
++
++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {
++
++#ifdef LOG_DEBUG
++  fprintf(MSG_OUT, "libdvdnav: free_dup:called\n");
++#endif
++
++  if (this->file) {
++    pthread_mutex_lock(&this->vm_lock);
++    DVDCloseFile(this->file);
++#ifdef LOG_DEBUG
++    fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
++#endif
++    this->file = NULL;
++    pthread_mutex_unlock(&this->vm_lock);
++  }
++
++  /* Free the VM */
++  if(this->vm)
++    vm_free_copy(this->vm);
++
++  pthread_mutex_destroy(&this->vm_lock);
++
++  /* We leave the final freeing of the entire structure to the cache,
++   * because we don't know, if there are still buffers out in the wild,
++   * that must return first. */
++  if(this->cache)
++    dvdnav_read_cache_free(this->cache);
++  else
++    free(this);
++
++  return DVDNAV_STATUS_OK;
++}
++
+ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
+   dvdnav_t *this;
+   struct timeval time;
+Index: src/dvdnav/dvdnav.h
+===================================================================
+--- libdvdnav.orig/src/dvdnav/dvdnav.h	(revision 1168)
++++ libdvdnav/src/dvdnav.h	(working copy)
+@@ -89,6 +89,9 @@
+  */
+ dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
+ 
++dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src);
++dvdnav_status_t dvdnav_free_dup(dvdnav_t *this);
++
+ /*
+  * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
+  * memory associated with it.
+Index: src/vm/vm.c
+===================================================================
+--- libdvdnav.orig/src/vm/vm.c	(revision 1168)
++++ libdvdnav/src/vm/vm.c	(working copy)
+@@ -96,6 +98,7 @@
+ 
+ static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang);
+ static pgcit_t* get_PGCIT(vm_t *vm);
++static void vm_close(vm_t *vm);
+ 
+ 
+ /* Helper functions */
+@@ -262,7 +265,7 @@
+ }
+ 
+ void vm_free_vm(vm_t *vm) {
+-  vm_stop(vm);
++  vm_close(vm);
+   free(vm);
+ }
+ 
+@@ -289,12 +292,20 @@
+ 
+ int vm_start(vm_t *vm) {
+   /* Set pgc to FP (First Play) pgc */
++  if (vm->stopped) {
++    vm_reset(vm, NULL);
++    vm->stopped = 0;
++  }
+   set_FP_PGC(vm);
+   process_command(vm, play_PGC(vm));
+   return !vm->stopped;
+ }
+ 
+ void vm_stop(vm_t *vm) {
++  vm->stopped = 1;
++}
++
++static void vm_close(vm_t *vm) {
+   if(vm->vmgi) {
+     ifoClose(vm->vmgi);
+     vm->vmgi=NULL;
+@@ -346,7 +357,7 @@
+ 
+   if (vm->dvd && dvdroot) {
+     /* a new dvd device has been requested */
+-    vm_stop(vm);
++    vm_close(vm);
+   }
+   if (!vm->dvd) {
+     vm->dvd = DVDOpen(dvdroot);
diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
new file mode 100644
index 00000000000..0e061861735
--- /dev/null
+++ b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
@@ -0,0 +1,21 @@
+diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am
+--- libdvdnav.orig/Makefile.am	2008-10-03 16:11:46.000000000 -0400
++++ libdvdnav/Makefile.am	2009-04-24 02:53:15.000000000 -0400
+@@ -1,7 +1,7 @@
+ include $(top_srcdir)/misc/Makefile.common
+ 
+ 
+-SUBDIRS = src examples doc misc m4
++SUBDIRS = src doc misc m4
+ 
+ EXTRA_DIST = autogen.sh \
+ 	     AUTHORS \
+diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac
+--- libdvdnav.orig/configure.ac	2009-01-08 17:57:11.000000000 -0500
++++ libdvdnav/configure.ac	2009-04-24 02:52:34.000000000 -0400
+@@ -252,5 +252,4 @@
+ misc/relchk.sh
+ m4/Makefile
+ doc/Makefile
+-examples/Makefile
+ ])
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 4ba938911a4..9b4e912772b 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, libdvdread}:
+{stdenv, fetchurl, pkgconfig, libdvdread}:
 
 stdenv.mkDerivation {
-  name = "libdvdnav-4.1.3";
+  name = "libdvdnav-4.2.1";
   
   src = fetchurl {
-    url = http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-4.1.3.tar.bz2;
-    sha1 = "d1b95eb8a7caee1fa7580a1abad84d6cb3cad046";
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
+    sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [libdvdread];
 
   configureScript = "./configure2"; # wtf?
@@ -16,9 +17,14 @@ stdenv.mkDerivation {
     mkdir -p $out
   '';
 
+  # From Handbrake
+  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
+
   meta = {
-    homepage = http://www.mplayerhq.hu/;
+    homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library that implements DVD navigation features such as DVD menus";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
   };
 
   passthru = { inherit libdvdread; };
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 2593274d89b..eb5a48a99f1 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -1,29 +1,25 @@
 {stdenv, fetchurl, libdvdcss}:
 
 stdenv.mkDerivation {
-  name = "libdvdread-4.2.1";
+  name = "libdvdread-4.9.9";
   
   src = fetchurl {
-    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz;
-    sha256 = "af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4";
+    url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz;
+    sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";
   };
 
   buildInputs = [libdvdcss];
 
   NIX_LDFLAGS = "-ldvdcss";
 
-  configureScript = "./configure2"; # wtf?
-
-  preConfigure = ''
-    mkdir -p $out
-  '';
-
   postInstall = ''
     ln -s dvdread $out/include/libdvdread
   '';
 
   meta = {
-    homepage = http://www.mplayerhq.hu/;
+    homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library for reading DVDs";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
   };
 }

From ccb065a08cf06a77e7861d6e855fa953b9daef2b Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:34:24 +0200
Subject: [PATCH 0939/2033] libmpeg2: Add patches from Handbrake project

libmpeg2 is abandoned upstream.

Patches:
- A00: Fix tag handling on frames
---
 .../libraries/libmpeg2/A00-tags.patch         | 27 +++++++++++++++++++
 .../libraries/libmpeg2/default.nix            |  7 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libmpeg2/A00-tags.patch

diff --git a/pkgs/development/libraries/libmpeg2/A00-tags.patch b/pkgs/development/libraries/libmpeg2/A00-tags.patch
new file mode 100644
index 00000000000..0b5d7d7da12
--- /dev/null
+++ b/pkgs/development/libraries/libmpeg2/A00-tags.patch
@@ -0,0 +1,27 @@
+diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
+--- mpeg2dec.orig/libmpeg2/decode.c	2008-07-09 12:16:05.000000000 -0700
++++ mpeg2dec/libmpeg2/decode.c	2009-07-03 16:29:48.000000000 -0700
+@@ -212,7 +212,7 @@
+ 
+ mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
+ {
+-    static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
++    static int (* process_header[]) (mpeg2dec_t *) = {
+ 	mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
+ 	mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
+     };
+@@ -368,6 +368,14 @@
+ 
+ void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
+ {
++    if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
++        // since tags got processed when we entered this state we
++        // have to set them directly or they'll end up on the next frame.
++        mpeg2dec->picture->tag = tag;
++        mpeg2dec->picture->tag2 = tag2;
++        mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
++        return;
++    }
+     mpeg2dec->tag_previous = mpeg2dec->tag_current;
+     mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
+     mpeg2dec->tag_current = tag;
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index 1d04eea89f6..e651a932efe 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -1,13 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libmpeg2-0.5.1";
+  name = "libmpeg2-0.5.1p4";
   
   src = fetchurl {
     url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz";
     sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny";
   };
 
+  # From Handbrake - Project seems unmaintained
+  patches = [
+    ./A00-tags.patch
+  ];
+
   meta = {
     homepage = http://libmpeg2.sourceforge.net/;
     description = "A free library for decoding mpeg-2 and mpeg-1 video streams";

From d1ebc1a2b3dc988264f8585c2bec3b7bf9063a1e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:44:16 +0200
Subject: [PATCH 0940/2033] mp4v2: Add patches from Handbrake project

mp4v2 seems abandoned upstream.

Patches:
- A00: Add API call for subpicture subtitles
- A01: Fix divide by zero
- A02: Give a meaningfull error when hitting 4GB limit
- P00: Fix compilation with mingw32
---
 .../libraries/mp4v2/A00-nero-vobsub.patch     | 142 ++++++++++++++++++
 .../libraries/mp4v2/A01-divide-zero.patch     |  22 +++
 .../mp4v2/A02-meaningful-4gb-warning.patch    |  14 ++
 .../libraries/mp4v2/P00-mingw-dllimport.patch |  11 ++
 pkgs/development/libraries/mp4v2/default.nix  |   8 +-
 5 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
 create mode 100644 pkgs/development/libraries/mp4v2/A01-divide-zero.patch
 create mode 100644 pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
 create mode 100644 pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch

diff --git a/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch b/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
new file mode 100644
index 00000000000..beb8be6d892
--- /dev/null
+++ b/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
@@ -0,0 +1,142 @@
+diff -Naur mp4v2-trunk-r355/include/mp4v2/general.h mp4v2-trunk-r355/include/mp4v2/general.h
+--- mp4v2-trunk-r355/include/mp4v2/general.h	2009-05-23 06:09:58.000000000 -0700
++++ mp4v2-trunk-r355/include/mp4v2/general.h	2010-05-23 14:22:21.949288657 -0700
+@@ -75,6 +75,7 @@
+ #define MP4_CNTL_TRACK_TYPE     "cntl"  /**< Constant: control track. */
+ #define MP4_TEXT_TRACK_TYPE     "text"  /**< Constant: text track. */
+ #define MP4_SUBTITLE_TRACK_TYPE "sbtl"  /**< Constant: subtitle track. */
++#define MP4_SUBPIC_TRACK_TYPE   "subp"  /**< Constant: subtitle track. */
+ /*
+  * This second set of track types should be created
+  * via MP4AddSystemsTrack(type)
+diff -Naur mp4v2-trunk-r355/include/mp4v2/track.h mp4v2-trunk-r355/include/mp4v2/track.h
+--- mp4v2-trunk-r355/include/mp4v2/track.h	2009-05-23 06:21:49.000000000 -0700
++++ mp4v2-trunk-r355/include/mp4v2/track.h	2010-05-23 15:43:47.249286008 -0700
+@@ -310,6 +310,13 @@
+     uint16_t      height );
+ 
+ MP4V2_EXPORT
++MP4TrackId MP4AddSubpicTrack(
++    MP4FileHandle hFile,
++    uint32_t      timescale,
++    uint16_t      width,
++    uint16_t      height );
++
++MP4V2_EXPORT
+ MP4TrackId MP4AddPixelAspectRatio(
+     MP4FileHandle hFile,
+     MP4TrackId    refTrackId,
+diff -Naur mp4v2-trunk-r355/src/descriptors.h mp4v2-trunk-r355/src/descriptors.h
+--- mp4v2-trunk-r355/src/descriptors.h	2009-05-20 19:52:32.000000000 -0700
++++ mp4v2-trunk-r355/src/descriptors.h	2010-05-23 16:29:34.800935677 -0700
+@@ -119,6 +119,7 @@
+ // ES objectTypeId
+ const uint8_t MP4SystemsV1ObjectType            = 0x01;
+ const uint8_t MP4SystemsV2ObjectType            = 0x02;
++const uint8_t MP4SubpicObjectType               = 0xe0;
+ 
+ // ES streamType
+ const uint8_t MP4ObjectDescriptionStreamType    = 0x01;
+@@ -131,6 +132,7 @@
+ const uint8_t MP4OCIStreamType                  = 0x08;
+ const uint8_t MP4MPEGJStreamType                = 0x09;
+ const uint8_t MP4UserPrivateStreamType          = 0x20;
++const uint8_t MP4NeroSubpicStreamType           = 0x38;
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+diff -Naur mp4v2-trunk-r355/src/mp4.cpp mp4v2-trunk-r355/src/mp4.cpp
+--- mp4v2-trunk-r355/src/mp4.cpp	2009-05-23 06:29:37.000000000 -0700
++++ mp4v2-trunk-r355/src/mp4.cpp	2010-05-23 15:45:28.852222074 -0700
+@@ -1174,6 +1174,23 @@
+         return MP4_INVALID_TRACK_ID;
+     }
+ 
++    MP4TrackId MP4AddSubpicTrack(MP4FileHandle hFile,
++                                   uint32_t timescale,
++                                   uint16_t width,
++                                   uint16_t height)
++    {
++        if (MP4_IS_VALID_FILE_HANDLE(hFile)) {
++            try {
++                return ((MP4File*)hFile)->AddSubpicTrack(timescale, width, height);
++            }
++            catch (MP4Error* e) {
++                PRINT_ERROR(e);
++                delete e;
++            }
++        }
++        return MP4_INVALID_TRACK_ID;
++    }
++
+     MP4TrackId MP4AddChapterTextTrack(
+         MP4FileHandle hFile, MP4TrackId refTrackId, uint32_t timescale)
+     {
+diff -Naur mp4v2-trunk-r355/src/mp4file.cpp mp4v2-trunk-r355/src/mp4file.cpp
+--- mp4v2-trunk-r355/src/mp4file.cpp	2009-05-26 19:34:56.000000000 -0700
++++ mp4v2-trunk-r355/src/mp4file.cpp	2010-05-23 16:32:52.654220633 -0700
+@@ -2095,6 +2095,50 @@
+     return trackId;
+ }
+ 
++MP4TrackId MP4File::AddSubpicTrack(uint32_t timescale,
++                                     uint16_t width,
++                                     uint16_t height)
++{
++    MP4TrackId trackId =
++        AddTrack(MP4_SUBPIC_TRACK_TYPE, timescale);
++
++    InsertChildAtom(MakeTrackName(trackId, "mdia.minf"), "nmhd", 0);
++
++    (void)AddChildAtom(MakeTrackName(trackId, "mdia.minf.stbl.stsd"), "mp4s");
++
++    SetTrackFloatProperty(trackId, "tkhd.width", width);
++    SetTrackFloatProperty(trackId, "tkhd.height", height);
++    SetTrackIntegerProperty(trackId, "tkhd.layer", 0);
++
++    // stsd is a unique beast in that it has a count of the number
++    // of child atoms that needs to be incremented after we add the mp4s atom
++    MP4Integer32Property* pStsdCountProperty;
++    FindIntegerProperty(
++        MakeTrackName(trackId, "mdia.minf.stbl.stsd.entryCount"),
++        (MP4Property**)&pStsdCountProperty);
++    pStsdCountProperty->IncrementValue();
++
++    SetTrackIntegerProperty(trackId,
++                            "mdia.minf.stbl.stsd.mp4s.esds.ESID",
++#if 0
++                            // note - for a file, these values need to
++                            // be 0 - wmay - 04/16/2003
++                            trackId
++#else
++                            0
++#endif
++                           );
++
++    SetTrackIntegerProperty(trackId,
++                            "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.objectTypeId",
++                            MP4SubpicObjectType);
++
++    SetTrackIntegerProperty(trackId,
++                            "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.streamType",
++                            MP4NeroSubpicStreamType);
++    return trackId;
++}
++
+ MP4TrackId MP4File::AddChapterTextTrack(MP4TrackId refTrackId, uint32_t timescale)
+ {
+     // validate reference track id
+diff -Naur mp4v2-trunk-r355/src/mp4file.h mp4v2-trunk-r355/src/mp4file.h
+--- mp4v2-trunk-r355/src/mp4file.h	2009-05-23 06:29:37.000000000 -0700
++++ mp4v2-trunk-r355/src/mp4file.h	2010-05-23 15:44:57.568026299 -0700
+@@ -388,6 +388,10 @@
+                                 uint16_t width,
+                                 uint16_t height);
+ 
++    MP4TrackId AddSubpicTrack(uint32_t timescale,
++                                uint16_t width,
++                                uint16_t height);
++
+     MP4TrackId AddPixelAspectRatio(MP4TrackId trackId, uint32_t hSpacing, uint32_t vSpacing);
+     MP4TrackId AddColr(MP4TrackId trackId, uint16_t pri, uint16_t tran, uint16_t mat);
+ 
diff --git a/pkgs/development/libraries/mp4v2/A01-divide-zero.patch b/pkgs/development/libraries/mp4v2/A01-divide-zero.patch
new file mode 100644
index 00000000000..4d6aa4d2a39
--- /dev/null
+++ b/pkgs/development/libraries/mp4v2/A01-divide-zero.patch
@@ -0,0 +1,22 @@
+--- mp4v2-r355/src/mp4track.cpp	2012-01-05 15:44:29.000000000 +0100
++++ mp4v2-r355/src/mp4track.cpp	2012-01-05 15:47:34.000000000 +0100
+@@ -819,13 +819,14 @@
+                 (thisSecStart + timeScale) - lastSampleTime;
+             // calculate the duration of the last sample
+             MP4Duration lastSampleDur = sampleTime - lastSampleTime;
+-            uint32_t overflow_bytes;
+             // now, calculate the number of bytes we overflowed.  Round up.
+-            overflow_bytes =
+-                ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
++            if( lastSampleDur > 0 ) {
++                uint32_t overflow_bytes = 0;
++                overflow_bytes = ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
+ 
+-            if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
+-                maxBytesPerSec = bytesThisSec - overflow_bytes;
++                if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
++                    maxBytesPerSec = bytesThisSec - overflow_bytes;
++                }
+             }
+ 
+             // now adjust the values for this sample.  Remove the bytes
diff --git a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
new file mode 100644
index 00000000000..987298bd5b0
--- /dev/null
+++ b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
@@ -0,0 +1,14 @@
+diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp
+--- mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:40:03.000000000 +0100
++++ mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:36:38.000000000 +0100
+@@ -543,6 +543,10 @@
+         m_pFile->SetPosition(m_start + 8);
+         m_pFile->WriteUInt64(m_size);
+     } else {
++        if (!(m_size <= (uint64_t)0xFFFFFFFF)) {
++            // Let the user know what the following assert is all about
++            fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n");
++        }
+         ASSERT(m_size <= (uint64_t)0xFFFFFFFF);
+         m_pFile->SetPosition(m_start);
+         m_pFile->WriteUInt32(m_size);
diff --git a/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch b/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch
new file mode 100644
index 00000000000..5b7f1a300bd
--- /dev/null
+++ b/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch
@@ -0,0 +1,11 @@
+--- mp4v2-trunk-r355/include/mp4v2/platform.h	2009-05-20 19:52:26.000000000 -0700
++++ xxx/include/mp4v2/platform.h	2010-09-11 09:36:20.881523832 -0700
+@@ -24,7 +24,7 @@
+ #if defined( _WIN32 ) || defined( __MINGW32__ )
+ #   if defined( _WINDLL ) || defined( DLL_EXPORT )
+ #       define MP4V2_EXPORT __declspec(dllexport)
+-#   elif defined( _DLL ) || defined( DLL_IMPORT ) 
++#   elif defined( DLL_IMPORT ) 
+ #       define MP4V2_EXPORT __declspec(dllimport)
+ #   else
+ #       define MP4V2_EXPORT
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 7b0dd938211..06e8c8e5ac3 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -1,13 +1,19 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mp4v2-1.9.1";
+  name = "mp4v2-1.9.1p4";
 
   src = fetchurl {
     url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
     sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
   };
 
+  # From Handbrake
+  # mp4v2 doesn't seem to be actively maintained any more :-/
+  patches = [
+    ./A00-nero-vobsub.patch ./A01-divide-zero.patch ./A02-meaningful-4gb-warning.patch
+    ./P00-mingw-dllimport.patch
+  ];
   # `faac' expects `mp4.h'.
   postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";
 

From 3a7b7a8499e8fed3f8d19334a8fd865d0bbd609b Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:52:45 +0200
Subject: [PATCH 0941/2033] libmkv: from Handbrake project

Libmkv was started from Handbrake but is now unmaintained upstream.

Patches:
- A01: add constant to header file
- A02: Breaks API: Allow changing output sampling frequency
- P00: Fix accessing large files on Mingw32
---
 .../libraries/libmkv/A01-hbmv-pgs.patch       | 12 ++++++++
 .../libmkv/A02-audio-out-sampling-freq.patch  | 28 ++++++++++++++++++
 .../libmkv/P00-mingw-large-file.patch         | 24 +++++++++++++++
 pkgs/development/libraries/libmkv/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 95 insertions(+)
 create mode 100644 pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
 create mode 100644 pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
 create mode 100644 pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
 create mode 100644 pkgs/development/libraries/libmkv/default.nix

diff --git a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
new file mode 100644
index 00000000000..9f863cac412
--- /dev/null
+++ b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
@@ -0,0 +1,12 @@
+diff --git a/include/libmkv.h b/include/libmkv.h
+index 146a91f..f03d608 100644
+--- a/include/libmkv.h
++++ b/include/libmkv.h
+@@ -94,6 +94,7 @@ extern "C" {
+ #define MK_SUBTITLE_USF    "S_TEXT/USF"
+ #define MK_SUBTITLE_VOBSUB "S_VOBSUB"
+ #define MK_SUBTITLE_BMP    "S_IMAGE/BMP"
++#define MK_SUBTITLE_PGS    "S_HDMV/PGS"
+ 
+ /* Official Tags */
+ #define MK_TAG_TITLE		"TITLE"
diff --git a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
new file mode 100644
index 00000000000..ea31957c1d2
--- /dev/null
+++ b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
@@ -0,0 +1,28 @@
+diff --git a/include/libmkv.h b/include/libmkv.h
+index 146a91f..f03d608 100644
+--- a/include/libmkv.h
++++ b/include/libmkv.h
+@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
+ 		} video;
+ 		struct {
+ 			float samplingFreq;	/* Sampling Frequency in Hz */
++			float outputSamplingFreq;	/* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
+ 			unsigned channels;	/* Number of channels for this track */
+ 			unsigned bitDepth;	/* Bits per sample (PCM) */
+ 		} audio;
+diff --git a/src/tracks.c b/src/tracks.c
+index f9c7e48..a2a60ca 100644
+--- a/src/tracks.c
++++ b/src/tracks.c
+@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
+ 			/* SamplingFrequency */
+ 			if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
+ 				return NULL;
++			if (tc->extra.audio.outputSamplingFreq) {
++				/* Output SamplingFrequency */
++				if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
++					return NULL;
++			}
+ 			/* Channels */
+ 			if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
+ 				return NULL;
diff --git a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
new file mode 100644
index 00000000000..6a83eacca83
--- /dev/null
+++ b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
@@ -0,0 +1,24 @@
+--- libmkv.orig/src/matroska.c	2009-01-12 23:14:26.000000000 -0800
++++ libmkv/src/matroska.c	2009-03-25 15:22:30.000000000 -0700
+@@ -27,6 +27,11 @@
+ 
+ #include <sys/time.h>
+ 
++#if defined( __MINGW32__ )
++#undef fseeko
++#define fseeko fseeko64
++#endif
++
+ #define RESERVED_SEEKHEAD 0x100
+ /* 256 bytes should be enough room for our Seek entries. */
+ #define RESERVED_CHAPTERS 0x800
+@@ -34,7 +39,7 @@
+ 
+ int mk_seekFile(mk_Writer *w, uint64_t pos)
+ {
+-	if (fseek(w->fp, pos, SEEK_SET))
++	if (fseeko(w->fp, pos, SEEK_SET))
+ 		return -1;
+ 
+ 	w->f_pos = pos;
+
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
new file mode 100644
index 00000000000..c4b98d956bb
--- /dev/null
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, libtool, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "libmkv-0.6.5.1p2";
+  
+  src = fetchgit {
+    url = https://github.com/saintdev/libmkv.git;
+    rev = "refs/tags/0.6.5.1";
+    sha256 = "1b0441x5rl5dbwrc0hq9jih111iil7ckqws3hcdj63jx2ma3s4hi";
+  };
+
+  nativeBuildInputs = [ libtool autoconf automake ];
+
+  # TODO fix library version
+  preConfigure = "sh bootstrap.sh";
+
+  # From Handbrake
+  patches = [
+    ./A01-hbmv-pgs.patch
+    ./A02-audio-out-sampling-freq.patch
+    ./P00-mingw-large-file.patch
+  ];
+
+  meta = {
+    homepage = https://github.com/saintdev/libmkv;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54c61561da8..5b574c1f8af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5142,6 +5142,8 @@ let
 
   libmilter = callPackage ../development/libraries/libmilter { };
 
+  libmkv = callPackage ../development/libraries/libmkv { };
+
   libmms = callPackage ../development/libraries/libmms { };
 
   libmowgli = callPackage ../development/libraries/libmowgli { };

From d93b1f80c034290cc49836030f4f803af70a8f69 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:55:36 +0200
Subject: [PATCH 0942/2033] Add Handbrake 0.9.9: DVD ripper

This packaging splices off the unfree faac library and forces handbrake
to use the (more recent/patched) versions of libraries in Nixpkgs.
Produces the CLI HandbrakeCLI and optionally the GTK+ version ghb.
---
 pkgs/applications/video/handbrake/default.nix |  99 +++++++++++++++++
 .../video/handbrake/disable-unfree.patch      | 101 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 202 insertions(+)
 create mode 100644 pkgs/applications/video/handbrake/default.nix
 create mode 100644 pkgs/applications/video/handbrake/disable-unfree.patch

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
new file mode 100644
index 00000000000..34aa8ff65de
--- /dev/null
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -0,0 +1,99 @@
+# Handbrake normally uses its own copies of the libraries it uses, for better
+# control over library patches.
+#
+# This derivation patches HB so it doesn't do that. The relevant patches
+# are added to the Nix packages and proposed upstream instead. In several cases
+# upstream already incorporated these patches.
+# This has the benefits of providing improvements to other packages,
+# making licenses more clear and reducing compile time/install size.
+#
+# For compliance, the unfree codec faac is optionally spliced out.
+#
+# Only tested on Linux
+#
+# TODO: package and use libappindicator
+
+{ stdenv, config, fetchurl,
+  python, pkgconfig, yasm,
+  autoconf, automake, libtool, m4,
+  libass, libsamplerate, fribidi, libxml2, bzip2,
+  libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
+  lame, faac, ffmpeg, libdvdread, libdvdnav, libbluray,
+  mp4v2, mpeg2dec, x264, libmkv,
+  fontconfig, freetype,
+  glib, gtk, webkitgtk, intltool, libnotify,
+  gst_all_1, dbus_glib, udev,
+  useGtk ? true,
+  useWebKitGtk ? false # This prevents ghb from starting in my tests
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.9";
+  name = "handbrake-${version}";
+
+  allowUnfree = config.allowUnfree or false;
+
+  buildInputsX = stdenv.lib.optionals useGtk [
+    glib gtk intltool libnotify
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
+  ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ];
+
+  # Did not test compiling with it
+  unfreeInputs = stdenv.lib.optionals allowUnfree [ faac ];
+
+  nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];
+  buildInputs = [
+    fribidi fontconfig freetype
+    libass libsamplerate libxml2 bzip2
+    libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
+    lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264
+  ] ++ buildInputsX ++ unfreeInputs;
+
+  
+  src = fetchurl {
+    name = "HandBrake-${version}.tar.bz2";
+    url = "http://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2";
+    sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7";
+  };
+
+  patches = stdenv.lib.optionals (! allowUnfree) [ ./disable-unfree.patch ];
+
+  preConfigure = ''
+    # Fake wget to prevent downloads
+    mkdir wget
+    echo "#!/bin/sh" > wget/wget
+    echo "echo ===== Not fetching \$*" >> wget/wget
+    echo "exit 1" >> wget/wget
+    chmod +x wget/wget
+    export PATH=$PATH:$PWD/wget
+
+    # Force using nixpkgs dependencies
+    sed -i '/MODULES += contrib/d' make/include/main.defs
+    sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
+
+    # disable faac if non-free
+    if [ -z "$allowUnfree" ]; then
+      rm libhb/encfaac.c
+    fi
+  '';
+
+  configureFlags = "--enable-fdk-aac ${if useGtk then "--disable-gtk-update-checks" else "--disable-gtk"}";
+
+  preBuild = ''
+    cd build
+  '';
+
+  meta = {
+    homepage = http://handbrake.fr/;
+    description = "A tool for ripping DVDs into video files";
+    longDescription = ''
+      Handbrake is a versatile transcoding DVD ripper. This package
+      provides the cli HandbrakeCLI and the GTK+ version ghb.
+      The faac library is disabled if you're compiling free-only.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.wmertens ];
+    # Not tested on anything else
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/video/handbrake/disable-unfree.patch b/pkgs/applications/video/handbrake/disable-unfree.patch
new file mode 100644
index 00000000000..30edcb81c09
--- /dev/null
+++ b/pkgs/applications/video/handbrake/disable-unfree.patch
@@ -0,0 +1,101 @@
+diff -ru HandBrake-0.9.9-orig/gtk/configure.ac HandBrake-0.9.9/gtk/configure.ac
+--- HandBrake-0.9.9-orig/gtk/configure.ac	2014-05-02 22:50:00.047305795 +0200
++++ HandBrake-0.9.9/gtk/configure.ac	2014-05-02 22:48:57.119304020 +0200
+@@ -203,7 +203,7 @@
+     ;;
+ esac
+ 
+-HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
++HB_LIBS="-lhb -la52 -lmkv -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lmp4v2 -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype -lxml2"
+ 
+ if test "x$use_fdk_aac" = "xyes" ; then
+     HB_LIBS+=" -lfdk-aac"
+diff -ru HandBrake-0.9.9-orig/gtk/src/preset_xlat.c HandBrake-0.9.9/gtk/src/preset_xlat.c
+--- HandBrake-0.9.9-orig/gtk/src/preset_xlat.c	2014-05-02 22:50:00.043305794 +0200
++++ HandBrake-0.9.9/gtk/src/preset_xlat.c	2014-05-02 22:42:20.987292846 +0200
+@@ -260,7 +260,6 @@
+ 
+ static value_map_t acodec_xlat[] =
+ {
+-    {"AAC (faac)", "faac"},
+     {"AC3 Passthru", "ac3"},
+     {"MP3 (lame)", "lame"},
+     {"Vorbis (vorbis)", "vorbis"},
+diff -ru HandBrake-0.9.9-orig/gtk/src/presets.c HandBrake-0.9.9/gtk/src/presets.c
+--- HandBrake-0.9.9-orig/gtk/src/presets.c	2014-05-02 22:50:00.043305794 +0200
++++ HandBrake-0.9.9/gtk/src/presets.c	2014-05-02 22:42:41.283293419 +0200
+@@ -2029,8 +2029,6 @@
+ 
+ static value_map_t acodec_xlat_compat[] =
+ {
+-    {"AAC (CoreAudio)", "faac"},
+-    {"HE-AAC (CoreAudio)", "faac"},
+     {"AC3 (ffmpeg)", "ac3"},
+     {"AC3", "ac3"},
+     {"MP3 Passthru", "mp3pass"},
+diff -ru HandBrake-0.9.9-orig/libhb/common.c HandBrake-0.9.9/libhb/common.c
+--- HandBrake-0.9.9-orig/libhb/common.c	2014-05-02 22:50:00.047305795 +0200
++++ HandBrake-0.9.9/libhb/common.c	2014-05-02 22:37:24.679284489 +0200
+@@ -126,7 +126,6 @@
+     { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
+     { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
+ #endif
+-    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
+ #ifdef USE_FDK_AAC
+     { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },
+     { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },
+diff -ru HandBrake-0.9.9-orig/libhb/common.h HandBrake-0.9.9/libhb/common.h
+--- HandBrake-0.9.9-orig/libhb/common.h	2014-05-02 22:50:00.047305795 +0200
++++ HandBrake-0.9.9/libhb/common.h	2014-05-02 22:39:37.839288245 +0200
+@@ -945,7 +945,6 @@
+ extern hb_work_object_t hb_decavcodeca;
+ extern hb_work_object_t hb_decavcodecv;
+ extern hb_work_object_t hb_declpcm;
+-extern hb_work_object_t hb_encfaac;
+ extern hb_work_object_t hb_enclame;
+ extern hb_work_object_t hb_encvorbis;
+ extern hb_work_object_t hb_muxer;
+diff -ru HandBrake-0.9.9-orig/libhb/hb.c HandBrake-0.9.9/libhb/hb.c
+--- HandBrake-0.9.9-orig/libhb/hb.c	2014-05-02 22:50:00.047305795 +0200
++++ HandBrake-0.9.9/libhb/hb.c	2014-05-02 22:39:02.287287242 +0200
+@@ -487,7 +487,6 @@
+ 	hb_register( &hb_decavcodeca );
+ 	hb_register( &hb_decavcodecv );
+ 	hb_register( &hb_declpcm );
+-	hb_register( &hb_encfaac );
+ 	hb_register( &hb_enclame );
+ 	hb_register( &hb_encvorbis );
+ 	hb_register( &hb_muxer );
+@@ -588,7 +587,6 @@
+ 	hb_register( &hb_decavcodeca );
+ 	hb_register( &hb_decavcodecv );
+ 	hb_register( &hb_declpcm );
+-	hb_register( &hb_encfaac );
+ 	hb_register( &hb_enclame );
+ 	hb_register( &hb_encvorbis );
+ 	hb_register( &hb_muxer );
+diff -ru HandBrake-0.9.9-orig/libhb/module.defs HandBrake-0.9.9/libhb/module.defs
+--- HandBrake-0.9.9-orig/libhb/module.defs	2014-05-02 22:50:00.047305795 +0200
++++ HandBrake-0.9.9/libhb/module.defs	2014-05-02 22:39:25.727287903 +0200
+@@ -95,7 +95,7 @@
+ LIBHB.lib = $(LIBHB.build/)hb.lib
+ 
+ LIBHB.dll.libs = $(foreach n, \
+-        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
++        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
+         $(CONTRIB.build/)lib/lib$(n).a )
+Only in HandBrake-0.9.9: libhb-orig
+diff -ru HandBrake-0.9.9orig/test/module.defs HandBrake-0.9.9/test/module.defs
+--- HandBrake-0.9.9-orig/test/module.defs	2014-05-02 23:15:10.575348401 +0200
++++ HandBrake-0.9.9/test/module.defs	2014-05-02 23:17:00.523351502 +0200
+@@ -14,7 +14,7 @@
+ TEST.libs = $(LIBHB.a)
+ 
+ TEST.GCC.l = \
+-        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
++        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
+         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+         bluray xml2 bz2 z
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b574c1f8af..75092848116 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8704,6 +8704,8 @@ let
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
+  handbrake = callPackage ../applications/video/handbrake { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };

From 9bc6893712e3a63191975b4aac132f0caab2816e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 3 May 2014 23:01:00 -0500
Subject: [PATCH 0943/2033] Add several new Haskell expressions

---
 .../libraries/haskell/CC-delcont/default.nix  | 14 ++++++++++
 .../libraries/haskell/composition/default.nix | 13 +++++++++
 .../libraries/haskell/cond/default.nix        | 13 +++++++++
 .../haskell/conduit-combinators/default.nix   |  4 +--
 .../haskell/doctest-prop/default.nix          | 14 ++++++++++
 .../haskell/kan-extensions/default.nix        | 19 +++++++++++++
 .../haskell/monad-coroutine/default.nix       | 14 ++++++++++
 .../haskell/monad-parallel/default.nix        | 14 ++++++++++
 .../libraries/haskell/monad-stm/default.nix   | 13 +++++++++
 .../libraries/haskell/multimap/default.nix    | 13 +++++++++
 .../haskell/regex-applicative/default.nix     | 19 +++++++++++++
 .../libraries/haskell/rex/default.nix         | 14 ++++++++++
 .../libraries/haskell/speculation/default.nix | 14 ++++++++++
 .../libraries/haskell/stm-stats/default.nix   | 13 +++++++++
 .../haskell/th-expand-syns/default.nix        | 13 +++++++++
 pkgs/top-level/haskell-packages.nix           | 28 +++++++++++++++++++
 16 files changed, 230 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/CC-delcont/default.nix
 create mode 100644 pkgs/development/libraries/haskell/composition/default.nix
 create mode 100644 pkgs/development/libraries/haskell/cond/default.nix
 create mode 100644 pkgs/development/libraries/haskell/doctest-prop/default.nix
 create mode 100644 pkgs/development/libraries/haskell/kan-extensions/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-coroutine/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-parallel/default.nix
 create mode 100644 pkgs/development/libraries/haskell/monad-stm/default.nix
 create mode 100644 pkgs/development/libraries/haskell/multimap/default.nix
 create mode 100644 pkgs/development/libraries/haskell/regex-applicative/default.nix
 create mode 100644 pkgs/development/libraries/haskell/rex/default.nix
 create mode 100644 pkgs/development/libraries/haskell/speculation/default.nix
 create mode 100644 pkgs/development/libraries/haskell/stm-stats/default.nix
 create mode 100644 pkgs/development/libraries/haskell/th-expand-syns/default.nix

diff --git a/pkgs/development/libraries/haskell/CC-delcont/default.nix b/pkgs/development/libraries/haskell/CC-delcont/default.nix
new file mode 100644
index 00000000000..e13344034ca
--- /dev/null
+++ b/pkgs/development/libraries/haskell/CC-delcont/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "CC-delcont";
+  version = "0.2";
+  sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~dolio/CC-delcont";
+    description = "Delimited continuations and dynamically scoped variables";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/composition/default.nix b/pkgs/development/libraries/haskell/composition/default.nix
new file mode 100644
index 00000000000..0a870c5b353
--- /dev/null
+++ b/pkgs/development/libraries/haskell/composition/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "composition";
+  version = "1.0.1.0";
+  sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
+  meta = {
+    homepage = "http://patch-tag.com/r/DanBurton/composition/home";
+    description = "Combinators for unorthodox function composition";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix
new file mode 100644
index 00000000000..c0c3d6ca784
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cond/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cond";
+  version = "0.4.0.2";
+  sha256 = "13m7bcsx4nch767kf9wza0vqql711b8vjd3m5cahrvb7xbh3g593";
+  meta = {
+    homepage = "https://github.com/kallisti-dev/cond";
+    description = "Basic conditional and boolean operators with monadic variants";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index b88b15cef67..dc0e872a032 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.5";
-  sha256 = "1by9jjflascchs7gf53fk5srv3ihrir8jqac6zyq74fjclx3b6z0";
+  version = "0.2.5.1";
+  sha256 = "1xz8vh9pvh3897lnv1vs69g079q6qvbh334gpfnkc5lb7hvdw7qv";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet
diff --git a/pkgs/development/libraries/haskell/doctest-prop/default.nix b/pkgs/development/libraries/haskell/doctest-prop/default.nix
new file mode 100644
index 00000000000..05376ee6bbc
--- /dev/null
+++ b/pkgs/development/libraries/haskell/doctest-prop/default.nix
@@ -0,0 +1,14 @@
+{ cabal, doctest, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "doctest-prop";
+  version = "0.2";
+  sha256 = "09wxkhcmh297hqnx3g4x8ff0w5dcmls9y383417rc8wawf5q288n";
+  buildDepends = [ HUnit QuickCheck ];
+  testDepends = [ doctest HUnit QuickCheck ];
+  meta = {
+    description = "Allow QuickCheck-style property testing within doctest";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix
new file mode 100644
index 00000000000..d4b5c5752e0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix
@@ -0,0 +1,19 @@
+{ cabal, adjunctions, comonad, contravariant, distributive, free
+, mtl, pointed, semigroupoids, speculation, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "kan-extensions";
+  version = "4.0.2";
+  sha256 = "05invi86i2a115jdy2nzdkc0i6g170j0xcxycw2z2qjigvjsaizi";
+  buildDepends = [
+    adjunctions comonad contravariant distributive free mtl pointed
+    semigroupoids speculation transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/kan-extensions/";
+    description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-coroutine/default.nix b/pkgs/development/libraries/haskell/monad-coroutine/default.nix
new file mode 100644
index 00000000000..6ddf872a6da
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-coroutine/default.nix
@@ -0,0 +1,14 @@
+{ cabal, monadParallel, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-coroutine";
+  version = "0.8";
+  sha256 = "0nirp5c3vi529ap142zs29j10j9m609ippi3chv6a87h51avkhzx";
+  buildDepends = [ monadParallel transformers ];
+  meta = {
+    homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
+    description = "Coroutine monad transformer for suspending and resuming monadic computations";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix
new file mode 100644
index 00000000000..1ee628cb36a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix
@@ -0,0 +1,14 @@
+{ cabal, parallel, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-parallel";
+  version = "0.7.1.2";
+  sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj";
+  buildDepends = [ parallel transformers ];
+  meta = {
+    homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
+    description = "Parallel execution of monadic computations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-stm/default.nix b/pkgs/development/libraries/haskell/monad-stm/default.nix
new file mode 100644
index 00000000000..5f923f5110a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-stm/default.nix
@@ -0,0 +1,13 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-stm";
+  version = "0.1.0.2";
+  sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
+  buildDepends = [ stm transformers ];
+  meta = {
+    description = "MonadSTM class analogous to MonadIO";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/multimap/default.nix b/pkgs/development/libraries/haskell/multimap/default.nix
new file mode 100644
index 00000000000..27283ad6a65
--- /dev/null
+++ b/pkgs/development/libraries/haskell/multimap/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "multimap";
+  version = "1.2.1";
+  sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
+  meta = {
+    homepage = "http://hub.darcs.net/scravy/multimap";
+    description = "A multimap";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/regex-applicative/default.nix b/pkgs/development/libraries/haskell/regex-applicative/default.nix
new file mode 100644
index 00000000000..5cb6485ec71
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-applicative/default.nix
@@ -0,0 +1,19 @@
+{ cabal, HUnit, smallcheck, tasty, tastyHunit, tastySmallcheck
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "regex-applicative";
+  version = "0.3.0.2";
+  sha256 = "0bzf8lnb5568glppk8bajh4c3a08baav5r0qhyn3vnfybi02c4d2";
+  buildDepends = [ transformers ];
+  testDepends = [
+    HUnit smallcheck tasty tastyHunit tastySmallcheck transformers
+  ];
+  meta = {
+    homepage = "https://github.com/feuerbach/regex-applicative";
+    description = "Regex-based parsing with applicative interface";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/rex/default.nix b/pkgs/development/libraries/haskell/rex/default.nix
new file mode 100644
index 00000000000..c590b6023c0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/rex/default.nix
@@ -0,0 +1,14 @@
+{ cabal, haskellSrcExts, haskellSrcMeta, pcreLight }:
+
+cabal.mkDerivation (self: {
+  pname = "rex";
+  version = "0.5.1";
+  sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
+  buildDepends = [ haskellSrcExts haskellSrcMeta pcreLight ];
+  meta = {
+    homepage = "http://github.com/mgsloan/rex";
+    description = "A quasi-quoter for typeful results of regex captures";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/speculation/default.nix b/pkgs/development/libraries/haskell/speculation/default.nix
new file mode 100644
index 00000000000..2cbad477b04
--- /dev/null
+++ b/pkgs/development/libraries/haskell/speculation/default.nix
@@ -0,0 +1,14 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "speculation";
+  version = "1.5.0.1";
+  sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0";
+  buildDepends = [ stm transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/speculation";
+    description = "A framework for safe, programmable, speculative parallelism";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/stm-stats/default.nix b/pkgs/development/libraries/haskell/stm-stats/default.nix
new file mode 100644
index 00000000000..e7f40a26320
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm-stats/default.nix
@@ -0,0 +1,13 @@
+{ cabal, stm, time }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-stats";
+  version = "0.2.0.0";
+  sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
+  buildDepends = [ stm time ];
+  meta = {
+    description = "retry statistics for STM transactions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/th-expand-syns/default.nix b/pkgs/development/libraries/haskell/th-expand-syns/default.nix
new file mode 100644
index 00000000000..9874fc6e13a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-expand-syns/default.nix
@@ -0,0 +1,13 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "th-expand-syns";
+  version = "0.3.0.4";
+  sha256 = "05qgfam7zq02848icvddds67ch5d8py7r30izg4lp0df0kzn08yq";
+  buildDepends = [ syb ];
+  meta = {
+    description = "Expands type synonyms in Template Haskell ASTs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fdbbcfed076..9f285473f41 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -739,6 +739,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 
+  CCdelcont = callPackage ../development/libraries/haskell/CC-delcont {};
+
   cereal = callPackage ../development/libraries/haskell/cereal {};
 
   cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {};
@@ -816,10 +818,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  composition = callPackage ../development/libraries/haskell/composition {};
+
   concatenative = callPackage ../development/libraries/haskell/concatenative {};
 
   concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {};
 
+  cond = callPackage ../development/libraries/haskell/cond {};
+
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
@@ -1012,6 +1018,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   doctest = callPackage ../development/libraries/haskell/doctest {};
 
+  doctestProp = callPackage ../development/libraries/haskell/doctest-prop {};
+
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
 
   doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
@@ -1616,6 +1624,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
+  kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {};
+
   kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};
 
   keys = callPackage ../development/libraries/haskell/keys {};
@@ -1774,6 +1784,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadControl = callPackage ../development/libraries/haskell/monad-control {};
 
+  monadCoroutine = callPackage ../development/libraries/haskell/monad-coroutine {};
+
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
   monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
@@ -1790,6 +1802,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {};
   monadPar = self.monadPar_0_3_4_6;
 
+  monadParallel = callPackage ../development/libraries/haskell/monad-parallel {};
+
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 
   monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
@@ -1798,6 +1812,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
+  monadStm = callPackage ../development/libraries/haskell/monad-stm {};
+
   monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
 
   monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
@@ -1834,6 +1850,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   multiarg = callPackage ../development/libraries/haskell/multiarg {};
 
+  multimap = callPackage ../development/libraries/haskell/multimap {};
+
   multiplate = callPackage ../development/libraries/haskell/multiplate {};
 
   multirec = callPackage ../development/libraries/haskell/multirec {};
@@ -2189,6 +2207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   reflection = callPackage ../development/libraries/haskell/reflection {};
 
+  regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {};
+
   regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
   regexBase_0_93_1   = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
   regexBase_0_93_2   = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};
@@ -2241,6 +2261,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
 
+  rex = callPackage ../development/libraries/haskell/rex {};
+
   rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
 
   robotsTxt = callPackage ../development/libraries/haskell/robots-txt {};
@@ -2321,6 +2343,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   sparse = callPackage ../development/libraries/haskell/sparse {};
 
+  speculation = callPackage ../development/libraries/haskell/speculation {};
+
   spoon = callPackage ../development/libraries/haskell/spoon {};
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
@@ -2443,6 +2467,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
 
+  stmStats = callPackage ../development/libraries/haskell/stm-stats {};
+
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};
@@ -2555,6 +2581,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   thDesugar = callPackage ../development/libraries/haskell/th-desugar {};
 
+  thExpandSyns = callPackage ../development/libraries/haskell/th-expand-syns {};
+
   thExtras = callPackage ../development/libraries/haskell/th-extras {};
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};

From e017139e7092d9ef1ec9b0eaf5ed5bd32006d9c3 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 01:55:46 +0200
Subject: [PATCH 0944/2033] Add wmertens to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cf0743fa403..f64b087e55d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -91,6 +91,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
+  wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";

From 6ab576b702e9dbe64e7c1472a5d1386a34cc128c Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 4 May 2014 09:51:10 +0200
Subject: [PATCH 0945/2033] Monit: Bump to 5.8

- Use callPackage etc
- Make PAM optional
---
 pkgs/tools/system/monit/default.nix           | 40 ++++++++-----------
 pkgs/tools/system/monit/src-for-default.nix   |  9 -----
 .../system/monit/src-info-for-default.nix     |  4 --
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/system/monit/src-for-default.nix
 delete mode 100644 pkgs/tools/system/monit/src-info-for-default.nix

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index b8b2e2cbcdc..cbd9c20389c 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,30 +1,22 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    bison flex openssl
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
 
-  inherit (s) name;
-  inherit buildInputs;
+stdenv.mkDerivation rec {
+  name = "monit-5.8";
+  
+  src = fetchurl {
+    url = "${meta.homepage}dist/${name}.tar.gz";
+    sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c";
+  };
+
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];
+
+  configureFlags = stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-  configureFlags = [
-    "--with-ssl-incl-dir=${a.openssl}/include"
-    "--with-ssl-lib-dir=${a.openssl}/lib"
-    ];
-  preConfigure = a.fullDepEntry (''
-    sed -e 's@/bin/@@' -i Makefile.in
-  '') ["doUnpack" "minInit"];
-      
   meta = {
+    homepage = http://mmonit.com/monit/;
     description = "Monitoring system";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
+    license = stdenv.lib.licenses.agpl3;
+    maintainer = with stdenv.lib.maintainers; [ raskin wmertens ];
   };
 }
diff --git a/pkgs/tools/system/monit/src-for-default.nix b/pkgs/tools/system/monit/src-for-default.nix
deleted file mode 100644
index b74958ae19a..00000000000
--- a/pkgs/tools/system/monit/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="5.5";
-   name="monit-5.5";
-   hash="0lvw9llsnaj72dp6di74sc4sxpa4q3g23m28jwy4brphndhb0xl2";
-   url="http://mmonit.com/monit/download/../dist/monit-${version}.tar.gz";
-   advertisedUrl="http://mmonit.com/monit/download/../dist/monit-5.5.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/system/monit/src-info-for-default.nix b/pkgs/tools/system/monit/src-info-for-default.nix
deleted file mode 100644
index 691984a9fd5..00000000000
--- a/pkgs/tools/system/monit/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://mmonit.com/monit/download/";
-  baseName = "monit";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b92341445d0..b31db5f1bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1430,9 +1430,7 @@ let
 
   modemmanager = callPackage ../tools/networking/modemmanager {};
 
-  monit = builderDefsPackage ../tools/system/monit {
-    inherit openssl flex bison;
-  };
+  monit = callPackage ../tools/system/monit { };
 
   mosh = callPackage ../tools/networking/mosh {
     boost = boostHeaders;

From c2fd001fd4728bca9808e47b1339bf2582acf911 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 12:17:35 +0200
Subject: [PATCH 0946/2033] Remove obsolete Agda-executable package; the
 compiler is not part of 'Agda'.

---
 .../compilers/agda/agda-executable.nix         | 18 ------------------
 .../default.nix => compilers/agda/agda.nix}    |  0
 .../agda/{agda-stdlib.nix => stdlib.nix}       |  0
 pkgs/top-level/haskell-packages.nix            |  6 ++----
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/compilers/agda/agda-executable.nix
 rename pkgs/development/{libraries/haskell/Agda/default.nix => compilers/agda/agda.nix} (100%)
 rename pkgs/development/compilers/agda/{agda-stdlib.nix => stdlib.nix} (100%)

diff --git a/pkgs/development/compilers/agda/agda-executable.nix b/pkgs/development/compilers/agda/agda-executable.nix
deleted file mode 100644
index f9acff43ef7..00000000000
--- a/pkgs/development/compilers/agda/agda-executable.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ cabal, Agda }:
-
-cabal.mkDerivation (self: {
-  pname = "Agda-executable";
-  version = "2.3.0.1";
-  sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Agda ];
-  jailbreak = true;
-  meta = {
-    homepage = "http://wiki.portal.chalmers.se/agda/";
-    description = "Command-line program for type-checking and compiling Agda programs";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Agda/default.nix b/pkgs/development/compilers/agda/agda.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/Agda/default.nix
rename to pkgs/development/compilers/agda/agda.nix
diff --git a/pkgs/development/compilers/agda/agda-stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
similarity index 100%
rename from pkgs/development/compilers/agda/agda-stdlib.nix
rename to pkgs/development/compilers/agda/stdlib.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 87be3ee67d5..4a8ec0c0266 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -502,8 +502,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   acidState = callPackage ../development/libraries/haskell/acid-state {};
 
-  Agda = callPackage ../development/libraries/haskell/Agda {};
-
   accelerate = callPackage ../development/libraries/haskell/accelerate {};
 
   accelerateCuda = callPackage ../development/libraries/haskell/accelerate-cuda {};
@@ -2923,8 +2921,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   # Compilers.
 
-  AgdaExecutable = callPackage ../development/compilers/agda/agda-executable.nix {};
-  AgdaStdlib = callPackage ../development/compilers/agda/agda-stdlib.nix {};
+  Agda = callPackage ../development/compilers/agda/agda.nix {};
+  AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {};
 
   uhc = callPackage ../development/compilers/uhc {};
 

From cfb69025261af018818417f5f2efc2bc55154872 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 12:40:01 +0200
Subject: [PATCH 0947/2033] HTTP-4000.2.13: jailbreak to fix build with latest
 version of conduit

https://github.com/haskell/HTTP/issues/61
https://github.com/NixOS/nixpkgs/issues/2495
---
 pkgs/development/libraries/haskell/HTTP/4000.2.13.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
index e3c4282b5ae..9c423a94e3f 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
@@ -12,6 +12,7 @@ cabal.mkDerivation (self: {
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
     network pureMD5 split testFramework testFrameworkHunit wai warp
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";

From a2ae6ebb7bb17edd32466cd6099188f7aecb5a6d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 12:40:58 +0200
Subject: [PATCH 0948/2033] haskell-HTTP-4000.2.13: disable test suite to fix
 the build

https://github.com/haskell/HTTP/issues/60
---
 pkgs/development/libraries/haskell/HTTP/4000.2.13.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
index 9c423a94e3f..3a78e8f1674 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     network pureMD5 split testFramework testFrameworkHunit wai warp
   ];
   jailbreak = true;
+  doCheck = false;
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";

From 7c06d93c0f33409008cd0ad25f7f1efbbcb4666e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 12:53:45 +0200
Subject: [PATCH 0949/2033] haskell-download-curl: jailbreak to fix build with
 recent versions of tagsoup

---
 pkgs/development/libraries/haskell/download-curl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix
index 935004a6bb0..6b9f1e2108b 100644
--- a/pkgs/development/libraries/haskell/download-curl/default.nix
+++ b/pkgs/development/libraries/haskell/download-curl/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.1.4";
   sha256 = "1wf3pf2k4i6jvpfsjlxdj6v53qd33jj1z1ipaf3p47glgx4xw3lm";
   buildDepends = [ curl feed tagsoup xml ];
+  jailbreak = true;
   meta = {
     homepage = "http://code.haskell.org/~dons/code/download-curl";
     description = "High-level file download based on URLs";

From eba689ad05145a84e088bfe52543453ad60d657e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 13:03:18 +0200
Subject: [PATCH 0950/2033] haskell-ghc-mod: wrap the newly added ghc-modi
 executable

Cherry-picked from <https://github.com/NixOS/nixpkgs/pull/2490>.
---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index feaf0c9be6e..90c6f18a732 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -26,14 +26,16 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
-    cat - > $out/bin/ghc-mod <<EOF
+    for prog in ghc-mod ghc-modi; do
+      mv $out/bin/$prog $out/bin/.$prog-wrapped
+      cat - > $out/bin/$prog <<EOF
     #! ${self.stdenv.shell}
     COMMAND=\$1
     shift
-    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.$prog-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
-    chmod +x $out/bin/ghc-mod
+      chmod +x $out/bin/$prog
+    done
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";

From b3f3d111ad4d869e574aa028fe8cae62e4ab081c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 13:12:07 +0200
Subject: [PATCH 0951/2033] haskell-graphviz: jailbreak to fix build with fgl
 5.x

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

diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 0112f6e419e..7bdcfd71101 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -15,7 +15,7 @@ cabal.mkDerivation (self: {
     transformers wlPprintText
   ];
   patchPhase = ''
-    sed -i -e 's|polyparse.*,|polyparse,|' -e 's|dlist ==.*|dlist|' -e 's|temporary.*,|temporary,|' graphviz.cabal
+    sed -i -e 's|fgl ==.*,|fgl,|' -e 's|polyparse.*,|polyparse,|' -e 's|dlist ==.*|dlist|' -e 's|temporary.*,|temporary,|' graphviz.cabal
   '';
   doCheck = false;
   meta = {

From ce21d883c0d881622aa6c903475c66a84fcc9dec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 13:19:22 +0200
Subject: [PATCH 0952/2033] haskell-vinyl: add version 0.3

---
 .../development/libraries/haskell/vinyl/default.nix | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/vinyl/default.nix

diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix
new file mode 100644
index 00000000000..239221dc048
--- /dev/null
+++ b/pkgs/development/libraries/haskell/vinyl/default.nix
@@ -0,0 +1,13 @@
+{ cabal, doctest, lens }:
+
+cabal.mkDerivation (self: {
+  pname = "vinyl";
+  version = "0.3";
+  sha256 = "0wa7pdk5ds1zq0yy6lbzhpjglpnz56hg36iwma09b6jk2x71sf5r";
+  testDepends = [ doctest lens ];
+  meta = {
+    description = "Extensible Records";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4a8ec0c0266..e887f85430b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2720,6 +2720,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   vectorThUnbox = callPackage ../development/libraries/haskell/vector-th-unbox {};
 
+  vinyl = callPackage ../development/libraries/haskell/vinyl {};
+
   void = callPackage ../development/libraries/haskell/void {};
 
   vty = callPackage ../development/libraries/haskell/vty {};

From 1220084354dd5cdb8fa8f5034e4a1255541fe3af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 13:19:47 +0200
Subject: [PATCH 0953/2033] haskell-httpd-shed: jailbreak to fix build with
 latest version of 'network'

---
 pkgs/development/libraries/haskell/httpd-shed/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index b87135cf01f..90f11940a46 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ network ];
+  jailbreak = true;
   meta = {
     description = "A simple web-server with an interact style API";
     license = self.stdenv.lib.licenses.bsd3;

From 80d39a273e313b0837fca382edbe92eaf85d031a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 13:37:15 +0200
Subject: [PATCH 0954/2033] HTTP-4000.2.13: patch Cabal file to declare
 FlexibleContexts extension to fix the build with ghc-head

https://github.com/haskell/HTTP/issues/62
---
 pkgs/development/libraries/haskell/HTTP/4000.2.13.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
index 3a78e8f1674..9963b7e9770 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
@@ -14,6 +14,9 @@ cabal.mkDerivation (self: {
   ];
   jailbreak = true;
   doCheck = false;
+  preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) ''
+    sed -i -e 's|Extensions: |Extensions: FlexibleContexts, |' HTTP.cabal
+  '';
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";

From 9e5f7ada34f50dfd580525c2bf943b4780f28dc9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 14:05:05 +0200
Subject: [PATCH 0955/2033] haskell-ghc-mod: revert "wrap the newly added
 ghc-modi executable"

This reverts commit eba689ad05145a84e088bfe52543453ad60d657e. ghc-modi
stopped working for me after this change.

https://github.com/NixOS/nixpkgs/pull/2490
---
 pkgs/development/libraries/haskell/ghc-mod/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index 90c6f18a732..feaf0c9be6e 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -26,16 +26,14 @@ cabal.mkDerivation (self: {
     cd ..
     ensureDir "$out/share/emacs"
     mv $pname-$version emacs/site-lisp
-    for prog in ghc-mod ghc-modi; do
-      mv $out/bin/$prog $out/bin/.$prog-wrapped
-      cat - > $out/bin/$prog <<EOF
+    mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped
+    cat - > $out/bin/ghc-mod <<EOF
     #! ${self.stdenv.shell}
     COMMAND=\$1
     shift
-    eval exec $out/bin/.$prog-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
+    eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@"
     EOF
-      chmod +x $out/bin/$prog
-    done
+    chmod +x $out/bin/ghc-mod
   '';
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";

From 204fc0a397e17dc2c935350339e63898330504b5 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 4 May 2014 14:42:16 +0200
Subject: [PATCH 0956/2033] sudo: env_keep TERMINFO for urxvt

---
 nixos/modules/security/sudo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 956856c6499..6cfeac0d7dc 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -62,6 +62,7 @@ in
         Defaults:root,%wheel env_keep+=NIX_CONF_DIR
         Defaults:root,%wheel env_keep+=NIX_PATH
         Defaults:root,%wheel env_keep+=TERMINFO_DIRS
+        Defaults:root,%wheel env_keep+=TERMINFO
 
         # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
         Defaults env_keep+=SSH_AUTH_SOCK

From 17807c8b6cb7fd9f50bce98bb4557e202c571325 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 4 May 2014 06:54:57 +0200
Subject: [PATCH 0957/2033] chromium: Link against pulse instead of dlopen().

This fixes the issue of Chromium not being able to load the pulseaudio
librarp

We could also propagate the build inputs, but it would end up being the
same as just directoly linking against the library.

Thanks to @aristidb for noticing this in #2421:

https://github.com/NixOS/nixpkgs/pull/2421#issuecomment-42113656

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7bed83ac4c6..dcc2a97547a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -148,6 +148,7 @@ let
       use_gconf = gnomeSupport;
       use_gio = gnomeSupport;
       use_pulseaudio = pulseSupport;
+      linux_link_pulseaudio = pulseSupport;
       disable_nacl = !enableNaCl;
       use_openssl = useOpenSSL;
       selinux = enableSELinux;

From f6e31fadd80486cdd68e3ad3d7ae888aa81400b9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 4 May 2014 08:17:49 +0200
Subject: [PATCH 0958/2033] chromium: Update all channels to latest versions.

With this commit, the following new upstream versions are introduced:

stable: 34.0.1847.116 -> 34.0.1847.132 (builds fine, tested)
beta:   35.0.1916.47  -> 35.0.1916.86  (builds fine, tested)
dev:    36.0.1941.0   -> 36.0.1964.2   (builds fine, tested)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/sources.nix      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 6881b8d44e8..715b1e95825 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,21 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "36.0.1941.0";
-    sha256 = "12rhyq8hliwc8b3371h2axzlzabg99c06d02kl9ldag2kxfpsfps";
-    sha256bin32 = "1rbl5x0pjid5lypdplbqvcx4lgvr2rlbiv83ivvqb5dbg6p7886g";
-    sha256bin64 = "18440spj541w4bqjblb2wpf94slg4if176gprccbxw9sy6b7z38w";
+    version = "36.0.1964.2";
+    sha256 = "0yrp1553pl0310h5pkfh2x27xhfrrxrpc25zad36f3k73iwmbg4c";
+    sha256bin32 = "02brz6lj7vfyyapc942dhdw7z26ksvnm7xqryfxn49y1rkd26xrf";
+    sha256bin64 = "0ibry2bfjcqnihwb8ykyl48qk25bzfxmw948sm70xnrmwbkv42ny";
   };
   beta = {
-    version = "35.0.1916.47";
-    sha256 = "0pq87aybfna4pgsf02v97lprj5kbsrzim7c44nqarmcvlj4l65ch";
-    sha256bin32 = "057l59any3hiqdg1gh4nxry542083lxdaychhljbrfkipq1gy4yv";
-    sha256bin64 = "07n8sqv234dg959id023w3mz5n9ascwrcmxq3px96bqgqim2vf8s";
+    version = "35.0.1916.86";
+    sha256 = "0pjgpif8fiq14fk05pxs3js0pcg2jwmw0fklcci11rzq6rcm7r2g";
+    sha256bin32 = "1js71l88hqfli6c342iigwddxrqrzlx5fcazfxwlps4bdwgig6f8";
+    sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr";
   };
   stable = {
-    version = "34.0.1847.116";
-    sha256 = "04cpfav5rqa117igvzmrw0045r2ljxg5fqb46qgqvkgff30pjrfx";
-    sha256bin32 = "1k24j80xgc91p8ssynql9ifjdhpz6w7vl3pk9lvkr0sdhg16hlrf";
-    sha256bin64 = "16gidav4ilc95fr1d6832xzpyynfwnglbz7b33gq62vp8bj77da4";
+    version = "34.0.1847.132";
+    sha256 = "0f30i0jxqx059imfiyvsaslkydkva9x6nbvpsjccvwygs91hm4z8";
+    sha256bin32 = "1czbydkyazhc63ndyiarbwmmi7p3wh2rb4x7avs41yx7sx9vdqjl";
+    sha256bin64 = "01k301629m4m8a4mpg0m5kblygfs72kpa4qi3mlkl8cbb0rlq6mv";
   };
 }

From adce4233afead8dce0c5d9204d8f23b16b4111db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 14:39:40 +0200
Subject: [PATCH 0959/2033] all-packages.nix: strip trailing whitespace

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b92341445d0..f14abc0c26c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1396,7 +1396,7 @@ let
 
   mdbtools = callPackage ../tools/misc/mdbtools { };
 
-  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { 
+  mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
     inherit (gnome) scrollkeeper;
   };
 
@@ -4279,7 +4279,7 @@ let
   dclib = callPackage ../development/libraries/dclib { };
 
   dillo = callPackage ../applications/networking/browsers/dillo {
-    fltk = fltk13;  
+    fltk = fltk13;
   };
 
   directfb = callPackage ../development/libraries/directfb { };
@@ -6491,7 +6491,7 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
-  ejabberd = callPackage ../servers/xmpp/ejabberd { 
+  ejabberd = callPackage ../servers/xmpp/ejabberd {
     erlang = erlangR16B02;
   };
 
@@ -10017,11 +10017,11 @@ let
   cinnamon = recurseIntoAttrs rec {
     callPackage = newScope pkgs.cinnamon;
     inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
-    
+
     muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
-    
+
     cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
-    
+
     cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
 
     cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;

From 7c6a730e0bdfb0ffe7ee013ce28efb91e3625289 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 15:20:51 +0200
Subject: [PATCH 0960/2033] R: added wrapper script that provides "R" and
 "Rscript" binaries that know about extra libraries

Configure an override in ~/.nixpkgs/config.nix as follows:

  {
    packageOverrides = pkgs: {

      rWrapper = pkgs.rWrapper.override {
        packages = with pkgs.rPackages; [ Defaults dataTable foreach xtable ];
      };

    };
  }
---
 pkgs/development/r-modules/generic/wrapper.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/r-modules/generic/wrapper.nix

diff --git a/pkgs/development/r-modules/generic/wrapper.nix b/pkgs/development/r-modules/generic/wrapper.nix
new file mode 100644
index 00000000000..6a17c8447c8
--- /dev/null
+++ b/pkgs/development/r-modules/generic/wrapper.nix
@@ -0,0 +1,18 @@
+{ stdenv, R, packages, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = R.name + "-wrapper";
+
+  buildInputs = [makeWrapper R] ++ packages;
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cd ${R}/bin
+    for exe in *; do
+      makeWrapper ${R}/bin/$exe $out/bin/$exe \
+        --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE"
+    done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f14abc0c26c..6db0c86478a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6435,6 +6435,10 @@ let
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   });
 
+  rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
+    packages = [];
+  };
+
   ### SERVERS
 
   rdf4store = callPackage ../servers/http/4store { };

From 35d2c4b7411512accecffc6cf515f0183e7e7ab6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 15:21:12 +0200
Subject: [PATCH 0961/2033] r-packages.nix: added various new libraries

---
 pkgs/top-level/r-packages.nix | 129 +++++++++++++++++++++++++---------
 1 file changed, 94 insertions(+), 35 deletions(-)

diff --git a/pkgs/top-level/r-packages.nix b/pkgs/top-level/r-packages.nix
index f3759c14baa..65880a44cc2 100644
--- a/pkgs/top-level/r-packages.nix
+++ b/pkgs/top-level/r-packages.nix
@@ -8,7 +8,7 @@ let self = _self // overrides; _self = with self; {
 
   inherit (stdenv.lib) maintainers;
 
-  abind = buildRPackage rec {
+  abind = buildRPackage {
     name = "abind-1.4-0";
     src = fetchurl {
       url = "mirror://cran/src/contrib/abind_1.4-0.tar.gz";
@@ -16,7 +16,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  chron = buildRPackage rec {
+  chron = buildRPackage {
     name = "chron-2.3-44";
     src = fetchurl {
       url = "mirror://cran/src/contrib/chron_2.3-44.tar.gz";
@@ -24,7 +24,15 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  colorspace = buildRPackage rec {
+  codetools = buildRPackage {
+    name = "codetools-0.2-8";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/codetools_0.2-8.tar.gz";
+      sha256 = "0m326kfxihm5ayfn5b4k8awdf34002iy094gazbc3h0y42r4g86b";
+    };
+  };
+
+  colorspace = buildRPackage {
     name = "colorspace-1.2-2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/colorspace_1.2-2.tar.gz";
@@ -32,7 +40,24 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DBI = buildRPackage rec {
+  dataTable = buildRPackage {
+    name = "data.table-1.9.2";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/data.table_1.9.2.tar.gz";
+      sha256 = "1fchjg939av89m0zsv85w2xcc8qriwkskk0mcsqy8ip6pcfnlg66";
+    };
+    propagatedBuildInputs = [ reshape2 ];
+  };
+
+  Defaults = buildRPackage {
+    name = "Defaults-1.1-1";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/Defaults_1.1-1.tar.gz";
+      sha256 = "0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d";
+    };
+  };
+
+  DBI = buildRPackage {
     name = "DBI-0.2-7";
     src = fetchurl {
       url = "mirror://cran/src/contrib/DBI_0.2-7.tar.gz";
@@ -40,7 +65,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  dichromat = buildRPackage rec {
+  dichromat = buildRPackage {
     name = "dichromat-2.0-0";
     src = fetchurl {
       url = "mirror://cran/src/contrib/dichromat_2.0-0.tar.gz";
@@ -48,7 +73,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  digest = buildRPackage rec {
+  digest = buildRPackage {
     name = "digest-0.6.3";
     src = fetchurl {
       url = "mirror://cran/src/contrib/digest_0.6.3.tar.gz";
@@ -56,7 +81,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ggplot2 = buildRPackage rec {
+  foreach = buildRPackage {
+    name = "foreach-1.4.2";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/foreach_1.4.2.tar.gz";
+      sha256 = "097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl";
+    };
+    propagatedBuildInputs = [ codetools iterators ];
+  };
+
+  ggplot2 = buildRPackage {
     name = "ggplot2-0.9.3.1";
     src = fetchurl {
       url = "mirror://cran/src/contrib/ggplot2_0.9.3.1.tar.gz";
@@ -65,7 +99,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ digest plyr gtable reshape2 scales proto ];
   };
 
-  gtable = buildRPackage rec {
+  gtable = buildRPackage {
     name = "gtable-0.1.2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/gtable_0.1.2.tar.gz";
@@ -73,7 +107,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  gtools = buildRPackage rec {
+  gtools = buildRPackage {
     name = "gtools-3.0.0";
     src = fetchurl {
       url = "mirror://cran/src/contrib/gtools_3.0.0.tar.gz";
@@ -81,7 +115,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  gsubfn = buildRPackage rec {
+  gsubfn = buildRPackage {
     name = "gsubfn-0.6-5";
     src = fetchurl {
       url = "mirror://cran/src/contrib/gsubfn_0.6-5.tar.gz";
@@ -90,7 +124,15 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ proto ];
   };
 
-  labeling = buildRPackage rec {
+  iterators = buildRPackage {
+    name = "iterators-1.0.7";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/iterators_1.0.7.tar.gz";
+      sha256 = "1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv";
+    };
+  };
+
+  labeling = buildRPackage {
     name = "labeling-0.2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/labeling_0.2.tar.gz";
@@ -98,7 +140,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  lars = buildRPackage rec {
+  lars = buildRPackage {
     name = "lars-1.2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/lars_1.2.tar.gz";
@@ -106,7 +148,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LiblineaR = buildRPackage rec {
+  LiblineaR = buildRPackage {
     name = "LiblineaR-1.80-7";
     src = fetchurl {
       url = "mirror://cran/src/contrib/LiblineaR_1.80-7.tar.gz";
@@ -114,7 +156,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  linprog = buildRPackage rec {
+  linprog = buildRPackage {
     name = "linprog-0.9-2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/linprog_0.9-2.tar.gz";
@@ -123,7 +165,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ lpSolve ];
   };
 
-  lpSolve = buildRPackage rec {
+  lpSolve = buildRPackage {
     name = "lpSolve-5.6.7";
     src = fetchurl {
       url = "mirror://cran/src/contrib/lpSolve_5.6.7.tar.gz";
@@ -131,7 +173,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  munsell = buildRPackage rec {
+  munsell = buildRPackage {
     name = "munsell-0.4.2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/munsell_0.4.2.tar.gz";
@@ -140,7 +182,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ colorspace ];
   };
 
-  pamr = buildRPackage rec {
+  pamr = buildRPackage {
     name = "pamr-1.54.1";
     src = fetchurl {
       url = "mirror://cran/src/contrib/pamr_1.54.1.tar.gz";
@@ -148,7 +190,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  penalized = buildRPackage rec {
+  penalized = buildRPackage {
     name = "penalized-0.9-42";
     src = fetchurl {
       url = "mirror://cran/src/contrib/penalized_0.9-42.tar.gz";
@@ -156,15 +198,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  plyr = buildRPackage rec {
-    name = "plyr-1.8";
+  plyr = buildRPackage {
+    name = "plyr-1.8.1";
     src = fetchurl {
-      url = "mirror://cran/src/contrib/plyr_1.8.tar.gz";
-      sha256 = "0bd6861af241e6c5ce777ef3f1b0eb72b31cc026669a68f6250b8ecfadf71a66";
+      url = "mirror://cran/src/contrib/plyr_1.8.1.tar.gz";
+      sha256 = "0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm";
     };
+    propagatedBuildInputs = [ Rcpp ];
   };
 
-  proto = buildRPackage rec {
+  proto = buildRPackage {
     name = "proto-0.3-10";
     src = fetchurl {
       url = "mirror://cran/src/contrib/proto_0.3-10.tar.gz";
@@ -172,7 +215,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  randomForest = buildRPackage rec {
+  randomForest = buildRPackage {
     name = "randomForest-4.6-7";
     src = fetchurl {
       url = "mirror://cran/src/contrib/randomForest_4.6-7.tar.gz";
@@ -181,16 +224,24 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ plyr stringr ];
   };
 
-  reshape2 = buildRPackage rec {
-    name = "reshape2-1.2.2";
+  Rcpp = buildRPackage {
+    name = "Rcpp-0.11.1";
     src = fetchurl {
-      url = "mirror://cran/src/contrib/reshape2_1.2.2.tar.gz";
-      sha256 = "9131025b8f684e1629ab3e2748d4cf2b907b7c89cfbff667c925bc0fb5dfc103";
+      url = "mirror://cran/src/contrib/Rcpp_0.11.1.tar.gz";
+      sha256 = "1ccsvdij6yym9dziqsjf5gr37968imz8i81334vi2fc69z5xzf30";
     };
-    propagatedBuildInputs = [ plyr stringr ];
   };
 
-  RColorBrewer = buildRPackage rec {
+  reshape2 = buildRPackage {
+    name = "reshape2-1.4";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/reshape2_1.4.tar.gz";
+      sha256 = "0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp";
+    };
+    propagatedBuildInputs = [ plyr stringr Rcpp ];
+  };
+
+  RColorBrewer = buildRPackage {
     name = "RColorBrewer-1.0-5";
     src = fetchurl {
       url = "mirror://cran/src/contrib/RColorBrewer_1.0-5.tar.gz";
@@ -198,7 +249,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  RSQLite = buildRPackage rec {
+  RSQLite = buildRPackage {
     name = "RSQlite-0.11.4";
     src = fetchurl {
       url = "mirror://cran/src/contrib/RSQLite_0.11.4.tar.gz";
@@ -207,7 +258,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DBI ];
   };
 
-  RSQLiteExtfuns = buildRPackage rec {
+  RSQLiteExtfuns = buildRPackage {
     name = "RSQlite.extfuns-0.0.1";
     src = fetchurl {
       url = "mirror://cran/src/contrib/RSQLite.extfuns_0.0.1.tar.gz";
@@ -216,7 +267,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ RSQLite ];
   };
 
-  scales = buildRPackage rec {
+  scales = buildRPackage {
     name = "scales-0.2.3";
     src = fetchurl {
       url = "mirror://cran/src/contrib/scales_0.2.3.tar.gz";
@@ -225,7 +276,7 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ RColorBrewer stringr dichromat munsell plyr labeling ];
   };
 
-  stringr = buildRPackage rec {
+  stringr = buildRPackage {
     name = "stringr-0.6.2";
     src = fetchurl {
       url = "mirror://cran/src/contrib/stringr_0.6.2.tar.gz";
@@ -233,7 +284,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  sqldf = buildRPackage rec {
+  sqldf = buildRPackage {
     name = "sqldf-0.4-6.4";
     src = fetchurl {
       url = "mirror://cran/src/contrib/sqldf_0.4-6.4.tar.gz";
@@ -241,4 +292,12 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ DBI gsubfn proto chron RSQLite RSQLiteExtfuns ];
   };
+
+  xtable = buildRPackage {
+    name = "xtable-1.7-3";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/xtable_1.7-3.tar.gz";
+      sha256 = "1rsfq0acf1pvpci3jq9fbhsv6ws4d46yap8m2xjk1cr463m9gdcc";
+    };
+  };
 }; in self

From a9a3cbfae3365225e31a221c13ef7dc78285d2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 4 May 2014 18:03:00 +0200
Subject: [PATCH 0962/2033] xbmc: 12.3 -> 13.0

- add support for vaapi, bluray
- depend on gnutls
- by default enable pulseaudio
---
 pkgs/applications/video/xbmc/default.nix | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index e645bbcf284..94da757867e 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -3,17 +3,17 @@
 , boost, avahi, libdvdcss, lame, autoreconfHook
 , gettext, pcre, yajl, fribidi, which
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
-, libX11, xproto, inputproto
+, libX11, xproto, inputproto, libxml2
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
-, libXtst, libXfixes, fixesproto
+, libXtst, libXfixes, fixesproto, systemd
 , SDL, SDL_image, SDL_mixer, alsaLib
 , mesa, glew, fontconfig, freetype, ftgl
 , libjpeg, jasper, libpng, libtiff
 , ffmpeg, libmpeg2, libsamplerate, libmad
-, libogg, libvorbis, flac
-, lzo, libcdio, libmodplug, libass
-, sqlite, mysql, nasm
+, libogg, libvorbis, flac, libxslt
+, lzo, libcdio, libmodplug, libass, libbluray
+, sqlite, mysql, nasm, gnutls, libva
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
@@ -23,7 +23,7 @@
 # TODO: would be nice to have nfsSupport (needs libnfs library)
 # TODO: librtmp
 , libvdpau ? null, vdpauSupport ? true
-, pulseaudio ? null, pulseSupport ? false
+, pulseaudio ? null, pulseSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -34,18 +34,18 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-12.3";
+    name = "xbmc-13.0";
 
     src = fetchurl {
-      url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "0wyy9rsl11px4mh0fyq75n29905ldiqp8yraz6jxxvrls1hcj59y";
+      url = "https://github.com/xbmc/xbmc/archive/13.0-Gotham.tar.gz";
+      sha256 = "096hin8qp1864ypyw9xysy13niwf79bgfgivxi7w7mh2dagn0mjx";
     };
 
     buildInputs = [
-      makeWrapper
+      makeWrapper libxml2 gnutls
       pkgconfig cmake gnumake yasm pythonFull
       boost libmicrohttpd autoreconfHook
-      gettext pcre yajl fribidi
+      gettext pcre yajl fribidi libva
       openssl gperf tinyxml2 taglib libssh swig jre
       libX11 xproto inputproto which
       libXt libXmu libXext xextproto
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
       mesa glew fontconfig freetype ftgl
       libjpeg jasper libpng libtiff
       ffmpeg libmpeg2 libsamplerate libmad
-      libogg libvorbis flac
-      lzo libcdio libmodplug libass
+      libogg libvorbis flac libxslt systemd
+      lzo libcdio libmodplug libass libbluray
       sqlite mysql nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
     ]
@@ -89,6 +89,7 @@ stdenv.mkDerivation rec {
           --prefix PATH ":" "${glxinfo}/bin" \
           --prefix PATH ":" "${xdpyinfo}/bin" \
           --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib"
       done
     '';

From 5f025b65058057dccd3df8b27a7eed5e8038afde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Sun, 4 May 2014 19:58:16 +0200
Subject: [PATCH 0963/2033] Changed URL to upstream, as the old URL was dead

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

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index c8e8ff35277..c9da441705c 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "openldap-2.4.39";
 
   src = fetchurl {
-    url = "ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/${name}.tgz";
+    url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
     sha256 = "19zq9dc7dl03wmqd11fbsdii1npyq1vlicl3nxbfygqh8xrwhrw2";
   };
 

From 0d264c17616646a7d68e0a465fdc0f335e0d2fb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 20:51:14 +0200
Subject: [PATCH 0964/2033] r-packages.nix: add an auto-generated list of all
 CRAN packages

---
 pkgs/top-level/r-packages.nix | 5846 +++++++++++++++++++++++++++++++--
 1 file changed, 5549 insertions(+), 297 deletions(-)

diff --git a/pkgs/top-level/r-packages.nix b/pkgs/top-level/r-packages.nix
index 65880a44cc2..3a164762138 100644
--- a/pkgs/top-level/r-packages.nix
+++ b/pkgs/top-level/r-packages.nix
@@ -1,303 +1,5555 @@
-/* This file defines the composition for CRAN (R) packages. */
+/* This file defines the composition for CRAN (R) packages.
 
-{pkgs, overrides}:
+   It was generated automatically by the following R program:
+
+   | library(data.table)
+   | library(parallel)
+   | cl <- makeCluster(10)
+   |
+   | nixPrefetch <- function(name, version) {
+   |     system(paste0("nix-prefetch-url 2>/dev/null http://cran.rstudio.com/src/contrib/", name, "_", version, ".tar.gz"), intern=TRUE)
+   | }
+   |
+   | formatPackage <- function(name, version, sha256, depends, imports, knownPackages) {
+   |     attr <- gsub(".", "_", name, fixed=TRUE)
+   |     if (is.na(depends)) depends <- "";
+   |     depends <- unlist(strsplit(depends, split="[ \t\n]*,[ \t\n]*", fixed=FALSE))
+   |     depends <- c(depends, unlist(strsplit(imports, split="[ \t\n]*,[ \t\n]*", fixed=FALSE)))
+   |     depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
+   |     depends <- depends[depends %in% knownPackages]
+   |     depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
+   |     depends <- paste(depends, collapse=" ")
+   |     paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
+   | }
+   |
+   | clusterExport(cl, c("nixPrefetch"))
+   |
+   | pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates")))
+   | pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib")
+   | pkgs$sha256 <- parApply(cl, pkgs, 1, function(p) nixPrefetch(p[1], p[2]))
+   | knownPackages <- unique(pkgs$Package)
+   |
+   | nix <- apply(pkgs, 1, function(p) formatPackage(p[1], p[2], p[18], p[4], p[5], knownPackages))
+   | cat(paste(nix, collapse="\n"), "\n", file="/tmp/r-packages.nix")
+*/
+
+{ pkgs, overrides }:
+
+let
+
+  inherit (pkgs) R fetchurl stdenv;
+
+  buildRPackage = import ../development/r-modules/generic R;
+
+  derive = { name, version, sha256, depends ? [] }: buildRPackage {
+    name = "${name}-${version}";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/${name}_${version}.tar.gz";
+      inherit sha256;
+    };
+    propagatedBuildInputs = depends;
+  };
+
+in
 
 let self = _self // overrides; _self = with self; {
 
-  inherit (pkgs) buildRPackage fetchurl stdenv R;
+  A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
+  abc = derive { name="abc"; version="1.8"; sha256="042hnhk8npx6rhbsmrdpz4gcczjg5sy665hzvwqvcw8a6836fd1n"; depends=[nnet quantreg MASS]; };
+  abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
+  ABCExtremes = derive { name="ABCExtremes"; version="1.0"; sha256="032bc9a6cxy4war95n8v4vaax3q96k2wryjbcipi3z55b2l8hdny"; depends=[SpatialExtremes combinat]; };
+  ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
+  ABCp2 = derive { name="ABCp2"; version="1.1"; sha256="0s0lbwlc8nycm7b8vx0v01f8dmy91r1zqcj9zgrlj7dnpg4cpkml"; depends=[MASS]; };
+  abctools = derive { name="abctools"; version="0.2-2"; sha256="00i1lnnzyry1xj8pgx977j9fp0zmy6nmpr93jb18nq1r5mbagp0n"; depends=[abc abind pls plyr]; };
+  abd = derive { name="abd"; version="0.2-6"; sha256="0nlqgjmzpn715kg7pb4zz3rcrf11zd4inj7gam8mr8faf4b5qq2w"; depends=[nlme lattice mosaic]; };
+  abf2 = derive { name="abf2"; version="0.7-0"; sha256="0ybl7w8sjfghy8svbxj01q5ldfi05g1r24q9ah1nfca8xzby410n"; depends=[]; };
+  abind = derive { name="abind"; version="1.4-0"; sha256="0s7m7wv23z485fc0nb61svcszx0skxl3m8kiilrj506ndazk95hv"; depends=[]; };
+  abn = derive { name="abn"; version="0.83"; sha256="12nhk7hb26285pyyppl5289m7y8zvssnriyj84hlnz0ykar66mpi"; depends=[]; };
+  abundant = derive { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
+  accelerometry = derive { name="accelerometry"; version="2.2.1"; sha256="1ivwb60vj35radl4vdaqlv2amxrp4rns38x19hhffzw498rj7mxp"; depends=[Rcpp]; };
+  AcceptanceSampling = derive { name="AcceptanceSampling"; version="1.0-3"; sha256="1camxmvz8prkvpf3d3rc07bnfphakwdlickqlr4sgzrs4k27rr4f"; depends=[]; };
+  ACCLMA = derive { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
+  accrual = derive { name="accrual"; version="1.0"; sha256="0gw418i9nlrm7nkg6d4m2icd4a04a7avqfjj7nidhl6vy4nflg3k"; depends=[fgui SMPracticals]; };
+  accrued = derive { name="accrued"; version="1.0"; sha256="1prrsb7w0pppyc3j3y08pvdgna0h4hmb31sqjll32smxcav6pfvg"; depends=[]; };
+  ACD = derive { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
+  Ace = derive { name="Ace"; version="0.0.8"; sha256="0zjg6xwzd2lc555rviaq60rb1fq9vdf8cdazlf3c9m0i1pvz990i"; depends=[]; };
+  acepack = derive { name="acepack"; version="1.3-3.3"; sha256="17xfxjflc79y15hnrks3wina5irrggrxb9al9h5q0x1c401ds843"; depends=[]; };
+  acer = derive { name="acer"; version="0.1.2"; sha256="17x7281m2wa6a1pcga3xarg3infw5vygr7z068h8pqm30ix34ky4"; depends=[Rcpp]; };
+  aCGH_Spline = derive { name="aCGH.Spline"; version="2.2"; sha256="1ll045qgwl1170a4x93vj1xrn197l5ds648qasxlpnsm1a6svwas"; depends=[rJava]; };
+  acm4r = derive { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; };
+  ACNE = derive { name="ACNE"; version="0.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; };
+  acopula = derive { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
+  aCRM = derive { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[dummies randomForest kernelFactory ada]; };
+  acs = derive { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[stringr plyr XML]; };
+  acss = derive { name="acss"; version="0.1-1"; sha256="16y0g6vwbgsqaafm8l8h49ijs2jmz4595k0h7yndkcn5x0xaj8ig"; depends=[acss_data zoo]; };
+  acss_data = derive { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
+  ACTCD = derive { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
+  Actigraphy = derive { name="Actigraphy"; version="1.2"; sha256="02xxmzjqym46q0fzddmy29i8la9knrna3b46y8849nmbpqvmp3qn"; depends=[fda lattice SDMTools]; };
+  actuar = derive { name="actuar"; version="1.1-6"; sha256="0f0zvk4a3rni656jfml2nqb3h3amks3g4aczp8j2x01ywwmazqr9"; depends=[]; };
+  ActuDistns = derive { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[reliaR actuar hypergeo]; };
+  ada = derive { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
+  adabag = derive { name="adabag"; version="3.2"; sha256="1ijr5i5p8sf2cq7cgiwh0qk3c4wxagk6r06a2vrjy76d262m1060"; depends=[rpart mlbench caret]; };
+  adagio = derive { name="adagio"; version="0.5.9"; sha256="1yp9w557advb7dzrdqwkffpdmhn6mk4879lrrjd0d6kv89fwz5yr"; depends=[]; };
+  AdapEnetClass = derive { name="AdapEnetClass"; version="1.0"; sha256="0m8wg515djdpkq5lv8nkcny9s2iq9ym092jd99nysazqw0qy6a8r"; depends=[imputeYn glmnet lars]; };
+  AdaptFit = derive { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[SemiPar MASS nlme cluster]; };
+  AdaptFitOS = derive { name="AdaptFitOS"; version="0.50"; sha256="034qmx4jd5j7al9jnnc4whz9a5wa4hc2fkaci50ndm55agpk1h8w"; depends=[SemiPar nlme MASS mgcv]; };
+  AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp]; };
+  adaptivetau = derive { name="adaptivetau"; version="2.0"; sha256="0hp09wna5aqz9xq0nyymk91y4acrqzlg4isx4vpcfy5dnhmazgz6"; depends=[]; };
+  adaptMCMC = derive { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
+  adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
+  adaptTest = derive { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
+  additivityTests = derive { name="additivityTests"; version="1.1-2"; sha256="0ijk91whhsb7nm1ax9wpfw9qgxfb1bvg2cq939m81gvk09kzrvgz"; depends=[]; };
+  ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; };
+  ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
+  adegenet = derive { name="adegenet"; version="1.4-1"; sha256="0xfyck7p6261vv2k21z123q13v0bw10rs9x9v3afx5vf6zxnvs4f"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
+  adehabitat = derive { name="adehabitat"; version="1.8.14"; sha256="048jp9408x80akfnxqpyhhlzl2f89axsc90vr8cgqkimlg6h6xjh"; depends=[ade4 tkrplot shapefiles sp]; };
+  adehabitatHR = derive { name="adehabitatHR"; version="0.4.11"; sha256="1llpmpfax9846v3s2finyq9x97hyi87148jx83phzjl7daag3qn1"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
+  adehabitatHS = derive { name="adehabitatHS"; version="0.3.9"; sha256="0jv7470z1m219q5paw8cglx3d5l99iagkpm24v6q0xgdffvcq94l"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
+  adehabitatLT = derive { name="adehabitatLT"; version="0.3.15"; sha256="046mzhn2h1lnr0ph4r5w7bw6sdndyjxjr64yknjbilg80332njlx"; depends=[sp ade4 adehabitatMA CircStats]; };
+  adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; };
+  adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; };
+  AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; };
+  ADGofTest = derive { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
+  adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; };
+  adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
+  adlift = derive { name="adlift"; version="1.3-2"; sha256="0nzg16vhm5qg3xzczi3f6cynvp9ym2jsfrc4fdyxq7bwp9kry2i4"; depends=[EbayesThresh]; };
+  ADM3 = derive { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
+  AdMit = derive { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; };
+  ads = derive { name="ads"; version="1.5-2.1"; sha256="1jwgk48qypg36v53kj7wy5rcz059p1qg8awm3nf7xngrb2zff6h3"; depends=[ade4 spatstat]; };
+  AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; };
+  afex = derive { name="afex"; version="0.9-109"; sha256="01wwlab77jaalr6a10bp8rklqk54jrzxacxlwpp9n6gf6pqzdpmv"; depends=[car lme4 pbkrtest reshape2 stringr coin Matrix]; };
+  AFLPsim = derive { name="AFLPsim"; version="0.3-3"; sha256="1vknmd98v65118c093gqpfckcggnk4c8rn6bblsaclwmx0jdi78s"; depends=[adegenet introgress]; };
+  aftgee = derive { name="aftgee"; version="0.4-3"; sha256="0r1fq3n28hfkdih6a2nyz5vy832fsxxs0fr2zlml6cikpbay8zqx"; depends=[MASS BB survival geepack]; };
+  AGD = derive { name="AGD"; version="0.30"; sha256="175hsii3g8vx5ms552wnh1hcn3p6hgfggv1zi5gpwlsc0i875iag"; depends=[gamlss]; };
+  agop = derive { name="agop"; version="0.1-3"; sha256="02yc7n8avg69750cnc1prvp2fnz964sfc7vggxfyyqrig9q5ppyq"; depends=[Matrix igraph]; };
+  agRee = derive { name="agRee"; version="0.2-2"; sha256="0d4cfmqqxjdqidiwrrs83386qqxz80px3v9ikfv9s6xq2v7zz5ys"; depends=[miscF]; };
+  Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
+  agricolae = derive { name="agricolae"; version="1.1-8"; sha256="0a70ngilbnmhlhd8a6s7r41bamhcjxzjzpmw910r3y6s6338hrbf"; depends=[]; };
+  agridat = derive { name="agridat"; version="1.8"; sha256="12cw7hp7bjcw0zy4gbihc8w82ak36548jdk4i0b2dck6sl78004g"; depends=[lattice reshape2]; };
+  agrmt = derive { name="agrmt"; version="1.31"; sha256="0s0av1fg9aswkyj1vzr6fng53r5cnkfb3x0n46zrkb1fgb5fwdgm"; depends=[]; };
+  AGSDest = derive { name="AGSDest"; version="2.1"; sha256="1l36x3sjb0732aic2y4yrvx64phii1xjfzr4nc3x9b2crr988n0g"; depends=[ldbounds]; };
+  ahaz = derive { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[survival Matrix]; };
+  AICcmodavg = derive { name="AICcmodavg"; version="1.35"; sha256="1hxldkvyvfk10a50vw26xwsbq3wl5r92abqlpdp7vsla4ff72x39"; depends=[]; };
+  AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; };
+  aidar = derive { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
+  AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; };
+  akima = derive { name="akima"; version="0.5-11"; sha256="17n7iiwybwanvm5mflb1f2xx1gnw1pcmfsnl1f82afixpalbs0gh"; depends=[]; };
+  akmeans = derive { name="akmeans"; version="1.0"; sha256="1z2a4k419qq4vkl0zx7hnn5vka6vwh9k6ir89ldvwyi849b1nnxv"; depends=[]; };
+  alabama = derive { name="alabama"; version="2011.9-1"; sha256="05c1a8707akwy39n2gjg3ahdp9xdkl18a32wdchw60f0h4ixqfdi"; depends=[numDeriv]; };
+  aLFQ = derive { name="aLFQ"; version="1.3.1"; sha256="0i351xa5x3sn0li5qway0wjhifvf9jfjb7hxk5vw13gzn0cq9sd5"; depends=[data_table plyr caret seqinr]; };
+  AlgDesign = derive { name="AlgDesign"; version="1.1-7.2"; sha256="1c0hxg02dzjnns6awwsfaa5sc00x4zkc5jmsdz5vssjkliviwm9k"; depends=[]; };
+  algstat = derive { name="algstat"; version="0.0.0"; sha256="0g1bylrwfigh2wb005iais5blrz95asq9dizp1jbqgiyxqfbd1g4"; depends=[mpoly stringr reshape2 Rcpp]; };
+  ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp]; };
+  allan = derive { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
+  allanvar = derive { name="allanvar"; version="1.0"; sha256="0wpywdr15gb49m9kxrpjfsxlxrm4hwm46x42k8dgc6sihfsqbm22"; depends=[gplots]; };
+  allelematch = derive { name="allelematch"; version="2.03"; sha256="1dmalyljsmf7njr6fj8bcjii13swvh89dj3r1mp2xxf1r0p6jry8"; depends=[dynamicTreeCut]; };
+  AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
+  allelic = derive { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; };
+  AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
+  alm = derive { name="alm"; version="0.1.6"; sha256="148sbp87dz963xq1lzm1hrg0201pba5fqfk3wh2v7zqz4qfji1i8"; depends=[ggplot2 RCurl plyr stringr reshape reshape2 httr RJSONIO lubridate]; };
+  alphahull = derive { name="alphahull"; version="1.0"; sha256="0k3n9l4vbvpmdb4m37y1ynsiv27l8b5fmm6l35sazlfbbinhzwc1"; depends=[tripack sgeostat splancs]; };
+  alphashape3d = derive { name="alphashape3d"; version="1.0-4"; sha256="029j5zwg34hqp21d7w3k89i10sslrs7xiwckk8wc9cikvr1fr79h"; depends=[geometry rgl]; };
+  alr3 = derive { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
+  alr4 = derive { name="alr4"; version="1.0.3"; sha256="1m73b626fljfs96wvv1v627v48qilq5dyi5clqn8b4a5lyjjs2mg"; depends=[car effects]; };
+  ALS = derive { name="ALS"; version="0.0.5"; sha256="1ryviknpf7c0v20bmc40khhmx51b83hbh9q9iwz9d694by51xryc"; depends=[nnls Iso]; };
+  ALSCPC = derive { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; };
+  amap = derive { name="amap"; version="0.8-12"; sha256="0z7c5lrwqvjcnjm48zq2ifyx089fabvwf1zz17qlxq44i8xzpx8j"; depends=[]; };
+  AMAP_Seq = derive { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; };
+  amei = derive { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
+  Amelia = derive { name="Amelia"; version="1.7.2"; sha256="1zmaqnjqam8f4spdgy9gfvd5r0a48amvlsqdpdq9zwn7sq7702jj"; depends=[foreign Rcpp RcppArmadillo]; };
+  amen = derive { name="amen"; version="0.999"; sha256="1p9ma31bzrxylcgi43nk44bq0cg4xgk9fzmxw2dpqz33x4xlrfiq"; depends=[]; };
+  AmericanCallOpt = derive { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
+  AMGET = derive { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
+  aml = derive { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
+  AMOEBA = derive { name="AMOEBA"; version="1.0"; sha256="0iaznr19hdi40mkj82ai4r83b8whvvzmbiba0kwkp2g8g38a5brk"; depends=[snowfall rlecuyer spdep]; };
+  AMORE = derive { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
+  AmpliconDuo = derive { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; };
+  anacor = derive { name="anacor"; version="1.0-4"; sha256="13f5cnna7vdimv4mxmjj21alxjzi1rk0hksajfy2m0b3yn2vl612"; depends=[rgl scatterplot3d fda colorspace car]; };
+  anaglyph = derive { name="anaglyph"; version="0.1-1"; sha256="1a9c7rl7r2sgl230mcwqnmxjqba8skycdhi09i834qaw2h9qd4k5"; depends=[]; };
+  analogue = derive { name="analogue"; version="0.12-0"; sha256="16bdrvhk4ivq43lfl7pncrwzjdsvwqj8d3j2krskmpdh9qc3sq65"; depends=[vegan lattice rgl mgcv MASS brglm princurve]; };
+  AnalyzeFMRI = derive { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[R_matlab fastICA]; };
+  anametrix = derive { name="anametrix"; version="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[RCurl XML pastecs]; };
+  anapuce = derive { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; };
+  AncestryMapper = derive { name="AncestryMapper"; version="1.1"; sha256="0nc9iacdgmdda9d9ga9mn0dvmv8d1571sblifqdrz35p5yl7fr0g"; depends=[]; };
+  anchors = derive { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[rgenoud MASS]; };
+  AnDE = derive { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization functional foreign stringr]; };
+  andrews = derive { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; };
+  anesrake = derive { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; };
+  Animal = derive { name="Animal"; version="1.04"; sha256="0hahvq1x81s0qmr58jv6q96jnc8lzn4ycljd8adhpgsx3wn8s7mq"; depends=[]; };
+  animalTrack = derive { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; };
+  animation = derive { name="animation"; version="2.2"; sha256="0dg754hrbba4k69pd1k85ailiyzm7cc59dcjs3w6gbgy5l605qqa"; depends=[MASS]; };
+  ANN = derive { name="ANN"; version="0.1.4"; sha256="06cgbjybp731bxsv0y3fm3dsl0lzlgm6rqjmni1r3bjp60pjxdxl"; depends=[]; };
+  AnnotLists = derive { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
+  anoint = derive { name="anoint"; version="1.3"; sha256="0hwvwd6ghxhkfymf124igski8l98k29pj3ahi5mflm8gv0qan92g"; depends=[survival glmnet MASS]; };
+  anominate = derive { name="anominate"; version="0.4"; sha256="00cqwlka33aqr3jks1fsxizwdlrfmv5w5bpnkzknhgz70l60h38n"; depends=[wnominate oc pscl MCMCpack]; };
+  ant = derive { name="ant"; version="0.0-10"; sha256="00fmjkkp4ml8kgx90918l36amzr29a9cw756k4z64dd4gdv9s25p"; depends=[rJava]; };
+  AnthropMMD = derive { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
+  Anthropometry = derive { name="Anthropometry"; version="1.0"; sha256="1cvq06hyxcgg95n21bi22csdgc6l6av78bvz7r7qdsl7wffddk0w"; depends=[shapes rgl archetypes nnls depth FNN ICGE cluster]; };
+  antitrust = derive { name="antitrust"; version="0.93"; sha256="1ria3ybar84gclqpc5hmigl84m59ajkb75rbmjr5fs8244j6szif"; depends=[MASS evd BB numDeriv ggplot2]; };
+  AntWeb = derive { name="AntWeb"; version="0.6.1"; sha256="1m4r7zx6mmxwdf1ldwmqad2lzc9kw150l0b3z2994nvcx36r4cj4"; depends=[rjson plyr assertthat httr leafletR]; };
+  aod = derive { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
+  aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[lme4 boot]; };
+  AOfamilies = derive { name="AOfamilies"; version="1.01"; sha256="0v3b83k12lsrdcrkjl2ff38d0g8sbrnm5pmm9xphyrk3lfgap76k"; depends=[lqmm quantreg]; };
+  aoristic = derive { name="aoristic"; version="0.4"; sha256="114vhh5sxa7m900w1l0xzqp8n6kfqbvhq0fynlxdll6dbh9gg3gm"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2]; };
+  apcluster = derive { name="apcluster"; version="1.3.3"; sha256="0ly4crmkg0v2dilk54ipbh15gmqchddbdl40rjlzs31vcn3clwkp"; depends=[Rcpp]; };
+  ape = derive { name="ape"; version="3.1-1"; sha256="0vywi5a8hmpc6wphzxvnlln1sffsbkcrwxw26mcagaq4hzc8fbr0"; depends=[nlme lattice]; };
+  aplpack = derive { name="aplpack"; version="1.2.9"; sha256="024q0vsimhr3cj4fz2x10hf7mm89psn8f04j013qas7wdsixkswk"; depends=[]; };
+  apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; };
+  appell = derive { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
+  apple = derive { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; };
+  AppliedPredictiveModeling = derive { name="AppliedPredictiveModeling"; version="1.1-5"; sha256="1kcgr1kf4fjhr2skmjp4cdky5093xwm17z46zywimksc94j8aa83"; depends=[CORElearn MASS plyr reshape2]; };
+  approximator = derive { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
+  aprof = derive { name="aprof"; version="0.1"; sha256="1lqbcm9b4hc03nrjg5szpyl7dgxx5xlrx65x9hnj1f6b6g0vvv18"; depends=[]; };
+  APSIMBatch = derive { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
+  apsrtable = derive { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
+  apt = derive { name="apt"; version="2.0"; sha256="1myhda1ickxiw6abf8ci9ca976daldcm5i0yb0jfl5zrxjanx552"; depends=[car erer urca]; };
+  apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
+  aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
+  aqp = derive { name="aqp"; version="1.7"; sha256="034lxhssn98rkcvwyycqcpppabm4xi89kr19d8ydj74dfgbhyx1z"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer]; };
+  aqr = derive { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[xts RCurl]; };
+  AquaEnv = derive { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[minpack_lm deSolve]; };
+  ARAMIS = derive { name="ARAMIS"; version="1.0.1"; sha256="12bsn5lpb9cv0py1ymbqhbnjrpisf09yixpnqbazsmrz7lrin079"; depends=[MASS LearnBayes]; };
+  archetypes = derive { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
+  ArDec = derive { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
+  arf3DS4 = derive { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
+  arfima = derive { name="arfima"; version="1.2-5"; sha256="0bjhb5swhw4knmsp7fimbcc68bws60saij07p3hj2asjbsqw8n16"; depends=[ltsa]; };
+  argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
+  argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; };
+  arm = derive { name="arm"; version="1.7-03"; sha256="0v92ilikbk5viy544axqapb2q88n21qilfg7hxc0ag87n0xyxfaq"; depends=[MASS Matrix lme4 abind coda nlme]; };
+  aroma_affymetrix = derive { name="aroma.affymetrix"; version="2.12.0"; sha256="1r3ywi97xqvk6dif7kkc3gqapiydd2sbq0ibxs1qf6s2v236d71r"; depends=[R_utils aroma_core R_methodsS3 R_oo R_cache R_filesets aroma_apd MASS matrixStats]; };
+  aroma_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
+  aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
+  aroma_core = derive { name="aroma.core"; version="2.12.1"; sha256="1rg7m9z2j9hn0adj407amyabyh6jhpgip51zd8fb8rplzgbkrm7s"; depends=[R_utils R_filesets R_devices R_methodsS3 R_oo R_cache R_rsp matrixStats RColorBrewer PSCBS]; };
+  aRpsDCA = derive { name="aRpsDCA"; version="1.0.0"; sha256="035888scbl5333sz25f9n6xh1zis7l2752p4nhsbs2g44q38l9h6"; depends=[]; };
+  ArrayBin = derive { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[]; };
+  arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
+  ars = derive { name="ars"; version="0.4"; sha256="0ynciw8n2jpqi40gsrj189419vgr1lgs9wridh09nj7n451b4kvg"; depends=[]; };
+  ARTIVA = derive { name="ARTIVA"; version="1.2.2"; sha256="1k51yfh2xxchbiq9b64llc3sp330kh30lai75fgnbycwynkpsk5m"; depends=[MASS igraph gplots]; };
+  ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
+  arules = derive { name="arules"; version="1.1-2"; sha256="01dp7mhqff9kqz281dz37in040gxr6wzyxmz4r6kmgww7wzi6j80"; depends=[Matrix]; };
+  arulesNBMiner = derive { name="arulesNBMiner"; version="0.1-2"; sha256="1wsl8g9hi1pv4wm4345p8ch6sn8900s6ak8hnzb9ini0djq6jzyw"; depends=[arules rJava]; };
+  arulesSequences = derive { name="arulesSequences"; version="0.2-6"; sha256="1fvph6c8dy3hj0h63h85bzzzka8dx0cc0lcncz9svyahy1j4q3z0"; depends=[arules]; };
+  arulesViz = derive { name="arulesViz"; version="0.1-9"; sha256="1s1hsf64fg32r3p1h8bvzbpr7a28szdh9hs7ck9qykh2s93xh12z"; depends=[arules scatterplot3d vcd seriation igraph]; };
+  asbio = derive { name="asbio"; version="1.0"; sha256="198fkj2wlw0dpqlc6fbycxfkmgj8wkbvfvk2pxvliqy83dkh8d7l"; depends=[scatterplot3d pixmap tkrplot plotrix mvtnorm deSolve lattice]; };
+  ascii = derive { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
+  ascrda = derive { name="ascrda"; version="1.15"; sha256="17anzlhcjmrk13s5gs752rsc735y5wvba6r3w1nbv0cnkpnyk8i7"; depends=[class nnet rda MASS sfsmisc e1071 pamr]; };
+  asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
+  ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
+  aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; };
+  aspect = derive { name="aspect"; version="1.0-2"; sha256="1p06vglsj2z0qal3sacjfm6cr9vb3jidk1c1rsmwy4cfv7dzh58n"; depends=[]; };
+  assertive = derive { name="assertive"; version="0.1-8"; sha256="0j1phpx2w34rdjaar3fqhp0rsvdlidvw2irfazbh9955mdn2cwq1"; depends=[]; };
+  assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
+  AssetPricing = derive { name="AssetPricing"; version="0.1-3"; sha256="0043z4453njxm0ziwxbxsxf1d1zanwmaf9flajawm4f96c0iydp2"; depends=[polynom deSolve]; };
+  AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
+  aster = derive { name="aster"; version="0.8-27"; sha256="1bn83n41fa58xsv7p69lq06fr07x3w317gfcg4icgj4wyhzgj5c4"; depends=[trust]; };
+  aster2 = derive { name="aster2"; version="0.1"; sha256="1qbh1l2cnhvdfxaw1bv8cpj96nv03g155b1xh1vdigniwc04mssw"; depends=[]; };
+  astro = derive { name="astro"; version="1.1"; sha256="15xxa3ynlgk6dhlb1z9lwvf9jqvfw9ghkl7rjbdcrvc52b92nwd3"; depends=[MASS plotrix]; };
+  astroFns = derive { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
+  astsa = derive { name="astsa"; version="1.2"; sha256="13nlk5m5j9rygjih2hd3nj5iyncm1cx4smcj9zpr6nrsc79brwzj"; depends=[]; };
+  asympTest = derive { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
+  asypow = derive { name="asypow"; version="2013.9-1"; sha256="0zd42ha30kysjhd6rwxr91k1hhsimw3py2inymbpxgyq4s890whs"; depends=[]; };
+  AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; };
+  ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
+  AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
+  attfad = derive { name="attfad"; version="1.1"; sha256="10vdb60i8iigslcd0f3ipkf7m3d7h8zhq9x0n7yilc1xpd79r3ha"; depends=[]; };
+  AUC = derive { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
+  AUCRF = derive { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
+  audio = derive { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
+  audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin RJSONIO plotrix]; };
+  audit = derive { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
+  automap = derive { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[sp gstat lattice reshape]; };
+  autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; };
+  AutoSEARCH = derive { name="AutoSEARCH"; version="1.2"; sha256="1zl5zd96249y2zfpidpl9n3zwcp74kvcxn4s10v0lypvr19cr3hn"; depends=[zoo]; };
+  avgrankoverlap = derive { name="avgrankoverlap"; version="1.0"; sha256="1wyafcygwdk754wp25283nd84lnn9qxha41xij55ylrn4nvg57l1"; depends=[]; };
+  aws = derive { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
+  awsMethods = derive { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; };
+  AWS_tools = derive { name="AWS.tools"; version="0.0.5"; sha256="0z0mh8pdrqvsg49dbhds8aj0lmxmvhfi05im0gg01vdidxpmabyn"; depends=[XML]; };
+  aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
+  B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
+  b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
+  babel = derive { name="babel"; version="0.2-5"; sha256="0c4ks9yi90nmlp383dfikdkd4xzsdkadckbs4sw86qrizyv2qb62"; depends=[]; };
+  BaBooN = derive { name="BaBooN"; version="0.1-6"; sha256="1splid5mvyd04d1lxkq45md910ry6n516cph20j6vqfhla0arxjg"; depends=[MASS nnet]; };
+  BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
+  backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
+  BACprior = derive { name="BACprior"; version="1.2.1"; sha256="1xwszrnb6fnfl4pz89y24jykzyjnkzwzkicdp1rp7q3jwp986fxi"; depends=[mvtnorm leaps]; };
+  BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
+  bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
+  BalancedSampling = derive { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; };
+  BaM = derive { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda MASS mice survival foreign nnet]; };
+  bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; };
+  BAMMtools = derive { name="BAMMtools"; version="1.0.1"; sha256="0850yl0knw705ip2fl3sbgspnwbpks0vhlb3fb5sfh6p9klyk140"; depends=[ape]; };
+  bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
+  bandit = derive { name="bandit"; version="0.4.2"; sha256="09q6b44kcacb8ll3g2vjr58rn0ikic9m1nlm0iq43s1vcsnwcgvh"; depends=[boot gam]; };
+  barcode = derive { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
+  bark = derive { name="bark"; version="0.1-0"; sha256="00sgwr1sfbx0gb2ssbnmbz90mwb40sk3s24asj7lhadwgm150nly"; depends=[]; };
+  Barnard = derive { name="Barnard"; version="1.3"; sha256="1kyc6rph0c9lxv6mkdl5n11xw1pvavlm2kknplb3sv6f94ss2yci"; depends=[]; };
+  bartMachine = derive { name="bartMachine"; version="1.0.2"; sha256="1mxl8yra44ypxchqlyfv950gac1m8mw85qqaifzylm7fqb12xr8s"; depends=[rJava car randomForest missForest]; };
+  BAS = derive { name="BAS"; version="1.0"; sha256="1j5crafky3jb25kim3b7gxg9azn3ya357ckq1v7wryzi3zi674sg"; depends=[MASS]; };
+  BaSAR = derive { name="BaSAR"; version="1.3"; sha256="0n18gjgnqdmwdna6b5r664rw2svjqlpis95vchnlk19cr3pjvqc1"; depends=[polynom orthopolynom]; };
+  base64 = derive { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
+  base64enc = derive { name="base64enc"; version="0.1-1"; sha256="0aflrnn5af6igmlwhmshiz7nb07ajgaryj9gs93zhk2ca5ki80lv"; depends=[]; };
+  baseline = derive { name="baseline"; version="1.1-3"; sha256="1n3g1ads26nq3y31nniirac453pdshzkdfg774w46x83cc5pc0xj"; depends=[SparseM]; };
+  basicspace = derive { name="basicspace"; version="0.07"; sha256="0lpj03a5cwrj0pag6hb29rfi8dw51hqx7rrc4r00lsbqf5picin2"; depends=[]; };
+  BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
+  BaSTA = derive { name="BaSTA"; version="1.9.3"; sha256="1jfki5lnsvd6fjrld2qp179lyzli61pi2308lkkl1h6vgp11zp2v"; depends=[msm]; };
+  batade = derive { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
+  batch = derive { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
+  BatchExperiments = derive { name="BatchExperiments"; version="1.1"; sha256="1asjk7wwz595k3ylmg19mil42bi3drz96181ikaqpq20l4zr8ccr"; depends=[BatchJobs BBmisc DBI RSQLite plyr]; };
+  BatchJobs = derive { name="BatchJobs"; version="1.2"; sha256="16v3a9awm3isx53lrhlklnxfsgf9kcfsq66hlvkwdvrcw3bsh639"; depends=[BBmisc digest DBI RSQLite sendmailR brew plyr stringr fail]; };
+  batchmeans = derive { name="batchmeans"; version="1.0-1"; sha256="06p51ipc603zqkf7ifv495jxbnqqxzx5h8mnz5l5sz9rq5pixg13"; depends=[]; };
+  BayesBridge = derive { name="BayesBridge"; version="0.4"; sha256="1h63jdx45fdwwfif4ac9rlhhjldqznb695sp6ddjm7nzzh0vx1zn"; depends=[]; };
+  bayesclust = derive { name="bayesclust"; version="3.1"; sha256="0zxjd64nz8c6vg6jwb2xh6kbw41a2pcmlwq5cl6k2kbplqbm2jdf"; depends=[]; };
+  BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda]; };
+  bayescount = derive { name="bayescount"; version="0.9.9-1"; sha256="1sdc4j06a7h2i3rzjz83l1zd20jmy4rmnmjqq5ghskahgwyab3zc"; depends=[runjags coda lattice]; };
+  BayesCR = derive { name="BayesCR"; version="1.0"; sha256="0cq1ii01j0nprnyvfxml1nrajrbb9yanr4fa5fcwn764cq5s30n9"; depends=[MCMCpack mvtnorm Rlab truncdist truncnorm]; };
+  BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
+  bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
+  BayesFactor = derive { name="BayesFactor"; version="0.9.7"; sha256="02bqsvxsxkyhxm0llwnscsp204ffjygdk9xraml1l2fkz3cg62vl"; depends=[coda pbapply mvtnorm stringr]; };
+  bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
+  bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; };
+  Bayesianbetareg = derive { name="Bayesianbetareg"; version="1.1"; sha256="1kj974fl2mfqlgl03ynfcwm4c9iqgymbnhqiz3dx1xdbqf1vd2cd"; depends=[mvtnorm betareg]; };
+  BayesLCA = derive { name="BayesLCA"; version="1.5"; sha256="0ikx0qxp9mw4206c0i2g8cjr3d5i591wb1qak28c11m22rn1s7gc"; depends=[e1071 coda fields nlme MCMCpack]; };
+  bayesLife = derive { name="bayesLife"; version="2.1-0"; sha256="1cjwxjnfj5vm5m2kr4k3z7a0zdgcm727kwbp5jvc7j67qw7p30k7"; depends=[bayesTFR wpp2012 hett car coda]; };
+  BayesLogit = derive { name="BayesLogit"; version="0.4"; sha256="1a6iv3v7l2vc3ry0ry506bqz7avj24kdz5rly2d65jkxg8xv7vih"; depends=[]; };
+  bayesm = derive { name="bayesm"; version="2.2-5"; sha256="16cnm1i7vwviqxwq3yhj5r9a46qaanq2mb4snd0659rkia6p8h7a"; depends=[]; };
+  bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; };
+  BayesMed = derive { name="BayesMed"; version="1.0"; sha256="1ppl5g8c5yy8jzhm34wvvprn9dj697ihcg8jb5111qmjybzzp0dh"; depends=[R2jags QRM polspline MCMCpack]; };
+  bayesmix = derive { name="bayesmix"; version="0.7-3"; sha256="142132aslmmm35yai4n1d2hqqkczvrnm8ln9gwxvbczmxaggnc01"; depends=[rjags coda]; };
+  BayesNI = derive { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
+  BayesPen = derive { name="BayesPen"; version="1.0"; sha256="1c31n0mrx07j9mw4afdh1qznkiq2jrig3ldpsnhkv2nd2apgjbbp"; depends=[lars MCMCpack SuppDists]; };
+  bayesPop = derive { name="bayesPop"; version="5.0-0"; sha256="0a577jkm0v88q2i7dmn2xqndm9z5y3hwfxr4a5d65cnrlsahfzdl"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
+  bayespref = derive { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
+  bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
+  BayesQTLBIC = derive { name="BayesQTLBIC"; version="1.0-2"; sha256="1pgd3h45v3l44pfkin2883lk1davp0y4fq80lp6nqrsbx9cpsy2z"; depends=[leaps]; };
+  bayess = derive { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[MASS mnormt gplots combinat]; };
+  BayesSAE = derive { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[Formula coda lattice]; };
+  BayesSingleSub = derive { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda mvtnorm MCMCpack]; };
+  bayesSurv = derive { name="bayesSurv"; version="2.1-1"; sha256="076lzaiwjp4ahw36wvx9sb1g86b9cidvjv91sc1r509s8khph91w"; depends=[survival coda smoothSurv]; };
+  bayesTFR = derive { name="bayesTFR"; version="4.0-5"; sha256="1cyzkgx0f275ng0ds0lvm3rwryd2ai20shhilp7ajvsria4h4dcw"; depends=[mvtnorm MASS coda wpp2012]; };
+  Bayesthresh = derive { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[lme4 MASS VGAM mvtnorm matrixcalc coda]; };
+  BayesTree = derive { name="BayesTree"; version="0.3-1.1"; sha256="1sdxya2nli590m837zmqn4y3h62ph1hx8qszp6ayb19liff2bnmd"; depends=[nnet]; };
+  BayesValidate = derive { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
+  BayesVarSel = derive { name="BayesVarSel"; version="1.5.1"; sha256="0r2al4d74dbra7va88fcazq5h19f0i4wymd39apsz3a3hsb8vdvv"; depends=[MASS]; };
+  BayesX = derive { name="BayesX"; version="0.2-8"; sha256="1kj0xwy972383vx52i8dn7vp0x8r5cbbii0s7nwfz0bn2iaks0c0"; depends=[shapefiles sp maptools colorspace coda]; };
+  BayesXsrc = derive { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
+  BayHap = derive { name="BayHap"; version="1.0.1"; sha256="0xqnl2cbf0pyjlpywyy0j4mwknfn8msz4s719dsri3r7hvn9m6kd"; depends=[boa]; };
+  BayHaz = derive { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; };
+  BaylorEdPsych = derive { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; };
+  BaySIC = derive { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[rjags fields poibin]; };
+  BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
+  BB = derive { name="BB"; version="2014.1-1"; sha256="05ang9k03cpdyjskifp8y68sjgbsnp8xj1a85hzqychlb7d4f2qk"; depends=[]; };
+  bbefkr = derive { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
+  bbemkr = derive { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
+  BBmisc = derive { name="BBmisc"; version="1.6"; sha256="0zb9137rnqjb9jvazfqz5ajqf18w1f57lxqy8q4rys7966bp3ndm"; depends=[]; };
+  bbmle = derive { name="bbmle"; version="1.0.16"; sha256="133ff9md8m2xh8x45xmpdm868pp46dzlly1qq8dp8ail18kqj9ga"; depends=[numDeriv lattice MASS]; };
+  BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
+  bbo = derive { name="bbo"; version="0.1"; sha256="1giif78135f3hy8dqims83imism0k3507jlppgcb3x6pxk7dgwbs"; depends=[]; };
+  BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; };
+  bc3net = derive { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net infotheo igraph Matrix lattice]; };
+  BCA = derive { name="BCA"; version="0.9-2"; sha256="1kry9v0sfcpn5vv4hwd983svwcgv841y9pkjdzi849gspmc9291r"; depends=[car clv cluster class flexclust rpart nnet rgl Rcmdr]; };
+  BCBCSF = derive { name="BCBCSF"; version="1.0-0"; sha256="1ag8wz8a9vh1x4jgppimgchfs53rr6hbg5xzzr6k2h4bfsg7pmn3"; depends=[abind]; };
+  BCDating = derive { name="BCDating"; version="0.9.3"; sha256="1ibm34wab1dpigrhifkyr1nylgbprbh22fdw9zpmg8bawb7zgbsl"; depends=[]; };
+  BCE = derive { name="BCE"; version="1.4"; sha256="1i7kxw6ykxk6kzncxgqalx51yj55nr3klr4ziy8fwwyix9llcrqy"; depends=[limSolve]; };
+  BCEA = derive { name="BCEA"; version="2.0-2"; sha256="1n0fp6na2y4n7p6ncwgi6hwx97mfrga3fkp3i0z06bh1p1jh8m88"; depends=[]; };
+  BCEs0 = derive { name="BCEs0"; version="1.1"; sha256="0q63bkmk0kk9p5d3xb0f5srzfrbr743isyw4v2h9ch5yyxizcizb"; depends=[]; };
+  Bchron = derive { name="Bchron"; version="4.1.1"; sha256="0dnfz7xpmbygyarh9ai9x3xfsqiizi0zhnxm8bmkvqyb8h7zpghb"; depends=[inline hdrcde MASS ellipse coda mclust]; };
+  Bclim = derive { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[MASS mclust hdrcde statmod]; };
+  bclust = derive { name="bclust"; version="1.4"; sha256="1s04fqff5bw6d5kk0smvach6yq492dv1w0ahh9mrm2jsi2q58h7p"; depends=[]; };
+  bcool = derive { name="bcool"; version="1.1"; sha256="03z6wdqpk491gyysbzz1lgfavskmi0j65r3df7baz6lrvzkg30ji"; depends=[MCMCglmm doMPI seqinr]; };
+  bcp = derive { name="bcp"; version="3.0.1"; sha256="08sa1az1ljsi00zmj3l7z8p1j5im1w79yjxy8k1p6ba90bck7l4h"; depends=[foreach iterators Rcpp]; };
+  bcpa = derive { name="bcpa"; version="1.0"; sha256="02vyvwd1j5d1nvwmhjbldyav1zx8sh8kvchwz73i0vs0jdrwp3q4"; depends=[Rcpp intervals plyr]; };
+  bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; };
+  bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; };
+  bda = derive { name="bda"; version="3.1.3-2"; sha256="1l11p8a57hqyfbm7339fdis8kb7mw044cnpf85bq4rh7fvmknc9n"; depends=[]; };
+  BDgraph = derive { name="BDgraph"; version="2.7"; sha256="1krg11v4gh453xqhyli8qwnd52j0c9c3mp9ynk2fljbimzj6pz81"; depends=[huge]; };
+  bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
+  bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
+  bdsmatrix = derive { name="bdsmatrix"; version="1.3-1"; sha256="1iiqz34ssb5i5jd1x5d0mccir9ycrq2vq30g67ggw12apl7yks1l"; depends=[]; };
+  bdynsys = derive { name="bdynsys"; version="1.2"; sha256="06n4n5yix6yd5180c5y7qdk2p5jpjqiw28147l8fp58zqxvwjrxb"; depends=[plm Formula MASS Hmisc deSolve pracma caTools matrixStats]; };
+  beadarrayFilter = derive { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[RColorBrewer]; };
+  beadarrayMSV = derive { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[rggobi]; };
+  beanplot = derive { name="beanplot"; version="1.1"; sha256="0h1ns2y0f6x5z9bn4wsv640509q4jxhqvmqr7snf8vk54vc35zs5"; depends=[]; };
+  bear = derive { name="bear"; version="2.6.3"; sha256="1w933rb1v4ixgmxpbjxrfwzhiddpr0vxwr3gryl6z6p4wvwdwvp7"; depends=[reshape nlme gdata ICSNP sciplot plotrix ggplot2 png]; };
+  BEDASSLE = derive { name="BEDASSLE"; version="1.3"; sha256="09zjddp9001l31ax7m0il0z5d8j69mj5wcxf56lcwq14fchk3ip5"; depends=[MASS matrixcalc emdbook]; };
+  beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8vmcprss5ivgb0dlyly07jywj3vrf2z81yhy"; depends=[]; };
+  benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
+  benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; };
+  Benchmarking = derive { name="Benchmarking"; version="0.23"; sha256="0q0m34l3216m467b28nckg7l4g0z7jmxdamba3jgzfm4rv73d6rd"; depends=[lpSolveAPI ucminf]; };
+  benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
+  BenfordTests = derive { name="BenfordTests"; version="1.1.1"; sha256="12xzc4gq4h7p18ypbkybrzjj2qh71rgd7nzznij36yv7n6h21mlw"; depends=[]; };
+  bentcableAR = derive { name="bentcableAR"; version="0.2.3"; sha256="0d20cc3zis3pc3r86z12cwcz013w0mglbg6xgv90wq912jjpkxk9"; depends=[]; };
+  BEQI2 = derive { name="BEQI2"; version="1.0-0"; sha256="1yw4q0402qlzl0g541fd2k5pmaf3h6dsq4p2qyk496z0r6fv0x4k"; depends=[knitr markdown RJSONIO xtable plyr reshape2]; };
+  ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
+  Bergm = derive { name="Bergm"; version="2.6"; sha256="1r47xzrc2sl8b4vmw40dxyn5cndwc7872zrb52ni0ismxvvkkwqq"; depends=[ergm network coda mvtnorm]; };
+  Bessel = derive { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; };
+  BEST = derive { name="BEST"; version="0.2.0"; sha256="076dsy813sq0x21ihp4xz0jf22j5xj80f5gpsk89mafr5ys22zl7"; depends=[rjags]; };
+  bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
+  betafam = derive { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
+  betapart = derive { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
+  betaper = derive { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[vegan ellipse]; };
+  betareg = derive { name="betareg"; version="3.0-4"; sha256="1crkp1j11zpzd92hc1zaw0pb68ngga8gl6v504p4r7629806g5hv"; depends=[Formula flexmix lmtest modeltools sandwich]; };
+  betategarch = derive { name="betategarch"; version="3.1"; sha256="1m4xif7xn1hhz9a77mmy0hlqrfp7qxardc95jcvx1jy76nny21af"; depends=[zoo]; };
+  bethel = derive { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; };
+  bezier = derive { name="bezier"; version="1.0"; sha256="0145d2vd2l9l6wq3a1rkqi5n74nwrv6b50c28hrw1nqnmgk2pw2n"; depends=[]; };
+  bfa = derive { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; };
+  bfast = derive { name="bfast"; version="1.4.4"; sha256="1k8rwlzrnkgs0wj0yy4gh4lj4zd5zyzwgwckgjy8k53r4296js66"; depends=[strucchange MASS forecast zoo raster sp strucchange zoo raster]; };
+  bfp = derive { name="bfp"; version="0.0-27"; sha256="08hlr33dwwjc4ag8vfsa3w4rcsc2093j8zwb05xkkl5nwqsq3mq0"; depends=[Rcpp]; };
+  bgeva = derive { name="bgeva"; version="0.2"; sha256="178c2jkg5578mh1yq37713lwfbz98nbsc2p1bmacgmbxbqnkba3x"; depends=[mgcv magic trust]; };
+  BGLR = derive { name="BGLR"; version="1.0.2"; sha256="1w9a0hbh65l8kjm1098d0gka4mgr19v55cwgdygykf8kjh4ihmkn"; depends=[]; };
+  bgmm = derive { name="bgmm"; version="1.6"; sha256="04d06rhb8ax1q4ayl03cw18j4wk4g4690kwdgiyym9yi0gh8hjij"; depends=[mvtnorm car lattice combinat]; };
+  BGPhazard = derive { name="BGPhazard"; version="1.0"; sha256="14nk8gxzd0xd4fcc16m026rlq3prnppv3jywllfapk5986cacq4g"; depends=[survival]; };
+  BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
+  BH = derive { name="BH"; version="1.54.0-2"; sha256="0044his8xl2nlf216ya5nzx4k1311221s9k96b5m982kj074y9zv"; depends=[]; };
+  Bhat = derive { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
+  BHH2 = derive { name="BHH2"; version="2012.04-0"; sha256="10ixvjpkqamlddrndpnw5gsdm4gdhp693jdvc0f774ngmf32rbaa"; depends=[]; };
+  biasbetareg = derive { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
+  BiasedUrn = derive { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
+  bibtex = derive { name="bibtex"; version="0.3-6"; sha256="06v6pzwpx5dh3h4cf382hf0mszxchvzjsjaw880gfbgc9yl931z7"; depends=[]; };
+  biclust = derive { name="biclust"; version="1.0.2"; sha256="09w164zsnc48apf3r0yr6bfjxlpy4s2wqpzfhlg60c3c7bk1bf7v"; depends=[MASS colorspace lattice]; };
+  BiDimRegression = derive { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
+  bifactorial = derive { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[mvtnorm multcomp lattice Rcpp]; };
+  bigalgebra = derive { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[bigmemory]; };
+  biganalytics = derive { name="biganalytics"; version="1.1.1"; sha256="0g45b293c1z9n2z9ab66jsy8yaiqm7bbs2d6pglzwgmmdvwy03qd"; depends=[bigmemory]; };
+  bigdata = derive { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet Matrix lattice]; };
+  bigGP = derive { name="bigGP"; version="0.1-2"; sha256="0ypcg7gwfwf1yriizy777adx5whya7f6al1z0irhq414g46r0s34"; depends=[Rmpi]; };
+  biglars = derive { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
+  biglm = derive { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
+  bigmemory = derive { name="bigmemory"; version="4.4.6"; sha256="1pplnpxqg380l5mjgz0ak4ipsx7x54339n2wr3dd29xv3w2fb5rp"; depends=[bigmemory_sri BH]; };
+  bigmemory_sri = derive { name="bigmemory.sri"; version="0.1.2"; sha256="01nz4phifx10r1hs83avisnaqxvs3y70v0yczjgcr8kih2cnvbsd"; depends=[]; };
+  bigml = derive { name="bigml"; version="0.1-1"; sha256="0x0gn5pyffc8s0z2hp9iqgc63mmb3q7fb8lafzz2x67z2gghxi77"; depends=[RJSONIO RCurl plyr]; };
+  bigpca = derive { name="bigpca"; version="1.0"; sha256="1s4qmg7xl8z0sv1b1vfqw0r5cvlbrxx1n0m03ira8fpykcck2clm"; depends=[reader NCmisc bigmemory biganalytics bigmemory_sri BH irlba]; };
+  bigrf = derive { name="bigrf"; version="0.1-6"; sha256="0xwimdbrj4iiqqgwj6y018bc7zv4n60b5x5yan64nd1371lcrlrq"; depends=[bigmemory BH foreach]; };
+  bigRR = derive { name="bigRR"; version="1.3-8"; sha256="11c3w9f2hdr74hwfli72i3gv45x3lvhjxrymjc91scxkks6va2s8"; depends=[hglm DatABEL]; };
+  bigsplines = derive { name="bigsplines"; version="1.0-0"; sha256="05lmqpqlaf8qf6is0s0bj9fq6icc6sfwbq6srrvmc9sf5fy6wizj"; depends=[]; };
+  bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory]; };
+  BigTSP = derive { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[glmnet tree randomForest gbm]; };
+  bilan = derive { name="bilan"; version="2013.12"; sha256="0wrrs6l8iwy6r707djsmlmwiw0y5z6wwnsn27fvmq9cb8scvbfan"; depends=[Rcpp]; };
+  bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; };
+  bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
+  binda = derive { name="binda"; version="1.0.0"; sha256="0h5a67ygn4hwkdzbmhdkqjngln32yr8rk36k87m3hq1ahj4jn73x"; depends=[entropy]; };
+  bindata = derive { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
+  bingat = derive { name="bingat"; version="1.0"; sha256="0x2ira1a6yan3pp206asil4xqrldpybywk1b8bnfbcp4xyclv44n"; depends=[cluster network]; };
+  binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
+  binhf = derive { name="binhf"; version="1.0-1"; sha256="0l8925bj6mjv2y7fn76zh2g8xjig3kbbdy4jl0ip3gd9kbrakl9k"; depends=[wavethresh adlift]; };
+  binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
+  BinNor = derive { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[mvtnorm corpcor psych Matrix]; };
+  binom = derive { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
+  binomialcftp = derive { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
+  binomlogit = derive { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
+  binomSamSize = derive { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; };
+  binomTools = derive { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; };
+  binseqtest = derive { name="binseqtest"; version="0.4"; sha256="1w85hfb6g9y3s4y9ldpi319qdrhi1p5qi040xh3630dlwk7zlpwb"; depends=[clinfun]; };
+  Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
+  BiodiversityR = derive { name="BiodiversityR"; version="2.4-1"; sha256="1b4fx1wh02z6p2l76xqxj0h59ypjngii92n0qp70hdm064h0pxji"; depends=[Rcmdr]; };
+  BioGeoBEARS = derive { name="BioGeoBEARS"; version="0.2.1"; sha256="1j3d7p4cdwhhbxx96sjdjwmlz6pj3als768hfzmjkhq0n6zhfwvq"; depends=[rexpokit cladoRcpp ape phylobase optimx FD xtable plotrix gdata]; };
+  Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; };
+  bio_infer = derive { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
+  biom = derive { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[plyr RJSONIO Matrix]; };
+  BioMark = derive { name="BioMark"; version="0.4.1"; sha256="163i7jsj8m6bqckpz6vr9rs3fc545w5fzw9vgk8mxq8cdq53yaiz"; depends=[pls glmnet st]; };
+  BiomarkeR = derive { name="BiomarkeR"; version="1.3"; sha256="0djhqindpmzx6kkj17db6d1n3w5v5wl1l3z14lnl0r2k1hf276fy"; depends=[igraph Hmisc]; };
+  biomod2 = derive { name="biomod2"; version="3.1-25"; sha256="1w3xxiqynmcrvw95jqd8j5mjmbs181gn8hbvvgz257x93fsyl293"; depends=[sp raster abind rasterVis pROC nnet gbm mda randomForest rpart MASS]; };
+  bionetdata = derive { name="bionetdata"; version="1.0"; sha256="1y5nnyfzbdk8673jyi733j4ncsc62kbsn1b8ghq10cb4xzxf2mvf"; depends=[]; };
+  biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
+  BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; };
+  bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
+  biOps = derive { name="biOps"; version="0.2.2"; sha256="04sc30kfj727c4l7xyax4idjv5shxm97m3rixfxialllcppjppw1"; depends=[]; };
+  biOpsGUI = derive { name="biOpsGUI"; version="0.1.2"; sha256="07567n2ixc1xinbyrzl0xy48x09m4j3xgxmarsrgx3nq5cmdr0rw"; depends=[RGtk2 biOps]; };
+  bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
+  BioStatR = derive { name="BioStatR"; version="1.0.4"; sha256="043fakac56kf1mdmwlm8q3hjdxlclissxbkv26y2brqp2sfr01pb"; depends=[]; };
+  biotools = derive { name="biotools"; version="1.1"; sha256="034lvkw7bfpyqgkp58phgk97sks7y33mj5hk3489y7pql43j6rfa"; depends=[rpanel MASS boot]; };
+  bipartite = derive { name="bipartite"; version="2.04"; sha256="0rp2j2ip8523jmvgvbnj56q49yazwz2wqyqc0l00flvp4920svf0"; depends=[vegan sna fields igraph MASS permute]; };
+  biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; };
+  BIPOD = derive { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp]; };
+  birch = derive { name="birch"; version="1.2-3"; sha256="1y0fcrmcljq74x7zd27lz9cr8bffg2hg3hm47qssa3301m9a5fjh"; depends=[ellipse]; };
+  birdring = derive { name="birdring"; version="1.0"; sha256="0fn4qaiiskmx19lzpm4hw3nbnicb91p2v6c0jc0n48ycvspa7mc9"; depends=[geosphere ks lazyData raster reshape rgdal rgeos rworldmap rworldxtra sp]; };
+  bisectr = derive { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
+  BiSEp = derive { name="BiSEp"; version="1.0"; sha256="1iw3ask3gpjhx0gnjgl3402fygi7bnsrha6dfxfsmyzz94im352x"; depends=[mclust]; };
+  bisoreg = derive { name="bisoreg"; version="1.1"; sha256="16d6nxbj18y6wv57nxbmwv0gypsgf7hw76hsyv0fhydrkf404igb"; depends=[bootstrap monreg R2WinBUGS coda]; };
+  bit = derive { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
+  bit64 = derive { name="bit64"; version="0.9-4"; sha256="1w734l5ayr7w17a3gk2kmkqwz7v5jm830kfhyqmnd15i816lnjb9"; depends=[bit]; };
+  bitops = derive { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
+  bivarRIpower = derive { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
+  biwavelet = derive { name="biwavelet"; version="0.17.3"; sha256="08lj0v53l9s12pssy3hgzys988w3y490nab7js655ljs825d2lpc"; depends=[fields]; };
+  biwt = derive { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[rrcov MASS]; };
+  bizdays = derive { name="bizdays"; version="0.1.3"; sha256="12x7p8h3h9rbji96yvwag9n5l09yci3x3lvzvh366rdcl52h0xvy"; depends=[]; };
+  BlakerCI = derive { name="BlakerCI"; version="1.0-2"; sha256="0njx3n469nwyq6nsv5lckvl9xdrf0qjp8kfgc1k01xiljppdb82w"; depends=[]; };
+  Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
+  BLCOP = derive { name="BLCOP"; version="0.2.7"; sha256="0dlf4h7bcwypamafl9y8jsjpjrilz153xzw4pjvpxv8gg1wh14d2"; depends=[MASS quadprog]; };
+  blender = derive { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
+  blighty = derive { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
+  blkergm = derive { name="blkergm"; version="1.0"; sha256="00xqmqn7y3vwygfx2v6kqm52n96vxlip2yk09gf30cqn2p3b6sck"; depends=[ergm ergm_userterms]; };
+  blm = derive { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
+  blme = derive { name="blme"; version="1.0-2"; sha256="11m98j9xr6w0hfcss4bbx2aa34gnc5p9if9r8ilw9ify18by77np"; depends=[lme4]; };
+  blockcluster = derive { name="blockcluster"; version="3.0.1"; sha256="1lxm20f8dhxfnm13j08sj7h3sfwc8limyqn8n87c3kl87066gdaq"; depends=[Rcpp]; };
+  blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
+  BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
+  blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
+  blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
+  blockTools = derive { name="blockTools"; version="0.5-8"; sha256="08smr9n5jl8lyhxk9ygbqgym1mlynjjn0007gz986pk8z6cqar0i"; depends=[MASS]; };
+  BLR = derive { name="BLR"; version="1.3"; sha256="02p29p06vhh8gxkfnqdf9niq09bygshmiipvd3q19k92g0a10l69"; depends=[SuppDists]; };
+  BMA = derive { name="BMA"; version="3.16.2.3"; sha256="1kgcml0issi43fw0g5qbmrh8y3jdyn98w7gp8z5n581763q9q273"; depends=[survival leaps robustbase]; };
+  BMAmevt = derive { name="BMAmevt"; version="1.0"; sha256="0cy3h81xd1jjg7fdwndb5az67cp7kn1wp87p17za8506vyxj1pa0"; depends=[coda]; };
+  bmd = derive { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
+  bmem = derive { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia MASS lavaan sem snowfall]; };
+  BMhyd = derive { name="BMhyd"; version="1.2-2"; sha256="09gb1pq9y3gq9avpaqrlxdsm9iqsxpbnr0bg2mw1vkhc0d5z8zv7"; depends=[corpcor numDeriv]; };
+  Bmix = derive { name="Bmix"; version="0.3"; sha256="0p3ks3miniz356spmdikynwa7yrdk1mwlpz081fnkjnwxa3kdsw7"; depends=[mvtnorm]; };
+  bmk = derive { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda plyr functional]; };
+  BMN = derive { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
+  bmp = derive { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
+  bmrm = derive { name="bmrm"; version="1.8"; sha256="1kw9i84v5larzy79aghp08760krp29xlwrjg4mh9fsa9nl9wxqda"; depends=[clpAPI kernlab]; };
+  BMS = derive { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
+  bnlearn = derive { name="bnlearn"; version="3.5"; sha256="1lxfmbj5j904gv8akpgbgwpnzw2a6ws9bvxq7hzxmxxnp9jri1sp"; depends=[]; };
+  BNPdensity = derive { name="BNPdensity"; version="2013.8"; sha256="1qlhav764ji289kcibbmqjj62mmxiw3zsiwjz1gkifzgpmzyar85"; depends=[]; };
+  bnpmr = derive { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
+  boa = derive { name="boa"; version="1.1.7-2"; sha256="1n7i0i8jq2sa1kzhbgyqzl9d53wja7fsxd7rligc8xjm0sdsb386"; depends=[]; };
+  BOG = derive { name="BOG"; version="1.1"; sha256="0lr2n4j32b7qzmyb2048kssc7sbchivhi2a8skmahhjl85jgy166"; depends=[hash DIME]; };
+  boilerpipeR = derive { name="boilerpipeR"; version="1.1"; sha256="0bjnydpz1fiwwj2d02rjsk0dv5rcwxlm3344dwib3igmsi0ch62k"; depends=[rJava]; };
+  Bolstad = derive { name="Bolstad"; version="0.2-25"; sha256="1dj0ib3jndnsdx2cqsy0dz54szdx1xq3r2xqnxzk4ysng6svdym8"; depends=[]; };
+  Bolstad2 = derive { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
+  BoolNet = derive { name="BoolNet"; version="1.63"; sha256="1ay80s4mrr26zfig5igqs0cwzf8ph4qxv33j8njwslgd5srzwrc4"; depends=[]; };
+  boostSeq = derive { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
+  boot = derive { name="boot"; version="1.3-11"; sha256="0s8v5mpyz2pqmm0kk8qkjiqr3wb1j1mqazx5hgsdabq6ga85ah8j"; depends=[]; };
+  bootES = derive { name="bootES"; version="1.01"; sha256="00y901d5cjdpzras5w6mv851h5zgp36m5ib6dazs4vqrfpqymva8"; depends=[boot]; };
+  bootfs = derive { name="bootfs"; version="1.4.2"; sha256="1qac7v0yzhxzqbdhkpgb4z1gqr6v6hjyb2y5lsxlq5dg1ka1cnb0"; depends=[pROC igraph ROCR gbm colorRamps gplots gtools pamr randomForest Boruta caret tgp mlegp penalizedSVM]; };
+  BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
+  bootRes = derive { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; };
+  bootruin = derive { name="bootruin"; version="1.2-0"; sha256="1hkyn3wc63z3r3gvfwrhs20rjjknhkk2b21q0m5dnd3jgf9q44lc"; depends=[]; };
+  bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
+  bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
+  bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; };
+  Boruta = derive { name="Boruta"; version="3.0.0"; sha256="1311cbg2hx4y068ayryvz6jishr87h6pgkwaax0ixrn0q20w42kn"; depends=[randomForest rFerns]; };
+  boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
+  BoSSA = derive { name="BoSSA"; version="1.2"; sha256="0rvb6y7jwy0nmjvnpkim09fdph5kazg8cr0jchnz1s46n16gvc96"; depends=[ape SoDA]; };
+  boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
+  boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
+  bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; };
+  bpcp = derive { name="bpcp"; version="1.1.0"; sha256="15dy3bbpazm4g72lwdf925f13a4dpdhi771283564v9f3n7qm3qf"; depends=[]; };
+  bPeaks = derive { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
+  bpkde = derive { name="bpkde"; version="1.0-2"; sha256="1vvj8z75q2aw3fiv3aiw97bac4ffslq8nqplil0s7a0x77al8nx7"; depends=[mvtnorm KernSmooth]; };
+  bqtl = derive { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
+  BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-4"; sha256="1v25r1yki3p2br6l38b77ailkip5gda1dfyvlb2dvr8a7cbjwp3s"; depends=[lme4 brglm gnm gtools]; };
+  BrailleR = derive { name="BrailleR"; version="0.8"; sha256="0smi8jkrmpmcbv9kzvj82rcbv6gcir51l0qyh6kccw69r2zfk4q4"; depends=[xtable moments nortest]; };
+  brainR = derive { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[rgl misc3d oro_nifti]; };
+  brainwaver = derive { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
+  branchLars = derive { name="branchLars"; version="1.0"; sha256="1adk9j77ynv7y8q04nvb468ik4nq4ff3j2nbxw596kgg5bg1ymz0"; depends=[lars]; };
+  breakage = derive { name="breakage"; version="1.0-1"; sha256="1zn0hxkz4zqhrfny75gkp2sgc0fs4v3y940aw32fmjh4j8kl3n4j"; depends=[Imap]; };
+  breakpoint = derive { name="breakpoint"; version="1.0"; sha256="0clmrad4ycpi0rxrvkh4agwixdayypjdnk3lfyb5g2w2hngrxv73"; depends=[ggplot2 foreach]; };
+  bReeze = derive { name="bReeze"; version="0.3-1"; sha256="1yyqp2f5avnml50ilajgralw24g7zar2dlmi3qcf5gs8fjhmayhr"; depends=[RColorBrewer]; };
+  brew = derive { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
+  brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; };
+  bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
+  brnn = derive { name="brnn"; version="0.3"; sha256="0fpmjmxzcsxqv3vfy568r7js0zpydh2q70vw2s8yki2jzxl4gsl9"; depends=[Formula]; };
+  Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
+  broman = derive { name="broman"; version="0.44-1"; sha256="04qmpdi0s2j083a9c642zf4l58shqz2pnybrrlyy18vkv9vjz8zw"; depends=[]; };
+  Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
+  BRugs = derive { name="BRugs"; version="0.8-3"; sha256="1qjwm6qizg70nvpl5p2yx65ynghazchqw7d2iadhdjz7dd293sqi"; depends=[coda]; };
+  BSagri = derive { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[gamlss multcomp MCPAN mvtnorm boot mratios]; };
+  BSDA = derive { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
+  bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; };
+  BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
+  bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; };
+  bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
+  BSquare = derive { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; };
+  BSSasymp = derive { name="BSSasymp"; version="1.0-0"; sha256="0gmy74sxif90ypavq0sl58g6wjh1qhlv6pdb2gmq7qiiig2qfdac"; depends=[fICA JADE]; };
+  bst = derive { name="bst"; version="0.3-3"; sha256="0f1apiq0b22w74pqwfnj4h9alrb9qjzjrrfnzk0b6j06lqiydmaw"; depends=[rpart gbm]; };
+  bstats = derive { name="bstats"; version="1.1-11-4"; sha256="1fwp33kswnlk3dyj174gaac7wmpg9n0sjx042hx091y9q2v1cczc"; depends=[]; };
+  BTYD = derive { name="BTYD"; version="1.0"; sha256="09nw1zf2ni6xwbk0kqzy2gada7d1lph6wz6l6r9xh11v4a8mw3xn"; depends=[gsl Matrix]; };
+  bujar = derive { name="bujar"; version="0.1-3"; sha256="01337y65k89bgyfmab6czyy1sy8z8ccklgjbmyakr59qc7pgdnph"; depends=[mda ncvreg mboost gbm earth elasticnet rms]; };
+  BurStFin = derive { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
+  BurStMisc = derive { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; };
+  bursts = derive { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
+  bvenn = derive { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
+  bvls = derive { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
+  bvpSolve = derive { name="bvpSolve"; version="1.2.4"; sha256="1ss25md3q59cm40rxw29x9421xjc7gd964hx9xwvx4h8dis34rgd"; depends=[rootSolve deSolve]; };
+  BVS = derive { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[MASS msm haplo_stats]; };
+  c060 = derive { name="c060"; version="0.2-3"; sha256="1lynkmdlqi41szrpqqa79d5i65lindqgi0dwqpvvw94yjnbnm6b3"; depends=[glmnet survival mlegp tgp peperr penalizedSVM lattice]; };
+  c3net = derive { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
+  C50 = derive { name="C50"; version="0.1.0-16"; sha256="0dhwjvslgza7sqbmvshb981k9spdk6wxwvr6z97m98vmkv2g6czk"; depends=[]; };
+  ca = derive { name="ca"; version="0.53"; sha256="07s51hl0rlbg91dp05qdz31ns9q0ah249710j1fb31ij92avqjj6"; depends=[]; };
+  cabootcrs = derive { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
+  cacher = derive { name="cacher"; version="1.1-2"; sha256="17zw30mpi1vrgk1jsxqpw2id3k78rrs6i55kq0yl64aikmq91c0v"; depends=[]; };
+  cacheSweave = derive { name="cacheSweave"; version="0.6-1"; sha256="0w30ryd24x2z204k8j41knayq3ax4b5zf0ai1andgdzjvf5jmmas"; depends=[filehash stashR digest]; };
+  cacIRT = derive { name="cacIRT"; version="1.3"; sha256="1qd9qw47d9dmxhnva3ik62q5rfcw0pd1ha1y689345nl05wysjkh"; depends=[]; };
+  CaDENCE = derive { name="CaDENCE"; version="1.2.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; depends=[]; };
+  CADFtest = derive { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; };
+  CAGExploreR = derive { name="CAGExploreR"; version="1.0.2"; sha256="0vszsvpfg1xn1k5qsx42bmlhb92vsyrsf421g1dwx5lgsl4f7xrr"; depends=[data_table rbamtools R2HTML]; };
+  Cairo = derive { name="Cairo"; version="1.5-5"; sha256="0g709j87fvqmxxliczw2z4zixq786c4n632vrygm3ibqg1vmipiq"; depends=[]; };
+  cairoDevice = derive { name="cairoDevice"; version="2.20"; sha256="1v9sdv35a1sl42gsz1y9jw1p6fr19yny07cc2pwmcrb4vs5lhysf"; depends=[]; };
+  CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-5"; sha256="0daii1qbq624zp466492xnwwf7c8qdagskh0w7nh70fqzh8yhqfr"; depends=[mice mvtnorm randomForest]; };
+  calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
+  calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; };
+  CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
+  calmate = derive { name="calmate"; version="0.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
+  CAMAN = derive { name="CAMAN"; version="0.67"; sha256="1cckgmbzrjafvql17c94y1h812v2hplv1p7p9kalcg13nzd45inx"; depends=[sp]; };
+  camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; };
+  cancerTiming = derive { name="cancerTiming"; version="1.0.0"; sha256="08m50bsl2cxmkdbx2p9b5cwxkmgn2jhfz9dnc1k9kisy6l9s5p5h"; depends=[LearnBayes]; };
+  candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; };
+  cape = derive { name="cape"; version="1.2"; sha256="01bh8lngp346w6pjvbw4jllbr8f9f8ypsxv6c9p6zv5l7w5yzri8"; depends=[corpcor evd qpcR Matrix igraph fdrtool]; };
+  caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
+  capm = derive { name="capm"; version="0.4"; sha256="1vy1vilm1qiwshf28kb7dr60vglqn4gga595plirbfhs0ccay4x9"; depends=[deSolve FME survey ggplot2 reshape2 shiny rgdal maptools sp]; };
+  capme = derive { name="capme"; version="1.3"; sha256="0d4acwp4y8djcry8gr34dx3h8bn8sj3z2di5zl9657czw5289zm8"; depends=[lpSolve]; };
+  capushe = derive { name="capushe"; version="1.0"; sha256="0dwxaiqnz0qbsk4icjapklaa9bpjfl4gqvk1f92livy97jmf1r44"; depends=[MASS]; };
+  capwire = derive { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
+  car = derive { name="car"; version="2.0-20"; sha256="0dbq3ndw9srrf7pp7wl8gj7cwcgggnjh4i6c9aqmrap7wnaa14fb"; depends=[MASS nnet]; };
+  CARBayes = derive { name="CARBayes"; version="3.0"; sha256="0wflay6k159cw8149qb4ib1mlpsbgddlbkiyfxd4qz3vwl06dg3q"; depends=[MASS Rcpp truncdist spam coda]; };
+  carcass = derive { name="carcass"; version="1.1"; sha256="09cg6ba44k0i7v7d380nl5vy7cvmpjjl6zab8sscqql5c2nm0lxk"; depends=[arm survival]; };
+  cardidates = derive { name="cardidates"; version="0.4.5"; sha256="1zw8c8jiq8bz748xppwj88z1882qk7k2r0k2gkrsvw7b6c9h35pb"; depends=[boot pastecs]; };
+  care = derive { name="care"; version="1.1.4"; sha256="0x2496r57h03m53gqmcmbjv7n04bl08si97ff29k6q50jxd1v8hy"; depends=[corpcor]; };
+  CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
+  caret = derive { name="caret"; version="6.0-24"; sha256="1d56z7bik5ry8iglys4ha1mpkc11g93nm0m15107c44shfi56d3v"; depends=[lattice ggplot2 car reshape2 foreach plyr]; };
+  caribou = derive { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
+  caroline = derive { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; };
+  CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; };
+  CARrampsOcl = derive { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[OpenCL fields]; };
+  caschrono = derive { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; };
+  cat = derive { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
+  catdata = derive { name="catdata"; version="1.2"; sha256="0907sr7kjlr47sxaxvkk3za5j2rn6zvckkgjc9inr5hrn5nv5hsv"; depends=[MASS]; };
+  CatDyn = derive { name="CatDyn"; version="1.0-5"; sha256="1syc40256104nm8n7h5b7w3ia2iya0y47p1sdxk8g1dy4l5wnalm"; depends=[optimx BB]; };
+  catenary = derive { name="catenary"; version="1.1"; sha256="0khdk61fh8ngr70qf9i2655h5nblj98r8zl724ljv1cjb5x1vphv"; depends=[ggplot2 boot]; };
+  catIrt = derive { name="catIrt"; version="0.4-1"; sha256="1rrvm954sfsrl978kb47fv6pr9rczrb8n1ffhh71qjhj1bka35vb"; depends=[numDeriv sfsmisc]; };
+  catnet = derive { name="catnet"; version="1.14.3"; sha256="099vxi3fy5y4w635mqmbzsyqiswsw76kz3l5vgg8ckrj1cqshh5z"; depends=[]; };
+  caTools = derive { name="caTools"; version="1.17"; sha256="00jgbna2dm99y5hwk3y28ng2w2c0vxrx4rlz6mhd15z4lsdx1ys6"; depends=[bitops]; };
+  catR = derive { name="catR"; version="3.0"; sha256="1qi5qp6s3xclm1wiid48lnyllax0lns8dxmrvssp04v30j19zwml"; depends=[]; };
+  catspec = derive { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
+  CausalGAM = derive { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; };
+  causalsens = derive { name="causalsens"; version="0.1"; sha256="1v72zjplsa073f92qdza1zvwa1fwxlpmh8f6w5z8qcyiwqcbmifr"; depends=[]; };
+  Causata = derive { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[XML R_utils rjson RMySQL RCurl stringr yaml boot foreach data_table glmnet ggplot2]; };
+  cba = derive { name="cba"; version="0.2-14"; sha256="067rm1rfz0rrq8xkzibd81pwvc9rx7ki46bncim4j5ra6i9pn24n"; depends=[proxy]; };
+  CBPS = derive { name="CBPS"; version="0.8"; sha256="0a619sgr4iv66y16a7bfywxhniaxsrixr6pqwn88hj0j0k5b312i"; depends=[MASS MatchIt nnet numDeriv]; };
+  CCA = derive { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
+  CCAGFA = derive { name="CCAGFA"; version="1.0.3"; sha256="1qicxrrwwd9il894v11lmmf4i88j72nyqm3z8iz9f7m17l9yiwwf"; depends=[]; };
+  ccaPP = derive { name="ccaPP"; version="0.3.0"; sha256="1wj5yij02372xarhvxsnh43v0l6xb2p8rflmskw6x86vpcdqd6zw"; depends=[Rcpp pcaPP robustbase RcppArmadillo]; };
+  cccd = derive { name="cccd"; version="1.04"; sha256="0mhqv9hzvw3w6wp23kvw4py54ij6x9r19b87i97wwgqr5rhhh1f3"; depends=[igraph plotrix proxy]; };
+  ccChooser = derive { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
+  cccrm = derive { name="cccrm"; version="1.1"; sha256="0q7vxzj3lblz5ddgzm8z99k0b0z194963hx96bbkqm4rv705dgb0"; depends=[nlme gdata]; };
+  ccda = derive { name="ccda"; version="1.0"; sha256="13wxzwpld55rbpbslrgm2f7gamvkbmkaic7xrp1nn4l3lvg236dy"; depends=[MASS]; };
+  ccgarch = derive { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
+  cclust = derive { name="cclust"; version="0.6-18"; sha256="1lyk205i6q0s194r4l575l531c60kdql6p8aqhjjfkjfhczh5hq3"; depends=[]; };
+  CCM = derive { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
+  CCMnet = derive { name="CCMnet"; version="0.0-2"; sha256="1x5xjnnyr31yq9cgqfrvg71x7mmc2c54r59fv0az49njh3yg3vja"; depends=[sna network ergm]; };
+  CCP = derive { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
+  CCpop = derive { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
+  CCTpack = derive { name="CCTpack"; version="1.1"; sha256="07qqsfmd08amkh8yhfgd2g988v3q1j5p756wdjcy45cgzh5mn7d3"; depends=[R2jags rjags psych mvtnorm polycor MASS]; };
+  cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr]; };
+  cdb = derive { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
+  CDFt = derive { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; };
+  CDLasso = derive { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; };
+  CDM = derive { name="CDM"; version="3.2-6"; sha256="07vnvqzrs3zny0p2sq0df37jgiwhzrnlgw9p6dd9x9qn5m9asfm6"; depends=[mvtnorm MASS psych polycor sfsmisc Rcpp]; };
+  CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; depends=[]; };
+  CDVine = derive { name="CDVine"; version="1.2"; sha256="1qfjbzdfz2dydkfw3b0jjma4csn62177j5sgzh6rszf0nifsi97g"; depends=[MASS mvtnorm igraph]; };
+  cec2005benchmark = derive { name="cec2005benchmark"; version="1.0.3"; sha256="1fc833ji557y2vb6snlxh90gz1n7fxjfkwjmdcmasj1sfzaalsjy"; depends=[]; };
+  cec2013 = derive { name="cec2013"; version="0.1-4"; sha256="199r6b1gkay9a7v1x7v2w8xmxmafvizdyb1dkiq3qylsqvhq994d"; depends=[]; };
+  celestial = derive { name="celestial"; version="1.1"; sha256="19yxaa63px9byn5k2k2qr89f5vy73cqb5l4zq4qj1v27g06k5dy7"; depends=[]; };
+  CellularAutomaton = derive { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_oo R_methodsS3]; };
+  cellVolumeDist = derive { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[minpack_lm gplots]; };
+  cem = derive { name="cem"; version="1.1.10"; sha256="0lykr7sksii30nk4z8pvn4bdmvhm5952grrsvb63qblazg3b84qc"; depends=[nlme lattice randomForest combinat]; };
+  censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
+  censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; };
+  CensRegMod = derive { name="CensRegMod"; version="0.0"; sha256="0vfkyj2mx5l1pmcah8zilxrjlb6iign1by4ydjq8ddk1zyi242sw"; depends=[]; };
+  CePa = derive { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
+  cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; };
+  cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; };
+  CfEstimateQuantiles = derive { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
+  CFL = derive { name="CFL"; version="0.1"; sha256="1vi1iiyg7qga7knpqgf30zfzy46aqzs8digkv5933lc2xrv03ap1"; depends=[]; };
+  cg = derive { name="cg"; version="1.0-0"; sha256="1dyisisvys85zwn4hix5zsgs08qgxn75fyb6h7xvk0nvmks1md05"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
+  cgam = derive { name="cgam"; version="1.1"; sha256="1dy23ix0ll0riqpdqxhf86fmw4m8mgqmp6m1c4nyhwk2z2adxd3k"; depends=[coneproj]; };
+  cgAUC = derive { name="cgAUC"; version="1.1.2"; sha256="1y3q4hmkd6wbn4zjgclla3jif272sn4vv63ijxnfrsylzy02xhln"; depends=[]; };
+  cgdsr = derive { name="cgdsr"; version="1.1.30"; sha256="0c8n2c6gqhk5klrxmmyf77czn2zwmm1f9cbp8n8yrhdcdqminznm"; depends=[R_oo R_methodsS3]; };
+  cggd = derive { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
+  cgh = derive { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
+  cghFLasso = derive { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
+  cghseg = derive { name="cghseg"; version="1.0.2"; sha256="0nz52wlgpl9r9pa41lz7nzk35fvcn3zr0gyliiw8q1nyxl2m0q1s"; depends=[]; };
+  cgwtools = derive { name="cgwtools"; version="1.1"; sha256="11ryc20iqz0xwpq0cfjy37f6mnyrwvhf7kkf574j0v9fn6zg2jic"; depends=[]; };
+  ChainLadder = derive { name="ChainLadder"; version="0.1.7"; sha256="06jgxhjlvzcgfm7dnzd81ycf1xx7qcyvk5541qmnvniwqppfvm19"; depends=[systemfit Matrix actuar Hmisc statmod reshape2 MASS lattice tweedie]; };
+  changeLOS = derive { name="changeLOS"; version="2.1"; sha256="1bld2phnvcwfpqbkg1ycjci4i4dc4di8gjckbqjp997zyr42nnay"; depends=[survival]; };
+  changepoint = derive { name="changepoint"; version="1.1.2"; sha256="1lx52zdpva5yrnscgwziph0vk5k5mz2saz9ngfma5scxiiqfx3d8"; depends=[zoo]; };
+  ChargeTransport = derive { name="ChargeTransport"; version="1.0.1"; sha256="03xm5rzqhcr4fywrgwh8217rck120wyssxin3ahawqzxvrq3b7pv"; depends=[]; };
+  CHAT = derive { name="CHAT"; version="1.0"; sha256="0w6p5ymiancvha41xyzm61ahmz0a95wqh2kax2whb57l1cpz3ghx"; depends=[DPpackage]; };
+  CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
+  cheb = derive { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
+  chebpol = derive { name="chebpol"; version="1.3-1040"; sha256="13x6li7cs72pnhxxdigg6r9f0nay89hldzh76vp0hi0i2y9vw0dz"; depends=[]; };
+  CheckDigit = derive { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
+  cheddar = derive { name="cheddar"; version="0.1-625"; sha256="1qdxid6h7kyja0ac4v6ml2s6vw5lhrlchcz8lbf37gs9bpx6b4jc"; depends=[]; };
+  chemCal = derive { name="chemCal"; version="0.1-34"; sha256="0sn0mhp2d9a9rddfpkiv1pkrmvnv4sy18c1x2ks0lwpaklg78fbs"; depends=[]; };
+  chemometrics = derive { name="chemometrics"; version="1.3.8"; sha256="0vd5p2qhd17hr9psk6pg4jvcadz2pjffkjaffva4spa7m7qpp5ss"; depends=[class e1071 gclus lars MASS mclust nnet pcaPP pls rpart robustbase som]; };
+  ChemometricsWithR = derive { name="ChemometricsWithR"; version="0.1.7"; sha256="1mach1lxjrz4hfrlc7w1qgvmphmzky6a15gxn8n0hcxk3v3m90jw"; depends=[ChemometricsWithRData MASS pls]; };
+  ChemometricsWithRData = derive { name="ChemometricsWithRData"; version="0.1.3"; sha256="10zhvr2bfl5d2g27bpxvygkm83lh8qjylfi627jmpcplvvifxb01"; depends=[]; };
+  chemosensors = derive { name="chemosensors"; version="0.7.7"; sha256="1yi0d69nxknca3k7pnxppgjaqyzlc1ksxaa7w31favq0xbdw508n"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
+  ChemoSpec = derive { name="ChemoSpec"; version="1.61-3"; sha256="1309jsib5gckhpaxs63yp6m0ia97jvzv2lr398f89xbwi81zg8va"; depends=[pls amap chemometrics robustbase RColorBrewer plyr pcaPP mvtnorm mvoutlier rgl R_utils mclust MASS baseline IDPmisc gsubfn lattice seriation]; };
+  cherry = derive { name="cherry"; version="0.4-9"; sha256="018jmmjx30jb85w4729pkwp66napbx9bxn8d1zjslwn14930xbrm"; depends=[bitops]; };
+  chillR = derive { name="chillR"; version="0.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; };
+  chipPCR = derive { name="chipPCR"; version="0.0.6"; sha256="14rq39nn3k5xak6jvnrwgf2r6nwy435bzkin4a1b9mp7iq3dmb56"; depends=[qpcR outliers robustbase signal]; };
+  CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; };
+  ChoiceModelR = derive { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
+  choplump = derive { name="choplump"; version="1.0-0.3"; sha256="10nkkcmpay4rcqbkdhlksnxqb177j5bjpsffyy6q5dbl7nf7whx1"; depends=[]; };
+  chords = derive { name="chords"; version="0.67"; sha256="0dj9bbl5abdvvfrn17xxnrnrlvdxw4m841ds37a6pf8dzprs1gdv"; depends=[]; };
+  choroplethr = derive { name="choroplethr"; version="1.4.0"; sha256="1fcbrbql6n6xv3gxiq0sl0lf7swgrsyhbzbwdmx4lnw4v2bn5cka"; depends=[ggplot2 scales plyr Hmisc acs stringr]; };
+  chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; };
+  chron = derive { name="chron"; version="2.3-45"; sha256="0jkanbisi1bxh35rg0i6sl82f8r9v8va8mf8hknfvwv7p7n3ddpx"; depends=[]; };
+  CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; };
+  CIDnetworks = derive { name="CIDnetworks"; version="0.2.5"; sha256="0ldpgf370rpylrqp3lbxs6r2x1047y6bxqm40a7yq04i6mg0zwh3"; depends=[mvtnorm msm Rcpp igraph]; };
+  CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
+  cimis = derive { name="cimis"; version="0.1-7"; sha256="002drrilp6hi6zpr6wn3dm4sg1pakszw7piydaas0jqsz6qz3n79"; depends=[XML RCurl]; };
+  cin = derive { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
+  CINID = derive { name="CINID"; version="1.0"; sha256="0xa9zbd578ac5gc2mm7k5yisw5sx8x259c5gwyy6frpkldhbwldn"; depends=[]; };
+  CircE = derive { name="CircE"; version="1.0"; sha256="1fik612iggqv9hvp9nmpx0h6g6s6vfk99z8anvqkk5ify5690g1x"; depends=[]; };
+  circlize = derive { name="circlize"; version="0.0.7"; sha256="1ps6cpir6b8pshqmiwqz5nj620h0i0nq7bk3kmcfmvz1mdszhivf"; depends=[]; };
+  CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; };
+  CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
+  circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
+  cit = derive { name="cit"; version="1.2"; sha256="1mk3bgac8qhc48vm0z8fhygsrrd5mqznyblbfv03y4rjiyh7f2qs"; depends=[]; };
+  CITAN = derive { name="CITAN"; version="2011.08-1"; sha256="1viv2iha6hcghh4iy4ndnbrnhcdrjixk837v78w43mdcmrkjh3rb"; depends=[DBI RSQLite RGtk2 hash ADGofTest]; };
+  citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
+  citccmst = derive { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
+  CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
+  Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.02"; sha256="1r7zxvrcn8lg8i74fnjr7mqcnhc0y5lsxy1zch1bhbrnbr19sgq5"; depends=[]; };
+  cladoRcpp = derive { name="cladoRcpp"; version="0.14.2"; sha256="0gb8j991dxnyrfwqvcb2vcs8dhmsd8777w00r8gqcxx2yx8civvw"; depends=[Rcpp RcppArmadillo]; };
+  CLAG = derive { name="CLAG"; version="2.18.1"; sha256="0y8m6m01vw3rxwrmxvwhpiy6dd2snr0lhb026l1494y43hhqi3wy"; depends=[]; };
+  class = derive { name="class"; version="7.3-10"; sha256="0yb1y2xnybr7mbpz9lgqcbkfwh9kki3qvkxhdxj33fsyb9c5mydr"; depends=[MASS]; };
+  classGraph = derive { name="classGraph"; version="0.7-4"; sha256="08cid5bdbciyijlzkx3684gx0cyzcj8myawf4dhcrz00jqrg8v60"; depends=[]; };
+  classifly = derive { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
+  classify = derive { name="classify"; version="1.2"; sha256="1c1919phhn3xlm807408hhryy1ifm8vf68zcb0gj3adiczpj5xcy"; depends=[Rcpp plyr ggplot2 lattice R2jags reshape2]; };
+  classInt = derive { name="classInt"; version="0.1-21"; sha256="1sld7bw1x2i8qqj0fbavifl9ni8724fg2wrwjyg657ib8f2yqj5z"; depends=[e1071 class]; };
+  clere = derive { name="clere"; version="1.1"; sha256="1jna5dqy47mldd557qxl7vr59v5lalhligvm3c4k6b2dfararhfr"; depends=[Rcpp]; };
+  clhs = derive { name="clhs"; version="0.5-1"; sha256="09165qcnlwz6aaafq4lzzpm7id15wgfbz3am9gfp2g5fyh0irsr2"; depends=[ggplot2 sp raster reshape2 plyr scales]; };
+  ClickClust = derive { name="ClickClust"; version="0.1.1"; sha256="1mgim5z4j0lmjlazqqigc88r41ciqnz9d49irm9b2bdjwg2rpilw"; depends=[]; };
+  clickstream = derive { name="clickstream"; version="1.1.0"; sha256="0ak1avqaipxnz8g261346i1wki7vf4hiaj2n5krr85ay7rv4gnym"; depends=[igraph plyr reshape2 Rsolnp]; };
+  climdex_pcic = derive { name="climdex.pcic"; version="1.1-1"; sha256="1payygvw327qjab9vzivqd21f5w0gwq3f2jjpmkk89fn7rznz7y2"; depends=[PCICt caTools Rcpp]; };
+  clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
+  clinfun = derive { name="clinfun"; version="1.0.5"; sha256="1498xxyc1j59fr8p6nskhphk558s7dd6p5gvdq24frmlx6nagxd6"; depends=[mvtnorm]; };
+  clinsig = derive { name="clinsig"; version="1.0-4"; sha256="0w2qb9k6fkw9lqi0ib6kzi6pvpb5hpq78w9x2jjs0yyqsj0rydwv"; depends=[]; };
+  clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
+  clogitL1 = derive { name="clogitL1"; version="1.3"; sha256="0bf1x0q3svw286jc8yyjfyqlb1rpvbylksyhwh0ik1v9wp808fqq"; depends=[Rcpp]; };
+  cloudUtil = derive { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
+  clpAPI = derive { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
+  CLSOCP = derive { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
+  clue = derive { name="clue"; version="0.3-48"; sha256="1lwfm5sk9d35khcrvjs91bixfnjc3zwyfzq5ma9ljsc6hs80y8ar"; depends=[cluster]; };
+  cluster = derive { name="cluster"; version="1.15.2"; sha256="0bv7qsbf6x3gq2iz3rwbjsj3cs8j0dvzxjhwdsvnqgkc1yhpkr13"; depends=[]; };
+  clusterCrit = derive { name="clusterCrit"; version="1.2.3"; sha256="0xd06w7jsl3srvhqx08vywy191k97lk3mgl2hsx1ki8ydplrdyha"; depends=[]; };
+  cluster_datasets = derive { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
+  clusterfly = derive { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[rggobi e1071 reshape2 plyr RGtk2]; };
+  clustergas = derive { name="clustergas"; version="1.0"; sha256="1vf4czpwk71yxd26vm5sal0ml20ssjrq4bmk31yzxydpxn495fg8"; depends=[cluster]; };
+  clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; };
+  clusterGenomics = derive { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; };
+  clusterPower = derive { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; };
+  clusterRepro = derive { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; };
+  clusterSim = derive { name="clusterSim"; version="0.43-4"; sha256="12ngcfh68ck7511yrc9agjnxwbxz52zddmvp8xyayxj8j7qnkk91"; depends=[cluster MASS ade4 e1071 rgl R2HTML]; };
+  clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
+  clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; };
+  ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
+  clustrd = derive { name="clustrd"; version="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
+  clustsig = derive { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
+  ClustVarLV = derive { name="ClustVarLV"; version="1.2"; sha256="0831nrid4wv99p35zinhfcnr2kgh4rmgg3vq62rzvcabsq9l825r"; depends=[Rcpp]; };
+  clustvarsel = derive { name="clustvarsel"; version="2.0"; sha256="0ql98r2aqwfmbn48xd68wpi2lk671aj2l8dqjn0jjp1vrk9fbw1m"; depends=[mclust BMA foreach iterators]; };
+  clv = derive { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[cluster class]; };
+  clValid = derive { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[cluster class]; };
+  cmaes = derive { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
+  CMC = derive { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
+  CMF = derive { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; };
+  cmm = derive { name="cmm"; version="0.7"; sha256="16pw9namrc3crcqnsn4ckk8m4r3af908wm2siw6fzbk6hwac17i6"; depends=[]; };
+  CMPControl = derive { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; };
+  cmprsk = derive { name="cmprsk"; version="2.2-6"; sha256="0ln72h57icsch967hm398bilv13zf9jxjal2zfsa0rv0cishw8qd"; depends=[survival]; };
+  cmrutils = derive { name="cmrutils"; version="1.2-2"; sha256="0gc4sx8g9364sybmrqdjdvddqjd9ps6v205kaw0nqdx30xn96hmm"; depends=[chron]; };
+  cncaGUI = derive { name="cncaGUI"; version="0.0-2"; sha256="1rgs7446qb40b4qi1i4m5c3111kbqap4z1g7s01pnbylil0m80fd"; depends=[rgl tcltk2 tkrplot]; };
+  CNprep = derive { name="CNprep"; version="1.0"; sha256="1i8iz0ir14g56zjsj8z4kmds5rybg8jjra33v0qcjwp489s6475a"; depends=[mclust rlecuyer]; };
+  CNVassoc = derive { name="CNVassoc"; version="2.0.1"; sha256="0xf5rrcv7pl158fbz0yjibmrigpqgzwvdyl1gw0fkn5jjsm62hsm"; depends=[CNVassocData mixdist mclust survival]; };
+  CNVassocData = derive { name="CNVassocData"; version="1.0"; sha256="17r3b1w9i9v6llawnjnrjns6jkd82m2cn9c90aif8j0bf4dmgdli"; depends=[]; };
+  coalescentMCMC = derive { name="coalescentMCMC"; version="0.4"; sha256="115kvrk46hzhr83vkk57jn90dw2fvj1pl56w6mlja16i93yaz10h"; depends=[ape coda Matrix phangorn]; };
+  coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
+  COBRA = derive { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; };
+  cobs = derive { name="cobs"; version="1.2-2"; sha256="1g8qwnda7fqrqknz7lnlq47kqs5k83pg9qq205alm12jgx3180a1"; depends=[SparseM quantreg]; };
+  cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
+  CoClust = derive { name="CoClust"; version="0.2-9"; sha256="0qzvbyv7p7gi4pmvgwc1zc164d4cph20sy8ypgskx2pli2n3lh0d"; depends=[copula gtools]; };
+  cocor = derive { name="cocor"; version="1.0-0"; sha256="173kszv661hailav69khqh9c15y9m5n6l7crc9i6vf71yrig1vqs"; depends=[]; };
+  cocorresp = derive { name="cocorresp"; version="0.2-1"; sha256="0q41clhp4nl9vyakfmnhr5ix7nxfq0phq8xa02na38qhfwpxznfn"; depends=[vegan]; };
+  cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
+  coda = derive { name="coda"; version="0.16-1"; sha256="0575pbx37jn7ljgjybl2v7rry55l6s6cb3a0m9znh4blln405q4i"; depends=[lattice]; };
+  codadiags = derive { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
+  codep = derive { name="codep"; version="0.2-2"; sha256="1knl6hrqf98lslgn3hvafxpwvrzcy4fjdw0gg44dixcynv08rncr"; depends=[]; };
+  codetools = derive { name="codetools"; version="0.2-8"; sha256="0m326kfxihm5ayfn5b4k8awdf34002iy094gazbc3h0y42r4g86b"; depends=[]; };
+  coefficientalpha = derive { name="coefficientalpha"; version="0.2.6"; sha256="0a0fvg22sg3idavv2qrb9sjvjjfm39fvpjsxz83a7bk6400vflsr"; depends=[MASS]; };
+  coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr reshape2 useful scales proto]; };
+  coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
+  CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; };
+  coin = derive { name="coin"; version="1.0-23"; sha256="07433fblandxb8gzkzln49cckv75mqr2z847dwsa3qz68callxba"; depends=[survival modeltools mvtnorm]; };
+  CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
+  colbycol = derive { name="colbycol"; version="0.8"; sha256="198zc4jd7gby1dhvmg7fy41ldbxkgqj6ram54g3w6sw0yv9ilk8r"; depends=[rJava filehash]; };
+  cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; };
+  CollocInfer = derive { name="CollocInfer"; version="1.0.0"; sha256="1q8bbj331iylvkvr0gqxvjnbdhncb549vlcamy0iqa9cl0gjlijv"; depends=[fda deSolve MASS Matrix spam]; };
+  coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
+  colorfulVennPlot = derive { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
+  colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
+  colorspace = derive { name="colorspace"; version="1.2-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; };
+  colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
+  colourlovers = derive { name="colourlovers"; version="0.1.2"; sha256="1mrdw10j6b6xihsh29vjqiz1jmw3h7lm77y2zcnw01g1lqb4rqlp"; depends=[XML RJSONIO png]; };
+  comato = derive { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[igraph Matrix lattice gdata XML cluster clusterSim]; };
+  combinat = derive { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
+  CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; };
+  CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
+  comclim = derive { name="comclim"; version="0.9.2"; sha256="14x9qpflprdi7j94xipndzp76bbs7cqmyhqd2cakxgnl1q915pnx"; depends=[]; };
+  commandr = derive { name="commandr"; version="0.9.5"; sha256="1i960c4hszxm10qcpn9hrhxfzxfp9yywkbj4i9hraj8ka759z75a"; depends=[]; };
+  CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-4"; sha256="0amn8z8im64q1k6j6l2bh4795b6i665wxqpgabhv471zfhdk0nil"; depends=[]; };
+  CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
+  comorbidities = derive { name="comorbidities"; version="1.0"; sha256="01aisxy4cx3jw37cg6mwvfj4nv10ndmwjxf8xsfv7s20hdb0gmqn"; depends=[]; };
+  Comp2ROC = derive { name="Comp2ROC"; version="1.0"; sha256="0vymjbxdlvm5dvss4z4zjdc7y7040s3j972gh2138wfygji1szg7"; depends=[ROCR boot]; };
+  compactr = derive { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
+  compare = derive { name="compare"; version="0.2-4"; sha256="0fhw7y7xwrv79wxvs9gy4xddjzc6hh97m81a10j64jssy4p291b6"; depends=[]; };
+  compareGroups = derive { name="compareGroups"; version="2.0.4"; sha256="1z2aipcjnqh83g33aypspwk8kkab5i2h5ms0lnnmcp3c8wn8pzi8"; depends=[Hmisc xtable gdata SNPassoc survival epitools HardyWeinberg]; };
+  compareODM = derive { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
+  CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid35pqvgiwk6h91waafigwks6n5f4pg7xxx1fifks4f"; depends=[]; };
+  comparison = derive { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; };
+  compeir = derive { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[lattice etm]; };
+  compHclust = derive { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
+  complex_surv_dat_sim = derive { name="complex.surv.dat.sim"; version="2.0.0"; sha256="1x4whyq0bds0zblppcvv7lk6qy567c37x19n1r0xjgyl3id40f7c"; depends=[eha statmod]; };
+  CompLognormal = derive { name="CompLognormal"; version="3.0"; sha256="1dhgr9l713l2n889bpa47lbg2qab0fz0r15qa928c0b9nz688ddm"; depends=[numDeriv]; };
+  compoisson = derive { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
+  COMPoissonReg = derive { name="COMPoissonReg"; version="0.3.4"; sha256="1mf2q7phc2bn700yp7i2i6ccj6lrvh8b2dmibqihh76a85j1ycrq"; depends=[]; };
+  compound_Cox = derive { name="compound.Cox"; version="1.4"; sha256="08sdkq040zk9mb1lcy4nm32gwab26vaig8brp2n3aizagx9fv3r9"; depends=[numDeriv survival]; };
+  Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
+  CompQuadForm = derive { name="CompQuadForm"; version="1.4.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
+  CompRandFld = derive { name="CompRandFld"; version="1.0.3"; sha256="1qfq1zkdxk6jh3z7vfp91c6jcvj4smq21cndxdmq150f6vsx35fl"; depends=[]; };
+  compute_es = derive { name="compute.es"; version="0.2-3"; sha256="17g1s9vz61kyqsm16vbzwmaw2qz6r99p9cg3s6c7lk73vr2qrwni"; depends=[]; };
+  ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.2"; sha256="0x3md1xfrrg41qfyafbvl9qaa6yy81nky3pl5z9qs850mjbs8qdl"; depends=[Rcpp]; };
+  concor = derive { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
+  concreg = derive { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; };
+  cond = derive { name="cond"; version="1.2-2"; sha256="0r4z8gkjqd5l9j83k23v7x2w5j7lr3kzzdrgm1fvc6sf8lb18lf7"; depends=[statmod survival]; };
+  condGEE = derive { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
+  condmixt = derive { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
+  CondReg = derive { name="CondReg"; version="0.16"; sha256="1240xspnxh9fkj35jal07rpk7q7h05cvzvpypg4wcx3gvb02askj"; depends=[]; };
+  coneproj = derive { name="coneproj"; version="1.4"; sha256="07zhqidjinpphvr7xdzrn3f5iq6bx8c2sj5gya2bz8glf4x74h9d"; depends=[Rcpp]; };
+  conf_design = derive { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
+  confReg = derive { name="confReg"; version="0.1.3"; sha256="0cwz5wnrk0qppj65gskizy2jb9y6x6xhkyb5qhd5xfc698x6ivs2"; depends=[e1071]; };
+  confreq = derive { name="confreq"; version="1.1"; sha256="14d0vlf4bwmdwayqg2fsyqblyinx1d3mqhndhjjk0d59qmr44lsa"; depends=[]; };
+  conicfit = derive { name="conicfit"; version="1.0.0"; sha256="032a9ajrv1xl2i4p3a32fyzg6s76vngdcmwqnh2lgk72srlhryzj"; depends=[pracma geigen]; };
+  conics = derive { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
+  conjoint = derive { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
+  ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
+  ConnMatTools = derive { name="ConnMatTools"; version="0.1.4"; sha256="1z9bq6npm0131msjj35mx053kb7y4xvhg5gcchs45fxk81mbv84b"; depends=[]; };
+  CONOR = derive { name="CONOR"; version="1.0.2"; sha256="1h6vx8hq8lbjdhv466q9q4h13hir1pfj6bjmg90gmqjwrpbdciw1"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr CONORData]; };
+  CONORData = derive { name="CONORData"; version="1.0.2"; sha256="0a52wz9i9md15wqvhh105wjvlw4byx7qgy9i1sd1wr4jn84ir5wf"; depends=[CLSOCP tseries outliers nortest quadprog zoo fields fpc flexclust plyr]; };
+  constrainedKriging = derive { name="constrainedKriging"; version="0.2.2"; sha256="1bza9xnzvymskxc02s8pc2xafh7sdp0mvfcn7hnjvc7ma2rmjprp"; depends=[sp spatialCovariance rgeos RandomFields]; };
+  contfrac = derive { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
+  conting = derive { name="conting"; version="1.1"; sha256="0l2chipx3a3mqj7hrb16ca4hwgxbmg3h0p2s2864l0kxq5my7n62"; depends=[mvtnorm BMS gregmisc tseries coda]; };
+  contrast = derive { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
+  ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
+  ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.0"; sha256="1s6yxiaxmv7yxydwjhxi778vznh4gs8l5cgy308bxj53d4d6kfkz"; depends=[tkrplot lattice]; };
+  convexHaz = derive { name="convexHaz"; version="0.2"; sha256="0lfksb01iilhyjbr9wj3w4s9nbkdcl649w86fp2mz6s6makmq84x"; depends=[]; };
+  cooccur = derive { name="cooccur"; version="1.0"; sha256="12h8bfy5gml47g6b151cynvybh3w8a3swq6l9563qsiq67hivn44"; depends=[reshape gmp ggplot2]; };
+  COP = derive { name="COP"; version="1.0-2"; sha256="1gynknplvx97hjhi7adsgq9r9lqismch1q1pqvgmz0x1wkg4jj40"; depends=[dr MASS]; };
+  copas = derive { name="copas"; version="0.8-0"; sha256="08c645n4pp077nh7c6b099bpw4vkkz02w0nsm6rrks7kx1kzd3yd"; depends=[meta]; };
+  copBasic = derive { name="copBasic"; version="1.5.4"; sha256="1za91mkahkrcg4h54ii2zk3c22rn8krsa95aj9y0kgg3rxnd09hz"; depends=[lmomco]; };
+  copula = derive { name="copula"; version="0.999-8"; sha256="12l0qd4ny9s5j88wggd09r6n3lv17zdf46brl5v7v83rnbd0c27l"; depends=[Matrix gsl ADGofTest stabledist mvtnorm pspline]; };
+  copulaedas = derive { name="copulaedas"; version="1.3.1"; sha256="1prmj3z5znifd2mqq7s9z566fbskrcjx0ly43dcvjc9mb6fpq34p"; depends=[copula vines mvtnorm truncnorm]; };
+  CopulaRegression = derive { name="CopulaRegression"; version="0.1-4"; sha256="17cfs47g5am0gf6kv366v87zv2gcmc7s7bcay4ccfqzqhbhli2i4"; depends=[MASS VineCopula]; };
+  CopyDetect = derive { name="CopyDetect"; version="1.0"; sha256="013h9p3fz8dp8f54ddcr6q9nh76ayg6cwmx3ycv5cxmdyd9nz1y8"; depends=[irtoys]; };
+  corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; };
+  corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
+  CORE = derive { name="CORE"; version="1.2"; sha256="0r63fyrxx2dkjnr2pdciw3a93zzhmvr75z7xd6grxp1ay3brq78n"; depends=[]; };
+  CORElearn = derive { name="CORElearn"; version="0.9.42"; sha256="19lp1vzqc68ns10bjvsbk2d8v349pya3f6pn9a89w1q0ihp705fm"; depends=[cluster rpart]; };
+  corHMM = derive { name="corHMM"; version="1.13"; sha256="0g2qhk4j6dhpigypxvbm7kib0brdrfi13ssrj1s3mccm1qaf3j79"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; };
+  CORM = derive { name="CORM"; version="1.0.1"; sha256="1srkca74c1k3q7xqrr5h9909pl5ydlhb1v79g2z9vvljwi3bz7n0"; depends=[cluster]; };
+  corpcor = derive { name="corpcor"; version="1.6.6"; sha256="0rjlqbh76f5q3sjbh9nhvsip9391mnh05x5f7cqi6rp63c194v12"; depends=[]; };
+  corpora = derive { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; };
+  CorrBin = derive { name="CorrBin"; version="1.4"; sha256="0xnj2rhm4ph9277v2wfrp15p8nbdxiqfpcj0shj0d9z8rasx7p8m"; depends=[boot combinat]; };
+  CorReg = derive { name="CorReg"; version="0.14.3"; sha256="02r7mw7wr4mhmg3ng06mmv6a6iplr4knvdlcz8xp91fb6v3jd52c"; depends=[Rcpp lars elasticnet clere spikeslab corrplot Matrix mclust Rmixmod ridge rpart MASS parcor]; };
+  correlate = derive { name="correlate"; version="1.0"; sha256="0hv0i928f49p8n78hd3bcx923l2x0zcs4kwj71ph8gm7s8540fhc"; depends=[]; };
+  Correlplot = derive { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
+  corrgram = derive { name="corrgram"; version="1.5"; sha256="015h4vnbmjir81x9ifqbnl25havpi8m7p3iaj30rl1hdhhbpy0dz"; depends=[seriation]; };
+  corrplot = derive { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; };
+  corrsieve = derive { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
+  corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
+  COSINE = derive { name="COSINE"; version="2.0"; sha256="0awn4xsfi3a2cifynivr38wh9x8ps17fij8kfd74p6fvy647d1b5"; depends=[MASS genalg]; };
+  cosmoFns = derive { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
+  cosmosR = derive { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; };
+  cosso = derive { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[quadprog Rglpk glmnet]; };
+  costat = derive { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
+  cotrend = derive { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
+  COUNT = derive { name="COUNT"; version="1.2.3"; sha256="0h3d5w93izh9nv97qxjqlv8igydvq6559ln9hj4j2hhp6pwc4n8l"; depends=[MASS]; };
+  countrycode = derive { name="countrycode"; version="0.16"; sha256="1yhab0i0ag3b1r257i1yldr9y3j236x2vlgnhnhzkwm3mz7n7lgm"; depends=[]; };
+  CountsEPPM = derive { name="CountsEPPM"; version="1.0"; sha256="19l0nb1rrhqcxcjx4lrp298xgxprziz1ccl3r1q3h16yj5vhkqrw"; depends=[Matrix Formula]; };
+  covLCA = derive { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
+  covreg = derive { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
+  covRobust = derive { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
+  CovSel = derive { name="CovSel"; version="1.0"; sha256="14z58mrvv7c9y3vmzzyfijyxhqkb4q30w6n5fmnzvrjx5ipp6wss"; depends=[MASS dr np boot cubature]; };
+  covTest = derive { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[lars glmnet glmpath MASS]; };
+  CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; };
+  coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48q9i7hdppn1k528nfca5ikw2l37h9"; depends=[survival bdsmatrix nlme Matrix]; };
+  coxphf = derive { name="coxphf"; version="1.10"; sha256="15bpy6vcn65pnknqbiqhpbpddhzyslgsc06g8rnamg60akg4p3v8"; depends=[survival]; };
+  coxphw = derive { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
+  CoxRidge = derive { name="CoxRidge"; version="0.9.1"; sha256="11vlsrv03j6kcxq9an7g210nq6cc6qd04b7w0pfbdk4bniqc0k60"; depends=[survival]; };
+  coxrobust = derive { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
+  cpa = derive { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
+  cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
+  CPE = derive { name="CPE"; version="1.4.4"; sha256="09sqp2a0j43jr9ya9piv8575rwd5fdvwmiz4chv75r3mw8p128mn"; depends=[survival rms]; };
+  CpGassoc = derive { name="CpGassoc"; version="2.11"; sha256="01hx9flf4mq1kgg77dah7s33kdkdgnmckppcl1y806xsnxqxmrxq"; depends=[nlme]; };
+  CPHshape = derive { name="CPHshape"; version="1.0.1"; sha256="05krqcd4spgghp3ihv1zfql6ikd64vkqnrjghjvfki3hi3zi5k7h"; depends=[]; };
+  cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
+  cplexAPI = derive { name="cplexAPI"; version="1.2.9"; sha256="1j5hh1f6sxvhavi4j8cz3kycv85whipky3w007s3hxmxlxh4jlgb"; depends=[]; };
+  cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie]; };
+  cpm = derive { name="cpm"; version="1.1"; sha256="173lxjnp19h6nfy578y3jh6bgwf2lyqj57gqiyb7n11qw52visdn"; depends=[]; };
+  CPMCGLM = derive { name="CPMCGLM"; version="1.1"; sha256="1w8yp37vxz2cl0yqdzpyxdfq2scz2h9i4crjzjmjzpzffi45f06s"; depends=[mvtnorm plyr]; };
+  Cprob = derive { name="Cprob"; version="1.2.2"; sha256="18dzyfgxx32azmb02i1gr0fb6nq1b81wni9cgj3qgw8ga7lplgik"; depends=[prodlim tpr geepack lgtdl lattice]; };
+  CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; };
+  CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
+  crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
+  cramer = derive { name="cramer"; version="0.8-1"; sha256="16cn457f9ly1wm3hsx930rw5arywngn2mhhkmcmhdh9jmdkzsbn3"; depends=[boot boot]; };
+  crank = derive { name="crank"; version="1.0-5"; sha256="1zy0z308kw0qgyppkm66p8vqw5b1qcn5avhm78zh0r9k60069dm5"; depends=[]; };
+  crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
+  crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
+  crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
+  crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
+  CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
+  CRF = derive { name="CRF"; version="0.3-6"; sha256="0hv5mc2w9gr4ykycp4s5xfq97zrz480hkyfp9s7mi2hqnjhj1c0p"; depends=[Rglpk]; };
+  crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
+  CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
+  crmn = derive { name="crmn"; version="0.0.19"; sha256="0gja9a2nk328hxali15kc2za32dgbjfznxh08yka6qf6jc6jx9g1"; depends=[pls]; };
+  crn = derive { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
+  crossdes = derive { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
+  crossmatch = derive { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[survival nbpMatching]; };
+  crossval = derive { name="crossval"; version="1.0.1"; sha256="1xdl6cmmfkl46arbm71jhdsscjknclvsiaysijlp2p4vgw2762pa"; depends=[]; };
+  crp_CSFP = derive { name="crp.CSFP"; version="2.0"; sha256="0ji208hn3zimql0xhy8bl7w0vg40szw28fia7k1f7g9z0wbl9xqp"; depends=[MASS]; };
+  crqa = derive { name="crqa"; version="1.0.4"; sha256="05sp7dbi89wanhjlrbqb3ms9gl7s1h1iww26s4iy84i0pr0wg7br"; depends=[Matrix tseriesChaos fields]; };
+  crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
+  crrstep = derive { name="crrstep"; version="2014-01.08"; sha256="1ak52nf4rabgdd8dpgpcnyn4lw04hgmf6qkd8d224pkgqmmpr80d"; depends=[cmprsk]; };
+  crs = derive { name="crs"; version="0.15-22"; sha256="0mwaixjbjv3g7r9prd0vv99gwfkx3ifkl9f1lklzivchmsdkgpyv"; depends=[boot]; };
+  CRTSize = derive { name="CRTSize"; version="0.3"; sha256="0m7dc29p2vdpcgji4k4yrpmhv29b7n9i2n6qz6fm19jb2byqsrr5"; depends=[]; };
+  CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; };
+  csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
+  cSFM = derive { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[sn mgcv mnormt MASS moments]; };
+  cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
+  cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
+  csound = derive { name="csound"; version="0.1-1"; sha256="0d4bad8qld29k0yavg7f2srljnbax0gj53dljqw1b1z7shyqd1n5"; depends=[rdyncall]; };
+  CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; };
+  csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
+  cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
+  CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
+  ctv = derive { name="ctv"; version="0.7-9"; sha256="16x9fb0mzclfhnm0n3b66n7wr8447fp2p39vrqs5xw3vsyxf46xg"; depends=[]; };
+  cubature = derive { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
+  Cubist = derive { name="Cubist"; version="0.0.15"; sha256="1z4iyd7kgqy0cq58n7id4kygcilyyzb21kqg5svajibqgmminlsz"; depends=[lattice reshape2]; };
+  cudaBayesreg = derive { name="cudaBayesreg"; version="0.3-15"; sha256="02akp2ib06hqb1vfqj27vj4y5m0pimy6qg69argq6g0bz5msrgp8"; depends=[cudaBayesregData oro_nifti]; };
+  cudaBayesregData = derive { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
+  cudia = derive { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
+  CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
+  cumplyr = derive { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
+  cumSeg = derive { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
+  currentSurvival = derive { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[survival cmprsk]; };
+  curvetest = derive { name="curvetest"; version="2.2"; sha256="1lz6rx9fmgyrlci1dyanscp2a18ki9lhrwnrzhp062flysffimg6"; depends=[locfit R_oo R_methodsS3]; };
+  curvHDR = derive { name="curvHDR"; version="1.0-3"; sha256="0rq72prxv2r5nicss9mh4wpkfjvlbb885w85ag4qrqijzq6y8q04"; depends=[feature geometry hdrcde ks misc3d ptinpoly rgl]; };
+  cusp = derive { name="cusp"; version="2.2"; sha256="0c8hxsvvp2p86jwcbx1rzs6i8w2mh3dnsfmfkwpq9x28aps3dmd5"; depends=[]; };
+  cuttlefish_model = derive { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
+  cvAUC = derive { name="cvAUC"; version="1.0-0"; sha256="1z8l2ivv7h8din6q46ds3gnlsff10l4ry2kavqv9qsl4xkd8rim0"; depends=[ROCR]; };
+  CVcalibration = derive { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; };
+  CVD = derive { name="CVD"; version="1.0.0"; sha256="1lqx3rrq4abm7rxc6c9zlw0sc6flc6mll4xgfnasfrkai82kaf44"; depends=[]; };
+  cvplogistic = derive { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; };
+  cvq2 = derive { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
+  CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pwkaqq394awdlswykz3qlyzx4zx2"; depends=[kernlab Matrix]; };
+  CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; };
+  cvTools = derive { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase lattice robustbase]; };
+  cvxclustr = derive { name="cvxclustr"; version="1.0.0"; sha256="13fmm18507787njyscbs2wzijxq37a2yxqqzbmpdhgqa0jriq64z"; depends=[]; };
+  cwhmisc = derive { name="cwhmisc"; version="4.0"; sha256="1lvq2mcbdr38nzbx344c2y9ayi3lv9fkzwwf0l2jzan9s2sppxx2"; depends=[lattice]; };
+  cwm = derive { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
+  cxxfunplus = derive { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
+  cycloids = derive { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
+  cyphid = derive { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
+  cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; };
+  d3Network = derive { name="d3Network"; version="0.4.2"; sha256="0sfl1c3ddjrzm8b52vkq85qc4lzr9d2hkln5ism78kr42njvq3ah"; depends=[plyr rjson whisker]; };
+  DAAG = derive { name="DAAG"; version="1.20"; sha256="05jlsrs0frk9ky20h17c5vj9d4j28c9n0a1jww5lssacimn1d4x5"; depends=[lattice latticeExtra]; };
+  DAAGbio = derive { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[]; };
+  DAAGxtras = derive { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; };
+  dae = derive { name="dae"; version="2.1-7"; sha256="0wchpq8hg2s33nm86dj6vqqvajg2062gbrxg6z7n9i2r6s1hmdjv"; depends=[lattice]; };
+  daewr = derive { name="daewr"; version="1.0-10"; sha256="09ra3zkmvxdxn0fvrbzixvvgddb066bba9q5zih5kifc8kd0a5xp"; depends=[FrF2 BsMD]; };
+  dafs = derive { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
+  DAGGER = derive { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Rglpk quadprog Matrix]; };
+  dagR = derive { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
+  Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
+  DAKS = derive { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
+  DALY = derive { name="DALY"; version="1.2.0"; sha256="1r4hdd79alphdk70z3g08nvw9cm0403h2bb9b7nn0mhm1l2yrk75"; depends=[]; };
+  DAMisc = derive { name="DAMisc"; version="1.2"; sha256="1fkp21inpgfr5lfid8wmajlcsqbnrgl5c35j0863sywvz6gamgc2"; depends=[car effects lattice sm MASS nnet pscl gdata xtable]; };
+  DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
+  darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[futile_logger ff]; };
+  darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
+  DatABEL = derive { name="DatABEL"; version="0.9-4"; sha256="11hdzndni7jaa5m42g8vmqk2s3armi7p5aiw7mh0fxzmwya1h32j"; depends=[]; };
+  datacheck = derive { name="datacheck"; version="1.0.0"; sha256="03lms1m3g1rc6jj224hzzbv975xkdd0jsm602zn74j73i227fvmz"; depends=[Hmisc stringr shiny testthat xtable]; };
+  DataCombine = derive { name="DataCombine"; version="0.1.24"; sha256="0vrs25554m9nzlqb0bg488ylb5nabb8aq8wh6q4xf81zsbz7imi8"; depends=[data_table forecast dplyr]; };
+  dataframes2xls = derive { name="dataframes2xls"; version="0.4.5"; sha256="0lfdp87k0yypwvnsr7803ylzqfy51l37zgwy9zn5nb6n30p588fv"; depends=[]; };
+  datalist = derive { name="datalist"; version="0.2"; sha256="0q82wira0sfi63cn66f5cfyd15f19ig7pbmpk56j38a3115l2fmn"; depends=[assertthat]; };
+  datamap = derive { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
+  datamart = derive { name="datamart"; version="0.4.2"; sha256="1khhjva0kpl4j406lpn4n1bxlxk5wcmz4cbbrw71gi3bg3sxpd5y"; depends=[RJSONIO XML RCurl base64 markdown]; };
+  datamerge = derive { name="datamerge"; version="1.0-1"; sha256="03xb48igkh0f91iq6qc2j5xzqfy2n51ci5i850gn09mm9k4lxij1"; depends=[xtermStyle]; };
+  dataone = derive { name="dataone"; version="1.0.0"; sha256="0r2andiv1igygdd3rby4jqs0imhkyfyl0jzb67lc2vjgwh3m2rx0"; depends=[rJava XML dataonelibs rJava XML]; };
+  dataonelibs = derive { name="dataonelibs"; version="1.0.0"; sha256="12qp8vgdqhsfsnh06ml6lz0vvk934q4bpbg79p9l1hsnbxwnj2w6"; depends=[rJava]; };
+  dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
+  data_table = derive { name="data.table"; version="1.9.2"; sha256="1fchjg939av89m0zsv85w2xcc8qriwkskk0mcsqy8ip6pcfnlg66"; depends=[reshape2]; };
+  datautils = derive { name="datautils"; version="0.1.4"; sha256="0adg87p9rzz62cm0s80x71mhsg3yfg93gskv1hs1l8gaj78zd1y1"; depends=[deldir gplots gtools]; };
+  dataview = derive { name="dataview"; version="2.0-9"; sha256="0519h2c33v04vwdd8nz9xmqha15svhxdj761d68qmi52jrw6858d"; depends=[xtermStyle]; };
+  date = derive { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
+  DATforDCEMRI = derive { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[xtable akima R_oo R_methodsS3 matlab lattice locfit]; };
+  dave = derive { name="dave"; version="1.4"; sha256="1qd01qv6nkfras92zvcdafniirvvnn6hqhcyrgh25z6bpd7pprv0"; depends=[labdsv vegan cluster nnet tree rpart MASS]; };
+  Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
+  dawai = derive { name="dawai"; version="1.0"; sha256="0vff248ldm24dk7kh2z2sj5m4g7jc5nmnlqay5j4h0gsk95fb8d5"; depends=[mvtnorm ibdreg boot]; };
+  dbConnect = derive { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[RMySQL gWidgets]; };
+  dbEmpLikeGOF = derive { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
+  dbEmpLikeNorm = derive { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
+  DBFTest = derive { name="DBFTest"; version="1.0"; sha256="0h83ic16z0lg7grjh4jbrxf672qchqv4zzypm2b1mhmzl01jn1wg"; depends=[]; };
+  DBGSA = derive { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
+  DBI = derive { name="DBI"; version="0.2-7"; sha256="1qxmcgswrbisvzmaz2s6bcfbh3lb2hmizjxaqkan147r823rh2p9"; depends=[]; };
+  DBKGrad = derive { name="DBKGrad"; version="1.5"; sha256="0k0bl680ynblbla5k9fndh5x7a6f8jyr402a7dg9cjnhhw5q7bxc"; depends=[minpack_lm SDD TSA lattice]; };
+  dblcens = derive { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
+  dbmss = derive { name="dbmss"; version="2.1.0"; sha256="051q1b0srfiv983938fvhhr74ca8i921s1mg9dvqm716syxqic8z"; depends=[spatstat Rcpp cubature]; };
+  dbstats = derive { name="dbstats"; version="1.0.3"; sha256="1l7yy6m98pkkrzycxcajjjw2h0crbm0fazyq9xg8875ar29i291p"; depends=[cluster pls]; };
+  dcemriS4 = derive { name="dcemriS4"; version="0.51"; sha256="14ir9g4jg8asim8f33wizmvj6vm96583h212yygsa6yc301bhad8"; depends=[oro_nifti]; };
+  DCGL = derive { name="DCGL"; version="2.1.1"; sha256="16jdlpl09q9pcymk5xxca2ba0vqv2l05wzi4ffb9ffydxpxy61j9"; depends=[igraph]; };
+  DCL = derive { name="DCL"; version="0.1.0"; sha256="1ls3x3v0wmddfy7ii7509cglb28l1ix1zaicdc6mhwin0rpp2rx3"; depends=[lattice latticeExtra]; };
+  dclone = derive { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
+  DCluster = derive { name="DCluster"; version="0.2-6"; sha256="0g7d15kq3dbrjmd5fmiwwg2b6gakz1lpsgrpkg6q89pzwlqx8xr9"; depends=[boot spdep MASS]; };
+  dcmle = derive { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[dclone rjags coda lattice]; };
+  dcv = derive { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
+  ddalpha = derive { name="ddalpha"; version="1.0.6"; sha256="1scfmq6zsbd15n6mnnplj0c4a0yl8bp7nqqh91cvvycggb5y0a1v"; depends=[MASS class robustbase]; };
+  DDD = derive { name="DDD"; version="2.4"; sha256="1fla2cm0iqmqm2pzkd49c0kswhamss5ir2f19nxydwfw017ygr3s"; depends=[deSolve ape ade4]; };
+  ddepn = derive { name="ddepn"; version="2.2"; sha256="1zwz664jq6qvf1lcwyfn6kyn6dwxhh2nnyirayx0vqs9c6xzpir7"; depends=[lattice coda igraph gam gplots]; };
+  DDHFm = derive { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; };
+  ddst = derive { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[orthopolynom evd]; };
+  deal = derive { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
+  deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
+  debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
+  decctools = derive { name="decctools"; version="0.1.5"; sha256="19k50r21mlfzh2lx3mibcqlpvrcdax61725416prqplgbdmi0bis"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
+  DECIDE = derive { name="DECIDE"; version="1.1"; sha256="1g6l2k4nmspg5y4gzxcnx58kix0br6sgmf54jlaxk69nkvdxm9xy"; depends=[]; };
+  decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
+  Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; };
+  DeducerExtras = derive { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
+  DeducerPlugInExample = derive { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
+  DeducerPlugInScaling = derive { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer psych GPArotation mvnormtest irr klaR]; };
+  DeducerSpatial = derive { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[JavaGD Deducer sp maptools OpenStreetMap scales rgdal UScensus2010 Hmisc]; };
+  DeducerSurvival = derive { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; };
+  DeducerText = derive { name="DeducerText"; version="0.1-1"; sha256="080mbjqm6vf9c6ddk2ba2m9mwwg0fawi37g13f80my2i3lsxpfhb"; depends=[Deducer tm wordcloud RColorBrewer SnowballC]; };
+  deducorrect = derive { name="deducorrect"; version="1.3-4"; sha256="0hpq0cahfar9y9f6mvpmx35mvinwnnmqq16y9yzrmzbxjkylz2ja"; depends=[editrules]; };
+  deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
+  Defaults = derive { name="Defaults"; version="1.1-1"; sha256="0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d"; depends=[]; };
+  degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
+  degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; };
+  Delaporte = derive { name="Delaporte"; version="2.1-1"; sha256="03ka7dys8ygw5id0zr9718n61mxa5nc8h3sc3b7sw296zcja6xb1"; depends=[Rcpp]; };
+  deldir = derive { name="deldir"; version="0.1-5"; sha256="073rj4ab3dgxy4nqpvdm0936yg4580qf99ndsf43z3xk29dnbblb"; depends=[]; };
+  deltaPlotR = derive { name="deltaPlotR"; version="1.3"; sha256="1f9jji73c1jizgd7k2ii0zw3h99sir0bi5jipihfkp2v9hzcdm82"; depends=[MASS]; };
+  Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts sfsmisc vegan mlogit]; };
+  DEMEtics = derive { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
+  demi = derive { name="demi"; version="1.1.1"; sha256="19zszmjcczmz9qjp1dhvf92w134266w4qwskdpz36q72m5455zdb"; depends=[plyr R_utils]; };
+  demography = derive { name="demography"; version="1.17"; sha256="01yq3wzzcdclgklxqr3sgxglnw18ljxnhzlmzaj9fzqqdw6xngv3"; depends=[forecast rainbow ftsa cobs mgcv strucchange RCurl]; };
+  demoKde = derive { name="demoKde"; version="0.9-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
+  dendextend = derive { name="dendextend"; version="0.14.2"; sha256="01m050s8m3hgnc5yk2b9918p7w397gxk3pj4qczyd2nl9n38bwr5"; depends=[ape]; };
+  dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend]; };
+  dendroextras = derive { name="dendroextras"; version="0.1-4"; sha256="0g5s936xq8dpw7pg9xafrbnppgl8rjq2ig24vpmbdc4icmv1i3z7"; depends=[]; };
+  DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
+  dendsort = derive { name="dendsort"; version="0.2.0"; sha256="14ax7bscwhxn1nrqq498a79jbkr9zn3ig4qr9b64axypbkj2mzyk"; depends=[]; };
+  denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; };
+  Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="1.02"; sha256="0xjr6z136c0vgsb609xcqf6g4ivyvgpfr4qkwdlj9z5g7gcf3bhl"; depends=[histogram]; };
+  denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
+  DEoptim = derive { name="DEoptim"; version="2.2-2"; sha256="0yayp056knd7d6bvk07k7rnj79vibmkzflnk71dsfbkk5yx7vc77"; depends=[]; };
+  DEoptimR = derive { name="DEoptimR"; version="1.0-1"; sha256="02c1pmpg42wwmp3wjfi09qbidclclwmrmd3gbfvrnivq7ngp2zil"; depends=[]; };
+  depend_truncation = derive { name="depend.truncation"; version="2.1"; sha256="1b13mqm8pjw0r0z5h7vizz15nzhslxhcn4cb8pzadyq98mcmk4g2"; depends=[mvtnorm]; };
+  depmix = derive { name="depmix"; version="0.9.12"; sha256="0brs6cskrk52dn41zaqa59dxz377sl9lnh89457d3ykbj4jbc97c"; depends=[MASS]; };
+  depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
+  depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
+  depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
+  descr = derive { name="descr"; version="1.0.2"; sha256="1a39zf7rajdfb03khgmnv3iz9rxl3yix09yxkvhp1cvcsw3vv530"; depends=[xtable]; };
+  DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
+  DescTools = derive { name="DescTools"; version="0.99.6"; sha256="1hgaj9xj6qr7ngmwbip1pdz79gnxbv43xqr0zgn65vhyv66zq2j8"; depends=[boot]; };
+  deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; };
+  designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
+  desirability = derive { name="desirability"; version="1.6"; sha256="17g998fmps4ypiscqd2nmh38sd0q7k3r60h2zdrq3wbm1vyyzygk"; depends=[]; };
+  desire = derive { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
+  DESnowball = derive { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue combinat MASS cluster]; };
+  deSolve = derive { name="deSolve"; version="1.10-8"; sha256="0l67pr2pr70dmr4igkk1kl9dj5pzib4jclrzfrhw64hzz5hc1whs"; depends=[]; };
+  detect = derive { name="detect"; version="0.3-1"; sha256="1wwz6hcsb0vlgs9bbagd74rpflpc694nvxahhcvi68r6im1gapnx"; depends=[Formula]; };
+  deTestSet = derive { name="deTestSet"; version="1.1.1"; sha256="1qc8sj44zlndyr9k5r179pmy8kyq0wawz7q2xgdmnx27j2rjls43"; depends=[ReacTran]; };
+  detrendeR = derive { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
+  DetSel = derive { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
+  devEMF = derive { name="devEMF"; version="1.2"; sha256="14nqx1gy6hlkmzrrayd7kgljla9flxx4xm329436znd66184sass"; depends=[]; };
+  Devore6 = derive { name="Devore6"; version="0.6-0"; sha256="093jbz405wi0zf4nhracy80pl3m7255lq7jkbymfd5snpr9gnb53"; depends=[]; };
+  Devore7 = derive { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[MASS lattice]; };
+  devtools = derive { name="devtools"; version="1.5"; sha256="1gd8skhj7612zbci361h3yys6iwxr7dvgrjr99vs7b0c0mglm7hp"; depends=[httr RCurl memoise whisker evaluate digest]; };
+  df2json = derive { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; };
+  dfcrm = derive { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
+  dfexplore = derive { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
+  dfoptim = derive { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
+  dglars = derive { name="dglars"; version="1.0.4"; sha256="1w04zs2mjf0avcns5hi9y7b4ccrnjg4251ilz8642r8bj30p14k7"; depends=[]; };
+  dglm = derive { name="dglm"; version="1.6.2"; sha256="0w9rrvlhy2vd9mmp04i1hc3s1w228p0sicwg56rjywsmfqfr81vv"; depends=[statmod]; };
+  dgmb = derive { name="dgmb"; version="1.0"; sha256="0s1wa8lg814ydajnx3z5zlly4321srdkhvqhr6syliylxi03778k"; depends=[abind MASS]; };
+  dgof = derive { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
+  dhglm = derive { name="dhglm"; version="1.2"; sha256="14wa0xkwb1qvkynk95aw6y4rx3jjdki19wdydg3wv5nfagcc4vdz"; depends=[Matrix numDeriv boot]; };
+  diagram = derive { name="diagram"; version="1.6.2"; sha256="0jxy1rwph29w8q1383ykbnpq61p220azyv6miq1dx0v2fk5579da"; depends=[shape]; };
+  DiagTest3Grp = derive { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car KernSmooth gplots]; };
+  diaplt = derive { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
+  dice = derive { name="dice"; version="1.1"; sha256="0wnmiyrf57kjkby26z9lgplphv3p15dfxgsbbsgwq65md2d6idyn"; depends=[gtools]; };
+  DiceDesign = derive { name="DiceDesign"; version="1.4"; sha256="0xpmaljyvvbrgk39m5lxdpnyx17cm5d2zhzpaycmvqydvfs66g92"; depends=[]; };
+  DiceEval = derive { name="DiceEval"; version="1.2"; sha256="0x5j32fabwl2w24skxmkcj41k8a39pf7r8psldqyv8jqf04gdcmd"; depends=[DiceKriging]; };
+  DiceKriging = derive { name="DiceKriging"; version="1.5.3"; sha256="14826fwsj6cifksyd605nbfxlfwnapr80inm4chjmm0f2xjc4r5n"; depends=[]; };
+  DiceOptim = derive { name="DiceOptim"; version="1.4"; sha256="11k6gqw8bcfcnxhm6a039vnkdm7526h3aszjqwfp1s7m157w8kp2"; depends=[DiceKriging rgenoud MASS lhs]; };
+  DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
+  dichromat = derive { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
+  dicionariosIBGE = derive { name="dicionariosIBGE"; version="1.5"; sha256="03gsp5h39a4s6zgvwnrfdyj1wzrp688qk8g5hdr8rk3a2rzbbzgg"; depends=[]; };
+  dielectric = derive { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
+  DierckxSpline = derive { name="DierckxSpline"; version="1.1-9"; sha256="07bp86zfbcp3d7jdhfap3z1sy15534qvdapdzscbyr2x82mmqpy3"; depends=[lattice PolynomF fda]; };
+  diffdepprop = derive { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee rootSolve PropCIs]; };
+  diffEq = derive { name="diffEq"; version="1.0"; sha256="17b6yw5xhlk70wvv58348hy1237sjwkxfrgkyw876piy50dxmnz8"; depends=[deSolve rootSolve bvpSolve ReacTran diagram deTestSet scatterplot3d]; };
+  diffIRT = derive { name="diffIRT"; version="1.2"; sha256="00ak4cnnw68iswlsj198i6iw8xbpx4knnax30yfqp3ibkzq7mwp8"; depends=[statmod]; };
+  diffractometry = derive { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
+  diffusionMap = derive { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[scatterplot3d igraph Matrix]; };
+  DIFlasso = derive { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso penalized miscTools]; };
+  difR = derive { name="difR"; version="4.5"; sha256="0qlaqpywyjggw74h5y5r2aivcyknc6b7l8b1p69g3lyx4d2hz8wp"; depends=[lme4 ltm]; };
+  digest = derive { name="digest"; version="0.6.4"; sha256="06xbklq6laffv609hsfqyj04fhdnr9bgjh6ala7253h9vvkjch1k"; depends=[]; };
+  Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
+  dils = derive { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
+  DIME = derive { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
+  dinamic = derive { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
+  diptest = derive { name="diptest"; version="0.75-5"; sha256="13nml4fp2y77x396xm4j9h8k2cdinfmkna1fr0jpmy3lpcj3h6vs"; depends=[]; };
+  DIRECT = derive { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
+  directlabels = derive { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
+  directPA = derive { name="directPA"; version="1.0"; sha256="16bllp7afb83y73zr5wxfkad7vxzfqwdmhcxfa5jml4hlvkhgv1r"; depends=[]; };
+  DirichletReg = derive { name="DirichletReg"; version="0.4-0"; sha256="1azrqx1wa7yaary3qk4pz605xzvzdvwqwz5darl2aighwafzgy8d"; depends=[maxLik Formula rgl]; };
+  dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
+  Disake = derive { name="Disake"; version="1.0"; sha256="1i58q6dqk980mk8qj66hbqd64wmkvpa4v0z6c0q3lkirsvdm4cwv"; depends=[]; };
+  disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
+  disclapmix = derive { name="disclapmix"; version="1.4"; sha256="06036vs1jx4ac9d30q3pn9zschrpaq5wznk4n7zchyj8nl5lpr73"; depends=[Rcpp disclap cluster]; };
+  DiscML = derive { name="DiscML"; version="1.0"; sha256="1pnv8dycbzj8x3x0dybh7mcsifmk83kcn0f1y11d6fawhq1232y8"; depends=[ape]; };
+  DiscreteInverseWeibull = derive { name="DiscreteInverseWeibull"; version="1.0"; sha256="0lnpcpwfgl5ncaa67a32nvviv1wn60dprd781dpjljhgja4hrsa7"; depends=[Rsolnp]; };
+  DiscreteLaplace = derive { name="DiscreteLaplace"; version="1.0"; sha256="1mwqvlhgswqp697zjl6yjzqbgazycwwz6dfdvx8s72hdmnlqqr9r"; depends=[]; };
+  discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
+  discreteRV = derive { name="discreteRV"; version="1.1"; sha256="1h845ya66d3kqxhxz85lq3ds74h38213s4j7jnm024c3bk9aa83w"; depends=[]; };
+  DiscreteWeibull = derive { name="DiscreteWeibull"; version="1.0"; sha256="0v8za4arqarf20jrw38dzcjxdwfdpn0ss7p5yxbwhylnj7qz207w"; depends=[Rsolnp]; };
+  discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
+  discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
+  DiscriMiner = derive { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
+  diseasemapping = derive { name="diseasemapping"; version="0.7.5"; sha256="0i5za00p2pgbwak5gl006yamklzg2m6xcxmqba1kiz16dddfscqq"; depends=[sp mgcv]; };
+  dismo = derive { name="dismo"; version="0.9-3"; sha256="1vr24kx4mv15wivpk6lw1j8l4422p5al80fld8x6fcp31sf7q652"; depends=[raster sp]; };
+  disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
+  displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
+  dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
+  Distance = derive { name="Distance"; version="0.9"; sha256="0rj9glc7plc8cyqlfijjcrls2lvi2w0zzlgxd6fq6yk0xicsggjc"; depends=[mrds]; };
+  DistatisR = derive { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[prettyGraphs car]; };
+  distfree_cr = derive { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; };
+  distillery = derive { name="distillery"; version="1.0-1"; sha256="0hfj4qbfb5219dm7yrgf2h4jrh2qsjhwrbv8gbrxcr0xf6gqbxmv"; depends=[]; };
+  distory = derive { name="distory"; version="1.4.2"; sha256="12j19cb1b4prm8m43gya15kia1ii1k0yy7hkngpn2vsyk7n2z65m"; depends=[ape]; };
+  distr = derive { name="distr"; version="2.5.2"; sha256="1x2pmb3lagdwspww0bq35qfwsylzq91v5lc470yc4f4q6r39nw21"; depends=[startupmsg sfsmisc SweaveListingUtils]; };
+  distrDoc = derive { name="distrDoc"; version="2.5"; sha256="104y8q7p53pzwr5pgspa0zczmnhylac2k9aj9flqd75ka6icfqh8"; depends=[distr distrEx distrSim distrTEst distrTeach RandVar distrMod MASS SweaveListingUtils startupmsg]; };
+  distrEllipse = derive { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[mvtnorm setRNG distr distrEx distrSim]; };
+  distrEx = derive { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; };
+  DistributionUtils = derive { name="DistributionUtils"; version="0.5-1"; sha256="1in2k7xsaa0wadjgdh8m0v25v0dzx89pb20i5nsa19vx2iiysqbd"; depends=[RUnit]; };
+  distrMod = derive { name="distrMod"; version="2.5.2"; sha256="1vgb06qhfpav93xv9lamzmn8mccx5bqdfplkcqpv3i7qlgmngvh9"; depends=[distr distrEx RandVar MASS]; };
+  distrom = derive { name="distrom"; version="0.2"; sha256="1mvqqwaa6jwg483gjzgb0wplg1r8p7q7ihypa2z0c8pcbja8i9ff"; depends=[Matrix gamlr]; };
+  distrRmetrics = derive { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7hav68gag8ymgicywl2vbnvqpjxca0x24wpdi1gs4jf6"; depends=[distr fBasics fGarch]; };
+  distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[setRNG distr]; };
+  distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; };
+  distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[setRNG distrSim startupmsg]; };
+  divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
+  DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
+  diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; };
+  diversitree = derive { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[deSolve ape subplex Rcpp]; };
+  diveRsity = derive { name="diveRsity"; version="1.9.5"; sha256="0rybnjkkxsam0fhsfcxb2h00p65169iw8kb7xgzzgzdfi258zp9s"; depends=[ggplot2 shiny qgraph Rcpp]; };
+  DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
+  DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
+  dixon = derive { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[splancs spatstat]; };
+  dkDNA = derive { name="dkDNA"; version="0.1.0"; sha256="1waqj8l48yqlzi3rb3ilxyx79n5d4w0sp02flvynwaxck6jvh8gc"; depends=[]; };
+  dlm = derive { name="dlm"; version="1.1-3"; sha256="1mk5hlhm4bm8a5ilrbiwqggj1wg2jiv44s6gjjkjigs24673lg27"; depends=[]; };
+  dlmap = derive { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[qtl ibdreg wgaim nlme mgcv]; };
+  dlmodeler = derive { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
+  dlnm = derive { name="dlnm"; version="2.0.9"; sha256="1a86fm4054sihd28ilbz8bdd1y4rmfyfpcgbxp6813rds165fmlc"; depends=[nlme]; };
+  dma = derive { name="dma"; version="1.2-0"; sha256="1q0zclp7y1y1ksy8j64z05jy1fi0lmgd9a5cswxyl8l4xbs894wn"; depends=[]; };
+  DMR = derive { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
+  dmt = derive { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[mvtnorm MASS Matrix]; };
+  DMwR = derive { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[lattice xts quantmod zoo abind rpart class ROCR]; };
+  dna = derive { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
+  DNAtools = derive { name="DNAtools"; version="0.1-8"; sha256="146r59lhj57b0dlwwsddks9lpfdyvbjm8i5mvkc6w9wwj32g931i"; depends=[Rsolnp multicool]; };
+  DnE = derive { name="DnE"; version="1.01"; sha256="04b2zz1b47nxpl8060ravybwq6y3s08fbkg5a4qiiaz9a84kvbhw"; depends=[]; };
+  dnet = derive { name="dnet"; version="1.0.2"; sha256="1111b4565wp0mip96yk6i2fwb9yqzs9mysa4wd7zy1f98xzyd23n"; depends=[igraph Matrix]; };
+  DOBAD = derive { name="DOBAD"; version="1.0.3"; sha256="0q8sjcbfdg66jrhii98kls1l2gzx5s8nzv5xrbyl497cn6ysiww0"; depends=[numDeriv]; };
+  doBy = derive { name="doBy"; version="4.5-10"; sha256="1axdy61n6jf0chr9276aj16h4dbq9nh4cw82md2r7mgw746ccvcn"; depends=[survival MASS Matrix lme4]; };
+  Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
+  DoE_base = derive { name="DoE.base"; version="0.26-1"; sha256="07mcbxz9xf87ldsigr8bxczhq487ixv4m2xcz622sc43nbzri8la"; depends=[conf_design vcd combinat MASS]; };
+  DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-9"; sha256="1f4q7i0d620wn13c6l3bifqqr5b1g1ihdw5fw92yaw1zv9dwzx0c"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; };
+  doMC = derive { name="doMC"; version="1.3.3"; sha256="0g5psgk92b2zk9fkap3a86haay2y0kfz75cyk3d1ila9m7cd2cn4"; depends=[foreach iterators]; };
+  Dominance = derive { name="Dominance"; version="0.9.11"; sha256="075a5vijgki8xnfv0ggg0wq5shwaxs5qq25r4ydcwggcgrmwfb1c"; depends=[igraph chron gdata]; };
+  domino = derive { name="domino"; version="0.1-6"; sha256="18gdcqb6x2v0vc2gfj2rqi4y4xay6npbpxi7ggq0l8gyds2hzcaq"; depends=[]; };
+  doMPI = derive { name="doMPI"; version="0.2"; sha256="0cvws4zwbjj9ji0s69qy1843404a221pyxg9y35ihfcrjknfjc0l"; depends=[foreach iterators Rmpi]; };
+  doParallel = derive { name="doParallel"; version="1.0.8"; sha256="1z6cwqnjvqsbck44padqkv4r75cy32p5vrlkkan4mq84cc8062nx"; depends=[foreach iterators]; };
+  doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[rredis foreach iterators]; };
+  doRNG = derive { name="doRNG"; version="1.6"; sha256="0yvg4052gfdh54drn6xnpiqyd77p8765yi525nag3ismw2yn9y58"; depends=[foreach rngtools iterators pkgmaker]; };
+  DoseFinding = derive { name="DoseFinding"; version="0.9-11"; sha256="10i2vpv09avspn2daa9bcpj0nicdjm71gixhvh3x7xb3681zsw2d"; depends=[lattice mvtnorm]; };
+  doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
+  dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
+  dostats = derive { name="dostats"; version="1.3.0"; sha256="1786jc7hpbq5390cs11vlq9fvp0rbsmjwxbgn55qmc1dg46yl2xv"; depends=[]; };
+  DoubleCone = derive { name="DoubleCone"; version="1.0"; sha256="1pba9ypp0n3i2k3ji1x8j7h548pfam9z99hxylcjcxnnvc7xs2fw"; depends=[coneproj Matrix MASS]; };
+  downloader = derive { name="downloader"; version="0.3"; sha256="0jpq8z3i9fkgs8wwjrq5qd7qfi5w3rxmzmsi1c1dxlnxzzhg6kxq"; depends=[digest]; };
+  dpa = derive { name="dpa"; version="1.0-3"; sha256="0chkbbqxpq5fmqzr74jvflls9h0i2y25jp8gvlg3pfam9j07w7i5"; depends=[sem igraph]; };
+  dpcR = derive { name="dpcR"; version="0.1.0"; sha256="09f0illfs17as5ns4syb2r0db8cm24mdffwf76jbagzs7inm7c4s"; depends=[qpcR binom e1071 dgof pracma shiny]; };
+  dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
+  dplR = derive { name="dplR"; version="1.6.0"; sha256="1rjb10adhycp16xav7z5c93jfcjwpcrp8cdiyab8skrijgzbp0vx"; depends=[gmp digest lattice stringr XML]; };
+  dplyr = derive { name="dplyr"; version="0.1.3"; sha256="10dngi0n03mks7jkvci4b5968ds2155p19w0ay065g6ggyrsb3w3"; depends=[assertthat Rcpp]; };
+  dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
+  DPpackage = derive { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; };
+  DPw = derive { name="DPw"; version="1.1.2"; sha256="0waprp6xql67ijwwsy0z8f0fnazkzci0nzwiajwkvy7vbwcch5bx"; depends=[]; };
+  dr = derive { name="dr"; version="3.0.8"; sha256="0plvdkk041giqx8cgph4vdcabq9nv5bvjwz0pvjmhvb3z7q15cgj"; depends=[MASS]; };
+  drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
+  drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; };
+  drfit = derive { name="drfit"; version="0.6.1"; sha256="1hjjd1djd0acf2qvnx505rhmpq21igckzqjd5zhmm5k2v3al48dh"; depends=[MASS RODBC drc]; };
+  drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; };
+  DRI = derive { name="DRI"; version="1.1"; sha256="11dqwjqddwis8y8yq248k90wwk2fi3mcy0rwq2dz95m17wvd1v0k"; depends=[cghFLasso]; };
+  drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
+  drmdel = derive { name="drmdel"; version="1.3"; sha256="0yflpja6r8cm4yv07ac1wic8w2iv0pwqpgh3ls2pjwv3vqzg7jrm"; depends=[]; };
+  drsmooth = derive { name="drsmooth"; version="1.0"; sha256="1cxhj28dkll704kif040vqnp9grb61v891rswvyx7aa9216156px"; depends=[car clinfun mgcv multcomp pgirmess DTK segmented mvtnorm]; };
+  ds = derive { name="ds"; version="2.0"; sha256="0jxkwp8hm36aqh8xdxh3q5zgafwik6i9ihs52sxrllpmhyb39x3p"; depends=[]; };
+  dsample = derive { name="dsample"; version="0.91.1"; sha256="0nxx3x55zj089aq2shk7cg9bgh6xw7jnrr2qmlaq6bflwn58wn1q"; depends=[]; };
+  DSBayes = derive { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
+  dse = derive { name="dse"; version="2013.3-2"; sha256="170bpd0ix5bslbif2blcyb8dkbxwl3334h2nw0fgcx495vxvvx2x"; depends=[tframe setRNG tfplot]; };
+  dse1 = derive { name="dse1"; version="2011.11-2"; sha256="0h8f1f4qqycyc4k8ksdlz7cprayaa08gnsgj6hxa0kxnfs726qb6"; depends=[dse]; };
+  dse2 = derive { name="dse2"; version="2011.11-2"; sha256="05kf2072a50wd6p42yx5wpy0m7wq1gssy877nfyyc5l0pwviy3zs"; depends=[EvalEst]; };
+  DSL = derive { name="DSL"; version="0.1-5"; sha256="0k320cmim9mvi5cmr6964h9i2jbskh76xws3p6zsfakk63ndg3rr"; depends=[]; };
+  dsm = derive { name="dsm"; version="2.2.3"; sha256="1i4ns0042v11f7c6ysrd96r72mkqzs1jmb4ya1cdi0wydwx86s90"; depends=[mgcv mrds nlme ggplot2 statmod]; };
+  DSpat = derive { name="DSpat"; version="0.1.5"; sha256="1njc9p2cxszcskdm21x00yvcs7gx71x18fdayih6l3g5l40c698a"; depends=[spatstat RandomFields mgcv rgeos]; };
+  DSsim = derive { name="DSsim"; version="1.0.1"; sha256="0a62l8jfrnr2h9laxw27p8icvfa8f1gdhdiywwb33328barhzfrk"; depends=[shapefiles splancs mrds mgcv]; };
+  DTComPair = derive { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
+  DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
+  dti = derive { name="dti"; version="1.1-7"; sha256="0zgl05j74siwnz5qln8gpshr0kxyqspkg9pa8pydd96spy4v021a"; depends=[awsMethods oro_nifti oro_dicom adimpro gsl rgl]; };
+  DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
+  DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
+  DTR = derive { name="DTR"; version="1.3"; sha256="00a8q47wkfdp2g0mdsw05a8x2xmvjj4hl80iz7n82l3zv8a3awf4"; depends=[survival ggplot2 aod proto]; };
+  dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
+  dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
+  dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
+  dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
+  DunnettTests = derive { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; };
+  dupiR = derive { name="dupiR"; version="1.1"; sha256="01yhwgqm2y6znxds3p2admcyayvjj5xw7vvc9djd7b6ywsivb8sa"; depends=[plotrix]; };
+  dvfBm = derive { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
+  dvn = derive { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
+  DWD = derive { name="DWD"; version="0.11"; sha256="1yqcww4jbbvdcv0yj9h8q2w7ck7pwr0zcvmncp9mc4n4k9y67r9j"; depends=[Matrix]; };
+  dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
+  DynamicDistribution = derive { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
+  dynamicGraph = derive { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
+  dynamicTreeCut = derive { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
+  dynaTree = derive { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
+  dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.0.1"; sha256="06vc8m981va4jiihlyaqigp3snfh06677l2m1idgbl8pwl1k80wh"; depends=[tcltk2 tkrplot RODBC]; };
+  DynClust = derive { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
+  dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
+  dynlm = derive { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[zoo car lmtest]; };
+  dynpred = derive { name="dynpred"; version="0.1.1"; sha256="1qs845lzjvhiwd8xq9d5r8rc8sk813wjjl5d0z3alb8217gkhb2j"; depends=[survival survival]; };
+  dynsim = derive { name="dynsim"; version="0.2.4"; sha256="1b4j47asqanrfhyg9r730brp3xaw1853jk23va2sx606q2rh94wv"; depends=[DataCombine ggplot2 gridExtra Zelig]; };
+  dynsurv = derive { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[survival reshape plyr nleqslv ggplot2]; };
+  e1071 = derive { name="e1071"; version="1.6-3"; sha256="0scyxk3y2fizvw5zrddxid37vzayd879g67faq0a879nhk7fkm1z"; depends=[class]; };
+  eaf = derive { name="eaf"; version="1.05"; sha256="12jwkz4cn3kgg3yczb0xgbp394bzgzps1mz0b999i3p1k6vn46z6"; depends=[modeltools]; };
+  earlywarnings = derive { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[ggplot2 moments tgp tseries fields nortest quadprog Kendall KernSmooth lmtest som spam]; };
+  earth = derive { name="earth"; version="3.2-7"; sha256="1j9w03i4pvz8a6s9rkfssj7bqz5sql0g7rzwpmis33kvi0d7wihn"; depends=[plotmo plotrix]; };
+  easi = derive { name="easi"; version="0.2"; sha256="0kvcixbiijh3akxqy2w6kwydayqlr7lk2ws747a1z4whhclm1623"; depends=[systemfit micEcon]; };
+  EasyABC = derive { name="EasyABC"; version="1.3.1"; sha256="1d1j7n6mhpmbbczg0yjs4kqjxlclc7pm5fl7pkxp9dmfic002y34"; depends=[abc pls mnormt MASS lhs]; };
+  easyanova = derive { name="easyanova"; version="3.0"; sha256="19mcjj1lvy8kf6s004rqnalv80jf62g7dpsnrwkrklb19n1164v8"; depends=[car nlme]; };
+  EasyHTMLReport = derive { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc markdown knitr ggplot2 scales xtable reshape2]; };
+  EasyMARK = derive { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[MASS stringr rjags coda foreach doParallel random]; };
+  easynls = derive { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; };
+  eba = derive { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
+  ebal = derive { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
+  EbayesThresh = derive { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
+  ebdbNet = derive { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
+  EBMAforecast = derive { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[separationplot ensembleBMA plyr Hmisc abind]; };
+  EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
+  Ecdat = derive { name="Ecdat"; version="0.2-5"; sha256="0g123v1719nhr0d8wryg8vd9avahcl5mnwssl936chpjpzs7a82d"; depends=[Ecfun]; };
+  ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk22bh4ga1v9xwrcghy70q1ipv0z279ph"; depends=[splancs spatstat]; };
+  Ecfun = derive { name="Ecfun"; version="0.1-0"; sha256="0jfcqxbx27dwbipx1b994iy4qnpkg1sh4xpq7qq8yy823rgpkhrp"; depends=[]; };
+  ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
+  ecoengine = derive { name="ecoengine"; version="1.3"; sha256="0ih6wbqbrqrivxm7003gmkqlw876axb556mm0b1qgk0zg2k3zzws"; depends=[httr plyr assertthat whisker data_table RJSONIO lubridate leafletR]; };
+  EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
+  ecolMod = derive { name="ecolMod"; version="1.2.5"; sha256="07dr3q17vd60569w34apylpsv81qcf31l7v0bqdycb5mlaifdahz"; depends=[rootSolve diagram deSolve]; };
+  ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; };
+  ecosim = derive { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
+  EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
+  edcc = derive { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
+  edeR = derive { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
+  EDISON = derive { name="EDISON"; version="1.0"; sha256="17yjvvsgsmd4i00wzmih50qz3wqig2zdg5r877b4hqk1dsv5kxym"; depends=[corpcor MASS]; };
+  editrules = derive { name="editrules"; version="2.7.2"; sha256="19g07caacwphvrqn900chrz3k6x4z8gmvlcvna5x2mqidcjkf25i"; depends=[igraph lpSolveAPI]; };
+  edmr = derive { name="edmr"; version="0.6.3"; sha256="1yjw34m67wxg5qs3r1k9fv7zv5f2zsi1v6s8h1hzjd0p634fza0i"; depends=[data_table mixtools]; };
+  EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
+  edrGraphicalTools = derive { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[rgl mvtnorm MASS lasso2]; };
+  eeptools = derive { name="eeptools"; version="0.3.1"; sha256="0m6i0hiw565wgziknlf19rh2fq8zvzq2v5a0ppnwcv8vhbhyph3g"; depends=[ggplot2 MASS stringr maptools arm data_table memisc]; };
+  effects = derive { name="effects"; version="3.0-0"; sha256="075vd540d8wry1l70s28pkmd1g3424yan9f7mwvcrqf0l62ahmfg"; depends=[lattice colorspace]; };
+  EffectsRelBaseline = derive { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
+  EffectStars = derive { name="EffectStars"; version="1.3"; sha256="193j2dbp6bp60yb2qym119ciry3s5z54iv1vmb9wrddjzb77nnvv"; depends=[VGAM]; };
+  effsize = derive { name="effsize"; version="0.5"; sha256="12wvwp87xhz5plasp0cmpd50nqaxvdg790rlva2qzn75xhhaq4jq"; depends=[]; };
+  egcm = derive { name="egcm"; version="1.0.2"; sha256="17fzxl34vc38308wbvjp5xdv1q48k4lf6gsw7ax27zc4chqlmqfz"; depends=[ggplot2 tseries zoo MASS]; };
+  eggCounts = derive { name="eggCounts"; version="0.2"; sha256="0ilwhw2fk8mvqsnranpj4mny98vhha8jrrxccz6x0f8hsy34b27k"; depends=[coda actuar boot]; };
+  egonet = derive { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; };
+  eha = derive { name="eha"; version="2.4-1"; sha256="1znxpcrwp8fllr3m14gbxwgp7yln55jwvkilmbsqldz00za6xn0w"; depends=[survival]; };
+  eHOF = derive { name="eHOF"; version="1.4"; sha256="050wlckw2i8iqymdmq68zj2fwq74slsbk83p5kkhxlyn132m0k47"; depends=[mgcv lattice]; };
+  eigeninv = derive { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; };
+  eigenmodel = derive { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; };
+  eigenprcomp = derive { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; };
+  EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
+  eiPack = derive { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[MASS coda msm]; };
+  eive = derive { name="eive"; version="1.0"; sha256="0g7pn6dbm9cs0nsf03k92v37sjnsda7qc0xi00xzgm6y1g8rdbbq"; depends=[]; };
+  eiwild = derive { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[gtools coda lattice]; };
+  EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
+  elasticnet = derive { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
+  elec = derive { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
+  elec_strat = derive { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
+  ElemStatLearn = derive { name="ElemStatLearn"; version="2012.04-0"; sha256="107x2mybadqgw03j3yq8ibq3ljs4fpx90chvsirpylqhv77wsabl"; depends=[]; };
+  elliplot = derive { name="elliplot"; version="1.1.1"; sha256="1sl85kyjpxiw0gs3syhlhfrci03fl054py7m24xln5vk07665vbp"; depends=[]; };
+  ellipse = derive { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; };
+  elliptic = derive { name="elliptic"; version="1.3-3"; sha256="1spl19yh2fqii1ffcmg4y11v6ccb83q6znvjn0scgzv6646c7xi4"; depends=[MASS]; };
+  elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
+  EloRating = derive { name="EloRating"; version="0.41"; sha256="1d7kcng0iv4paagm0jljkfk7c2n3vvs91khjvlc7jpifisf1zi7a"; depends=[zoo]; };
+  elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
+  ELT = derive { name="ELT"; version="1.1"; sha256="0h0nir4gb0wprr0lz8lii2n4a48zafknyimpk1pr235z8kw1v6qi"; depends=[locfit lattice latticeExtra xlsx]; };
+  em2 = derive { name="em2"; version="0.9"; sha256="120731nh5qq3kzbfj9p2s4fhrr3xvddj5n0bv5m3dp5l5495px1b"; depends=[plyr]; };
+  EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; };
+  EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; };
+  EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
+  EMCluster = derive { name="EMCluster"; version="0.2-4"; sha256="0m5cl5mrg6q0ixfpjj1jwd7l5hcldc33lr7n6xgy7p9nlr52mimz"; depends=[MASS]; };
+  EMD = derive { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
+  emdatr = derive { name="emdatr"; version="0.1"; sha256="0d8jkppkr6lwf2grw3d6q849yr5jz365qcqvhxfhf8v38hk5xsay"; depends=[]; };
+  emdbook = derive { name="emdbook"; version="1.3.4"; sha256="19i8i1wp6vqgc77ajaqrfrjw6ijjafkgdqgfpa0dvl1w117rpy2d"; depends=[MASS lattice plyr]; };
+  emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
+  emg = derive { name="emg"; version="1.0.5"; sha256="028g8gqjjqfwly6vzvinbpilay5jj9rnm7ri9aby9q0hj5prh56m"; depends=[]; };
+  EMJumpDiffusion = derive { name="EMJumpDiffusion"; version="1.4.1"; sha256="10lw6717yq9vlywn5ilsl0d99fpx3zvc87vf7s0zxswhs81h7x1w"; depends=[]; };
+  emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
+  EMMAgeo = derive { name="EMMAgeo"; version="0.9.1"; sha256="1rxbb666gh9g35m4jqa6y1zjp82s62ha6n92fkjvkk9wm25w6imr"; depends=[GPArotation limSolve shape]; };
+  emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
+  EMMIXcontrasts = derive { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
+  EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; };
+  EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-5"; sha256="00lgjraadkxh68nvdalp784pcrzn6issdps3dbwsl8rl60r4ryk8"; depends=[MASS]; };
+  EMMREML = derive { name="EMMREML"; version="1.0"; sha256="0g6jr9bgiikk4x3hxy9f5626ykh9ffjarc8x60504hgp08560i2m"; depends=[Matrix]; };
+  emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
+  EMP = derive { name="EMP"; version="1.0.1"; sha256="12ahyfav918qf7bphhy251x0gzhdziaz2gg064hcwh6jaqw0jw0g"; depends=[]; };
+  emplik = derive { name="emplik"; version="0.9-9-2"; sha256="131wk9nfymkygb89jk9cwi53dx4857c06ip9pfzzvswch3hhdqwb"; depends=[quantreg]; };
+  emplik2 = derive { name="emplik2"; version="1.10"; sha256="19s19jhcaqnh6vjfgrsgjvjlrsm5fa1mgwc5v36hzdf2mv1xhr3q"; depends=[]; };
+  EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
+  emulator = derive { name="emulator"; version="1.2-13"; sha256="1y8mrrz4dw66wn3lhi7x7r72bxa77rpc68zqab6c67ndyi4wamxr"; depends=[mvtnorm]; };
+  EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
+  ENA = derive { name="ENA"; version="1.3-0"; sha256="02gsngkzc8vfpg2jvcabwp4kpfs14cajs9xv1rh76807l5ylqihz"; depends=[GeneNet space WGCNA parmigene]; };
+  enaR = derive { name="enaR"; version="2.5"; sha256="1hhxccpgxzyqwri6v59qv2fgh9c5xk6zzm283c1n8wlinj6d87bi"; depends=[sna network MASS stringr xlsx]; };
+  endogMNP = derive { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
+  endorse = derive { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
+  energy = derive { name="energy"; version="1.6.1"; sha256="08s7kzl12fcp1lz86jzwznxk6dqvls418zcqwd31shqqynna25vm"; depends=[boot]; };
+  english = derive { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
+  EngrExpt = derive { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
+  ENmisc = derive { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc vcd RColorBrewer]; };
+  EnQuireR = derive { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR SensoMineR Rcmdr MASS]; };
+  enRich = derive { name="enRich"; version="2.0"; sha256="13ahwdifm33h4h5mvmc49v39fbhiy291rbdwm4c8kxjrqjq9ip66"; depends=[]; };
+  enrichvs = derive { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
+  ensembleBMA = derive { name="ensembleBMA"; version="5.0.8"; sha256="1wv1g1iwpmxhcgxgx78jc4w5kcbbzjxljj7pbfykgq7hjpkb109f"; depends=[chron]; };
+  ensembleMOS = derive { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[ensembleBMA chron]; };
+  entropart = derive { name="entropart"; version="1.1.3"; sha256="0k7cdj8ndpxbqq3xczmfcidh71xc0s8gmr0n9rh1idgs12kyn47x"; depends=[ade4]; };
+  entropy = derive { name="entropy"; version="1.2.0"; sha256="1qs8g5jp6ydhirxnrck3qqq3cc232hcaizy401c8gjn2vn23s15d"; depends=[]; };
+  EntropyEstimation = derive { name="EntropyEstimation"; version="0.1"; sha256="1l31vc9478db22zg79zm26xahagvw7p5ywkhyq4lanl38gh2my6y"; depends=[]; };
+  enviPat = derive { name="enviPat"; version="1.5"; sha256="0g86n736r40z7pg4yhsw67vq05dkf651n9pwcizx3irj7bwfmla8"; depends=[]; };
+  EnviroStat = derive { name="EnviroStat"; version="0.4-0"; sha256="05sa63z6yzny2ncxpm5d3x0bx8snkn0x5pzpj2a7y6rwf6al5q4r"; depends=[MASS]; };
+  EnvNicheR = derive { name="EnvNicheR"; version="1.0"; sha256="1vw21gsdrx8gkf1rf8cnazv8l9ddcdmy2gckyf33fz7z2mbzgbkk"; depends=[]; };
+  EnvStats = derive { name="EnvStats"; version="1.0.2"; sha256="0914j7v190j401rdqqpfz3s69pb6crmq297wiw2q99syx0fnimnw"; depends=[]; };
+  epade = derive { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
+  Epi = derive { name="Epi"; version="1.1.49"; sha256="1rw31bf0szqp87axyc4z65dbbvk2981ifd6r3lf14d0cizxqfwbf"; depends=[]; };
+  epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
+  epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; };
+  EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML]; };
+  EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
+  EpiModel = derive { name="EpiModel"; version="0.95"; sha256="1dkhcxxhf1hk90s493dq7in4yrikizs5sn5i44nad5c36l930qq0"; depends=[network networkDynamic tergm deSolve RColorBrewer statnet_common]; };
+  epinet = derive { name="epinet"; version="0.0-8.1"; sha256="00mq2bqdnjp7wwsb3dldlxd0l3vyij48az4s3vrmycab8g9dffk5"; depends=[]; };
+  epipen = derive { name="epipen"; version="1.0-0"; sha256="1g3w7siiwnmmrh14q7xqx6ycc6a1nywqrin0n4kbf32g02x7b4v8"; depends=[pwr]; };
+  epiR = derive { name="epiR"; version="0.9-58"; sha256="154syr08jy74cj0bg22yv5ysn9q4a644wasj5q8iap5143ixs7v8"; depends=[survival]; };
+  epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
+  epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; };
+  epr = derive { name="epr"; version="2.0"; sha256="1xqc0jhgdwwvilqpljxzpzz3wx30kigy09sxvzcfvsjmxyyvflqy"; depends=[car]; };
+  EQL = derive { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[ttutils lattice]; };
+  eqs2lavaan = derive { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
+  eqtl = derive { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
+  equate = derive { name="equate"; version="2.0-2"; sha256="1n83rr01y5rcsr2wgcd1n7ihjk5bvxdl7f9abcjdz6vja7qg6h83"; depends=[]; };
+  equateIRT = derive { name="equateIRT"; version="1.0-1"; sha256="1dfhn2p13hzlm9sa36rwgnysd5gd8bvrkgqy4hl4alwadiacdj5g"; depends=[statmod]; };
+  equivalence = derive { name="equivalence"; version="0.5.7"; sha256="0dddpj2xzwvkyl5d1sgpwqmcw5k58b4rdkwxaf61ahz6q79h5wms"; depends=[lattice boot]; };
+  erboost = derive { name="erboost"; version="1.2"; sha256="0afgh0zkl3h3ab4s7wl0cn24qdyhszssai9i390mi7w0p88wgba9"; depends=[lattice]; };
+  erer = derive { name="erer"; version="2.0"; sha256="0375vvi67gy8j6va181149r618w16x4rv1cfbgqxlrraqk0jks3a"; depends=[systemfit lmtest tseries ggplot2 urca]; };
+  ergm = derive { name="ergm"; version="3.1.2"; sha256="1v7cchmw305xcfpf464z59iiqfpa2aab4zvhi76qax8a674b972p"; depends=[statnet_common network robustbase coda trust Matrix]; };
+  ergm_count = derive { name="ergm.count"; version="3.1.1"; sha256="0l66shy5p7h9j3h5gpkn48ps069mdaqbscnnkvmwjfvcc7k5vr8m"; depends=[statnet_common ergm network]; };
+  ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.1"; sha256="0j2z8dvgfrkvm9sqpyqvylz6sakxl8wpy4fbgc20wwznfzbaaal6"; depends=[statnet]; };
+  ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
+  ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common]; };
+  eRm = derive { name="eRm"; version="0.15-4"; sha256="0x05vsf8kp0z422w1b1wqayada2vbl7jh4ifa52sqlq7ygsmnmi1"; depends=[MASS Matrix]; };
+  ERP = derive { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
+  ES = derive { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
+  ESG = derive { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
+  esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
+  ESPRESSO = derive { name="ESPRESSO"; version="2.0"; sha256="1xz4lw1rczs4laz1drrqyz91w62a99z7jzs2wkcdrhcirgmmpjp3"; depends=[MASS]; };
+  EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
+  estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
+  etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[xtable Hmisc]; };
+  ETAS = derive { name="ETAS"; version="0.0-1"; sha256="1p38ay3vnca8b8wszm66whxap8k58c004l1nlsk7zkynyia0im6c"; depends=[spatstat]; };
+  etasFLP = derive { name="etasFLP"; version="1.0.3"; sha256="1krfpnqh7w157cfy8rwa6dmr0j8xqvnhwvygbrcvns3a3y4v4ix0"; depends=[mapdata rgl fields maps]; };
+  ETC = derive { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
+  ETLUtils = derive { name="ETLUtils"; version="1.2"; sha256="0mlfq23v7nl6lslscknk9mdx4dxk8xyc5imnvzlhzhag0k50mqj2"; depends=[ff]; };
+  etm = derive { name="etm"; version="0.6-1"; sha256="00sm4cib1r4wcn71v1ry3asszshks4f6br7s5xzm8d5ngxdlsxda"; depends=[survival lattice]; };
+  eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
+  EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0jhkwdbp34c9h2cc5l2n2b14khjhv1msqcfmi"; depends=[setRNG tframe tfplot dse]; };
+  evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; };
+  Evapotranspiration = derive { name="Evapotranspiration"; version="1.3"; sha256="1s0r448h69nxa47phs6b6fz9lfhklhak3bk8mwl5sy45hami4016"; depends=[zoo]; };
+  EvCombR = derive { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
+  evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
+  evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
+  eVenn = derive { name="eVenn"; version="2.1.6"; sha256="1kxxaj2ia1v5p0d0yi3vq7rkiajsdsg97k3yg0iqb9v4vbj8mc1y"; depends=[]; };
+  eventInterval = derive { name="eventInterval"; version="1.0-1"; sha256="0vcp40rsb2pazn4p44dsaxjai7qhjwzrh9lf0q84fcayrnk51dqv"; depends=[MASS]; };
+  events = derive { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
+  eventstudies = derive { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[zoo xts boot]; };
+  EVER = derive { name="EVER"; version="1.2"; sha256="1yk6ln4shp53jvph6jy1d5m4cq080p6f03qwigdw4f0al9qzja2s"; depends=[]; };
+  evir = derive { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
+  evmix = derive { name="evmix"; version="2.0"; sha256="0848lig19dmcaz3780knd3kzr7igbfjx02lxvdi7s9l3clzc4v3s"; depends=[MASS gsl]; };
+  evobiR = derive { name="evobiR"; version="1.0"; sha256="12j01qzc4yrjpxbj39bl29f5ypxwk33c6qf0mjjbgpwn5g6fgsi4"; depends=[seqinr ape stringr geiger taxize]; };
+  evora = derive { name="evora"; version="1.0"; sha256="0blq28ldynbq3v6rh0yk89wy1sjp4621h6iwnyyiipqwzihwrhz2"; depends=[Hmisc]; };
+  EvoRAG = derive { name="EvoRAG"; version="1.0"; sha256="1dd4c9pg8apagp8bn04n1irz09ab6bf2s8h90zfq0n060jmnbbml"; depends=[]; };
+  evt0 = derive { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
+  evtree = derive { name="evtree"; version="0.1-4"; sha256="1n75w11jc6sbs3fzd4dmimn0hs7p4rj9ikaxaa85gh383p9yfw0h"; depends=[partykit]; };
+  EWGoF = derive { name="EWGoF"; version="2.0"; sha256="07kpzaqfd7ihpmh2y5806mz5h64dcajia5v36pp9myl04fvpjapp"; depends=[Rcpp maxLik miscTools]; };
+  Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; };
+  exact2x2 = derive { name="exact2x2"; version="1.3.0"; sha256="0gp6b04bd6pf1a01d6d99p8mbjcqsayrdbm58wky2pg8s445523q"; depends=[exactci ssanv]; };
+  exactci = derive { name="exactci"; version="1.2-1"; sha256="1vnaggb38px2z8fhav0s8hnqz0x2y0ivfzxhyfqn2rlm1v2zxmn0"; depends=[]; };
+  ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
+  exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
+  exactmeta = derive { name="exactmeta"; version="1.0-1"; sha256="1alva8ls4l56j3bdxgd1mh9isqk198iyrycc88vgpmj30gjpwncn"; depends=[]; };
+  ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
+  exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; };
+  exams = derive { name="exams"; version="1.9-6"; sha256="1dyhc3nkvyw1s3mk44m141dhrg92lhk06b6d6n76b2iadjk90ywa"; depends=[]; };
+  ExceedanceTools = derive { name="ExceedanceTools"; version="1.1.2"; sha256="1f466mc0gdk5qzqxr2sylc9j990wi6nx0083gbzwnh2bq1k1d0sh"; depends=[SpatialTools splancs]; };
+  excursions = derive { name="excursions"; version="1.0-20140427"; sha256="01m91r3xsrabdaq79gqryhzic0frcdhapnygv3hz6bypv9ls7g76"; depends=[Matrix]; };
+  ExomeDepth = derive { name="ExomeDepth"; version="1.0.0"; sha256="00d0glxaax0qx2siyxrp9zfd4xwq7idd25nmiws4gngmzm16s2q5"; depends=[aod VGAM]; };
+  expands = derive { name="expands"; version="1.4"; sha256="1k9rr13vbppmaq8i0s4q7szp42b444hx5fka9q9vwskhv3d9azwi"; depends=[rJava flexmix matlab mclust moments ape permute]; };
+  ExpDes = derive { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; };
+  ExpDes_pt = derive { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; };
+  expectreg = derive { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[mboost BayesX quadprog]; };
+  experiment = derive { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; };
+  expert = derive { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
+  expm = derive { name="expm"; version="0.99-1.1"; sha256="0kcanqaqn51f437fxriw4qkpxbhzpjzlkp95wn89ip4jhy6076qn"; depends=[Matrix]; };
+  expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
+  ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
+  expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
+  expp = derive { name="expp"; version="1.0"; sha256="03yxgg7vldcclpwj1yin33rdh2sm7nqsqwgs819j6vh2wr5x9h27"; depends=[sp spdep rgeos deldir]; };
+  expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; };
+  exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
+  exsic = derive { name="exsic"; version="1.0"; sha256="01gvqpy72vs7hn5hcxazzqjb44crh0j31khc11m99ig1ynkbvkms"; depends=[stringr markdown]; };
+  extfunnel = derive { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
+  extraBinomial = derive { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; };
+  extracat = derive { name="extracat"; version="1.6-4"; sha256="1v398ih6ikqwwc5frs6zqxmhzpx4vinbdxvj9704rzs6zl4vp7aj"; depends=[colorspace hexbin scales ggplot2 reshape2 plyr TSP]; };
+  extrafont = derive { name="extrafont"; version="0.16"; sha256="0ml1a7m28cdx1a6qcmg8840v95lmhl39ad51q1k3bnqzbxfgqncl"; depends=[extrafontdb Rttf2pt1]; };
+  extrafontdb = derive { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; };
+  extraTrees = derive { name="extraTrees"; version="0.4-5"; sha256="0svxafhkl3lc3c6r0aqs1cx8gzp699ij6hl5396vwlbsy0bvpk8x"; depends=[rJava]; };
+  ExtremeBounds = derive { name="ExtremeBounds"; version="0.1.3"; sha256="15p7ghgam1myfaq8mwmf1m5mhy45sbrwpz2kjjz6h3792ccwa9f7"; depends=[]; };
+  extRemes = derive { name="extRemes"; version="2.0-0"; sha256="0nygiz9h5xzkbda7ihqq3mf7h0glc7phc28hi00q6fda3gm7cgwj"; depends=[Lmoments distillery car]; };
+  extremevalues = derive { name="extremevalues"; version="2.2"; sha256="162j6kqnd1ak2w2m6y5dbxcya1ap4648hvc83ibq33bxk98rh7sb"; depends=[]; };
+  extWeibQuant = derive { name="extWeibQuant"; version="1.0"; sha256="0l20x33nh50jfrkwm8d0n824d400lnjia8ymdwr10sgj3v1x7vp1"; depends=[]; };
+  eyetracking = derive { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
+  ez = derive { name="ez"; version="4.2-2"; sha256="1dk4ig137ridr4pw4afp3flm22s8l38yrgxabld1zv46slndc8mm"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
+  ezglm = derive { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
+  ezsim = derive { name="ezsim"; version="0.5.3"; sha256="0kfppsl8ckni6dl3qfqxi8saskqx3das7grwqw2f6v1yfms68xvy"; depends=[foreach ggplot2 reshape plyr Jmisc digest]; };
+  FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[Rlab MASS]; };
+  factas = derive { name="factas"; version="2.3"; sha256="015lpxf37z8vx4h7a8lavksd7i0gc4x7a7ja63wi9h1czdjsc28k"; depends=[plotrix FactoMineR Matrix]; };
+  FactMixtAnalysis = derive { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
+  FactoClass = derive { name="FactoClass"; version="1.1.0"; sha256="0y7yd2i79j1m5yl6vnvma47xhr3rl7i37h9sadyrpfm4s486b3kc"; depends=[ade4 xtable]; };
+  FactoMineR = derive { name="FactoMineR"; version="1.26"; sha256="0a5kxygybsk2y7nyzl3hnvpspimx3c77j7n8syhs817zw3d6sg6i"; depends=[car ellipse lattice cluster scatterplot3d leaps]; };
+  factorplot = derive { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; };
+  factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
+  factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RJSONIO RCurl]; };
+  FAdist = derive { name="FAdist"; version="2.0"; sha256="0qkbliz25xlsng7fi9hk1vshpd3535yrv5rc43m3g2mj024a9wxg"; depends=[]; };
+  Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
+  fail = derive { name="fail"; version="1.2"; sha256="0xzvb71iq20ah1x1zlb9kbx0r47jhqlzxx0sxwhkibglpzskg84z"; depends=[BBmisc]; };
+  FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; };
+  faisalconjoint = derive { name="faisalconjoint"; version="1.10"; sha256="0z1d241s05jpcih6kh8dhs3k506mwls4xms5zszsmdbzri6sa34x"; depends=[]; };
+  falcon = derive { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
+  fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
+  Familias = derive { name="Familias"; version="1.2"; sha256="0y97sn2wn3g804yx5fx40pbki5d6avb73prb24k85ri3gscrac38"; depends=[paramlink]; };
+  FAMT = derive { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[mnormt]; };
+  fanc = derive { name="fanc"; version="1.13"; sha256="08qw4vhms8q2jyqqp2vlq8xdg7y7m0mcwb1pibm7wn938rgablq3"; depends=[Matrix]; };
+  fANCOVA = derive { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
+  fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
+  fanplot = derive { name="fanplot"; version="3.2"; sha256="0xs02036dw7p5nqn6n33vl19hi7r8567hkhi2f2akayi81ryb288"; depends=[]; };
+  FAOSTAT = derive { name="FAOSTAT"; version="1.6"; sha256="18wx691hclbf7fvfk3swsz6ripv9w70nlqhsk3lgr4il8bjsr3cy"; depends=[RJSONIO plyr data_table MASS classInt ggplot2 labeling scales]; };
+  faoutlier = derive { name="faoutlier"; version="0.3.1"; sha256="15gibfhdffgwcrz435b6bhz4zabmzwbn9hgirimsgy0k492ywnl6"; depends=[sem lattice MASS]; };
+  far = derive { name="far"; version="0.6-3"; sha256="0i7c0zrz33abwkml1zdjf5m61bxpfndwziqjbh6wyhdz8msp2kmf"; depends=[nlme]; };
+  faraway = derive { name="faraway"; version="1.0.5"; sha256="0grqpmmfq8ymhscqn2s6zhf2b86nj7vi4qcg6ymaaydnc228xb75"; depends=[]; };
+  fArma = derive { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[timeDate timeSeries fBasics]; };
+  farsi = derive { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
+  fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[timeDate timeSeries fBasics fOptions]; };
+  fAssets = derive { name="fAssets"; version="3003.81"; sha256="12dxd2vwg58lp8mzwff3nap2sr2gg9h69j921qp0m39cgs2nlsk0"; depends=[MASS timeDate timeSeries fBasics fCopulae sn robustbase ecodist energy mvnormtest]; };
+  fast = derive { name="fast"; version="0.63"; sha256="00ag9d0dwn9al104y93m8dclbjqabr9liif8gr19v3gv6k2k6p2c"; depends=[zoo]; };
+  fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbqgkfw4l9mw32sg4p5pvcg4v24z1q44pgnwn4y"; depends=[lattice igraph MASS Matrix]; };
+  fastcluster = derive { name="fastcluster"; version="1.1.13"; sha256="0hkml8ggmq5gqw9indqh6rb5x922qq8chd9s35fkxdcgzw58253a"; depends=[]; };
+  fastcox = derive { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; };
+  fastGHQuad = derive { name="fastGHQuad"; version="0.1-1"; sha256="0qnffhplfl2kb4dd90as298ays19k4f18slhj063f01gywqqrahn"; depends=[Rcpp]; };
+  FastHCS = derive { name="FastHCS"; version="0.0.1"; sha256="02hh4cj1viccw95r54jlxdppmqfyllw1csx5hwls5gp6gwx8f861"; depends=[matrixStats]; };
+  fastHICA = derive { name="fastHICA"; version="1.0"; sha256="02lqqni7j2sp3ndb3kq785d7jf08p2s3ch30di8ffhwn57indald"; depends=[fastICA energy]; };
+  fastICA = derive { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
+  FastImputation = derive { name="FastImputation"; version="1.2"; sha256="04bz623kcanxcl9z8zl6m7m47pk0szcjrjlgs5v1yl3jnq9m2n7g"; depends=[]; };
+  fastM = derive { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp]; };
+  fastmatch = derive { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
+  FastPCS = derive { name="FastPCS"; version="0.0.9"; sha256="12hzp8vk2qb847xy42r0dhab21c0xn23vvakb4qa1jwz6ykji1zk"; depends=[matrixStats]; };
+  fastR = derive { name="fastR"; version="0.4-2"; sha256="19vg2dpbq4d7c3zyp18ygx91f0i0n37xwywbj87l7va82l55flyx"; depends=[lattice mosaic]; };
+  FastRCS = derive { name="FastRCS"; version="0.0.3"; sha256="0v69hgl0lwasj6xhzmd9sqv3ipax8d0gz6svhmcvnf47rzr8wc7z"; depends=[matrixStats]; };
+  FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
+  fastSOM = derive { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
+  fat2Lpoly = derive { name="fat2Lpoly"; version="1.0.2"; sha256="1v5lrs2jksqiaavyhrsa2kjcw84wzg98g3v0kyx7jhmq8686027g"; depends=[kinship2 multgee]; };
+  FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; };
+  fBasics = derive { name="fBasics"; version="3010.86"; sha256="1ij7f030r12g7s4jfykyfbnfwxwy777smccf9aw0imrz5ik6qjaj"; depends=[MASS timeDate timeSeries stabledist gss]; };
+  fbati = derive { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[pbatR fgui rootSolve]; };
+  FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; };
+  FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
+  fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[timeDate timeSeries fBasics]; };
+  fbRanks = derive { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
+  fcd = derive { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[glmnet MASS combinat]; };
+  fCertificates = derive { name="fCertificates"; version="0.5-3"; sha256="1m0kglsr6g0f7m8r9ls95zj3hmjqq83whyk6svar39p13vabadw6"; depends=[fBasics fOptions fExoticOptions]; };
+  fclust = derive { name="fclust"; version="1.0.1"; sha256="1xl8mw4wfwp9n9fmfmzxz8k8qyrk62qr77j085b3kgp7a85dp8ma"; depends=[]; };
+  fCopulae = derive { name="fCopulae"; version="3000.79"; sha256="0khinbvma19zcp01qjqishwjlzj99qfggldnsasvbyq13hdj1zf0"; depends=[sn timeDate timeSeries fBasics]; };
+  fcros = derive { name="fcros"; version="1.1"; sha256="1wnsjghcs0gfqzl6v95zf0cxm3apnii92b2gxg3hkbgmc6xjm5bf"; depends=[]; };
+  FD = derive { name="FD"; version="1.0-11"; sha256="18g2fn6s60hxnasrj58450bjsf4kz62mypyby9avs5anlwihj8gm"; depends=[ade4 ape geometry vegan]; };
+  fda = derive { name="fda"; version="2.4.0"; sha256="1jj4s3dk2l2r871la848bawyjm62w2w1669xa7cqc7xqid78ry68"; depends=[Matrix]; };
+  fdakma = derive { name="fdakma"; version="1.0"; sha256="19bzc02vcgh847xihjf5y9qfm1jsvygmfddf31hnszr3rgqchpl0"; depends=[]; };
+  fdaMixed = derive { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp]; };
+  fdasrvf = derive { name="fdasrvf"; version="1.4.2"; sha256="12x04fi0sxs9yh1mf9iykk69zlz6m31j7s01in28p5hgk6wqf8fi"; depends=[foreach mvtnorm matrixcalc numDeriv]; };
+  fdatest = derive { name="fdatest"; version="1.0"; sha256="0m17abycfczkhwmrmjg43ra3fcaqicr15v2frwfgr5p1wj9x0gwq"; depends=[fda]; };
+  fda_usc = derive { name="fda.usc"; version="1.1.0"; sha256="0b7g4qjf0sjk438cflviz0yh9addy6ra8aiq7nwvx3dg2vx13gm3"; depends=[fda MASS mgcv]; };
+  FDboost = derive { name="FDboost"; version="0.0-5"; sha256="1xra0g46kicq74cpjby6y1va2bxvx8b9fiy76mdg1s6n8m6r1pxn"; depends=[mboost Matrix mgcv zoo nnls]; };
+  fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
+  FDRreg = derive { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda Rcpp mosaic]; };
+  fdrtool = derive { name="fdrtool"; version="1.2.12"; sha256="15c1ikddwzzl3mq2dcwjicjg46k436m315dhmkxmbwilrdqlcrn6"; depends=[]; };
+  fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
+  fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; };
+  FeaLect = derive { name="FeaLect"; version="1.3"; sha256="0an548y067g2n7xbg6slxnlaxzn71nwq28cdf9788w4zs98gh9c9"; depends=[lars rms]; };
+  feature = derive { name="feature"; version="1.2.10"; sha256="0jsqa2mv4kxzx3jh1lakg62f15776yzc8clj7wyijnx4jbkx8k8j"; depends=[ks]; };
+  features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
+  fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
+  FeedbackTS = derive { name="FeedbackTS"; version="1.0"; sha256="0xbpjyhz24cdc0kz0i96mwd6375x6kbipjs6zqhyh2z7pckvd6sb"; depends=[maps mapdata proj4 geoR]; };
+  fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; };
+  fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; };
+  fExtremes = derive { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[timeDate timeSeries fBasics fGarch fTrading]; };
+  ff = derive { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
+  ffbase = derive { name="ffbase"; version="0.11.3"; sha256="0n65i2a91jjjpzfw3placf6j6sbf8azzd1sck4adha6iiwpi8b1n"; depends=[ff bit fastmatch]; };
+  FFD = derive { name="FFD"; version="1.0-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; };
+  FField = derive { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; };
+  ffmanova = derive { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; };
+  fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; };
+  fftwtools = derive { name="fftwtools"; version="0.9-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; };
+  fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
+  FGalgorithm = derive { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
+  fGarch = derive { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[timeDate timeSeries fBasics]; };
+  FGN = derive { name="FGN"; version="2.0-11"; sha256="01l6gddxqg7cqlw1anskmzfs58yxr7a5zib8ayln19xrvws6c0v8"; depends=[ltsa akima ltsa]; };
+  fgof = derive { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
+  FGSG = derive { name="FGSG"; version="1.0"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; };
+  fgui = derive { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
+  FHtest = derive { name="FHtest"; version="1.1"; sha256="0yqy3lvxjhk7biqfikxqlgs9zsy1vlld9pqxhgxmq04gbnjn2jfk"; depends=[interval MLEcens MASS KMsurv]; };
+  FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
+  fICA = derive { name="fICA"; version="1.0-0"; sha256="054dg6ikps0ynfy06y95an5mi2wwqx88ylk5qcifxhjiylw36v5v"; depends=[JADE]; };
+  fields = derive { name="fields"; version="6.9.1"; sha256="004arwyhzps19ljjlx30qqm080r3a3bhq8kglvrnvpgzjxrl68x0"; depends=[spam maps]; };
+  FieldSim = derive { name="FieldSim"; version="3.1.3"; sha256="0ap1mfsjj3bflpryn0y8h9kg5mzfrnqj6h9f3m5ja32yjv19ql60"; depends=[rgl RColorBrewer]; };
+  fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
+  filehash = derive { name="filehash"; version="2.2-2"; sha256="0766wrc42qh7r99bd2zy50vvdnqlz0vkzplskzkm5f4g63qdhjxh"; depends=[]; };
+  filehashSQLite = derive { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[filehash DBI RSQLite filehash DBI]; };
+  fImport = derive { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; };
+  financial = derive { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
+  FinancialInstrument = derive { name="FinancialInstrument"; version="1.1"; sha256="19sszdrqipy9i8g2bda9v8i9g5c9w584si4va35fq3i929yv7hrl"; depends=[quantmod xts zoo]; };
+  FinAsym = derive { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
+  FinCal = derive { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 reshape2 scales RCurl]; };
+  FindAllRoots = derive { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
+  FindIt = derive { name="FindIt"; version="0.3"; sha256="0bnyfv9xc5c9bzc34qpbnk6s9mvnzkx9zswjr3j210f518y8z45f"; depends=[glmnet lars glmnet lars]; };
+  FindMinIC = derive { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
+  findpython = derive { name="findpython"; version="1.0.1"; sha256="0fa01znc9cckj4ay4zmwmssm2lkhmsw6h07y1pwgd6z1b2pj7bns"; depends=[]; };
+  fingerprint = derive { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; };
+  FinTS = derive { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
+  FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; };
+  fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
+  FisHiCal = derive { name="FisHiCal"; version="1.0"; sha256="17ga4d6ln8zz24s0iirv6a0z5wys9d8si7r8zsjdxnsgnhiwdxad"; depends=[igraph RcppArmadillo]; };
+  fishmethods = derive { name="fishmethods"; version="1.6-0"; sha256="1vp125sg3fy02zj5rbvgq4aymg1dj8g54kq5ss78c7rzwww7a560"; depends=[MASS boot bootstrap]; };
+  fishMod = derive { name="fishMod"; version="0.24"; sha256="1kjn94zvcxqx1j26f99ih1yffzv626x3lfhg7z2imypffm955ap3"; depends=[]; };
+  fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; };
+  fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="1xy334svv7cc3xh2j33q6icnibxl46yvnxw8bd4xrpclg4xchc1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
+  FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; };
+  FitARMA = derive { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
+  fitdistrplus = derive { name="fitdistrplus"; version="1.0-2"; sha256="1m35zicxm5gfc9wgp7lx7ymy06nr4s9fcwc07iky40xh65kps0s5"; depends=[survival]; };
+  fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
+  fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
+  FITSio = derive { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
+  fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
+  FKF = derive { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
+  flare = derive { name="flare"; version="1.3.0"; sha256="1i2lwda8whzxhi834fcwx87nc19z4xxv2l9rzavxgsdsfjh0nx83"; depends=[lattice MASS Matrix]; };
+  flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
+  flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
+  flexCWM = derive { name="flexCWM"; version="1.1"; sha256="0vxzf3ifmpg7l13bvbmv6h5a3gmn2h1xvkq354lvy4s8znk643c4"; depends=[numDeriv mnormt mclust ellipse mixture Flury]; };
+  flexmix = derive { name="flexmix"; version="2.3-11"; sha256="14nv6dxpgm9nr01rcz32x42agr4xi2anyss2fiywjidwbdgj50iy"; depends=[lattice modeltools nnet]; };
+  FlexParamCurve = derive { name="FlexParamCurve"; version="1.4-3"; sha256="1056lxs9c2bbh2i2gv1bv2sy8gq6k6p0jpl1d3axqd1xk5pipm2x"; depends=[nlme]; };
+  flexsurv = derive { name="flexsurv"; version="0.3"; sha256="0ig0151843qfc4pvk9mh80kly1n9mq9aphwkwligm9llspiwbcja"; depends=[survival muhaz mvtnorm]; };
+  flip = derive { name="flip"; version="2.4.2"; sha256="0qyn5y66hx4zbpxz2n56zazih44qrdi8lllq6awfin1dn8yx9xip"; depends=[e1071 someMTP cherry Rcpp]; };
+  FLLat = derive { name="FLLat"; version="1.1"; sha256="1h2nfx7gb66hjdfkdm6im6n8c1fjdz9csg39pckb47c0khl3g9r0"; depends=[gplots]; };
+  flora = derive { name="flora"; version="0.1"; sha256="1bccx65aw2z44h8j9q2f6yqz5745h7l3q9nz0fjc9sqbyd4n1wpw"; depends=[RCurl XML rjson]; };
+  flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
+  flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
+  FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; };
+  Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
+  flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
+  fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; };
+  FME = derive { name="FME"; version="1.3.1"; sha256="1wylpxr9m65ksizjhn97082kfkf9m451qraw93cgn5660skxw7d8"; depends=[deSolve rootSolve minpack_lm MASS coda]; };
+  fmri = derive { name="fmri"; version="1.5-0"; sha256="1a40rpm86kpqbq7hsfl3a3zkm3i938wdhdwf8vplrd117f15jbyb"; depends=[]; };
+  fmsb = derive { name="fmsb"; version="0.4.4"; sha256="16kbbxlxwa1dnsyqw30rjwygh09cn0131zk2zswv7zq1imxniayr"; depends=[]; };
+  FMStable = derive { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; };
+  fmt = derive { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
+  fMultivar = derive { name="fMultivar"; version="2152.77"; sha256="1gli46v7gvfbmbqvlam5g858ggyr8bl6ndbrqidq4bd1pdb8s9sl"; depends=[sn timeDate timeSeries fBasics]; };
+  FNN = derive { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
+  fNonlinear = derive { name="fNonlinear"; version="3010.78"; sha256="0pmz16b606i3mx05zjln4nyl53ks7rlwgm45ldr9qgmw51pflwz9"; depends=[timeDate timeSeries fBasics fGarch]; };
+  foba = derive { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
+  fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
+  foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
+  fOptions = derive { name="fOptions"; version="3010.83"; sha256="01yr3hrfiq4hjhidl5pl1gcqg0myg4acmnipjhq70l3q50cfjm8l"; depends=[timeDate timeSeries fBasics]; };
+  forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
+  foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
+  ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; };
+  forecast = derive { name="forecast"; version="5.3"; sha256="1nb4llzvkawxd5iwq50wj07w17v2bnz4ynddgrvs3k719fdqi9i2"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace]; };
+  foreign = derive { name="foreign"; version="0.8-61"; sha256="0r994z3ihvrbfhzpvp2dkxbfgkbmccgrryfaxmy1vi56v59n73w8"; depends=[]; };
+  forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
+  forensim = derive { name="forensim"; version="4.3"; sha256="1j92imykw48cciay0r6n1aq1jrdb2b1grrz6lpc4kgbnbd7mk0qm"; depends=[tcltk2 tkrplot]; };
+  ForImp = derive { name="ForImp"; version="1.0.2"; sha256="1qplsg3cxs95b3ax71a3wyjfk4q207k72ggba2sl0zc7mjqhv1f4"; depends=[homals sampling mvtnorm]; };
+  fork = derive { name="fork"; version="1.2.4"; sha256="1sb4xypirmrknhrc872ky845kym58dmakn6c2crsbp67wpg63m4l"; depends=[]; };
+  FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
+  formatR = derive { name="formatR"; version="0.10"; sha256="0rxm4c896rcmalmq1hsjg053dqb3m2vf9jqap5w5bsllaiakwh4a"; depends=[]; };
+  Formula = derive { name="Formula"; version="1.1-1"; sha256="06lrl2yv58qhgnyc44cbzf8av4pr8gfizn00mmbb54wl685cr9g1"; depends=[]; };
+  formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
+  fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
+  forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
+  fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; };
+  FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
+  fpc = derive { name="fpc"; version="2.1-7"; sha256="1zymk2v7s8jyn4jm3qaxzd5rlx748ap4ad2dd56w195q5j1xn4bh"; depends=[MASS cluster mclust flexmix]; };
+  fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
+  FPDC = derive { name="FPDC"; version="1.0"; sha256="0f6f5bjh1dqv9n6hpbgj922ymbd1zdb0b4ad5h9nk1c6c9ysai7y"; depends=[ThreeWay]; };
+  fPortfolio = derive { name="fPortfolio"; version="2130.80"; sha256="0i1f60nc6xn9a3cvq2m8hzvvcbqgyjj08f71410kd5vqyk58gahw"; depends=[MASS robustbase timeDate timeSeries fBasics fAssets quadprog Rglpk]; };
+  fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
+  fpp = derive { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[forecast fma expsmooth lmtest tseries]; };
+  fptdApprox = derive { name="fptdApprox"; version="2.0"; sha256="152bajs76wrapp0zdbkckff6kdkkm6sqqlqd2w220hsi96l2p9dh"; depends=[]; };
+  fracdiff = derive { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
+  fracprolif = derive { name="fracprolif"; version="1.0.5"; sha256="0d028dkiwv8jlsnvdv3wqgx6vsl2ai0icpdadl66sjj45yxv1z7g"; depends=[emg numDeriv]; };
+  fractal = derive { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[splus2R ifultools sapa wmtsa scatterplot3d]; };
+  fractaldim = derive { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
+  fractalrock = derive { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger timeDate quantmod]; };
+  FRACTION = derive { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
+  frailtyHL = derive { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
+  frailtypack = derive { name="frailtypack"; version="2.6"; sha256="1mwglniv7v2ivx5hkg12l61w95bzc7nh9q89fvn3hrdy9s4zpg3h"; depends=[survival boot MASS survC1]; };
+  frair = derive { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle emdbook boot]; };
+  FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; };
+  FRB = derive { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
+  FRBData = derive { name="FRBData"; version="0.3"; sha256="1m109kmk7pimin6wspck0yc1am4d7w75f1b8lr5kb9xzl9gw4i7c"; depends=[xts]; };
+  frbs = derive { name="frbs"; version="2.2-0"; sha256="13m8hm2925h1mz2wgbsxiqls5gy7sgvp0rsdcsy2sm7czjnl2z7n"; depends=[]; };
+  FRCC = derive { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[CCP MASS calibrate corpcor]; };
+  freeknotsplines = derive { name="freeknotsplines"; version="1.0"; sha256="19zs42q9njknirdbrbnp8bv4vr32kd8wxmkqj0a0nh06i5fcx67r"; depends=[]; };
+  freestats = derive { name="freestats"; version="0.0.2"; sha256="167z75scm5jasm7zz38n6sq6ryi10xaj694riyqlczw55ac3csn7"; depends=[MASS mvtnorm]; };
+  fRegression = derive { name="fRegression"; version="3010.80"; sha256="07ncfp103a4g98xhfh89r0ixgwgd1l7d7fkr2xwi39lrjdfxk97h"; depends=[fBasics fTrading fMultivar mgcv nnet polspline lmtest MASS]; };
+  FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
+  freqMAP = derive { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
+  freqparcoord = derive { name="freqparcoord"; version="1.0.0"; sha256="0hn5y10yp3j76lqrmj6dsaafamgy4pfxx1p4y92z17s79x29j59q"; depends=[ggplot2 GGally FNN mvtnorm]; };
+  freqweights = derive { name="freqweights"; version="0.0.1"; sha256="062av7fv17xzkpymlmaajby4jp39d26qdr08mrbys6hdgcdrk5zd"; depends=[plyr data_table dplyr biglm fastcluster]; };
+  FrF2 = derive { name="FrF2"; version="1.7"; sha256="1z6ld8m0xmqb1dpvmaq36n2yz6b5j6jxll8pj2qav8x1055n3wfm"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
+  FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
+  frm = derive { name="frm"; version="1.0"; sha256="1pxzywyvh95i57g2ppj4qhl4j47s46kmhc6xlvmghw44c3pynfyz"; depends=[]; };
+  frmqa = derive { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; };
+  frontier = derive { name="frontier"; version="1.1-0"; sha256="0k2ap22qddzki63biikr1jzi5vmqz4j06d7qrf1y8axdq1q1cr44"; depends=[micEcon lmtest moments Formula miscTools]; };
+  frontiles = derive { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
+  frt = derive { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
+  fscaret = derive { name="fscaret"; version="0.8.5.6"; sha256="060i64q65ra2npxvrd6ihzqqqv3s4xyisvgrskkyybswhqzvhxvr"; depends=[caret gsubfn]; };
+  FSelector = derive { name="FSelector"; version="0.19"; sha256="1b9jj8lqly31v393mx9dmr437sw0pk7m693ah4xnr2c9vjry6fav"; depends=[randomForest RWeka digest]; };
+  fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
+  fSRM = derive { name="fSRM"; version="0.3.4"; sha256="013nlz28nyyx59w8rbyqh074kzabkkb0zfm9vpk5ay4nd2i9a28r"; depends=[lavaan plyr reshape2]; };
+  FTICRMS = derive { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[Matrix lattice]; };
+  ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
+  fTrading = derive { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[timeDate timeSeries fBasics]; };
+  fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo]; };
+  ftsa = derive { name="ftsa"; version="3.9"; sha256="1fbaclaj7a74gvy7kax45vg0805jp7myr5929mj90lymazm7r76j"; depends=[forecast rainbow colorspace]; };
+  fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp]; };
+  fume = derive { name="fume"; version="1.0"; sha256="0g9ygyjxsk0m3ad25h3bcgxs9g29blqn8p27s9g47kxvh4v1nq4y"; depends=[chron]; };
+  fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
+  FunChisq = derive { name="FunChisq"; version="1.0"; sha256="1wrj483w6fjwwqjbymdj229nismmwaxw6v6fpba9mylqbyhs69gc"; depends=[]; };
+  FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
+  Funclustering = derive { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp]; };
+  FuncMap = derive { name="FuncMap"; version="1.0-2"; sha256="0psz2bsmq22ghgr3dijsw094b9ams15dvknigcgi5sq1invafx4a"; depends=[mvbutils]; };
+  functional = derive { name="functional"; version="0.4"; sha256="1a3hka0ba9bbpk5bnb4vhygxyw88hif636hw8wwdjx55wq6sbl85"; depends=[]; };
+  fUnitRoots = derive { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[urca timeDate timeSeries fBasics]; };
+  FusedPCA = derive { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
+  futile_any = derive { name="futile.any"; version="1.3.0"; sha256="1c7pj64kz09qzwrxvkp1w1w8mvxwq36zkj6w4b7yyi8v7x3daq2a"; depends=[lambda_r]; };
+  futile_logger = derive { name="futile.logger"; version="1.3.7"; sha256="0mcca1d70a173f2c54g05fp6174z3265bc4z73k8hs16sfb3s7zf"; depends=[lambda_r futile_options]; };
+  futile_matrix = derive { name="futile.matrix"; version="1.2.0"; sha256="0nas464z70318d8mh81k7w28889jqva5ghisnknzin1rsrpws0zg"; depends=[futile_logger futile_any RMTstat]; };
+  futile_options = derive { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
+  futile_paradigm = derive { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
+  fuzzyFDR = derive { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
+  FuzzyNumbers = derive { name="FuzzyNumbers"; version="0.3-3"; sha256="1vbfkr8r1n8d564ws8dqfbd49f33vd7drg3chg2vr9bxh292wsl3"; depends=[]; };
+  fuzzyRankTests = derive { name="fuzzyRankTests"; version="0.3-5"; sha256="1g09506bbpk05a2r2wxjynjs8dmjd2q7x74d83vjscg1kdk4kazq"; depends=[]; };
+  FuzzyStatProb = derive { name="FuzzyStatProb"; version="1.0"; sha256="0dkxix2blb403a72a9n13hyx31rknfxfq0cbkvvk7dvgis2w6k14"; depends=[MultinomialCI FuzzyNumbers DEoptim]; };
+  FuzzyToolkitUoN = derive { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
+  fwdmsa = derive { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
+  FWDselect = derive { name="FWDselect"; version="1.1"; sha256="1snamrzf0cqcm6sc5vr1b0scgy83jgr5hgsf2cjb3vi3j01hz9wd"; depends=[mgcv]; };
+  fwi_fbp = derive { name="fwi.fbp"; version="1.3"; sha256="0fsrqvf4w8izbbkx99syy842bkgm932g5q81k9qsrb0a61l94nsr"; depends=[]; };
+  fwsim = derive { name="fwsim"; version="0.3.1"; sha256="0l9qsysi0v8q58ik0pk7jxs2m57q2n82apc0rb0d0czm7dmib6b6"; depends=[Rcpp]; };
+  fxregime = derive { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[zoo strucchange car sandwich]; };
+  G1DBN = derive { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[MASS igraph]; };
+  G2Sd = derive { name="G2Sd"; version="2.1-1"; sha256="01b7bpvnl51dms7bp076v0mbz8bk2vrlkqji9fk6nyqfpxg5zn6a"; depends=[shiny xlsx rJava xlsxjars]; };
+  GA = derive { name="GA"; version="2.0"; sha256="0bcxxjbsbv4m8dn02dw74gidcjn1jilmp88ckz6w5dnhdm74d42z"; depends=[]; };
+  GA4Stratification = derive { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; };
+  GABi = derive { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
+  GAD = derive { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; };
+  gains = derive { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
+  GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
+  galts = derive { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[genalg DEoptim]; };
+  gam = derive { name="gam"; version="1.09.1"; sha256="09p83ki821x57kc74klh6i1h8bz3acsrvibz3mzzcgq6sa8gzr5i"; depends=[]; };
+  gamair = derive { name="gamair"; version="0.0-8"; sha256="11qwmhrzks8gi9is2n9xcy6cviy7a8mwh2v78fw78x7g7ccd8i9x"; depends=[]; };
+  gambin = derive { name="gambin"; version="1.0"; sha256="01jsh9h83s0lh887s6gfhb074k8cv96jhj8x6bkql5g948p2b0p0"; depends=[]; };
+  GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
+  gamboostLSS = derive { name="gamboostLSS"; version="1.0-3"; sha256="04p3f2vq2h2abqjm0hf0g29anw18b338d6apyfm438glji60fm5y"; depends=[survival mboost]; };
+  gamboostMSM = derive { name="gamboostMSM"; version="1.1.5"; sha256="1n6ngbxx9f3p98jfiq4x21y0rqmhy18zyv13y8mkrz7hrchh835f"; depends=[mboost]; };
+  gamclass = derive { name="gamclass"; version="0.52"; sha256="0ypdsjmzj5vj6z5iimx1xva6pqh75s1dlaar2hkyn8zx08d0q2kh"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; };
+  games = derive { name="games"; version="1.1-1"; sha256="0qw2pfigkqfwldam45q786fksz7ssldh62cw6rxclb4j14c8ibig"; depends=[maxLik Formula MASS stringr]; };
+  gamlr = derive { name="gamlr"; version="1.11-3"; sha256="01mwgmmyp132d792darjrfbcihw04sy3fyw2xchshjqry616j82i"; depends=[Matrix]; };
+  gamlss = derive { name="gamlss"; version="4.2-8"; sha256="13562jiilcci20v0j5p04jvh2bs4r31svv54d9gar3hn8syhn3wp"; depends=[gamlss_data gamlss_dist nlme MASS survival]; };
+  gamlss_add = derive { name="gamlss.add"; version="4.2-8"; sha256="1spa5ds68a5r7ihiimybm1rm6n21r1csxn9asjxrb6v2vi3kiy34"; depends=[gamlss mgcv nnet rpart]; };
+  gamlss_cens = derive { name="gamlss.cens"; version="4.2.7"; sha256="1dy8myravipsa3cmkdwy3m46s419fhck0f0yz1kf6qlvxxr7a4m4"; depends=[gamlss gamlss_dist survival]; };
+  gamlss_data = derive { name="gamlss.data"; version="4.2-7"; sha256="0g3fmqrwxmj14r0p0ai1adq6cs3bd3ys47gjcja035xjiajg6cs2"; depends=[]; };
+  gamlss_demo = derive { name="gamlss.demo"; version="4.2-7"; sha256="1mlfkm290dk8fvfahmrr7adhw0bj4923zjs2xn0fvbj739rgv6b7"; depends=[rpanel gamlss gamlss_tr gamlss_util]; };
+  gamlss_dist = derive { name="gamlss.dist"; version="4.2-7"; sha256="0fbr2zcc4vf6hyi1b09n6j0jr578m9xjpiw4bv5gzk5xkx9w3sbr"; depends=[MASS]; };
+  gamlss_mx = derive { name="gamlss.mx"; version="4.2-7"; sha256="0k1isn2mavmwm15jk4gp9r3ks6z9pwd7k3xdsc29b9p8v8iapj4q"; depends=[gamlss nnet MASS]; };
+  gamlss_nl = derive { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
+  gamlss_spatial = derive { name="gamlss.spatial"; version="0.1"; sha256="0lsq3lfv9gxjvnbnib551sfvcn6g9amwg51q5ipwwzh12hdl0m98"; depends=[gamlss spam mgcv]; };
+  gamlss_tr = derive { name="gamlss.tr"; version="4.2-7"; sha256="0f0vmspknkg8039dnrxkjqwjqbl34vjb5sgkcdvy5g8x8dlb5h3w"; depends=[gamlss]; };
+  gamlss_util = derive { name="gamlss.util"; version="4.2-7"; sha256="1c8xc0qf387cd9d6k9fzlwvj9735y7v6njsb5fls2fimpnd5vsik"; depends=[gamlss colorspace Matrix MASS rgenoud zoo gamlss_add spam]; };
+  gamm4 = derive { name="gamm4"; version="0.2-2"; sha256="0jx17gh0rk3a56dx7yhh9hlzj9pi04r9z28vcwqip43x5pxq8y86"; depends=[Matrix lme4 mgcv]; };
+  Gammareg = derive { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; };
+  gammSlice = derive { name="gammSlice"; version="1.2-6"; sha256="19443rfpk9ivv42zy5vdfhs4pcrbcn4d984xnchfbznmddilavg8"; depends=[KernSmooth lattice mgcv]; };
+  GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
+  GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
+  gaoptim = derive { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
+  gap = derive { name="gap"; version="1.1-10"; sha256="02as90x8r93mynwpa1dirp0lplc7i27ya3q7fq6zbq2xn16j4vj5"; depends=[]; };
+  gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
+  gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; };
+  gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
+  gbm = derive { name="gbm"; version="2.1"; sha256="1a150ksvdbdv8b5f4j62q7v68sbgjvvq0izm4d877izp6d8qd99g"; depends=[survival lattice]; };
+  gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
+  gbs = derive { name="gbs"; version="1.0"; sha256="19zcsvd258ibrj356zlwgryjqylcs56agg3z6d44xbnf8prg05ig"; depends=[nlme]; };
+  gcbd = derive { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[RSQLite plyr reshape lattice]; };
+  GCD = derive { name="GCD"; version="3.0.3"; sha256="19y6xk6qzc8vc7q6svjqinlr97yb9mir0cd4ji9fgplrmgs7qdf7"; depends=[sp raster ggplot2]; };
+  gcdnet = derive { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; };
+  gcExplorer = derive { name="gcExplorer"; version="0.9-4"; sha256="1ig5m278n8mp93z1c8z39mf1zwwlkl38csn6d6ykpnrfpa3kk65a"; depends=[flexclust flexclust modeltools]; };
+  gclus = derive { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
+  gcmr = derive { name="gcmr"; version="0.6.1"; sha256="0a47xpgi6bfsc0nn7vkid1q9r29h01q0vjkysaxh1i4zbmxnx5dl"; depends=[nlme sandwich geoR betareg Formula]; };
+  gconcord = derive { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
+  gcookbook = derive { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; };
+  gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xrkvc98i2hm3lvna4jw7p89gn2bf74kzphqpmy"; depends=[sp foreach R_utils]; };
+  gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; };
+  g_data = derive { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
+  GDAtools = derive { name="GDAtools"; version="1.1"; sha256="0r1d98wavzwg3icr3czfzmcf1d86nwzq2s6avqkh4h0sank220wn"; depends=[FactoMineR]; };
+  GDELTtools = derive { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
+  gdimap = derive { name="gdimap"; version="0.1-3"; sha256="14cij862r2i1056hd67dy6yhx3xwhbypi8hy8fjpj8hnrv27ylmx"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
+  gdistance = derive { name="gdistance"; version="1.1-5"; sha256="12877mg0ih346h62xa087xwbrqrjvdh0fs8avrvyy4qpqls2s7qn"; depends=[raster igraph Matrix sp]; };
+  gdsfmt = derive { name="gdsfmt"; version="1.0.4"; sha256="13iynlcvbgwlh34gn8h5x39lvm6hsf4314620079bzwdmrribqhy"; depends=[]; };
+  gee = derive { name="gee"; version="4.13-18"; sha256="0zfxmjajbgr7999gbnqppq43zzk901kqra7b1d5fa2qn8js6h1ng"; depends=[]; };
+  geeM = derive { name="geeM"; version="0.7.1"; sha256="0pzvy0ga17g5v5dd2q4q7fmcwj3nws0p1cg5s0dz3azmrj7n4s31"; depends=[Matrix]; };
+  geepack = derive { name="geepack"; version="1.1-6"; sha256="0ixwrr2jjrqzh23zg9cibayinjxzgdpia9znsv7qwhc7hx23a2zm"; depends=[]; };
+  geigen = derive { name="geigen"; version="1.3"; sha256="16zz3k4j75hn1dkzydsxnk0jblka22fbww7ak9lgg1znkfws6dhk"; depends=[]; };
+  geiger = derive { name="geiger"; version="2.0.1"; sha256="11rrdymwj9wl11sqi3rxfl7vr86w86m5460k04v35kn8sf0g3gw2"; depends=[ape MASS mvtnorm subplex deSolve digest Rcpp coda]; };
+  gems = derive { name="gems"; version="0.9.4"; sha256="1i0dygrdvqjmham5ay64if7lg9fji53p94acnayhn4893wmy98ma"; depends=[MASS msm mstate plyr data_table]; };
+  gemtc = derive { name="gemtc"; version="0.6"; sha256="03aw5r62577fizvbl7wpl7k3m8bxji21h8a41gl8yr4fpj0353yj"; depends=[coda igraph meta XML]; };
+  gemtc_jar = derive { name="gemtc.jar"; version="0.14.3"; sha256="18hbiygpsv67flc4v6z6mir0rfq41v1vsh11dg9phmdr8bx4kcl1"; depends=[rJava]; };
+  GenABEL = derive { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[MASS GenABEL_data]; };
+  GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
+  genalg = derive { name="genalg"; version="0.1.1.1"; sha256="0f6j3zj9frnjhs4rrcn05z2bmp6c7d1blpwjqg7ckfwk46x61app"; depends=[]; };
+  GenBinomApps = derive { name="GenBinomApps"; version="1.0-1"; sha256="1iz66j8jv5rym5zzn200ybdcyxzb9nr8yj6qwsgy1syljw95adx2"; depends=[]; };
+  GENEAread = derive { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
+  GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; };
+  GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
+  GeneFeST = derive { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
+  Geneland = derive { name="Geneland"; version="4.0.4"; sha256="14crcj71i4vc48a132k024jrkwlwbrqi6jd9w3d1qsy6dn7inc0k"; depends=[RandomFields fields]; };
+  geneListPie = derive { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
+  GeneNet = derive { name="GeneNet"; version="1.2.9"; sha256="1hlifd4a3v4whb6cxdmf7vawbsjyrg2skz9hp6bb26cn2y0q45gr"; depends=[corpcor longitudinal fdrtool igraph]; };
+  genepi = derive { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
+  GeneralizedHyperbolic = derive { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="1q7bagq6c4an5jprypab5121ymich55xgyxfxnj5izihssmcwssp"; depends=[DistributionUtils RUnit]; };
+  GeneReg = derive { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
+  geneSignatureFinder = derive { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[survival cluster class]; };
+  genetics = derive { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
+  GeneticTools = derive { name="GeneticTools"; version="0.2.1"; sha256="0iz4afkm9gp6sdriyv0b0dhwwjmjpw92i2x7dihra12bb3z1mqvp"; depends=[gMWT Rcpp RcppArmadillo plotrix]; };
+  GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
+  genlasso = derive { name="genlasso"; version="1.2"; sha256="0ahkml10nvx1sfikl0ai3yfs5gzps7ss9aymsg1wy494p95riwz5"; depends=[MASS Matrix igraph]; };
+  genMOSS = derive { name="genMOSS"; version="1.1"; sha256="08d6j0iwfah1ianqdr884hh6bg04vfk4kml3clmf7vzx8wfmliy5"; depends=[]; };
+  genMOSSplus = derive { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
+  genomicper = derive { name="genomicper"; version="1.3"; sha256="0fpvf286x0rf2mg9x82668kg5fx90arz5vf3731qinmdnnvrpziv"; depends=[]; };
+  genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5gk0qzszp81x52lpwpk3z4cg0bgxi9zbwmw467"; depends=[ade4]; };
+  GenOrd = derive { name="GenOrd"; version="1.2.0"; sha256="1aypz879r2fc8zd7lnd1d2ic3zgx9gpz4gxmfqyhb5gfkg50xhlg"; depends=[mvtnorm Matrix MASS]; };
+  genridge = derive { name="genridge"; version="0.6-3"; sha256="01rjvfjmdn0hxgydvrinl4md74n0ndvqcib4m59q6f67m3qnylfr"; depends=[car]; };
+  GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; };
+  gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
+  genSurv = derive { name="genSurv"; version="1.0.1"; sha256="17f9ccg9r0lpakhmk4wxqycb2qi13ql4l7bmf2sw27icv2zh9lhm"; depends=[]; };
+  geoChina = derive { name="geoChina"; version="1.0"; sha256="06sqzg4jn8nv2mg5qm3kps482jb5av9ag4b71lc2y66w4qsr2k5r"; depends=[RCurl RJSONIO plyr]; };
+  geoCount = derive { name="geoCount"; version="1.131209"; sha256="0v9nsqhwf58czq4vh9f2yim2r7w9sfx9g9hp4jdbfy4q7jc5m02a"; depends=[Rcpp RcppArmadillo]; };
+  GeoLight = derive { name="GeoLight"; version="1.03"; sha256="0l2p4rcmk33dj31xy06652mn05d2dhnny3xpzcf12kxyflpipdgr"; depends=[maps changepoint]; };
+  GEOmap = derive { name="GEOmap"; version="2.2-2"; sha256="1kp9sdp51zcz98bk03pknya9g5fhz2i677wgacabq402yjhfgn80"; depends=[RPMG splancs MBA]; };
+  geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
+  geometry = derive { name="geometry"; version="0.3-4"; sha256="1rplvy7528v270c4pdxxb34h7mfdd6141dnb9aw59xc0sd9cx0lv"; depends=[magic]; };
+  geomorph = derive { name="geomorph"; version="2.0.1"; sha256="12alj8lkajqxjlkp9apay6lvvh526qr5jxqn70ld6ppxmsl120zy"; depends=[rgl jpeg calibrate vegan ape geiger]; };
+  geonames = derive { name="geonames"; version="0.8"; sha256="0k8jx3jf0aa51vp3mm21skr4cf9hhpyjx3nprbaclpylvwlzjbhf"; depends=[rjson]; };
+  geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
+  geoR = derive { name="geoR"; version="1.7-4"; sha256="00868h4rvw923n2b7v191rcr10vyyljxzg3dl7hgc7al1c98gjwq"; depends=[sp MASS splancs RandomFields]; };
+  geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; };
+  georob = derive { name="georob"; version="0.1-2"; sha256="1j4l3hri7k1fy8q5g48xc5fnvcw7y1wvhzxvizjqrf06rrh00hn6"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase]; };
+  geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
+  geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
+  geosphere = derive { name="geosphere"; version="1.3-8"; sha256="1ldg3lrz9plhr5b1dgnc2nj5srpv23xxma83kcd7aicll4x1jmbw"; depends=[sp]; };
+  geospt = derive { name="geospt"; version="0.5-0"; sha256="0bpflmj1kx2fph5b9dfy57bxdqjhpwnn8050k8afky5fmiwzm708"; depends=[geoR gstat genalg limSolve MASS plyr TeachingDemos gsl]; };
+  geostatsp = derive { name="geostatsp"; version="0.9.7"; sha256="1i8ri78zq0w4n0aw9z4ws15nrv488421p1937cvbmxfzvf3gr4gr"; depends=[Matrix raster sp]; };
+  geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
+  geotopbricks = derive { name="geotopbricks"; version="1.3.5"; sha256="0036lb60wfwy602c85ngmgnnjk4cw8wqscqq2l64gbzxh6ax6qcd"; depends=[raster stringr zoo]; };
+  GeoXp = derive { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[quantreg rgl spdep KernSmooth rgeos robustbase splancs]; };
+  geozoo = derive { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
+  GESTr = derive { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[mclust gtools]; };
+  GetNenshuJP = derive { name="GetNenshuJP"; version="0.1"; sha256="0s1j58i688zj64xmjyswk03vxz2ndvj204rncy3wc3fjfrpr2asv"; depends=[XML]; };
+  getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
+  GetoptLong = derive { name="GetoptLong"; version="0.0.3"; sha256="132zhvd4qng5q1bwfn2nbvm3628nkbw7c6mdc0wk41a73c2wj37l"; depends=[rjson]; };
+  GetR = derive { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
+  gettingtothebottom = derive { name="gettingtothebottom"; version="2.0"; sha256="1icl2s0qbczvdrn39j5bmaf55ckc9y8qfn6rah8lpy47zkcc6rfs"; depends=[ggplot2 Matrix]; };
+  GEVcdn = derive { name="GEVcdn"; version="1.1.3"; sha256="13p6hkdybs8s2i363z2a65yijqarwj9swvy22ljk61shf2nzbk80"; depends=[VGAM]; };
+  GEVStableGarch = derive { name="GEVStableGarch"; version="1.0"; sha256="007s7lbfpp1bqnyg08rwarsmkxlx16p4is1k3736fmnri9sfp7z6"; depends=[fGarch fExtremes stabledist skewt Rsolnp]; };
+  GExMap = derive { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[]; };
+  gfcanalysis = derive { name="gfcanalysis"; version="1.1"; sha256="1z29y6gx0b9b9h6939vb9pqplcjhi0xb5l3bgjybjad01p2dnqas"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
+  GGally = derive { name="GGally"; version="0.4.5"; sha256="0mfk3g469xk2hdlrhcmgid2qyqwywiihbhgycbaix8z15vc7qrra"; depends=[ggplot2 reshape gtable plyr stringr]; };
+  ggdendro = derive { name="ggdendro"; version="0.1-14"; sha256="0x6bl0v2lkiybc5pdrcak5cslhaw7cxhh6imsrvdhcrzdr4cc45s"; depends=[MASS ggplot2]; };
+  GGEBiplotGUI = derive { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
+  ggHorizon = derive { name="ggHorizon"; version="0.1"; sha256="0k617qnfqdl9w2hdwppkrgl51krnwpdf0gahzvivcwzynbmywc37"; depends=[ggplot2 plyr RColorBrewer proto]; };
+  GGIR = derive { name="GGIR"; version="1.0-4"; sha256="09fqw4al4bn87h9543ais634crk9mzvfzdgp25gwy7lhpwzdl2y0"; depends=[GENEAread matlab]; };
+  gglasso = derive { name="gglasso"; version="1.1"; sha256="1zq1xckb4nlc2acg8p16lx610c87j8ac6v34b8m49d6gjl7r39wp"; depends=[]; };
+  ggm = derive { name="ggm"; version="2.0"; sha256="05980y142qzihawj9s20swqa10lslarrdxn496gacc18dvbnv2cg"; depends=[igraph]; };
+  ggmap = derive { name="ggmap"; version="2.3"; sha256="0sl3jkifba3q0khl5sg2nf08kgn1pirw5a1xag07za51sqda5b5q"; depends=[ggplot2 proto scales RgoogleMaps png plyr reshape2 rjson mapproj]; };
+  ggmcmc = derive { name="ggmcmc"; version="0.5.1"; sha256="17pmb2kfrjc2s538my8finr029vy1npzk44626xvznf6bf6bv895"; depends=[plyr reshape2 ggplot2]; };
+  GGMselect = derive { name="GGMselect"; version="0.1-8"; sha256="1chmyzbn85c5z5b8lvgqpr7knwg25dm7qbb4nhivcdr6ipd1dqr0"; depends=[mvtnorm lars gtools]; };
+  ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwbr87qlqhm8jlrqf7dhdvm1cf0xrwjlkmy6dqjvg"; depends=[ggplot2 reshape2 plyr]; };
+  ggplot2 = derive { name="ggplot2"; version="0.9.3.1"; sha256="00b67911g6msz5yxjfg6sjsh9llyjiizjakih2ciyms4zl279jdl"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
+  ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
+  ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
+  ggtern = derive { name="ggtern"; version="1.0.3.1"; sha256="0w42w0rr0s48s9ax5ccih0l6cp0s097x32zm7mc8yf0zw0gbxcar"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
+  ggthemes = derive { name="ggthemes"; version="1.7.0"; sha256="1wfqh3mq4hyyfgvw99bq1s8qxvl3qasa8qcikfhbp2ky898w5npb"; depends=[ggplot2 colorspace proto scales]; };
+  GhcnDaily = derive { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[R_utils R_oo R_methodsS3 abind ncdf]; };
+  GHQp = derive { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
+  ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
+  GibbsACOV = derive { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
+  gibbs_met = derive { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
+  GIGrvg = derive { name="GIGrvg"; version="0.2"; sha256="15m540xsnw0n7fl03yh2yxj3yfyw76mpra70pr5088258rg7dxkn"; depends=[]; };
+  GillespieSSA = derive { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
+  gIPFrm = derive { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
+  giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
+  GISTools = derive { name="GISTools"; version="0.7-2"; sha256="1n1zzi25xx320gwmsn5rj8c3m1wqwmjbzf32krdzmaqiwvhf7c1b"; depends=[maptools RColorBrewer MASS rgeos]; };
+  gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
+  Giza = derive { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[reshape lattice lattice]; };
+  glarma = derive { name="glarma"; version="1.1-0"; sha256="06sm8kv43ngy495mv020wh350nfmk4djiwh1267xvp97f5sbgmxr"; depends=[MASS]; };
+  glasso = derive { name="glasso"; version="1.7"; sha256="1rl3rnc7c5gd99ffryyi30xgy9zdbwvvnl6bkwgfkfcz6bm0cwlk"; depends=[]; };
+  glassomix = derive { name="glassomix"; version="1.2"; sha256="13a2ly0by58z8djq8nbakpyacgb6nkdsqxjq44yw4v2fy3s22z3n"; depends=[mvtnorm glasso huge]; };
+  glcm = derive { name="glcm"; version="0.3.1"; sha256="0bsvih2fk5liqrhnhs3hlb7p3kcgmyymwhpq0gial0g1dh324p2w"; depends=[Rcpp]; };
+  gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
+  GLDEX = derive { name="GLDEX"; version="2.0.0.0"; sha256="0pskh9wa32im6wrjkqkxczfsds71mx2435yhn7vrna4vzyc2xdvb"; depends=[cluster]; };
+  gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
+  glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; };
+  gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
+  glm2 = derive { name="glm2"; version="1.1.1"; sha256="181s0h4npd759b7m58gnab50hk0xmw884iwmn7xxjvnyi16ll179"; depends=[]; };
+  glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
+  glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
+  glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
+  glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; };
+  glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
+  glmmLasso = derive { name="glmmLasso"; version="1.2.2"; sha256="1av14z8anhnq265kqhqyi1js0p5a38h2l0kn88b08m8rxxzpwx55"; depends=[minqa]; };
+  glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
+  glmnet = derive { name="glmnet"; version="1.9-5"; sha256="1pilqd4cqdhydxzbwqkw2y5zw4g92ihm4zgplpxiig94jwlr7gfp"; depends=[Matrix]; };
+  glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
+  glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
+  glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
+  glmperm = derive { name="glmperm"; version="1.0-5"; sha256="1m6nxk9k5qjmq4kvv1nv7n51hagwxi97pd5a3wgiky3wml4aa2nw"; depends=[survival]; };
+  glmulti = derive { name="glmulti"; version="1.0.7"; sha256="154s72sjp6pz7ki7s4mgn5v62j7h0lfz9mngf40wvmy31da2s8ix"; depends=[rJava]; };
+  glmx = derive { name="glmx"; version="0.1-0"; sha256="0i0p1xk5yk1l274gfr4ijmqnnbq7yyzmi577pb7igwvi3hjn7g7k"; depends=[MASS Formula lmtest sandwich]; };
+  globalboosttest = derive { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
+  GlobalDeviance = derive { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
+  globalGSA = derive { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
+  globalOptTests = derive { name="globalOptTests"; version="1.0"; sha256="0vmly1mh8k5aihlwxfp30gj0qdrwfx2b9bcbs8ccrpfhgcvacnr9"; depends=[]; };
+  glogis = derive { name="glogis"; version="0.1-1"; sha256="02wdncycmnsvj09d1032cns3xbrh92ki5zn9sa3gscw1xzz0yzh6"; depends=[zoo sandwich]; };
+  glpkAPI = derive { name="glpkAPI"; version="1.2.10"; sha256="0xlgccb77xgscfg46pxxcz5k9gm8a913xgp48dfmxw31n7ynckml"; depends=[]; };
+  gmatrix = derive { name="gmatrix"; version="0.1"; sha256="06fbqixjbpxm4k6l132krbmk2jvh4r2s64nlbi9gb3whq55pf4ih"; depends=[]; };
+  GMCM = derive { name="GMCM"; version="1.0"; sha256="1nj16kz7382aif7vgmwwnl998v7c4l63da3cwy3a3vsaxv45v8r9"; depends=[Rcpp RcppArmadillo mvtnorm]; };
+  gMCP = derive { name="gMCP"; version="0.8-6"; sha256="1pr40k4qj4yy9hcp2zx8x4dys9vav7gk4164999wg4psp7f06va0"; depends=[rJava JavaGD MASS PolynomF multcomp mvtnorm Matrix CommonJavaJars]; };
+  GMD = derive { name="GMD"; version="0.3.1.1"; sha256="1vpapfnkn5gfqy033qirblx7xkbh52nw95sxw10v4aajddy0dyx9"; depends=[gplots]; };
+  Gmisc = derive { name="Gmisc"; version="0.6.2.0"; sha256="1q9pswywil1hbvm1g23p4vh29l32rba1lzd6f233hk64plnizl6d"; depends=[Hmisc stringr lattice sp]; };
+  gmm = derive { name="gmm"; version="1.5-0"; sha256="071i2bk73z606yb6a3vrv4cfyvgfwkrirm09i7bg2l3y2is1dfgj"; depends=[sandwich]; };
+  GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; };
+  gmodels = derive { name="gmodels"; version="2.15.4.1"; sha256="1yizjw181bg0ml6j96calflz3k3wpvpxh61hfd3pdba013ixjib5"; depends=[MASS gdata]; };
+  gmp = derive { name="gmp"; version="0.5-11"; sha256="1zlsgmfdnc8p1k6y07bzhgjpxpaj8hicx49xia09acs0n0hpxmdh"; depends=[]; };
+  gmt = derive { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; };
+  gMWT = derive { name="gMWT"; version="0.3"; sha256="15d681j913zmw6yknj7n6bmij127vcx0i41ag3rgr7mq2pn4nv24"; depends=[clinfun Rcpp RcppArmadillo]; };
+  gnm = derive { name="gnm"; version="1.0-7"; sha256="1jnh39i4462ky9vwnrlwq30d8qbp0jg73p8mwm6hnl8sdh53nkr1"; depends=[MASS Matrix nnet qvcalc relimp]; };
+  gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; };
+  gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; };
+  goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
+  gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
+  GoFKernel = derive { name="GoFKernel"; version="1.0"; sha256="0x3g7m1vi5xrsda4lvmzr4ggicyiiwc00w3rg4v036hdbp8yjv6h"; depends=[KernSmooth]; };
+  goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn434yjx1690bxbh41ckvb92hnx"; depends=[gPdtest mvShapiroTest]; };
+  GOGANPA = derive { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
+  gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; };
+  googlePublicData = derive { name="googlePublicData"; version="0.12.05"; sha256="01wilag2h55zdxxim2h06k0l93csi2nl7iqjnmk4yf9ayz226bc8"; depends=[XML XLConnect]; };
+  googleVis = derive { name="googleVis"; version="0.5.1"; sha256="0sf2yhxj65gg4c3rrhndq6jmvz34h6dw4zipcw7vd7dyyp1fi3wb"; depends=[RJSONIO]; };
+  gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
+  goric = derive { name="goric"; version="0.0-7"; sha256="199scq0ii2l2jgxm634n9vs4w4zxq5scyc4ssab8m6yg4z8v45xp"; depends=[mvtnorm quadprog Matrix nlme MASS]; };
+  GOsummaries = derive { name="GOsummaries"; version="1.1"; sha256="1lkaid88lrm2xyz62xx32xnpch9qlhb3lif9jmk2zaym1d53558a"; depends=[ggplot2 Rcpp plyr gProfileR reshape2 gtable]; };
+  govStatJPN = derive { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
+  gpairs = derive { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode lattice vcd MASS colorspace]; };
+  GPArotation = derive { name="GPArotation"; version="2012.3-1"; sha256="1kvd6djsr6vdjd228i03d914n77sd5sym7dl5lbaq76bgmqfhr77"; depends=[]; };
+  gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
+  gpclib = derive { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
+  GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
+  gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
+  GPFDA = derive { name="GPFDA"; version="2.0"; sha256="0acwp9jxbp2bdkvbb1q0azds5sqrkada8j45r83l1dhxad8f0l1d"; depends=[fda_usc spam MASS]; };
+  GPfit = derive { name="GPfit"; version="0.1-0"; sha256="1gk14qm94088prwaiilklqb2xrb81qr25psmg31585dv93yawgqr"; depends=[lhs lattice]; };
+  gpk = derive { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
+  gplm = derive { name="gplm"; version="0.7-1"; sha256="0pyl4hjvbhxvnssxsr8mdgs8phvkwimfcgfp34vr2mbyiycy2dl1"; depends=[]; };
+  gplots = derive { name="gplots"; version="2.13.0"; sha256="1qxm6878lzcca9q0sbc4p3g3xh32169hkaidbk3m14ph0vwl45b2"; depends=[gtools gdata caTools KernSmooth]; };
+  GPLTR = derive { name="GPLTR"; version="0.85"; sha256="1njlq8s56m42n8yg93xgjk91dcaprf3n05rkqfiq8sbpfvva8v3j"; depends=[rpart]; };
+  gpmap = derive { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[isotone plyr ggplot2 foreach]; };
+  gpr = derive { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
+  gProfileR = derive { name="gProfileR"; version="0.5"; sha256="0jadfj2hcn3zx4ph61685p5iz16330jccp5ipi8183dkcybvimw4"; depends=[RCurl plyr]; };
+  GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
+  gptk = derive { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[Matrix fields]; };
+  gputools = derive { name="gputools"; version="0.28"; sha256="0ria03ggcfqgn93gjv2anhvkd3k73c6vfwgka16kf66g1nfzxs4l"; depends=[]; };
+  GPvam = derive { name="GPvam"; version="3.0-1"; sha256="1ig079m9rwhsbv0pwxp2swvrxajaxsfq3hic4cq56sxpq1wr9vja"; depends=[Rcpp RcppArmadillo Matrix numDeriv]; };
+  grade = derive { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
+  GRaF = derive { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
+  gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; };
+  granova = derive { name="granova"; version="2.0"; sha256="02jk6p0y29z09l2d35flyrx1g0b4vjpwv99v46pi4kdkiv50508x"; depends=[car]; };
+  granovaGG = derive { name="granovaGG"; version="1.2"; sha256="0gy8ba1zlm62f458sxrph3cyz4c6nqkaddm6nwj54nyicxqah32h"; depends=[ggplot2 RColorBrewer plyr gridExtra reshape2]; };
+  gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
+  gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; };
+  GrapheR = derive { name="GrapheR"; version="1.9-82"; sha256="0rqc12mcs5q5ybdj19as6q4sn8a39yqbv8n235v9hf8dh2c9ph71"; depends=[]; };
+  graphicsQC = derive { name="graphicsQC"; version="1.0-5"; sha256="1h0qrf47r16np1ysymvlvvb95a8w86brh440kk20ajhbr5njp6kz"; depends=[XML]; };
+  GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; };
+  GrassmannOptim = derive { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
+  gRbase = derive { name="gRbase"; version="1.7-0.1"; sha256="1x52i4c5jbry17y1pfnjq03kz4xxnk3anidva41z5alp7c73zlqv"; depends=[Matrix igraph Rcpp]; };
+  gRc = derive { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[gRbase]; };
+  gregmisc = derive { name="gregmisc"; version="2.1.5"; sha256="06mwyxf1s3alwsmlwm39q5x7jq9k5rlgrkjn7ysxd72h5g1hh54i"; depends=[gdata gmodels gplots gtools]; };
+  greport = derive { name="greport"; version="0.5-1"; sha256="0l88w78djgyzd8ma3b61xkjsr76xlxzc3ibhzh6xz389knn3vfl5"; depends=[Hmisc data_table rms lattice latticeExtra Formula survival]; };
+  Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; };
+  gridBase = derive { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
+  gridDebug = derive { name="gridDebug"; version="0.4-0"; sha256="1nbcdjip6ghnlv0j7cf45bpqdpirwn636pg324f0hgiqj4rifn09"; depends=[gridGraphviz gridSVG]; };
+  gridExtra = derive { name="gridExtra"; version="0.9.1"; sha256="15pj5w5wlrf8gw4z01i9j88gk6bm4kni64fpip9icmxkn887y3hx"; depends=[]; };
+  gridGraphviz = derive { name="gridGraphviz"; version="0.1"; sha256="14zcr0w2c9cgdw6ij93w52k3bkmgdmx809snh9jjf2amy08p2gbg"; depends=[]; };
+  gridSVG = derive { name="gridSVG"; version="1.4-0"; sha256="0ch1waz2z60a7ivn63nf1418kgypr0nv8vr3ak3my0i7gdgny2pc"; depends=[RJSONIO XML]; };
+  GriegSmith = derive { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
+  gRim = derive { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRbase gRain igraph]; };
+  grImport = derive { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
+  grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
+  groc = derive { name="groc"; version="1.0.1"; sha256="147vwvr5n0z6197j6lwm7hvpxbdc2cmykxqgx9mk2v3ssvpjwg86"; depends=[pls mgcv robust robustbase]; };
+  grofit = derive { name="grofit"; version="1.1.1"; sha256="0m0phd5irk007k2kpxlsg03g7939nndf363fmkcxffykvp0023hz"; depends=[]; };
+  grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
+  GroupSeq = derive { name="GroupSeq"; version="1.3.2"; sha256="16n06jw7f97jhafgl9sfvd163v1walhlpmai1hmhiwjvv341sp13"; depends=[]; };
+  growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat]; };
+  growthmodels = derive { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
+  growthrate = derive { name="growthrate"; version="1.2"; sha256="05a2g3lcw4c0r3hykk5lsxmx2s1lp1fsjjxmip75dhid969sagcs"; depends=[Matrix clime mvtnorm]; };
+  grplasso = derive { name="grplasso"; version="0.4-3"; sha256="1v15x0kbzfvl3ygbrsxqgj3mz6a107bfvanbymh0hs7668b1zkab"; depends=[]; };
+  grppenalty = derive { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
+  grpreg = derive { name="grpreg"; version="2.6-0"; sha256="1j112c96milqnd34dmznm1x7i02ydh484msd6vm98daghb42dzsg"; depends=[Matrix]; };
+  grt = derive { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS rgl misc3d]; };
+  GRTo = derive { name="GRTo"; version="1.1"; sha256="0fzl3f3x9g9rv1lcsp72sq2cj13d93pdcmjzm4p1p1bb9ainggif"; depends=[bootstrap]; };
+  GSA = derive { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
+  GSAgm = derive { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[survival]; };
+  gsalib = derive { name="gsalib"; version="2.0"; sha256="0yk39ca7yrsksga73ma2pdqfy3s1xpp07y8622x44b9cazv6rdy4"; depends=[]; };
+  gsarima = derive { name="gsarima"; version="0.1-4"; sha256="0q5i5szyqvj1sgyg17khqx5rgdpn3wxp22ddr9m9rb653y03xzz0"; depends=[MASS]; };
+  gsbDesign = derive { name="gsbDesign"; version="0.96-2"; sha256="0sk4a66z9bqi3aa2ky9472p9znfm93kc9p5igdmvii4dr0syyfxd"; depends=[gsDesign lattice]; };
+  gsDesign = derive { name="gsDesign"; version="2.8-8"; sha256="0czr2xyh3nd8kgvw71wvqakvmfbdbysiyyfnh2az7l4j33xyhfc9"; depends=[ggplot2 xtable stringr RUnit plyr]; };
+  GSE = derive { name="GSE"; version="3.0"; sha256="1b1nrnvgly7zpyw9z9ddgmx7qfz0mllwm8k7czs17x3l5gkmw8ir"; depends=[Rcpp RcppArmadillo MASS ggplot2]; };
+  gSeg = derive { name="gSeg"; version="0.1"; sha256="0qnv3c0rla0g2fb4s4x1i0zdp3dlvi98qf80wlr54gnn7s9vpjf1"; depends=[]; };
+  gsg = derive { name="gsg"; version="1.0"; sha256="0j2h1i94vr0mvj4rl328n666b9nn2xnakid8k1r2lh88vk3dv9ma"; depends=[mgcv mvtnorm boot numDeriv]; };
+  GSIF = derive { name="GSIF"; version="0.3-6"; sha256="00z0fbfr5xird1nnjrkmddqc8zbzcqfgmp65wfc5dhsjip7jzcy2"; depends=[sp RSAGA dismo rgdal raster aqp plotKML gstat boot rpart quantregForest randomForest nlme]; };
+  gskat = derive { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
+  gsl = derive { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
+  GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxmnj7v3vzrvlk6y5v5smlvybd0"; depends=[gtools]; };
+  gsmaRt = derive { name="gsmaRt"; version="1.0"; sha256="0hpf0vgmhill3w8cqpsgvxjgwk2ka154vm9klidckm05qcqlwdn6"; depends=[R2HTML rgl scatterplot3d xtable]; };
+  gsmoothr = derive { name="gsmoothr"; version="0.1.5"; sha256="13z1klyrkbiv069q9cmvdrwr627x5z68y414wxxhsr2099wrj4bd"; depends=[]; };
+  gss = derive { name="gss"; version="2.1-0"; sha256="1ncnim4m63wlmh1mvd5l6clgnqmy4g5vv3d2a7bb28n4274zvwy9"; depends=[]; };
+  gsscopu = derive { name="gsscopu"; version="0.9-1"; sha256="0qg4ra7zvp0j6wjbb14sqajfq745bza3v50s0c5xxnddblqi4hcc"; depends=[gss]; };
+  gstat = derive { name="gstat"; version="1.0-19"; sha256="1yhrp1dgkl11hr8jy1kmsiaf8avf02m85wcnvf34vlbil24hy7py"; depends=[lattice sp zoo spacetime FNN]; };
+  gstudio = derive { name="gstudio"; version="1.2"; sha256="01rmyvsmf21992wvr18qz81f01wkch0dq260y9pxiz9mhw0cdsd2"; depends=[ggplot2 raster sp reshape2 ggmap popgraph]; };
+  gsubfn = derive { name="gsubfn"; version="0.6-5"; sha256="1glpq5ghzgarqg8wfl7pblblm31d4dsxrlrkhsgckldbdap52yws"; depends=[proto]; };
+  gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
+  gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
+  gte = derive { name="gte"; version="1.2-1"; sha256="0h6c5n9wz8b4b5pmqfbc8ivqpg2jh4k6x94wns1l33kiah70pmjd"; depends=[survival]; };
+  gtools = derive { name="gtools"; version="3.4.0"; sha256="1q0az6sqjnrl76i2lsn7zjl4zcwfbh29ia1vmw0dwm4s1afrhvqj"; depends=[]; };
+  gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
+  GuardianR = derive { name="GuardianR"; version="0.3"; sha256="11dhzhrv6ykb2glymaxq33m0r8fr3v4481g4cwhlbzkmbncvwl6d"; depends=[RCurl RJSONIO]; };
+  Guerry = derive { name="Guerry"; version="1.5-0"; sha256="18pgmsqd6ign5g4lwpd35gxaypm3zjf1i82w63ss11dsqddnfyvh"; depends=[sp shapefiles]; };
+  GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
+  gumbel = derive { name="gumbel"; version="1.04"; sha256="0fl44i4kz9wbba1iv4fy1b74nf25axdkifhczgrgpy5d81ky43v6"; depends=[]; };
+  GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0w08b22xkx0llmwk1kj4ibapvg3fxkgkmjz6z6acr4nwqfwmjzzx"; depends=[vegan ape]; };
+  gvcm_cat = derive { name="gvcm.cat"; version="1.6"; sha256="0v5q97gjninxrjdclxj1bn362h0j93pm71k9gp79aa3sdy4ay6s4"; depends=[Matrix MASS]; };
+  gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
+  GWAF = derive { name="GWAF"; version="2.1"; sha256="1s56d3b6p5fpaxi32ks2mmhsa5sgi746hf159wk0z99099gli8g3"; depends=[geepack coxme lme4]; };
+  GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
+  GWAtoolbox = derive { name="GWAtoolbox"; version="2.2.4"; sha256="0adpixlfh0j1py79b0636921kmz2zvhv8p07m6ism6h3xva0i4ck"; depends=[]; };
+  gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
+  GWG = derive { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; };
+  gWidgets = derive { name="gWidgets"; version="0.0-52"; sha256="0nldrgc3kbqf8x09n0h8kcf86zc3f94s1fmb3jdcxjzw4p5f0dna"; depends=[]; };
+  gWidgets2 = derive { name="gWidgets2"; version="1.0-5"; sha256="1y6vm6ds77yr1qiqlcaixbsarbwx5w53ba343svla7wva80ajbpl"; depends=[digest]; };
+  gWidgets2RGtk2 = derive { name="gWidgets2RGtk2"; version="1.0-2"; sha256="1pzcpjz5cdizvj0ih2r4i3ll6flm45q8ym6sz0wqbg4j3ir0l5kh"; depends=[memoise RGtk2 gWidgets2]; };
+  gWidgets2tcltk = derive { name="gWidgets2tcltk"; version="1.0-2"; sha256="1dzrc8yry4l2afpijr35irnqmvfpd22vlb3lih4pk14n52690y0h"; depends=[digest memoise gWidgets2]; };
+  gWidgetsRGtk2 = derive { name="gWidgetsRGtk2"; version="0.0-82"; sha256="0b1imvy2094s2ixar7z4kxs047855ssijx8l22a1hlwdg7zp7sng"; depends=[RGtk2 gWidgets]; };
+  gWidgetstcltk = derive { name="gWidgetstcltk"; version="0.0-54"; sha256="04mc0vc0iz18v86fmz4yb46m4flcljzx9njm9jnfq3lh2gj3bf9d"; depends=[gWidgets digest]; };
+  gWidgetsWWW = derive { name="gWidgetsWWW"; version="0.0-23"; sha256="14yw04kgfqfwl44zkyqy075rjd5vafbzig6x5py25ypbdk3hwn7a"; depends=[proto filehash digest rjson]; };
+  GWmodel = derive { name="GWmodel"; version="1.2-2"; sha256="0ixy0005lgi3h9mfbbmd6l6k3zg2w3j0caarx4yp7457mjla2471"; depends=[maptools robustbase]; };
+  GWRM = derive { name="GWRM"; version="1.1"; sha256="1l8rw2nksd1vskjb7kjn93vgrs39bcrr8zz1j66rmkcc399pf6nf"; depends=[]; };
+  gwrr = derive { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
+  GWsignif = derive { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; };
+  GxM = derive { name="GxM"; version="1.0"; sha256="1vaq0fkx3bf2kdmn2iqgad8haprg9i3a9101nrvyh2pv2g894761"; depends=[Rcpp minqa nlme]; };
+  h5r = derive { name="h5r"; version="1.4.7"; sha256="1q2l6hq30x5cnxrhk6fz8ymb836sc2z48h37yw4v13xqmb8q74wp"; depends=[]; };
+  haarfisz = derive { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
+  HAC = derive { name="HAC"; version="0.3-1"; sha256="1rzfc8h5w2rxjlppi3pa7n3gavxclkwm7bw081k8jlmrifx87sp3"; depends=[copula]; };
+  HadoopStreaming = derive { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
+  HandTill2001 = derive { name="HandTill2001"; version="0.2-9"; sha256="1j4ivxarm3k9sj05824lv6b03apyabpciv4mp253vv0yzjcp2bzf"; depends=[]; };
+  hapassoc = derive { name="hapassoc"; version="1.2-6"; sha256="14ddh7wiyks0wcw0iy1af9njg4wsn5flv59r463z2b3pbj5zp1qc"; depends=[]; };
+  HapEstXXR = derive { name="HapEstXXR"; version="0.1-6"; sha256="0ldmfa9729sf9r1kaldsskq8w6kvjac778bzjyi0a1pfz2walzjb"; depends=[survival]; };
+  HAPim = derive { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
+  Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; };
+  haplo_ccs = derive { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
+  HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
+  haplo_stats = derive { name="haplo.stats"; version="1.6.8"; sha256="1zz8hi37zwc6wkn5q7zhz1l29vlklhnj8gzp1pmz4ys496c2lwxh"; depends=[]; };
+  HAP_ROR = derive { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[hash ape]; };
+  hapsim = derive { name="hapsim"; version="0.3"; sha256="18r0cq15psjwxprml84ihj5gw4pk6agd7x0qicj899awa21f2qb3"; depends=[MASS]; };
+  HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.2"; sha256="10djqp3qd2a7wr2l9nn13wwvhwrlj9wdr5sij8ac8l2xibrxdghv"; depends=[mice]; };
+  harvestr = derive { name="harvestr"; version="0.5.2"; sha256="1559pzfsp3fnz7ichi5ayqb3vk48xgw5x5i48s45lm9vkqyha303"; depends=[plyr digest]; };
+  hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
+  hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
+  hasseDiagram = derive { name="hasseDiagram"; version="0.1"; sha256="1j48h6im66vc60fkrlkdgcqmz8ilvwa56qn97ybmy50gl0ispd2c"; depends=[]; };
+  hawkes = derive { name="hawkes"; version="0.0-3"; sha256="03gw5wnyqw4yn313d8jgdrl87dwmwji4ljvjllc5yv8z8mnmhv6j"; depends=[Rcpp RcppArmadillo]; };
+  hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
+  hbmem = derive { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; };
+  hbsae = derive { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[Matrix arm]; };
+  HBSTM = derive { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[MASS fBasics maps]; };
+  hcc = derive { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; };
+  hcci = derive { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
+  hda = derive { name="hda"; version="0.2-12"; sha256="11z9p35dvhi7bdw09d2yawh46nxk8axw76b51vk089g12nr2b9x7"; depends=[e1071]; };
+  HDclassif = derive { name="HDclassif"; version="1.2.2"; sha256="0j32nhl2v0bipflidwfk6q8a0pvn7qjs7ks1al2izsr772dwfcvq"; depends=[MASS]; };
+  hddplot = derive { name="hddplot"; version="0.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS]; };
+  hdeco = derive { name="hdeco"; version="0.4.1"; sha256="04nggwckvn1kwi238qd33l4pryzn4aq5bmi30bvfi99gwnrlgfgq"; depends=[]; };
+  hdi = derive { name="hdi"; version="0.0-6"; sha256="1w4ijr385zvnc1r6agzy2gg3knyf58zbm46yyp0yscgrxp85v1bb"; depends=[glmnet linprog plus]; };
+  hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[glmnet foreach MASS iterators]; };
+  HDMD = derive { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[psych MASS]; };
+  hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; };
+  HDtweedie = derive { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
+  HEAT = derive { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
+  heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
+  heatmapFit = derive { name="heatmapFit"; version="1.0"; sha256="0fj75f4hs2pxwq8vwk2mjy0kigkf2fpamcy8zzwa1n7x6q109c02"; depends=[]; };
+  heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
+  heavy = derive { name="heavy"; version="0.2-3"; sha256="17mr2i629hw38dadbl75rmkz9y3brc2yz3hap1vp607ya420cmv8"; depends=[]; };
+  helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-7"; sha256="0x0f64w5783mh0ryv0krpdzhicbv912y36h74h1qapcy5225fxh5"; depends=[rJava]; };
+  helsinki = derive { name="helsinki"; version="0.9.12"; sha256="1bajxhzsg555xlkmp38b1mg69kaai814m3rl863v3xg988ing2yr"; depends=[rjson RCurl maptools]; };
+  heplots = derive { name="heplots"; version="1.0-11"; sha256="0zbrkq62gcig9bils51dc4x7bgjskh1lp38diajifvypqmfhciph"; depends=[car MASS]; };
+  hergm = derive { name="hergm"; version="1.3-11"; sha256="1kfh7ry84smxf3d0ykjr7d0ckh2dk9y63761f4pmskfxqx12w98a"; depends=[ergm]; };
+  hett = derive { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[MASS lattice]; };
+  het_test = derive { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
+  hexbin = derive { name="hexbin"; version="1.26.3"; sha256="1srvpj5nzmrnk5l0j9rdr246j8fd07r44shc9mayv58qk8ivbhqy"; depends=[lattice]; };
+  hexView = derive { name="hexView"; version="0.3-2"; sha256="19s87qxz9rjvzr64pv51wfd26jy5f00i8lwv39hhr6rh0jwngdly"; depends=[]; };
+  hflights = derive { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
+  hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
+  hglasso = derive { name="hglasso"; version="1.0"; sha256="1nfnyb9ns5jgqqdg6dmvdc7708j4d7picy8135pa3g7pnrfxs9mm"; depends=[glasso mvtnorm igraph fields]; };
+  hglm = derive { name="hglm"; version="2.0-4"; sha256="0jdihcank1dx2k56mhwxlh2bbbpwrdblf9jgy6x68mly4b863239"; depends=[Matrix MASS]; };
+  HGNChelper = derive { name="HGNChelper"; version="0.3.0"; sha256="1w1x8fkvwlm4xqfx3afg42hhsa459sxqacsiph088sr77lhd3acz"; depends=[]; };
+  HH = derive { name="HH"; version="3.0-4"; sha256="11b1qvhdl1waskvvcdkdkljh5d3ql6ajsq0vg4fapprfkq4jamv1"; depends=[lattice latticeExtra multcomp reshape2 leaps vcd colorspace RColorBrewer]; };
+  HHG = derive { name="HHG"; version="1.3"; sha256="0m8h460m5qv5zcs648kaw8w3p7nlgb88zybs7r9j0kya1xlqjwkm"; depends=[]; };
+  hht = derive { name="hht"; version="2.0.1"; sha256="1xs6p2xqcnh3xixhv7wblbyv02rwd1pd8xj14n2jyrq1icl9idri"; depends=[EMD fields]; };
+  HI = derive { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
+  HIBAG = derive { name="HIBAG"; version="1.2.3"; sha256="08hg9l5il2zicbpg04biiqm99lj51ny6ias8hwxj2s4gyr1qd5ny"; depends=[]; };
+  HiCseg = derive { name="HiCseg"; version="1.0"; sha256="1g7sw2nsq71la42nz4mfgi6y6kzwz4lcsqhrlinahw2sq1kxfp9b"; depends=[]; };
+  HiddenMarkov = derive { name="HiddenMarkov"; version="1.7-0"; sha256="0223yw1ga2c2y1fqjgr3m4yw7w8cp5r0z5cz766qvbc5wv65bh59"; depends=[]; };
+  HiDimDA = derive { name="HiDimDA"; version="0.2-1"; sha256="0i898f5ij0imw6iq6h1r5f84qb7g86c1r3ljnb23fkq2ki4z4igk"; depends=[locfdr]; };
+  hierarchicalDS = derive { name="hierarchicalDS"; version="2.01"; sha256="0qdpdr8wk27zm1gf50awnmy8sghqq7mcdq30ahcyphmxmkm5cn1l"; depends=[truncnorm MASS mvtnorm Matrix coda spsurvey MCMCpack xtable mc2d]; };
+  hierfstat = derive { name="hierfstat"; version="0.04-10"; sha256="1n0nn5liwvf3xc743vdxpfqsbr40n599f981gk49d9nq8qk0kggl"; depends=[gtools ade4]; };
+  hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
+  hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
+  HIest = derive { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
+  highfrequency = derive { name="highfrequency"; version="0.2"; sha256="0gq1szwqal792n1k14m51flbjz72vfym14wkxl3q48mwv2i4s772"; depends=[xts zoo]; };
+  highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; };
+  highr = derive { name="highr"; version="0.3"; sha256="1y0amfvdpqwq0n60fykbsir4jd1ynkwfcgadjnn1997amk9qja5x"; depends=[]; };
+  highriskzone = derive { name="highriskzone"; version="1.1"; sha256="1qpk63jh44075b6fnhqx1iqjywzzwhvr6lry3vjlx0sfv1nqad6k"; depends=[spatstat ks]; };
+  HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; };
+  hint = derive { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
+  HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
+  hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
+  hisemi = derive { name="hisemi"; version="1.0-319"; sha256="0pm7dsaaqrdhkvxsk2cjvk6qd2rqqmddmv012smnrivi7mpnvd4w"; depends=[Matrix Iso fda]; };
+  HistData = derive { name="HistData"; version="0.7-5"; sha256="17s64hfs7r77p0wjzpbgz9wp3gjzbly2d0v784f9m2bka8gj6xhr"; depends=[]; };
+  histogram = derive { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
+  HistogramTools = derive { name="HistogramTools"; version="0.3"; sha256="1wfvrznr578s2hc8ccs849pz4kjlyi4brdxhw919cvk758ahy9rv"; depends=[Hmisc ash stringr]; };
+  hitandrun = derive { name="hitandrun"; version="0.4-1"; sha256="1p2wnib0ngdcz01ml3izl4k4a6ww5ygkk5050q4nzabl1gby9xg6"; depends=[rcdd]; };
+  hive = derive { name="hive"; version="0.1-16"; sha256="1xaxnr8nfkji2b5f5dq2h01pkl20rm24wxnf1y1xv695v3j58ibd"; depends=[rJava XML]; };
+  HiveR = derive { name="HiveR"; version="0.2-17"; sha256="1nbs79ikhp60nmhjd30vapn7aggpdw2f6dp5gz4g3fp82gld9llb"; depends=[RColorBrewer plyr tkrgl]; };
+  HIV_LifeTables = derive { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
+  HK80 = derive { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
+  HLMdiag = derive { name="HLMdiag"; version="0.2.5"; sha256="1yim9m5q1m112aj7zhsw345l32bdj7lbw2mqpcxhjzv1lcknm5lq"; depends=[lme4 ggplot2 plyr reshape2 MASS Matrix Rcpp]; };
+  hlr = derive { name="hlr"; version="0.0-4"; sha256="04w1hzjfg2ly9vm9ynh676fy74d9ncy3a1mak209z2ddgr3m7r2y"; depends=[MASS]; };
+  hmeasure = derive { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
+  Hmisc = derive { name="Hmisc"; version="3.14-4"; sha256="1jpz1sxvcip1k7yc8wkxf68fplr6dv24pavblxmi823xq1pjq21y"; depends=[lattice survival Formula latticeExtra cluster]; };
+  HMM = derive { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
+  HMMCont = derive { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
+  hmm_discnp = derive { name="hmm.discnp"; version="0.2-1"; sha256="0xqvg2hfcp4m8k2pkcvrbrlyv66m1hr0flwb0k5haj0y2h73g373"; depends=[]; };
+  hmmm = derive { name="hmmm"; version="1.0-2"; sha256="057yfp1sgp1wvhdq0sfvs598zcq8dhrbqfc02lih5pnwacf96vpc"; depends=[quadprog MASS mvtnorm]; };
+  HMMmix = derive { name="HMMmix"; version="1.0"; sha256="1wipyc80ywf8ahlc4hny8pawcx2js6zgwv981s4sydx56c4fy8f2"; depends=[mnormt]; };
+  HMMpa = derive { name="HMMpa"; version="1.0"; sha256="14r2axg42by49qm6avgv7g3xnc29bxlrni5fhc5vdz0wygkcrqhn"; depends=[]; };
+  HMP = derive { name="HMP"; version="1.3.1"; sha256="1r39mq8j071khza37ck7w4kvk1di71hhn5m4wnx9dak7nlcq2nwx"; depends=[MCMCpack dirmult]; };
+  HMPTrees = derive { name="HMPTrees"; version="1.2"; sha256="0agp8w7rzr1byj01di89r3qy1vb9inb2zgys78mg8jnk7axi925l"; depends=[ape]; };
+  HMR = derive { name="HMR"; version="0.3.1"; sha256="1lmxp46r5jr0r37sk9y080irbrf89rkzhv0943xv0f0l2dyyk415"; depends=[]; };
+  hoardeR = derive { name="hoardeR"; version="0.0-1"; sha256="17720hg1zksgaiandbsq9ab9l0vkm3crg5275n5jyz37yrz9mka6"; depends=[httr XML]; };
+  holdem = derive { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
+  Holidays = derive { name="Holidays"; version="1.0-0"; sha256="1p7rwph50i0dwl7a6n394dq7sl9nb2y8p5ip5y6ql48ixjh4d078"; depends=[TimeWarp]; };
+  homals = derive { name="homals"; version="1.0-5"; sha256="1azrwvdzn379in2sz9d94w2f2xp0d6iiayrv0bws44kvdzr95aqm"; depends=[rgl ape scatterplot3d]; };
+  homeR = derive { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
+  homtest = derive { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
+  HotDeckImputation = derive { name="HotDeckImputation"; version="0.1.0"; sha256="1zj09fa5bqfw27zzard9a9a2aglg7ff8z2zzfyjcdz187l6g9gql"; depends=[]; };
+  Hotelling = derive { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; };
+  hotspots = derive { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[lattice ineq]; };
+  howmany = derive { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
+  HPbayes = derive { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[MASS mvtnorm corpcor numDeriv boot]; };
+  HPO_db = derive { name="HPO.db"; version="1.2"; sha256="04mys72qajp7cn0vhzr9mv388d5a69kjvkwxjjskz24k91xwn4vz"; depends=[]; };
+  HPOSim = derive { name="HPOSim"; version="1.2"; sha256="1bgakx9y1cqc54adm6d4zlqvd2smxq895bf68njsgj3ygrlglc2v"; depends=[HPO_db igraph]; };
+  hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
+  hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
+  HSAUR = derive { name="HSAUR"; version="1.3-3"; sha256="0lf6z9fgmbdhpvz2dyni5wi1ri6y6fikkf1px03pirlswm1mbchj"; depends=[]; };
+  HSAUR2 = derive { name="HSAUR2"; version="1.1-9"; sha256="0sp51fr86lcx02kz4sqcppip8hbd4vdbh5n3jiq1197fcvamvb1y"; depends=[]; };
+  HSAUR3 = derive { name="HSAUR3"; version="1.0-0"; sha256="1lzcpmmdczf2wq0s9kpriwn4q9grvhqhrzf3prpdq8lq280x9zx7"; depends=[]; };
+  hSDM = derive { name="hSDM"; version="1.0"; sha256="0j1pl6vg9yypaikh89pwwbbpvkhxabgrbvza14bvqbp6v52c651l"; depends=[coda]; };
+  hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
+  hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
+  hsphase = derive { name="hsphase"; version="1.2.6"; sha256="1xwgxhlr54kmqpwlp9aphii95829hjpgz1xi3z9m9hd7hsd1fcp8"; depends=[snowfall Rcpp]; };
+  HSROC = derive { name="HSROC"; version="2.1.7"; sha256="05gixmzmgdply9zhjpss54b50ch4b8586cik6c49naxcqxr0y5vd"; depends=[lattice coda MASS MCMCpack]; };
+  HTMLUtils = derive { name="HTMLUtils"; version="0.1.5"; sha256="12r8x7b944lbzz3f4j6w88szq6j9gscbss3f5bzpisw33sr4wgx3"; depends=[R2HTML]; };
+  hts = derive { name="hts"; version="4.2"; sha256="12ayz90c2ajasm54j7gvmzypifgdy24d2g9b1igyhikfnvn44yk1"; depends=[forecast SparseM]; };
+  HTSCluster = derive { name="HTSCluster"; version="2.0.1"; sha256="093g7rs8kbmh7fn7kppb7a7h4zrngxajzc32dmk80dbbm7694271"; depends=[plotrix ggplot2 RColorBrewer]; };
+  HTSDiff = derive { name="HTSDiff"; version="1.0.1"; sha256="0qpnvfgd3vhmcjim0dr78lz4xxpfvx1zz4giw501n0lhghg9cqgm"; depends=[plotrix HTSCluster]; };
+  httpRequest = derive { name="httpRequest"; version="0.0.9"; sha256="1s71lpxv5n1syffckxnnxm5470b2lb2l7pikcm1r2j21j08g807f"; depends=[]; };
+  httpuv = derive { name="httpuv"; version="1.3.0"; sha256="0fs2saz9g17069hkrh6r3wlzsbljv2dvq6sdlwh54dlm6skp7jm6"; depends=[Rcpp]; };
+  httr = derive { name="httr"; version="0.3"; sha256="179cw0by3szzpy9w38v03m5k7fpa3dmkmfqi3y4as4sbv3ii4g9s"; depends=[RCurl stringr digest]; };
+  huge = derive { name="huge"; version="1.2.6"; sha256="11njfd4i8q950apga6sdk84p4wk4qvp8bpg6yz9lgjrgj2hn14n2"; depends=[Matrix lattice igraph MASS]; };
+  HUM = derive { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
+  humanFormat = derive { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
+  hwde = derive { name="hwde"; version="0.64"; sha256="1is39zknssqm98577sdjg8gn3h9wsraih19a9nd6n8mxdcsqivh4"; depends=[]; };
+  HWEBayes = derive { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; };
+  HWEintrinsic = derive { name="HWEintrinsic"; version="1.2.1"; sha256="1sg5lrc6kl5rr6f5awp100qpd1679745kixasiddiggzd8fhgb7q"; depends=[]; };
+  HW_pval = derive { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
+  hwriter = derive { name="hwriter"; version="1.3"; sha256="12hs78m2pzjhjpv43qdc3lazf5qi5w1vpzqign6qpdrhm85xgvhi"; depends=[]; };
+  hwriterPlus = derive { name="hwriterPlus"; version="1.0-3"; sha256="06hq493v702hy2mv73glav4az2wphzy3lqqkxjkpjpab00xc42d5"; depends=[hwriter TeachingDemos]; };
+  hybridEnsemble = derive { name="hybridEnsemble"; version="0.1.1"; sha256="1hn6zfz22mgxv5qpwdgmn7a9snha7hdkbbqq3xicy37j8xypsab5"; depends=[kernelFactory ada rpart ROCR nnet e1071 NMOF GenSA Rmalschains pso AUC soma genalg reportr nnls quadprog tabuSearch glmnet]; };
+  hybridHclust = derive { name="hybridHclust"; version="1.0-4"; sha256="1967p6crkrbnlfghd9x1alr2x57nqjl1zh58hhyshgla3xmdmhx5"; depends=[cluster]; };
+  HybridMC = derive { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
+  hydroApps = derive { name="hydroApps"; version="0.0-1"; sha256="1mf9kchrsnqsam2a8s0hksa4dfdrxcjijlafd0m2bca76bfdqky8"; depends=[nsRFA]; };
+  hydrogeo = derive { name="hydrogeo"; version="0.2-2"; sha256="18ybphkvrghmv1i3mkmiibz75khnc1v6cawkyn71ar557q8w4613"; depends=[]; };
+  hydroGOF = derive { name="hydroGOF"; version="0.3-8"; sha256="1ljk2dk5ydsg7qdizyzkbw0b2zdhnb3x9h965d94ygzg8nw5kbak"; depends=[zoo hydroTSM xts]; };
+  HydroMe = derive { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[nlme minpack_lm]; };
+  hydroPSO = derive { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc sp lattice zoo lhs]; };
+  hydroTSM = derive { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[zoo xts e1071 gstat automap sp]; };
+  HyperbolicDist = derive { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
+  hyperdirichlet = derive { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[aylmer abind mvtnorm cubature]; };
+  hypergeo = derive { name="hypergeo"; version="1.2-5"; sha256="00rqyw7xc4q6lqg0vy1jkb4rc1xbdgvqsmx58n6w2006zni54ss1"; depends=[elliptic contfrac]; };
+  hyperSpec = derive { name="hyperSpec"; version="0.98-20140220"; sha256="1hyzmpbzzj09759lbfy1y0xlnsqadnpgyrpvjdbarsh4h9jqng1g"; depends=[lattice mvtnorm]; };
+  hypervolume = derive { name="hypervolume"; version="0.9.9.7"; sha256="039blwjhx77qgl0mfnz78nmidr50hxcvcwfw26n5m3jy63pi8z08"; depends=[Rcpp rgl]; };
+  HyPhy = derive { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
+  hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
+  hypred = derive { name="hypred"; version="0.4"; sha256="08nqgw0h3zh4vyhfd1cngr6snz5n7skj3d9rg2qccz9pnjp7j1ab"; depends=[]; };
+  hysteresis = derive { name="hysteresis"; version="2.0"; sha256="1g9d91djwi9k2q10zqak8fpmywnwmha1pm18g2hmwzrqrwnr6dh9"; depends=[car msm nlrwr]; };
+  hzar = derive { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[MCMCpack foreach coda]; };
+  IASD = derive { name="IASD"; version="1.0.7"; sha256="0a25sd82fxnmz3f4iaxhc69cdfb7xmh7wi79wv11sbw9cv2pl7kr"; depends=[]; };
+  IAT = derive { name="IAT"; version="0.1"; sha256="1fjx053352qrxwhcbkqslwcnrkafray8hqm9ziqyhpphbl98kwjx"; depends=[data_table ggplot2]; };
+  ibd = derive { name="ibd"; version="1.1"; sha256="1p7dw74qpbdalb8vq8jixjhizjl2zc8wrl28mzavw89lbragvi6k"; depends=[lpSolve MASS]; };
+  IBDhaploRtools = derive { name="IBDhaploRtools"; version="1.5"; sha256="14mp81xsjmha2zkyy57fzn41ph7m8h7z82sz1pizvgdmahmzkg87"; depends=[]; };
+  ibdreg = derive { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
+  IBDsim = derive { name="IBDsim"; version="0.9-2"; sha256="01ky69mpi404a3j8gv32ha1fbzr1f9c15a5b3lz6bg172qcxb6zs"; depends=[paramlink]; };
+  IBHM = derive { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[DEoptim cmaes Rcpp]; };
+  Iboot = derive { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
+  ibr = derive { name="ibr"; version="1.4.5"; sha256="0nw2j232br06l30v3cn4qcr25vbh911v2mz7nfail40sqxc6wwc4"; depends=[]; };
+  IBrokers = derive { name="IBrokers"; version="0.9-10"; sha256="1kpmmiar5762byy6pl8x8drpsw8as9ilbqzgqhfrvj5rd31mylz6"; depends=[xts]; };
+  iBUGS = derive { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[R2WinBUGS gWidgetsRGtk2]; };
+  IC2 = derive { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
+  ic50 = derive { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
+  icaOcularCorrection = derive { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
+  icapca = derive { name="icapca"; version="1.0"; sha256="1m8z5444y06wadc63zlb1x3qfgam81j78nvzzxlpxijydzh8xla8"; depends=[]; };
+  ICC = derive { name="ICC"; version="2.2.1"; sha256="1xl8x8ddbrk8ma57mybmmv9m096wlpbas7hsmd2c6qzcrlz6i7wa"; depends=[]; };
+  ICE = derive { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
+  ICEbox = derive { name="ICEbox"; version="1.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; };
+  ICEinfer = derive { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
+  icensmis = derive { name="icensmis"; version="1.1"; sha256="18raaylj1y753xw9x1ghsgvli4rp5npl7ca6xcicwklg2jmjwfws"; depends=[]; };
+  ICGE = derive { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[MASS cluster]; };
+  ic_infer = derive { name="ic.infer"; version="1.1-4"; sha256="02dsp1vmh8226mf9mx571b72nvcg0bxkll9yybynj9mbxm5db95w"; depends=[quadprog mvtnorm boot kappalab]; };
+  iCluster = derive { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[lattice caTools gdata gtools gplots]; };
+  icomp = derive { name="icomp"; version="0.1"; sha256="0xpjbfb9lxgsby9fj5lbb4nkl6zy8k4whqpgdqq5ndzy7zgq1lvm"; depends=[]; };
+  ICS = derive { name="ICS"; version="1.2-4"; sha256="1sfm9ymrrl72jzg8gsdw6v4q20i4s2w4syyr7brlvan136khpqyn"; depends=[mvtnorm survey]; };
+  ICSNP = derive { name="ICSNP"; version="1.0-9"; sha256="0kisk7wk0zjsr47hgrmz5c8f2ljsl7x4549a1rwzsfkjz8901qka"; depends=[mvtnorm ICS]; };
+  idbg = derive { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
+  identity = derive { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
+  IDPmisc = derive { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+  idr = derive { name="idr"; version="1.1.1"; sha256="0shwwyvc4j32grxanhyqk66aykzy5bzic2004krvzbmcb5cr1sgb"; depends=[]; };
+  iDynoR = derive { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[XML vegan]; };
+  ieeeround = derive { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
+  ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
+  iFad = derive { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[Rlab MASS coda ROCR]; };
+  ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
+  ifultools = derive { name="ifultools"; version="2.0-0"; sha256="0xgd4j09kixsv653cj5h1kyf9jfzz8nhc85xixbcpz3yn0fqbn00"; depends=[splus2R MASS]; };
+  iGasso = derive { name="iGasso"; version="1.1-1"; sha256="1j12ynh4fmhql0adk12fm5dn3f1b88ccprc7vpwj65f7jv4cx0lg"; depends=[lattice]; };
+  IgorR = derive { name="IgorR"; version="0.7.1"; sha256="1ahj1ckzjffsskicdy2b70pzx5cn2r0s22yg1ajwiyy4ykwcg4pk"; depends=[bitops]; };
+  igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
+  igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; };
+  igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
+  IM = derive { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[png jpeg bmp]; };
+  Imap = derive { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
+  imguR = derive { name="imguR"; version="0.1.5"; sha256="052381fppz81bdc0sxnqpl9s9hzsgv675mnpgyw673chp05hi5ix"; depends=[XML RCurl httr]; };
+  IMIS = derive { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
+  ImpactIV = derive { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
+  imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
+  imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
+  imputeYn = derive { name="imputeYn"; version="1.1"; sha256="12hdx7bwpm4jickpbj7cswjsl6f772ibzaf3d79q24n24ymw576h"; depends=[quadprog emplik mvtnorm]; };
+  in2extRemes = derive { name="in2extRemes"; version="1.0-1"; sha256="0k5qczs54b7bl71my8xmnqly91g7c5skj0lm2g8dk4hgrx6wwsrf"; depends=[extRemes]; };
+  inarmix = derive { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
+  incReg = derive { name="incReg"; version="1.0"; sha256="1kckx64hn8g9wvjg7g9xild5hclim1rs7z2m7rgmbdwlbayxpwgv"; depends=[car]; };
+  IndependenceTests = derive { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
+  indicspecies = derive { name="indicspecies"; version="1.7.1"; sha256="11z166qaywpdplx4b73wsziygi41dbmk05gjnl4wdim7iv6im9ps"; depends=[permute]; };
+  ineq = derive { name="ineq"; version="0.2-11"; sha256="1vadgqcl8wqhryfwdn5ih7bxc6c1xqpkfyxv72xzfzs10wws9v3l"; depends=[]; };
+  InfDim = derive { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
+  inference = derive { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
+  InferenceSMR = derive { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
+  inflection = derive { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
+  influence_ME = derive { name="influence.ME"; version="0.9-4"; sha256="1smvhr72vnds20x71986idk6rak69g28dddlf9g2ivg0ajkji5q9"; depends=[lme4 Matrix lattice]; };
+  influence_SEM = derive { name="influence.SEM"; version="1.2"; sha256="066h8zhqbai07yg9p3js9m2a1ya050kp4inbfhwc3b8gwpajg9h1"; depends=[lavaan]; };
+  infoDecompuTE = derive { name="infoDecompuTE"; version="0.5.1"; sha256="1aigd1fvpdqjplq1s1js0sy8px68q73lbp5q591rn52c77smdhaj"; depends=[MASS]; };
+  informR = derive { name="informR"; version="1.0.04"; sha256="0s40hlilk8fjld2m43f2m50a3764qgnv07y5jwv60a8d0nf4gpa2"; depends=[abind relevent]; };
+  infotheo = derive { name="infotheo"; version="1.1.1"; sha256="12c16r2v5bn4dxwcihqiicw2j13ar971478qc3n109f5mxxmxywq"; depends=[]; };
+  infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
+  INLABMA = derive { name="INLABMA"; version="0.1-4"; sha256="18a5hz7yvw6xikv7qn6r8whmxsr7q10fywj65rnz2rw1f2rdhq5q"; depends=[Matrix spdep]; };
+  inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; };
+  inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
+  InPosition = derive { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[prettyGraphs ExPosition]; };
+  insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; };
+  insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
+  intamap = derive { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[sp gstat automap mvtnorm MASS evd]; };
+  intamapInteractive = derive { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[intamap spcosa spatstat automap gstat]; };
+  intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
+  integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; };
+  Interact = derive { name="Interact"; version="1.0"; sha256="14mxqbr2ivwihnpbwmb9xf70p0svp4bi7l9v1c45vr1x9lyqkxgd"; depends=[]; };
+  InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
+  intergraph = derive { name="intergraph"; version="2.0-0"; sha256="0y5cd7y08p86fxm4zqraj81sj5a5h7725wvzcyxd8p1q3ky2sj9f"; depends=[network igraph]; };
+  Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
+  Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
+  InterVA4 = derive { name="InterVA4"; version="1.2"; sha256="0ic78i7vnvb6c3iz1gv6k69q9n0894rzy26df0zd0gd55hral1fx"; depends=[]; };
+  interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
+  intervals = derive { name="intervals"; version="0.14.0"; sha256="0hqifkb8pbx0v42z3s78nm38b3ixi0vycq8kba4mv3w8v7zcfbxb"; depends=[]; };
+  interventionalDBN = derive { name="interventionalDBN"; version="1.2"; sha256="0byqpfn2dv045f0kd36kci4amg6vivsilapxx8r513yl9diz3vy2"; depends=[]; };
+  IntLik = derive { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
+  intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
+  intReg = derive { name="intReg"; version="0.1-2"; sha256="1sm7v4fnfsdhyqr3q8dms0ifwb00hzf3x1g0fpm7xldlqc3wf6pr"; depends=[maxLik sets sets]; };
+  intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
+  introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; };
+  intsvy = derive { name="intsvy"; version="1.3"; sha256="0743kn95njgv31yhl21h35k9fv78czdw3w669wsvzf35gasxak3y"; depends=[memisc foreign plyr]; };
+  investr = derive { name="investr"; version="1.0.1"; sha256="1j598kirf21mcwjy6m48nif8f92aawl9dkpbvp19xbbkxz6jrxfj"; depends=[]; };
+  invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; };
+  ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
+  ipfp = derive { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
+  iplots = derive { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[rJava png]; };
+  IPMpack = derive { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[Matrix MASS nlme]; };
+  ipred = derive { name="ipred"; version="0.9-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; };
+  IPSUR = derive { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
+  ipw = derive { name="ipw"; version="1.0-10"; sha256="15wpjfkvlfhpwsvb5hbp8f5cp0zr20f6c0iym39api71ahn14ma0"; depends=[boot geepack MASS nlme nnet survey survival]; };
+  IQCC = derive { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[qcc MASS micEcon miscTools]; };
+  iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; };
+  irace = derive { name="irace"; version="1.04"; sha256="00ckh02i9hrzccv7pfpkg2cmvk2spcv6xamyilgwi6f9rkx43164"; depends=[]; };
+  iRefR = derive { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[igraph]; };
+  iRegression = derive { name="iRegression"; version="1.2"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
+  irlba = derive { name="irlba"; version="1.0.3"; sha256="1h2ymk9hg9xj2075w715742j23jl7kqa4cgzl1jvr48gcysq5byy"; depends=[Matrix]; };
+  irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
+  irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; };
+  irtProb = derive { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
+  irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
+  isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; };
+  ISBF = derive { name="ISBF"; version="0.2"; sha256="0vhxazbm56pli8m931l1kkica4spf50yclr3yhbwx3539775421a"; depends=[]; };
+  iScreen = derive { name="iScreen"; version="1.0"; sha256="09iyimzrx7510xamhl6w1f7p6j096wh5yck9zgwbk87mvabqynmg"; depends=[maptree]; };
+  isdals = derive { name="isdals"; version="2.0-1"; sha256="0r4dwfz18aai38wg213pn3gny9sh42nm19p6swxmzrkrigiwy4qa"; depends=[]; };
+  ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
+  IsingFit = derive { name="IsingFit"; version="0.2.0"; sha256="03858wnz9si8r9qlwg5hx0xai4kfn6nnh0mfmias6f5wkgjj0niv"; depends=[qgraph Matrix glmnet]; };
+  isingLenzMC = derive { name="isingLenzMC"; version="0.1.1"; sha256="1bm2pdq2pi3c2fgyzsp20yv68zn0hyfxhnr2133vnxvrym4is0z3"; depends=[]; };
+  IsingSampler = derive { name="IsingSampler"; version="0.1.1"; sha256="068fy16fw2ja25mllyw4z3bn17pxdq17zg75zwlwmljds6psa1gk"; depends=[Rcpp plyr]; };
+  ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
+  ismev = derive { name="ismev"; version="1.39"; sha256="0z5pam5lq72jv13gy40l35nvpk5hfcg3sq14mwhjqd129670gjbv"; depends=[mgcv]; };
+  Iso = derive { name="Iso"; version="0.0-15"; sha256="18ig772xxsbj1vhrv7b20hrglnnz742s1mjzhwx02bpjhica4a46"; depends=[]; };
+  isocir = derive { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
+  ISOcodes = derive { name="ISOcodes"; version="2014.03.24"; sha256="0a6ap9a5h88c6iqzlqfalcg1fwm9x7rm3c8z9vwxfw6jrjs6v2cp"; depends=[]; };
+  IsoGene = derive { name="IsoGene"; version="1.0-22"; sha256="097xxgqdk2j7y22qflrgss9pgbyg01rcw5088b43pbv3sc85fqcs"; depends=[Iso xtable ff]; };
+  isopam = derive { name="isopam"; version="0.9-12"; sha256="16zkw6y57i46w6v6z8zh0p2mapqry35ibl54vpb5mwp6six2hklk"; depends=[vegan cluster]; };
+  isopat = derive { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
+  isotone = derive { name="isotone"; version="1.0-1"; sha256="1miq1d35kl5br8jl0lv2jjn8nbhjzy92lqd4jzgi374g7cxyclp1"; depends=[]; };
+  isotonic_pen = derive { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
+  IsotopeR = derive { name="IsotopeR"; version="0.4.7"; sha256="18gwmh4nprj4z0ar1w8npj2ymxihw5ydwa33g25mimjk8y2cs0x5"; depends=[coda fgui runjags]; };
+  ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
+  isva = derive { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA]; };
+  ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; };
+  iteRates = derive { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[partitions VGAM MASS ape apTreeshape geiger gtools]; };
+  iterators = derive { name="iterators"; version="1.0.7"; sha256="1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv"; depends=[]; };
+  iterLap = derive { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; };
+  iterpc = derive { name="iterpc"; version="0.2.3"; sha256="1ynablx06hqhryp0ibzl4f7slk1n15krym6mmki0x42scdgr6m4f"; depends=[Rcpp polynom]; };
+  itertools = derive { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
+  itree = derive { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
+  its = derive { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; };
+  itsmr = derive { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
+  IUPS = derive { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[R2jags Matching boot]; };
+  ivbma = derive { name="ivbma"; version="1.02"; sha256="0ay7ghrygllpgh7cagrk1f56hxw1s1wfv4bap78javiyj6jgwfzy"; depends=[]; };
+  ivfixed = derive { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
+  ivivc = derive { name="ivivc"; version="0.1.9"; sha256="0m992snhvjbw9crigvksajpdj7rqyxx20nx72z0irc2vvfsynlnb"; depends=[deSolve reshape sciplot png]; };
+  ivpack = derive { name="ivpack"; version="1.1"; sha256="058g73n3gbpwdav4n78n1wfskfp518wkk220a55x5h82i77a5n6a"; depends=[AER sandwich lmtest]; };
+  iWeigReg = derive { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
+  iwtp = derive { name="iwtp"; version="1.0.0"; sha256="1q3nrp526kzkz74vjxvzm6dgdwlsmx7n034a06sqw210z9mqw3dr"; depends=[survival]; };
+  jaatha = derive { name="jaatha"; version="2.3"; sha256="0xjcl2man8aal6zlzjga75znbh0y9a7sbgqa0425nsl2h6mzal8v"; depends=[foreach phyclust Rcpp plyr]; };
+  jackknifeKME = derive { name="jackknifeKME"; version="1.0"; sha256="1vkxp6z4fb73azndk6iis2ckv3ch5c5lrpf5x4ah56z3wd785v9v"; depends=[imputeYn survival]; };
+  jackstraw = derive { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
+  JADE = derive { name="JADE"; version="1.9-91"; sha256="142a7cq2rpl746m1lcsr5da50zhc0zddxzc8dxddc87qszf920jw"; depends=[clue]; };
+  JASPAR = derive { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
+  JavaGD = derive { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
+  JBTools = derive { name="JBTools"; version="0.7.2.6"; sha256="1wpkv8841kzpw2iqacp6k0y182lsvfl1ri54aq1hg4ypb51b8ibb"; depends=[foreach gplots colorspace plotrix]; };
+  JGL = derive { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
+  JGR = derive { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[rJava JavaGD iplots]; };
+  JJcorr = derive { name="JJcorr"; version="0.01"; sha256="1mbzmzrja8a086z0hqibk2l9b3sa0481mjjz014hb0bjlavgfkv3"; depends=[fCopulae mvtnorm]; };
+  JM = derive { name="JM"; version="1.3-0"; sha256="0yn33dvy9kp7xaxlqk11f86qaichdcxpmq04gpnbcs8w8cdjjz3m"; depends=[MASS nlme survival]; };
+  JMbayes = derive { name="JMbayes"; version="0.6-0"; sha256="0p2jsxky7fg1lax5s5555mqybalc6gm7v6rwwfrl2v3j5hm18b0i"; depends=[MASS nlme survival]; };
+  jmec = derive { name="jmec"; version="1.0-4"; sha256="125scv3wxkdrnqqhsp4lziiqrkk1pvs4gjl96jh71h1w7sv8mb5f"; depends=[nlme survival]; };
+  Jmisc = derive { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
+  Johnson = derive { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
+  JohnsonDistribution = derive { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; };
+  joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[nlme MASS boot survival lattice statmod gdata]; };
+  jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
+  jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
+  JointRegBC = derive { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[nlme MASS survival]; };
+  JOP = derive { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[Rsolnp dglm]; };
+  JoSAE = derive { name="JoSAE"; version="0.2.2"; sha256="1ag4qg9cfcg8i2xz79bza2qlw3azw33h7k2ip5nlfkfpd33l9w05"; depends=[nlme]; };
+  jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
+  JPSurv = derive { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
+  jsonlite = derive { name="jsonlite"; version="0.9.7"; sha256="1c66j35fxxj9llnh16j3s4wa6axhbb4m0v1lhzc2j0pb56qg5020"; depends=[]; };
+  jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
+  JudgeIt = derive { name="JudgeIt"; version="1.5.1"; sha256="1jssz1x9gw9hjpqlqbvlxa99icl8gffzl6qya0cnaxr50p82hdag"; depends=[]; };
+  Julia = derive { name="Julia"; version="1.0"; sha256="0df72mjkfsaz7wbrg3l6fcypwm59hdxxndjv1b833xa4qpq5301g"; depends=[]; };
+  jvmr = derive { name="jvmr"; version="1.0.4"; sha256="14sbkj1ssxgf9ka6qnhqkf4ry9n0n5v07a8q112zvq0766rs3rrr"; depends=[rJava]; };
+  KANT = derive { name="KANT"; version="1.0"; sha256="0k5i1fwbmc1cg9p2zi94npkdn12lm92d7y8ncqnn64dr8ypxh2h5"; depends=[]; };
+  KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; };
+  kappalab = derive { name="kappalab"; version="0.4-6"; sha256="0dmzy0d7azzfpnzbf8b7a6zgmmfwzfiybz8610asajyfsj36gszl"; depends=[lpSolve quadprog kernlab]; };
+  kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
+  KappaV = derive { name="KappaV"; version="0.2"; sha256="05qwf083jn05qpbsmnfbp3kglsrlgl136rj4rb3nprcxzbgb8b0r"; depends=[maptools sp rgeos PresenceAbsence]; };
+  kaps = derive { name="kaps"; version="1.0-0"; sha256="19dwvlvpm8naisch2c8265rm178jixc6klqf7ilsrz6wi5r119x5"; depends=[survival Formula coin]; };
+  KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; };
+  kcirt = derive { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[mvtnorm snowfall corpcor]; };
+  kdetrees = derive { name="kdetrees"; version="0.1.3"; sha256="1lh6dkayyhwmas8fnfl9qxv5zihyimm02v2hizgcw7mk7lmjqr79"; depends=[ape distory ggplot2]; };
+  kedd = derive { name="kedd"; version="1.0.0"; sha256="1llc8hqbrp1r75b28z889nik047y400g2h05a7cjaq0r2qxbcqx1"; depends=[]; };
+  kelvin = derive { name="kelvin"; version="1.2-2"; sha256="0fl2yxc0dpmkhq3f7711gd08i7jlzlfncin1d6q251dfnmwd7rzf"; depends=[Bessel]; };
+  Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
+  kequate = derive { name="kequate"; version="1.3.2"; sha256="1sgdxkkgqpzi61c5y0slflvsvf0hr39plq0g5v7jbdbjrgqdyadv"; depends=[ltm]; };
+  kerdiest = derive { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[date chron evir]; };
+  kernelFactory = derive { name="kernelFactory"; version="0.2.0"; sha256="1ihghqrrndgif6kh6n0f4g3bfy5miskn3mk5ynxfcnnrfvp9h3xj"; depends=[randomForest AUC genalg kernlab]; };
+  kernelPop = derive { name="kernelPop"; version="1.0.2"; sha256="04p0q1bnabjswr8xnm91gbglaiqf2jqqyjp8vjak89k92cq3ryfw"; depends=[ape ade4 MASS]; };
+  kernlab = derive { name="kernlab"; version="0.9-19"; sha256="0caqp5dp1irhwpq8lyram35r8x16qlfp6f5wzqyi5rzcz27d03sg"; depends=[]; };
+  KernSmooth = derive { name="KernSmooth"; version="2.23-12"; sha256="0jlpfaf8wqa9hq7scdmgfhkvr5hi61di54slkzskg0pr7c28rlqh"; depends=[]; };
+  KernSmoothIRT = derive { name="KernSmoothIRT"; version="6.0"; sha256="09ypvyb59hz5jhf4n225y2k75xa6vw4k0ra3ql38y78aig55drry"; depends=[Rcpp plotrix rgl]; };
+  KFAS = derive { name="KFAS"; version="1.0.3"; sha256="09adqacq4r6s2ba7879s2g09wbxzgcnavxkr9pmmirsl0zvqd8vy"; depends=[]; };
+  KFKSDS = derive { name="KFKSDS"; version="1.3"; sha256="19ypaz75cl5il65klwmahkj56qy403lwfisrb6qkmprx2zwz2pil"; depends=[]; };
+  kimisc = derive { name="kimisc"; version="0.2-1"; sha256="1nbhw1q0p87w4z326wj5b4k0xdv0ybkgcc59b3cqbqhrdx8zsvql"; depends=[plyr]; };
+  kin_cohort = derive { name="kin.cohort"; version="0.6"; sha256="13gnjk58m5kya9wj87klwm6h7cdqi61ba6y0cg9k1hgbc1ajy3s8"; depends=[survival]; };
+  kinfit = derive { name="kinfit"; version="1.1.12"; sha256="1vh64k244lk8x7223dr29ds0qnhw7c7xdmrk86vhwshlzb8x712y"; depends=[]; };
+  kinship2 = derive { name="kinship2"; version="1.5.7"; sha256="13rmx9bb9lzg56k2vpdx4cc9116n27nahsiisjkj505f8j3j8x7n"; depends=[Matrix quadprog]; };
+  kintone = derive { name="kintone"; version="0.1.1"; sha256="13c82vkapks9j2crrb4awnhl60ld8b1r7xmy9yv4zzch868kcl5g"; depends=[RCurl rjson]; };
+  kitagawa = derive { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
+  kknn = derive { name="kknn"; version="1.2-5"; sha256="0c1qnn1lnypjybk2p0dpfrg6hzxflzbwmjb5biq45r57bzji7im7"; depends=[igraph Matrix]; };
+  klaR = derive { name="klaR"; version="0.6-10"; sha256="19w0ahh5b7wriky1d0hq9l1p74fiy2lf8x93yaqbbyn70bf5wka3"; depends=[MASS combinat]; };
+  klausuR = derive { name="klausuR"; version="0.12-5"; sha256="1agd432ihljww3bhm73lqdvgkd8w99jqr7fp5xwwav7mawwsirfj"; depends=[xtable psychometric]; };
+  klin = derive { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
+  kmc = derive { name="kmc"; version="0.1-2"; sha256="16lv8wk24cp91qg5202zhfmdhg83qw8bwiycknaml5ki820ffdlx"; depends=[rootSolve emplik Rcpp]; };
+  km_ci = derive { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
+  kmconfband = derive { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
+  kmi = derive { name="kmi"; version="0.5"; sha256="13m9kxbyph24njp28r122gry03rpkp26ldilhjc4rnixczvnhzwi"; depends=[survival mitools]; };
+  Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[Rcpp data_table lattice knitr markdown]; };
+  kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; };
+  kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; };
+  kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
+  KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
+  knitcitations = derive { name="knitcitations"; version="0.5-0"; sha256="1zp6flkzr3wmhnshv0sr67nwbd7fy9cg2qdvgyfz9fgwq70qbdyc"; depends=[knitr bibtex xtable RCurl XML httr]; };
+  knitr = derive { name="knitr"; version="1.5"; sha256="07f0fxgxkm6lq9lajnn590m0lpfdbjj9nwsnf2aifj46kpqkrs4y"; depends=[evaluate digest formatR highr markdown stringr]; };
+  knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
+  knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
+  knnIndep = derive { name="knnIndep"; version="1.0"; sha256="13iav0db8qmbmnf7hxmbvcyb0d76wyd05ib8mfzmgsdcpdkn4f72"; depends=[]; };
+  kobe = derive { name="kobe"; version="1.2.2"; sha256="028i4inzfrm574x0abmhs1mznhv670prhj2vd1vhxlcad6ndgyyi"; depends=[ggplot2 reshape plyr MASS coda emdbook tables RCurl ellipse]; };
+  kohonen = derive { name="kohonen"; version="2.0.14"; sha256="0rh5hs00wvkyg7kpra1lfhr93w30jmmdzkg7byypk4smxlxq64am"; depends=[class MASS]; };
+  kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; };
+  KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
+  koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
+  Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
+  kriging = derive { name="kriging"; version="1.0.1"; sha256="0ppkhjrz09x4b8syp6j2xjdv5gi4mjkvnqdfxv3pqcm3c7zqfdrs"; depends=[]; };
+  KrigInv = derive { name="KrigInv"; version="1.3"; sha256="1zgrx0rmcaf3j3igqhvnbzjwh2dm2x5s5l027c7cbrl1rn20im0r"; depends=[DiceKriging rgenoud MASS lhs pbivnorm randtoolbox DiceView]; };
+  KRLS = derive { name="KRLS"; version="0.3-5"; sha256="11r886l7rhbi247m7jnjgr0l574wicl81lxc4v2sb4ap9zzfymld"; depends=[]; };
+  krm = derive { name="krm"; version="13.11-03"; sha256="05yy06ib879j1gcgqgljkfw79a3vg2ij71w7zah4ixl7di0301la"; depends=[]; };
+  ks = derive { name="ks"; version="1.9.2"; sha256="05h13g4nla3gvawsb9zf7w8cdylpf7rc6ly6lp5dbsgc9qxha5py"; depends=[KernSmooth misc3d mvtnorm rgl multicool]; };
+  kSamples = derive { name="kSamples"; version="1.0"; sha256="0a4kl6508isjsbv8g7b8g9c2kmai90lwdjn0576i7l4hnqvi532b"; depends=[SuppDists]; };
+  KsPlot = derive { name="KsPlot"; version="1.3"; sha256="1mzpsgzscpv888ipfh9nakhqrgw7rdinb5lwhkjk9yk7ap5lfvs0"; depends=[e1071 caret nnet MASS caTools mda glmnet randomForest mvpart]; };
+  kst = derive { name="kst"; version="0.2-1"; sha256="1wy9cvvln994qgr0p7qa9qs1jd7gjv6ch65gg6i42cf9681m9h65"; depends=[proxy relations sets]; };
+  ktsolve = derive { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
+  ktspair = derive { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[]; };
+  kulife = derive { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
+  kyotil = derive { name="kyotil"; version="2014.4-1"; sha256="1cqbrn860lfh0bsfglmqa3vqv1jfblicfaz2albk31p9hh14hm20"; depends=[]; };
+  kza = derive { name="kza"; version="3.0.0"; sha256="0v811ln9vg7msvks9lpgmdi39p01342yi8fj180aclha3mfk6gfw"; depends=[polynom]; };
+  kzft = derive { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; };
+  kzs = derive { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; };
+  l2boost = derive { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
+  labdsv = derive { name="labdsv"; version="1.6-1"; sha256="0bcsjznq9w1arv503895060hkri0447fnc49nj4ynry7fi35ci22"; depends=[mgcv MASS]; };
+  labeledLoop = derive { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
+  labeling = derive { name="labeling"; version="0.2"; sha256="194awd2j33hk7p368q2npkrggkxd1xi45bj79vd8hc4jj65pzala"; depends=[]; };
+  label_switching = derive { name="label.switching"; version="1.2"; sha256="149np2jqr4vffj1mb7wvnlpj4fhb3gijrdn7qx1m946pf3h13wvv"; depends=[lpSolve combinat]; };
+  labeltodendro = derive { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; };
+  labstatR = derive { name="labstatR"; version="1.0.7"; sha256="1p6xav9cb7yx3n8rkh8xm1jkykf3xw974id49j558hmayq47ad4f"; depends=[]; };
+  laeken = derive { name="laeken"; version="0.4.5"; sha256="1wbdj7wnyapj4wbzsclm1vyyaxid4ww72dv5v2nk64q7fbc56py0"; depends=[boot MASS]; };
+  laercio = derive { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
+  LaF = derive { name="LaF"; version="0.6.1"; sha256="1yg498qzxzx4qpp27rwh854x7vkz8iqmny1pvcy2rvnnb8g0wk24"; depends=[Rcpp]; };
+  laGP = derive { name="laGP"; version="1.1"; sha256="03xpgmab61m160vbcach218njwdkpfqvs19fvcvixvgy3hpa0prc"; depends=[]; };
+  Lahman = derive { name="Lahman"; version="2.0-3"; sha256="0rsjm81yda7z73dvafhbplkp1ly5diwwmls2fgpz3pvr2hc72v1f"; depends=[]; };
+  Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
+  lambda_r = derive { name="lambda.r"; version="1.1.6"; sha256="03f3945f9kqj7in1mxk23ai56x68rdyd10c3ki4nqqysshyjr4d4"; depends=[]; };
+  lambda_tools = derive { name="lambda.tools"; version="1.0.3"; sha256="1vd1ms8yzy01wvg4baj2ypyiyy27ck3na9awlmvhdvxc1s459sr7"; depends=[lambda_r]; };
+  LambertW = derive { name="LambertW"; version="0.2.9.9.5"; sha256="06330zdpp2h973j841axd9nqgmy5z8gns1w2anmjw298k164mr6g"; depends=[moments gsl MASS nortest maxLik]; };
+  lancet_iraqmortality = derive { name="lancet.iraqmortality"; version="0.2-0"; sha256="00f467j9lw30r6han9d3gdkyqmkqsr3hq4cvp2mc93qhpprf81cq"; depends=[foreign]; };
+  landsat = derive { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[rgdal sp lmodel2 mgcv]; };
+  languageR = derive { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
+  lar = derive { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; };
+  LARF = derive { name="LARF"; version="1.1"; sha256="0mlmfd748flxf3cxj3y668azhx9v7wd2cf3c6qj56llmk5fygfbg"; depends=[]; };
+  LargeRegression = derive { name="LargeRegression"; version="1.0"; sha256="05vkd6skqg19bs54vsjf3i4rwz1j3g1gmp9jj8fsnmkds46yr91y"; depends=[Matrix]; };
+  lars = derive { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; };
+  laser = derive { name="laser"; version="2.4-1"; sha256="1f6j3xdks0w63fqjj9q8ng2m6ss90kcnsrigwal0bqskpvrpiqyz"; depends=[ape geiger]; };
+  lasso2 = derive { name="lasso2"; version="1.2-18"; sha256="0pzbp3052ns056ynk2fq8q3k6qz8ygf16zkm2bydj13qfa9k03dd"; depends=[]; };
+  lassoscore = derive { name="lassoscore"; version="0.1"; sha256="05jpybp00hl36my5ifqidp5a0n05na8maf5c0amwhmfwhl8i0p7j"; depends=[]; };
+  lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
+  latdiag = derive { name="latdiag"; version="0.2"; sha256="11fahajwky3cfbd8y5xfaiz24qf7bkifbzcnvhv7daan4gsha04z"; depends=[]; };
+  latentnet = derive { name="latentnet"; version="2.5.1"; sha256="0jzdgsw3i0s0rn8199m7g4x2gwbbrc5nd7fzimhxmib99pyzvrjf"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
+  Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14dwscnfs07hahd9is2fbn4wxwh31732vv3hr7kwm"; depends=[ade4]; };
+  lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; };
+  latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; };
+  latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; };
+  LatticeKrig = derive { name="LatticeKrig"; version="3.1"; sha256="0gvddhji6a7z0g1v5g1zjkv5hmbh6i9gb712k7j11d1gw6pla5cm"; depends=[spam fields]; };
+  latticist = derive { name="latticist"; version="0.9-44"; sha256="0kx2dyyr3zn3p63r5ypaw22hdrqyjibkws3hgyc3d560shjyfafv"; depends=[lattice latticeExtra vcd gWidgets]; };
+  lava = derive { name="lava"; version="1.2.5"; sha256="1kkp5lcs8rm26p82wc5vjgl53k8cl8l1rv3rl9xpkf4wsrvxy3ng"; depends=[numDeriv]; };
+  lavaan = derive { name="lavaan"; version="0.5-16"; sha256="1ifzhbzb57smzj22hc19d0hl1v6qg1jvilgrjy9fp0kixk1qmf80"; depends=[MASS mnormt pbivnorm quadprog]; };
+  lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; };
+  lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
+  lawstat = derive { name="lawstat"; version="2.4.1"; sha256="142plbzpvi5xy7j5m5wizhz3w1n9im9hs8byhs6kfjpdw710qn7h"; depends=[mvtnorm VGAM]; };
+  lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
+  lazyData = derive { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
+  lazyWeave = derive { name="lazyWeave"; version="2.2.0"; sha256="1cl6pqn40k4fj3p695xpp3qzy3j1swccjgrajs8z2yb563pnz9zr"; depends=[Hmisc survival]; };
+  lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
+  LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
+  LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; };
+  lcd = derive { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[igraph MASS ggm]; };
+  lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
+  LCFdata = derive { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
+  lcmm = derive { name="lcmm"; version="1.6.4"; sha256="1qk821q7abq7w2iyyd2yyjj1cr943ycjb4174m3zdxj3qxlq1v0z"; depends=[survival]; };
+  lctools = derive { name="lctools"; version="0.1-2"; sha256="1d3vxz198mwngqbhhpdz5w43j3h04dg590bzvzwfdbr1lgw8hw2g"; depends=[reshape weights]; };
+  lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; };
+  ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
+  LDcorSV = derive { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
+  ldDesign = derive { name="ldDesign"; version="2.0-1"; sha256="1a9j139a6ld3hvxawj0zhdfnhl8dhrcj4nx2qyq5vwgq8195d9y5"; depends=[]; };
+  LDExplorer = derive { name="LDExplorer"; version="1.0.3"; sha256="1hkhbhclm1bvxzq7z663i583f94cvkklaq0z5qkswrpi406md7mi"; depends=[]; };
+  LDheatmap = derive { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; };
+  ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
+  LDOD = derive { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rsolnp Rmpfr]; };
+  ldr = derive { name="ldr"; version="1.3"; sha256="0yjjy577wqi9hajgpl8bk10sgcn04knxyhbmjjr0jh08jmkvcqmx"; depends=[GrassmannOptim Matrix]; };
+  LDtests = derive { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
+  LeafAngle = derive { name="LeafAngle"; version="1.2"; sha256="18b3gncn18jvsjprjmaays67iwjdcpszy5z711rb71h1vyi0fdfs"; depends=[]; };
+  leafletR = derive { name="leafletR"; version="0.2-0"; sha256="143khia10hhr3dlj5vgnp3b0wmhls8bpabcxlhxbnk7djgfkgnb9"; depends=[]; };
+  LEAPFrOG = derive { name="LEAPFrOG"; version="1.0.6"; sha256="0zsvf22ir8r4ld67ir4m9ziqwrxfnjs44yjayicpm6sg4bdfdfa5"; depends=[alabama MASS]; };
+  leapp = derive { name="leapp"; version="1.1"; sha256="19jicg9qqgbrssi8jqqhqwxi17918zx4vp0vm1axgzyasfji36a6"; depends=[MASS]; };
+  leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
+  LearnBayes = derive { name="LearnBayes"; version="2.12"; sha256="0ynklfwfkw0iz2l6k1vddcbylrskl64852xqc9d6jyysrvydanam"; depends=[]; };
+  LearnEDA = derive { name="LearnEDA"; version="1.2"; sha256="0pvxi5ab2mrh9rwxpl4pvjzy7qr6aqg82jfga0rlcqm95wjh6br2"; depends=[aplpack vcd]; };
+  learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
+  leiv = derive { name="leiv"; version="2.0-6"; sha256="18cf050653qrwyma23r50i66irjpdbp03nc96pirji5sl4dr9q7x"; depends=[]; };
+  LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
+  lessR = derive { name="lessR"; version="3.1"; sha256="1hnjzh8chh08hgmsfc3gqgzcvs5rqycxdp0kjv660mbmrmi0g270"; depends=[car leaps MBESS foreign gdata triangle]; };
+  lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
+  lfe = derive { name="lfe"; version="1.7-1289"; sha256="1k64llwsjk6lpfyvzwq5plickds15r42p0x5ppr57xzjqfyhyy61"; depends=[Matrix Formula xtable]; };
+  lfstat = derive { name="lfstat"; version="0.6"; sha256="0wffcdgs2bqq3dvz15182jjblxgya38cfdk0vi0wxyigrlywb5ib"; depends=[lattice lmom lmomRFA latticeExtra]; };
+  lga = derive { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
+  lgarch = derive { name="lgarch"; version="0.2"; sha256="1l3n9vvj6d7famff4v1phlyjr57s4hkda857frpc11adx7k7aan7"; depends=[zoo]; };
+  lgcp = derive { name="lgcp"; version="1.3-4"; sha256="1wkv4gz0jnjlwqwmg1vpbsf2j40c4260814x1fx1xfhhrii03m0q"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
+  LGS = derive { name="LGS"; version="0.91"; sha256="0rzj1shapyg7hyzsb9v81dirwihd7bz9s861l75g3yl3p4qm8sg7"; depends=[]; };
+  lgtdl = derive { name="lgtdl"; version="1.1.1"; sha256="03gasdlw12lgw40522f6s3vybsv737f0r8w6v4k8ara1gxfy3xc6"; depends=[]; };
+  lhs = derive { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
+  libamtrack = derive { name="libamtrack"; version="0.5.4"; sha256="198wjqdhyw4s9qd7pd5qnml9sl6nyhrq75kr02ismbcx20q6ks65"; depends=[]; };
+  LiblineaR = derive { name="LiblineaR"; version="1.80-7"; sha256="1gg4x0x94qq7h3nf5z3k7zy3iknydz3cfpnb8syhpgv5a462i84v"; depends=[]; };
+  LICORS = derive { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[RColorBrewer mvtnorm zoo FNN fields locfit Matrix]; };
+  LICurvature = derive { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; };
+  lifecontingencies = derive { name="lifecontingencies"; version="1.1"; sha256="0rjiqmhqiliy8zbprxnr63r0wvwzs825gd6rrz4skwxcwpl4d0sh"; depends=[]; };
+  LifeTables = derive { name="LifeTables"; version="0.2"; sha256="1n4mqypxm0rbi77ykpr6bpzxfxvq8mm9bmfvcqz7k3ajb78cdr0d"; depends=[mclust]; };
+  LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[sn moments BB Bolstad2 optimx Rmpfr]; };
+  likelihood = derive { name="likelihood"; version="1.5"; sha256="104rvhrsszzp4h9d0qjzqxk2q06xp8p4s64s7zdi4hswqm1cp224"; depends=[nlme]; };
+  likeLTD = derive { name="likeLTD"; version="5.3.2"; sha256="1kmch31w098j4qc9gx5wkh96cz6nhaggl3ka3rrb9adlvsrlnknj"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
+  likert = derive { name="likert"; version="1.1"; sha256="1jmzxqav5hqvafb53k4mk8a2zfbzvlynqxkphndnbngq7z5915ah"; depends=[ggplot2 gridExtra xtable reshape psych]; };
+  LIM = derive { name="LIM"; version="1.4.5"; sha256="1dir9dqrpns77n5ydm3fpj2k0pl7q15z8vqbi5704vsfv94mgmas"; depends=[limSolve diagram]; };
+  limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
+  limSolve = derive { name="limSolve"; version="1.5.5"; sha256="1wcw4f95alsn1x1x98hlivc65p28ykq9njgjs561yl2zn4dyfqxf"; depends=[quadprog lpSolve MASS]; };
+  LinearizedSVR = derive { name="LinearizedSVR"; version="1.2"; sha256="08kj5mnfda6h100wvggywkcjx7mc6cwjnyqiw1kc8m8ax4birqdp"; depends=[kernlab LiblineaR expectreg]; };
+  lineup = derive { name="lineup"; version="0.34-1"; sha256="0p6gxbv8xdrhgk8zdlnqrybald9vqz717czb49b123h84rjr2f19"; depends=[qtl class]; };
+  linkcomm = derive { name="linkcomm"; version="1.0-8"; sha256="1j7m8h5pnlrz036ly9br4f9wkgbi4951cpfv5sd1lqh1gy191ldn"; depends=[igraph RColorBrewer dynamicTreeCut]; };
+  linkim = derive { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
+  linLIR = derive { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
+  linprog = derive { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
+  LINselect = derive { name="LINselect"; version="0.0-1"; sha256="1n6nsspdp1ig8v9bclyga072hxqj2hb9n1smrqia8jrma07yaydl"; depends=[]; };
+  lint = derive { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[plyr harvestr stringr dostats foreach]; };
+  liso = derive { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[MASS Iso]; };
+  lisp = derive { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
+  lisrelToR = derive { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
+  list = derive { name="list"; version="6.1"; sha256="18yclnj71yknw46wy2f2hjhrg38fyklirgr0x5aibk7yywpry0qq"; depends=[sandwich VGAM magic gamlss_dist MASS quadprog arm corpcor mvtnorm coda]; };
+  LIStest = derive { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
+  ljr = derive { name="ljr"; version="1.3-0"; sha256="0dfv0nndlbpn3b8g2b1h9qrx2if2s5cpgqkwbivh47pj9gjsir0i"; depends=[]; };
+  llama = derive { name="llama"; version="0.6"; sha256="0ga1zxibmqvqa6246y0zlrgibvcwddc8kn1h5l8f8x4jik8iq77r"; depends=[plyr rJava parallelMap]; };
+  lle = derive { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[scatterplot3d MASS snowfall]; };
+  lllcrc = derive { name="lllcrc"; version="1.1"; sha256="0m4dqg774d0pzpwvr4hj50xdz93y83w0yjcial8b14wy8zcdsmmz"; depends=[data_table combinat VGAM plyr]; };
+  lmbc = derive { name="lmbc"; version="0.9.1"; sha256="0pxm29n8rhcy7g8kia0bgz78w5nr851dhhrb7nn13szw6j13ji8x"; depends=[mseq lars]; };
+  lm_br = derive { name="lm.br"; version="2.5"; sha256="0v4gam24gny4g5618kakamryw0aq62wb9k7w6n3wq397mysnkd15"; depends=[Rcpp]; };
+  lme4 = derive { name="lme4"; version="1.1-6"; sha256="0axlax675sm9jh8h3r6ylqanknr0mi367cq7pl9z2ap0cngnd6ra"; depends=[Matrix Rcpp MASS nlme lattice minqa RcppEigen]; };
+  lmec = derive { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
+  lmeNB = derive { name="lmeNB"; version="1.2"; sha256="0xgw1kmq3krz8z0ickjg6qkj3bq2bkbwcd79c5fkl6fa3hp035mh"; depends=[numDeriv statmod lmeNBBayes]; };
+  lmeNBBayes = derive { name="lmeNBBayes"; version="1.2"; sha256="0zpxdgqv5yhpwl2jfrxx37b126pgrflynmw9i4vmcvzx830d084l"; depends=[]; };
+  LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.5"; sha256="1kq0ww8h43rsygjz5pmb3ym027klgi4sw1csdr9apwgd3ydbnr7n"; depends=[Matrix lme4]; };
+  lmerTest = derive { name="lmerTest"; version="2.0-6"; sha256="113iv3ib7917mchmns9di84c52m0yp14ikc1sklg4bfvk607cw6l"; depends=[Matrix lme4 numDeriv MASS Hmisc gplots pbkrtest]; };
+  lmeSplines = derive { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
+  LMest = derive { name="LMest"; version="1.0"; sha256="0i76wkj8a95pa5spxsaxbkk2nyrjdlnzri9739n3h08sagwc0y67"; depends=[MASS Matrix]; };
+  lmf = derive { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
+  lmm = derive { name="lmm"; version="0.9"; sha256="0gs68iwk9gajb5af5ibgg9k5280ixqki8vxyp3cq5lrk96gcmqpr"; depends=[]; };
+  lmmfit = derive { name="lmmfit"; version="1.0"; sha256="06mzmx7md7qw5mfhgdljc7i40sx9yrx7j57xbbp3fhl2zs1dpb4g"; depends=[nlme MASS]; };
+  lmmlasso = derive { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
+  lmodel2 = derive { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; };
+  lmom = derive { name="lmom"; version="2.4"; sha256="04mfp7fcw1696qn34pxdffspwy0xalig3p7mqcj49v6kdxclpx1p"; depends=[]; };
+  lmomco = derive { name="lmomco"; version="2.0.1"; sha256="0m889d436nxsl3y383sl30f82ndz06a1a9dyxz199qrw944f2cbi"; depends=[]; };
+  Lmoments = derive { name="Lmoments"; version="1.1-5"; sha256="13s9lbmfbjfam6xg0q9jl2p3q3db3pimcmnx47vx82qdm43xa4an"; depends=[]; };
+  lmomRFA = derive { name="lmomRFA"; version="3.0"; sha256="188i2fk2csqwdmw3x1wwigaajbvwfd9dwd8q3pmx7ha4smp49amk"; depends=[lmom]; };
+  lmPerm = derive { name="lmPerm"; version="1.1-2"; sha256="0wxp1dhs42isqfjfr154x0lysi55f0mw9kyas7l28xp0h57mqjqz"; depends=[]; };
+  lmSupport = derive { name="lmSupport"; version="1.07.1"; sha256="1smv1ag12373981qqhlrdf4xj73j2h0jblb74gd2w70zrbx0s2qb"; depends=[car psych gplots gvlma MASS]; };
+  lmtest = derive { name="lmtest"; version="0.9-33"; sha256="1ycmxjrxf41mnbgakdmn4y2kmgp4rkj7v3nqwqnlc6gdfdmac73s"; depends=[zoo]; };
+  loa = derive { name="loa"; version="0.2.15"; sha256="137l90qz87xrid28knbj8997pjqgqf6769cwfj82cm57m98bda91"; depends=[lattice MASS png RgoogleMaps RColorBrewer]; };
+  localdepth = derive { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; };
+  localgauss = derive { name="localgauss"; version="0.33"; sha256="1xgcwlgkzkxws771zig4x6v0m6flf9vlcgpa80ajr0vmjhlplbly"; depends=[ggplot2 MASS foreach matrixStats]; };
+  locfdr = derive { name="locfdr"; version="1.1-7"; sha256="1ix64nf0lymvqfks399871ynyph32x4yhymdw0nw59jh3c3ldhxx"; depends=[]; };
+  locfit = derive { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
+  locits = derive { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[wavethresh igraph]; };
+  Lock5Data = derive { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
+  locpol = derive { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
+  loe = derive { name="loe"; version="1.0"; sha256="11wjzq4h7qjrnrj1zg3msg1ksld9c3r3n3biamf2hz8zvi1asvqv"; depends=[igraph MASS vegan Matrix]; };
+  log4r = derive { name="log4r"; version="0.1-4"; sha256="1wgn9gywkldfzxgpdfj84l05zw6y84bwzjr7q6fjddfdvxmdwa5n"; depends=[]; };
+  LogConcDEAD = derive { name="LogConcDEAD"; version="1.5-8"; sha256="1hycsdgbmaxqq2cmyw0zg33imyzx5y82x2s7marpjiqxv4q4v95r"; depends=[MASS mvtnorm]; };
+  logconcens = derive { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; };
+  logcondens = derive { name="logcondens"; version="2.1.1"; sha256="1anawy47g2bmpi5x4s9dqw82c51mv98wfy39sikb1jixbs40mqgp"; depends=[]; };
+  logcondens_mode = derive { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[logcondens distr]; };
+  logcondiscr = derive { name="logcondiscr"; version="1.0.5"; sha256="170rg4rqch0mlhmc1zc59h271b57y3xfxrc3gh9pwvc9r11gw7k5"; depends=[Matrix mvtnorm cobs]; };
+  logging = derive { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
+  LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
+  LogicReg = derive { name="LogicReg"; version="1.5.5"; sha256="1lccxiafi2g2jmzaklcgman5zgax2rvfh61qzwz1w0p57460m581"; depends=[survival]; };
+  logistf = derive { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mice mgcv]; };
+  logistiX = derive { name="logistiX"; version="1.0-1"; sha256="0k2658hph4h9v0f1c4nd0zi72xzf7l4ivhy063y01zx61q8dbi8q"; depends=[]; };
+  LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
+  logitnorm = derive { name="logitnorm"; version="0.8.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
+  loglognorm = derive { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; };
+  logmult = derive { name="logmult"; version="0.6"; sha256="1r8i2zgmgm44dhg2z2k7cqy10hldp1p91idjiyg9pmi8dfch8xki"; depends=[gnm qvcalc]; };
+  LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
+  logregperm = derive { name="logregperm"; version="1.0"; sha256="002s5a71m3ykyypq8gw4xa642xnbp2rjwd1cxnf0rkgmshngqaik"; depends=[]; };
+  logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp92whgxgn7w87cadgxr65pp7nv6m5pvj130i3p"; depends=[]; };
+  lokern = derive { name="lokern"; version="1.1-5"; sha256="0fgpkmz8jy77sb0m862j7v32lj9d3x373na1102wvq164jjhyqg2"; depends=[sfsmisc]; };
+  lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
+  longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
+  longclust = derive { name="longclust"; version="1.1"; sha256="0cqpwkzgyg42w0yicl7diy4i3g7v3m0g0xwqg64m7hyw123dlcwl"; depends=[]; };
+  longitudinal = derive { name="longitudinal"; version="1.1.9"; sha256="048z9n7ca655mjj4gdfj1hlpddkn8jikmh5igv76l5zj9iccw5xy"; depends=[corpcor]; };
+  longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; };
+  longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
+  longpower = derive { name="longpower"; version="1.0-10"; sha256="0907s9807c1vcxac8xf6aqbw2fi7pdqfjs14nxl7wf0r0wi9jgw2"; depends=[Matrix lme4 nlme]; };
+  loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
+  LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
+  lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
+  lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
+  LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; };
+  LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="04xxg68509sgshjnzixzasp41d0vwzgvvwalm0vzfdkfrzp26h24"; depends=[]; };
+  lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
+  LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
+  lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
+  LPmerge = derive { name="LPmerge"; version="1.5"; sha256="0qy3j6xnsk5h2lmx3mx2q4b5g4vip54nh2f85zg5ncg0x5qqrizb"; depends=[Rglpk Matrix]; };
+  lpmodeler = derive { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
+  lpridge = derive { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
+  LPS = derive { name="LPS"; version="1.0.4"; sha256="0dy45nn1bmzd17y2dsh4pf4jmh9qvifigvpg2lv2zrmvlx53cli5"; depends=[]; };
+  lpSolve = derive { name="lpSolve"; version="5.6.8"; sha256="112lvmkzzl3ds3mvnmyzydjvlzgsdwsywsld6v5paq633975f4aj"; depends=[]; };
+  lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-9"; sha256="1kq3ai04dps2c14gixk67y4ax850zv79674qmf0xxrppq4yzq9n1"; depends=[]; };
+  LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-2"; sha256="1gwz2lalgqm6r364lgvk1xd1p11kbrx7lfcpclasz3ygj8lsck9y"; depends=[]; };
+  lqa = derive { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
+  lqmm = derive { name="lqmm"; version="1.5"; sha256="12fggqka00y2hwknxwfa2326r2r17mdn2qd213n7xs3pn7v0rg18"; depends=[SparseGrid nlme]; };
+  lrmest = derive { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
+  LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
+  lsa = derive { name="lsa"; version="0.73"; sha256="041wa1i85i90qvm5sxvd9nidis8s069cvf9nw1r68ajkvds65y91"; depends=[SnowballC]; };
+  LSAfun = derive { name="LSAfun"; version="0.2"; sha256="114hmqjzrq9pzq6na7yg0wl4yip50na3sgd81c6s3wrnlbdwpl0a"; depends=[lsa rgl]; };
+  LSC = derive { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[LICORS RColorBrewer fields gam Matrix]; };
+  LSD = derive { name="LSD"; version="2.5"; sha256="0j7lmsz93q2zv9y05aan5pwhpzh8m1i45mh4p386g7bvfrwlmxbx"; depends=[MASS gtools RColorBrewer colorRamps schoolmath ellipse]; };
+  lsdv = derive { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
+  lsgl = derive { name="lsgl"; version="1.0.123.0"; sha256="15chgzds2vb4jgw7vzday6km7i92g6ifpj0a2x9s4nvrdzh9y8di"; depends=[sglOptim Matrix]; };
+  lshorth = derive { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
+  lsmeans = derive { name="lsmeans"; version="2.00-5"; sha256="0yqqkzy2ignsgjwhda6i59cvh11p78az5xqb39w4ckcidk5pq96v"; depends=[multcomp plyr Matrix]; };
+  LSMonteCarlo = derive { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[mvtnorm fBasics]; };
+  lspls = derive { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
+  lsr = derive { name="lsr"; version="0.3.2"; sha256="1ahcj3ja5hj7pc7hvzlvhmh62mql3a0awli8szsyld0fpn50wprz"; depends=[]; };
+  lss = derive { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
+  ltm = derive { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
+  ltmle = derive { name="ltmle"; version="0.9.3-1"; sha256="0nvcxl55nmcabsz79vkjxmnifzm2vxg0lgwcjqiwsj242vhnfjhh"; depends=[]; };
+  LTPDvar = derive { name="LTPDvar"; version="1.1"; sha256="0zb3ffz5vw1zabgzhpcw1mzfqh4g7r0sq4iy31nzyv8smdwddqzw"; depends=[]; };
+  LTR = derive { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
+  ltsa = derive { name="ltsa"; version="1.4.4"; sha256="06db0d4j0kqp4q6rpa3sawcsm5rfgdhzl8fl7cxivjbbyrfnszqp"; depends=[]; };
+  ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
+  ltsk = derive { name="ltsk"; version="1.0.1"; sha256="1ym9h6af1aq46b6yxhdwnp6kqgx3zw08sal67y8rqd9z68432lx4"; depends=[fields]; };
+  lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; };
+  luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; };
+  Luminescence = derive { name="Luminescence"; version="0.3.3"; sha256="0z66hc3z5qrbx5j8s11kpv7qc2mcf45r0xrxqfhfbfawzy52sqm3"; depends=[Rserve XML shape rgl matrixStats]; };
+  LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[nlme MASS]; };
+  LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
+  lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
+  lymphclon = derive { name="lymphclon"; version="1.2.3"; sha256="0dvyihghjamqmhn9lvh1qblqh946b9ldnxyhb6z1gi57pyfgq00w"; depends=[VGAM MASS expm corpcor]; };
+  M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
+  MAc = derive { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; };
+  MAclinical = derive { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[party plsgenomics st e1071]; };
+  MAd = derive { name="MAd"; version="0.8-1"; sha256="16lis6q61d11z0kn3svd77yr0k3jm0zhqpwacl86jdjlmn67l92i"; depends=[]; };
+  mada = derive { name="mada"; version="0.5.5"; sha256="01hmj68dn3a003zxkih7h4332fsvib56kpgcw5hanmakdh3lq41j"; depends=[mvtnorm ellipse mvmeta]; };
+  MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
+  madsim = derive { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
+  Maeswrap = derive { name="Maeswrap"; version="1.4.11"; sha256="15i36xj2bdzhly78614077s8k2z75a1gmzl2crsfgvhyyjdax8r7"; depends=[rgl lattice geometry]; };
+  magic = derive { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
+  magicaxis = derive { name="magicaxis"; version="1.7"; sha256="1zq68iia327gignqpmv314vm79gs39yzqcd3qnwalwbcidrhp32g"; depends=[MASS plotrix]; };
+  magma = derive { name="magma"; version="1.3.0-2"; sha256="0hgwjq30ksx2qg4q9fj57m27i96sci8hrfrqc2lw4hz18b6kkph4"; depends=[]; };
+  magrittr = derive { name="magrittr"; version="1.0.0"; sha256="1hbiid6pmi0pjwfpamxh260qp9rqgj8hjbji1xncs1z82bpmx99f"; depends=[]; };
+  mail = derive { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
+  mailR = derive { name="mailR"; version="0.1"; sha256="098pn75l4bd0s6x22nv67sypj8i4r4sdzyzka3dr7k3is7gpn1r5"; depends=[rJava]; };
+  MAINT_Data = derive { name="MAINT.Data"; version="0.2"; sha256="0kmvz3s6ci9zi9k3vvrkl7jwqfjgdfk7b6xv7dskjh6mbgpcqcf4"; depends=[MASS sn miscTools]; };
+  makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
+  malaria_em = derive { name="malaria.em"; version="2.0"; sha256="1n34ahifggpdlpmigy010zysana0fg9c8ji0khk8g3il2gmzmgim"; depends=[]; };
+  MALDIquant = derive { name="MALDIquant"; version="1.10"; sha256="1g1xr26skvz4i1m3di35krlzal69gvrk3d6qkf5fhmh2n7qlga6h"; depends=[]; };
+  MALDIquantForeign = derive { name="MALDIquantForeign"; version="0.7"; sha256="03kz73n3vmbnqq7sg9qy1d13kxv1kl4pc4jr382zg306z5dphsjw"; depends=[MALDIquant base64enc digest downloader readBrukerFlexData readMzXmlData XML]; };
+  mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
+  MAMA = derive { name="MAMA"; version="2.2.1"; sha256="1dcyfir6jv28jzvphiqrjns3jh2zg2201iwcvjzbmddl2isk9h0i"; depends=[metaMA xtable gtools xtable]; };
+  MAMS = derive { name="MAMS"; version="0.2"; sha256="1q5ldw2y5ckwbbgny96x6d6wsbvn7v4gvx0h2fdjnjd5bw50144h"; depends=[mvtnorm]; };
+  MAMSE = derive { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; };
+  Mangrove = derive { name="Mangrove"; version="1.1"; sha256="15dzxsm982v7sskqh31fdiiqyac37l00i51z3f4nk3zpz6gq2nw5"; depends=[]; };
+  ManyTests = derive { name="ManyTests"; version="1.0"; sha256="0lmcvspai6mnq7xn793sx8vbml78ziqs80zym64qa5c1prvrm4jy"; depends=[]; };
+  Map2NCBI = derive { name="Map2NCBI"; version="1.0"; sha256="02cgmayrhkyji0cwr6n0f439njq29mzna7sgzkq6ml45njm9m5nh"; depends=[]; };
+  MAPA = derive { name="MAPA"; version="1.3"; sha256="00px8yh1jlfhrkkx0ln3acgidn1js3f6nv9n5hs685s82qi64937"; depends=[forecast miscTools]; };
+  mapdata = derive { name="mapdata"; version="2.2-2"; sha256="1271qw6v17v12q6g2nabr7jc4k2jvq2dy3vl90kjfdjrpb1fp3rs"; depends=[maps]; };
+  MapGAM = derive { name="MapGAM"; version="0.7-0"; sha256="00ggr7wrkz13n1f9gsp3qxxjwb01kq47aqv2mj4pa6p253iw19i7"; depends=[gam maptools]; };
+  MAPLES = derive { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
+  mapmisc = derive { name="mapmisc"; version="0.9.4"; sha256="0qsv36sk6fd3ix85yagl86y2r1kkl3qry0g0k6d0rb87aaxmk86i"; depends=[sp raster]; };
+  mapplots = derive { name="mapplots"; version="1.4"; sha256="0wwz52hjhp2xzw38zsvbk5cgdfr58rakjnmficjr305x88kisz20"; depends=[]; };
+  mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
+  maps = derive { name="maps"; version="2.3-6"; sha256="1jw461gb81ykxnjpkykim0fmm3zvb6grkaxip1h9ish8q0sh08kw"; depends=[]; };
+  mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; };
+  maptools = derive { name="maptools"; version="0.8-29"; sha256="1fb5r9i63kch2s7qjidr1n1apwkav9kzh17byrm8p89d50v5ycff"; depends=[sp foreign lattice]; };
+  maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; };
+  maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
+  mAr = derive { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
+  MAR1 = derive { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[leaps bestglm]; };
+  mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
+  marelac = derive { name="marelac"; version="2.1.3"; sha256="155a8ijl2y8l4r980ml0p23jrwnf36xqsa8s1q6n7arhxwaknhxv"; depends=[shape seacarb]; };
+  marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
+  margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; };
+  marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; };
+  markdown = derive { name="markdown"; version="0.6.5"; sha256="0gixql675hyl38cha2xxklx8x2jin88iqs7mndfqmq7mfms62i31"; depends=[]; };
+  marked = derive { name="marked"; version="1.1.3"; sha256="0nvk7fq2q7yqxmw507bsbss04wggy13kgvcv5v01g8a0wb3ig9ym"; depends=[R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; };
+  MarkedPointProcess = derive { name="MarkedPointProcess"; version="0.2.21"; sha256="06bypa124raa4vbcvi082vpd8bndnar4p1v18dq261z6j3ixk44k"; depends=[RandomFields R2Cuba]; };
+  maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
+  markovchain = derive { name="markovchain"; version="0.0.9"; sha256="0mkyzjzvc9ry7h58zp5jsnryasjllw2n877h1603g1byi9hnhvqg"; depends=[igraph Matrix matlab expm]; };
+  MarkowitzR = derive { name="MarkowitzR"; version="0.1402"; sha256="1fbn6l8z76ak8z2nyzmizcjm7h54y58773nsy03x1pwykcwpzw9f"; depends=[matrixcalc sandwich gtools]; };
+  marmap = derive { name="marmap"; version="0.7"; sha256="0c015zzwz56qz5wnasng5ckpz2i51nvq03ikzpimzrsn63a8j78z"; depends=[RSQLite gdistance geosphere sp raster ncdf]; };
+  marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
+  MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
+  maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
+  MASS = derive { name="MASS"; version="7.3-32"; sha256="1nmd5b9yillca3gczq82n5kpxslkvdhq0nl3cw2wp9s9vax29ymh"; depends=[]; };
+  MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; };
+  MASSTIMATE = derive { name="MASSTIMATE"; version="1.1"; sha256="10hs2mprdfa747sz2bjy29jixblbnyb744wxf8gh4jq3d5f5xpiq"; depends=[epicalc]; };
+  MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; };
+  MAT = derive { name="MAT"; version="0.1-3"; sha256="0z9kiji0kar286dcirsgrszd2kn6hcrfq8jhnn5pa2rfscgccdmj"; depends=[MASS]; };
+  Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
+  MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
+  mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
+  maticce = derive { name="maticce"; version="1.0-3"; sha256="0nir60jbai0fisccrpkrnjm5z9lvhimhwfiqnmzxw4mjiifj41c2"; depends=[ouch ape]; };
+  matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
+  matlab = derive { name="matlab"; version="1.0.1"; sha256="0cfjif92visppk4r028gpp66l8x1c4cc287nildwlhrwf7s9szm3"; depends=[]; };
+  Matrix = derive { name="Matrix"; version="1.1-3"; sha256="0f10j4f7bsq55ks4a976l1d8pq3brfpwjx7gj54iv79viyvz1lr3"; depends=[lattice]; };
+  matrixcalc = derive { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
+  MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.0"; sha256="03ccawgrkv0r3y8smpym27p5bsxy8y9rhn7pqs9ybb385951azy9"; depends=[]; };
+  MatrixModels = derive { name="MatrixModels"; version="0.3-1.1"; sha256="0b44gyvpfvhbkl1vymni7pplidz9a5jrcalswx19hnh5x14qw168"; depends=[Matrix]; };
+  matrixpls = derive { name="matrixpls"; version="0.3.0"; sha256="12qa1isj9609xj8qrr8ra8l711zagckim3nwvp7crrv4i6jm4299"; depends=[assertive matrixcalc psych lavaan MASS]; };
+  matrixStats = derive { name="matrixStats"; version="0.8.14"; sha256="1sb9vzgcidiy0jynczigbddc70g0nm9052jzh7wxzx922bj8pir1"; depends=[R_methodsS3]; };
+  MATTOOLS = derive { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
+  MaXact = derive { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
+  maxent = derive { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[SparseM tm Rcpp]; };
+  maxLik = derive { name="maxLik"; version="1.2-0"; sha256="1vgq2pjy8244ccdjcrrgri4sn2kcwqyfwskh885ci5aw01121d36"; depends=[miscTools sandwich]; };
+  maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
+  maxstat = derive { name="maxstat"; version="0.7-20"; sha256="171xsq96qdclb7ndpmv8652gh372ncxfkn5yfngvjv1fb12dq8jx"; depends=[exactRankTests mvtnorm]; };
+  MBA = derive { name="MBA"; version="0.0-8"; sha256="09rs1861fz41dgicgh4f95v4zafh1jfxhqar1plpqqdx8z1gpxfl"; depends=[sp]; };
+  mbbefd = derive { name="mbbefd"; version="0.1"; sha256="0m24q679b7a27hw7v370p21w9bq18zc225q2df319hdrya3aygf2"; depends=[]; };
+  MBCluster_Seq = derive { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
+  MBESS = derive { name="MBESS"; version="3.3.3"; sha256="12jsrxwdprrahqbk0i0js7lja81ydy385xmijlqk0slppd72dd9c"; depends=[]; };
+  MBI = derive { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
+  mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
+  MBmca = derive { name="MBmca"; version="0.0.3-2"; sha256="1fg1yl8nx8mv44d3sb5cjvyqazz0z4qc7947m96bwpcdva79lvkh"; depends=[robustbase chipPCR]; };
+  mbmdr = derive { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
+  mboost = derive { name="mboost"; version="2.2-3"; sha256="05xsmli8srxq1jyza6s67xgcrjby1rzp1ahc62rh636i9m0ihr9k"; depends=[survival Matrix lattice]; };
+  mc2d = derive { name="mc2d"; version="0.1-14"; sha256="1djnvwlq1qvvwhnmj3ijwyaqyp1k778i1yv6qmlj053lc38b54j7"; depends=[mvtnorm]; };
+  MCAPS = derive { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
+  mcbiopi = derive { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
+  mcclust = derive { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
+  MCDA = derive { name="MCDA"; version="0.0.3"; sha256="0nfj5wlsjhj3z20jvdwl12r18rxnpk343r49j5awkh41qa0qyjr8"; depends=[Rglpk Kendall glpkAPI]; };
+  mcga = derive { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; };
+  mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
+  mcGlobaloptim = derive { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; };
+  mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
+  MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
+  mcIRT = derive { name="mcIRT"; version="0.40"; sha256="1mqyivxgg0mzhlvl3swgicb78ikk998yab0ssmbagbk24amr1q7h"; depends=[Rcpp RcppArmadillo]; };
+  mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; };
+  mclogit = derive { name="mclogit"; version="0.2-7"; sha256="1ykkrbbnha7npmxr79qc7x77xa3847rjcax6gxrala5s07yg7sww"; depends=[memisc Matrix]; };
+  mclust = derive { name="mclust"; version="4.3"; sha256="0ii3w4d66p47i0xmjl9gz4g36piqz3b2kny876qdfjj7wh9m7hpl"; depends=[]; };
+  mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
+  MCMCglmm = derive { name="MCMCglmm"; version="2.19"; sha256="1rwg5ys8k3ccdndsyswmv2q4hnhqkqix2l271qafhg71nxlm1wd1"; depends=[Matrix coda ape corpcor tensorA]; };
+  MCMChybridGP = derive { name="MCMChybridGP"; version="4.3"; sha256="1a2mhhscjf7s2qczc4zz2pvb9kichdqr1lnkjsyiy61snbhkvp3n"; depends=[MASS]; };
+  MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
+  mcmcplots = derive { name="mcmcplots"; version="0.4.1"; sha256="0japi78j1a9q6mb7j74d81lj45j8878mdby7765yz8xnjzwjpslb"; depends=[coda sfsmisc colorspace denstrip]; };
+  MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.3"; sha256="101pbg08p594ilcrrig9sqkddprpl6cd6g9y9rrk1rq6cy5cmrvr"; depends=[MCMCglmm ggplot2]; };
+  mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
+  mco = derive { name="mco"; version="1.0.12"; sha256="1zfk01l9hza810f0kw8i4d3ayvn6l115c7i31a9ai1c33yralj0d"; depends=[]; };
+  Mcomp = derive { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[tseries forecast]; };
+  MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
+  MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; };
+  McParre = derive { name="McParre"; version="1.0.1"; sha256="16bfca867drbknzc6bylg8paa8p72l23wgjpyvy4pd9z6lpgmhdy"; depends=[MASS]; };
+  MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
+  MCPMod = derive { name="MCPMod"; version="1.0-7"; sha256="1iv4c3hsi69yhwch5mf88l27pni07yjnkjqr53kkq167axs7zklx"; depends=[mvtnorm lattice]; };
+  mcprofile = derive { name="mcprofile"; version="0.1-7"; sha256="0zjrm3bgr83pqlyjkhg6iwlw4xm4d9ad9gixbav417yw2n9h4p1l"; depends=[quadprog ggplot2 mvtnorm]; };
+  mcr = derive { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
+  mcsm = derive { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[MASS coda]; };
+  McSpatial = derive { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
+  mda = derive { name="mda"; version="0.4-4"; sha256="18a12fnhcx911ii8wfqkyi8yxrhbiw2pi6mhywgxzsl3a09g8ghh"; depends=[class]; };
+  mdatools = derive { name="mdatools"; version="0.5.3"; sha256="00zv97asyxp6m4fckkrzba2v1b24a3qzdh4f03nbv5nxdkmbpv4a"; depends=[]; };
+  mded = derive { name="mded"; version="0.1-0"; sha256="0r4pfkgndq71mbkk9yn8f3csa12kn20q7whiy24v875y8sg7w9gf"; depends=[]; };
+  MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
+  MDPtoolbox = derive { name="MDPtoolbox"; version="4.0.1"; sha256="1iskq61zvv1n0k5akdiwkvkw2kb312cpf7rgjdi45shad6z33n4d"; depends=[Matrix linprog]; };
+  MDR = derive { name="MDR"; version="1.2"; sha256="0g2fvvcwagml6635va87nc0ijzy0pypx5aqzz7mf5w13j0wpm24y"; depends=[lattice]; };
+  meboot = derive { name="meboot"; version="1.4-3"; sha256="0n01g1mjm07pii1las7l2003kg705fqdi941l9lyvdkglnx0dkc6"; depends=[dynlm nlme]; };
+  mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
+  mediation = derive { name="mediation"; version="4.4"; sha256="1vgx0i9gk7lqpvyyci0d5s9ls0ydhvhrqw9041ikb4b6h2y2aln3"; depends=[MASS Matrix lpSolve sandwich]; };
+  MedOr = derive { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
+  medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
+  MEET = derive { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[seqinr Matrix ROCR Hmisc KernSmooth]; };
+  mefa = derive { name="mefa"; version="3.2-5"; sha256="037vpnwclyj6xgycznh6g6qlirlgy3sjnkjqb1046q80b5ywv2ni"; depends=[]; };
+  mefa4 = derive { name="mefa4"; version="0.3-0"; sha256="1n56k8xr2qpmd57cj8z3n9w62h71g4aqsm8yis4dw2vsrfqp2jmf"; depends=[Matrix]; };
+  meifly = derive { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[plyr leaps MASS]; };
+  mem = derive { name="mem"; version="1.3"; sha256="02q5awb7hh1rn2s54kl2pp935fbj7nq09z6pzhdjflxd0kw1340d"; depends=[sm boot]; };
+  memisc = derive { name="memisc"; version="0.96-9"; sha256="0nra47086z4cxwx2hj0w3rdc7zi7k05z9fm6mxw2gi19jgamwcma"; depends=[lattice MASS]; };
+  memoise = derive { name="memoise"; version="0.2.1"; sha256="19wm4b3kq6xva43kga3xydnl7ybl5mq7b4y2fczgzzjz63jd75y4"; depends=[digest]; };
+  MEMSS = derive { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
+  memuse = derive { name="memuse"; version="1.1"; sha256="1i6l3d885b4v01hlkl50m401bwi7akydhh52gf4kya5khanb8n2b"; depends=[]; };
+  MergeGUI = derive { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[gWidgetsRGtk2 ggplot2 cairoDevice rpart]; };
+  merror = derive { name="merror"; version="2.0.1"; sha256="09v62f7ycywasid3b7x52dhidplwdbx9fd0855b40jklfy469bkn"; depends=[]; };
+  MESS = derive { name="MESS"; version="0.2-1"; sha256="1hqq615643iqhw6kvcxnxqlpzirdvq0hjm7j2n9x5zkr62syaql3"; depends=[geepack kinship2 mvtnorm]; };
+  meta = derive { name="meta"; version="3.5-0"; sha256="1ckyvvgi2q2gpdq6la0lwg787k3qv22f3jxd235l0f50lfvri7dn"; depends=[]; };
+  MetABEL = derive { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
+  MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; };
+  metabolomics = derive { name="metabolomics"; version="0.1.3"; sha256="1i5wqpjqbl5rhmys6l3iqkrnni7hw7ihq6c5l49ibi7mfyhzq5j9"; depends=[crmn]; };
+  metacom = derive { name="metacom"; version="1.3"; sha256="12asmqwaihm9j6p6qp79m1j93gfcj6rkwmpywhi6nv4g85c1shll"; depends=[vegan lattice]; };
+  metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
+  MetaDE = derive { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[survival combinat]; };
+  metafor = derive { name="metafor"; version="1.9-2"; sha256="1mk53g7jx4c62q4wmwsfmyki1s1g46hr9vhrmshlf6cgqhrmj90z"; depends=[Formula]; };
+  metagen = derive { name="metagen"; version="0.2"; sha256="1rhs11qv8vfh8wmh0ga7zsaxnkvk3cfsqip13a9k5x15ph7kpci9"; depends=[MASS lhs plyr BBmisc ParamHelpers BatchJobs BatchExperiments ggplot2 metafor]; };
+  metaLik = derive { name="metaLik"; version="0.41.0"; sha256="08wiriq6cm02d0b0q34056y5249daidpjzkwzgjq6dh55v5fp2s4"; depends=[]; };
+  metaMA = derive { name="metaMA"; version="2.1"; sha256="1hwhj3m4n48qb9vqix2qazsy1xnmwk8x37zm826xx9j0n5j2ilac"; depends=[SMVar]; };
+  metamisc = derive { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[mvtnorm ellipse bbmle rjags coda]; };
+  metap = derive { name="metap"; version="0.5-1"; sha256="1bfm5lg38d6ma6vras98d81xy77d2dhswn6jfk5q4cyx0wnx155j"; depends=[]; };
+  MetaPCA = derive { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
+  MetaQC = derive { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[proto foreach iterators]; };
+  metaRNASeq = derive { name="metaRNASeq"; version="0.4"; sha256="14xqgxvlip6il1gx9xvv37683qm7zmyswklbcgqw9rgqifi0plal"; depends=[]; };
+  MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1rc7sw1dfyazdm2d57wcmhkggfg3hkdn1vv"; depends=[SKAT]; };
+  metatest = derive { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
+  Metatron = derive { name="Metatron"; version="0.1-0"; sha256="0pfkb8wh1gbygbi7m9c5zi630clkn2bd1y9yrdxjlqifzvwx4dbi"; depends=[lme4 mpt Matrix]; };
+  meteogRam = derive { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
+  Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
+  MethComp = derive { name="MethComp"; version="1.22"; sha256="0wp2v8z5y9nl3jalcl2a42z2fpkwkzkvl407farws0yih0hj8b8l"; depends=[nlme]; };
+  Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
+  Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
+  metRology = derive { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
+  metrumrg = derive { name="metrumrg"; version="5.55"; sha256="1y95j8chnm34svf4q7ijqm19778pnap8734a40v3zb17zbjvs3aj"; depends=[reshape lattice XML MASS]; };
+  mets = derive { name="mets"; version="0.2.7"; sha256="1lrxc9x3f9srfmjmr8hhzwvip71dvg7372q7ia6vs4i3asc8cxa3"; depends=[timereg lava numDeriv Rcpp]; };
+  MetSizeR = derive { name="MetSizeR"; version="0.99"; sha256="1msq0la89fvg9vfz5k8rzsnhpqa9b8cjyhggp7mp10rzh696sdap"; depends=[gWidgets cairoDevice pscl gtools MetabolAnalyze]; };
+  MetStaT = derive { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[MASS abind pls]; };
+  mewAvg = derive { name="mewAvg"; version="0.2.0"; sha256="06vww6r04ig7m8d31y7ag6nr53ska5avy6m0h3lsv4lxygzsyyl1"; depends=[]; };
+  MExPosition = derive { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[prettyGraphs ExPosition]; };
+  MF = derive { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
+  MFDA = derive { name="MFDA"; version="1.1-4"; sha256="0zf21al8ivmsxlf1i7kc01w0jx3s6650a034cdynz7axnxx28ncx"; depends=[gss mvtnorm]; };
+  MFHD = derive { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[fda_usc deldir depth depthTools matrixStats]; };
+  mFilter = derive { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
+  mfp = derive { name="mfp"; version="1.4.9"; sha256="1xnx4jgkxccli1y852kvf26q04mdidczpic3ms916a8mkby7kg3k"; depends=[survival]; };
+  MFSAS = derive { name="MFSAS"; version="1.0-0"; sha256="1vnhkr4bgwdn6ffzqfp8w7z45m0ghrfr6ib4agv23frk36ypmxxr"; depends=[]; };
+  mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; };
+  mgcv = derive { name="mgcv"; version="1.7-29"; sha256="0xnp6k5mscg3g7y09zzmphlzwzank01av5i69w8ags021pdazh5n"; depends=[nlme Matrix]; };
+  MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6rlb99y9z68935q8px70njs8rl87"; depends=[ggplot2 plyr reshape2]; };
+  mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
+  mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
+  mGSZ = derive { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[GSA MASS ismev]; };
+  MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
+  mhsmm = derive { name="mhsmm"; version="0.4.12"; sha256="0k8qm447fcgfc5fmqn478dszr76jmin85k51ccqmhgk14jiz64bf"; depends=[mvtnorm]; };
+  mht = derive { name="mht"; version="3.00"; sha256="143gmipx6v9nvg2lq1kbl7ns6qmvwpxf3gzmq4b6cfgamcljl05l"; depends=[glmnet]; };
+  mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
+  mi = derive { name="mi"; version="0.09-18.03"; sha256="01cxkqy5g0i7bqr9rb86075p5gmwgcs7cvs4nfs00r5vjw1hgq61"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; };
+  mice = derive { name="mice"; version="2.21"; sha256="1j3gn84ch5jw0z9bnyjbavqx064p2x2cd8jsfp368w1xngsf9ll1"; depends=[Rcpp lattice MASS nnet randomForest rpart]; };
+  miceadds = derive { name="miceadds"; version="0.11-121"; sha256="13w3jn99214gc0qx8cgpg1hmg5q9nv1kd2rkqzqqp2fif6hls9ll"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp]; };
+  micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
+  micEconAids = derive { name="micEconAids"; version="0.6-14"; sha256="0rjr9pf2imy6ywscqx3v6vwa8abd313p16b9chfc96sdxbkv2ch9"; depends=[lmtest micEcon systemfit miscTools]; };
+  micEconCES = derive { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[minpack_lm DEoptim systemfit car micEcon miscTools]; };
+  micEconSNQP = derive { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[miscTools systemfit MASS]; };
+  MiClip = derive { name="MiClip"; version="1.2"; sha256="0cszylg7sk88gs1f4dfshw74kdifjr4q069ssxzgss9k90rszp30"; depends=[moments VGAM]; };
+  microbenchmark = derive { name="microbenchmark"; version="1.3-0"; sha256="1j0pif46bymmkgr61yf2xv2ymm0xwx52lyc46pgas4i9czygdc9v"; depends=[]; };
+  MicroDatosEs = derive { name="MicroDatosEs"; version="0.4"; sha256="14xrxf25a2w9h03sm0ppm38sa5cw2xpfxy4l056baafr9hilgvaf"; depends=[memisc Hmisc]; };
+  micromap = derive { name="micromap"; version="1.8"; sha256="0mqxqr0sx3351ln0hcr5xdijd4cg41ib7pslgbx58pwbnhy7g3pi"; depends=[ggplot2 maptools RColorBrewer rgdal]; };
+  micromapST = derive { name="micromapST"; version="1.0.3"; sha256="182zhpsps8cx3wflc5j62njzsv108d5a30v9sb1wpxpcrnsyr343"; depends=[RColorBrewer]; };
+  MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
+  MicSim = derive { name="MicSim"; version="1.0.3"; sha256="0h7mhw6476yabl4avin6pkihplg0q8dh7k63rix65aanam07wj8q"; depends=[chron snowfall rlecuyer]; };
+  midasr = derive { name="midasr"; version="0.3"; sha256="1gdfrf8p4wxz03bzdqrvj4ss14zy7dh5ac04ncvg4db2wcdxq6z5"; depends=[sandwich optimx MASS numDeriv Matrix]; };
+  MIfuns = derive { name="MIfuns"; version="5.1"; sha256="1jhiaf9wrwgrlsl8s81qh0m8x1vpa01gnw2nxcfpshi7i9il3lw7"; depends=[reshape lattice XML MASS]; };
+  MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; };
+  migest = derive { name="migest"; version="1.5"; sha256="1n82z8cl6y3v5fappvslvlviz5r60bz7jx91khk04ygprrb5amgg"; depends=[]; };
+  migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
+  migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; };
+  MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; };
+  MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
+  mime = derive { name="mime"; version="0.1"; sha256="1qmflb4339mx666ak7h47k5jgvp7prisvpay00b639sg7pwp2hbx"; depends=[]; };
+  MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
+  MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; };
+  minerva = derive { name="minerva"; version="1.3"; sha256="0ph65jfm05wck3zz0lh3bmaj0p4c9309nzkrjpjxqkcnrfdbw6wf"; depends=[]; };
+  Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
+  miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
+  minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
+  minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3dqjzkz1vq2z0xla317011zm9ms8y1qvf75raz83"; depends=[]; };
+  minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; };
+  minqa = derive { name="minqa"; version="1.2.3"; sha256="06w8in7kpsv8c7frpsgjb40x4vsc8y0ashb0il1yyr157gqdgyhn"; depends=[Rcpp]; };
+  minque = derive { name="minque"; version="1.0"; sha256="1ympfyf24883n7178s7jspq18bq5j2kb87hz2yq9i99ds6liqr6b"; depends=[klaR agridat Matrix]; };
+  minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
+  miP = derive { name="miP"; version="1.1"; sha256="17y2badm76iwidjp45flm9ln098lk9r5m6lgx3skzcq3hp075967"; depends=[VIM mi mice Amelia lattice vcd]; };
+  MIPHENO = derive { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
+  miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
+  mirt = derive { name="mirt"; version="1.3"; sha256="15136xr7awf6p736g03dxz669rg7x98gfpipxw1fv4kg10zmnk5k"; depends=[lattice GPArotation Rcpp numDeriv]; };
+  miRtest = derive { name="miRtest"; version="1.6"; sha256="11jjrw539pgnqh509hba4i3s59hd7797mfcjaadb3jnjg5yxldmc"; depends=[corpcor MASS RepeatedHighDim]; };
+  misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
+  miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; };
+  miscFuncs = derive { name="miscFuncs"; version="1.2-4"; sha256="0dql47pn0pq3rxybpc4x3c4m8d83h5j5a5zm0l4mqzjbhwd45src"; depends=[roxygen2 mvtnorm]; };
+  MiscPsycho = derive { name="MiscPsycho"; version="1.6"; sha256="1zs6apivzzii7nln3jmhxggnhxk3j54cw84wbsc8hb279rv943il"; depends=[statmod]; };
+  miscTools = derive { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; };
+  missForest = derive { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[randomForest foreach itertools]; };
+  MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-0"; sha256="18z25wjq4mcd7vv7wg1xz0hmac2dvd1ap91p22yxvpk1qjllzaq3"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
+  missMDA = derive { name="missMDA"; version="1.7.2"; sha256="07m8vih9bbzsx47g59dz9m8m23r8rrvnwddm29gx0cv24snh97lv"; depends=[FactoMineR]; };
+  MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; };
+  MiST = derive { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
+  mistat = derive { name="mistat"; version="1.0-2"; sha256="1n5wdn5pl6mflzxpdwjj0x44c8a3cxxpwhmyw1jkx5r8yk95mh3p"; depends=[]; };
+  mistral = derive { name="mistral"; version="1.1-0"; sha256="08gnichjihhl8dnyh7612x9m2b8vbj81jcya8bh1aaxql26zq9w1"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
+  MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
+  mitools = derive { name="mitools"; version="2.2"; sha256="08sbm17sw549ljid93x64lxg79f860as6j3vv0f8nh1zb9rabqh8"; depends=[foreign]; };
+  mix = derive { name="mix"; version="1.0-8"; sha256="0zdbxrslj39cl272ggzvlc41gysj1inbcbmsa4ch7ss5xvk5vfbf"; depends=[]; };
+  mixAK = derive { name="mixAK"; version="3.5"; sha256="1lqazxr5l4a1dpap48b096xclr0b1bbdqyp70gisphblsg6aa9d6"; depends=[colorspace lme4 fastGHQuad mnormt]; };
+  mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
+  mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
+  mixedQF = derive { name="mixedQF"; version="0.3"; sha256="037376k13qh0c5nw1nxx3fvffisl9kcdyjz5d4i6vn3gfj0yqccc"; depends=[nnet MASS]; };
+  mixer = derive { name="mixer"; version="1.7"; sha256="0as9l0s646snli5pykh0i6zpz168f8i5wmxk07l5rhxnb74m0id2"; depends=[]; };
+  mixexp = derive { name="mixexp"; version="1.1.1"; sha256="176idz03m24czvzgviqjfwrlsj7iqj1j146x2a6n4nirdnarjwjd"; depends=[gdata lattice]; };
+  mixlm = derive { name="mixlm"; version="1.0.2"; sha256="03m3aqyy5bck4qf19y2lbfr6rqfwnsbkz0gbfvwgyg6bwrl564s1"; depends=[multcomp pls leaps lme4 car]; };
+  mixlow = derive { name="mixlow"; version="1.0.1"; sha256="12vnp3gl3ykxzgvc4bwhi4flmc1sl2y77yi0zi4by17q93a49akm"; depends=[nlme]; };
+  MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
+  mixOmics = derive { name="mixOmics"; version="5.0-1"; sha256="0y24z1kk1q9hpy7jm76yqybg29afyjfjayxasyxldvgk1k60634r"; depends=[MASS lattice RGCCA igraph rgl pheatmap]; };
+  mixPHM = derive { name="mixPHM"; version="0.7.0"; sha256="0gyvccz205wwnmggh5zw90r6kmr5lv4s4zrdazi2ghjjrvv0gv6b"; depends=[survival lattice]; };
+  mixRasch = derive { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
+  mixreg = derive { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
+  mixsep = derive { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[tcltk2 MASS RODBC]; };
+  MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
+  mixsmsn = derive { name="mixsmsn"; version="1.0-9"; sha256="0pgip1xfgfrdy3g3197d7visn164zi7xnp6wlsgjwxdylvjsxkji"; depends=[mvtnorm]; };
+  mixstock = derive { name="mixstock"; version="0.9.5.1"; sha256="05bnxz7xkr5j96r85r7pc47svc60nwfmfax76naplzbvn751mhkg"; depends=[coda plotrix abind lattice]; };
+  mixtools = derive { name="mixtools"; version="1.0.1"; sha256="16rw8dggz5944rl5ijfdzymxdp5kb08690ppagbqbjmadmrzafaf"; depends=[boot MASS segmented]; };
+  mixture = derive { name="mixture"; version="1.0"; sha256="17gbnz82ld4d3rd4nizc27qyj0j6ca4vlj9y7sam74h35g2xrkm1"; depends=[]; };
+  MixtureInf = derive { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
+  mizer = derive { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[plyr reshape2 ggplot2]; };
+  mkin = derive { name="mkin"; version="0.9-24"; sha256="0qg9110h8frva3l3gqy8d6c0nq4z5j9y5jqzpqv00fn5v2dw4zrd"; depends=[FME deSolve minpack_lm]; };
+  MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
+  MKmisc = derive { name="MKmisc"; version="0.96"; sha256="1lcnmswvix290s63cqqlq4ls6wyzzb3f5ykcn4sch6nv71bn8x5x"; depends=[RColorBrewer robustbase]; };
+  mkssd = derive { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
+  mlbench = derive { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
+  MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
+  mlDNA = derive { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[snowfall igraph rsgcc e1071 randomForest pROC ROCR]; };
+  MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
+  mlearning = derive { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class nnet MASS e1071 randomForest ipred]; };
+  MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
+  mlegp = derive { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
+  MLEP = derive { name="MLEP"; version="0.0-3"; sha256="1v3jiqy9lr3p30bpiibbq5cypy46c7vnsl40z0miyviiv4s1c3vz"; depends=[]; };
+  mleur = derive { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[urca stabledist fGarch lattice]; };
+  mlgt = derive { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
+  mlica2 = derive { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
+  mlmmm = derive { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
+  mlmRev = derive { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
+  mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula maxLik statmod zoo MASS lmtest]; };
+  mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
+  MLPAstats = derive { name="MLPAstats"; version="0.5-9"; sha256="0cy315kj2ivqwrdhg85ncp634mwx2bbwzs86w1pcjwf03v217wk9"; depends=[nlme boot tkrplot pixmap]; };
+  mlPhaser = derive { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
+  mlr = derive { name="mlr"; version="1.1-18"; sha256="07f68afywylml4qqnid90idvhnplxqlv3gh7shm6769s15cv992a"; depends=[ParamHelpers BBmisc parallelMap codetools]; };
+  MLRMPA = derive { name="MLRMPA"; version="1.0"; sha256="0gfbi70b15ivv76l3i0zlm14cq398nlny40aci3vqxxd0m2lyyx5"; depends=[ClustOfVar]; };
+  MM = derive { name="MM"; version="1.6-2"; sha256="1z7i8ggd54qjmlxw9ks686hqgm272lwwhgw2s00d9946rxhb3ffi"; depends=[magic partitions emulator Oarray]; };
+  mmand = derive { name="mmand"; version="0.1.2"; sha256="00ag668nsl62g2dcndycfh3lljchal2rmbl4qpr8q03h8zjznln7"; depends=[reportr]; };
+  mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
+  mmcm = derive { name="mmcm"; version="1.2-4"; sha256="16lh9ivnj3l01y28lgb5gykkxwa56cssadnh516qwhnv63c586sv"; depends=[mvtnorm]; };
+  mmds = derive { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; };
+  mme = derive { name="mme"; version="0.1-4"; sha256="1k9l86q8bahkp0g6g6k963j3n2pzz4jb2xljw31r8xxlxpiv11n5"; depends=[mixstock MASS Matrix]; };
+  mmeln = derive { name="mmeln"; version="1.1"; sha256="06bxp157cdab6ghx3yrsn8l2gixh9cyv6fv4pqyq0yxqwbjf9bmi"; depends=[]; };
+  mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; };
+  MMIX = derive { name="MMIX"; version="1.2"; sha256="02c74qp48ixqh5cjp2006zgg4xz4bgxxq3csyhjl219if19kmj5m"; depends=[]; };
+  mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
+  mmm2 = derive { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; };
+  MMMS = derive { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[survival glmnet]; };
+  mmod = derive { name="mmod"; version="1.2"; sha256="1ln3srlaqn5bz72dych6gl0s0fswslsn74sg4zzpxh31473h6nrp"; depends=[adegenet pegas]; };
+  MMS = derive { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
+  MMST = derive { name="MMST"; version="0.6-1.1"; sha256="1gd7v34xi3wn2rjhk0ih0q2i2hb7c5x8kvv90g90ln803b5wvbhs"; depends=[]; };
+  mnlogit = derive { name="mnlogit"; version="1.1.1"; sha256="0n6b5c14dcqv8pldrdgpjq8r2q956whwz2bxalphcf5da9r9jlc7"; depends=[]; };
+  MNM = derive { name="MNM"; version="1.0-0"; sha256="0qab0qqhfjmaiji5yqdvd1lqz8f90q40sdwpcah923yi3g6alh2q"; depends=[ellipse ICS ICSNP SpatialNP mvtnorm survey]; };
+  mnormt = derive { name="mnormt"; version="1.4-7"; sha256="1nzf48sk9sqw4j9v6fq59qm22956jlad9acn705h4wzasmzbdic2"; depends=[]; };
+  MNP = derive { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
+  mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; };
+  Mobilize = derive { name="Mobilize"; version="2.16-2"; sha256="077s56cfb6cp2fiyrvva130c63nqr7nczfyfkykmkdsjsgs3ksp8"; depends=[Ohmage ggplot2 wordcloud reshape2]; };
+  MOCCA = derive { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
+  modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
+  modehunt = derive { name="modehunt"; version="1.0.6"; sha256="15rq1yyrjhsn2rlkyiqj36jvji635hy6jsih845mfxdpn4vnssa3"; depends=[]; };
+  modelcf = derive { name="modelcf"; version="2.1.1"; sha256="04ls1rj6q06f64dsgpmas18i8m2a24655hhbcpdpikbdsx2sifvh"; depends=[]; };
+  modelfree = derive { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
+  ModelGood = derive { name="ModelGood"; version="1.0.8"; sha256="1s86l7kcvfqm1lkpgp74b1bxj14a9r134waszw0da231zdsxfh3c"; depends=[prodlim]; };
+  ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; };
+  modeltools = derive { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
+  modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date sp sfsmisc raster rgdal]; };
+  MODISTools = derive { name="MODISTools"; version="0.93.9"; sha256="086i965gxmcqz7n0a1wg4jhplb3ivpfpwl1w32vzr0wql5yyp85i"; depends=[RCurl XML]; };
+  modTempEff = derive { name="modTempEff"; version="1.5.1"; sha256="1xny818gnr5fphxvpc343mcc6xcacr0asi36m7q0bxmzy3lhs8r6"; depends=[mgcv]; };
+  moduleColor = derive { name="moduleColor"; version="1.08-1"; sha256="16z0iyy517j1kbsbcpdppy0gyac7vyfz13yznzhs42fwj7k0iwxl"; depends=[dynamicTreeCut]; };
+  MOJOV = derive { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod survey saws lattice]; };
+  mokken = derive { name="mokken"; version="2.7.5"; sha256="0wrf5xlhvb3lcjdxkrf8pfsq8k159l5zvcwni653vrxl1rfwh69m"; depends=[]; };
+  mombf = derive { name="mombf"; version="1.5.7"; sha256="0kmxzdkjwlbw3sjinjcxsi1fjylib232agvq0bx58i7bzcad8bv9"; depends=[mvtnorm ncvreg actuar mgcv]; };
+  moments = derive { name="moments"; version="0.13"; sha256="05pa4gkmpmp744a5rsr2arqh7y5bgalwrwdn731jg6waqiniy024"; depends=[]; };
+  Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; };
+  mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
+  MonetDB_R = derive { name="MonetDB.R"; version="0.9.2"; sha256="0iyyg5mbqb97pjlfj2xd2y9sd8h31d8vv0gnwgc33lwdjl65nsxx"; depends=[DBI digest]; };
+  monitoR = derive { name="monitoR"; version="1.0.1"; sha256="0rypa5r26sd3lrprh59384nzzyy2cbmq88qx6q5q647gy8w0kj1g"; depends=[tuneR]; };
+  monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
+  monomvn = derive { name="monomvn"; version="1.9-4"; sha256="0hdrwsadjgw1md5fmd5353sc4v2dwbz6qh6h85m755fyv0q1bh5v"; depends=[pls lars MASS]; };
+  MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
+  monreg = derive { name="monreg"; version="0.1.2"; sha256="0qah7yw1xwk3pig413r7l8hhh645d45706mndv614fir738bv9pk"; depends=[]; };
+  moonsun = derive { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
+  mopsocd = derive { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
+  morgenstemning = derive { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
+  Morpho = derive { name="Morpho"; version="2.0.2"; sha256="0pfg01w918qfz8k75g4mbr67dp01a5s9nw1qi59ncrh79qy2zgin"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp]; };
+  MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
+  MortalitySmooth = derive { name="MortalitySmooth"; version="2.3.2"; sha256="0r24v94nslavxjxvyc8a1f6dar3vm2lysg6qpxcgw6zgx8k0vk00"; depends=[svcm lattice]; };
+  mosaic = derive { name="mosaic"; version="0.8-18"; sha256="19qw4m8wvk0j6wjnzz8lc7sz07f9di8n52l739l8wzwzacjrlc6f"; depends=[lattice car Hmisc]; };
+  moult = derive { name="moult"; version="1.3"; sha256="0mvzyildng2qs4jgws37wa2b8ms8bv7mmzs0dxbc1wcq56vfs9yj"; depends=[Formula]; };
+  move = derive { name="move"; version="1.2.475"; sha256="0d542554bamgnc5qd7z497ssk885mz4m1wbaiqpi5cyxd24kwgii"; depends=[geosphere sp raster rgdal]; };
+  movMF = derive { name="movMF"; version="0.1-3"; sha256="0ad9ihvr63jgdxyr5fjbrf5cqjlcjaxfbygapb5li3lb1q0f01vl"; depends=[skmeans clue slam]; };
+  mpa = derive { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
+  MPCI = derive { name="MPCI"; version="1.0.6"; sha256="1ngxx5363cm2cid3dl9amva016xy914sz49nfdkh88hjsxv3svjc"; depends=[]; };
+  MPDiR = derive { name="MPDiR"; version="0.1-15"; sha256="1ga3dk9ncycsq30w6na4g7aik43v8q2kcrg7x6lpmiaa9qa2wn16"; depends=[]; };
+  mph = derive { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
+  MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
+  MplusAutomation = derive { name="MplusAutomation"; version="0.6-2"; sha256="0b85hnxxd46xr240k0vswwh81n57a2azmmz9wyc6x8qidiagqzxg"; depends=[plyr boot gsubfn coda xtable lattice]; };
+  mpm = derive { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[MASS KernSmooth]; };
+  mpMap = derive { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata seriation qtl wgaim]; };
+  mpmcorrelogram = derive { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
+  mpmi = derive { name="mpmi"; version="0.4"; sha256="0lfzw1bncp9nhsng5j5avvwi02grx8pmf39v5zav63s0lzmrj8a3"; depends=[KernSmooth]; };
+  mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
+  MPSEM = derive { name="MPSEM"; version="0.2-3"; sha256="1shg2n2bsv14bc3i0z6d88gz1n813ad5xnz9z77b7q92v8dr6wn3"; depends=[ape MASS]; };
+  mpt = derive { name="mpt"; version="0.4-1"; sha256="08drh66056pnvs43gc7dxhb62ajkdijbc9ca2y1hjrgvkssqk5xg"; depends=[]; };
+  MPTinR = derive { name="MPTinR"; version="1.3.5"; sha256="0igxmgf3r3d3nacz5nv95aikk4jqacbd75wdry14ahhn513h7qx5"; depends=[numDeriv Brobdingnag]; };
+  MPV = derive { name="MPV"; version="1.29"; sha256="165sbayrp8p3aqwqrmf1g10agm0kdjksr6mr6p929j22kkf3k8gx"; depends=[]; };
+  mQTL = derive { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[qtl MASS outliers]; };
+  mra = derive { name="mra"; version="2.13"; sha256="1x282nzdz5bd3yji26mnzlvrkxszx15cra079k07rgdxqnixg2c8"; depends=[]; };
+  mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
+  MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
+  MRCV = derive { name="MRCV"; version="0.3-1"; sha256="0dr8mh1gf68qd88bx686r4j22nz5qr6nc65x6icv6idsy1q27xsn"; depends=[tables]; };
+  mrdrc = derive { name="mrdrc"; version="1.0-6"; sha256="0kk6837hx4c7ixsrmib46ycvimv90ka8sj3w0310s4d7bzxvw1sc"; depends=[drc locfit]; };
+  mrds = derive { name="mrds"; version="2.1.5"; sha256="1zpp28v389r955d3y6d6b9mvjn08ayym2j0wmynjmsfqp3phfp3z"; depends=[optimx mgcv Rsolnp]; };
+  mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
+  mritc = derive { name="mritc"; version="0.4-0"; sha256="02a8h1x3pk406zpn89gl5wkcd74qm5gqz8gqpckk3nv881pkayaz"; depends=[lattice misc3d fmri AnalyzeFMRI]; };
+  mRm = derive { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
+  MRMR = derive { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[reshape2 ggplot2 lubridate lmtest plyr]; };
+  mRMRe = derive { name="mRMRe"; version="2.0.4"; sha256="1ig78szk20s0cdj4pzrxxqa2hlx7126fh0jah8ym0563ps8hwill"; depends=[survival igraph]; };
+  MRsurv = derive { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[survival mvtnorm]; };
+  MRwarping = derive { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
+  msap = derive { name="msap"; version="1.1.5"; sha256="0y9dxj8g05w344rj3mfc4cafqbh59dxxg3z75nk8xjy2xsv60wxs"; depends=[ade4 scrime pegas cba ape]; };
+  msarc = derive { name="msarc"; version="1.3.2"; sha256="1y9yy8gzha2q8qicxj7j6r2iqy8bdbckdnqjakh74hlpp8jyqx5i"; depends=[gplots]; };
+  MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; };
+  MSBVAR = derive { name="MSBVAR"; version="0.7-2"; sha256="0gcbzc2pb14hvd1b1phjkm38l5nh4m3s8zdgwh9xvv4qmx255czw"; depends=[KernSmooth xtable coda bit mvtnorm lattice]; };
+  mseapca = derive { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
+  MSeasy = derive { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap clValid cluster fpc]; };
+  MSeasyTkGUI = derive { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
+  mseq = derive { name="mseq"; version="1.2"; sha256="0h1wdnmlw7raqyy7844zl5k942d6glhv0lihd4h3gcv5is0if66w"; depends=[gbm]; };
+  MSG = derive { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; };
+  msgl = derive { name="msgl"; version="2.0.125.0"; sha256="0jpyzn6pp3fh22qxmbgapdbjkxrvjl0mkk5cms0cldawbds3p4sj"; depends=[Matrix sglOptim]; };
+  msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
+  msgps = derive { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
+  msir = derive { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
+  msm = derive { name="msm"; version="1.3"; sha256="1imkzwk4f727g04p3q3h442wiw5ccg3n47skdgsxz3yy5nxlll8v"; depends=[survival mvtnorm expm]; };
+  msme = derive { name="msme"; version="0.4.4"; sha256="16j1xl0vn2ph7hbhlp9sdlm3dl4qygg97j13fwqn9slzhyr986sk"; depends=[MASS lattice]; };
+  msos = derive { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
+  MSQC = derive { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; };
+  msr = derive { name="msr"; version="0.4.1"; sha256="1kfj6xq7l32ligc53akiym3s9if87087gan8nqz4w7d8nxp693s7"; depends=[Matrix class glmnet e1071 rgl RColorBrewer colorspace]; };
+  msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class lattice]; };
+  mstate = derive { name="mstate"; version="0.2.6"; sha256="1kj2w9xqip1mn217ri2pa32bsmyfxndmda9r6j64xkz00lnynsff"; depends=[survival survival]; };
+  MSwM = derive { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
+  MTS = derive { name="MTS"; version="0.32"; sha256="0jxa0madik1d317wsl1svb2bndi6mw125brbxpyf019lknh6yajy"; depends=[Rcpp fGarch mvtnorm]; };
+  mtsdi = derive { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
+  MTurkR = derive { name="MTurkR"; version="0.4"; sha256="19hk6jgkj7rr4syad3chmyacn0q2m9lq0z3hdrfavcwqa203zgp9"; depends=[RCurl digest XML]; };
+  MUCflights = derive { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[XML geosphere sp RSQLite NightDay]; };
+  MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
+  mugnet = derive { name="mugnet"; version="1.02.0"; sha256="0mr70iizs93awl6bzg3i4w3i35dyyq0ckpakph3psga1xqdq6gzm"; depends=[catnet]; };
+  muhaz = derive { name="muhaz"; version="1.2.5"; sha256="1vj33kg2mfr79y4ayybkjamxx0swykpf7iqbw502xclqyvd7a9hn"; depends=[survival]; };
+  multcomp = derive { name="multcomp"; version="1.3-3"; sha256="1cxlkvwr67k10l65ia1fgsvqaz1zh8rhbjim63a9zjha32cy1dcx"; depends=[mvtnorm survival TH_data sandwich]; };
+  multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
+  MultEq = derive { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
+  multgee = derive { name="multgee"; version="1.4"; sha256="02h8zl79a8ad0q3inpb3aqjr9icjxjiph2b4rxnwa6kq8p3aagwn"; depends=[gnm VGAM]; };
+  multibiplotGUI = derive { name="multibiplotGUI"; version="0.0-1"; sha256="0klslbj1v0j10hv8xgyxgp4d2rkm3l4gr0gyrr1g8lyj0gf43sb3"; depends=[rgl tkrplot RODBC]; };
+  multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
+  MultiChIPmixHMM = derive { name="MultiChIPmixHMM"; version="5.0"; sha256="07pyibxk7dccbjr02ahil0fmjx60aq214fid29zakvpn2qg7kjdq"; depends=[]; };
+  Multiclasstesting = derive { name="Multiclasstesting"; version="1.3.9"; sha256="09y3gnarqv15wgmk545qrwpjwb2ilv2b2kc74cxzcb2p1lflfjzm"; depends=[]; };
+  MultiCNVDetect = derive { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
+  multicon = derive { name="multicon"; version="1.2"; sha256="0cjmh4q2yvv9pqmmnilzhzvmds2nzbipy4vd009zjfq4c925c7m0"; depends=[psych abind foreach mvtnorm sciplot]; };
+  multicool = derive { name="multicool"; version="0.1-2"; sha256="1rs7q93lcr1crrx433zgil2db1rb3n4qw62r52nvpllqfwfx98dc"; depends=[]; };
+  multicore = derive { name="multicore"; version="0.1-7"; sha256="122qxzkb9zl81xj8y1w3dmb0vqz81js94x39fmkld9jw7ydiha8l"; depends=[]; };
+  multiDimBio = derive { name="multiDimBio"; version="0.3.3"; sha256="1aj6yam31mr0abjb6m5m85r1w71snha4s7h4ikyw66sc73xkmb9m"; depends=[ggplot2 lme4 misc3d MASS RColorBrewer]; };
+  multigroup = derive { name="multigroup"; version="0.2"; sha256="1y4z6fwl68n3bk5klf3hz9jkvyx59pyq84d4brszs3hzb59ra39z"; depends=[]; };
+  MultiLCIRT = derive { name="MultiLCIRT"; version="2.6"; sha256="18c2wb9jf44vjiiz3a4ggksi0z7rgwyvpqhfb67rra304rp1gs4r"; depends=[MASS]; };
+  multilevel = derive { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[nlme MASS]; };
+  multilevelPSA = derive { name="multilevelPSA"; version="1.2"; sha256="1wkywcnlvmf5li3ii7vhjsj390ay88gz9ll5agiyaj15gfd3mjls"; depends=[ggplot2 plyr psych reshape proto xtable xtable]; };
+  multinbmod = derive { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
+  MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
+  multinomRob = derive { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[rgenoud MASS mvtnorm]; };
+  MultiOrd = derive { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[mvtnorm corpcor Matrix psych]; };
+  MultiPhen = derive { name="MultiPhen"; version="2.0.0"; sha256="05w7khzyxswlsz4sxhaakbz828zrdya1y8qcsdfc6w7wgl8qpmj9"; depends=[MASS abind epitools meta HardyWeinberg RColorBrewer gplots]; };
+  multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; };
+  multiplex = derive { name="multiplex"; version="1.2"; sha256="06wrzglgrvahavlcknf80cp0j4k840dhmclw9g6wqv51pq9brj2f"; depends=[]; };
+  multipol = derive { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
+  multisensi = derive { name="multisensi"; version="1.0-7"; sha256="1sq0jxkp33wsv6id27nka0764mr1jskqzsr2nhmqc4c8l312bkp6"; depends=[]; };
+  multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
+  multitaper = derive { name="multitaper"; version="1.0-8"; sha256="1x0a4nrngh1hs44h4gnmjfhx57kgxmkyzm431i5k288ydv57vvx0"; depends=[]; };
+  multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
+  multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
+  muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
+  MuMIn = derive { name="MuMIn"; version="1.9.13"; sha256="05q6hwjkgly0xzfjkd7ybycb0x1vwcfbzc4h1prn9kjllrlrwxw5"; depends=[]; };
+  munfold = derive { name="munfold"; version="0.3-1"; sha256="0rjicbyhxp0xr375ryg7kb2a4rvh3giw62ypws63nc3l8iwsig2m"; depends=[memisc MASS]; };
+  munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
+  muRL = derive { name="muRL"; version="0.1-9"; sha256="0711hxq8l0zc8w8k3aj4f9sq8xl5mqqx70dvq0m66kahkh2pnhgb"; depends=[maps]; };
+  muscle = derive { name="muscle"; version="3.8.31-1"; sha256="0i5y54hnkbbzg2radp5cnznab3hk73nmmsp8n5v4ybmqr226kgqj"; depends=[]; };
+  muStat = derive { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
+  mutoss = derive { name="mutoss"; version="0.1-8"; sha256="13x49dk1xyn697yindg6m00nqbn2cb12544v2k14ckmnw07mp1gq"; depends=[mvtnorm plotrix multcomp]; };
+  mutossGUI = derive { name="mutossGUI"; version="0.1-8"; sha256="1lpfz5d36v0szfg7vn7gdad27rvzxbx4w3651dmi2y1ff0d8j5z3"; depends=[rJava JavaGD CommonJavaJars plotrix mutoss multcomp]; };
+  MVA = derive { name="MVA"; version="1.0-5"; sha256="18x075hjqhrjwxivvrixgs6yc67il3n5p1m7v2wymcf8h2mkki91"; depends=[HSAUR2]; };
+  mvabund = derive { name="mvabund"; version="3.8.4"; sha256="0qvyyi8r6z6qg30vpbbr0jcajaviygwwzsfs2fw0bjix1p2df43w"; depends=[Rcpp MASS]; };
+  MVB = derive { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
+  mvbutils = derive { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
+  mvc = derive { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
+  mvcwt = derive { name="mvcwt"; version="1.2"; sha256="0fk7jgf07cap3mjg317z8g6bv28mlnwcn0lrd7my31zqima78hm9"; depends=[foreach RColorBrewer]; };
+  mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
+  mvmeta = derive { name="mvmeta"; version="0.4.3"; sha256="1f4sb55ybsd3fa2951y4h2iyyiarndmgcbcikhcvd9dbnhxr6rdv"; depends=[]; };
+  mvMORPH = derive { name="mvMORPH"; version="1.0.2"; sha256="1zzh2vmm3l6zvzg8b39ivkx2jmbw2g6n00jj4icp46w8jb26rlwa"; depends=[phytools ape corpcor subplex]; };
+  MVN = derive { name="MVN"; version="3.4"; sha256="13cmb4xls3j366lcjl6a7vimx457q1a531sy23nrddmyw1g918l2"; depends=[nortest moments MASS]; };
+  mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
+  mvngGrAd = derive { name="mvngGrAd"; version="0.1.3"; sha256="1c0rwywsa2dzhhphwc9prdxv6jyk1qdc655zvzyxif6ay3wnganf"; depends=[]; };
+  mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
+  mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
+  mvoutlier = derive { name="mvoutlier"; version="2.0.4"; sha256="131nc6m0h21azdxdxirabmnzzbg4iyhsbf3lq79v7w1f30irlv0z"; depends=[sgeostat robCompositions robustbase]; };
+  mvpart = derive { name="mvpart"; version="1.6-1"; sha256="0bs87bfb48b8n4iqy4vl2dg7grz45imjr6yiz39ns9d0c7iqs88j"; depends=[]; };
+  MVPARTwrap = derive { name="MVPARTwrap"; version="0.1-9.2"; sha256="0kj89nlndfcddsx2i9isfd7lqzj8rlsd47anhca5cmj1nyjsb4w5"; depends=[mvpart Hmisc labdsv vegan fBasics ade4]; };
+  MVpower = derive { name="MVpower"; version="2.0"; sha256="176g8jfn8gbbhyxcny9prvkn7gk23lmcr4pnxlf0a0pacxczsldr"; depends=[randomForest pamr kernlab class]; };
+  mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
+  MVR = derive { name="MVR"; version="1.20.0"; sha256="1wwzws9116ck14g6xd1svmwc9wkr8piwb24bddnzri388p8qkgb4"; depends=[statmod]; };
+  mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[nortest mvnormtest]; };
+  mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
+  mvSLOUCH = derive { name="mvSLOUCH"; version="1.1"; sha256="1z9pkqv3yb84nsv17brm1pjf8l5vbqi0i4k0djr9qfjyva1shr9x"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
+  mvtBinaryEP = derive { name="mvtBinaryEP"; version="1.0.1"; sha256="0bc5x50116bm437xmnrp3f12aaw54hna6dqf72cxnqls2k5x7gaf"; depends=[mvtnorm]; };
+  mvtmeta = derive { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
+  mvtnorm = derive { name="mvtnorm"; version="0.9-99991"; sha256="0181qg1cnkach6p366i0qzlchjdzx8jjm9pd6l24j5qwzwr44kq6"; depends=[]; };
+  mvtsplot = derive { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
+  mwa = derive { name="mwa"; version="0.2"; sha256="10ksjic71qrsmqf5x532nzfd17040plzvrnhfcr3srczf4yp51ci"; depends=[cem rJava MASS]; };
+  mxkssd = derive { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
+  mycobacrvR = derive { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
+  myepisodes = derive { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
+  Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
+  Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
+  nacopula = derive { name="nacopula"; version="0.8-1"; sha256="1g1kcs6vqagq0nisyc43040ri3a9iy3fv4bnjjjc5zrla52a20w5"; depends=[copula copula]; };
+  NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
+  nadiv = derive { name="nadiv"; version="2.12"; sha256="0x63lanzhdwsfh8jnc2i5lj359c63q9kmm3savhk4sl1qx6kczv9"; depends=[Matrix]; };
+  namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
+  nanop = derive { name="nanop"; version="2.0-2"; sha256="1f24ykdjpwd7b9cc375bk6bz7m8brb7pgzakclgvdy0fj2mlwkd9"; depends=[distrEx geometry rgl]; };
+  NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.17"; sha256="02jvrrz4cmr7l35s7xh0mmwmr5l5lga1vnph2rij2lb8124ardf5"; depends=[gdata]; };
+  NAPPA = derive { name="NAPPA"; version="1.0"; sha256="0l264w4kmfzp57j92az1my7xcrna4nix4yvngb69qynyipv683yx"; depends=[plyr]; };
+  nat = derive { name="nat"; version="1.4.10"; sha256="1200qxsrhlxassi8jyrcwfpknyck2p092sxv2gkc74vp62w2b0lp"; depends=[rgl RANN igraph filehash digest nat_utils]; };
+  naturalsort = derive { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
+  nat_utils = derive { name="nat.utils"; version="0.4"; sha256="1l3pzms5d7zagdzlq98bsr0yma90x57hykxlgyjyri4qncq32cmp"; depends=[]; };
+  NbClust = derive { name="NbClust"; version="1.4"; sha256="163ri75q8r0amcj38mg027frs47f9iindcf6fhzf0529b19wdcaw"; depends=[]; };
+  NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
+  nbpMatching = derive { name="nbpMatching"; version="1.4.0"; sha256="0ncw8xihdh24cfz0rhcvvp2l5mhm2z7hllnkf45bhdhpams6yryp"; depends=[Hmisc MASS]; };
+  NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; };
+  nCal = derive { name="nCal"; version="13.12-01"; sha256="06grlb7ac9vy3ncnqz5h63iarsh94z4mcb29bigkdvnbv9whj7mn"; depends=[drc gdata gWidgets xtable]; };
+  NCBI2R = derive { name="NCBI2R"; version="1.4.5"; sha256="0c7w74fj4pml9pg4xx0f99mw50rr73j2mcahz3s91nrgm0gfyd2v"; depends=[]; };
+  ncbit = derive { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
+  ncdf = derive { name="ncdf"; version="1.6.6"; sha256="0s4jx70kxdwifwzgwqc7yy3glsw19664hxnhhsay6sv68jdyhb8y"; depends=[]; };
+  ncdf4 = derive { name="ncdf4"; version="1.10"; sha256="1v3pncm865bysg38mas4584pbvh2gcv2dms8rjbn8h1cmkjhh2p9"; depends=[]; };
+  ncdf4_helpers = derive { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[ncdf4 PCICt abind]; };
+  ncdf_tools = derive { name="ncdf.tools"; version="0.7.1.291"; sha256="149d89kim67q77w17afc5x7hkvmk05gfkaw6cpl583j2zxingify"; depends=[RNetCDF chron abind plotrix raster RColorBrewer JBTools]; };
+  nCDunnett = derive { name="nCDunnett"; version="1.0.0"; sha256="0n5zzsdrhra5xql110wrxbfdjm3fwa6qhvnpj89w9ph9nr4ad8gf"; depends=[]; };
+  ncf = derive { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
+  ncg = derive { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
+  NCmisc = derive { name="NCmisc"; version="1.1"; sha256="13nx9p6yq46lf2q92ximi33wynxfxah8ns18227xxm99d6fpb05v"; depends=[proftools]; };
+  ncvreg = derive { name="ncvreg"; version="3.1-0"; sha256="1q8ij64x03xmxn73s3dcwyq55936irv2jn9q5apgdy15myiigb49"; depends=[]; };
+  ndl = derive { name="ndl"; version="0.2.16"; sha256="1l56kg3x4579hzr4sig3iwrd81rhm8nmmrqfs54zxqv5yxpk3hp4"; depends=[Rcpp MASS]; };
+  ndtv = derive { name="ndtv"; version="0.5.1"; sha256="0cvqpr74als10zhdravbc7ykacy3ll7y5fx4n5jik0avwcaclgkc"; depends=[network networkDynamic animation sna MASS statnet_common]; };
+  neariso = derive { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
+  NeatMap = derive { name="NeatMap"; version="0.3.6.1"; sha256="05x7dphddxns8gp7bfbsvqnbvwybhzq7qslsyaxbiib3000s3628"; depends=[ggplot2 rgl]; };
+  needy = derive { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
+  NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; };
+  negenes = derive { name="negenes"; version="1.0-1"; sha256="0g8m3idjm24cf9b1wngw2pv1axgnv9mk5wqs78zgwvn0m67ypsiz"; depends=[]; };
+  neldermead = derive { name="neldermead"; version="1.0-9"; sha256="144liymq0cnd80cp2vn2d1j22g0izipnchc90r526gfpm2gklh7n"; depends=[optimbase optimsimplex]; };
+  nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; };
+  NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; };
+  netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
+  NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
+  NetComp = derive { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
+  NetData = derive { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
+  NetIndices = derive { name="NetIndices"; version="1.4.3"; sha256="0ff57f5b12lccqbfin530ra373rn1wz6n42b0jnkyi2ra8hcm88f"; depends=[MASS]; };
+  netmeta = derive { name="netmeta"; version="0.4-3"; sha256="0a8z3wfdwqi2dazy94b46p3p8zrb5lvadklmpa4n7gczx0k0zqnx"; depends=[meta magic]; };
+  NetPreProc = derive { name="NetPreProc"; version="1.0"; sha256="1w0iih6pz8ci1y09xlzm2x3082s57znp1cxq44ckwh45hvzbxbmi"; depends=[]; };
+  nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
+  NetSim = derive { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
+  netweavers = derive { name="netweavers"; version="1.0"; sha256="1k0i31h1wg3hk6m0w56jq14hqc4xpdmw7xy4mydars2nzfj41kzj"; depends=[igraph]; };
+  network = derive { name="network"; version="1.9.0"; sha256="1n88gz8ccrd9jq0xfywnj0yxlqq2nfp90vd18zjvf4yf3sylqril"; depends=[]; };
+  networkDynamic = derive { name="networkDynamic"; version="0.6.3"; sha256="0yb536q7v16wx491c5dmw7sf7h4f2rxs39bsdi0sknizgnmsqlv0"; depends=[network statnet_common]; };
+  networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; };
+  networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; };
+  networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
+  neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
+  neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
+  neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; };
+  neuRosim = derive { name="neuRosim"; version="0.2-10"; sha256="1h6hhzf3rl8fnvdv8vw3lzzd23pbnv1shd9d8gpk41fgigjnxp1v"; depends=[deSolve]; };
+  Newdistns = derive { name="Newdistns"; version="1.0"; sha256="1agg5v05x9qlg1w439aycfjfd5yap6ivn1kqgsc3ck148ar11wb2"; depends=[]; };
+  nFactors = derive { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[MASS psych boot lattice]; };
+  ngramr = derive { name="ngramr"; version="1.4.3"; sha256="0j66v841xkb1yw2n4pa7p8kz574np2yj2ic71z6aq71npdbxgh9a"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; };
+  ngspatial = derive { name="ngspatial"; version="1.0-3"; sha256="1ph3yg8vcvij3ymw41dczjpzs68icm5lr0pxybmmfgggpmw5cjyb"; depends=[Rcpp batchmeans]; };
+  NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
+  nhlscrapr = derive { name="nhlscrapr"; version="1.5"; sha256="1b3bi79gkax2cm4b1hq8gd5snxyh1z3flc3qipdkada9r794jxlw"; depends=[RCurl rjson biglm bitops]; };
+  NHMMfdr = derive { name="NHMMfdr"; version="1.0.6"; sha256="10xwvmzqkx90zh88yjmf6d8gsbqil4vxp53d914080b3aygsvxm8"; depends=[MASS locfdr]; };
+  NHPoisson = derive { name="NHPoisson"; version="2.1"; sha256="147qxmgwpqa9i8w4syhmr9n0pnypdvhpcai45zkfd1wz49xx3lvr"; depends=[car]; };
+  nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
+  NightDay = derive { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
+  Nippon = derive { name="Nippon"; version="0.5.3"; sha256="02m591aljlaxn95k7sl8gfsviv4ywqv9mrkjf6g19kfrc9pbgjqg"; depends=[maptools]; };
+  NISTnls = derive { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
+  nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
+  nleqslv = derive { name="nleqslv"; version="2.1.1"; sha256="1f15qql1hg5rirdl4lq0mpabz7nc9ki0yaham6n43i326cwmsxpn"; depends=[]; };
+  nlme = derive { name="nlme"; version="3.1-117"; sha256="105zrprpgd4snwcy80qfnjzvd5m7g4cx8njji83gg7ynskhrhxj9"; depends=[lattice]; };
+  nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
+  nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
+  nlmrt = derive { name="nlmrt"; version="2013-8.10"; sha256="1b86kjmbspwj9whnmvbvhhgij2jn3j102szygjpzwmqgx4sfsgw7"; depends=[]; };
+  nloptr = derive { name="nloptr"; version="1.0.0"; sha256="169gvrywx0py2d5xvx61cz20pmrdf9xahanj4wxr5klgylbbrgd6"; depends=[]; };
+  NLP = derive { name="NLP"; version="0.1-2"; sha256="17b0bsh9ff0rzjpa4rj1mzimpb8iysk3ykk2lazajz2faz8xnsba"; depends=[]; };
+  nlreg = derive { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
+  NLRoot = derive { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
+  nlrwr = derive { name="nlrwr"; version="1.1-0"; sha256="1j9wfcjimvfhxiwxsxcp5dni70i7bj5iizd8dq3kamzp7319mryv"; depends=[alr3 car drc HydroMe lattice lmtest MASS NISTnls nlme nls2 nlstools NRAIA sandwich]; };
+  nls2 = derive { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
+  NLSdata = derive { name="NLSdata"; version="0.9"; sha256="0z98bnxbzlpgyz5qlzhjqbfhscz9khxq4prrkx2iv1d1jwf5nli2"; depends=[reshape2]; };
+  nlsmsn = derive { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; };
+  nlstools = derive { name="nlstools"; version="0.0-15"; sha256="16a8v2hx2x92ak811psld0klanksd8p0l8w0ikhi3frfaps8g8vi"; depends=[]; };
+  NlsyLinks = derive { name="NlsyLinks"; version="1.302"; sha256="0m1qvrpdfwql4jdk3nbn80llq83wavimifw630gnazwmkgkcncai"; depends=[lavaan]; };
+  nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[EbayesThresh adlift]; };
+  nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; };
+  NMF = derive { name="NMF"; version="0.20.5"; sha256="1j91vklzi4qjlix5sn9qh86dwx6vxnla2p4ag81apkr441jkvynr"; depends=[pkgmaker registry rngtools cluster stringr digest gridBase colorspace RColorBrewer foreach doParallel ggplot2 reshape2]; };
+  NMFN = derive { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
+  NMOF = derive { name="NMOF"; version="0.28-2"; sha256="0c22fpzg8qg6asd0glq5cz32mhw7607bcsl7cmrkfzwm8p4yarns"; depends=[]; };
+  NMRS = derive { name="NMRS"; version="1.0"; sha256="0cas9lxki0c1bjn2dciv4s3wpvgvi6wkg5v46dj6cj9br21gc7nj"; depends=[Rwave FTICRMS tkrplot]; };
+  nnclust = derive { name="nnclust"; version="2.2"; sha256="1mr506ddvw4lslylpmm43wmd6mwv055zjzgb427nj3jl142dfyz2"; depends=[]; };
+  nnet = derive { name="nnet"; version="7.3-8"; sha256="0nhbprhwkpnhzw6jls8y76xskfh9gq491kg8q8wnamjv3gnngfa5"; depends=[]; };
+  nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
+  nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; };
+  noia = derive { name="noia"; version="0.96"; sha256="0f5gfb78vaj9iklj7gq3g85v78xh5izghjc7v3827jr1irfjivap"; depends=[]; };
+  NominalLogisticBiplot = derive { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[mirt gmodels MASS]; };
+  nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; };
+  nonparaeff = derive { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[lpSolve gdata Hmisc rms geometry psych pwt]; };
+  NonpModelCheck = derive { name="NonpModelCheck"; version="1.0"; sha256="0mgbyp651jfqyfavpv12i9kwqf0cpk2mzh9m0b5k4n759710qv8f"; depends=[dr MASS]; };
+  nonrandom = derive { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
+  nontarget = derive { name="nontarget"; version="1.2"; sha256="0k3kmspzd7xz4y241yg5cdpg8lsavkzv0l9311d7ajf78hll15b0"; depends=[]; };
+  nopp = derive { name="nopp"; version="1.0.3"; sha256="128c441l5fgapxwl143yhciz8jcak8fisypp6wq6csdxpbs8w21f"; depends=[mlogit MASS]; };
+  nor1mix = derive { name="nor1mix"; version="1.1-4"; sha256="11ym6av7zykynkqvhkbnl7rwxgzrjhgjnbq7whxhkb6qbf6khfsx"; depends=[]; };
+  nordklimdata1 = derive { name="nordklimdata1"; version="1.0"; sha256="0l50g09c102r8fz8ks42dfywg2vh2ad8lhqi7n3gc8nhad8rapqr"; depends=[]; };
+  norm = derive { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
+  NormalGamma = derive { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[optimx histogram]; };
+  NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="1yrqfqhxkavczascwpq7z77jwpa1s2dn2cfi15vxfjyayhdxq4aa"; depends=[DistributionUtils GeneralizedHyperbolic]; };
+  normalp = derive { name="normalp"; version="0.6.9"; sha256="1a2m7agcnqmf69mgbkjmmp7mvpx9r4gk13x98yfkg1dyh3b48rri"; depends=[]; };
+  NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
+  normtest = derive { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
+  normwhn_test = derive { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
+  nortest = derive { name="nortest"; version="1.0-2"; sha256="010i9cxjaq6jjdnw8fggvinakrxi3pv4098r9i4jh62vlfwqbjpb"; depends=[]; };
+  nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
+  notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
+  noweb = derive { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
+  Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
+  np = derive { name="np"; version="0.50-1"; sha256="0x1z0kgvqc8fj9snarl3rs4kf87x6w0jk5nnjqg2sxs2gxfpdzaz"; depends=[boot cubature]; };
+  nparcomp = derive { name="nparcomp"; version="2.0"; sha256="154689lk1sd1smc3fyslrgz4rzg166n2d8nz7bhbjcrq2fhj8pj0"; depends=[multcomp mvtnorm]; };
+  nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
+  npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; };
+  NPCD = derive { name="NPCD"; version="1.0-6"; sha256="1lnj55f73rpjy6amg1n5x7b0jsrmharp0fhcjcn0dflcrjwianxj"; depends=[BB R_oo R_methodsS3]; };
+  NPCirc = derive { name="NPCirc"; version="2.0.0"; sha256="03b4lx7rkpjlxy9854dy16qw15x1cjwzyyvxn778n5xsva0c498b"; depends=[circular misc3d movMF plotrix rgl shape]; };
+  npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
+  NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
+  nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
+  nplr = derive { name="nplr"; version="0.1"; sha256="1fqsvmkgw1nz7p0fb6hgiawp9lnkd6rzlm3cca8zrwy3r2m59l56"; depends=[]; };
+  NPMLEcmprsk = derive { name="NPMLEcmprsk"; version="1.0"; sha256="0yakcjkxqlbpzs8jdaahdl4lv5l2ffq7l7v00sl77sn9gflgprk3"; depends=[]; };
+  npmlreg = derive { name="npmlreg"; version="0.45-4"; sha256="142pbbmb5qpnzsc2kx99f1kb4dkzfzj8xf69a5pjn17lppd6qxna"; depends=[statmod]; };
+  NPMPM = derive { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; };
+  npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; };
+  NPMVCP = derive { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; };
+  nppbib = derive { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
+  npRmpi = derive { name="npRmpi"; version="0.50-1.1"; sha256="0ipz0gr65ya2vk51a89l3mmbys48sa0dzywmqlvxc92k3mfiavzm"; depends=[boot cubature]; };
+  NPS = derive { name="NPS"; version="1.0"; sha256="1acg3367rd53dgwzqr8pnfr8z72s3699h2nhrhh2w9zdqipid89g"; depends=[]; };
+  NPsimex = derive { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; };
+  npsp = derive { name="npsp"; version="0.2-4"; sha256="1lzdr958m00dxwzgd46x5fs07sx0gnzbyjrllfa6s7r9klg4i707"; depends=[quadprog]; };
+  npst = derive { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
+  NRAIA = derive { name="NRAIA"; version="0.9-8"; sha256="16v8s9mqvr6sbiwwj93n3nyrm996wyw4f9l569mw2ykqpdkbp7hm"; depends=[lattice]; };
+  nricens = derive { name="nricens"; version="1.2"; sha256="17h0vckchqlvcsa604cgbcw1akaxl30yx24x1d8201svyz9n0hhb"; depends=[survival]; };
+  NSA = derive { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[R_methodsS3 MASS matrixStats R_oo R_utils aroma_core aroma_affymetrix]; };
+  NScluster = derive { name="NScluster"; version="1.0.0"; sha256="1mzh0v8lh881pr7rqfa4aqp9mwvldn4w5hzfsp8bhzamdf7w112v"; depends=[]; };
+  nsga2R = derive { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
+  NSM3 = derive { name="NSM3"; version="1.1"; sha256="0xyx06pc9690akdm02597pgcchn29gvc4kzcgyc3ihsjj71xryi2"; depends=[combinat MASS partitions survival agricolae ash binom BSDA coin epitools fANCOVA gtools Hmisc km_ci metafor nortest np quantreg Rfit SemiPar SuppDists waveslim]; };
+  nsprcomp = derive { name="nsprcomp"; version="0.4.1"; sha256="01zy6fkfnv8csmdp485rm3g7lznf826z3kgpgx964zhsx2axxdzl"; depends=[]; };
+  nsRFA = derive { name="nsRFA"; version="0.7-11"; sha256="1mlm8fygzr8b03rflays78l63ld0nagprc8xbwny5f87vi00wwq4"; depends=[]; };
+  nullabor = derive { name="nullabor"; version="0.2.1"; sha256="1pxxynfjjyqmgqvfb4fcs6jy63cf9bcbi9x1kz4f5b454q2g1raq"; depends=[MASS ggplot2 plyr]; };
+  numbers = derive { name="numbers"; version="0.4-5"; sha256="0z69samkj7fvbk0wj2nbnkcw17y1sdha7hghkc7yhgkwx2z1pana"; depends=[gmp]; };
+  numDeriv = derive { name="numDeriv"; version="2012.9-1"; sha256="09s00a1wddpq5556mz87vdmx045rhjrx1w8f2a37m8hljghy86k9"; depends=[]; };
+  numOSL = derive { name="numOSL"; version="1.3"; sha256="0jmf73199v5f20cz3xgv0askaqz8rslawjzsc8ibb562v5b29fg7"; depends=[]; };
+  nutshell = derive { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_bbdb nutshell_audioscrobbler]; };
+  nutshell_audioscrobbler = derive { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
+  nutshell_bbdb = derive { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
+  nws = derive { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
+  OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; };
+  Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
+  objectProperties = derive { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals objectSignals]; };
+  objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
+  obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; };
+  obliqueRF = derive { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[ROCR pls mda e1071]; };
+  oblique_tree = derive { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[tree glmnet nnet]; };
+  obs_agree = derive { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; };
+  obsSens = derive { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
+  oc = derive { name="oc"; version="0.93"; sha256="1nw594wrlnb0kkhkqfa14wxahh1yshpa2hz25nlnb42mi9pbrzg4"; depends=[pscl]; };
+  occ = derive { name="occ"; version="1.0"; sha256="1gn8rg6k5lwwb6axfby7hiss5m64j2rh3hsmwwij58j5xda3jlbx"; depends=[]; };
+  oce = derive { name="oce"; version="0.9-13"; sha256="09aib8xz7gs0sdq0iikmxjdpga1jvl9z4a7qqwyz4jlv74g73xas"; depends=[mapproj]; };
+  ocean = derive { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
+  OceanView = derive { name="OceanView"; version="1.0"; sha256="1x94zrvz45vval4qiim6755ispj23zp0d6qvzg3xd65y30gprni1"; depends=[plot3D plot3Drgl shape]; };
+  ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
+  odfWeave = derive { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
+  odfWeave_survey = derive { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
+  ODMconverter = derive { name="ODMconverter"; version="1.2"; sha256="05s12rv5aplii2vix6vmxx9raidgsrrdn29yillld9p6dwklrrs8"; depends=[XML xlsx]; };
+  oem = derive { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp]; };
+  Ohmage = derive { name="Ohmage"; version="2.11-3"; sha256="16mm58yzh1r8s8x3jhdjwb01a1a8yjiay4v7gcj7j4r7z4mqr75c"; depends=[RCurl RJSONIO]; };
+  OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; };
+  OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; };
+  OjaNP = derive { name="OjaNP"; version="0.9-6"; sha256="1xkwc1hca74jd74mczyvvfimm6726r4mdzw12llh4i82jcwrzzs2"; depends=[ICS ICSNP]; };
+  okmesonet = derive { name="okmesonet"; version="0.1.4"; sha256="1fq17v1wx8hxvlk489vp6nlsx8ifs4491099zhikhn1fj7b1m346"; depends=[plyr]; };
+  OligoSpecificitySystem = derive { name="OligoSpecificitySystem"; version="1.3"; sha256="0s76fxai1kgq0hcr5m18yz7i14algld97rjrax75cxm1ccylah71"; depends=[tkrplot]; };
+  OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
+  omd = derive { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
+  OmicKriging = derive { name="OmicKriging"; version="1.1"; sha256="07k23ar2garvkdzhi7qqwh3xbnl9ak8synvnsk2ycvgs1mgcwzsn"; depends=[SNPRelate doMC ROCR inline gdsfmt irlba Rcpp RcppEigen]; };
+  oncomodel = derive { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
+  Oncotree = derive { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
+  OneHandClapping = derive { name="OneHandClapping"; version="1.5"; sha256="1j45qy4nwnmiqmjqnhzs4f6zspckzhr1rx56i9ddis4iahffqd19"; depends=[]; };
+  onemap = derive { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
+  OneTwoSamples = derive { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
+  onion = derive { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
+  OOmisc = derive { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
+  OpasnetUtils = derive { name="OpasnetUtils"; version="1.0.0"; sha256="04w6jvrjwiyva8lblx7i3ynywhis7d45nzhc1gls9yqxq0p426i1"; depends=[rjson RCurl reshape2 triangle httpRequest digest xtable]; };
+  OPDOE = derive { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[gmp mvtnorm orthopolynom nlme crossdes polynom]; };
+  OPE = derive { name="OPE"; version="0.7"; sha256="0ld3pr94ii1pmfk99qfwgria6ki2iz2hwmn7pj3cjwprv8jkcjji"; depends=[]; };
+  opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
+  openair = derive { name="openair"; version="0.9-2"; sha256="051wj9s733w6i9hz8bj19m355ravd46kqzh49qhhm9vy8msvna7q"; depends=[plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer Rcpp]; };
+  OpenCL = derive { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
+  opencpu = derive { name="opencpu"; version="1.4.0"; sha256="1czgzzfhs4ik74vfxg9jf3r2yfb2jrbyki5047ac8f65skmhrz8r"; depends=[evaluate httpuv knitr jsonlite devtools httr brew pander]; };
+  openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
+  OpenMPController = derive { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
+  openNLP = derive { name="openNLP"; version="0.2-3"; sha256="1d609hv24sxjppxpkgfvsl7p8vsajj0ivczcjixlnrly09j9ajrh"; depends=[NLP openNLPdata rJava]; };
+  openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
+  OpenRepGrid = derive { name="OpenRepGrid"; version="0.1.8"; sha256="1m71wb9i30vggbxpcv9ywbdi21ki8qivqw70i3rsrk8r1nx3zxq1"; depends=[colorspace plyr abind rgl GPArotation psych XML xlsx pvclust]; };
+  OpenStreetMap = derive { name="OpenStreetMap"; version="0.3.1"; sha256="009xiqsbgqb3lba6msyzq7ncripmvpymxynkga8pqc8npv8g7fzb"; depends=[rJava raster rgdal rJava]; };
+  openxlsx = derive { name="openxlsx"; version="1.0.3"; sha256="02fq0viam2czjnjvj055a5hbwnmgcxf1n7pdbba2bx52cwfq7c9l"; depends=[Rcpp]; };
+  operators = derive { name="operators"; version="0.1-6"; sha256="13lqxifbw8h4xn5gjf96bnzq9fzrncrj1g5lib8gvbpcbwn2smsl"; depends=[]; };
+  operator_tools = derive { name="operator.tools"; version="1.3.0"; sha256="0y5f0ifj4gaq03gm44vdvslcs7lglk1p8kq47mdc0gc1yfa6l00c"; depends=[]; };
+  OPI = derive { name="OPI"; version="1.6"; sha256="0d9863zs54chmdc74g508xpclj7gjk7q36amdnqq0bffp87bj9nq"; depends=[rJava]; };
+  opm = derive { name="opm"; version="1.1.0"; sha256="14sj0frjfd4a7j30zyk1fbhkpry45bjcn2k0l9jf7xc8415rbc3v"; depends=[lattice boot hwriter plotrix Ckmeans_1d_dp pkgutils yaml mgcv grofit rjson nlme DBI]; };
+  opmdata = derive { name="opmdata"; version="0.7.0"; sha256="043zzp2p4cvda5rshi9s990lm5qyi6ydkmy84xanwaqvysi1cpyy"; depends=[opm]; };
+  oposSOM = derive { name="oposSOM"; version="0.2-3"; sha256="0s6sq9ij8swgpljpk0jbzl0a1qw2y122zgxazy54q16xdf5a5vgy"; depends=[som fastICA pixmap igraph]; };
+  ops = derive { name="ops"; version="1.0"; sha256="0cvwyn5sz5lx8sin8w4k8ymslfl4nfaa012a9vcl2hvp4850rk25"; depends=[]; };
+  optAUC = derive { name="optAUC"; version="1.0"; sha256="0j1llzqa3n7kqw3i5bb7284z0hi6s5jbjfl9zap0l7xf6hg4x1dn"; depends=[MASS]; };
+  optBiomarker = derive { name="optBiomarker"; version="1.0-27"; sha256="1kkj602d4klwyd8kylawgfysg8dlp2g6j7afkppzv5x8mbhs5ji4"; depends=[rpanel rgl MASS randomForest e1071 ipred msm Matrix]; };
+  optextras = derive { name="optextras"; version="2013-10.27"; sha256="0898dgl8div4hdhb4wyj39vak94nm2311x550b8k8ljbx0nmp9gh"; depends=[numDeriv]; };
+  OptHedging = derive { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
+  OptimalCutpoints = derive { name="OptimalCutpoints"; version="1.1-1"; sha256="1rlbi0b4hfwnbfckjam5hxpv0bcmk6rb99jwqmpg8m6x9jhcjzb0"; depends=[]; };
+  optimbase = derive { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
+  optimsimplex = derive { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; };
+  optimx = derive { name="optimx"; version="2013.8.6"; sha256="0aq3pd33ln2dvvvj2wx7qdjs7a4hc3i3xalysa41a0j0dm7v90s9"; depends=[numDeriv]; };
+  OptInterim = derive { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[mvtnorm clinfun]; };
+  optiRum = derive { name="optiRum"; version="0.33"; sha256="1324wmi6b2y9whacf9883k1f86bs9gvxp46gksiga1dwab53nlhv"; depends=[data_table]; };
+  optmatch = derive { name="optmatch"; version="0.9-1"; sha256="0j8xyb0vsd4rgl5kqwzgy88myby61qaild2bmgn2xban63xnc23j"; depends=[digest]; };
+  optparse = derive { name="optparse"; version="1.2.0"; sha256="064grlajnmbcbyhmfgx58mbbmv94sxdkxdqqww0cbi7dg441sli2"; depends=[getopt]; };
+  optpart = derive { name="optpart"; version="2.1-1"; sha256="0m2nsrynqbw9sj7cp7c37grx9g20dld2f26g0xzbj16wz7whgp02"; depends=[cluster labdsv MASS plotrix]; };
+  optR = derive { name="optR"; version="1.0.3"; sha256="1grzm4m0zs1i0p6z3v2acgfyp3lvjrrkfp5sbix4jbr9360fk8m3"; depends=[]; };
+  ora = derive { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
+  orca = derive { name="orca"; version="1.0"; sha256="0cqz1zmlzwdprhbxs4arjv2gx868dx47xg8jmjvzk7g2xc9prj62"; depends=[]; };
+  orclus = derive { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
+  ORCME = derive { name="ORCME"; version="1.2.1"; sha256="14jj69m52vvcpshb31pvj9k5fp506d9a5dgyj85qvn3m39p7akky"; depends=[]; };
+  orcutt = derive { name="orcutt"; version="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; };
+  ordBTL = derive { name="ordBTL"; version="0.7"; sha256="16x05iiqqxyx528070b5aakr8r93hklmdwcsi5rfg2k9h91f0p03"; depends=[caret VGAM wikibooks]; };
+  orddom = derive { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
+  ORDER2PARENT = derive { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; };
+  orderbook = derive { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[lattice hash]; };
+  OrdFacReg = derive { name="OrdFacReg"; version="1.0.4"; sha256="00zw5zqbn2v5r4mqgs4m7gz278bnb53jf5x6c50yv47643m0nxfy"; depends=[eha MASS]; };
+  ordinal = derive { name="ordinal"; version="2013.9-30"; sha256="07a226ccd05a3w0i5j6f3mwbmnc3xpl7myq33zl6r4gpvcc8d7c3"; depends=[ucminf MASS Matrix]; };
+  OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.3"; sha256="0z03dpargdkay99gci5kpxr2i8cgiw3gfras65f83bjr2pkmsdla"; depends=[mirt MASS NominalLogisticBiplot]; };
+  OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
+  OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; };
+  ordPens = derive { name="ordPens"; version="0.2-1"; sha256="1kcxjfr2ncnqg293ph509hpgzzn5s4ih2kd8agl335zlxcksz3fp"; depends=[grplasso mgcv RLRsim]; };
+  OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-3"; sha256="0mnwsrcsq54g34465ygfbnnmmqsl8aqx50qds20ldnnqxxq3iic1"; depends=[]; };
+  ORIClust = derive { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; };
+  orientlib = derive { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; };
+  orloca = derive { name="orloca"; version="4.1"; sha256="1r9qx2q3djldgxr942g7rhi4i13dlmm2f8lcqgc1h35l4qdaam5n"; depends=[]; };
+  orloca_es = derive { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
+  ORMDR = derive { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; };
+  oro_dicom = derive { name="oro.dicom"; version="0.4.1"; sha256="0mxjqk7b0k4srkk5yqm21b2x67c5hyd7nwf3b1qlb9rvnfjhqyhk"; depends=[oro_nifti]; };
+  oro_nifti = derive { name="oro.nifti"; version="0.4.0"; sha256="1pragzjdldzgiaj4rbx37ki0930wfxj3kvan43vijd11a8ij1g5l"; depends=[bitops]; };
+  oro_pet = derive { name="oro.pet"; version="0.2.1"; sha256="1ysi7jxx1jalx78vqpbq1rd8q85nrz23zrz3vbj5ar3l265kwd5q"; depends=[oro_nifti]; };
+  orQA = derive { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[Rcpp gtools nlme]; };
+  orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
+  orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.5"; sha256="060g2z8zx5gkk8v31cs0c6v5jzkd7hc9l2syx6hmvj6przr2cxi4"; depends=[]; };
+  orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
+  osDesign = derive { name="osDesign"; version="1.6"; sha256="0xbrdv6pyriqxjxcq6vbk5qycc78jailw99l5w0rvp0s9mygqaaq"; depends=[]; };
+  osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
+  ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
+  outbreaker = derive { name="outbreaker"; version="1.1-2"; sha256="1sh9h1l7iqx6ly78wfxi0dlif77xggwzr0mzdy2ii7di1dnlwzv0"; depends=[ape igraph adegenet]; };
+  OutbreakTools = derive { name="OutbreakTools"; version="0.1-0"; sha256="1930kgqwys452p1xq0i7r20gd1gv0i6q03h1shzlkd0qyw1cx6in"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic]; };
+  OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
+  OutlierDM = derive { name="OutlierDM"; version="1.0-0"; sha256="1yphr47nswcaqa5pfamc3ksqcxwhxl388sdml2aqjjfd9w29lf2g"; depends=[quantreg MatrixModels outliers pcaPP]; };
+  outliers = derive { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
+  OUwie = derive { name="OUwie"; version="1.42"; sha256="0491cvl2z95mygl6ys94akf288i2bmr58dfnfs2vpbpnq4ldfjm4"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
+  overlap = derive { name="overlap"; version="0.2.2"; sha256="19236r750wpbvy2a50wjh6sadvn9jwcf4fx51nd2gfydfq48an21"; depends=[]; };
+  oz = derive { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; };
+  p2distance = derive { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
+  p3state_msm = derive { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; };
+  pa = derive { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
+  pacbpred = derive { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; };
+  pack = derive { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; };
+  packClassic = derive { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
+  packdep = derive { name="packdep"; version="0.3.1"; sha256="1827h9xcvgdad9nwz9k3hi79jc33yr7dnxy4xn2frp3fdh4q81ll"; depends=[igraph]; };
+  packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
+  packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; };
+  pacose = derive { name="pacose"; version="1.4"; sha256="10dpqafbq5iwfhx9xf6l902y23p2w4mvaclkhrcz2d89njakcnaz"; depends=[ggm igraph ppls MASS corpcor glmnet mvtnorm lcd]; };
+  paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
+  PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
+  PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; };
+  pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
+  PairedData = derive { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[MASS gld mvtnorm lattice ggplot2]; };
+  pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
+  PairViz = derive { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[TSP gtools]; };
+  pairwise = derive { name="pairwise"; version="0.2.4"; sha256="177xmxrs4fkvssigc7gl7az2z1q6gi7wrmygfhc9h9w1f8qg3n5y"; depends=[]; };
+  pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; };
+  palaeoSig = derive { name="palaeoSig"; version="1.1-2"; sha256="0f5y69zzb32zi3kdy8jpcvz3i38nmmi0d9ajs44jrq4rkhhhwq3v"; depends=[rioja vegan TeachingDemos gstat fields mapproj]; };
+  paleobioDB = derive { name="paleobioDB"; version="0.1"; sha256="0ax5mzfvrxwg82brc4589bkd7cl8iy254iq6sjs9cr3d7x0zyahz"; depends=[maps raster rjson gtools RCurl plyr scales]; };
+  paleofire = derive { name="paleofire"; version="1.1-2"; sha256="0sspqnj0p5m09mpb620ha0wy3m7xyhwrvqvs34xcma11kjav1xd6"; depends=[GCD rworldmap locfit gtools caTools pscl Imap RCurl devtools raster sp rgdal ggplot2 lattice RColorBrewer agricolae]; };
+  paleoMAS = derive { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[MASS vegan lattice]; };
+  paleotree = derive { name="paleotree"; version="2.0"; sha256="06bi9wikgb9szlhf747ijnqikv87svlf579w4hx9yplc8m44br1s"; depends=[ape phangorn]; };
+  paleoTS = derive { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
+  palinsol = derive { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
+  PamGeneMixed = derive { name="PamGeneMixed"; version="1.03"; sha256="0pg19nnn8d23mqw7aw1wqijcgfavvixr42p51iz0m931ig3sg4ki"; depends=[mgcv gplots nlme]; };
+  pamm = derive { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[lme4 mvtnorm gmodels]; };
+  pamr = derive { name="pamr"; version="1.54.1"; sha256="05jm67y329z4qcsacd9mc7hcq7g6icf2mi53nranmkgcnhwvr78k"; depends=[cluster survival]; };
+  pan = derive { name="pan"; version="0.9"; sha256="1payx5bzs0hp3f176ia56y4a9pym8p4h7ap5wag2symlvprzppah"; depends=[]; };
+  pander = derive { name="pander"; version="0.3.8"; sha256="0ka9cjwmvr79rbymww9m36l7z0rdf8xkxvc6r2y5lm6mpzx1s13i"; depends=[digest]; };
+  panelAR = derive { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
+  Paneldata = derive { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
+  papeR = derive { name="papeR"; version="0.4-0"; sha256="0w1pqmgaa15x4vxr4msw5fwmd42kgrhniy2h7wvpyyvgzxfvb0s3"; depends=[car nlme lme4 survival gmodels]; };
+  parallelize_dynamic = derive { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
+  parallelMap = derive { name="parallelMap"; version="1.0-83"; sha256="1ykgvvcynpqnkz8s5shwfi0qmlxffmrfb7wfhjw7dyh1zvkdwjwn"; depends=[BBmisc]; };
+  ParamHelpers = derive { name="ParamHelpers"; version="1.1-36"; sha256="009y7dbm2g0c9jr9893vzxflf5bvirxwa38i6ma6bgkmhg7smja9"; depends=[BBmisc]; };
+  paramlink = derive { name="paramlink"; version="0.9-6"; sha256="0pazllkjbqzvl9vmpvr67lkcsd960mipcd1p1nf00y8hknrwh7qp"; depends=[kinship2 maxLik]; };
+  paran = derive { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
+  parboost = derive { name="parboost"; version="0.1.3"; sha256="1ziqbbcxvhc3v0vjpf9y6jhk3rqbgn9cilwcfxlxjbw73jhvvclg"; depends=[mboost party iterators plyr caret glmnet doParallel]; };
+  parcor = derive { name="parcor"; version="0.2-4"; sha256="0zz1i3cm1gy2bx77hpydk0wlsr60nanjx57g0zr5wm01imkk99wa"; depends=[MASS glmnet ppls Epi GeneNet]; };
+  ParDNAcopy = derive { name="ParDNAcopy"; version="1.3"; sha256="1y0fl5gj3d3xj6krfyg48fs9vz3s4jb61js0b7yfzgv6a3289g5a"; depends=[]; };
+  ParentOffspring = derive { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
+  ParetoPosStable = derive { name="ParetoPosStable"; version="1.0.2"; sha256="1a42s9lhzzimvlxdpbd8dfqc5a936f1s31d040fwgs8i3qfpfjwp"; depends=[ADGofTest lmom]; };
+  parfm = derive { name="parfm"; version="2.5.6"; sha256="1zas6isgirha379f246zg84ddv0jl2n4795brshd98hkayl4c1fi"; depends=[survival eha msm]; };
+  parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[fossil foreach]; };
+  parma = derive { name="parma"; version="1.5-1"; sha256="0qrq3bx0amri9b3s6bym4znnk140jjd2abnvqyihaj4bf2glbl0g"; depends=[nloptr slam Rglpk quadprog FRAPO corpcor]; };
+  parmigene = derive { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
+  parspatstat = derive { name="parspatstat"; version="0.1-4"; sha256="14rcw2lzqwdjg4avjw3d6ivgdglkkagdh6pnd7bprkkdv8i5a9h2"; depends=[Rmpi spatstat]; };
+  partDSA = derive { name="partDSA"; version="0.9.5"; sha256="0zblwjzwhalcnbmgwnqxpq7ixf4xhgx9lpf0lk3krry3di537s0q"; depends=[survival]; };
+  partialOR = derive { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; };
+  partitionMap = derive { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; };
+  partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; };
+  partitions = derive { name="partitions"; version="1.9-15"; sha256="0jgpknm4zah50w9i3fbq2f1whm4hywm2j72vxc3ignx1snx2z0gs"; depends=[gmp polynom]; };
+  partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
+  party = derive { name="party"; version="1.0-13"; sha256="0l6s9wb7xy1jysfj2333xyl0z46bvcs35kamrw8n5riigqxxmqcm"; depends=[zoo sandwich strucchange modeltools survival coin]; };
+  partykit = derive { name="partykit"; version="0.8-0"; sha256="083lwaz38d40qdhlhf33vplykx1m3ham0q8r7pmwivj09nbfkmya"; depends=[survival]; };
+  parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
+  PAS = derive { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
+  pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; };
+  pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
+  pastis = derive { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[caper ape]; };
+  PASWR = derive { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 MASS lattice]; };
+  patchDVI = derive { name="patchDVI"; version="1.9.1601"; sha256="0vv1rmmd78n2r14dsl9fx25v6ym9mav557ya0aagr548wqcajf0m"; depends=[]; };
+  patchPlot = derive { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
+  pathClass = derive { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[svmpath kernlab ROCR igraph lpSolve]; };
+  pathdiagram = derive { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
+  pathmox = derive { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
+  PatternClass = derive { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; };
+  pavo = derive { name="pavo"; version="0.5-1"; sha256="189kshc5dm02qv0rm1dlcxrhvga4yhlkn3yyj3rjhmrags4rmwcb"; depends=[rgl rcdd mapproj geometry]; };
+  pawacc = derive { name="pawacc"; version="1.1"; sha256="1w3mzqbazxyb45yh3xmn780mghjyw90rmivhbp9kcxhjd175i4lw"; depends=[SparseM]; };
+  PAWL = derive { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[mvtnorm foreach reshape ggplot2]; };
+  pbapply = derive { name="pbapply"; version="1.1-0"; sha256="1a8qxxz8xj90a5ywdq0ggbp2n733qxd1a4xxkp0835xp1asjrsq7"; depends=[]; };
+  pbatR = derive { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[survival rootSolve]; };
+  PBC = derive { name="PBC"; version="1.2"; sha256="1z08y5sn6i439811c9mq3bs78zqlzzkz0srmv4wld68bywhmwqj4"; depends=[igraph Rcpp copula]; };
+  PBD = derive { name="PBD"; version="0.9"; sha256="0a38f6p12234wp42k21hdf30lb5bbfy61h66gz1z9p05rvl9lg4d"; depends=[deSolve ade4 ape DDD]; };
+  pbdBASE = derive { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[rlecuyer pbdMPI pbdSLAP]; };
+  pbdDEMO = derive { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE pbdDMAT]; };
+  pbdDMAT = derive { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[rlecuyer pbdMPI pbdSLAP pbdBASE]; };
+  pbdMPI = derive { name="pbdMPI"; version="0.2-2"; sha256="0xyjbf3snmx64l3l1v8zibsl84g61i8fgkzzmpxqmgyabl5izkhp"; depends=[rlecuyer]; };
+  pbdNCDF4 = derive { name="pbdNCDF4"; version="0.1-2"; sha256="101swavhc1l4bkaq6hi8sf6siyjlcca7pr3gz2wgqnbsrhddj8ry"; depends=[rlecuyer pbdMPI]; };
+  pbdPROF = derive { name="pbdPROF"; version="0.2-2"; sha256="0pjciwrx4ck7kr7667ma8mc3qrdkcwzmgb0ajx9lm7k5gm9s59pw"; depends=[ggplot2 gridExtra reshape2]; };
+  pbdSLAP = derive { name="pbdSLAP"; version="0.1-8"; sha256="1lwhr9lpa9cqbypa5hhcc9bqnf4xc6r1ixdbibvlgfk30q3nzjsg"; depends=[rlecuyer pbdMPI]; };
+  PBImisc = derive { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[MASS lme4 Matrix]; };
+  pbivnorm = derive { name="pbivnorm"; version="0.5-1"; sha256="18ry0qz0ryazplv5iwdvbfngn0zv7frqp16nc2x70s0wf3izxkwr"; depends=[]; };
+  pbkrtest = derive { name="pbkrtest"; version="0.3-8"; sha256="0cz02ryzd44pkw3j3bwh1wvayy0i3kkafapjw0rnbwj85mm02dla"; depends=[MASS lme4 Matrix]; };
+  pbs = derive { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
+  PBSadmb = derive { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
+  PBSddesolve = derive { name="PBSddesolve"; version="1.10.25"; sha256="09206zbw7sfnf624bm6y8407g6nq2z49xd5z5jri9dlny0ssl7xw"; depends=[]; };
+  PBSmapping = derive { name="PBSmapping"; version="2.67.60"; sha256="1n9c9fglsnch5jw248yyvy2vrq3wgca0wdkdwwhfc3n7yw83mwkr"; depends=[]; };
+  PBSmodelling = derive { name="PBSmodelling"; version="2.66.264"; sha256="08plp74cjzmgv3dkaxgryqq1yqp0z7pdlz9jqgai8w89vwi0il35"; depends=[]; };
+  pca3d = derive { name="pca3d"; version="0.2"; sha256="1x7fi9c4gijv34hr2bgsp872v5hknwidrh4q4blvvqknfl1w3clr"; depends=[rgl]; };
+  pcaL1 = derive { name="pcaL1"; version="1.2.1"; sha256="00jfsbhnpq5mvnmpv066w1nhz2lhv55imgbl2z7dza9b8gxb88ry"; depends=[]; };
+  pcalg = derive { name="pcalg"; version="2.0-2"; sha256="1fkd0881x1cjbvym3dmy4gm8wk0r6x5k0v531a9cr22kyvpk5qkb"; depends=[abind igraph ggm corpcor robustbase vcd Rcpp]; };
+  PCAmixdata = derive { name="PCAmixdata"; version="2.1"; sha256="12g6pkp9yffp1arqdvnx721cn34h0a7m3bm2ayd9fsrvbaqb7ci8"; depends=[]; };
+  pcaPA = derive { name="pcaPA"; version="1.2"; sha256="1acfhv6225r0d8m45z7dlx78lmypdlh1cg4irvf8b3av0qv12g5x"; depends=[polycor ltm ggplot2 mc2d]; };
+  pcaPP = derive { name="pcaPP"; version="1.9-49"; sha256="0yk97r0rwkppnzp0kc1j3hcp4n2dr8765mbmvlaikjgwhlhbby4q"; depends=[mvtnorm]; };
+  pcenum = derive { name="pcenum"; version="1.0.1"; sha256="0jcwggxcnlbx75lwwpaldv28sgmhxa46rny94sji37hq3zil8yhw"; depends=[]; };
+  pcg = derive { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
+  PCGSE = derive { name="PCGSE"; version="0.1"; sha256="113ppp574ci08p18g6b3s4zjdyihnql6qmrw8bh420lmdnxcfd7x"; depends=[MASS]; };
+  PCICt = derive { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
+  pcIRT = derive { name="pcIRT"; version="0.1"; sha256="0vfbbmnp4jyrbi5d9gz1krh707aazbrqfcgc3rjrwwyjld11wyzn"; depends=[combinat]; };
+  PCIT = derive { name="PCIT"; version="1.04-5"; sha256="10fnkad09y7vh8j3c5kgkh64lwqn2nsl5818rzl9b8d51f951qjg"; depends=[]; };
+  pcnetmeta = derive { name="pcnetmeta"; version="1.1"; sha256="1h1kqjvb4fry9qkq8ryh73fk0wfd9l24pyv2l8f6056i8nwkm5qp"; depends=[R2jags network runjags]; };
+  PCovR = derive { name="PCovR"; version="2.4"; sha256="0wz1bqdsf8x50kbi0vgw7wz268qks56bpgf6s68lqry7zgngjnx1"; depends=[GPArotation ThreeWay MASS Matrix]; };
+  PCPS = derive { name="PCPS"; version="1.0"; sha256="0qgbxkpnn4d1ng085z6wf61dg0dgyfc8q95li24wbwnghyqx1d5c"; depends=[picante SYNCSA vegan]; };
+  pcrcoal = derive { name="pcrcoal"; version="1.1"; sha256="17mm13xpmghachiqr7v2691jk39mbfsadpg028gs3iiwmh0pksa0"; depends=[ape ggplot2 phylosim]; };
+  PCS = derive { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[statmod]; };
+  pcse = derive { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
+  pdc = derive { name="pdc"; version="0.5"; sha256="1fx8y2irhklpkhxljy6vkg28i2xhprnhzrfrmxvmggpfk8xca8by"; depends=[]; };
+  pdfCluster = derive { name="pdfCluster"; version="1.0-2"; sha256="0kbci54dlzn736835fh18xnf2pmzqrdmwa3jim29xcnwa1r2gklb"; depends=[geometry]; };
+  pdfetch = derive { name="pdfetch"; version="0.1.3"; sha256="1zh9fq249g1xwznjdql4a53vmgnjfz5ggrp91sagy6mm7mgks2bw"; depends=[zoo xts RCurl XML lubridate jsonlite reshape2]; };
+  pdist = derive { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
+  pdmod = derive { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
+  PDSCE = derive { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; };
+  Peaks = derive { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; };
+  pear = derive { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
+  pearson7 = derive { name="pearson7"; version="1.0"; sha256="0dz5zf3k6bwj460gna6ak7hwdrsjinhv2ckkgqrycilfsx1w5h44"; depends=[]; };
+  PearsonDS = derive { name="PearsonDS"; version="0.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
+  PearsonICA = derive { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
+  pec = derive { name="pec"; version="2.2.9"; sha256="0qvkmm8k2bg6sg42csrk6sn5qa1bvnmn8q485sxc11lqgxvic2jx"; depends=[prodlim survival rms foreach]; };
+  pedantics = derive { name="pedantics"; version="1.5"; sha256="0m5jxzkf1pf657q2klv6idnywg18ki962666nj7sfyl4rq06xhsi"; depends=[MasterBayes MCMCglmm kinship2]; };
+  PedCNV = derive { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[Rcpp RcppArmadillo ggplot2]; };
+  pedgene = derive { name="pedgene"; version="1.4"; sha256="1ad3ym5q43vxzb035sdf83vdm0v44jba8mb7zziwkc2ljqza3564"; depends=[Matrix CompQuadForm kinship2]; };
+  pedigree = derive { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[Matrix HaploSim reshape]; };
+  pedigreemm = derive { name="pedigreemm"; version="0.3-1"; sha256="09gx7232ba72848icc305fkcqj6rl9xij0gmqglchr4fv8xcl4qx"; depends=[lme4 Matrix]; };
+  pegas = derive { name="pegas"; version="0.5-1"; sha256="0imn9n0y9nxp8vv1nz3qg9vmb5bdzxm596fxxg4hcgw7am6ap2sq"; depends=[ape adegenet]; };
+  PEIP = derive { name="PEIP"; version="1.7"; sha256="1bagi1kr8vd3b3r524vrk747bqmd9insny1nxj8bdvdk0a9yr949"; depends=[bvls Matrix RSEIS pracma]; };
+  PEMM = derive { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
+  penalized = derive { name="penalized"; version="0.9-42"; sha256="160ypgfcbdxcrgrhq99rgxl1wgn7854y64820nkvmfpc0ady7s4q"; depends=[survival survival]; };
+  penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
+  penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; };
+  pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; };
+  pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvza9h6j1ajkc6awjs0g8i07v529xn7fhygzwwccr"; depends=[lattice fda]; };
+  penDvine = derive { name="penDvine"; version="0.2.2"; sha256="054vw99z68pk0bi4yzdmvx13x8n75sj2371l8w2yady1lqjj4qi7"; depends=[lattice quadprog TSP fda Matrix]; };
+  PenLNM = derive { name="PenLNM"; version="1.0"; sha256="1xkz39cdp9dr8iq1cjiv862sda4zy737gvbwxxsykw15256lklmf"; depends=[remMap MASS Matrix]; };
+  pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; };
+  peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
+  peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
+  peptider = derive { name="peptider"; version="0.1.2"; sha256="1q63i84ibrqw0rdd48z76lhldc9gfyhxg9x1r2yz8q73dm2cvkig"; depends=[discreteRV plyr]; };
+  Peptides = derive { name="Peptides"; version="0.4"; sha256="1841cfx6i2yc5142j1160aandvlrljvfxx79clylj5k9yavpj8rc"; depends=[seqinr]; };
+  pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; };
+  perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
+  PerfMeas = derive { name="PerfMeas"; version="1.1"; sha256="1b49p5lvnshrinf08v9c6nriycrspy569v5akjpffyqi2badr82b"; depends=[]; };
+  PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.1.0"; sha256="082lh4g9lngbj1chmd23ax1603apnpwh7blml6vq6z3lic59qqgy"; depends=[zoo xts]; };
+  performanceEstimation = derive { name="performanceEstimation"; version="0.1.1"; sha256="1km2ljsy8hj9x6xr9am0f4wzihlhbyxhcss7kcxbimxvcv0a479n"; depends=[ggplot2]; };
+  perm = derive { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
+  PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; };
+  permGPU = derive { name="permGPU"; version="0.14.3"; sha256="1scw5jch1pa53p5jxy4k9nfpnbr2llw846vmzhq6qqk40snz5pj3"; depends=[RUnit foreach]; };
+  permtest = derive { name="permtest"; version="1.2"; sha256="1sciyjs840h004zg8bwclq0j0n22anvjvx3fz62y4dzblrynhrci"; depends=[]; };
+  permute = derive { name="permute"; version="0.8-3"; sha256="0zc3b3cl7q7y9pglc690ldg6p7bl7d1h7xkwnqqmvrpn7cq29rdb"; depends=[]; };
+  PERregress = derive { name="PERregress"; version="1.0-8"; sha256="1rhridhfgvrz14h61psfyr5ll13fvxj4b9fwrnlnc6lyqi01wjlc"; depends=[]; };
+  perry = derive { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
+  persiandictionary = derive { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
+  perturb = derive { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
+  pesticides = derive { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
+  PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; };
+  PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; };
+  pfa = derive { name="pfa"; version="1.0"; sha256="116mpfdmfyd0p5j33rjw1xwxyyaccagbrpw7jbh4x996s057mql4"; depends=[lars POET quantreg]; };
+  pgam = derive { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
+  pgirmess = derive { name="pgirmess"; version="1.5.8"; sha256="0ldfli5yam24m8w4y0jc4s2vxc4szh6yvmxc5gf6qib7qxhh8k1j"; depends=[boot nlme rgdal sp spdep splancs]; };
+  pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
+  pGLS = derive { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
+  PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
+  pgmm = derive { name="pgmm"; version="1.0"; sha256="1l8riigmhb64r9h6z2r2ll8i33vmlbwj58im9ir5cpkrgz2qsp4k"; depends=[]; };
+  pgnorm = derive { name="pgnorm"; version="1.1"; sha256="0fxx9wvzinh17cxy74xms6dbabifav0wsi2cl0wdfykpbwalmszk"; depends=[]; };
+  pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
+  phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
+  phangorn = derive { name="phangorn"; version="1.99-7"; sha256="1q6a6md52d2f9xlrs5wv9crncwxh9a4x6zfxmdbsvrlwmgsbzvcx"; depends=[ape quadprog igraph Matrix fastmatch]; };
+  PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
+  phaseR = derive { name="phaseR"; version="1.2"; sha256="0qkvcnpmjvldk49m6xrb7pinah4xl0s7gnhpfiy1v7cjg88k23ys"; depends=[deSolve]; };
+  PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
+  phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
+  pheatmap = derive { name="pheatmap"; version="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; };
+  phenability = derive { name="phenability"; version="1.0"; sha256="19vxknc0v8vz5cd748fhsndsrpggzlsiims9j7p2s6jlankkgsz9"; depends=[calibrate]; };
+  phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
+  phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; };
+  pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; };
+  pheno2geno = derive { name="pheno2geno"; version="1.1.0"; sha256="0myvmirxh0a4h18ngj89vs7ai9a1fj7gsdc76386y5yw0qx2gg5a"; depends=[qtl VGAM mixtools]; };
+  phenology = derive { name="phenology"; version="3.63"; sha256="1n3bh9kdpimcl9i9wmy58j7lajf6syxv39yzgb1c36dcwbj2xyg9"; depends=[fields zoo coda shiny XML]; };
+  PHeval = derive { name="PHeval"; version="0.5"; sha256="1alz676q80jcbkykfccxq8k2irv1j7xcqxjyyczhqzall2i6fhk0"; depends=[survival]; };
+  phia = derive { name="phia"; version="0.1-5"; sha256="0vkl4ccsdx72dwis2959f6w9zg584wfkn58fh2slybdyg9p8886a"; depends=[car]; };
+  phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; };
+  phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp]; };
+  phonR = derive { name="phonR"; version="0.4-2"; sha256="15hi15minbd756vplmcyf0987ppanr44kds13nny0v1h5yyv8kyx"; depends=[]; };
+  phonTools = derive { name="phonTools"; version="0.2-1.1"; sha256="1bclfz5nw3k9vzh24yai3xc748fd054b4i6a4mz23dg210csclc9"; depends=[]; };
+  phtt = derive { name="phtt"; version="3.1.1"; sha256="02fqg2djpvbm6id1dg8c8w1qccd2axxrhlfi4vrm8d1qcrbjkjm1"; depends=[pspline]; };
+  PhViD = derive { name="PhViD"; version="1.0.6"; sha256="17mr8gj6ic4p0xvxiva046r1gmy9azvm1s95rinxqsdd7hiak72w"; depends=[MCMCpack]; };
+  phyclust = derive { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
+  phyext = derive { name="phyext"; version="0.0.1"; sha256="07hmjgp4qb3x95rbgm83sh9zwhsxjl1v5rvs39m565sc0fax1qdi"; depends=[phylobase ape]; };
+  phylobase = derive { name="phylobase"; version="0.6.8"; sha256="0xj7x4cdfp0yadvjhdkw1ai3yd081ri4gpdg0n5g0z13cjaa6mjh"; depends=[ade4 ape Rcpp]; };
+  phyloclim = derive { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
+  phyloland = derive { name="phyloland"; version="1.0"; sha256="0r6rpwcq13bxa6289bfj0a0is67a49nj5npi5381090iarkwfvs7"; depends=[ape gsubfn]; };
+  phylolm = derive { name="phylolm"; version="2.0"; sha256="0ccrmkhh5sfnmjs4xidfim7nq79pzm5i89hh1s7amqzrdx00bcpj"; depends=[ape]; };
+  phylosim = derive { name="phylosim"; version="2.1.1"; sha256="0rrz5c7zl2hjalwm6m8pydikiwmiq2dybx2yhzp0ps2bcsn02lhn"; depends=[R_oo ape compoisson ggplot2 R_methodsS3]; };
+  phylotools = derive { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[seqRFLP ape picante spaa fields]; };
+  phyreg = derive { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
+  PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
+  phytools = derive { name="phytools"; version="0.3-93"; sha256="18302vbpifwxcinriq0kgj9lr8ha3mz1a0w7ikwhndmybmn2ds9q"; depends=[ape maps rgl animation clusterGeneration mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+  pi0 = derive { name="pi0"; version="1.3-250"; sha256="1561zvf1hcd05iqy245c0z23mi8ypk6q3lkfldcr55cs67w4lmz6"; depends=[LowRankQP Matrix numDeriv limSolve rgl scatterplot3d Iso quadprog kernlab]; };
+  picante = derive { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape vegan nlme]; };
+  PIGE = derive { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[snowfall ARTP xtable survival]; };
+  PIGShift = derive { name="PIGShift"; version="1.0.0"; sha256="15cgpi7j5cs4aqdq5cy7535x8ar916d9hd109kc01njrwxp1xr96"; depends=[ape mvtnorm]; };
+  PIN = derive { name="PIN"; version="0.8"; sha256="1hymf5106zxgbg8dki9jb7gy4vh2mjwbvzh0n2d7qkr6rm8lpmag"; depends=[]; };
+  PIPS = derive { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
+  pitchRx = derive { name="pitchRx"; version="1.3"; sha256="1naz281vwlry4dsrq1klxc9lhs6rminps7w5z8xa1jh400n47bqw"; depends=[ggplot2 XML2R plyr MASS hexbin rgl mgcv lubridate]; };
+  PivotalR = derive { name="PivotalR"; version="0.1.16.2"; sha256="0n5250bbg3gmyx75h53xx82hwlyyxxm2aaih17dsnm1jfjybbf3z"; depends=[Matrix]; };
+  pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
+  PK = derive { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
+  PKfit = derive { name="PKfit"; version="1.2.1"; sha256="0j5zjkz053ckwgbh8d2wil0y6dd7g8afylxxbj120y3hxxh5zq0v"; depends=[deSolve minpack_lm]; };
+  pkgmaker = derive { name="pkgmaker"; version="0.20"; sha256="1wj3989gm3vbi579zd30sb6s40mx5h0avxgfxdbir7ppyd98040k"; depends=[registry codetools digest stringr xtable]; };
+  PKgraph = derive { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[RGtk2 gWidgetsRGtk2 cairoDevice lattice rggobi ggplot2 proto RGtk2 gWidgetsRGtk2]; };
+  pkgutils = derive { name="pkgutils"; version="0.6.0"; sha256="0pi1xaamirsv1bwlwcvyd1hvdgbjbdmw3vg3krawsb34mynbrcff"; depends=[]; };
+  PKI = derive { name="PKI"; version="0.1-1"; sha256="1m4q43yq8ddig15k0j9yg9hq4yz3yplqp68zl3p9g2shkam60p6w"; depends=[base64enc]; };
+  PKmodelFinder = derive { name="PKmodelFinder"; version="1.1"; sha256="0v5l8j4yq6fv4cgx5psld6klwy6kjwcqg1vhf9r4i8qa12vpa1yh"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice numDeriv]; };
+  PKPDmodels = derive { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
+  PKreport = derive { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[lattice ggplot2]; };
+  pks = derive { name="pks"; version="0.3-0"; sha256="0lvj5kfjf8wikszz1dipwr1fw9xbhy3nx0ksqz4ln240k7fn5kcj"; depends=[sets]; };
+  PKtools = derive { name="PKtools"; version="1.5-0"; sha256="0za6qgl9q9y4j87kfhvanpc9mfckzww6q2kjz7divbv8ygn5cd1m"; depends=[lattice nlme R2HTML xtable]; };
+  plan = derive { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
+  planar = derive { name="planar"; version="1.5"; sha256="1ph3q985xw1sg9cs5k1cqpr46f0svycdc1dg3pqmdrzqdi8a3gyx"; depends=[dielectric Rcpp RcppArmadillo statmod cubature reshape2 plyr]; };
+  planor = derive { name="planor"; version="0.1-12"; sha256="1mcas42i39p9sr9x38x97ki7269x27pmac6xhss2h56clc0safqb"; depends=[conf_design biganalytics bigmemory]; };
+  PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
+  playitbyr = derive { name="playitbyr"; version="0.2-1"; sha256="0pi0kji32ha6csff5w2xl8f76clrxlkwws60lzqzc83avrb0930n"; depends=[csound]; };
+  playwith = derive { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[lattice cairoDevice gWidgetsRGtk2 RGtk2 gWidgets gridBase]; };
+  plfm = derive { name="plfm"; version="1.1.1"; sha256="0vsbva2clkjn8ddinmihq1gzd8g8yjiwd11rl7xzbyabjxkp95n1"; depends=[sfsmisc abind]; };
+  plgp = derive { name="plgp"; version="1.1-5"; sha256="04kxiixm6p9s42fs775lrh8112v2m7akjp78r46l0rd8fzp3zyiq"; depends=[mvtnorm tgp]; };
+  plink = derive { name="plink"; version="1.3-1"; sha256="1g8n4fy7yx3386kgvc0kgh8gd390yl4fxs09whdl1mzz5q9sx4wp"; depends=[lattice MASS statmod]; };
+  PLIS = derive { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
+  plm = derive { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[Formula MASS bdsmatrix zoo nlme sandwich]; };
+  plmDE = derive { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[MASS R_oo]; };
+  plmm = derive { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[sm Formula nlme]; };
+  pln = derive { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
+  plot2groups = derive { name="plot2groups"; version="0.10"; sha256="00mp82vvx6inlc2zj2cqqnzyglrm9x9im2vrqqk8j2jn0hbgfymy"; depends=[ggplot2]; };
+  plot3D = derive { name="plot3D"; version="1.0-1"; sha256="1zvvsl94azz3252c8f485zhzd4x23wfj08x85vq873fj36p82aaf"; depends=[misc3d]; };
+  plot3Drgl = derive { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[rgl plot3D]; };
+  plotGoogleMaps = derive { name="plotGoogleMaps"; version="2.0"; sha256="1fh3qb06jwklznwrfim4jgii5bjh2zmxf4klbfbd0qrx5qlr1vbq"; depends=[sp rgdal maptools lattice]; };
+  plotKML = derive { name="plotKML"; version="0.4-3"; sha256="0rcn4fx8zicazbjrpc6hxhdmv6j92wrinvv8jfmk5r1rhyvq5h5k"; depends=[XML sp raster rgdal spacetime colorspace plotrix dismo aqp pixmap plyr stringr colorRamps scales gstat zoo RColorBrewer RSAGA classInt]; };
+  plotMCMC = derive { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
+  plotmo = derive { name="plotmo"; version="1.3-3"; sha256="0xr70di5dfxwy69y60vr88wbrhbxkm55z04qxbvbdf5b04l9lw77"; depends=[]; };
+  plotpc = derive { name="plotpc"; version="1.0-2"; sha256="0z73wyhdnz5qv2jy8c0sby6sbjr1q9026h0bk2ykjkjvckggnabc"; depends=[]; };
+  PlotRegionHighlighter = derive { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
+  plotrix = derive { name="plotrix"; version="3.5-5"; sha256="0dqi4f1k5lrb1nxmlgcycxrjlpfxxy5gg3yf0fw2z2wlm2z42ikm"; depends=[]; };
+  plotSEMM = derive { name="plotSEMM"; version="1.0"; sha256="0i94l252m2d6akbwwaxq8j9w9503x6c16lwww3ni3rbimkbf8iqq"; depends=[]; };
+  plRasch = derive { name="plRasch"; version="1.0"; sha256="1rnpvxw6pzl5f6zp4xl2wfndgvqz5l3kiv9sh4cpvhga0gl8zjaw"; depends=[survival]; };
+  PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
+  pls = derive { name="pls"; version="2.4-3"; sha256="114ka4766x8fx0zvvr7cylky1jsy542nj6s7sb2dwv8zjhbclkhn"; depends=[]; };
+  plsdepot = derive { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
+  plsdof = derive { name="plsdof"; version="0.2-6"; sha256="1gdc6ck2l8k4i275lj1kvpqbzgm5a5db21zc828hz56aqfj28fm9"; depends=[MASS]; };
+  plsgenomics = derive { name="plsgenomics"; version="1.2-6"; sha256="0f0pns20hd8hfc3v9m9vb8sng8qib6cry1k49nqs9gn09hhh26w9"; depends=[MASS]; };
+  plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; };
+  plsRbeta = derive { name="plsRbeta"; version="0.1.8"; sha256="1gfwl659pmwjkif8n1vz7ljij3r8akzrlf389qwmhy57d6lhyb6w"; depends=[mvtnorm boot Formula plsdof MASS plsRglm betareg]; };
+  plsRcox = derive { name="plsRcox"; version="0.9.999"; sha256="1w4zdmb28hh98zasbagvnqp6ykk3468c576qz61v91gyjar03z9c"; depends=[boot plsRglm lars survival pls kernlab mixOmics]; };
+  plsRglm = derive { name="plsRglm"; version="0.8.3"; sha256="00wl6cqgb0f6qpa3ynlj15qrylp3ir74qh6lqr1543dld6avr4p0"; depends=[mvtnorm boot bipartite]; };
+  plugdensity = derive { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
+  plumbr = derive { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
+  plus = derive { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
+  plusser = derive { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[RCurl RJSONIO lubridate plyr]; };
+  plyr = derive { name="plyr"; version="1.8.1"; sha256="0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm"; depends=[Rcpp]; };
+  PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; };
+  pmcgd = derive { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
+  pmclust = derive { name="pmclust"; version="0.1-6"; sha256="05zjx4psvk5zjmr0iwwwig990g6h04ajn5wi0xi8bqv046r47q3h"; depends=[rlecuyer pbdMPI MASS]; };
+  pmg = derive { name="pmg"; version="0.9-42"; sha256="16jkkhpjiwpk5gszr7fc133l3y50dfwqxb45flzihxvp1x42d70y"; depends=[lattice MASS proto foreign gWidgets gWidgetsRGtk2]; };
+  pmlr = derive { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; };
+  pmml = derive { name="pmml"; version="1.4.1"; sha256="173d1wznc99gl5n1nxzcjd03pmc5aahs5ny6kn79g0wlyqxdqyrn"; depends=[XML survival]; };
+  pmmlTransformations = derive { name="pmmlTransformations"; version="1.2.1"; sha256="11i75dy9rci1jajirnq00mr24y36wss6w2krf1v63g5h0rbm3gmh"; depends=[]; };
+  pmr = derive { name="pmr"; version="1.2.3"; sha256="1f6s9n7bffsf0w82i6mgainbgllpvbmc1l5l05mqgybpa90mdl2y"; depends=[]; };
+  png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
+  pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
+  pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
+  pocrm = derive { name="pocrm"; version="0.7"; sha256="043jdsc34mvlsckwkqaz3w5rbpczm3mx85nxyksj09yxn04j14sr"; depends=[dfcrm nnet]; };
+  POET = derive { name="POET"; version="1.0"; sha256="0drn9530b14hindim8si1828yabyqc85b0qi900ahi5rv1p38v82"; depends=[]; };
+  poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
+  PoiClaClu = derive { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
+  poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
+  PoisNor = derive { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[mvtnorm corpcor Matrix]; };
+  poisson_glm_mix = derive { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
+  PoissonSeq = derive { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; };
+  poistweedie = derive { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
+  poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; };
+  pollstR = derive { name="pollstR"; version="1.0-0"; sha256="1nmhvbpfb64cbh317k09dran38410qcfhk4rl37rch3bz6vv17rd"; depends=[httr plyr jsonlite]; };
+  polspline = derive { name="polspline"; version="1.1.9"; sha256="1n08dhwpf53slk1zib491kii54x9h16g3jgr2kxxpyc5xfv4yj26"; depends=[]; };
+  polyaAeppli = derive { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
+  polyapost = derive { name="polyapost"; version="1.1-6"; sha256="1wk85nl2p9plnaavjdr4bqxxhjc84ynv53bh2v1rmq87jymw40b1"; depends=[boot]; };
+  polyclip = derive { name="polyclip"; version="1.2-0"; sha256="1rcygs7907r75hndfs3yyh0yfcw3q5dyfps57r3ygkq1rjl6pchb"; depends=[]; };
+  polycor = derive { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
+  polyCub = derive { name="polyCub"; version="0.4-3"; sha256="08m1nmc8g8s69lpnah9aisva4himymv659kxw73xzh7rma50r415"; depends=[sp spatstat statmod]; };
+  polynom = derive { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
+  PolynomF = derive { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
+  polysat = derive { name="polysat"; version="1.3-2"; sha256="1h1ixxa4z6qr3ixpphy70axd3kf4gnwiw1i22qzm4m06h4bdchva"; depends=[combinat]; };
+  polySegratio = derive { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
+  polySegratioMM = derive { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[polySegratio gtools coda lattice]; };
+  polytomous = derive { name="polytomous"; version="0.1.6"; sha256="137qcnncih1lm2wshwrznlcr0k552n0sqhiy73iwis59lg854caa"; depends=[MASS Hmisc lme4]; };
+  polywog = derive { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[miscTools foreach Formula glmnet iterators Matrix ncvreg Rcpp stringr]; };
+  pom = derive { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; };
+  Pomic = derive { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
+  PoMoS = derive { name="PoMoS"; version="1.1.1"; sha256="0j3iw6bcsr3rzwh15afcw3rglddq9bj7470xpnlpfpmd9nk0s18d"; depends=[RGtk2 cairoDevice igraph]; };
+  pomp = derive { name="pomp"; version="0.49-2"; sha256="0prhingisbg5j36qawxnhjwarxfrldghd95gxc963d1rvvq8xgg9"; depends=[mvtnorm subplex nloptr deSolve]; };
+  pooh = derive { name="pooh"; version="0.2-1"; sha256="1h8b5zwawhvq6h29dfznnhdb33al06hkvy05dphsmycd1lsha0jm"; depends=[]; };
+  popbio = derive { name="popbio"; version="2.4"; sha256="12hvxkgbr6snypplxv404sj0ass6ab9i969bb00ipy10gny1w4ww"; depends=[quadprog]; };
+  PopED = derive { name="PopED"; version="0.1.0"; sha256="081sjx15fhaw4a04mf12g9430djgjkzd66ncqjwj9asrhzsy0pdc"; depends=[ggplot2 MASS mvtnorm]; };
+  popgen = derive { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
+  PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
+  PopGenome = derive { name="PopGenome"; version="2.0.6"; sha256="1zykgf68fgbj83x26dvsh34izc02ic8rg9gh7r01bks3q5hqmlj0"; depends=[ff]; };
+  PopGenReport = derive { name="PopGenReport"; version="1.8"; sha256="0jzakqjbmbs3f67vhnzxwvc2xf0q2i83a8y73c5ysbv5gyl0q1sf"; depends=[adegenet mmod knitr lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp raster]; };
+  popgraph = derive { name="popgraph"; version="1.3"; sha256="064nxda90qrm8pzmnshwqrda91nmwb4sg2pyk7k9q6kpvqq7pjs6"; depends=[ggplot2 MASS sp igraph Matrix]; };
+  poppr = derive { name="poppr"; version="1.0.6"; sha256="0dbkvdjh4f81kj6xv2civhhhfymjc16imnx0vf0cbc4hyqfgqnpp"; depends=[adegenet vegan ggplot2 phangorn ape igraph pegas]; };
+  popRange = derive { name="popRange"; version="1.1.1"; sha256="1n8swfhnxk757n6nxsmn8dzx2h01xdr2s64wy2m4xq7wpdp9lajq"; depends=[]; };
+  popReconstruct = derive { name="popReconstruct"; version="1.0-3"; sha256="1m4gj43bzsz8y4jay0bc5mvdfwqx5agha4l2r0svm6qg8cfl4lza"; depends=[coda]; };
+  popsom = derive { name="popsom"; version="2.3"; sha256="0hdg1nx8mlpqw9aj2q08sb20frsc5jnbvqpfalf5kyvlygnhxdlc"; depends=[som fields]; };
+  portes = derive { name="portes"; version="2.1-1"; sha256="0kj35cr85j7fv6viy0q62jcplrs4rnryrb9kw8g3mhszh4da8ld2"; depends=[]; };
+  portfolio = derive { name="portfolio"; version="0.4-6"; sha256="0kaaincyzc2f4dm7n08y3vs1yd1r7pd997gf2wvfjydw7wkc5pin"; depends=[lattice nlme]; };
+  portfolioSim = derive { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
+  postCP = derive { name="postCP"; version="1.7.2"; sha256="1zi3ns202rsfbjkblsmk3vzlygixgm81cp9kga64q1xgk40vq657"; depends=[MASS Segmentor3IsBack]; };
+  POT = derive { name="POT"; version="1.1-3"; sha256="0s8ifnvk2h3blw7m0widp9q10hik58y02v7rl8lqpppnd5y868vz"; depends=[]; };
+  potts = derive { name="potts"; version="0.5-2"; sha256="1q4kvknxkrd8qbv8l3vmwrppgzq5bsysnqgm029lx7iys73x4fck"; depends=[]; };
+  PottsUtils = derive { name="PottsUtils"; version="0.2-3"; sha256="0mnly1xlpwzk3ryvgl2m0m6ygvx0i7k7gk3fdf4vmw5llyd6xg3s"; depends=[miscF]; };
+  powell = derive { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; };
+  PoweR = derive { name="PoweR"; version="1.0.1"; sha256="1m6y7f89kjhdmrdw1xb59cly0xjz79b1krhywkg9m7z73k1yx9h9"; depends=[]; };
+  Power2Stage = derive { name="Power2Stage"; version="0.0-8"; sha256="0ni7pp7wc22v01f2anp0932glxwvikwj57laq6f5vs6v12gz3wkv"; depends=[PowerTOST]; };
+  powerAnalysis = derive { name="powerAnalysis"; version="0.2"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
+  powerGWASinteraction = derive { name="powerGWASinteraction"; version="1.0.0"; sha256="0ij843g95ypxc7cfhvi3pm57b5ry1xr2x0f944l9ncyy8d15jxc4"; depends=[]; };
+  poweRlaw = derive { name="poweRlaw"; version="0.20.2"; sha256="0nw52gwk9504i55852dik1kqqk6zg3wjgckc9rmw8gh2pz8i9nla"; depends=[VGAM]; };
+  powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; };
+  powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
+  powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
+  PowerTOST = derive { name="PowerTOST"; version="1.1-11"; sha256="0b2qnz1wivi2190gq2cwcnbk9cnrsj23zv41jaqs8p5319gr76jh"; depends=[mvtnorm]; };
+  PP = derive { name="PP"; version="0.2-1"; sha256="0qrmlfjfsaj1jxbpzzbh1lnsw5c9b631b7q5jxrzvg675m0wy2mr"; depends=[]; };
+  ppcor = derive { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
+  ppiPre = derive { name="ppiPre"; version="1.5"; sha256="1d1567h2j0y4f8jkaiszxkq13xkxq9jb3bf0rmjmy1z263nnl4a1"; depends=[igraph e1071]; };
+  ppls = derive { name="ppls"; version="1.6-0"; sha256="0jd80sfsg7j2540sz5v9n43pni9713sb1nvb5h1azbr3mnwqsri5"; depends=[MASS]; };
+  ppmlasso = derive { name="ppmlasso"; version="1.0"; sha256="0f5wld45r874rmi5bvhiqhpi5jqgrg5lwqazfhkv1md0ac2klkqj"; depends=[spatstat]; };
+  pps = derive { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
+  ppstat = derive { name="ppstat"; version="0.9"; sha256="1mnlvdzvayz30sbiq95wm0ywmzc168lqx0l33397jadiq5zbsbkn"; depends=[processdata reshape2 ggplot2 Matrix]; };
+  PPtree = derive { name="PPtree"; version="2.2.0"; sha256="0pbfda0ab56ji1ms35msnpjxj7zrj9vif6vvsdajmlnnhncm757q"; depends=[MASS penalizedLDA]; };
+  pqantimalarials = derive { name="pqantimalarials"; version="0.1"; sha256="0q7knygxcv9s7lnpzn165dqvgff6zsz25ld44rh4fddgfzlwynn8"; depends=[shiny rms reshape2 RColorBrewer plyr]; };
+  prabclus = derive { name="prabclus"; version="2.2-4"; sha256="1p4hhs002cyrmnmfc2s11zia2jcnafidmy41dl3bd8mqyq3d193z"; depends=[MASS mclust]; };
+  pracma = derive { name="pracma"; version="1.6.4"; sha256="0kqpz4pszcs0wh08cpwb19ahnbz1qnv423sl9dk9ii1j79n7rh7x"; depends=[]; };
+  PracTools = derive { name="PracTools"; version="0.0-1"; sha256="06xgyxpfczxs0vzjib6jpabj3ar143wkhi1q15c3nzjn8r33zi4h"; depends=[]; };
+  pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
+  praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
+  predfinitepop = derive { name="predfinitepop"; version="1.0"; sha256="1x5ri1kvd1rd9bjp2ygqwl68yp6hyb6aly22bs5kdwv2vn9nlq9w"; depends=[]; };
+  PredictABEL = derive { name="PredictABEL"; version="1.2-1"; sha256="18fmafl1d4nwf7mya9gh1rlv5936zzr2jm3fwn5r2m5fc034qqjx"; depends=[Hmisc ROCR epitools PBSmodelling]; };
+  PredictiveRegression = derive { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
+  predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
+  prefmod = derive { name="prefmod"; version="0.8-31"; sha256="19yglrj4nqsknhan9v2qyjbfwx0c796a0qn2sjnjwlc4vf9d94fn"; depends=[gnm colorspace]; };
+  PReMiuM = derive { name="PReMiuM"; version="3.0.24"; sha256="1i6bsp3bmzhb17nrxi6jj22s8rpck3ix7l6g1cx094im4hhgnb2k"; depends=[Rcpp ggplot2 cluster plotrix]; };
+  PresenceAbsence = derive { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
+  PResiduals = derive { name="PResiduals"; version="0.1-0"; sha256="0g3div2i5sr4fbc7l6zzvaw72nbs80lkc1yv7p32w6g2cmyjhy7c"; depends=[Formula]; };
+  prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
+  prettyR = derive { name="prettyR"; version="2.0-7"; sha256="0ic0s8sqjlyn21s2zzrq2hrncsxqmgnl2xyvlicd5pvx3gfggjdi"; depends=[]; };
+  prevalence = derive { name="prevalence"; version="0.2.0"; sha256="0yab4ig0hwyr10fgcw50hs63hbdpch83500xws05h1srsd2kiq8f"; depends=[rjags coda]; };
+  prevR = derive { name="prevR"; version="2.9"; sha256="1h0v52pwhrb9ib61wjqdcand5prc1h205nd2rl5qiiqcnq4xn582"; depends=[sp gstat GenKern rgdal fields]; };
+  prim = derive { name="prim"; version="1.0.13"; sha256="114n002jfiz99als8jny356frg6jamzfbrc2cqxl3fjjxijiy6hi"; depends=[]; };
+  primer = derive { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
+  primerTree = derive { name="primerTree"; version="1.0.0"; sha256="127i14bgb5kkd91yvd50bsib73lm01az80x3lm4d0fqirv7l715i"; depends=[directlabels gridExtra ggplot2 XML ape httr lubridate plyr scales stringr foreach]; };
+  princurve = derive { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
+  prinsimp = derive { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
+  PRISMA = derive { name="PRISMA"; version="0.2-1"; sha256="09hpplm86d8f0v11jijj3nl4iaqbzhmz4wjdm81idmnfna83mmk0"; depends=[Matrix gplots ggplot2]; };
+  PrivateLR = derive { name="PrivateLR"; version="1.1-69"; sha256="0harlkccxa51k75if5z1h29lnis1dinh2zsk2liicwyjxcnmx0ml"; depends=[]; };
+  prLogistic = derive { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot lme4 Hmisc]; };
+  prob = derive { name="prob"; version="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
+  ProbForecastGOP = derive { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[RandomFields fields]; };
+  probsvm = derive { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
+  pROC = derive { name="pROC"; version="1.7.2"; sha256="13yb6wypw1k34hddshwf67l72mkpqflbicy4c6pifq7m3jjz5v3w"; depends=[plyr Rcpp]; };
+  processdata = derive { name="processdata"; version="0.8.2"; sha256="1rdb3chpm7c2acx5r262gcg5w02mplh6xgxlld070kb91i7drahj"; depends=[ggplot2 reshape2]; };
+  ProDenICA = derive { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
+  prodlim = derive { name="prodlim"; version="1.4.3"; sha256="0y18ngb1gy8zdk4dfakb57pyjll8937acbaz2lynwhbabd6kg66l"; depends=[survival KernSmooth lava]; };
+  PROFANCY = derive { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[Matrix lattice igraph]; };
+  profdpm = derive { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
+  ProfessR = derive { name="ProfessR"; version="2.1"; sha256="1khgb3bbq44mskhrcni9yfg6cs35fdpgfakznna8d9rqy8wmw7ff"; depends=[RPMG]; };
+  ProfileLikelihood = derive { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[nlme MASS]; };
+  profileModel = derive { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
+  profileR = derive { name="profileR"; version="0.2-1"; sha256="1hcydy7hqjac9mvbaim2g75ab1ziyvpbrkb4k21966m54zjk9kka"; depends=[ggplot2 MASS RColorBrewer reshape plyr]; };
+  profr = derive { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[stringr plyr]; };
+  proftools = derive { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; };
+  ProgGUIinR = derive { name="ProgGUIinR"; version="0.0-3"; sha256="1k441a5wmqhkmlm8cffvblp99c8sqq4z64qmb6a3mflkv89wd5si"; depends=[ggplot2 svMisc ggplot2 MASS]; };
+  prognosticROC = derive { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
+  proj4 = derive { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
+  ProjectTemplate = derive { name="ProjectTemplate"; version="0.5-1"; sha256="0fi5i9icac2rjrpmgvb9glqr6z5fr880bn8hz6djgi1n1bn2v1g8"; depends=[]; };
+  propagate = derive { name="propagate"; version="1.0-3"; sha256="1kg29c72r6yz8asm6zdjxiwkrkz8dh92iybcxmiwzifhshv4gg34"; depends=[MASS tmvtnorm Rcpp ff minpack_lm]; };
+  PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; };
+  PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[flashClust dynamicTreeCut]; };
+  PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
+  prospectr = derive { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[RcppArmadillo foreach iterators Rcpp]; };
+  proteomicdesign = derive { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
+  protiq = derive { name="protiq"; version="1.2"; sha256="00hv6hmfba4is2q1s9h5csx42s7ry2qdmi7vasgcafp8s4fc999l"; depends=[mvtnorm]; };
+  proto = derive { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
+  protoclass = derive { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
+  protoclust = derive { name="protoclust"; version="1.3"; sha256="01ri32w2l9w8k72hi22i8rwrzl2q1d14ikvzdkpysnr17sp00c1m"; depends=[]; };
+  PROTOLIDAR = derive { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
+  protr = derive { name="protr"; version="0.2-1"; sha256="0kjvq7w2pg8vdv0f7lsc6f1ksbv9f9x7p61aqfzqignz9nh792dd"; depends=[]; };
+  protViz = derive { name="protViz"; version="0.1.76"; sha256="1zbi0h8vlgfpni3a10p6102llzpsx1yp0k8dnnbjcc357jj73zkk"; depends=[Rcpp]; };
+  proxy = derive { name="proxy"; version="0.4-12"; sha256="1hjbx94c4m2v22fswdd2jkb43ixfv6qivx8qiyzm23g1965ynvii"; depends=[]; };
+  PSAboot = derive { name="PSAboot"; version="1.0"; sha256="1ddlxyvfcq186njqkxr8nbdssc6qnlq0c3gghsn87zc4jf9v83fi"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
+  PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
+  psbcGroup = derive { name="psbcGroup"; version="1.0"; sha256="1l28sy0jys1g3nyfls9nl9vx9b6qh405a2nhx0qgxwb24l67x56n"; depends=[bayesm LearnBayes SuppDists mvtnorm]; };
+  PSCBS = derive { name="PSCBS"; version="0.40.4"; sha256="0hz0pw3ph0b03kqqpiwsg2vh6ia5k7wd0hxbx3kyg0cx4l0mmzwf"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
+  pscl = derive { name="pscl"; version="1.04.4"; sha256="0mm8qak7cq8qks60wx6lslii79wnkh58a31izgns35wwlflg8g6n"; depends=[MASS mvtnorm coda gam vcd lattice]; };
+  psd = derive { name="psd"; version="0.4-1"; sha256="1knfpgvmhrispfvlv94rnpbrjkyggqrmng65bjdjjigq83hhzywm"; depends=[fftw RColorBrewer signal zoo]; };
+  psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
+  pse = derive { name="pse"; version="0.3.3"; sha256="0cr9bjh12qhglqygdnx7fx6wfdxq591vpck0g490svrh35bdbd5s"; depends=[Hmisc boot]; };
+  pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
+  psgp = derive { name="psgp"; version="0.3-5"; sha256="0w1pvx227fr897isl8ffampnz7rw8jsmmi24ily1nzb0xvrzhp0i"; depends=[intamap automap gstat]; };
+  pSI = derive { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
+  psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrpyb4v8bv77mygxcf51rxihigzvj"; depends=[data_table RCurl foreign SAScii]; };
+  PSM = derive { name="PSM"; version="0.8-10"; sha256="1s60fr85xn3ynpvsbc3nw7vgz6h6jxy3yii1w6jpkw3iwl4bgn84"; depends=[MASS numDeriv deSolve ucminf]; };
+  PSMix = derive { name="PSMix"; version="1.1.1"; sha256="0g9s7v05jjc7vq08fj5bb2wg03isnyr1ql1rciiihqi5w4dwx6w7"; depends=[]; };
+  pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
+  pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
+  pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
+  PST = derive { name="PST"; version="0.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; };
+  PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; };
+  psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
+  psych = derive { name="psych"; version="1.4.4"; sha256="0ljb4xi9x2gpr8na1swa1ri855r8prxv669bmw4vnri4qrc7ijck"; depends=[]; };
+  psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
+  psychomix = derive { name="psychomix"; version="1.1-0"; sha256="1sw5w2na9pgmi63mqiv06v1lr7vlin8912dsy75yjxl9zrm3wavi"; depends=[flexmix psychotools lattice Formula modeltools]; };
+  psychotools = derive { name="psychotools"; version="0.2-0"; sha256="13zpg4xi5hmr8yzjsri4kn0dy39ns5razdmchh4nwfr9gjn0h29b"; depends=[]; };
+  psychotree = derive { name="psychotree"; version="0.13-0"; sha256="1jwya7glgaz4zb81i37bvxnm712b1y34dh5s3y64lms2bd98wc4b"; depends=[party psychotools modeltools sandwich strucchange]; };
+  psyphy = derive { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; };
+  psytabs = derive { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[psych plyr rtf R2HTML mokken lavaan semTools]; };
+  pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl9hpwm7j2nzg3plv6i1fz"; depends=[]; };
+  PTAk = derive { name="PTAk"; version="1.2-6"; sha256="06b59qmlz7n6nydb7d2nbv2ggfam0092qzavshgfa6p8r5vzxcj6"; depends=[tensor]; };
+  PTE = derive { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; };
+  ptinpoly = derive { name="ptinpoly"; version="2.1"; sha256="0l16hvg3b7km0kh2wqzcvnn6jydvvh5mm089j15in4s1wsjn173k"; depends=[misc3d]; };
+  PtProcess = derive { name="PtProcess"; version="3.3-1"; sha256="0qh673i00z8x07zjhwazambz1myw5q342zfqfgm2f5z59v1j7m48"; depends=[]; };
+  ptw = derive { name="ptw"; version="1.0-7"; sha256="195pa6hj3y9spyc7yxfgr8alkp48a7ccnyp64r6fyjwj6ds08b64"; depends=[]; };
+  PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; };
+  pubmed_mineR = derive { name="pubmed.mineR"; version="1.0.1"; sha256="0d288hx98j5k4nmzj1vc3sfjwh9i4cljfgi6vklrsvgn5sx39x91"; depends=[RCurl XML NCBI2R boot R2HTML]; };
+  PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3"; sha256="1vqgd34hr0p2dm8mlnqw0ff26nszqrii0gxzi3pa01yvdr0bi4fd"; depends=[XML stringr RCurl wordcloud tm GOsummaries RColorBrewer]; };
+  pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; };
+  PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
+  pushoverr = derive { name="pushoverr"; version="0.1.1"; sha256="0ybvrb406s0i8kr11187dkbpryw2gjz1h8k6f5bsxwhfhzxmfri1"; depends=[httr]; };
+  PVAClone = derive { name="PVAClone"; version="0.1-1"; sha256="1nscnh4ynijflvch0vp40a4hjdz34h58p61lpgda6b4rjaw6a7dy"; depends=[dcmle dclone]; };
+  pvar = derive { name="pvar"; version="1.0.9"; sha256="01bkva4kna1vfjlsss16s6501l8x2s95a5wh7wsmwq3spdgp1i2r"; depends=[]; };
+  pvclass = derive { name="pvclass"; version="1.0"; sha256="0zp2si1hby13s5qqkqzwmf3qi7fm2sghkiphdp1cp9r5h6zkdp13"; depends=[Matrix]; };
+  pvclust = derive { name="pvclust"; version="1.2-2"; sha256="152qwvk4lpdsrv96148bc3z51jqdaa7p95ql2zhpb7a2fvzs5ad5"; depends=[]; };
+  PVR = derive { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
+  pvsR = derive { name="pvsR"; version="0.1.1"; sha256="0bx8jbyr5d3p1x74z7zidw0dr61rcf3fsh3hxjx10m3ppd1lafvf"; depends=[XML nnet]; };
+  pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; };
+  PwrGSD = derive { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
+  pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
+  pwt8 = derive { name="pwt8"; version="8.0-0"; sha256="12cgyban6waj0cxz9gb35s5v0v29rmx67ipzalzdnrjp5nsmy431"; depends=[]; };
+  pxR = derive { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[stringr reshape2 RJSONIO plyr]; };
+  pyramid = derive { name="pyramid"; version="1.3"; sha256="1jmcqzgxqwvfa9aidayjx6j1s9f3kwqvivwldwpkf780i9wkdig9"; depends=[]; };
+  qat = derive { name="qat"; version="0.72"; sha256="0vs7xc32h9s5p7486cafzzll7xaby7lbqmmpnshkn8mq021xlxkg"; depends=[ncdf gplots XML gdata moments boot fields]; };
+  QCA = derive { name="QCA"; version="1.1-2"; sha256="0fqhxwa7vjizis273sj8r6ssi1fx0kbchf3nrvvs7hhypnw39969"; depends=[lpSolve]; };
+  QCA3 = derive { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
+  QCAGUI = derive { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
+  qcc = derive { name="qcc"; version="2.3"; sha256="1hrv8ar58af4h0mkvx2l7kfmix3y91d158h8llbcfl5idffy8551"; depends=[MASS]; };
+  QCGWAS = derive { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
+  qdap = derive { name="qdap"; version="1.3.5"; sha256="1y05p93b1khagwsjqzfnhs4j9gfkvm574gyaizz9kxnmaamj32nf"; depends=[ggplot2 qdapDictionaries RColorBrewer chron gdata gridExtra igraph RCurl openNLP NLP plotrix reports reshape2 scales tm venneuler wordcloud xlsx XML]; };
+  qdapDictionaries = derive { name="qdapDictionaries"; version="0.0.4"; sha256="05a1w9hdwxnl7hzjnz2bn8krz60a2wayw5q9jv1pjb691rlsqqx1"; depends=[]; };
+  qdapTools = derive { name="qdapTools"; version="0.0.3"; sha256="0gvgb9xs8wz723ggv4xgn52ijcr28mf2dcqzmkacl8xap9ma392i"; depends=[chron RCurl]; };
+  qfa = derive { name="qfa"; version="0.0-10"; sha256="1c6yh5fa45fk3g9hi905b2cjswn6gmn53f0gb5v5byb9gr9bjf7s"; depends=[sp DEoptim]; };
+  qgraph = derive { name="qgraph"; version="1.2.4"; sha256="1dvw6ykprp9j5g62iimbr7nrabfvhag81031i57g6hk9jn3gjnyr"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace BDgraph Matrix sna corpcor]; };
+  qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
+  qLearn = derive { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; };
+  qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
+  qmap = derive { name="qmap"; version="1.0-2"; sha256="1hb8bl51103fzyfcmz5bmf5aqqw2db8523li3ffw5asa9j9vhjwm"; depends=[fitdistrplus]; };
+  qmrparser = derive { name="qmrparser"; version="0.1.4"; sha256="1lw8sn4qsdv4bxf5p7gnkm0vmiymyj03svbl232zyyb0fh97i7nk"; depends=[]; };
+  qp = derive { name="qp"; version="0.3-2"; sha256="1964bj2ggmpaqz0rnmc2zx5hyrzawlmawz3mh046cx1pdzlsqfwh"; depends=[]; };
+  qpcR = derive { name="qpcR"; version="1.3-7.1"; sha256="09vyhj144b1hs0kmyvh4r7zjasqas47jhacg86mkxgkcrzgzf1vf"; depends=[MASS minpack_lm rgl robustbase]; };
+  qPCR_CT = derive { name="qPCR.CT"; version="1.1"; sha256="19j41fsd2m7p2nxi2h2mj43rjxx6sz2jpf4sk0bfvl1gyj0iz3hi"; depends=[RColorBrewer]; };
+  qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
+  QRM = derive { name="QRM"; version="0.4-9"; sha256="0ibkwkmlf3qvi6l46802y07v1zp0wkhn0vxki95kkir6fbbz4ndr"; depends=[gsl Matrix mvtnorm numDeriv timeSeries mgcv]; };
+  qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
+  QSARdata = derive { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
+  qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
+  qtl = derive { name="qtl"; version="1.31-9"; sha256="1pwmq7viwxa8g1f3iclfggz6ny006vlzvknbdrb37p8198x83xy3"; depends=[]; };
+  qtlbim = derive { name="qtlbim"; version="2.0.7"; sha256="0nm7ky5bkzhmfr41fs1pvl51i2df1fz11j55q74ma2wzki5adfps"; depends=[qtl lattice coda MASS]; };
+  qtlbook = derive { name="qtlbook"; version="0.18-1"; sha256="09b4w7kqdlmpf0vsjgwbi9sraafzchvk18yzrx72gs151v03nxlm"; depends=[qtl]; };
+  qtlDesign = derive { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
+  qtlhot = derive { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[qtl lattice corpcor mnormt]; };
+  qtlmt = derive { name="qtlmt"; version="0.1-3"; sha256="01ql0fr2mxl8a8nd6lpig5j8vznv594ygn6bj6d31gj15r5rs8fs"; depends=[]; };
+  qtlnet = derive { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[qtl igraph sem pcalg]; };
+  QTLRel = derive { name="QTLRel"; version="0.2-14"; sha256="05x56a8fjr6xk38dphdzh77y520cr6zykjp3qlx27drk9s5z06cs"; depends=[gdata]; };
+  qtpaint = derive { name="qtpaint"; version="0.9.0"; sha256="06yqakg134mks8q7a40f5knjpcm1k2wdzchs0ywvfpwvpwgwig01"; depends=[qtbase qtbase]; };
+  qtutils = derive { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase qtbase]; };
+  QuACN = derive { name="QuACN"; version="1.7.4"; sha256="1bcvnzycw7xvnms41rqsnfvggvcmpaw6byrsdzqmg7z0q754b1j4"; depends=[combinat Rmpfr igraph]; };
+  quadprog = derive { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; };
+  quadrupen = derive { name="quadrupen"; version="0.2-4"; sha256="0gs565zi5qkccr9f65smvzgq2d97p7i5inksp2492bjvqhsbagxj"; depends=[Rcpp ggplot2 Matrix reshape2 scales]; };
+  qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0qrxf47fv56c86p0mmg3l3qvx8p3rvapffwhaw4yn4kbp7yiap5d"; depends=[]; };
+  qualV = derive { name="qualV"; version="0.3"; sha256="0cr3jlp0y83nk6i965bd6v86sl8pjx47z1y20lcygrf5cb6m4ifw"; depends=[KernSmooth]; };
+  Quandl = derive { name="Quandl"; version="2.3.2"; sha256="0dx6myf5gw7dvhglsc60hwq8nsj73zz3gcqcad1z3d27acv2q7m0"; depends=[RCurl RJSONIO zoo xts]; };
+  quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
+  QuantifQuantile = derive { name="QuantifQuantile"; version="0.1"; sha256="031plwf801rwczg4zprgpmsapvyf4mylrnbrxjkbza9dgddhwwy0"; depends=[rgl]; };
+  quantmod = derive { name="quantmod"; version="0.4-0"; sha256="12411ykj1f1ni5y00ma3kr5h5fsi0rqkshz7501wykj926js9v5j"; depends=[Defaults xts zoo TTR]; };
+  QuantPsyc = derive { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
+  quantreg = derive { name="quantreg"; version="5.05"; sha256="07djmdlmij9add2sgdsb1p6521hlnsfmll8lqs3x0z9gmr2wyx4f"; depends=[SparseM]; };
+  quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; };
+  quantregGrowth = derive { name="quantregGrowth"; version="0.1-2"; sha256="1lisnslvfhx1iyqiidw87a1gmqx5wwdzq2134jq01yiahp05kifj"; depends=[quantreg]; };
+  quantspec = derive { name="quantspec"; version="1.0-0"; sha256="1z2r9iq3pccba3k871cbbvssnrls0p2w2ax21nmy2z3g7n3fbwq7"; depends=[quantreg testthat abind zoo rje snowfall]; };
+  QuasiSeq = derive { name="QuasiSeq"; version="1.0-4"; sha256="1vpk1l7dhbfdywncdfg1c29qpj3x0m5ddpyh13d0d3ic8rzhdivf"; depends=[Matrix mgcv]; };
+  questionr = derive { name="questionr"; version="0.4"; sha256="023q2d1p32p11pn1w37q5ax13sks462b5i1mmg7wwd7sjkmjq9f5"; depends=[shiny highr]; };
+  queueing = derive { name="queueing"; version="0.2.2"; sha256="1db8w9pzy4krgcc4xahfs9aw45gvvyl6kqm1hkklw21pfc0ka09f"; depends=[]; };
+  QUIC = derive { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
+  quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
+  quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
+  qvcalc = derive { name="qvcalc"; version="0.8-8"; sha256="0xmbn6p7ryr43yf978pqpdnlxdq84v965hxbff8dviqhxwgqv4aq"; depends=[]; };
+  QZ = derive { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
+  R0 = derive { name="R0"; version="1.2-4"; sha256="1gg5jlmb20lqa4nismchffc65b02n0qmbsk8nwzkkl2zxkm9kx3k"; depends=[MASS]; };
+  R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; };
+  R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; };
+  R2BayesX = derive { name="R2BayesX"; version="0.3-1"; sha256="1qsg4lvzxpbn2jli58kncn5kjlv7ccmmkrj1m9jakbbzx51qc1rj"; depends=[BayesXsrc colorspace mgcv]; };
+  R2Cuba = derive { name="R2Cuba"; version="1.0-11"; sha256="1kgcxqn83yskh0dv6vyz66d0z32qy55par36jj987qglpl25zmax"; depends=[]; };
+  r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
+  r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; };
+  R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
+  R2GUESS = derive { name="R2GUESS"; version="1.3"; sha256="1jqzh2f9qwwmcf16hjgnl3rgp49zx6m090r750p3n4ds3qr96zx7"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
+  R2HTML = derive { name="R2HTML"; version="2.2.1"; sha256="11p0mg6b39z2w7k76j21hy09r8fm3rwkiby2lmhx5cgvnvxgrqf1"; depends=[]; };
+  R2jags = derive { name="R2jags"; version="0.04-01"; sha256="1df9663cn2hv02v7b3i3j38ajh66106fl8p175z116dz0byzk2z6"; depends=[rjags abind coda R2WinBUGS]; };
+  r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
+  R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; };
+  R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
+  r2stl = derive { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
+  R2SWF = derive { name="R2SWF"; version="0.8"; sha256="125r4drgl79cwda00g42m0l0dzqmi2n8p5cikx70jz67giq5blw2"; depends=[sysfonts]; };
+  R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
+  R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
+  R4CDISC = derive { name="R4CDISC"; version="0.1"; sha256="0sf57gx5sxsr958mjvmiggkfb6yyk2fwvqhpmagw8d54d6qxsl36"; depends=[XML]; };
+  R4CouchDB = derive { name="R4CouchDB"; version="0.4"; sha256="15177dwwnhl6mfvb78knhmjqi34pb74dcgb9rf9j0rvy85vznzzm"; depends=[bitops RCurl RJSONIO]; };
+  R4dfp = derive { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
+  r4ss = derive { name="r4ss"; version="1.20"; sha256="1nrxyqm570w5g9k7f9mj9rvv6pvwd00pansrrdfik2ciwcriyzz8"; depends=[coda gtools maps]; };
+  race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
+  RAD = derive { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[mvtnorm MASS]; };
+  RADami = derive { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape geiger phangorn]; };
+  RadioSonde = derive { name="RadioSonde"; version="1.3"; sha256="1bvy281v278dni7ms4mq963463mwsj1bys9n2lvn6y8p7jhqvhdj"; depends=[]; };
+  RadOnc = derive { name="RadOnc"; version="1.0.7"; sha256="05d6fd4qj8crx0jip13ixqqra1l9y7j1nijzfq6w8hxhan7cgys7"; depends=[rgl geometry oro_dicom ptinpoly]; };
+  rags2ridges = derive { name="rags2ridges"; version="1.1"; sha256="0rvl9ygqxshlzgg1xlg91bximq5ws0vbzw4spf5hi9z718kj2ika"; depends=[expm GeneNet reshape ggplot2 igraph]; };
+  RAHRS = derive { name="RAHRS"; version="1.0.1"; sha256="068alq0mrfgcmpa5gfrrqgixpdadva11s9ammg7p6g9lfrjx6gcc"; depends=[pracma RSpincalc]; };
+  rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
+  raincpc = derive { name="raincpc"; version="0.1"; sha256="0l8b4s64ql3jj9m4mc4w21igq8pr7ky9ixzlgr76lhrbjnr7z7ig"; depends=[]; };
+  rAltmetric = derive { name="rAltmetric"; version="0.3"; sha256="0jq5w5yd1cps4npbm9wmrjb5vc36y89ib986ggqycd9jalmshxjd"; depends=[plyr RCurl reshape2 png ggplot2 RJSONIO]; };
+  Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
+  RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[lavaan ellipse]; };
+  ramps = derive { name="ramps"; version="0.6-12"; sha256="128lqfkgmcbcfvs210j14h54spqjcr4jdhk2rqgrwcjp5wjv209w"; depends=[coda maps Matrix nlme fields]; };
+  randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
+  random = derive { name="random"; version="0.2.2"; sha256="0h3vmd581i0srf9lfdgjv8kkinxf1kjg8aia0dhr5adghqvf5dck"; depends=[]; };
+  RandomFields = derive { name="RandomFields"; version="3.0.10"; sha256="02cvsyv5lfmm8axrhwmhhzcidhrj8bnkyas0vjsf51mzyfm0a9iv"; depends=[sp]; };
+  randomForest = derive { name="randomForest"; version="4.6-7"; sha256="02xyaz1rbvbsw6zl9kqv3qv32ni6rkgig38l1z0yy1rc4j5yh1l2"; depends=[]; };
+  randomForestSRC = derive { name="randomForestSRC"; version="1.4"; sha256="1a70i63l3iycns4zgbfrawchr5ysshy6ipbibh5wyc31yfjdlbsl"; depends=[]; };
+  randomGLM = derive { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[MASS foreach doParallel]; };
+  randomizationInference = derive { name="randomizationInference"; version="1.0.1"; sha256="1l4h9d0r199z775da0la30qijm8xikmbfnl7av7h1ar305ph6r2v"; depends=[permute matrixStats]; };
+  randomizeBE = derive { name="randomizeBE"; version="0.3-1"; sha256="06hj614wp9lb348qwyqgw5zk2vn0m81bkwz4jprgjd72kpy8kv1h"; depends=[]; };
+  randomLCA = derive { name="randomLCA"; version="0.8-7"; sha256="1xs2jh0parvqjm88cs2w2yb8r4ld6643fn84w35v8jsffbs98522"; depends=[lattice nlme boot]; };
+  randomNames = derive { name="randomNames"; version="0.0-6"; sha256="18fyxpqj6xv933nyv4s59wv7pgl4wra123qmf0fa68gk1zj9l153"; depends=[data_table]; };
+  random_polychor_pa = derive { name="random.polychor.pa"; version="1.1.3.6"; sha256="0qcy3f8r31k57ylcmg7a45h9fhg7llc8jqxvdxfxnsm5wx20vxvg"; depends=[psych nFactors mvtnorm MASS sfsmisc]; };
+  randomSurvivalForest = derive { name="randomSurvivalForest"; version="3.6.4"; sha256="1k08q43rxlz822rqzz3nvy40646764c8ds25ylsvg6daan2qzzmv"; depends=[]; };
+  randtests = derive { name="randtests"; version="0.3"; sha256="0v5hbbmx7cl1q8bfgk9141hqbimch5fkhcbr9xfxidydxyl9jqln"; depends=[]; };
+  randtoolbox = derive { name="randtoolbox"; version="1.14"; sha256="1pcbd626vkqakirzrvnz13k2h462hvf4ra7wvy1xx7k2vcm0ch78"; depends=[rngWELL]; };
+  RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
+  rangeMapper = derive { name="rangeMapper"; version="0.2-6"; sha256="1p4i677s7hc74snsk0vwswxp493ijwynsfmzjkrslzk819ng7zii"; depends=[RSQLite rgdal sp raster maptools RSQLite_extfuns lattice RColorBrewer classInt]; };
+  RankAggreg = derive { name="RankAggreg"; version="0.4-3"; sha256="0m9wndpfgiy9cf2ss1vk7f09yl0qiqhx48kn1qid69vhv73nsyf3"; depends=[gtools clValid]; };
+  Rankcluster = derive { name="Rankcluster"; version="0.92"; sha256="0rlha3l588k9f4d24pb5vgd6q44ycb3qpjl6zk9llmi8x42wf5s2"; depends=[Rcpp]; };
+  rankhazard = derive { name="rankhazard"; version="1.0"; sha256="1kylg8yjrixbv86i2ffhhn8f5shsj8kvi66k202ari0li92y7dsg"; depends=[survival]; };
+  RankResponse = derive { name="RankResponse"; version="3.0.3"; sha256="0bl0w8dzwn73psiln4bkilq1l1bn1jnh4mmvblvb3wnms8srhrpv"; depends=[]; };
+  RANN = derive { name="RANN"; version="2.3.0"; sha256="1f23zs5wd214pvvd2na4kc2nxrqrx8q1ij6ga8whs7qgyc8072fm"; depends=[]; };
+  RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
+  RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
+  RAPIDR = derive { name="RAPIDR"; version="0.1"; sha256="06lhsjy7s71p5bcpln999smvr6n1fp5qfbr7i8wjcn4p1ddcfdcm"; depends=[data_table PropCIs]; };
+  RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
+  RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; };
+  rapport = derive { name="rapport"; version="0.51"; sha256="1qn45nrcawr8d9pkdnpmm37dg31l28gfbnwjl62fs7y691187cqp"; depends=[lattice plyr pander yaml reshape]; };
+  rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[reshape plyr pander]; };
+  RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
+  Rarity = derive { name="Rarity"; version="1.2-1"; sha256="16ds0s396f42qqmn4xrnmfk1j6v917p27dgi9iji976hn2q463hh"; depends=[]; };
+  rARPACK = derive { name="rARPACK"; version="0.5-0"; sha256="0d4kd4fi6rvdamj5kvyba6zm0250ldm7nqrgnmapnc2q0wv0hik8"; depends=[Rcpp Matrix]; };
+  RaschSampler = derive { name="RaschSampler"; version="0.8-6"; sha256="1ap5r8k4ydnsxqz5hvnnp9cbp0mdnx5bn8pn2wh0rp42897mfm4i"; depends=[]; };
+  rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; };
+  raster = derive { name="raster"; version="2.2-31"; sha256="0i0a6d8g3qxxlmp897q80lw2k3ccidrfm236l0pd9nwydy0bqpl1"; depends=[sp]; };
+  rasterVis = derive { name="rasterVis"; version="0.28"; sha256="0pq47ldjnihi1mgy5g9ymgvfm5hkpivhcz8qk3kn24cp7j06n0xh"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; };
+  rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
+  raters = derive { name="raters"; version="1.1"; sha256="0djpax59qvvqklph847wh4m2231y3zrzv2i7maq43pr8pyw9f2md"; depends=[]; };
+  rationalfun = derive { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
+  RAtmosphere = derive { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; };
+  rattle = derive { name="rattle"; version="3.0.2"; sha256="19mscdb3snpj9z9zl8wg2zpr44l1x2agy108c086zqv8p1s7b8pv"; depends=[]; };
+  rAverage = derive { name="rAverage"; version="0.3-6"; sha256="005gjk8bifvncl1yfazj4bs8l4k2pgygwdyfrkkd4xvcywar0p73"; depends=[foreign]; };
+  rAvis = derive { name="rAvis"; version="0.1.1"; sha256="0iyhc24xm2655wc1dhg8vhd5yr7zx6hywpxczkfs0a7pifckfy4g"; depends=[stringr XML RCurl scrapeR gdata scales rgdal maptools raster sp]; };
+  rawFasta = derive { name="rawFasta"; version="1.0.0"; sha256="0krvs8d1r8hggjg84n7g3ncdkifa3hipbma98f49kf81fzn2npip"; depends=[]; };
+  rbamtools = derive { name="rbamtools"; version="2.6.0"; sha256="1iank7vr6haczgrv2pkcpvg24c78m8fmh9y982bnb8zjq8q4wwwn"; depends=[]; };
+  rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; };
+  rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
+  RBerkeley = derive { name="RBerkeley"; version="0.7-4"; sha256="0jslac7d0dyqxpy4lcg1i7kz9hdidnlxhf982lnsl5kx5fl0nmxi"; depends=[]; };
+  rBeta2009 = derive { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
+  rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; };
+  RbioRXN = derive { name="RbioRXN"; version="1.1"; sha256="1q7nznv54s9wmma82pisbrwsx6b23v4ncrvh6l145ah1qfxp3r8c"; depends=[gdata CHNOSZ hash foreach]; };
+  rbiouml = derive { name="rbiouml"; version="1.4"; sha256="03zpchcwq4sn8cymcrzw6r6fkxh85b8mivy42jkd0knm6i7f9aa6"; depends=[RCurl RJSONIO]; };
+  rbison = derive { name="rbison"; version="0.3.2"; sha256="04j0cq56b46d2nvvdl2sg49ffydbqv0bdzf9ccbh21y9z05s195a"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp data_table rjson]; };
+  Rbitcoin = derive { name="Rbitcoin"; version="0.9"; sha256="1l9k0pkxsdfm7aay47755zgx6k2b3pwnwxbzn80q5q27s1062pjv"; depends=[data_table RJSONIO RCurl digest]; };
+  rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
+  rbounds = derive { name="rbounds"; version="2.0"; sha256="19xxz5dzzh706pp9391fq4v0g1fsd442x6mqqdvhkm51a9x0ih3p"; depends=[Matching]; };
+  rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
+  RC = derive { name="RC"; version="1.0.2.13"; sha256="0rhbmmihsk09k1nhxkbq0kgxnynl4wfz4lq2jc9cvq8afirxi7wx"; depends=[igraph bitops]; };
+  RCA = derive { name="RCA"; version="1.4.5"; sha256="0s200s28a6gh3dggad52dgqnf0k2jsfrqv1hbg8w2529v4s3dc5i"; depends=[igraph]; };
+  R_cache = derive { name="R.cache"; version="0.9.0"; sha256="0a2x42rq2q0wzq2grwzc6ngs9hmw2lvz3nj1a4b3zh1r69qcn2vc"; depends=[R_methodsS3 R_oo R_utils]; };
+  RCALI = derive { name="RCALI"; version="0.2-6"; sha256="01zaks9mdgi9hcwsfvg3dwkihmb5ay5ilgg10fqcz2cssldj9x7x"; depends=[splancs]; };
+  Rcapture = derive { name="Rcapture"; version="1.3-1"; sha256="1k6w5pyml5y2sdfjc1xpl2d5p6d8zj98kwndgir56hyrrrm7nxgx"; depends=[]; };
+  rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
+  RCassandra = derive { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
+  rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
+  rcdk = derive { name="rcdk"; version="3.2.3.2"; sha256="0av5g1yhixx4px8xadg0645a31rgzbpfk2gpf8szxjlb16yvb7cs"; depends=[fingerprint rJava rcdklibs png iterators]; };
+  rcdklibs = derive { name="rcdklibs"; version="1.5.4"; sha256="0ffqvyrawr3n7y6yfag3lpqaz4z2v8ng3kr9h4qfmmab317njwwn"; depends=[rJava]; };
+  RCEIM = derive { name="RCEIM"; version="0.1"; sha256="1z9vp5x4zsc2rg6b080aw88p57gg5xl88psmk0dvy30l39wm4qx5"; depends=[]; };
+  Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v9wlh2wyp086r2vi6bia9j8sxhi0c"; depends=[proto plyr reshape ggplot2 digest]; };
+  Rcgmin = derive { name="Rcgmin"; version="2013-02.20"; sha256="1y6095vapb3r8p9i5hqa14gfpl4q3g2n82nb64429kl6w3mlfk8f"; depends=[numDeriv]; };
+  Rchoice = derive { name="Rchoice"; version="0.1"; sha256="030x42jq6dd25g7isk5m9s0v9rfqkkj7i7286i9as1mpn73nlyz5"; depends=[maxLik Formula sandwich ggplot2 plotrix car lmtest]; };
+  rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.4"; sha256="12gzfw0r1ljk81j7hglgsmdm7xwa2n2w2f56sg684l26jyqsaw1z"; depends=[rJava]; };
+  RCircos = derive { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; };
+  RClimMAWGEN = derive { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
+  rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.0"; sha256="1cnrs2znd105fvrcsf8bylmwlwhdrrgxkkkqzjyry1n36cf8q7jk"; depends=[stringr RCurl XML rjson tm]; };
+  Rclusterpp = derive { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
+  rCMA = derive { name="rCMA"; version="1.0.0"; sha256="16d3cdxiaq65lwbvq8wjcp89vrfdp9kwrdl2jy9fynsg0v2lasvp"; depends=[rJava]; };
+  Rcmdr = derive { name="Rcmdr"; version="2.0-4"; sha256="0py5qfr1zk83hgp06xvypz5b9nml5km5xwp2hzy3cf4fd2xjkl3q"; depends=[tcltk2]; };
+  RcmdrPlugin_BCA = derive { name="RcmdrPlugin.BCA"; version="0.9-7"; sha256="1r4mib6r6qdhkbysxjs7s49j2l1qivlksaixzyz321jwsilpl411"; depends=[BCA car Rcmdr]; };
+  RcmdrPlugin_coin = derive { name="RcmdrPlugin.coin"; version="1.0-21"; sha256="10fapjk74fpknym3pf2c0g25c4sk0pkfkakfy2c5fw9nw4a1j71f"; depends=[Rcmdr coin survival multcomp]; };
+  RcmdrPlugin_depthTools = derive { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[Rcmdr depthTools]; };
+  RcmdrPlugin_doBy = derive { name="RcmdrPlugin.doBy"; version="0.1-3"; sha256="0nza4y8px90fbhqs9wyjy9302cjavvk72kr1553ljcyh16hjwmmr"; depends=[Rcmdr doBy]; };
+  RcmdrPlugin_DoE = derive { name="RcmdrPlugin.DoE"; version="0.12-2"; sha256="19axgapk8scqi1ky3r3m2dn942z1q6licsaym6ky7a6lygs52k4z"; depends=[DoE_base FrF2 DoE_wrapper relimp Rcmdr]; };
+  RcmdrPlugin_doex = derive { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[Rcmdr multcomp]; };
+  RcmdrPlugin_EACSPIR = derive { name="RcmdrPlugin.EACSPIR"; version="0.2-1"; sha256="0fn12acbjh0n402hn9whhhyij3jlwmvlawyfi9myimnb4wyaqgwb"; depends=[R2HTML abind ez nortest reshape Rcmdr]; };
+  RcmdrPlugin_EBM = derive { name="RcmdrPlugin.EBM"; version="1.0-3"; sha256="189q5k7lr9laq4s10hhjnd4mfdrdjqxf7sn2q1gq9nfglcpkwql6"; depends=[Rcmdr epiR abind]; };
+  RcmdrPlugin_epack = derive { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[Rcmdr TeachingDemos tseries abind MASS xts forecast]; };
+  RcmdrPlugin_EZR = derive { name="RcmdrPlugin.EZR"; version="1.24"; sha256="1zcpj1xcbmcyrbsr0gsndm5p6qls57zrkjcidk8y27pyd6gim2zj"; depends=[Rcmdr]; };
+  RcmdrPlugin_HH = derive { name="RcmdrPlugin.HH"; version="1.1-40"; sha256="0i85bbzy46jk8568d7mx1fwq9zk51iq1jjwr2mnik4zh6914f9h5"; depends=[HH lattice latticeExtra rgl Rcmdr multcomp leaps]; };
+  RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.1-8"; sha256="1xgirbwcc2jz16da9fw553phxd2i4ky5jqzspdccj1i7fd4l625m"; depends=[Rcmdr]; };
+  RcmdrPlugin_KMggplot2 = derive { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
+  RcmdrPlugin_lfstat = derive { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; };
+  RcmdrPlugin_MA = derive { name="RcmdrPlugin.MA"; version="0.0-1"; sha256="1l4nvwa0gq83ndkc190l7lba76d9gnf52k4p1z5jfpc9p9s6c20k"; depends=[MAd metafor Rcmdr]; };
+  RcmdrPlugin_mosaic = derive { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc vcd Hmisc Rcmdr]; };
+  RcmdrPlugin_MPAStats = derive { name="RcmdrPlugin.MPAStats"; version="1.1.4"; sha256="1ir0qh4gqa4zwhqvikak38gsxm0l4r63i0szvv6vgifmpj6sx008"; depends=[Rcmdr ordinal]; };
+  RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.7.1"; sha256="1lvq7qmxjk5n78yjr5dj7dkv9d7kc8qzyrcapsxq8pydvva2223d"; depends=[mixlm MASS pls Rcmdr]; };
+  RcmdrPlugin_orloca = derive { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; };
+  RcmdrPlugin_plotByGroup = derive { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[Rcmdr lattice]; };
+  RcmdrPlugin_pointG = derive { name="RcmdrPlugin.pointG"; version="0.6.6"; sha256="0sc3akbpdys353va05b40g3rq8qihw0pmhvv0kckkhsgrbr8mc07"; depends=[Rcmdr RColorBrewer]; };
+  RcmdrPlugin_qual = derive { name="RcmdrPlugin.qual"; version="2.2.6"; sha256="00wznh0k909cd9vwdj1ag3224xkqnwjsad1bfkgxbszsx0w6xvy9"; depends=[Rcmdr]; };
+  RcmdrPlugin_sampling = derive { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve sampling MASS Rcmdr]; };
+  RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.0"; sha256="0z43hhp798kga70xmiq4wzp5iad553rndn17g3va3dh6lz1k3y3h"; depends=[SCVA SCRT SCMA Rcmdr]; };
+  RcmdrPlugin_seeg = derive { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg spatstat sgeostat]; };
+  RcmdrPlugin_SLC = derive { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[SLC Rcmdr]; };
+  RcmdrPlugin_SM = derive { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[Rcmdr car RColorBrewer colorspace vcd]; };
+  RcmdrPlugin_sos = derive { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[sos Rcmdr tcltk2]; };
+  RcmdrPlugin_StatisticalURV = derive { name="RcmdrPlugin.StatisticalURV"; version="1.0-1"; sha256="04pqqgy12rnhwm8l0752hb9p5h4l11mm7flm6n9kkcvbkvagsbrz"; depends=[agricolae multcomp car Rcmdr]; };
+  RcmdrPlugin_survival = derive { name="RcmdrPlugin.survival"; version="1.0-4"; sha256="03rgr9klf2d1ml8i2avf9lncjr3bfcb4v7mcwg800wwdjzkwqkql"; depends=[survival date Rcmdr]; };
+  RcmdrPlugin_TeachingDemos = derive { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[rgl TeachingDemos Rcmdr]; };
+  RcmdrPlugin_temis = derive { name="RcmdrPlugin.temis"; version="0.6.2"; sha256="08ahxx2gw5bp647wh53vsq54l4p4sbyac3xv24gfq2gyqh6ad9qm"; depends=[tm slam zoo lattice Rcmdr ca R2HTML RColorBrewer latticeExtra]; };
+  RcmdrPlugin_UCA = derive { name="RcmdrPlugin.UCA"; version="1.0-2"; sha256="11a8jaz5vycq8hnpxzrbv1g8vyh0ic1y48952ah633b2j1m1ay8i"; depends=[Rcmdr]; };
+  Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcccw1j8p4by5nxy7s52ahvdq2ag183hk91gjq4"; depends=[httr]; };
+  RColorBrewer = derive { name="RColorBrewer"; version="1.0-5"; sha256="0y4ficfdjzrd7lkcaafjrdqr5r3jiha7rvg76h8m5yak396c9has"; depends=[]; };
+  Rcplex = derive { name="Rcplex"; version="0.3-1"; sha256="1z0kjrd6m8sas9vllwv3dvmc1f8ix5b4j45jp8qparzcqfkjj9yk"; depends=[slam]; };
+  RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; };
+  Rcpp = derive { name="Rcpp"; version="0.11.1"; sha256="1ccsvdij6yym9dziqsjf5gr37968imz8i81334vi2fc69z5xzf30"; depends=[]; };
+  Rcpp11 = derive { name="Rcpp11"; version="3.1.0.1"; sha256="17ymlnpyq2pdc9jbd31hzdrc69rp7ccj4kg6k793chq322y12bfx"; depends=[]; };
+  RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.200.0"; sha256="1bqicsxqcs66slphzqx55mf6dg1b65vnpmq1qql0q0fs8g9g3cyk"; depends=[Rcpp]; };
+  RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp]; };
+  rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp]; };
+  RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; depends=[Rcpp]; };
+  RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
+  RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp]; };
+  RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
+  RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.1"; sha256="099hrj4r2dh0yfn63lazmqcja1gwxqzy1zlsfia31kkaw6i82g5l"; depends=[Matrix Rcpp]; };
+  RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
+  RcppGSL = derive { name="RcppGSL"; version="0.2.0"; sha256="0qdm5igjrifw8a0m36k9xrbnaj11j18236a1gvdz689vy6a4hfqz"; depends=[Rcpp]; };
+  RcppOctave = derive { name="RcppOctave"; version="0.14.1"; sha256="0fdljr0jdnardcm2qm29ibz16xymal8xac3p4grscipa44vm1w0b"; depends=[Rcpp pkgmaker digest stringr]; };
+  RcppProgress = derive { name="RcppProgress"; version="0.1"; sha256="1gvj51gadljaakm1nxdwgxzh723vv3ypzpzsgacsppxpj4rivxq4"; depends=[Rcpp]; };
+  RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo]; };
+  RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
+  RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
+  RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp]; };
+  rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
+  Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
+  rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
+  RCurl = derive { name="RCurl"; version="1.95-4.1"; sha256="1bphxniirak797rb2hjnv83i1sskdzcf3bl15lym171f79kx80w3"; depends=[bitops]; };
+  Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
+  rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
+  rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };
+  rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; };
+  rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
+  R_devices = derive { name="R.devices"; version="2.8.2"; sha256="0qnprgdihp1nzpbqzwg1l5snqyd7hzx49k8sbcl55jhcssdi3rym"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
+  RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
+  RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
+  Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; };
+  rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
+  Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
+  Rdrools = derive { name="Rdrools"; version="0.0.2"; sha256="0iwik7nx07vvn9im0p1lz7y7602jccrrwkgaab2qrlmfmh9cf3pm"; depends=[rJava Rdroolsjars rJava Rdroolsjars]; };
+  Rdroolsjars = derive { name="Rdroolsjars"; version="0.0.1"; sha256="108smksx7bm3dzyznv4h6vjgfh938wci787az0z0ba6mjm3za74c"; depends=[rJava rJava]; };
+  rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
+  RDS = derive { name="RDS"; version="0.5"; sha256="1lr59lwblv7rr6s8bgzsyh45fa1qkid2njx1chzm5y5ddn8cwlqa"; depends=[ggplot2 gridExtra igraph scales reshape2]; };
+  Rdsm = derive { name="Rdsm"; version="2.0.2"; sha256="1wzfc72zjvqdffkyp19zflab88r9yb3qrd0d96k8453dgmz8aygp"; depends=[bigmemory]; };
+  RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
+  rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
+  rdyncall = derive { name="rdyncall"; version="0.7.5"; sha256="0w7dwjswf8dx2w1piyrqr1wixmmlkgzlfwnnxvbiy2mfy1lwd04r"; depends=[]; };
+  ReacTran = derive { name="ReacTran"; version="1.4.1"; sha256="01k3w6iffql198na968dmqgzsqgd1kwrjb34yw7mzppyisjcyv0k"; depends=[rootSolve deSolve shape]; };
+  readbitmap = derive { name="readbitmap"; version="0.1-2"; sha256="11cha65hl5r8h143pnf54mxa0lpqphzi9l0n4bg24bjpdz15cppi"; depends=[bmp jpeg png]; };
+  readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.7"; sha256="0ajahma356aicl0jpwpdynf35yrh74z8zwjhav4h7v57zlvwhh1f"; depends=[]; };
+  reader = derive { name="reader"; version="1.0.1"; sha256="1320kmysri660p54l86n260nrxskpfrwn4zbbwvp7w9fcqa09zyn"; depends=[NCmisc]; };
+  readMLData = derive { name="readMLData"; version="0.9-6"; sha256="15rb8hm60fc30xgxjwxl7v5blzf02s6cb8pk0p26cgn9liiavjhb"; depends=[XML]; };
+  readMzXmlData = derive { name="readMzXmlData"; version="2.7"; sha256="1c4q2ghp7mr1i3547vdq3mhvhqz0y2il5za5milrwb72wpq1cdfi"; depends=[base64enc digest XML]; };
+  reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
+  Rearrangement = derive { name="Rearrangement"; version="1.0"; sha256="0biyg2m0ip2x4fwfw7c1ynidzb5cvdlr0gycx90w319jlz3rxqz0"; depends=[quantreg]; };
+  REBayes = derive { name="REBayes"; version="0.40"; sha256="0pvwxw3f1mn6ky3gxxvrvl37mqmhxbjxplxwa5v2y53vrw8p2sdk"; depends=[Rmosek Matrix SparseM]; };
+  rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; };
+  rebmix = derive { name="rebmix"; version="2.5.1"; sha256="1g1kjh48ssj2wvch8m0cgr10bd9wh1mmi1zf52pyrgsf7w75r985"; depends=[]; };
+  reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
+  ReCiPa = derive { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; };
+  recluster = derive { name="recluster"; version="2.5"; sha256="1hyq3nxbkah9jmly9a7ykzrf72r8yyd5ra5hf6d8fcprg15h8gg2"; depends=[vegan ape picante phangorn phytools cluster]; };
+  recommenderlab = derive { name="recommenderlab"; version="0.1-4"; sha256="0ays9y3l7nj4vcbdraqv627lv0vf3wiqfszcqrh74h8jz9nnx78d"; depends=[Matrix registry arules proxy]; };
+  recommenderlabBX = derive { name="recommenderlabBX"; version="0.1-0"; sha256="0dl79cxarsfp8l4nxnns05jwnjygigjhwpjrr4lzx4nvsfxmgsr2"; depends=[recommenderlab]; };
+  recommenderlabJester = derive { name="recommenderlabJester"; version="0.1-0"; sha256="1m5jg8gs16cwwwcnjzqkyzwyip8fshrwhmqz8g7nlf6g3p9347rl"; depends=[recommenderlab]; };
+  RecordLinkage = derive { name="RecordLinkage"; version="0.4-1"; sha256="0q5wb8p4w3xc6p9z8vdv1vdq4rnq69vi37b1m2cqsp2n9mmg1wfb"; depends=[e1071 rpart ada ipred evd RSQLite data_table ff ffbase]; };
+  Records = derive { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
+  RECSO = derive { name="RECSO"; version="1.0"; sha256="1ipjfxk58wkrq6a0nqrg9b734xj1qa8xnr44xigbpjrpdqd5j3lm"; depends=[]; };
+  REdaS = derive { name="REdaS"; version="0.9.0"; sha256="0xs27ryiy1rvj23w2p9ms87knq5hz4sqmxm0lqikbap3knm2n7zb"; depends=[]; };
+  REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
+  ref = derive { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
+  referenceIntervals = derive { name="referenceIntervals"; version="1.0"; sha256="0s0wxnykzp4ysg3x9jhyvpwv0wnldggs44aiqi1rm7774vgnla9h"; depends=[boot extremevalues]; };
+  RefFreeEWAS = derive { name="RefFreeEWAS"; version="1.2"; sha256="1xa75nigk683084f4c43v1gvlgpdhzw58ij1rs78m45y5hbsmagn"; depends=[isva]; };
+  refGenome = derive { name="refGenome"; version="1.2.0"; sha256="038v9pwh8fra31l14bwb2kyilmc9kqbvb9s1c0d79yxkx6znjc49"; depends=[RSQLite doBy]; };
+  RefManageR = derive { name="RefManageR"; version="0.8.1"; sha256="0rih1g7kw7c5cg37qh704wwniyi6ralrr2pqg8qwalq3pxc3y1qz"; depends=[XML RCurl RJSONIO plyr bibtex lubridate stringr]; };
+  refund = derive { name="refund"; version="0.1-9"; sha256="0yrjw2s1z8qa2zzasbiklvzs34zrhkj7iygi7bnp617fwvfj7jqs"; depends=[lattice boot mgcv fda MASS glmnet magic nlme wavethresh Matrix gamm4 matrixStats lme4 RLRsim]; };
+  RegClust = derive { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
+  REGENT = derive { name="REGENT"; version="1.0.5"; sha256="1id1bkrr0q1nwja8y7glb5wsq1hkx6gf1d09vbmfl62hslqblqn8"; depends=[]; };
+  registry = derive { name="registry"; version="0.2"; sha256="1ifv9sql70kylfj12cdb1j1zpk3ix728m8qj46sf1zyc5mhll01s"; depends=[]; };
+  reglogit = derive { name="reglogit"; version="1.2-2"; sha256="0nq60s8l860z6nd52l6c77vamis7hl2j667gkxry0jir2pxsk4jp"; depends=[mvtnorm boot Matrix]; };
+  regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7wksyng2g71mz2z9nb2zqdak794l1n44"; depends=[denpro]; };
+  regress = derive { name="regress"; version="1.3-10"; sha256="1vfy8ynxcpans2xw74iax5gxfdj9ql41cbcp2rcp1q0zq099hhh1"; depends=[]; };
+  regRSM = derive { name="regRSM"; version="0.4"; sha256="1rg74jqj8rw69q6my0n4alflx7mgfwng35ff72bxwjhn9ghhj347"; depends=[]; };
+  regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
+  regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
+  rehh = derive { name="rehh"; version="1.11"; sha256="1fvcwi9ijj886aswphblkxzgivmk76gr1m3s6zqblcbybxypm5cg"; depends=[gplots]; };
+  rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
+  relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
+  relations = derive { name="relations"; version="0.6-3"; sha256="1hw6g297h2az5f97q2rr3f6mb9d681wrgl9p8f2q1z3ww39b5vgw"; depends=[cluster slam sets]; };
+  RelativeRisk = derive { name="RelativeRisk"; version="1.1-1"; sha256="0ag7mdkrzixf334jfrkhkdzhsh90zzx013yih0fw3fywmy5h7lfk"; depends=[]; };
+  relax = derive { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
+  relaxnet = derive { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
+  relaxo = derive { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
+  reldist = derive { name="reldist"; version="1.6-2"; sha256="0f5l74jmk8jxi43jyjxjv9cklk8359drjkjipz7972dm3a7i4rmw"; depends=[]; };
+  relevent = derive { name="relevent"; version="1.0-3"; sha256="054x4kmc0h0s6a4svjqawy52sllzmaca46q6abnr5qhdzzmfh21n"; depends=[trust sna]; };
+  Reliability = derive { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
+  ReliabilityTheory = derive { name="ReliabilityTheory"; version="0.1.1"; sha256="0sfwax1qhjrwc5cy2yiycpppkzgs36wils23x3k6hjpzi3ybspn1"; depends=[igraph sfsmisc combinat FRACTION mcmc PhaseType actuar HI]; };
+  reliaR = derive { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
+  relimp = derive { name="relimp"; version="1.0-3"; sha256="1isn2ns3qiz985wrg7992dmmqxwdq75a9yhfqnb64xhnzzpcpszq"; depends=[]; };
+  relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; };
+  relsurv = derive { name="relsurv"; version="2.0-4"; sha256="1da3sj7hks5azm18m23fh8r2g02p0nivgilayndxwwvd1i70ycrx"; depends=[survival date MASS]; };
+  remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
+  rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; };
+  remMap = derive { name="remMap"; version="0.1-0"; sha256="03jbrnk8nbaj6l8g428il5h6p2sszndd2bl4rvg8347pw7cp4kk1"; depends=[]; };
+  Renext = derive { name="Renext"; version="2.1-0"; sha256="19920kb3qd97vm285zbxqarpq8dyyrx1k6sks990xjbgpy7vyj3y"; depends=[evd numDeriv]; };
+  RenextGUI = derive { name="RenextGUI"; version="1.0-2"; sha256="0ghs8bwb6qdyvhghxvdy51cibylgm7bdbzgqsn1nbxam39yhvfv9"; depends=[gWidgets gWidgetstcltk Renext]; };
+  rentrez = derive { name="rentrez"; version="0.2.3"; sha256="0z25wbsf435izmhrsrrjc5dhx583x0ayhmp3398jqd3k9y0i7saz"; depends=[RCurl XML]; };
+  Reol = derive { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[XML RCurl ape]; };
+  Reot = derive { name="Reot"; version="0.1.0"; sha256="0kpp5mg7dpfas77mw95ryfknjvdx7vwah42dip1kgyy7sxqqhn3h"; depends=[Rcpp raster foreach]; };
+  RepeatedHighDim = derive { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
+  repfdr = derive { name="repfdr"; version="1.0"; sha256="1rscfbnq739al5pac1y9szjw2g6f9z6qimkvhrkn9xfchjw3jvky"; depends=[locfdr]; };
+  repmis = derive { name="repmis"; version="0.2.8"; sha256="0g3k886x14hb0vih3rwv1rm1fjblsb21i7ixghj5c36h2a6d9a6q"; depends=[digest httr plyr R_cache]; };
+  repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
+  ReporteRs = derive { name="ReporteRs"; version="0.5.2"; sha256="0jigylskv8k7610qpwchf60bf50bcxpdziw8dpqmff41q24wwj1h"; depends=[ReporteRsjars rJava base64 highlight]; };
+  ReporteRsjars = derive { name="ReporteRsjars"; version="0.0.1"; sha256="0y2kzlyw2yf65jvawrvwwqhwwp0yw3ssx8y4jwkcyqn66b6gzh8j"; depends=[rJava]; };
+  reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
+  reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
+  reports = derive { name="reports"; version="0.1.2"; sha256="14w9dlhvk4080sq03ad3dhcww7c213f8ygbnxm7kxcpk36j71yjn"; depends=[knitr knitcitations]; };
+  reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f860z063j3pbm2c5qcaz45g73khj9rdp3if0cci8ikj"; depends=[xtable]; };
+  REPPlab = derive { name="REPPlab"; version="0.2"; sha256="1d3mb4mi17xlvyw9dgrcad6gfnyk0v1s0safxqyarm4xmh1bppzw"; depends=[rJava lattice]; };
+  represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
+  REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
+  resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; };
+  resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp]; };
+  reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
+  reshape2 = derive { name="reshape2"; version="1.4"; sha256="0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp"; depends=[plyr stringr Rcpp]; };
+  reshapeGUI = derive { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[reshape2 plyr gWidgets gWidgetsRGtk2]; };
+  ResistorArray = derive { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
+  ResourceSelection = derive { name="ResourceSelection"; version="0.2-3"; sha256="0mhm8klc9bgf443gmx7zrc3vlclsygmb2al6glp2yd2awzfnn27a"; depends=[]; };
+  restlos = derive { name="restlos"; version="0.1-2"; sha256="14nbi8xqjs9plkzamg0ja1mx7klpbnnglk7p2nipz551b0nmzn7i"; depends=[som rgl ade4 geometry nnclust]; };
+  restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
+  retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
+  reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
+  review = derive { name="review"; version="2.5"; sha256="0qk4n6g0hp49rjqhpipgja777namdafk6yf4kcxdld1cghdikw31"; depends=[XML Hmisc]; };
+  reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
+  rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp]; };
+  Rfacebook = derive { name="Rfacebook"; version="0.4"; sha256="0f5wbd16a7wsw1fpficz6i2vrwyw3n75a1qm4dv5181jr6ik492p"; depends=[httr rjson]; };
+  rFerns = derive { name="rFerns"; version="0.3.3"; sha256="0d0zkqqqv9l71a5bjps1m69mrpqxkzs77zlf6kbg70b053dzhiph"; depends=[]; };
+  RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
+  rfigshare = derive { name="rfigshare"; version="0.3-1"; sha256="10vjw3r4jwbbk3z9cm83k3hkg9vr6kh41d9h7cbxdw7v6d2mlc7f"; depends=[RJSONIO httr plyr yaml ggplot2 XML]; };
+  R_filesets = derive { name="R.filesets"; version="2.4.0"; sha256="1970x41g7wxspslfijmx021z06s3lfw5wz0mr8h5bk1y8sj0gsvk"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
+  RFinanceYJ = derive { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; };
+  rfishbase = derive { name="rfishbase"; version="0.2-2"; sha256="09pa5zpw9rclf5pqj1wjjhdcblca9sm9xcs9ka3xfa7azj7n9ljd"; depends=[XML RCurl]; };
+  rfisheries = derive { name="rfisheries"; version="0.1"; sha256="1g0h3icj7cikfkh76yff84hil23rfshlnnqmgvnfbhykyr2zmk61"; depends=[httr data_table assertthat ggplot2 rjson]; };
+  Rfit = derive { name="Rfit"; version="0.17"; sha256="1gl7hf5qdk0s9pb2wwzwyn81wyw7vk2d892ppnaf3c076b7gfvjh"; depends=[quantreg]; };
+  RFLPtools = derive { name="RFLPtools"; version="1.5"; sha256="0j3cdjibmdhg1qsmbpw7zbw9jz6gy662z28849xsr7gppzm08xbw"; depends=[RColorBrewer]; };
+  RfmriVC = derive { name="RfmriVC"; version="1.0.4"; sha256="15bzpwi01gb580wl0flvp7pwqf1sgk6fsdmfq4cqaprb979js79f"; depends=[mvtnorm mgcv Rniftilib]; };
+  RFOC = derive { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[RPMG GEOmap RSEIS MASS splancs]; };
+  RForcecom = derive { name="RForcecom"; version="0.7"; sha256="0rjav2rwanzqgi1yasbm9lj18f0mfxwd8w8x41skf656gfcpi0i4"; depends=[XML RCurl plyr]; };
+  rforensicbatwing = derive { name="rforensicbatwing"; version="1.1"; sha256="0nfqjnnky8gc4i9sfnnkxhc1n82hcbl9k68d8x8pclk57mbsqggi"; depends=[Rcpp]; };
+  rfPermute = derive { name="rfPermute"; version="1.5.2"; sha256="0pgi603c9izlhvadjw32sf4z449fnd4lbdszn3x24cvzpy4p94wg"; depends=[randomForest ggplot2 gridExtra]; };
+  RFreak = derive { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
+  rgabriel = derive { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
+  rgam = derive { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp]; };
+  rGammaGamma = derive { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
+  rgauges = derive { name="rgauges"; version="0.2.0"; sha256="0p42hh32wcjcchsalpsan52kvz6nd1gw28xnydqgfzkzcqkl22dd"; depends=[ggplot2 lubridate plyr httr reshape2 gridExtra scales data_table]; };
+  rgbif = derive { name="rgbif"; version="0.6.2"; sha256="1833f7zks2sbsavpzn0b1npyhxx07486ns3d28g2id9q4yhz5zan"; depends=[XML RCurl plyr ggplot2 maps httr maptools rgdal rgeos RJSONIO data_table stringr assertthat]; };
+  Rgbp = derive { name="Rgbp"; version="1.0.6"; sha256="1j4j7g9z7p592f82k0yvibrydynkd9v1ldil2vf3ikc650bn2l02"; depends=[sn]; };
+  RGCCA = derive { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
+  rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
+  rgdal = derive { name="rgdal"; version="0.8-16"; sha256="17qk7kd0l0l52nyf6drr0gv4b0ibkggyn6g3ky9flsjy05b3wg8j"; depends=[sp]; };
+  RGENERATE = derive { name="RGENERATE"; version="1.0"; sha256="17i9d4imv9fb2g2hvm2k35rhywym923niqy9fq4i88rfahn1c3j0"; depends=[RMAWGEN]; };
+  RGenetics = derive { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
+  rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
+  rgeos = derive { name="rgeos"; version="0.3-4"; sha256="13r09ihjlwg6scg0by79b73zcqac59x654azms1m80pg0gs30lsr"; depends=[sp]; };
+  rgexf = derive { name="rgexf"; version="0.14.3.11"; sha256="16mil1csyzkaywcdrjzz5r60n4xhhinxawg30skc7d9awkf26qfa"; depends=[XML Rook igraph]; };
+  rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
+  RGIFT = derive { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
+  rgl = derive { name="rgl"; version="0.93.996"; sha256="1p0yx1iwfqcppb5ndwg97wki8jcj370afrpp33bk9fdl6nqvhlhc"; depends=[]; };
+  Rglpk = derive { name="Rglpk"; version="0.5-2"; sha256="1wvg5gv9qjkj22sn1y2ipizs89537n5wd8m0mh4y3w5g4n6rr02j"; depends=[slam]; };
+  Rgnuplot = derive { name="Rgnuplot"; version="1.0.1"; sha256="1yag6ip2ppclhnpfc3mn6bsaylv2lk2k3jr8wgrgzrb7z22p7dk8"; depends=[]; };
+  RgoogleMaps = derive { name="RgoogleMaps"; version="1.2.0.6"; sha256="1kd77617j2dz3dqjskv71vj8xv0yjgcysrpw7a615s0ys2hs91wp"; depends=[png RJSONIO]; };
+  rgp = derive { name="rgp"; version="0.4-0"; sha256="0qm1vwx06076i5xywkxdi5c7i58rv94xkkl1dxsb3dg1syssv422"; depends=[emoa]; };
+  rgpui = derive { name="rgpui"; version="0.1-1"; sha256="0hp1z00n6jzi45j61hlp5qj26wpjvbzjz3nvpxvmcjdmkk3vjfyp"; depends=[rgp shiny emoa]; };
+  rgr = derive { name="rgr"; version="1.1.9"; sha256="1fs8f0g1wm6virwjzlgabp1i89n8jpdiwnkvk5w1lggs36xc8q59"; depends=[MASS fastICA]; };
+  RGraphics = derive { name="RGraphics"; version="2.0-7"; sha256="0xf67gqfz41zp3474rq4v64nsyzxc001yzlgq754ps25c4w525nc"; depends=[lattice ggplot2]; };
+  rgrs = derive { name="rgrs"; version="0.3"; sha256="19whlp3i0jps4pdif03h6z79zliw4shiqh7ackhk2gwq5c28jsql"; depends=[questionr]; };
+  RGtk2 = derive { name="RGtk2"; version="2.20.27"; sha256="12ks3j1q8qzp4k4gyn34zzy5ac3rbdimagrkxb46qb4s3hn4x3b5"; depends=[]; };
+  RGtk2Extras = derive { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
+  RH2 = derive { name="RH2"; version="0.1-2.12"; sha256="1ig9yxpaza7lm0b20sp7jr024hp284c0zs3k06k3k1vw1dyw60fj"; depends=[chron RJDBC]; };
+  rHealthDataGov = derive { name="rHealthDataGov"; version="1.0.0"; sha256="15qk52bf389hlv9aihwc8398s989gw0r48909g45ipdhxala4a8a"; depends=[bit64 httr jsonlite]; };
+  Rhh = derive { name="Rhh"; version="1.0.2"; sha256="0blxim8yrb0qnbkc1z2q24q6ryakggq2zhaa223swla99ahmsny3"; depends=[]; };
+  RHive = derive { name="RHive"; version="2.0-0.0"; sha256="0r49irdwigxxqniidx7i3j7si8bw7zklw3n4zvhcmzfkvx0al91n"; depends=[rJava]; };
+  RHmm = derive { name="RHmm"; version="2.0.3"; sha256="1mnsqkg419d1z0kyxpjj9md3aammvw0xfrd7dwymii2ql050v47b"; depends=[MASS nlme]; };
+  rhosp = derive { name="rhosp"; version="1.05"; sha256="1d1a4dc8hgvjmfb21s7j19yadbi1a9qp06prd80izbhvj2hni573"; depends=[]; };
+  Rhpc = derive { name="Rhpc"; version="0.14-78"; sha256="136xld0k99nlgmg6p5dcr882f2r11b0bahh57swwcfi9nfqw3zaz"; depends=[]; };
+  RhpcBLASctl = derive { name="RhpcBLASctl"; version="0.14-72"; sha256="0417d8lvwhnfniq41wlcl642z01nv3mhzj9fyb5hlg5vafqpmp8n"; depends=[]; };
+  rHpcc = derive { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
+  RHRV = derive { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[tkrplot waveslim nonlinearTseries]; };
+  RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
+  R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; };
+  ri = derive { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
+  rich = derive { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot vegan permute]; };
+  ridge = derive { name="ridge"; version="2.1-3"; sha256="0pdmybygf730dw73a5ncl9fw3kjnnpqqkanqxi97aj9n4cfcjn7z"; depends=[]; };
+  RidgeFusion = derive { name="RidgeFusion"; version="1.0-2"; sha256="1izhq9vqj9kca3ddk91f5h8351qr3cnwig9i7d76rhlzawrl7ch9"; depends=[mvtnorm]; };
+  Ridit = derive { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
+  RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
+  RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; };
+  RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; };
+  RImpala = derive { name="RImpala"; version="0.1.2"; sha256="0gg71zw9silq4j6zhhqzj5qvxv12mm6s7bl5kjn1i7ds93ixbfxn"; depends=[rJava]; };
+  rinat = derive { name="rinat"; version="0.1.1"; sha256="148hi13ax8fl853k3chv63aq5l2a3k5m0midyii3l9nfzqrc5g8n"; depends=[httr plyr jsonlite ggplot2 maps]; };
+  rindex = derive { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
+  ringbuffer = derive { name="ringbuffer"; version="1.1"; sha256="1jj6zdvqlkc30bnxapg0sjl5ci5kq76611smqc4jc8adzhzwrh3f"; depends=[]; };
+  ringscale = derive { name="ringscale"; version="0.1.2"; sha256="1gnnapkvxmkfws8dw41gj9h3svy3h6mi4zv413aykg9vrmy7d3rp"; depends=[FITSio]; };
+  RInside = derive { name="RInside"; version="0.2.11"; sha256="09j4dpv30pp0q3h129ig15xxlp8yzxnk122iica4nv88niabjcaa"; depends=[Rcpp]; };
+  RInSp = derive { name="RInSp"; version="1.0"; sha256="154ibjx5xyibaw8hhdh4hw5rbmwp340bplvz1174n6svg2dpl542"; depends=[]; };
+  rio = derive { name="rio"; version="0.1.2"; sha256="0h80msbj1qcc9m4408qcckw238ydqdzzgr9frlmmc7qi4dyba4i4"; depends=[stringr foreign testthat]; };
+  rioja = derive { name="rioja"; version="0.8-5"; sha256="0x5384v523mmqj012c32nna6lznbj6pl1n4wdkx19r07liwjg5y4"; depends=[vegan]; };
+  risaac = derive { name="risaac"; version="0.1"; sha256="1ndqxlq4l48iiaghx897bhr7q56csbia7y1a98fic8hzfp03811r"; depends=[]; };
+  riskRegression = derive { name="riskRegression"; version="0.0.8"; sha256="0bjxwj4wrlcqkm1zf25p39h3jwf0f11zspzsk4b41axr3adlvmdw"; depends=[prodlim rms pec rms cmprsk survival]; };
+  risksetROC = derive { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[survival MASS]; };
+  RISmed = derive { name="RISmed"; version="2.1.2"; sha256="1hi22sf6g047m2bq9yh6bwvi1x8bjw12vslfp6iyrim0w2pk96m1"; depends=[]; };
+  Ritc = derive { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; };
+  rite = derive { name="rite"; version="0.3.1"; sha256="0z12jxbmis9l82y0l98gf8hyxfwasj5lpznkmi8kwvvya3jw5ypf"; depends=[tcltk2 RCurl]; };
+  RItools = derive { name="RItools"; version="0.1-11"; sha256="08fhyzxszfpsdf3mfk3damwzf2rz5x470jaxsr0fk48c5gps57bj"; depends=[lattice SparseM xtable]; };
+  riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; };
+  riverplot = derive { name="riverplot"; version="0.2"; sha256="160xy3q7a7qfabambhq0h3mrx8wbiv88xvcfzkya3fkq5nac22c5"; depends=[]; };
+  rivervis = derive { name="rivervis"; version="0.38.3"; sha256="1zyw9z66j5ylikxd955b2r9f3176j565is3z52xsx64gwdc1sd4a"; depends=[]; };
+  Rivivc = derive { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
+  RJaCGH = derive { name="RJaCGH"; version="2.0.2"; sha256="1fy8wsnv7diwg2w7j61scm6vd35a5jb36i9pzh5m7jz6yqsank50"; depends=[]; };
+  rjags = derive { name="rjags"; version="3-13"; sha256="0npfyphi8z25h7w4frplbyjgib1gawz7ib9gz5w6h2i0pricm53r"; depends=[coda]; };
+  rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq85a4nl522g714s1w1r153qcc0jz0"; depends=[]; };
+  rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
+  RJDBC = derive { name="RJDBC"; version="0.2-3"; sha256="189cps0lvk756pcjx1xcigkchvahzp074f8973nx36q5s52pry0q"; depends=[DBI rJava]; };
+  rje = derive { name="rje"; version="1.7"; sha256="0p94nbcy0v83k0xbmqzg907iy4hkyjlnjm5v8d5b6asxwp3775r4"; depends=[]; };
+  Rjms = derive { name="Rjms"; version="0.0.5"; sha256="0bb07wynvk07p8i5x87hlxfavjs5wf5gasfggyjxycr54sphlg6z"; depends=[rJava Rjmsjars rJava Rjmsjars]; };
+  Rjmsjars = derive { name="Rjmsjars"; version="0.0.1"; sha256="0xi42p1wgp7f15j3b74zisf0xrz86kgyn5anq3x5ahyb9cfrnmqx"; depends=[rJava rJava]; };
+  rJPSGCS = derive { name="rJPSGCS"; version="0.2-6"; sha256="1x6mwy6232kjl8ssvkbamhfvxsc3rqbjsrlrprj0bprssm3pcr2g"; depends=[rJava]; };
+  Rjpstatdb = derive { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
+  rjson = derive { name="rjson"; version="0.2.13"; sha256="0p04rlqn8y8ibk7r2f5q4hzapmqmphkf2hlsd1fjj8mj4ppr7kr4"; depends=[]; };
+  RJSONIO = derive { name="RJSONIO"; version="1.2-0.2"; sha256="1rg74ja9v6apwbk5fn8f91yfgz7ffdcs3fbcxbvqsjzqm7pcc7mq"; depends=[]; };
+  RJSONLD = derive { name="RJSONLD"; version="1.0.3"; sha256="17myzigzmn6hd0fbzm7h4n65aiighklrzfr3irg1520aa35s6214"; depends=[RJSONIO formula_tools stringr lmtest]; };
+  rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
+  RKEA = derive { name="RKEA"; version="0.0-3"; sha256="0srjb8n2q2hv246q2mg9fzki121rk56sgxc6qk35bszy80f8yr5j"; depends=[rJava tm]; };
+  rknn = derive { name="rknn"; version="1.2"; sha256="1c92cv3462f00p237fkh06hl66j912ssiav4hpc4jphvs01g30kz"; depends=[gmp]; };
+  Rknots = derive { name="Rknots"; version="1.2.1"; sha256="1qv7l4c3n3zyz2s5whl5chi5yfb1j67kihk1c8gpjl291axmmi8w"; depends=[rgl rSymPy]; };
+  rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4hhkmf4ln7xlp0zinmmhym9m"; depends=[]; };
+  Rlab = derive { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
+  Rlabkey = derive { name="Rlabkey"; version="2.1.123"; sha256="0jz8x3n6byxmb10jcrcyznyj3zwab3bkp2g52n707w2jv0xvn8l5"; depends=[RCurl rjson]; };
+  rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.3"; sha256="0f014z005nw0gr6h3k44v5446mqmvy6x90x1fis5rf0jviqhxwc3"; depends=[]; };
+  rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
+  rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
+  rlme = derive { name="rlme"; version="0.2"; sha256="1r92405mksiix3ngbjqxmbbxghacg1lwdmlv500k73aj336xs44i"; depends=[MASS quantreg nlme mgcv stringr magic]; };
+  RLRsim = derive { name="RLRsim"; version="2.1-3"; sha256="1cvvr33pgcdrmia1ixdbq9bnfbd9kwa70zwxkqgh68192bgaizv9"; depends=[mgcv]; };
+  RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
+  rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; };
+  RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
+  Rmalschains = derive { name="Rmalschains"; version="0.2-1"; sha256="1s48ryb3k4nakdb3r3qp6r6fykkx0hp57616jwr3256h9vlrar95"; depends=[Rcpp]; };
+  RMark = derive { name="RMark"; version="2.1.7"; sha256="1634ajwvqw523w1wpzcs3bci4c68325yi3zvzf53ha6dmk39c3jm"; depends=[snowfall matrixcalc msm coda]; };
+  rmatio = derive { name="rmatio"; version="0.9.0"; sha256="05dz0q3hjkfnblsnib5misxkn2fr891g0hsa2c4cxxqsgdzg6hbm"; depends=[Matrix lattice]; };
+  R_matlab = derive { name="R.matlab"; version="2.2.3"; sha256="1wzck1shsr62syyq61y3b1mq7r5pgfppprkwvlg110my9x7cgg85"; depends=[R_methodsS3 R_oo R_utils]; };
+  RMAWGEN = derive { name="RMAWGEN"; version="1.2.6.1"; sha256="1j8yb37sv2ycg3zgdj6hlxvlrsgvb9rh4yxd40bah2j1xgibr36z"; depends=[chron date vars]; };
+  RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
+  RMediation = derive { name="RMediation"; version="1.1.3"; sha256="07ck74dl1wwb88229fhkh2czlynddff7zvjyhisxk53qmdb0wvmw"; depends=[MASS lavaan e1071]; };
+  RMendeley = derive { name="RMendeley"; version="0.1-2"; sha256="10w8gqjm5qw79sfa22r27ykyg3j0sj7qfg478hwspkswans565wy"; depends=[RJSONIO RCurl]; };
+  RMessenger = derive { name="RMessenger"; version="0.1.4"; sha256="1y2zvd41rjd7khy4662zkkgy00lrk9kill57gnczrdgsyiwphivz"; depends=[Rcpp]; };
+  rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
+  rmetasim = derive { name="rmetasim"; version="2.0.1"; sha256="18ri1j0ydw1syq33ydjqfk1blyifvg5a36zqhjkgmimdkpa5g1nz"; depends=[ape ade4 gtools]; };
+  R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; };
+  rmgarch = derive { name="rmgarch"; version="1.2-6"; sha256="0fwmpadm1zlgdvja0b0ig9b971rzmicyvxi9i3gh2c49h8rg8s5j"; depends=[rugarch Rsolnp MASS Matrix zoo xts Bessel ff fftw shape pcaPP spd Rcpp]; };
+  rminer = derive { name="rminer"; version="1.3.1"; sha256="0rwjv5i4lr9611lyq55ps2yna7zzarakdnbj83xfs0kva63xn7fh"; depends=[nnet kknn kernlab rpart plotrix lattice]; };
+  Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
+  Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp]; };
+  rmmseg4j = derive { name="rmmseg4j"; version="0.2-0"; sha256="1icc6a04hbqszzrs7sqp120v44g33rqgz2x926jvxvcishadnd90"; depends=[rJava]; };
+  rmngb = derive { name="rmngb"; version="0.3-1"; sha256="04x4fr4zrg7ihx8v76w32g2iaxigmlcr2qbxyq17fq306b4g0m0c"; depends=[]; };
+  RMongo = derive { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
+  rmongodb = derive { name="rmongodb"; version="1.6.5"; sha256="0y7vj1ci5k19qdh7jznm4izsqj2v6hfjarxq31xdmymajwi171rs"; depends=[jsonlite plyr]; };
+  Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="1ki28357ijwzzxyb820lsf8l5x2i46shar0v71k15hvf9jn0h7zm"; depends=[Matrix]; };
+  rmp = derive { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
+  Rmpfr = derive { name="Rmpfr"; version="0.5-4"; sha256="08mh9gp0cfaiqqds2sl5d1qd687lfby4ag834r5splpjzsx0sxs4"; depends=[gmp]; };
+  Rmpi = derive { name="Rmpi"; version="0.6-3"; sha256="16i11bdys39dlfyc4my3dmhr0sw56pzaiz74v0kmlmpfamwdh7cd"; depends=[]; };
+  rms = derive { name="rms"; version="4.2-0"; sha256="1kxifrypn6a0v2rbzhn3lch821d5w9qzj9rzvrsgac4fwskis65j"; depends=[Hmisc survival SparseM]; };
+  rms_gof = derive { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
+  RMTstat = derive { name="RMTstat"; version="0.2"; sha256="1qp4msw8ikv6zr1j1ahxgwka7878v4av6zfqvj4j9w570v8afxvf"; depends=[]; };
+  RMySQL = derive { name="RMySQL"; version="0.9-3"; sha256="1kmsrphzrk7a6f3i0pmpxlpj7w7yb5s2psx72lfv4zyd0aji83n1"; depends=[DBI]; };
+  RnavGraph = derive { name="RnavGraph"; version="0.1.6"; sha256="15f4az5wcmg1fv1sl34523lwcqpz6dv63z6yvnhx8hdac5ry9biw"; depends=[]; };
+  RnavGraphImageData = derive { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
+  RNCBI = derive { name="RNCBI"; version="0.9.1"; sha256="1gvaizcm7ajblnxkqxvdalg5kws5kfa8186hw5rr7q3dc51gxm0i"; depends=[rJava XML RNCBIEUtilsLibs RNCBIAxis2Libs]; };
+  RNCBIAxis2Libs = derive { name="RNCBIAxis2Libs"; version="0.9"; sha256="0lrvpka3bj6x6sqbjqwg8wlfgcjqq53ks4b48afqfzvqg9z8jk4d"; depends=[rJava]; };
+  RNCBIEUtilsLibs = derive { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
+  RNCEP = derive { name="RNCEP"; version="1.0.6"; sha256="0z8fa7hgd6ss2yzpjn3d1ybqakgn76c7hp3h87ma0k03ilawxi09"; depends=[abind maps fields tgp fossil RColorBrewer]; };
+  RND = derive { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
+  rneos = derive { name="rneos"; version="0.2-7"; sha256="0vsifj6zfrdij1gjdp1dlh41cckwd04h41q30m7ard4pgyl9n7za"; depends=[RCurl XML]; };
+  RNetCDF = derive { name="RNetCDF"; version="1.6.1-2"; sha256="18cdknszrr3wm45vm7wrg32d1mybnfzaka9l45qm860yq13v84r3"; depends=[]; };
+  RNetLogo = derive { name="RNetLogo"; version="0.9-7"; sha256="0d7mw1wfid9qs18jr59qsnvw1l96wzbrjwhjz1yyjzdcg2xfs9gm"; depends=[rJava]; };
+  rngtools = derive { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[pkgmaker stringr digest]; };
+  rngWELL = derive { name="rngWELL"; version="0.10-2"; sha256="1wsmagsssia02b6358mixpfgza32s1656f7s5pbfjgimjf7xwv5i"; depends=[]; };
+  rngwell19937 = derive { name="rngwell19937"; version="0.5-4"; sha256="1c6p0v673n328sdynvv780911yqxk2ayimb93k1f1h3ci915pixy"; depends=[]; };
+  Rniftilib = derive { name="Rniftilib"; version="0.0-32"; sha256="1ck7ddhm759zha1iazg5razchq3gsfq3rzvfb8ichnl5l15z9ry2"; depends=[]; };
+  RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; };
+  rnoaa = derive { name="rnoaa"; version="0.1.0"; sha256="0fr7s1x40y6fg5cfy6276557gp5c79df304hlk9sr3gssd2fdkw8"; depends=[httr lubridate plyr ggplot2 scales rgdal maptools stringr XML data_table]; };
+  rNOMADS = derive { name="rNOMADS"; version="1.3.0"; sha256="1h9rj42nsjnxydqsapg57gy1a1n5gn7y7hkqxfif4pvf3i5wsmhf"; depends=[scrapeR stringr fields XML GEOmap MBA]; };
+  ROAuth = derive { name="ROAuth"; version="0.9.3"; sha256="13h0q7dx4xx7fngi3zfm92ws5x4c6cfa2svq7smmci7c0z4kirb2"; depends=[RCurl digest]; };
+  RobAStBase = derive { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[rrcov distr distrEx distrMod RandVar]; };
+  robCompositions = derive { name="robCompositions"; version="1.8.0"; sha256="19j9x14kganramig349n5680r86f9dc83iz1h6n3626bp9da1j33"; depends=[robustbase rrcov car MASS pls]; };
+  robcor = derive { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
+  robeth = derive { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
+  robfilter = derive { name="robfilter"; version="4.0"; sha256="1mj50531xjncg9lfidxzlyqrzwjm7pdsky88s3syspf70cjq6mg8"; depends=[robustbase MASS lattice]; };
+  RobLox = derive { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[distrMod RobAStBase lattice RColorBrewer RandVar distr]; };
+  RobLoxBioC = derive { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[RobLox lattice RColorBrewer distr]; };
+  RobPer = derive { name="RobPer"; version="1.0"; sha256="00x64c6a3qdrcsh25xjnc1sfvlcd1glsb63gbhg06n6s46mpcnyy"; depends=[robustbase quantreg BB rgenoud]; };
+  RobRex = derive { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
+  RobRSVD = derive { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
+  RObsDat = derive { name="RObsDat"; version="13.09-1"; sha256="0iacmxrs2gbv96932ckpy5agzn0fdxw3wi0svm16q7nrsklj8r21"; depends=[xts zoo DBI vwr e1071]; };
+  robumeta = derive { name="robumeta"; version="1.1"; sha256="1b1pms0jmyfw1hmw2gllhxica4sds427y92by3w99kf3472im3d5"; depends=[]; };
+  robust = derive { name="robust"; version="0.4-15"; sha256="0v2vass0d10jbj2fkw9gdh3gcr746dfk3mhgyj0v9qlvy0p1h8ba"; depends=[fit_models MASS lattice robustbase rrcov robustbase]; };
+  RobustAFT = derive { name="RobustAFT"; version="1.2"; sha256="156p5ic91f8qhc2g6zyrbipa58bvwq8xkpbbhnvx9kvrw8k62ibs"; depends=[robustbase survival]; };
+  robustbase = derive { name="robustbase"; version="0.91-1"; sha256="1sf6dx2xjhp8ydxgv9hajjp064plr88ykg7fbglcqbl8apx9pr9h"; depends=[DEoptimR]; };
+  robustfa = derive { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
+  robustgam = derive { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[Rcpp RcppArmadillo mgcv robustbase]; };
+  robustHD = derive { name="robustHD"; version="0.5.0"; sha256="14ql2k5880lbwkv1acydrli6jyh6dls32jjhimbz82zzkzfk2cxr"; depends=[ggplot2 perry robustbase MASS]; };
+  robustlmm = derive { name="robustlmm"; version="1.4-3"; sha256="09ylilxr7kc4j0j0vhzypbn9sxz2pv155kcrfa3dabd2s0i41iqn"; depends=[lme4 Matrix ggplot2 lattice nlme robustbase xtable]; };
+  robustloggamma = derive { name="robustloggamma"; version="0.4-28"; sha256="0wwa7i2qw0fd5fiy45h7qiw7526zyyxx379ll4ha2n593dwhybx3"; depends=[robustbase]; };
+  RobustRankAggreg = derive { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
+  robustreg = derive { name="robustreg"; version="0.1-3"; sha256="0llnd6yzg0kg3049pcfwjzz4hnd40w06w59kvnh01q47p4c75bkj"; depends=[]; };
+  robustX = derive { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
+  ROC632 = derive { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[survival penalized survivalROC]; };
+  rocc = derive { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
+  rockchalk = derive { name="rockchalk"; version="1.8.0"; sha256="17lmvdqk23jrhl8i3ygl7k49p7ckm3j5phvnxrivbnqysbz84pky"; depends=[MASS car]; };
+  RockFab = derive { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[rgl]; };
+  rococo = derive { name="rococo"; version="1.1.1"; sha256="1xmjfgkb2cg77zsi8lzrs67w1h2fsk0b2zhdb8cc31fh7rr1rrq0"; depends=[Rcpp]; };
+  rocplus = derive { name="rocplus"; version="1.0-0"; sha256="1abw9fly7kfraf2yw6nrlz92qljy2alzfcm876im4s9sm00h1vlj"; depends=[SuppDists]; };
+  ROCR = derive { name="ROCR"; version="1.0-5"; sha256="1zinan5hfvgg24imn0210m2lwqk5jxmmw8gz08l44j988lw8c2iw"; depends=[gplots]; };
+  ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; };
+  ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
+  RODBC = derive { name="RODBC"; version="1.3-10"; sha256="0zjvyg522xwd7957vg2gy6hb8bjagn5457250aqh8f1qnpp57c48"; depends=[]; };
+  RODM = derive { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
+  ROI = derive { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
+  ROI_plugin_glpk = derive { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[ROI Rglpk]; };
+  ROI_plugin_quadprog = derive { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
+  ROI_plugin_symphony = derive { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
+  R_oo = derive { name="R.oo"; version="1.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; };
+  Rook = derive { name="Rook"; version="1.0-9"; sha256="013d95f2ddp0yngw7fs267k5lyksffqz61g7ngrx5faddbd6y0ym"; depends=[brew]; };
+  rootSolve = derive { name="rootSolve"; version="1.6.5"; sha256="0xr6krw9f9cjc38894x4c172vhxdpy3sp6f8sc25mwvmjwidcwrn"; depends=[]; };
+  ROptEst = derive { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
+  ROptEstOld = derive { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx RandVar evd]; };
+  ROptRegTS = derive { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[ROptEstOld RandVar distr distrEx]; };
+  ror = derive { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[rJava ROI ROI_plugin_glpk igraph]; };
+  ROracle = derive { name="ROracle"; version="1.1-11"; sha256="0q0sk5xl96s0d9c8jkd9rng0h03vyg98h7yq8x87r279pp1cp5y0"; depends=[DBI]; };
+  rorutadis = derive { name="rorutadis"; version="0.1.1"; sha256="1szv0v8dzyzhksc6ks01a5x2qg20vn180nywiih8whi4z2rq81by"; depends=[Rglpk ggplot2 gridExtra]; };
+  ROSE = derive { name="ROSE"; version="0.0-2"; sha256="0a7dx6hllrgynfvmp8jcvamr9q70dl0a79jgd4x42ga7alsi1i66"; depends=[]; };
+  rotations = derive { name="rotations"; version="1.2"; sha256="13z5ysjqz3qkiw4nrp9dgy55kbmff5j7m3hfp2h0sj8x1saglf66"; depends=[ggplot2 Rcpp]; };
+  Rothermel = derive { name="Rothermel"; version="1.1"; sha256="1bfmqw2f0dd4dlvd1v8wr2iq5cd0a48cyrakxl1hy5461gkxvxls"; depends=[GA ftsa]; };
+  RoughSets = derive { name="RoughSets"; version="1.0-0"; sha256="1mm1if706phyy48jl9q93ddp8x347i4pxgl2zshk6ijxjdlzryb5"; depends=[]; };
+  roxygen = derive { name="roxygen"; version="0.1-3"; sha256="0w2n4p4skwqr0yw49l06fxmncsplfj2q4gapdbc9wpm9w1g267fw"; depends=[digest gsubfn]; };
+  roxygen2 = derive { name="roxygen2"; version="4.0.0"; sha256="0y5jmryr7cvk0rafaqrmrxiid90nlm1na9qhm1c8b3g8d32557rb"; depends=[stringr brew digest Rcpp]; };
+  royston = derive { name="royston"; version="1.0"; sha256="1hhb1v1aqvvlzirxiyhv6zahz82w2pq4d6yp3rcakq0sw7dhawn6"; depends=[nortest moments]; };
+  rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
+  rpart = derive { name="rpart"; version="4.1-8"; sha256="1vhmwvb7hsh75lvmsjmkab2zl136irca1dhr6p57s1yhmpw4cys0"; depends=[]; };
+  rpartitions = derive { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
+  rpart_plot = derive { name="rpart.plot"; version="1.4-4"; sha256="0m7qngc9117yq69jj106svihy6s3f1byqg9qdls0bimj24insyxf"; depends=[rpart]; };
+  rpartScore = derive { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
+  RPCLR = derive { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
+  Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
+  rpf = derive { name="rpf"; version="0.28"; sha256="1qwxhbpkzxn602bgcwgmlv3805dkgqw6c4ylvkqvifihpym2g863"; depends=[mvtnorm]; };
+  rphast = derive { name="rphast"; version="1.5"; sha256="0r6bk0lbqpv60byhiv847ij5bxrflrs0nsla1zrn8ww7371czsgj"; depends=[]; };
+  Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
+  rPlant = derive { name="rPlant"; version="2.7"; sha256="0gqxb49d6qzkd533s9qp75byvz66v1csdlnmh3m2zg96aw32178r"; depends=[rjson RCurl seqinr knitcitations]; };
+  rplos = derive { name="rplos"; version="0.3.6"; sha256="1n9v106hlppizp0r8368vv5lvbbmva3wbn6y6wvv8rg67605a2yr"; depends=[ggplot2 RCurl RJSONIO XML plyr stringr googleVis httr lubridate reshape2]; };
+  rplotengine = derive { name="rplotengine"; version="1.0-3"; sha256="1a7s8yih9dywqn013bvayw1dvx6wdjj68fcy21xfscg799cpgshf"; depends=[xtable]; };
+  RPMG = derive { name="RPMG"; version="2.1-5"; sha256="1ck6bz72h1kwi7gg8vd0zw1q61pqv23rish84zri2p18z7nd9kvh"; depends=[]; };
+  RPMM = derive { name="RPMM"; version="1.10"; sha256="0xhcf0a28zdxd6x495k9xddirkd37bzs8n99jbmsdxza19a7f0vz"; depends=[cluster]; };
+  Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
+  rportfolios = derive { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
+  RPostgreSQL = derive { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
+  RPPanalyzer = derive { name="RPPanalyzer"; version="1.2.2"; sha256="072sag9szrx06g6b0q62am8gk0wx5w1pkfv7yy7pcdsnll4x91vp"; depends=[quantreg lattice gam gplots ggplot2 Hmisc]; };
+  RProtoBuf = derive { name="RProtoBuf"; version="0.4.1"; sha256="1992nz0dz4h802gakcri1c9dgacxc5nvg3h5lm2zv6yg748ha6nh"; depends=[Rcpp RCurl]; };
+  rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
+  rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; };
+  rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; };
+  rPython = derive { name="rPython"; version="0.0-4"; sha256="18pibmhjvc8aj6awmm1dz3mm2v82cwggrpjqwck9mj43w5fxd4hf"; depends=[RJSONIO]; };
+  RQDA = derive { name="RQDA"; version="0.2-5"; sha256="0zcc4l5rl0n7f14yaszadm38shg7lbh5xzvrzfkmmymwbzgjq46h"; depends=[RSQLite gWidgetsRGtk2 RGtk2 DBI igraph gWidgets]; };
+  Rquake = derive { name="Rquake"; version="2.2"; sha256="0gkarqqhmiakc968ffwywkwy7npm1ly5gd6bbhr8fjfwdnhjam5n"; depends=[RPMG RSEIS GEOmap MBA minpack_lm rgl]; };
+  RQuantLib = derive { name="RQuantLib"; version="0.3.12"; sha256="1ih7lkpa3p0ipgc8hs9miv500rk285ddc7pmn2qv03ibpsdlvjmq"; depends=[Rcpp]; };
+  Rramas = derive { name="Rramas"; version="0.1-4"; sha256="191rm2ylvf3ffc9i4wpjvfbsinmw7s1m0wcq24j4qs4fxg8qqzyq"; depends=[diagram]; };
+  rrBLUP = derive { name="rrBLUP"; version="4.3"; sha256="0wydh4sx7b6rcrgb3qvqh0z46pixx63711q2nf8s3c32090a5g81"; depends=[]; };
+  rrBlupMethod6 = derive { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
+  rrcov = derive { name="rrcov"; version="1.3-4"; sha256="0k2lqwsfb9ir053m4dbz8z57xq6mlfj63i1k64p1h5jdzbpyw1ks"; depends=[robustbase pcaPP mvtnorm]; };
+  rrcovHD = derive { name="rrcovHD"; version="0.2-2"; sha256="03b1mpqqhfjxjzz9agx575mcgalb7jrsv843zjqv9jp4wszprs6z"; depends=[rrcov robustbase pcaPP pls spls]; };
+  rrcovNA = derive { name="rrcovNA"; version="0.4-4"; sha256="0zrzgnl83wfsaz0rma07hgb5jlmhvqwv06q7zkm65xd6mfsalqv0"; depends=[rrcov robustbase norm]; };
+  rrdf = derive { name="rrdf"; version="2.0.2"; sha256="1m1dfxi720c0xyj1x41zc4vc3dhxs9flysm4xri8b7cibx44piyk"; depends=[rJava rrdflibs]; };
+  rrdflibs = derive { name="rrdflibs"; version="1.3.0"; sha256="1qhi0diwvlw5icbym0nlg2yy8gibajycw55szsiipdxkjxj5r85l"; depends=[rJava]; };
+  rredis = derive { name="rredis"; version="1.6.8"; sha256="01kksak1hdlcc2q32rzs8i45flxb7shzyq785yr0kanr54pd874z"; depends=[]; };
+  RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
+  rriskDistributions = derive { name="rriskDistributions"; version="2.0"; sha256="0278426m4v7b8qb9ydzxqncayq8z25b36n4livqg40zpazp3hy85"; depends=[mc2d eha msm tkrplot]; };
+  rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[pcaPP mvoutlier glasso matrixcalc]; };
+  R_rsp = derive { name="R.rsp"; version="0.15.0"; sha256="163i2vl6ds4bqwk41xa44p72198j3b5rdwv4qy3yzm071lxdngaf"; depends=[R_oo R_methodsS3 R_utils R_cache]; };
+  rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
+  RSA = derive { name="RSA"; version="0.9"; sha256="167pdll03kbiwc632r83mqc0r50rkmzjfjxawm654zxslfxssbq9"; depends=[lavaan ggplot2 lattice gridExtra plyr RColorBrewer]; };
+  RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
+  rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
+  RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; };
+  RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
+  rSCA = derive { name="rSCA"; version="2.0"; sha256="0xcs1w4a8s83mvjp6hp474fmj9wr5mypa244a1lplx8jjwd0mf5b"; depends=[]; };
+  RSclient = derive { name="RSclient"; version="0.7-2"; sha256="04ml4pynjl97295wrclvb61mpwacrkzc9x5pbwyfg1qr3l8hss93"; depends=[]; };
+  rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
+  RSDA = derive { name="RSDA"; version="1.2"; sha256="06sa3x0abm2gnf4i4y3d5mlqj1wl7mzzal27sa1x65awzi6rs2kz"; depends=[sqldf XML scales FactoMineR ggplot2 glmnet abind scatterplot3d]; };
+  RSeed = derive { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[sybil]; };
+  rseedcalc = derive { name="rseedcalc"; version="1.2"; sha256="1di9bzwxyxm9gs14ks9z6sixi656hz9xwmq3aaqh53cjjr1ka0rc"; depends=[]; };
+  RSEIS = derive { name="RSEIS"; version="3.3-3"; sha256="13fb4mx3sgnbrcn1kkxy0a490kikjrq49ii3x14xw2s8ci030wlr"; depends=[RPMG Rwave]; };
+  RSelenium = derive { name="RSelenium"; version="1.2.2"; sha256="14fhj04122x3bj7fbaa0m8mcy37hrlpjsw8pypf6s3b7fqjnn5bq"; depends=[RCurl RJSONIO caTools XML]; };
+  rsem = derive { name="rsem"; version="0.4.5"; sha256="02vccj03bxisi2jwl31rwi4gw9i26g70aagdgg5gk8z0bys78v4d"; depends=[MASS lavaan]; };
+  Rserve = derive { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
+  rSFA = derive { name="rSFA"; version="1.03"; sha256="0bgapvlx5n0984ryyh1is0w88lhxj49gcar8gkwiw455jbzx7isp"; depends=[MASS]; };
+  rsgcc = derive { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene stringr snowfall]; };
+  RSGHB = derive { name="RSGHB"; version="1.0.1"; sha256="1af32jsbiidjmnih7x7lgcr3kpnl6nipv5rgav7sk7k0x84d1dnl"; depends=[]; };
+  RSiena = derive { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
+  rsig = derive { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[survival BBmisc glmnet superpc Matrix]; };
+  RSiteCatalyst = derive { name="RSiteCatalyst"; version="1.3.3"; sha256="0z6yg403qg2b18261s3v406ji18wpsjmd7i8v7ilr94pwgx0xhcl"; depends=[digest httr rjson plyr stringr base64enc]; };
+  RSKC = derive { name="RSKC"; version="2.4"; sha256="0g05kkw07skbbvah7z9a49z0dv5jkwa2l5srcy1jvsxczkmkq91v"; depends=[flexclust]; };
+  rsm = derive { name="rsm"; version="2.06"; sha256="0pjkqdhzmnzfc400z5xpdb17v6qckpnx2qpia2hm51m7xjfhks5b"; depends=[]; };
+  RSNNS = derive { name="RSNNS"; version="0.4-4"; sha256="0xqgmzbs82a413qqpcmyk1jgrdi5zaj4mywajwfwj1nv06j3dn5w"; depends=[Rcpp]; };
+  rsnps = derive { name="rsnps"; version="0.1.0"; sha256="1wpbr2sjcw6hh9sq8h2jzgvc4xlygf0kcd91sqg89nmprfw73j6c"; depends=[plyr stringr httr RCurl XML]; };
+  RSocrata = derive { name="RSocrata"; version="1.4"; sha256="0yv0fhrxqjgkh8nsdhp42j2g17iig8labv5x2c68nhn95x25n3bj"; depends=[httr RJSONIO]; };
+  RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
+  Rsolnp = derive { name="Rsolnp"; version="1.14"; sha256="0i5d8133vg0939j5772nbw1wd4cyp6q4684iqnl12qkk30hnh94s"; depends=[truncnorm]; };
+  Rsomoclu = derive { name="Rsomoclu"; version="1.3.1"; sha256="106cbp8vm5sx8h6k0ddlp51r65jl0d6c0bz29vp8z4adx8ikacsm"; depends=[Rcpp]; };
+  rspa = derive { name="rspa"; version="0.1-4"; sha256="1zvi39plbh4ya7523ckm9751mfirav6wa0zn5jd8c60g3rlcdkg5"; depends=[editrules]; };
+  rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
+  RSpincalc = derive { name="RSpincalc"; version="1.0.1"; sha256="0n751l329j9pgpdnqrdnf93i9l1qxfp2bl4v4ray3nrnjx8g5mc9"; depends=[]; };
+  rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; };
+  RSQLite = derive { name="RSQLite"; version="0.11.4"; sha256="0300q901bc0zypvapq8kp0ixpm4vbg5a27bkg9k0s4m3l7rcp85v"; depends=[DBI DBI]; };
+  RSQLite_extfuns = derive { name="RSQLite.extfuns"; version="0.0.1"; sha256="03ixy1q5dv4fnp4m1h75c7rvgfgfyxk5hgzd7fl7pqa1q13pjp6a"; depends=[RSQLite]; };
+  Rssa = derive { name="Rssa"; version="0.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; };
+  rstiefel = derive { name="rstiefel"; version="0.9"; sha256="1l80bx07swalh5dbx34zwjza3xf3nk1kp1832v6hzk60i5xycdxd"; depends=[]; };
+  RStorm = derive { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
+  rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
+  rstudioapi = derive { name="rstudioapi"; version="0.1"; sha256="027482pbdxnfhcpdw2ns2qhpa18zri71nz8fk0svq6900m2237h8"; depends=[]; };
+  Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
+  RSurvey = derive { name="RSurvey"; version="0.8-0"; sha256="1kc07hvvpyk83ci0x6g0lmnxksd91y2ilfalbhlbp69jid111k1v"; depends=[sp rgeos MBA]; };
+  RSvgDevice = derive { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
+  RSVGTipsDevice = derive { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
+  Rsymphony = derive { name="Rsymphony"; version="0.1-17"; sha256="1wg1l4535xmrqvyhf23b9kw3ggqxlcrig0x0dnhx0m2qr9v3ijni"; depends=[]; };
+  rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
+  rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
+  RTConnect = derive { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
+  rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; };
+  rTensor = derive { name="rTensor"; version="1.1"; sha256="0350cpafvdrjz5ibgk6bfw8j0kc3vr8vw84hw8jlbi96ia7p6w00"; depends=[]; };
+  RTextTools = derive { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[SparseM randomForest tree nnet tm e1071 ipred caTools maxent glmnet tau]; };
+  RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
+  rtf = derive { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_oo R_methodsS3]; };
+  rtfbs = derive { name="rtfbs"; version="0.3.2"; sha256="1v26znlispc8304xid0dsflphiwzil6nrxlsgj8dkp4prh6hdb34"; depends=[rphast]; };
+  rtiff = derive { name="rtiff"; version="1.4.4"; sha256="13cz35dfz735yk2lci8cmjmsg4ddm31lv98lpx8ymy3bwmzdmc3c"; depends=[pixmap]; };
+  RTisean = derive { name="RTisean"; version="3.0.14"; sha256="03c000anvdmj0bc0b1l4213ikvk9qwxw8aiwfflscigwbc77wa4r"; depends=[]; };
+  RTOMO = derive { name="RTOMO"; version="1.1-2"; sha256="15swp7jx5xmj87hjcfdar3r5sqnnb795qclf8b7l4bvx80h9nh2i"; depends=[RPMG GEOmap RSEIS splancs]; };
+  rtop = derive { name="rtop"; version="0.3-45"; sha256="0dh7jlnakk1hd27swspa0fj6pq6yddxhz32w3d7xq8jgr7xm8d70"; depends=[sp gstat]; };
+  rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4hg5x1r6p0f7wjiks50x55pbl4"; depends=[raster xts zoo]; };
+  Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3"; sha256="0a5q5qx3cfwhic92qm64n0qggqpjgkxjhr9alhm205av1b5fldv2"; depends=[]; };
+  Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
+  rugarch = derive { name="rugarch"; version="1.3-1"; sha256="1rwigrmqkxikr1hwal2adqybhim8q2a30sci8fdabsyjc06giky1"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp]; };
+  RUnit = derive { name="RUnit"; version="0.4.26"; sha256="0glz0ag2za5g4k8fjnsr97504bfk9d6khly1rqrrngg4qxz5wlf0"; depends=[]; };
+  Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
+  runjags = derive { name="runjags"; version="1.2.0-7"; sha256="0b3awpbbjlf5lsp53sikl0az5ap35lzhzsjiwdapa3l6pgbvyhx4"; depends=[lattice coda]; };
+  Runuran = derive { name="Runuran"; version="0.20.0"; sha256="1syzrmkw96gsw7vf10f1515zdqm9hdmq1v6yf1nbmipil1nkgsqs"; depends=[]; };
+  RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
+  R_utils = derive { name="R.utils"; version="1.29.8"; sha256="1rg9mgh0h566jar5542v5a5xb1frs167lphycvfka8gz0cj2ffv9"; depends=[R_oo R_methodsS3]; };
+  rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
+  RVAideMemoire = derive { name="RVAideMemoire"; version="0.9-35"; sha256="005vfax1yhnrq6fy0yjxjl0ya31s7mwfany7pajy6ws61sjh9kc9"; depends=[ade4 boot car lme4 lsmeans MASS mixOmics multcomp statmod]; };
+  Rvcg = derive { name="Rvcg"; version="0.7.1"; sha256="0iw3vzibv7pdx6bzkb6kwqvs6lmp96fiyqb8lsh0dv94swagi9ax"; depends=[Rcpp]; };
+  rvertnet = derive { name="rvertnet"; version="0.0-5"; sha256="1rj6csx2qb094wgkablrpzlbqb0hpzg5d29xrar2cy39gjmz40cj"; depends=[RCurl plyr RJSONIO httr ggplot2 maps]; };
+  rvgtest = derive { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
+  rvHPDT = derive { name="rvHPDT"; version="2.0"; sha256="1swwciphxgyil10dncx0fx32w6gs4dnnwb4qsqk0fr044prd9v6g"; depends=[gregmisc]; };
+  RVideoPoker = derive { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap tkrplot rpanel]; };
+  Rvmmin = derive { name="Rvmmin"; version="2013-11.11"; sha256="14gsdvw7qxcffwkh0ayj0vlm0cqyavqgl4rqn5ybjr0pkbsmz955"; depends=[optextras]; };
+  RVowpalWabbit = derive { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; };
+  RVsharing = derive { name="RVsharing"; version="1.1.0"; sha256="0gcas4rb8pms470dhbm2c2x87an0j594xsziglgd84nqn4gq095d"; depends=[kinship2]; };
+  rvTDT = derive { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
+  RVtests = derive { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet spls pls]; };
+  Rwave = derive { name="Rwave"; version="2.1"; sha256="0fiw3i8qwfhingxmdflfdld7zp61p7zxpj00zl5v7qf21kcmvkbx"; depends=[]; };
+  rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; };
+  RWeather = derive { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; };
+  RWebLogo = derive { name="RWebLogo"; version="1.0.1"; sha256="1qqvndvgb46hx02ixlh8zkwknkbxky598yalpsm47rrpzqwpkzdl"; depends=[raster jpeg findpython]; };
+  RWeka = derive { name="RWeka"; version="0.4-23"; sha256="1p1kz6if5yhmjvjzvr0ig5i0l6g7bzp6z8q4jssrp2g07g576084"; depends=[RWekajars rJava]; };
+  RWekajars = derive { name="RWekajars"; version="3.7.11-1"; sha256="1p0i1lxkcvxvpwkrzl4dqdxr3mcc9a6qs76b7lbmpxh7gfiwq82c"; depends=[rJava]; };
+  RWiener = derive { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; };
+  Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
+  rwm = derive { name="rwm"; version="1.53"; sha256="0x19502xzc3x90iwvhvj24w36qab79v4y7mb37ax8a0n3pw6rah8"; depends=[]; };
+  rworldmap = derive { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[sp maptools fields]; };
+  rworldxtra = derive { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
+  rwt = derive { name="rwt"; version="0.9.4"; sha256="0r80whjmq1d6248mzj16g0xn0k1c3kd6q4lhgjnqr81brbdmd3vg"; depends=[matlab]; };
+  RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
+  RXKCD = derive { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[RJSONIO png jpeg plyr]; };
+  RXMCDA = derive { name="RXMCDA"; version="1.5.0"; sha256="1kp2hpkr88g3cdpbdyam9lgas1irda7s6dhkp0dhz5mrzdlvw2jd"; depends=[XML kappalab]; };
+  RXshrink = derive { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
+  Ryacas = derive { name="Ryacas"; version="0.2-11"; sha256="116ncg48ih1v3ra095k63ccqchfbvzixh3cfjb2bbc47a9zh8phc"; depends=[XML]; };
+  RYoudaoTranslate = derive { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
+  ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
+  rysgran = derive { name="rysgran"; version="2.0"; sha256="11vh1sq267dva4gfg00xb3czcj2xymkg665pj895i7cn8hmy3q74"; depends=[soiltexture lattice]; };
+  Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; };
+  rzmq = derive { name="rzmq"; version="0.6.8"; sha256="0likcj1xivr0y42krnm5zynkr6slfc3yqq2nd90x79ldvbfdqxc6"; depends=[]; };
+  s20x = derive { name="s20x"; version="3.1-10"; sha256="0hxi8d1pl0jgg66jxzz0z973sg3f4s1jf75smmizy99kd76rdnh0"; depends=[]; };
+  s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
+  sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
+  sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; };
+  saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
+  SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
+  safeBinaryRegression = derive { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
+  SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
+  SamplerCompare = derive { name="SamplerCompare"; version="1.2.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; };
+  sampleSelection = derive { name="sampleSelection"; version="0.7-2"; sha256="11gqcls06imvlnbmc0nbypklz863xcp2ps170kd28j5wxfi8ybm7"; depends=[maxLik systemfit miscTools]; };
+  samplesize = derive { name="samplesize"; version="0.1-8"; sha256="0w4aa6p0j7l9xykhgqv7yps2nxx11q1mrgivdnv4si8fbkqx148n"; depends=[]; };
+  Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
+  samplesize4surveys = derive { name="samplesize4surveys"; version="0.5.1"; sha256="0qinzr55ldg7ngsa9lzwwwysjfk3230xs7kcqkvimnrn5z4n898v"; depends=[TeachingSampling]; };
+  SampleSizeMeans = derive { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
+  SampleSizeProportions = derive { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
+  sampling = derive { name="sampling"; version="2.6"; sha256="11r8p29kwc0ggycbv7sm1zmazmfm4p5207l764ad4znjib0cab6p"; depends=[MASS lpSolve]; };
+  samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
+  samplingEstimates = derive { name="samplingEstimates"; version="0.1-2"; sha256="14cgjixqj12www3jalq4dlsslcsbzaxinqdvss22b0qd3v9666xs"; depends=[samplingVarEst]; };
+  SamplingStrata = derive { name="SamplingStrata"; version="1.0-2"; sha256="04mb14hb328s4smpfidxf448mpa1cij9lbsfii7j0a0qx9nwapy2"; depends=[]; };
+  samplingVarEst = derive { name="samplingVarEst"; version="0.9-8"; sha256="0x9iwws272nzgx79rgdifqz51wm4k9hh38pi65qx6nwf21mjkxlj"; depends=[]; };
+  sampSurf = derive { name="sampSurf"; version="0.7-2"; sha256="1bj1m5c8bx8i4jyk6kdgcfmgfj15iirxwg259r0c4fk7whcnfz59"; depends=[sp raster rasterVis boot]; };
+  samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; };
+  SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
+  sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
+  sandwich = derive { name="sandwich"; version="2.3-0"; sha256="0sa175wjnp6ji22f92shgbfg21029sw8cpbkrfr9q21vf33wvlyd"; depends=[zoo]; };
+  sanon = derive { name="sanon"; version="1.3"; sha256="0kh2gvcd7nxcgfswhspw9xw68sk0kcrcv86h8ysfrwxi35ln6a75"; depends=[]; };
+  sapa = derive { name="sapa"; version="2.0-0"; sha256="04zf1xs4w7s28mvc272la8z3r1slnf50pw0k8zj335j3i56x6b9y"; depends=[ifultools splus2R]; };
+  SAPP = derive { name="SAPP"; version="1.0.3"; sha256="0bc6zjh7x541nng9cvv51v4gwgshwddykj91pmksvcjskhkzx3wy"; depends=[]; };
+  sas7bdat = derive { name="sas7bdat"; version="0.4"; sha256="152a1sx04rcd1hkr87q340nvxnj9dpmc4jwbzvjs2dl1zsrq2532"; depends=[chron]; };
+  SAScii = derive { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; };
+  SASmixed = derive { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; };
+  SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
+  SASxport = derive { name="SASxport"; version="1.3.6"; sha256="0rbjn2f3fs8q51rjkbiv4ha50s38rq1qnnfqq772c138k35ih4np"; depends=[chron]; };
+  SAVE = derive { name="SAVE"; version="0.9.3.8.4"; sha256="0ai5dfwvr9awccdinrcqxdn5sacw4nm4x7pim289q1lzrr7gnnrp"; depends=[coda DiceKriging]; };
+  saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
+  saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
+  sBF = derive { name="sBF"; version="1.1"; sha256="11yjw6y1k0fi95p68bc4481gac25lympmmdykh71ljg0hnrm0s53"; depends=[]; };
+  sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
+  sbioPN = derive { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
+  SBSA = derive { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp]; };
+  sca = derive { name="sca"; version="0.8-9"; sha256="024yxm1rlyz3hx9viv2nb6rapy938diaknc3nzkgq0ffky2gf0s3"; depends=[]; };
+  scagnostics = derive { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
+  scaleboot = derive { name="scaleboot"; version="0.3-3"; sha256="0w3gwqxshiypbixrdjg3p5z3qfp0nf9gv838z9hlbf0xpzgk11xa"; depends=[]; };
+  scales = derive { name="scales"; version="0.2.4"; sha256="08dryii8ibh16wxs61pam07b24rwhqvdcdhk09mij289l309192v"; depends=[RColorBrewer dichromat munsell plyr labeling]; };
+  scalreg = derive { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
+  scam = derive { name="scam"; version="1.1-6"; sha256="09y7gcmf40hc06cm8awjl40xbxs68b2lf916fywz2903bb6biai6"; depends=[mgcv Matrix]; };
+  scape = derive { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
+  scapeMCMC = derive { name="scapeMCMC"; version="1.1-3"; sha256="0gdranypjdzjdimmhs7k6pchvw9d3hr18rx1msll9bmaq1q2ffad"; depends=[coda lattice gplots]; };
+  scar = derive { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
+  scaRabee = derive { name="scaRabee"; version="1.1-3"; sha256="1fdxmk2mbrynxh6zy0xjmcwa384n5bppl1vzmfj5rjw840f7hbrk"; depends=[neldermead lattice deSolve]; };
+  scatterplot3d = derive { name="scatterplot3d"; version="0.3-35"; sha256="1w0r7cyz01rzmgcf2x7wa4xs88ga6fd67wksyjyzrh2pdcbc56yx"; depends=[]; };
+  SCBmeanfd = derive { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; };
+  SCEPtER = derive { name="SCEPtER"; version="0.1-0"; sha256="13jnqcgsz3rz5dis8jmbma1m6z72qphdjyjf3984c66clhazxnh9"; depends=[MASS]; };
+  SCEPtERextras = derive { name="SCEPtERextras"; version="0.1-0"; sha256="1vv231h744c7j7rvcb2xaffmwdd9ms76yvvw2l3xcb72iwhl5dbw"; depends=[]; };
+  SCGLR = derive { name="SCGLR"; version="1.2"; sha256="0346gmqd5wakfwabq4rwqdpiylq29cgx6hg40dzm2v1alpaxs8va"; depends=[Matrix Formula expm ggplot2 stringr ROCR]; };
+  scholar = derive { name="scholar"; version="0.1.1"; sha256="1wlhxw5k28qypfl6dm07cjrpvpmvcbwn1fc7205xpj20f41jchra"; depends=[stringr plyr R_cache XML]; };
+  schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
+  schoRsch = derive { name="schoRsch"; version="1.0"; sha256="15kjab5cpss2kkf3pd2nyszdsfn77840zx7yrbkry6n7xb4x8icn"; depends=[]; };
+  schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
+  SCI = derive { name="SCI"; version="1.0-0"; sha256="0ff35g0d7iq1mjr01bh5zdix8g9gg244zpkhvdcnyx7mchpv38la"; depends=[fitdistrplus lmomco]; };
+  scidb = derive { name="scidb"; version="1.1-2"; sha256="1nkyzvjpacm4imv778nc6gc468419shkyhxb59hsaw9840wcs1na"; depends=[Matrix iterators RCurl zoo]; };
+  SciencesPo = derive { name="SciencesPo"; version="0.03.21"; sha256="0g6n8v7k2qk3nqfnw4i31qh03lckpm787j2ha3gskgchnydmn5ac"; depends=[data_table maptools]; };
+  scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
+  sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
+  SciViews = derive { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[MASS ellipse]; };
+  SCMA = derive { name="SCMA"; version="1.1"; sha256="0bims9l047xvbwp2r5ly5cgpd7fc0p2cik48gg42abwdqvppf542"; depends=[]; };
+  SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; };
+  scoring = derive { name="scoring"; version="0.5"; sha256="0yiqz642zcpza4ixyb7knaqlq75d0pyi6v7h1vj8qlscyw2vcz57"; depends=[]; };
+  ScottKnott = derive { name="ScottKnott"; version="1.2-4"; sha256="0s2b74isklmjjz5qzb0sg2lzqxv3bka2wxcja1lg49npmv70kly7"; depends=[]; };
+  scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjschs7fkg04w67arl4pwma0z5z56lq"; depends=[glasso lars]; };
+  SCperf = derive { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; };
+  ScrabbleScore = derive { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
+  scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; };
+  ScreenClean = derive { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; };
+  scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
+  scriptests = derive { name="scriptests"; version="1.0-9"; sha256="03jv5hgzs4hvkpvjr9073nncmwj20cwispzwrbvxjdnvm5hnjg3y"; depends=[]; };
+  SCRT = derive { name="SCRT"; version="1.0"; sha256="1yk3ialhsn5qgjsi7zl7m61bkkwiw90xa4fl1vwncbgpzhrfzgkj"; depends=[]; };
+  scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
+  scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
+  SCVA = derive { name="SCVA"; version="1.0"; sha256="0dphdrc069d9nggpipl97wj1vqwnnjlv3fs68pqygzb5kbd70nx3"; depends=[]; };
+  sda = derive { name="sda"; version="1.3.3"; sha256="044ah4xmhx0y8pzd0y517p1drbj8bikfvm0925ji0abfcfc1xfsb"; depends=[entropy corpcor fdrtool]; };
+  SDaA = derive { name="SDaA"; version="0.1-2"; sha256="03ijiqwvvqs79ql9p016hpn5dwxnys820k00aza29npm9k2bciww"; depends=[survey ggplot2]; };
+  SDBP = derive { name="SDBP"; version="1.0"; sha256="18yk5zasxga58ny8n8kz3b8j0j8xznb9wqf5642xzfvcb9dd1kz2"; depends=[]; };
+  sdcMicro = derive { name="sdcMicro"; version="4.3.0"; sha256="18b7wqvid3y9lfm88jcpia6xk6kvjk49dbgzdjzhx5vdmg72vsll"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets]; };
+  sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; };
+  sdcTable = derive { name="sdcTable"; version="0.16.0"; sha256="1balavfwg70zbqd0xnnm2paac7fd4an1hysv1fsh3iw9n8cycdpy"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table]; };
+  SDD = derive { name="SDD"; version="1.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; };
+  SDDA = derive { name="SDDA"; version="1.0-5"; sha256="1lwp36bwx13cyiqyzh5jp2c0f0g2hvppqxnpjcflmcz7s23h5dp7"; depends=[MASS]; };
+  sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
+  sde = derive { name="sde"; version="2.0.10"; sha256="1wkgam394190zg1m0b9hg81h9mkqhqw8isk7xf5vdqxymjzsaxjm"; depends=[MASS fda zoo]; };
+  sdef = derive { name="sdef"; version="1.5"; sha256="1xmx3nfjjfh6zw1vq7iip4rnshh40azja83xyvnz04jcv574vhxm"; depends=[]; };
+  SDMTools = derive { name="SDMTools"; version="1.1-20"; sha256="10j1dpzndja503jamrw6jgxm1szj53skj44kn41msza8iz7638nn"; depends=[R_utils]; };
+  sdmvspecies = derive { name="sdmvspecies"; version="0.1"; sha256="0nlkz7am9xfj7phlzglmar6bxfvkb1r95qhm5j951h7053hwyppw"; depends=[raster ggplot2]; };
+  sdnet = derive { name="sdnet"; version="2.01.3"; sha256="1sr60ca2dn182nacsi1ix02cdjygf45jv51dcfz5744hj7afcvws"; depends=[]; };
+  sdprisk = derive { name="sdprisk"; version="1.0-3"; sha256="0v490zz2c1qa0w9nfd0xs5xbbvd9g8vp39fp8x7k7cy598vby4yx"; depends=[numDeriv PolynomF rootSolve]; };
+  sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
+  seacarb = derive { name="seacarb"; version="3.0"; sha256="1rjpf83f19rbp4mb7imnxlnlv8s0d6p6jqsarp6kksvr6yx5cdap"; depends=[]; };
+  sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
+  SearchTrees = derive { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; };
+  seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
+  season = derive { name="season"; version="0.3-3"; sha256="0562qxc5bz9yjkz0zzighlp52ysv0gjn8xfycbxckmjxy3wrk9cz"; depends=[ggplot2 MASS mgcv survival coda]; };
+  seasonal = derive { name="seasonal"; version="0.50.0"; sha256="0bf2j6vy7aa081k24q25ldry9ah2kr59c9i7bd1rwh5pcj7zlqpj"; depends=[]; };
+  seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
+  SEchart = derive { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
+  SECP = derive { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
+  secr = derive { name="secr"; version="2.8.2"; sha256="0p885q2r8wy4n8j1dvmmd59p5nfds8f4l1mwiw4z3xwck3bwi776"; depends=[abind MASS nlme sp]; };
+  secrdesign = derive { name="secrdesign"; version="2.1.2"; sha256="0x9nf3qki5mr85ylmlcjz7zcsl4i1jlz50gh2391gfbpdhljwbbc"; depends=[secr abind]; };
+  seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
+  seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
+  SEER2R = derive { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
+  SEERaBomb = derive { name="SEERaBomb"; version="2014.4.1"; sha256="1vlk6hcn05vdjfc7c8dhvsd1hc2yq1pdmhb7i48b689lkxg82igz"; depends=[RSQLite LaF]; };
+  seewave = derive { name="seewave"; version="1.7.3"; sha256="1bgv90x1rc7xyril6qarbx5mza131admd75s9704s8l7n4zfy64k"; depends=[fftw tuneR]; };
+  seg = derive { name="seg"; version="0.4-1"; sha256="1wkkxzvv1dq6z5l3b27fb72dg70py2qzkxmfibjg44zvcxr3y79g"; depends=[sp splancs]; };
+  segmented = derive { name="segmented"; version="0.3-1.0"; sha256="0d7mijvjl9kmypp8mgayq1l4800jj7cnd6anrnrng4ma6cxg8cjf"; depends=[]; };
+  Segmentor3IsBack = derive { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; };
+  SE_IGE = derive { name="SE.IGE"; version="1.0"; sha256="0gx3kdsdl3rjms6fxabxz51z84r9mcy4934l2g43ifrxbyphnias"; depends=[]; };
+  Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
+  SEL = derive { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[quadprog lattice]; };
+  selectiongain = derive { name="selectiongain"; version="2.0.29"; sha256="0l0av8dw14yfnc5a17nknjimhbi0nw30h7m8la346kibcsmszyvr"; depends=[mvtnorm]; };
+  selectMeta = derive { name="selectMeta"; version="1.0.6"; sha256="0qv06x6q6p2lwr13fw8xc6mkpb23h41sqnc9wyq8xx37d2jgpcif"; depends=[DEoptim]; };
+  selectr = derive { name="selectr"; version="0.2-2"; sha256="0hzj8ccs2jcfaqlpgrf59y6z7hrxsb2c85kkxflp6180rpqjrwq4"; depends=[XML stringr]; };
+  SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; };
+  sem = derive { name="sem"; version="3.1-3"; sha256="1y311ywnad910m5v35ga7x4ip95663ibi8vb7l4fq0hqrwn9f0c9"; depends=[MASS matrixcalc]; };
+  semdiag = derive { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
+  semGOF = derive { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[sem MASS matrixcalc]; };
+  semiArtificial = derive { name="semiArtificial"; version="1.2.0"; sha256="11pwdqpsf5d5g74s2b8ixmrh2khkha3d4akzlkn652s98qr55dpc"; depends=[CORElearn MASS nnet cluster mclust fpc timeSeries timeDate]; };
+  SemiCompRisks = derive { name="SemiCompRisks"; version="1.0"; sha256="1q10bqws152vk7fpd9m8w16m0ns2i10q07wnmmbjladvfq4ja9il"; depends=[]; };
+  SEMID = derive { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; };
+  SemiMarkov = derive { name="SemiMarkov"; version="1.3"; sha256="0zg5yljfmhysx7r3r8ks5mfc10wbrxvfgys0zxfnspd3qb7pz0q2"; depends=[numDeriv MASS Rsolnp]; };
+  SemiPar = derive { name="SemiPar"; version="1.0-4"; sha256="1gg80wpqa006qahpaxb5y7vnf4w0x9mhjwh6w3271j0b9znr1gs5"; depends=[MASS cluster nlme]; };
+  SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.2-10"; sha256="0rc3l4bdrm0g3lkv2h9as400jlqsibd7py448815kljznic70vbm"; depends=[CDVine VGAM mgcv mvtnorm MASS magic polycor VineCopula survey trust matrixStats Matrix]; };
+  SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.1"; sha256="0b2vdrqi4mw4bp6r82b3c329cddjxwc39rcramq5nr8awv9ib0cf"; depends=[copula mgcv mvtnorm magic trust Matrix]; };
+  semisupKernelPCA = derive { name="semisupKernelPCA"; version="0.1.5"; sha256="1v8wdq63b1gqicj8c9a24k0w7cc0bkg0mnc9z5mklsfcl7g0g6k9"; depends=[datautils irlba]; };
+  SEMModComp = derive { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
+  semPlot = derive { name="semPlot"; version="1.0.0"; sha256="0ih94pwhkgd8jni3wkv1xmjr4c00q94dq4n8mxdwvixwi1l0gzjq"; depends=[qgraph lavaan sem plyr XML igraph lisrelToR rockchalk colorspace corpcor]; };
+  semPLS = derive { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
+  semTools = derive { name="semTools"; version="0.4-0"; sha256="1s6js0wqipfvn8hdmsmxjg3h8j4n6v00jisiwg4rfljvis9wx27l"; depends=[MASS lavaan]; };
+  sendmailR = derive { name="sendmailR"; version="1.1-2"; sha256="1d3rzcckrfqsilpzmpacwibhz858b8sw029vfz6mjh6q0ijswi2q"; depends=[base64enc]; };
+  sendplot = derive { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
+  sensitivity = derive { name="sensitivity"; version="1.8-2"; sha256="1q30xpb1w5dnkivxh1ck53jz2m9kpjmzvr2yd739zxxlir5kx8gr"; depends=[boot]; };
+  SensitivityCaseControl = derive { name="SensitivityCaseControl"; version="1.0"; sha256="0dznwcicwlxlvsinqm4c64r9dp1c2mnf810svl34sd8ddnxrvvyl"; depends=[]; };
+  sensitivitymv = derive { name="sensitivitymv"; version="1.2"; sha256="0h8lbl5yhxgzdrajjydb2ap9q3dnm1abxdk8gdhp84m1bv8pznkj"; depends=[]; };
+  SensoMineR = derive { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[FactoMineR cluster KernSmooth]; };
+  sensR = derive { name="sensR"; version="1.3-1"; sha256="1v10zx1lydgmk8a6zsxxg1zzbblxn582ggcminrlvs7gwin7b0hn"; depends=[multcomp MASS numDeriv]; };
+  SenSrivastava = derive { name="SenSrivastava"; version="2012-04-0"; sha256="0ki0kl18cj8lkad6q48piyvslkirs8y5rnfa8bvgjxsisxg2ahhp"; depends=[]; };
+  separationplot = derive { name="separationplot"; version="1.0"; sha256="1m8s531dsmzdam5s2yn0qyvm89zfxrzj8sh8r2gpcf31qrai7m26"; depends=[MASS RColorBrewer]; };
+  seqCBS = derive { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
+  seqDesign = derive { name="seqDesign"; version="1.0.1"; sha256="17zb8l5kasjvrsrgs2k0ih25ydlz7hpr9dcr1rm1akvscmk8np3d"; depends=[survival xtable]; };
+  SeqGrapheR = derive { name="SeqGrapheR"; version="0.4.8.3"; sha256="03plwa3sc1pg34p1szbz3d0z8y53w7iqm7qn9q6fj72rsnk5spxc"; depends=[igraph rggobi gWidgets gWidgetsRGtk2 cairoDevice]; };
+  seqinr = derive { name="seqinr"; version="3.0-7"; sha256="0r54kvvwlp5i1fbk4vgbinj3zwzjppiyh7f5dy4kmja8m5lslc4x"; depends=[]; };
+  seqMeta = derive { name="seqMeta"; version="1.4"; sha256="0wmwvw09fskwpvy727lc974aw9gvd495wgxf8k1ybi16bq2h080j"; depends=[survival Matrix coxme CompQuadForm]; };
+  seqminer = derive { name="seqminer"; version="3.0"; sha256="0wkd315vc4h8hdlz8z44w04mkvl8kyck736jhrswfrzc4b3xrfb4"; depends=[stringr]; };
+  seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
+  seqPERM = derive { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
+  seqRFLP = derive { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
+  sequences = derive { name="sequences"; version="0.5.8"; sha256="1872737x77mknn2ay7qh8brd28hzsqzjqkx4shwkp0w7lk2p0rp0"; depends=[Rcpp]; };
+  Sequential = derive { name="Sequential"; version="1.1"; sha256="1fr4n6qbxwj6hs01h07wdj5v4c7af5q8ccnm33yzcrx845qf8fiv"; depends=[]; };
+  sequenza = derive { name="sequenza"; version="2.0.0"; sha256="04kva5bvflpzq53qgif8sw49npcx1hwlqvrypgb6ynajyg28hd6p"; depends=[squash]; };
+  seriation = derive { name="seriation"; version="1.0-13"; sha256="0k3m4x0msdynblcy1ign4p5qlsqmxk2p4vfjkv0fz3qjsbxfw61n"; depends=[TSP cluster gclus colorspace MASS]; };
+  servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; };
+  sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
+  SesIndexCreatoR = derive { name="SesIndexCreatoR"; version="1.0-2"; sha256="14xq2niqa6ml2dlyamv4w8appll7n0nplzvx9r7bnm289m4d6wwm"; depends=[FactoMineR class]; };
+  session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
+  SetMethods = derive { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[lattice betareg lattice betareg]; };
+  setRNG = derive { name="setRNG"; version="2011.11-2"; sha256="1gp577yy3wzszpzgdhfpas7hrk658rb2vz0dxm111s5xnc5wcp74"; depends=[]; };
+  sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; };
+  setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
+  severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
+  sExtinct = derive { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
+  sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
+  sfsmisc = derive { name="sfsmisc"; version="1.0-25"; sha256="1dz7m89a7agwxmi6hijmc8ynxl4vdm04n9wp7wzi683i6j74fs0k"; depends=[]; };
+  sft = derive { name="sft"; version="1.0-1"; sha256="0pi6x66mcywc1lbkwnwldnfg64h5vpp65vlis6b9cqd8iyx8msp4"; depends=[fda]; };
+  SGCS = derive { name="SGCS"; version="2.0"; sha256="1d7abq07f0702k33j334va7kc4swz7rdqqb4sw1wq6a671r7k5v6"; depends=[spatstat]; };
+  sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
+  SGL = derive { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
+  sglasso = derive { name="sglasso"; version="1.0-0"; sha256="1pb8s1hbl3ygnd6w28d2vlhbd7rxga84cs77fanay4qgxmgayfkx"; depends=[Matrix]; };
+  sglOptim = derive { name="sglOptim"; version="1.0.122.0"; sha256="07anc9ixbc82807ixr4k779src72gvbx0wsy3mr0mvzg9xq2fi1v"; depends=[Matrix]; };
+  sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
+  sgof = derive { name="sgof"; version="2.0.2"; sha256="1rami39hlgh72gkjwxd9nxva2kidw98pa02kmnh7scpip265jx06"; depends=[]; };
+  SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; };
+  sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[Matrix fields]; };
+  SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
+  sgr = derive { name="sgr"; version="1.0.4"; sha256="059gqq1pm7fz3kmfnlkcrlrw4v96460067kfa9frx19g3pij8ajp"; depends=[]; };
+  shape = derive { name="shape"; version="1.4.1"; sha256="1s1yj7cqc9svqliv9f9k3fimkakblri9vwr785ihav58x5cn90qj"; depends=[]; };
+  shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
+  shapes = derive { name="shapes"; version="1.1-9"; sha256="044d4ci9lv6g9vbh8zn85f08d9n8f91vn8gn1wqv1lp0qjycpmjv"; depends=[scatterplot3d rgl MASS]; };
+  SharpeR = derive { name="SharpeR"; version="0.1401"; sha256="1l55llafs81gl1mdhyyi6m02w7mx8g46y65jf1kw5mbrljgri8az"; depends=[matrixcalc xtable]; };
+  sharpshootR = derive { name="sharpshootR"; version="0.6-1"; sha256="0q5cy2mz98pc6dz7ixnr9cvlsl449zkz325h1m07adr97m52pl3p"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
+  sharx = derive { name="sharx"; version="1.0-3"; sha256="1a94s5r2ymif2l3ld101qqn5qkd4z4sj5scg0dsvdpdzkvnqpcyq"; depends=[Formula dcmle dclone]; };
+  sheldusr = derive { name="sheldusr"; version="0.1"; sha256="1q8d2cp177b574ml9z6mawpk8pyfdmwan4hc8srl3chq3yr44a45"; depends=[]; };
+  shiny = derive { name="shiny"; version="0.9.1"; sha256="15pnb87jap11myvlzppshswqwszjnkmcg27pp15askg1l71k1ci3"; depends=[httpuv caTools RJSONIO xtable digest]; };
+  shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
+  shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; };
+  shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
+  SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
+  shotGroups = derive { name="shotGroups"; version="0.4"; sha256="036qa5xdsl10swj6wfjhppksxj351yb0gifif80flzhlw4yl7lca"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
+  showtext = derive { name="showtext"; version="0.2"; sha256="18pr03n0v2dg93pnp3saar3664dpina33wzmhw13hqcx6nfjgzw7"; depends=[sysfonts]; };
+  shp2graph = derive { name="shp2graph"; version="0-1"; sha256="0bdvv9ygzq7jgbab6i3sclm48r373z9b2jlv9hdq0h4kmxv1wznd"; depends=[maptools igraph]; };
+  shrink = derive { name="shrink"; version="1.1"; sha256="0avf3502mjz2apy1nnz8a6xp5n77vva5v1n84sn1qimjnz40g58d"; depends=[]; };
+  ShrinkCovMat = derive { name="ShrinkCovMat"; version="1.0.0"; sha256="0l6zf0iizcymdkykkyq81bna5wll0j6wjnkfi5i5lpblz6xh5ddr"; depends=[]; };
+  shuffle = derive { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; };
+  siar = derive { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[hdrcde coda MASS bayesm mnormt spatstat]; };
+  sideChannelAttack = derive { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[MASS corpcor mmap ade4 infotheo]; };
+  sidier = derive { name="sidier"; version="2.3"; sha256="08w6xsncs4nbjgmfh1irfjrc7iflg7w4dx3shr9fh0vbsd35g8wl"; depends=[ape network igraph]; };
+  sig = derive { name="sig"; version="0.0-4"; sha256="0q5bwaj15jlmcg4qqcdkkwbnqphwgwzcnfzga12xzr912rwjybjr"; depends=[]; };
+  sigclust = derive { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
+  SightabilityModel = derive { name="SightabilityModel"; version="1.2"; sha256="1piw8i6c3bdwjj20329431is3b7mxij7f1g49g7qw00s197n8qha"; depends=[]; };
+  signal = derive { name="signal"; version="0.7-4"; sha256="0sz8im7i46qy5wjpm34a2nqvrc1vipmqlw8ns3i2s1vhcvp7fjs1"; depends=[MASS]; };
+  signalextraction = derive { name="signalextraction"; version="2.0.3"; sha256="0kxk32jfkcgkdcq4xfzdf24qr6wkkhl4yf2v4sjqxhviwml2g2aq"; depends=[]; };
+  sigora = derive { name="sigora"; version="0.9.2"; sha256="1s3c0xwxabr3n8sb6rjhzkkzbpvcczbgqq6b263yypwasqbg4mlb"; depends=[]; };
+  SigTree = derive { name="SigTree"; version="1.4"; sha256="0kh5fa5i5f8wik8rrwcfz2j66ywv89xhq3670srlli1j8vi4vfa8"; depends=[ape phylobase phyext RColorBrewer]; };
+  SigWinR = derive { name="SigWinR"; version="1.0.2"; sha256="0kwg2ly1lglksibgdh56zvmw7hk9py4kvln9flaf00j9d0f2lj0i"; depends=[]; };
+  SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
+  simba = derive { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
+  simboot = derive { name="simboot"; version="0.2-5"; sha256="0slznwk8i3z76sxbfd4y5rp28jr6jv4i5ynnckpr10i59ba04wlq"; depends=[boot mvtnorm]; };
+  SimComp = derive { name="SimComp"; version="1.9.0"; sha256="1qw1bm0pahmvjxwa15q42vifq71lg7rw3dij7vba14sy88746m3g"; depends=[mvtnorm multcomp mratios]; };
+  SimCorMultRes = derive { name="SimCorMultRes"; version="1.2"; sha256="0wgi36sdpsippdbawdl7b9bvip0l8gp8xd1v85vznd1dibkfjr1r"; depends=[evd]; };
+  simctest = derive { name="simctest"; version="2.4"; sha256="12qxav3qy1s6g8yr6ygbjp3jlrf2p0h3zvl8bnqpk6mx95zw5gh3"; depends=[]; };
+  Sim_DiffProc = derive { name="Sim.DiffProc"; version="2.6"; sha256="1cs9jmb1849kzs38nx8788al0jda2vbx0cry9g3gx4f7v39cc87d"; depends=[]; };
+  simecol = derive { name="simecol"; version="0.8-4"; sha256="0k83zcnvxq89m60d9157w3sn2gwyl6m7812qy1bgn260ac2nqv10"; depends=[deSolve]; };
+  simex = derive { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
+  simexaft = derive { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
+  simFrame = derive { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[Rcpp lattice]; };
+  SimHap = derive { name="SimHap"; version="1.2.0"; sha256="1mnvqfqfgkhnh3glvr0xamw7si29jg1ri0nbb437a7wf023siy9z"; depends=[survival nlme]; };
+  Simile = derive { name="Simile"; version="1.3"; sha256="0jf0ispjv8izrxggp6y3a3scd8qlbqfgppqz8m1q9n3gy8jhbsli"; depends=[]; };
+  SIMMS = derive { name="SIMMS"; version="0.0.1"; sha256="0s53kc95jbav28kj35isc7j09qpjsk49za8p766z9yfaiw0higp7"; depends=[survival MASS]; };
+  simMSM = derive { name="simMSM"; version="1.0.1"; sha256="0lway32vjajlsnkvi7j9hcsaz7bmhzmi1w3r2gr28y5mbkpfkgb2"; depends=[]; };
+  simone = derive { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
+  simPH = derive { name="simPH"; version="1.2"; sha256="1g6jq01ygx41q0giyqmw9adb7qljfqva66pr1rn18zgjnwh0d46f"; depends=[car DataCombine data_table dplyr ggplot2 gridExtra MASS mgcv plyr reshape2 stringr survival quadprog]; };
+  simpleboot = derive { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
+  SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
+  simplexreg = derive { name="simplexreg"; version="1.0"; sha256="144kljh968i7n2d21r4204i4h952mfrkfc8b5r6x760msgjphxvh"; depends=[Formula plotrix]; };
+  simPopulation = derive { name="simPopulation"; version="0.4.1"; sha256="0vcci28ic6y4ih2l6cbgv0vwa5f7776pa3dvi13rmzbzdjblp1yj"; depends=[nnet POT lattice vcd]; };
+  Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
+  SimRAD = derive { name="SimRAD"; version="0.93"; sha256="1n1457ckfcxrxi09qxvjrwv1rrqcr9608cas0qd3yhf8xv0zv1hm"; depends=[]; };
+  simsalapar = derive { name="simsalapar"; version="1.0-2"; sha256="0y45g3qvig4nzyd6lmcff3awz1i5jym8jxm96261d3g8fw7fp9vv"; depends=[sfsmisc gridBase colorspace]; };
+  simsem = derive { name="simsem"; version="0.5-3"; sha256="12y2jlyys3aq8k7wi13iarzlgiqisp7731vcnd5rvla3cn0bnzrw"; depends=[lavaan]; };
+  SimSeq = derive { name="SimSeq"; version="1.0.0"; sha256="142qjkfz53q3g9k37nqhilsw1mcklsa9q05yqvyn9dvj9l06y11i"; depends=[fdrtool]; };
+  simSummary = derive { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind svUnit gdata]; };
+  SimuChemPC = derive { name="SimuChemPC"; version="1.3"; sha256="0ff454rvplr1ad5c9nmq4jbdbgfy5gzlvxfwhnyv2wzvdcyca6rk"; depends=[rcdk]; };
+  SimultAnR = derive { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
+  SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
+  SINGLE = derive { name="SINGLE"; version="1.2"; sha256="13gxv0k7zd4d7ykgxjaf5x0w3c2sf7xsvm16irawm72mr0iwqxnj"; depends=[flsa igraph dse Matrix]; };
+  siplab = derive { name="siplab"; version="1.0"; sha256="1cbjrinnkmcysykp4cldmc8hj4jqfld9pr2bk9a0dqxs2ivwp097"; depends=[spatstat]; };
+  sirad = derive { name="sirad"; version="2.0-7"; sha256="009icj1jil757vvsf88sgmdz40swrx1qvrhnx7wwj7p3dlh78pvw"; depends=[zoo ncdf RNetCDF raster]; };
+  sirt = derive { name="sirt"; version="0.44-48"; sha256="1a77yjddigm98j871l0h9c4x63pxv5iy1isipmnsp364468m8r0y"; depends=[MASS coda mvtnorm sfsmisc TAM CDM combinat ic_infer sm psych pbivnorm gtools Rcpp qgraph]; };
+  SIS = derive { name="SIS"; version="0.7-1"; sha256="0v3c5vbc9hl5siyqbv00q5xi79hywp45zv68ww005zmnxdfg2kvn"; depends=[glmnet ncvreg survival]; };
+  sisus = derive { name="sisus"; version="3.9-12"; sha256="0b1gpzhkvhajc6mqww01c5zk71h6q8kqwgaiiqimr5wh4hfbpxi0"; depends=[MASS RColorBrewer coda gtools moments polyapost rcdd]; };
+  sitar = derive { name="sitar"; version="1.0"; sha256="1psz68j2bjhs9zv6966xq25799zg4sxva5xl96ffwxb8mv8y01nd"; depends=[nlme]; };
+  sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
+  SixSigma = derive { name="SixSigma"; version="0.8-1"; sha256="15jdr10a7a6wv50vz9y6qcrbhnddl8zh4j4d48xrarrqbjy6l4p7"; depends=[qcc lattice ggplot2 reshape2 nortest testthat]; };
+  SiZer = derive { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
+  sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
+  sjPlot = derive { name="sjPlot"; version="1.4.1"; sha256="18mw0zvd8ll5n66wpyi9s1g2wjddsadkwwqp5n86bzfxazfqm5kd"; depends=[ggplot2 MASS car foreign lmtest plyr psych reshape2 scales]; };
+  SKAT = derive { name="SKAT"; version="0.95"; sha256="0jvcwckx7m5jc929ip2fqppgl1c9cx7bpybx986fs25gg7m808d4"; depends=[]; };
+  skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
+  skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
+  SkewHyperbolic = derive { name="SkewHyperbolic"; version="0.3-2"; sha256="00l1bz3wxvs7qwl4sy814w6nrh0k79ldck5zd6c5alvg50hjwwk3"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+  skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
+  Skillings_Mack = derive { name="Skillings.Mack"; version="1.0-2"; sha256="02rmla48ls3fx4y5yshngsxijna2zrbpnvzb13r731l9lf9vxdv7"; depends=[MASS gregmisc matrixcalc gtools]; };
+  skmeans = derive { name="skmeans"; version="0.2-6"; sha256="1ncas6mx9w5saz28vvwni8g0wbm6m7gfv8a7azw4305pc64bawam"; depends=[slam clue cluster]; };
+  slam = derive { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
+  SLC = derive { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; };
+  Sleuth2 = derive { name="Sleuth2"; version="1.0-7"; sha256="1zav2g1yqc6bvzap4r5xwy9abkdj8iswivj5y2lylc25nkxwcswg"; depends=[]; };
+  Sleuth3 = derive { name="Sleuth3"; version="0.1-6"; sha256="0q8sgh2szqnxc289vgi5v0sljzz8yb803ijx9w5mswdxw87z2dq3"; depends=[]; };
+  SLHD = derive { name="SLHD"; version="1.2-1"; sha256="0n5j20hp7kgi23gjprcwcaji8wdz5wwqqyc7i8dv0058fz2b5gzc"; depends=[]; };
+  sltl = derive { name="sltl"; version="1.0"; sha256="08bh76qs4if17iw51wic1r9v17wldyqgmbyfpccqp49x7ajxnwhq"; depends=[FitAR timeSeries lubridate]; };
+  sm = derive { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
+  smaa = derive { name="smaa"; version="0.2-2"; sha256="1xd5yd63j67w9kb3sl3jbxkvd76270c1wlg9r3k85dm2mjd0l38v"; depends=[]; };
+  smacof = derive { name="smacof"; version="1.2-3"; sha256="0n0j7w4kydnzd6hhnc6632waqzk63lgm8mwjwzp5nj3h1v4c528x"; depends=[polynom rgl scatterplot3d Hmisc colorspace]; };
+  smam = derive { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; };
+  smart = derive { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[Matrix gplots gtools PMA elasticnet pcaPP igraph]; };
+  SmarterPoland = derive { name="SmarterPoland"; version="1.2"; sha256="1ga2m9kbn269dx21k5q1drlw9hph99fsfdx2mfnajwlgpycgf6m9"; depends=[reshape rjson]; };
+  smatr = derive { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
+  SMC = derive { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; };
+  smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
+  SMCP = derive { name="SMCP"; version="1.1.3"; sha256="0ksx2ibz849vhrz2px9p7z8hlgvspz7kxhadvhk5mhkfbhrnpdf0"; depends=[]; };
+  SMCRM = derive { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; };
+  smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
+  smcUtils = derive { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
+  smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; };
+  smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
+  sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; };
+  SMFI5 = derive { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[ggplot2 reshape corpcor]; };
+  smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
+  SMIR = derive { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; };
+  smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
+  SmithWilsonYieldCurve = derive { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; };
+  SML = derive { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet Matrix lattice]; };
+  SMNCensReg = derive { name="SMNCensReg"; version="2.3"; sha256="0gyqv31isvn1xzwnzsi9c4ilj2j8h96a5z65yvf1l6bbrp140xw6"; depends=[Matrix PerformanceAnalytics]; };
+  SmoothHazard = derive { name="SmoothHazard"; version="1.0.9"; sha256="01ipdkb51zwrwb1gj344y4gl0934y8j54738rdzffl2lq6r3w7kv"; depends=[prodlim mvtnorm]; };
+  smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
+  smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
+  smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
+  smoothSurv = derive { name="smoothSurv"; version="1.3-2"; sha256="11aq3yb7q4pilp00l7q8r3ywbmwnka63kkjpvakp27mvaqyr02qr"; depends=[survival]; };
+  smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
+  SMPracticals = derive { name="SMPracticals"; version="1.4-2"; sha256="0apmkmsv2fqmxpgq08n9k9dvcknj74s4cpp0myjcd6kibb7g9slq"; depends=[ellipse MASS nlme survival]; };
+  SMR = derive { name="SMR"; version="1.0.0"; sha256="1479rkzwciw6h2r43wip52fmv5im33jrdphahcg38rfdqbx5ayrr"; depends=[]; };
+  sms = derive { name="sms"; version="2.2"; sha256="049wh6d44b9iy1cfzkqy2iqwn5n5hyzq4xvd6w92r70qhjj8km4i"; depends=[doParallel foreach]; };
+  smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
+  SMVar = derive { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
+  sn = derive { name="sn"; version="1.0-0"; sha256="1g4i49zsdas6bb1fbr8cpgqilb597jl2zypamf5m10nsd35y07kx"; depends=[mnormt numDeriv]; };
+  sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
+  snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
+  SNFtool = derive { name="SNFtool"; version="2.1"; sha256="12kjxgjazb0qivcyg0lkqlvkdk7algpw3s1ir8p5if5c8cpicjyy"; depends=[]; };
+  snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
+  SnowballC = derive { name="SnowballC"; version="0.5"; sha256="0cx73c7jpz8fxskkjp9ln003gb17qdxc9znhmsdkhqpdnahh3xaf"; depends=[]; };
+  snowfall = derive { name="snowfall"; version="1.84-6"; sha256="1n9v9m4c02pspgkxfmq7zdk41s2vjcsk06b0kz9km4xy1x7k0hsg"; depends=[snow]; };
+  snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; };
+  SNPassoc = derive { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats survival mvtnorm]; };
+  snpEnrichment = derive { name="snpEnrichment"; version="1.4-0"; sha256="0fdr27d7hk3vzvhrvgnypwcrk4y0sncrrg4kk730ynsv0ig7dswl"; depends=[]; };
+  snplist = derive { name="snplist"; version="0.12"; sha256="0jsf080pbpnsx2jygyqg0l14lsr4fvjzahgchdrawjhl2rky4nwl"; depends=[RSQLite Rcpp R_utils]; };
+  SNPmaxsel = derive { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[mvtnorm combinat]; };
+  SNPMClust = derive { name="SNPMClust"; version="1.0"; sha256="1vyag8axrl888qhjsbv7g84hzfsnvxh5ccdcdriamy50c2chkji8"; depends=[MASS mclust]; };
+  snp_plotter = derive { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
+  SNPRelate = derive { name="SNPRelate"; version="0.9.19"; sha256="19cz0jlsiy4fhhb54bbsmd2lwhsq8jmw6ccc7ir1j57cw1lzrk64"; depends=[gdsfmt]; };
+  snpStatsWriter = derive { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace]; };
+  SNPtools = derive { name="SNPtools"; version="1.1"; sha256="0l29kiqz4048x7amxx1qzkaw2xnd6lpdsdp5nq3rck9amx2hw64a"; depends=[]; };
+  SNSequate = derive { name="SNSequate"; version="1.1-0"; sha256="1cmnq4glhwwxim6lrls3vd234w3klkrpsid61rhzrli43297sibw"; depends=[magic]; };
+  SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
+  soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
+  SocialNetworks = derive { name="SocialNetworks"; version="1.0"; sha256="0g6l1rf08qz0332fglc2gvkba55fjq9fiwf25rjqanh6spgk60fn"; depends=[Rcpp]; };
+  SoDA = derive { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
+  SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
+  softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; };
+  SoftClustering = derive { name="SoftClustering"; version="0.14.02"; sha256="15j79h1ccvzfpi55prbv2d7bms1grgry0ka58cr757cvwavrnbb8"; depends=[]; };
+  softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; };
+  soilDB = derive { name="soilDB"; version="1.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; };
+  soilphysics = derive { name="soilphysics"; version="1.0"; sha256="1abw5b35g5fz12ka3sl8b84ffxf0x99dsv1d7ns8il2f5j0zxr7h"; depends=[rpanel]; };
+  soilprofile = derive { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
+  SoilR = derive { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
+  soil_spec = derive { name="soil.spec"; version="2.1.3"; sha256="17fm4hyx8g6pj7qv11xlnx459x1s41fapz6ck4my9br734gcm4ns"; depends=[KernSmooth wavelets hexView pls]; };
+  soiltexture = derive { name="soiltexture"; version="1.2.13"; sha256="10f4fdvicm7gj5zizpw197avzsbzj9x1g92y1ibh6lpdx3qz0ba1"; depends=[sp MASS]; };
+  soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
+  solaR = derive { name="solaR"; version="0.38"; sha256="0cvza0d4kd47kr6749ysvw664kjja87ppn4jvan4hrklczbpdc9z"; depends=[lattice latticeExtra zoo]; };
+  SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
+  solr = derive { name="solr"; version="0.1.4"; sha256="0b1f6mf8fi2ql8j06b0mkk7nyy5wj1zsg46lfxi6bp8n4ywbym9n"; depends=[plyr httr XML assertthat rjson]; };
+  som = derive { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; };
+  soma = derive { name="soma"; version="1.1.0"; sha256="0x1wnn22mf14kix3rpkshf585vnddappd8w035pdv8qfsh5zzw6f"; depends=[reportr]; };
+  somebm = derive { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
+  someKfwer = derive { name="someKfwer"; version="1.1"; sha256="023lrf62z3ik3g6qljmyjkg1lxs21q93ajj3hyjri14431ccc2pg"; depends=[]; };
+  someMTP = derive { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
+  somplot = derive { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
+  soobench = derive { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
+  SortableHTMLTables = derive { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[testthat brew]; };
+  sortinghat = derive { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[MASS bdsmatrix mvtnorm]; };
+  sorvi = derive { name="sorvi"; version="0.4.05"; sha256="1pp0pj4nkayx133qsrqcg8jhbhf1cfs8m6jxh1nl4vb43gvk43sw"; depends=[pxR RCurl rjson sp spdep RColorBrewer RgoogleMaps XML gdata ggplot2 maptools plyr png reshape reshape2 rgdal rgl]; };
+  sos = derive { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
+  sos4R = derive { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[XML RCurl sp]; };
+  sotkanet = derive { name="sotkanet"; version="0.9.03"; sha256="1h8jmwv99hcrl5hkd99ypphvl8hx6k765vb8aphzp8a0vh42pkl1"; depends=[ggplot2 rjson]; };
+  soundecology = derive { name="soundecology"; version="1.1.1"; sha256="0md33ipcqcsbl361s242c4wk9szsl8sywks6ikzljabrfpjy3bkp"; depends=[pracma oce ineq vegan tuneR seewave]; };
+  source_gist = derive { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
+  sp = derive { name="sp"; version="1.0-15"; sha256="1pzkh1zzp61x9qg7k466syip1bcmp8m2j9vr964nv0fha9cfq6aj"; depends=[lattice]; };
+  spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
+  SPA3G = derive { name="SPA3G"; version="1.0"; sha256="0fcbrg43c5r2n5p7bb8wslqzhl5h31paxr9rla583lkm0baxnmym"; depends=[]; };
+  spaa = derive { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; };
+  space = derive { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
+  SPACECAP = derive { name="SPACECAP"; version="1.0.6"; sha256="0nbvplcn4yhf3jgprvbil8cdcb8sx8h6l7djwn7pnv1dxprv71lg"; depends=[TeachingDemos coda lattice]; };
+  spaceExt = derive { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[limSolve glasso]; };
+  spacejam = derive { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
+  spacetime = derive { name="spacetime"; version="1.1-0"; sha256="0hmwlvam57i58lhfy9328ld1w4c5ilif6s1wvz6l9zvh036169zi"; depends=[sp zoo xts intervals lattice rgeos]; };
+  spacodiR = derive { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[picante colorspace Rcpp]; };
+  spacom = derive { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[spdep foreach iterators lme4 nlme Matrix]; };
+  spam = derive { name="spam"; version="0.41-0"; sha256="0pky172hycis2idq4274f9i4vhvj3lz7fpr869vm4qklb91j81sp"; depends=[]; };
+  spaMM = derive { name="spaMM"; version="1.1"; sha256="1jmp33ifnskwxziwkwkhb9zrq2mgl0nayzl2wrxadiqpjjad3603"; depends=[Matrix MASS lpSolveAPI]; };
+  SPAr = derive { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; };
+  sparc = derive { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
+  sparcl = derive { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
+  sparkTable = derive { name="sparkTable"; version="0.9.6"; sha256="1q8xc672rr1yy7aaklcn7i93k09l8sxzf20i1nqwynwy3fb3kv66"; depends=[xtable Cairo Rglpk StatMatch gridExtra RGraphics ggplot2 pixmap]; };
+  sparktex = derive { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; };
+  SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; };
+  sparr = derive { name="sparr"; version="0.3-4"; sha256="1d0rbiwl6149i8izdjrp48fxgk23xk94xm3gbrwpjv37x8fhzy6y"; depends=[spatstat rgl MASS]; };
+  sparseBC = derive { name="sparseBC"; version="1.0"; sha256="16x581pm9fkbb4kp8lvz95mnckgrjbiwj9zin8hzyxdl1nrg4c3m"; depends=[glasso]; };
+  sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; };
+  SparseGrid = derive { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
+  sparseHessianFD = derive { name="sparseHessianFD"; version="0.1.1"; sha256="15x9v7b40mxl1z9ncazxzfzz7igvzmck22wlgj2y7c2ja8jxi6n2"; depends=[Rcpp RcppEigen Matrix]; };
+  sparseLDA = derive { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[lars elasticnet MASS mda]; };
+  sparseLTSEigen = derive { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[robustHD Rcpp RcppEigen]; };
+  SparseM = derive { name="SparseM"; version="1.03"; sha256="11wwh7z8k1vdxfg0z1d71q6g5mx92xi3fdz3mzq64m78nhqa36ij"; depends=[]; };
+  sparseMVN = derive { name="sparseMVN"; version="0.1.0"; sha256="1xcq1w80ypqdz4zxwhnnzc50lhja6qxfxxnrg5xkgzpmy1zvjbzq"; depends=[Matrix]; };
+  sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
+  spartan = derive { name="spartan"; version="1.3"; sha256="063nfxh8y0319y35lg3vlamjya0nsba81dijp2nahikwg1c1b67s"; depends=[]; };
+  spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
+  spate = derive { name="spate"; version="1.3"; sha256="17aiqi5cd17y9kaqx9yssk772ghcldk9i4s8nyafq8zp8d4r85i1"; depends=[mvtnorm truncnorm]; };
+  spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; };
+  spatial = derive { name="spatial"; version="7.3-8"; sha256="1vc6pc5i7nbazbh5y3hhr9kgaq0gd9xi89xc8ah4n0lrivjbxfa8"; depends=[]; };
+  spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; };
+  SpatialEpi = derive { name="SpatialEpi"; version="1.2"; sha256="1mf2ni9jbrhj14k8c5fm9hxzpralx3aszczn6p6lk7wbmjh8j29k"; depends=[sp MASS maps maptools shapefiles spdep gtools rgeos lattice Matrix nlme]; };
+  SpatialExtremes = derive { name="SpatialExtremes"; version="2.0-0"; sha256="0fjh4cjzljwzxk4bhcrff9wnkskaiawbj7z6swrj1xl35mq4dljx"; depends=[]; };
+  spatialkernel = derive { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; };
+  SpatialNP = derive { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
+  SpatialPack = derive { name="SpatialPack"; version="0.2"; sha256="1kvqsqgh627fmi3bdd0pcxv9byjraz47ax7c6w4jxdngfs7xpfzc"; depends=[]; };
+  spatialprobit = derive { name="spatialprobit"; version="0.9-10"; sha256="1z88nss69pixazqk3b6rpyc7mjryfznrgw9swfyfxky0bsdfj6mv"; depends=[Matrix spdep mvtnorm tmvtnorm]; };
+  spatialsegregation = derive { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
+  spatialTailDep = derive { name="spatialTailDep"; version="1.0"; sha256="070jsz86jc4qvwa8j9gfksy23hf0wgj307w7jd5107ng1f42047v"; depends=[cubature mvtnorm SpatialExtremes]; };
+  spatial_tools = derive { name="spatial.tools"; version="1.3.8"; sha256="0lpkfr1h8bbpkgzpgav4258f23wzq45id8gbxd5cgk0s15g0rh1m"; depends=[iterators foreach rgdal raster mmap abind doParallel]; };
+  SpatialTools = derive { name="SpatialTools"; version="0.5.7"; sha256="1l6b895znww4g1ga88pskp1s6czg5qvl6wfzmifp866mbndsxmx7"; depends=[spBayes Rcpp]; };
+  SpatialVx = derive { name="SpatialVx"; version="0.2-0"; sha256="0amsdh5cwcd27ws6fcgv5rxhmw6kfg7vrmzrj62fi93ajp4aiq4y"; depends=[spatstat fields smoothie smatr turboEM distillery maps boot CircStats fastcluster waveslim]; };
+  SpatioTemporal = derive { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[Matrix MASS]; };
+  spatstat = derive { name="spatstat"; version="1.36-0"; sha256="0z4ls57328aagcx700zwhq1rawi21yiilms1rvpnshaa9gc2fy79"; depends=[mgcv deldir abind tensor polyclip]; };
+  spatsurv = derive { name="spatsurv"; version="0.9-1"; sha256="0hmhw90rsnv01cbs07z2w4ihhvwhrmrgv3nysk745vm57lpqy7bk"; depends=[survival flexsurv sp iterators RandomFields fields rgl Matrix FNN]; };
+  spBayes = derive { name="spBayes"; version="0.3-8"; sha256="0pmriffqnblqyd1332a2pqrjr7y3wllb17swb403h7c9dph6mzzv"; depends=[coda magic abind Formula]; };
+  spc = derive { name="spc"; version="0.5.0"; sha256="0bh4a3dpavczckhpwqax1h5w73ai3mkf0nwq9nhlvkdrh6k6j6cy"; depends=[]; };
+  spcadjust = derive { name="spcadjust"; version="0.1-2"; sha256="1i64hbslsmnap6ljwpzygrbcb2q1zp0jsm02x2a29nyxq05wwrrv"; depends=[]; };
+  spcosa = derive { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[rJava ggplot2 sp]; };
+  spcov = derive { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
+  spcr = derive { name="spcr"; version="1.1"; sha256="039m1y66j085381x39dhswzzmq5r2xkps93d4jj8yjc5bkplbxxy"; depends=[]; };
+  spd = derive { name="spd"; version="1.9"; sha256="1f2663rgc11knhiz529msjzpjgxv42cjxgwbvkkk62sq348mq65m"; depends=[KernSmooth]; };
+  spdep = derive { name="spdep"; version="0.5-71"; sha256="0nj4hh5nn595ghsvisc6g7p4hj5fjxbihc6gdc1afky8rchr22hl"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
+  spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
+  speccalt = derive { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
+  SPECIES = derive { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; };
+  SpeciesMix = derive { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
+  specificity = derive { name="specificity"; version="0.1.1"; sha256="1gvlyx9crkzm3yyp1ln5j9czcg83k7grm6ijabhl919gjjr1p60n"; depends=[car]; };
+  SpecsVerification = derive { name="SpecsVerification"; version="0.1-1"; sha256="0bym4r2bz02v7cw0sn5bpsrnyvrm9jq2s9hz621x10d37iymc7m0"; depends=[]; };
+  spectralGP = derive { name="spectralGP"; version="1.3.1"; sha256="1bc8y4wk09spsvbv8cn1iqq2y9qdlvrcnpqh2s0b8j4nxx262gyb"; depends=[]; };
+  spectral_methods = derive { name="spectral.methods"; version="0.7.2.125"; sha256="06d7l3hv1yi887yd3ig63n2ajyxa7a0cpjaza8spif9yj5jia35d"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; };
+  speedglm = derive { name="speedglm"; version="0.2"; sha256="1vl3q67qhrvg01m2yaxrjz4rc3wh1mrmr3hdh0bbdg8rjq1khbl0"; depends=[Matrix]; };
+  speedRlibs = derive { name="speedRlibs"; version="1.1-36"; sha256="1q0kv07wgirfmvaqrnyfr6csz8yycjnpqlvxq9w2k5agsn86pbr8"; depends=[]; };
+  speedRlibTF = derive { name="speedRlibTF"; version="0.3-39"; sha256="061cnc9qy1zpfr0k9a57jfy3xf25gkl67f22sniykmk31v0vr60r"; depends=[]; };
+  speff2trial = derive { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
+  SPEI = derive { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; };
+  sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzrfr9hw2hm8d0cyfmc29p5fcplmjm24idh"; depends=[]; };
+  sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
+  spfrontier = derive { name="spfrontier"; version="0.1.3"; sha256="14qi9kkgxsy6fc3cp4lmnmbg3hs8w6r200k2d7gyspc3v11cs1yh"; depends=[moments ezsim tmvtnorm mvtnorm Matrix]; };
+  spgrass6 = derive { name="spgrass6"; version="0.8-3"; sha256="0syrm4fgyzslvl9k8szlha01iqkz02nla08whys3pvf4s9zjd4xl"; depends=[sp XML]; };
+  spgwr = derive { name="spgwr"; version="0.6-24"; sha256="10yiyq704gs51h7i2nrd5r8730np7hvkcfnn3mly5wgaanrcb6n4"; depends=[sp]; };
+  sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
+  SphericalCubature = derive { name="SphericalCubature"; version="1.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; };
+  SpherWave = derive { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; };
+  sphet = derive { name="sphet"; version="1.5"; sha256="00hgzashw5qdv7j2q0cz433k595d8dzlxr89kvz1z2cpb87pfv54"; depends=[nlme spdep Matrix sp]; };
+  spi = derive { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
+  SPIAssay = derive { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; };
+  spider = derive { name="spider"; version="1.3-0"; sha256="1p6f8mlm055xq3qwa4bqn9kvq60p8fn2w0cc6qcr22cblm5ww7jp"; depends=[ape pegas]; };
+  spikeslab = derive { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
+  spikeSlabGAM = derive { name="spikeSlabGAM"; version="1.1-7"; sha256="1hdclj3fq31n9hvyggj2rvz2m95kjszbcswa46vfi2vyiwbb2bia"; depends=[ggplot2 akima coda cluster gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
+  SPIn = derive { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
+  splancs = derive { name="splancs"; version="2.01-34"; sha256="0r7kn16mkpzyj52i28w40k0hngkf4i3si4qvkb8m5s641lw2jmpk"; depends=[sp]; };
+  splitstackshape = derive { name="splitstackshape"; version="1.2.0"; sha256="0p9av1zzzl6h5d3fprwcd8ng1g2s8wq7bzid7lqig3k8mcgzwm20"; depends=[data_table]; };
+  splm = derive { name="splm"; version="1.1-0"; sha256="1dhfasan5abr9gf6lfdl83cr47ckkj5sqjqgclnc6f6a2125q1fi"; depends=[MASS nlme spdep plm Matrix bdsmatrix spam ibdreg car lmtest Ecdat maxLik]; };
+  spls = derive { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
+  splus2R = derive { name="splus2R"; version="1.2-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; };
+  splusTimeDate = derive { name="splusTimeDate"; version="2.0.0-117"; sha256="1cmjlxczckbv3imibnns9wzrlz0irgrnf1s9fqsymxf01bcs0hjc"; depends=[]; };
+  splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
+  spMC = derive { name="spMC"; version="0.3.1"; sha256="12ymyyy77y7azbg983y091dfqcv68c7lpz2rcnnn384jqp7b2c4v"; depends=[]; };
+  SPmlficmcm = derive { name="SPmlficmcm"; version="1.1"; sha256="02hg9dzfnxa8cz31kkq52707f7y5471cq78asfbrf397mfz82wbl"; depends=[numDeriv nleqslv boot]; };
+  SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955rq4fb27as71z89h23mkswz5r5"; depends=[Matrix]; };
+  spocc = derive { name="spocc"; version="0.1.2"; sha256="14jcmdlllisxzaqw3y7jyg5mq6jwalf0y6450wck50nmwah9jixw"; depends=[ggplot2 rinat rbison rgbif ecoengine rebird AntWeb plyr ggmap maptools rworldmap sp rgeos lubridate RColorBrewer httr XML rgdal RJSONIO leafletR data_table assertthat]; };
+  SPODT = derive { name="SPODT"; version="0.9"; sha256="0r5zr0h5dgbkpn6dlvpj58s2wp3ngb7zb1xdapq1j25msmhwn5yy"; depends=[rgdal sp tree]; };
+  sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
+  SportsAnalytics = derive { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
+  SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; };
+  sprsmdl = derive { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
+  SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
+  spsmooth = derive { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
+  spsurvey = derive { name="spsurvey"; version="2.6"; sha256="1s48acqi502mdabhymhn0jjsghnlh2w6wnrfaa9gv0a7xjvjkydq"; depends=[sp deldir foreign MASS rgeos]; };
+  spt = derive { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
+  spTimer = derive { name="spTimer"; version="1.0-1"; sha256="0a1rzk2kini05xk4irkc3d4ywhghwzw73sn1p8jmjl31r352ajqk"; depends=[coda forecast spacetime]; };
+  spuRs = derive { name="spuRs"; version="1.0.5"; sha256="0k4ss65nq9imb1gcsl09xj33flryaihiq9blpc8sd4h9mdw64fca"; depends=[MASS lattice]; };
+  sqldf = derive { name="sqldf"; version="0.4-7.1"; sha256="03pg1wrkbhh6yi794rf5a96kls0zixqz50ralznvgd0zyvmd3cz2"; depends=[gsubfn proto RSQLite RSQLite_extfuns DBI chron]; };
+  sqliter = derive { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[stringr functional DBI RSQLite]; };
+  sqlshare = derive { name="sqlshare"; version="1.0.3"; sha256="1qy8vlzi6i4wsr53i71jlsv1b7ww254mbk2qzsvmcrranf42zbp8"; depends=[RCurl]; };
+  sqlutils = derive { name="sqlutils"; version="1.1.2"; sha256="1d3x4wid7f9h2y36avsajjvshzcszr2nby71ixfdq3iv8z01z4j3"; depends=[roxygen2 stringr DBI]; };
+  SQN = derive { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
+  SQUAREM = derive { name="SQUAREM"; version="2012.7-1"; sha256="17d5b9h7h8ayasi4zg790b3a11rka8dkfcmvhrjg4rvlggwjda5j"; depends=[]; };
+  squash = derive { name="squash"; version="1.0.1"; sha256="1402m3jh84mfwkjwy2f898r3cfmf4sxyh90yv9gy60qx1v3hrzwc"; depends=[]; };
+  sra = derive { name="sra"; version="0.1"; sha256="165r1aiv17gdhln2374724nx04wjcdpillxwwkxgshz3kjyvajvj"; depends=[]; };
+  sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
+  SRPM = derive { name="SRPM"; version="0.1-7"; sha256="1c7mca1p0z48w5jbywqqfbdwzcimy24fm23h5n930mxbxgh51shk"; depends=[stashR filehash cacheSweave]; };
+  SRRS = derive { name="SRRS"; version="0.1"; sha256="1450asdvl160ww1jc3s61lypk48r7dlm8hxypkgbjx6kf2j29zc9"; depends=[tcltk2 gregmisc]; };
+  ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; };
+  ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
+  SSDforR = derive { name="SSDforR"; version="1.4.3"; sha256="1r32kax83x0k80lmz1zj5p291qd0rrxfi9vqx1z27am3gn3s4xfj"; depends=[psych]; };
+  ssfit = derive { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
+  ssize_fdr = derive { name="ssize.fdr"; version="1.1"; sha256="00y00cb0bhsk0qcq9f96dcmmzmy88k1qyhx9ampws34n133cl509"; depends=[]; };
+  ssmrob = derive { name="ssmrob"; version="0.4"; sha256="1inndspir7571f54kalbj0h599v9k6dxdmp0n1l5r3a62vn45hd3"; depends=[sampleSelection robustbase mvtnorm MASS]; };
+  SSN = derive { name="SSN"; version="1.1.2"; sha256="0hm3r5lf7ah4v1pjaf13kjxxdncrp11gh0n81nsjkgsrqz6mmfl6"; depends=[RSQLite MASS igraph maptools lattice sp]; };
+  sspline = derive { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; };
+  sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
+  SSsimple = derive { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
+  ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
+  ssym = derive { name="ssym"; version="1.2"; sha256="0nkmflb8pbb1m3prrh9i6zwi00kvrm2x7rqf06gf5avyf1lkm92b"; depends=[GIGrvg numDeriv gsl normalp]; };
+  st = derive { name="st"; version="1.2.2"; sha256="0dbs95iaac3zvcgrndqic6rwchyvkbda641pv0dvj7h64c3k8w24"; depends=[sda fdrtool]; };
+  stab = derive { name="stab"; version="0.1.8"; sha256="1rbwfxdbdqb1l91xmnnz5z5m353z4rjihr0c1f7r77a0zl7sa3zj"; depends=[MASS reshape]; };
+  stabledist = derive { name="stabledist"; version="0.6-6"; sha256="0s59jp3y5ks4rfj7x76vb9g3slbbn98lvki54lv96yxdfr8i7ry5"; depends=[]; };
+  StableEstim = derive { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[Matrix stabledist testthat numDeriv xtable fBasics MASS]; };
+  Stack = derive { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[plyr stringr ff ffbase bit]; };
+  stacomirtools = derive { name="stacomirtools"; version="0.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
+  stam = derive { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
+  StAMPP = derive { name="StAMPP"; version="1.2"; sha256="0fd328byrcq11rpq4dvk65vs8gswaw0d9jb8di9hx5r7cdpka1g3"; depends=[pegas doParallel foreach adegenet]; };
+  StandardizeText = derive { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
+  standGL = derive { name="standGL"; version="1.1"; sha256="1ffskpba30ih1sb1gscy4njgr4vv0642311hj1m7x7n5slisnysm"; depends=[]; };
+  STAR = derive { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[survival mgcv R2HTML gss codetools]; };
+  stargazer = derive { name="stargazer"; version="5.0"; sha256="1n4ksf1cvklrg6aqq348gh914j0ihnrzwfshnqgfw1x6q9bx6isl"; depends=[]; };
+  STARSEQ = derive { name="STARSEQ"; version="1.02"; sha256="1gb763bb7z871hb443d29r0vvyl2inr0df0q0xxxg16scl4p4yvb"; depends=[CompQuadForm numDeriv vcf2geno]; };
+  startupmsg = derive { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
+  stashR = derive { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[filehash digest]; };
+  Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
+  StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
+  StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
+  StateTrace = derive { name="StateTrace"; version="1.0-4"; sha256="1nmdqmg4az1afhprjyqb9qqcvd0xa6xdb8gzar5jrcdldxxbsw35"; depends=[KernSmooth coda fgui]; };
+  statfi = derive { name="statfi"; version="0.9.06"; sha256="1fkx8jszmhzsgn0w45479klq1qhlagpj5b7s83p1g9lxymj33f8p"; depends=[pxR]; };
+  StatMatch = derive { name="StatMatch"; version="1.2.1"; sha256="1vv7730fmncysm7sv96kgwwi5s50fks1pn4zgv4w54qwlf286dzz"; depends=[proxy clue survey RANN]; };
+  statmod = derive { name="statmod"; version="1.4.19"; sha256="1g0yws7vmclk0w0mrzbsf86fl3fwd920hfmllklzkzm57if8yapa"; depends=[]; };
+  statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; };
+  statnet_common = derive { name="statnet.common"; version="3.1.1"; sha256="1fs38f4dxrvgm60xvn04jr2wwyrjg25h3rbdwrx7dx24fj7sx6wl"; depends=[]; };
+  StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; };
+  stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
+  Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; };
+  stepp = derive { name="stepp"; version="2.3-2"; sha256="1x7vbniwk83x9wn6a5ya053nkg9jmzqprqbg87zpp0fsn9z7qhyq"; depends=[cmprsk survival]; };
+  stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
+  stepwise = derive { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
+  StereoMorph = derive { name="StereoMorph"; version="1.0"; sha256="1gxkll2h1sm7cznm55z533v8z8gd52an3ac3dzcmnxbv30vj1s9m"; depends=[]; };
+  stilt = derive { name="stilt"; version="1.0"; sha256="192ild2i37apdzd03m2h3awjj09y07ws870v67cx4dih36mxgm5j"; depends=[fields]; };
+  stima = derive { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; };
+  stinepack = derive { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; };
+  stm = derive { name="stm"; version="0.6.1"; sha256="18f62kkirkn60whaps4g1ccmh6hrnp81mlz4b0h5sicg8plzp91w"; depends=[matrixStats slam lda stringr]; };
+  StMoSim = derive { name="StMoSim"; version="2.2"; sha256="127nr488a9xx3pjzrncbzw58ims87jifnzhpvqrr74px6wv0yisc"; depends=[]; };
+  stocc = derive { name="stocc"; version="1.0-7"; sha256="1gnsmc30innh2yjwgbggb16kg9438g98kz8lgq87pkl24kmjbq0c"; depends=[truncnorm coda Matrix fields]; };
+  stochvol = derive { name="stochvol"; version="0.8-1"; sha256="0lrda9hkn8ysin02vqwy7vs9c4cbj34lf04bg9d8gdg7rqbcssh3"; depends=[coda Rcpp]; };
+  stockPortfolio = derive { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
+  stoichcalc = derive { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
+  Storm = derive { name="Storm"; version="1.0"; sha256="0dmbgv78f598ihhks4wsfml3fxs6f5alzc9nm909qha5kzpb8m8a"; depends=[rjson]; };
+  stosim = derive { name="stosim"; version="0.0.11"; sha256="0fv5f9vvcsq86bis0hrb2k2ax78k1q8iwg7v1lj1l3qv5q6sq583"; depends=[tcltk2 Rcpp]; };
+  stpp = derive { name="stpp"; version="1.0-4"; sha256="04xl2745xr5r7yirbdmxaxqvl4gp73wr6xl08w21mcccsnpc3d1s"; depends=[splancs KernSmooth spatstat]; };
+  stppResid = derive { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[deldir splancs cubature]; };
+  StrainRanking = derive { name="StrainRanking"; version="1.1"; sha256="0q6k90if74320mrs2ccq2izynylr8zakciwbc2c6ms0v57aalwic"; depends=[]; };
+  strap = derive { name="strap"; version="1.1"; sha256="1396w7xk0vq5lhf1nph0za9c80zc9d9ycdrkafx475pqca2i8qlm"; depends=[ape geoscale]; };
+  stratification = derive { name="stratification"; version="2.2-3"; sha256="0mjv5x47rc7ci4ca949pg6ixmv6bfdfph6yz31syqk5xrgm8zmxq"; depends=[]; };
+  stratigraph = derive { name="stratigraph"; version="0.64"; sha256="1mi4s3wxbrmcxb7k18z02dy5dnvg7kka1dbg2hgyi4nm9y8casdl"; depends=[]; };
+  StratSel = derive { name="StratSel"; version="0.1"; sha256="0783ff6kxa3b2v3b5n55rfjy976mjph3w5yx1lxahahwp4yl8h1a"; depends=[mnormt memisc Formula]; };
+  straweib = derive { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
+  stream = derive { name="stream"; version="0.2-0"; sha256="14bgmd7ab1gn7gvd3572l90rw725g9vyn46s65yll72b79s30cjp"; depends=[rJava proxy birch hash clue clusterGeneration MASS animation mlbench]; };
+  StreamingLm = derive { name="StreamingLm"; version="0.1"; sha256="079ks5gj6ydj2fqq8pwhkb24a0zbz2j400777fm6a39wjgbgdx1n"; depends=[biglm]; };
+  StreamMetabolism = derive { name="StreamMetabolism"; version="1.0"; sha256="03pr7i1c3qddqwibfc2x08d2nh8fih02k7a1xhqs1awfs43x56is"; depends=[zoo chron maptools]; };
+  streamR = derive { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
+  stremo = derive { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan numDeriv MASS]; };
+  StressStrength = derive { name="StressStrength"; version="1.0"; sha256="0m67rawgn6w49zh4mw951i3pk4ckp4bxz9yphw0klllazjxyd6qp"; depends=[]; };
+  stringdist = derive { name="stringdist"; version="0.7.2"; sha256="1f7d580al845iakdyhkpfzfk0m4b206gfpiz364d4qfws6rfq64y"; depends=[]; };
+  stringi = derive { name="stringi"; version="0.1-25"; sha256="1rr8wjq58yswgmpgn6awdkg02h800fqyhhw5651w9xra2w9673zp"; depends=[]; };
+  stringr = derive { name="stringr"; version="0.6.2"; sha256="0dv7dd0xsivlccnf9pr5kb7zirgqn9mc6lgw5hnmkbb0s1qrrz63"; depends=[]; };
+  strucchange = derive { name="strucchange"; version="1.5-0"; sha256="17ikp36ahnsx1q3avqkz5r2n2yagzq7j6m515vdm8rxgv0538is3"; depends=[zoo sandwich]; };
+  structSSI = derive { name="structSSI"; version="1.0.5"; sha256="0i832k8jf317m47kzzfhgla4qm8bqmj3azjm4iqndkym2ry3jiy4"; depends=[igraph Matrix RColorBrewer classInt]; };
+  strum = derive { name="strum"; version="0.2"; sha256="0ibylqy897xz8qp11ifiv8dg1kpm6bd9zkmn7c3qka07d4asxlgd"; depends=[pedigree MASS Rcpp]; };
+  strvalidator = derive { name="strvalidator"; version="1.1.0"; sha256="0kih7rsaivbaydm7prwjwh0r1kd061858w1pxy401baalj3f9bq6"; depends=[gtable ggplot2 gWidgets plyr scales gridExtra]; };
+  stsm = derive { name="stsm"; version="1.2"; sha256="1si2hyz4lbn2bpdxvgz4a21a4q9iqi8i46lfnjwn6qs4816pfcfs"; depends=[KFKSDS stsm_class]; };
+  stsm_class = derive { name="stsm.class"; version="1.1"; sha256="1bj7affkpn229q47kbsxyy3rysvp7491fbhacrvlnk60gjlvaxzg"; depends=[]; };
+  StVAR = derive { name="StVAR"; version="1.0"; sha256="072jwn02a7a9s23rda9m80klr7mla525dsf266khg2pb1y6anqyh"; depends=[MCMCpack numDeriv car fMultivar moments]; };
+  stylo = derive { name="stylo"; version="0.5.5-1"; sha256="0m4xkd0fpkfva9psxxvnaikqxscnhayyc50zmvpixa2p637hbp26"; depends=[tcltk2 ape pamr e1071 class lattice tsne]; };
+  SubCultCon = derive { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
+  SubLasso = derive { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet psych gplots]; };
+  subplex = derive { name="subplex"; version="1.1-3"; sha256="04dy0alpida9h2zirn5b84arjir3gqfbb21s5nm7fx0dbm53a9p5"; depends=[]; };
+  subselect = derive { name="subselect"; version="0.12-3"; sha256="1m1vk8jgmw0cb9gmzvvpzdpjaqp56kwhalb2b2il20kc57czmymr"; depends=[]; };
+  subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
+  sudoku = derive { name="sudoku"; version="2.5"; sha256="1wg86dv3bjz9v3p87ic6fnnkmal92q9klm445z8sf4cw059ghshz"; depends=[]; };
+  SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
+  sugaR = derive { name="sugaR"; version="0.0-5"; sha256="0lg0wm4fbf4f4vlsy2cnfwm18vnc3i6bd51pixpdb9m512pw761c"; depends=[]; };
+  SunterSampling = derive { name="SunterSampling"; version="1.0"; sha256="07s5sd6kf2jg276b5q1ns3h7849b1h0rx77kb3vs4j1svn8k9wxy"; depends=[]; };
+  supclust = derive { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[rpart class]; };
+  superbiclust = derive { name="superbiclust"; version="0.1"; sha256="0hzihmjjwk3axgy1y95ckq6m5gmb7ybjj7zscplgsnihi5256jnk"; depends=[biclust Matrix]; };
+  superdiag = derive { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[coda boa]; };
+  SuperLearner = derive { name="SuperLearner"; version="2.0-10"; sha256="1axfpk63azffmzy2ag4xlbsxccw2232y5xxygkkiy6c54kgp6301"; depends=[nnls]; };
+  superMDS = derive { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; };
+  superpc = derive { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; };
+  SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
+  support_BWS = derive { name="support.BWS"; version="0.1-1"; sha256="06ccv7qh75yra6imc20597wp3z3qcj5gkal4dwvh6dzkv48fcxs8"; depends=[]; };
+  support_CEs = derive { name="support.CEs"; version="0.3-1"; sha256="0rf5jrk104g133lckcvxbc5nmr2mvcrca67iv1vmmf9why3qv4gq"; depends=[DoE_base MASS simex]; };
+  surface = derive { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape ouch MASS geiger]; };
+  Surrogate = derive { name="Surrogate"; version="0.1-0"; sha256="1pc7vwh0q2gf7w7y7msfzwwb2ag4yf0kyaf7dn4s3mpf8rjrvws0"; depends=[MASS nlme msm lme4]; };
+  suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
+  surv2sampleComp = derive { name="surv2sampleComp"; version="1.0-3"; sha256="036mkwvknvrlgp8pqrrjsvnsxv53c3l9qp23jihv0wl29k4jz2gi"; depends=[survival plotrix flexsurv survC1]; };
+  survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
+  survBayes = derive { name="survBayes"; version="0.2.2"; sha256="08fbb2kyy7gcqlbzbliy4njkyk6jhr4nlfb4nbmh2kfdfcb6q62v"; depends=[survival coda]; };
+  survC1 = derive { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
+  surveillance = derive { name="surveillance"; version="1.7-0"; sha256="0lih7vk3jghkyjknznj5fly3skdhjs2fpmbz73ql19lyark9896x"; depends=[Rcpp sp xtable polyCub MASS Matrix spatstat]; };
+  survexp_fr = derive { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
+  survey = derive { name="survey"; version="3.29-5"; sha256="0qzg6h3m27d9v6iyh88pk7iq2glfnn8364jjl7z5d5cbw3ga3j81"; depends=[]; };
+  surveydata = derive { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[stringr plyr]; };
+  Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
+  survIDINRI = derive { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survival survC1]; };
+  survival = derive { name="survival"; version="2.37-7"; sha256="1ihs42gjbw06aj5hz128964lshpi934cyc8npv9c8ann4mc2r3b5"; depends=[]; };
+  survivalMPL = derive { name="survivalMPL"; version="0.1.0"; sha256="1nq316w88j7dg48683ka326b2y3f9jl73mig47n3y31z2x9hc8h0"; depends=[survival]; };
+  survivalROC = derive { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
+  survJamda = derive { name="survJamda"; version="1.1.2"; sha256="172mryz19n4nb9w20xh7yhn4pqaw9m98na2x235lps5rwcjk6x7b"; depends=[survival survivalROC ecodist survJamda_data]; };
+  survJamda_data = derive { name="survJamda.data"; version="1.0.1"; sha256="1b8vy59hawgvpjds96q5wscggv8hffkbjw7zwfwf5g3firhb4gnq"; depends=[]; };
+  survMisc = derive { name="survMisc"; version="0.4"; sha256="0rrhq5hfi4y6x8gqdqavszqbif7nrmmc4n26hz2dli198gv5l2wp"; depends=[survival km_ci ggplot2 data_table gridExtra KMsurv combinat stringr Hmisc zoo gam]; };
+  survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
+  survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
+  SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
+  survsim = derive { name="survsim"; version="1.1.0"; sha256="0p4233n05mpaavdda5l69b6335vhlfd2jp0802vvr720fpxbaia1"; depends=[eha statmod]; };
+  survSNP = derive { name="survSNP"; version="0.21-7"; sha256="0fanya7ghd61pw7a21xkaxz4mgzdwjwkh1wm41h40wq1c529dzph"; depends=[survival Rcpp lattice foreach xtable]; };
+  svapls = derive { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
+  svcm = derive { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
+  svd = derive { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
+  svDialogs = derive { name="svDialogs"; version="0.9-55"; sha256="0x1wzqypxir0322mr3zsax1v64y9jdz5sya98y20hc3619mpynwj"; depends=[svGUI]; };
+  svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
+  svdvisual = derive { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
+  svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; };
+  svHttp = derive { name="svHttp"; version="0.9-55"; sha256="0qxsh6ifk3fszgzz497qwia4pxzplwraf2qnn5cqlv5l79nja5yq"; depends=[svMisc]; };
+  svIDE = derive { name="svIDE"; version="0.9-52"; sha256="19wsmi1i7nlnqdah1h2pxzsy8m50bnb282fdbj4219p86bb92a86"; depends=[svMisc XML]; };
+  svKomodo = derive { name="svKomodo"; version="0.9-62"; sha256="1af22nfbhmx5b3n45k5xfwq667w4cd7m0g5hx5dvv2vfikr613nx"; depends=[svMisc]; };
+  svMisc = derive { name="svMisc"; version="0.9-70"; sha256="1xprymz5hblbc929kmbaz0lj633xvgz6mm4snhhjib47cz5anl1w"; depends=[]; };
+  SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
+  svmpath = derive { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
+  svSocket = derive { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; };
+  svSweave = derive { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; };
+  svTools = derive { name="svTools"; version="0.9-4"; sha256="0szr5dcxjsh5p1nkszvmj0vmi9x70d656hfvhmqf0wyjwv63vp90"; depends=[codetools svMisc]; };
+  svUnit = derive { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; };
+  svWidgets = derive { name="svWidgets"; version="0.9-44"; sha256="18k06wldcg6xpyf8nz9rdbig5nhvghn7zgf1316413kq3v90vz7b"; depends=[svMisc]; };
+  SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; };
+  svyPVpack = derive { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
+  swamp = derive { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots MASS]; };
+  SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
+  SweaveListingUtils = derive { name="SweaveListingUtils"; version="0.6.1"; sha256="04xl7sw14x3ia5nsmkj1fhxvycl9wpim3frx83dd6kh8i0hpip54"; depends=[startupmsg]; };
+  sweSCB = derive { name="sweSCB"; version="0.3.4"; sha256="0fchrp8hsya0yxxnlcf01xklldc5kwkga9qd7wm0g53ahg86yyz9"; depends=[data_table stringr RJSONIO httr]; };
+  swirl = derive { name="swirl"; version="2.2.5"; sha256="1fvqv58aaywbfqajc33p0yb0zjy3zl1hcb8y7j5kg5qq7yads212"; depends=[stringr testthat httr yaml RCurl digest]; };
+  SwissAir = derive { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
+  switchnpreg = derive { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[MASS fda expm HiddenMarkov]; };
+  sybil = derive { name="sybil"; version="1.2.5"; sha256="10i704mrnh51ibgd31cnnsjyxi5r27p4bmr3h0kfy8jm4qbm0z60"; depends=[Matrix lattice]; };
+  sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; };
+  sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.0"; sha256="0wckkri37lvmcgrl8pj9d0zvczgfbklmkxx8yfn3w0k2dqp0wi47"; depends=[sybil Matrix MASS]; };
+  sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
+  sybilEFBA = derive { name="sybilEFBA"; version="1.0.1"; sha256="1advbbsyig49av7sbpbvs47xzg6f8czjb1938ynd0n2yq1bgq5xm"; depends=[sybil Matrix]; };
+  sybilSBML = derive { name="sybilSBML"; version="2.0.7"; sha256="11wq9xbhmp3fjgdc507fhp0384xzwk5mn2dqm7w688dk8cidvwkx"; depends=[Matrix sybil]; };
+  symbolicDA = derive { name="symbolicDA"; version="0.4-1"; sha256="14lcxgbsizw0l1xcjrmz3jvfsbwlirkd0shp293hg3qi7gbzcms8"; depends=[clusterSim XML rgl shapes e1071 ade4]; };
+  symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
+  symmoments = derive { name="symmoments"; version="1.1"; sha256="0p0q9wbpwpzvr5cikqg9mjl2z7fan4v7isxj8hva3h8b6j48vdab"; depends=[mvtnorm]; };
+  synbreed = derive { name="synbreed"; version="0.9-7"; sha256="0v81q18dqr7zrh7830xfk30jq6kzgn0kcrp9zq6swk5laalkkqg4"; depends=[doBy BLR regress abind lattice igraph MASS LDheatmap qtl synbreedData]; };
+  synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfwpvxq8f93z1amfss98as66kwpj5mnvvlr33ffmka9"; depends=[]; };
+  synchronicity = derive { name="synchronicity"; version="1.1.4"; sha256="0hcxwgf1irswwabgl0b6vb9q09nhxc1ljsm195lc8ql49sfj9mfz"; depends=[bigmemory_sri]; };
+  synchrony = derive { name="synchrony"; version="0.2.2"; sha256="1livac5ji5bk3ydnc4108csqbyhrlh06c35vv9ni95h38hp18llv"; depends=[]; };
+  SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
+  SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; };
+  SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
+  SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
+  synlik = derive { name="synlik"; version="0.1.0"; sha256="0b51wz4l3586g44m812d273q8x18glwxj4kd4g6qsqd4m1v35058"; depends=[Rcpp Matrix]; };
+  Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
+  sysfonts = derive { name="sysfonts"; version="0.2"; sha256="15wzb7c89645xxbhn29bh0djys73iklq05228qnhd5gx5sr43dd0"; depends=[]; };
+  systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
+  tab = derive { name="tab"; version="2.1.1"; sha256="006j43smk9gggfzyg75ah2dag16s82fwcq2kdznm5i8b410hjr3y"; depends=[survival gee]; };
+  Table1Heatmap = derive { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
+  table1xls = derive { name="table1xls"; version="0.3"; sha256="1av93a5h2br1js8146h9w5xqx7f9nfsjis5bdknayrajdanx5dc1"; depends=[XLConnect]; };
+  tableone = derive { name="tableone"; version="0.5.0"; sha256="0k9vpdn84wch4jr83imcx14ysgpdwi1x882k5q55n0hjcby007fd"; depends=[e1071 gmodels]; };
+  tableplot = derive { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
+  tables = derive { name="tables"; version="0.7.64"; sha256="1ixiw267c4wfznk3cx4x71yjczv1828423q80wlx0gwdfjlhbmsm"; depends=[Hmisc]; };
+  TableToLongForm = derive { name="TableToLongForm"; version="1.3.0"; sha256="1dxis6gx0misvl18jzsaqxjajclc98xppgxil5xsz1lcq0fkn383"; depends=[]; };
+  tabplot = derive { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
+  tabplotd3 = derive { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[tabplot httpuv Rook brew RJSONIO]; };
+  tabuSearch = derive { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
+  TAHMMAnnot = derive { name="TAHMMAnnot"; version="2.0"; sha256="12ai0rn31shb7halgi00b54gn8s35h9zy1s0r95k931nxb6w4djg"; depends=[mnormt]; };
+  TAM = derive { name="TAM"; version="1.0-2.1"; sha256="01w2dwsrr6616xkgb6181gv2bhva37xyrxvaviksm7034xxq73gs"; depends=[MASS mvtnorm tensor sfsmisc GPArotation psych Rcpp]; };
+  TANOVA = derive { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
+  TapeR = derive { name="TapeR"; version="0.3.2"; sha256="070zl7hqv5zprhs464gy1kmz0am58l0vig8xvdq6pbz94nrhvpj0"; depends=[nlme pracma]; };
+  TAQMNGR = derive { name="TAQMNGR"; version="2014.01-2"; sha256="1szds8yyk3ldap785jxi8lj86rf4zlpzhd7rk2y8xwcq2fhs9h62"; depends=[]; };
+  taRifx = derive { name="taRifx"; version="1.0.5"; sha256="1jiyz8pawd203qmmdvnflrrfkrqmsdnf3yxiscgqgcz22c3k4hg4"; depends=[plyr reshape2]; };
+  taRifx_geo = derive { name="taRifx.geo"; version="1.0.4"; sha256="1xwfh4zl444n7k6mdy45jaqf2jj315879bcpf3vcihnnrdabq9na"; depends=[taRifx sp plyr reshape2]; };
+  tau = derive { name="tau"; version="0.0-17"; sha256="144v2azk6pw1gc6r1mivai24wzrw24aargi05v83aif0cddf9xwa"; depends=[]; };
+  TauP_R = derive { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
+  tawny = derive { name="tawny"; version="2.1.0"; sha256="0y7l3pknsyppn3hzanl8gplfsdx6cr9z69ba2af4qgmw6j0glmgi"; depends=[tawny_types futile_matrix futile_logger PerformanceAnalytics quantmod]; };
+  tawny_types = derive { name="tawny.types"; version="1.1.1"; sha256="0il95rklqw0cg8kgijd2ca0maahjmhchkx41dw3h0jvfl40qfnfz"; depends=[lambda_r futile_logger futile_options futile_any zoo xts quantmod]; };
+  taxize = derive { name="taxize"; version="0.2.2"; sha256="1cbm7hifzarxhfh8rfw2kjikl67f2y0g21q5xmcc7qk65ljdcn1k"; depends=[XML RCurl stringr plyr httr RJSONIO foreach ape Taxonstand reshape2 data_table reshape vegan rgbif]; };
+  Taxonstand = derive { name="Taxonstand"; version="1.3"; sha256="0qfvsl2ywkagqn18iyjs3208szs0wm3xi39mssaw2l6rwyrx3kvd"; depends=[]; };
+  tbart = derive { name="tbart"; version="0.9"; sha256="1iim4qshbazrb58ydhaxzp9xpy9w1ji2h4nh74scnmsxjdj3gfkg"; depends=[Rcpp sp]; };
+  tbdiag = derive { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
+  TBEST = derive { name="TBEST"; version="1.4"; sha256="1jgx78k2r8cp7mv17jmqp6hpswhjbmfz9j0ffb0p0klj29lv8mj3"; depends=[signal]; };
+  TBSSurvival = derive { name="TBSSurvival"; version="1.1"; sha256="0hh0zpvwbkix8g9slf6bh4qzwmig5qif80q1ph6m5i496ywjcc80"; depends=[mcmc coda survival normalp R_utils BMS]; };
+  TcGSA = derive { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[lme4 ggplot2 GSA reshape2 gtools gplots cluster stringr]; };
+  tcltk2 = derive { name="tcltk2"; version="1.2-10"; sha256="0m648n028xc6gi3ypih0nyswczh787pwfq7ky2hsxabp958faflb"; depends=[]; };
+  TDD = derive { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[signal RSEIS pracma]; };
+  tdm = derive { name="tdm"; version="3.0.1"; sha256="0349k294n3ksm3mr3v78fmpslgm83lqsjzqqmqvzknhka6wwamm7"; depends=[rjags coda png]; };
+  TDMR = derive { name="TDMR"; version="1.0.1"; sha256="1m4vwxp5cvjkgwf6ajwfgfl6fi14cgrz6gy114ll9rcf36kgjp6f"; depends=[SPOT e1071]; };
+  tdthap = derive { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
+  TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
+  TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; };
+  TeachNet = derive { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
+  teigen = derive { name="teigen"; version="2.0.1"; sha256="1lsx7cb6frfi0i2pg1w228kydfymrbxqd535hnrhhq9j1shhykk4"; depends=[]; };
+  tempdisagg = derive { name="tempdisagg"; version="0.23"; sha256="1ym0cbvm8f1wvnkpdm34d5yzgbn3hig1kc3zv8b24pnx11ywv751"; depends=[]; };
+  tensor = derive { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
+  tensorA = derive { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
+  TEQR = derive { name="TEQR"; version="2.0-0"; sha256="1s73qd6cdap9xjhjgf9q7b266l2z3zmrd1pv9dzw3yh4lg2w8mlb"; depends=[]; };
+  TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
+  tergm = derive { name="tergm"; version="3.1.4"; sha256="0w5s4ziacxp9zdylmb8f7xrwvql58c6c9jvv27wjxdxpaf9iyp8h"; depends=[statnet_common ergm network networkDynamic robustbase coda nlme]; };
+  termstrc = derive { name="termstrc"; version="1.3.7"; sha256="12bycwhjrhkadafcckc30jr0md0ssj21n4v75yjhy21yvqjx1d7a"; depends=[lmtest Rcpp rgl sandwich urca zoo]; };
+  ternvis = derive { name="ternvis"; version="1.1"; sha256="16q1a1ns7q0d46js2m1hr6zm8msg3ncgp8w7yrwch11xq0759sb4"; depends=[quadprog maps maptools mapdata dichromat]; };
+  TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; };
+  tester = derive { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
+  testit = derive { name="testit"; version="0.3"; sha256="142q0zwlzx3w69j0fsd06s3pihr76kw9yg21596aalazh7c2yfgi"; depends=[]; };
+  TestScorer = derive { name="TestScorer"; version="1.5"; sha256="1kz7qxm96f6f0sd9y68i8fx88n9p52hr66y1gl5kpf21ihmgj4by"; depends=[]; };
+  TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
+  testthat = derive { name="testthat"; version="0.8.1"; sha256="1nja6yfcqyxi6nfs8mcwasslfw8mzlacjwj3kr65zmg58pm82ga4"; depends=[digest]; };
+  texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
+  TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; };
+  texreg = derive { name="texreg"; version="1.32"; sha256="09s68fvxrj7h69fw99vsn7g6hvjw1sn09ygyyydwazkbsp7iw2wy"; depends=[]; };
+  textcat = derive { name="textcat"; version="1.0-1"; sha256="0qk3435pr6nga6c3jwyn5z50ddmrlk8kaz2bp42pd15n6hc2svl3"; depends=[tau slam]; };
+  textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; };
+  textometry = derive { name="textometry"; version="0.1.2"; sha256="1p2fja00d0ipmzv1vgcaqhhbygqhgs72p8l4rz8xcpj5k3ngmfav"; depends=[]; };
+  TFDEA = derive { name="TFDEA"; version="0.8.3"; sha256="16vkvb5q7qyj35yl3hzdldmnjzb172qyjyx3anplrvh161lrhy5r"; depends=[lpSolveAPI]; };
+  tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
+  TFMPvalue = derive { name="TFMPvalue"; version="0.0.4"; sha256="0lcldym9h4946sk9nj5ic50s5ynlvv26dgjflij0akj5sq1dbph1"; depends=[Rcpp]; };
+  tfplot = derive { name="tfplot"; version="2014.2-2"; sha256="1jrkzccvqmwghp6nhxay0m1qx8r5wa96zb9r8v6qihryi9m3amhs"; depends=[tframe]; };
+  tframe = derive { name="tframe"; version="2012.8-1"; sha256="0m6kwwn7y4n0vkk9zvwixn2jg67rsv9f9s2xma2mxdxl1f5lnfvh"; depends=[]; };
+  tframePlus = derive { name="tframePlus"; version="2013.9-1"; sha256="070ad1g7yv1d5by6xrvshgn43jjxpq8waa339xhzc1am2qzb6mqr"; depends=[tframe timeSeries]; };
+  TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
+  tgp = derive { name="tgp"; version="2.4-9"; sha256="0ghn7pmwipwmq6lch7jvzghks9mbj9jrdv5140550vq4w6mnf57q"; depends=[]; };
+  tgram = derive { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
+  TH_data = derive { name="TH.data"; version="1.0-3"; sha256="0f52x4ill5d4wpb1iyz0blj62jqzrzr6gl74bmy5hxh3f4f4kwq1"; depends=[]; };
+  thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
+  Thinknum = derive { name="Thinknum"; version="1.2"; sha256="1chayv0mxmsvp05d2smb7y0fkvyppzn7a1s5amrq53qf4d0zknnl"; depends=[RCurl RJSONIO]; };
+  ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
+  threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
+  ThresholdROC = derive { name="ThresholdROC"; version="1.0"; sha256="1w7bjw1w09skxyc5w3d72wivljlvnck6vbchihjx7m5k6djn7pxi"; depends=[]; };
+  tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
+  TiddlyWikiR = derive { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
+  Tides = derive { name="Tides"; version="1.0"; sha256="10k8cmpfj9jjpzayyklslgazgl96078vfbn71ncgrn9bb98ahyqs"; depends=[]; };
+  tiff = derive { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
+  tiger = derive { name="tiger"; version="0.2.3"; sha256="1cci18g7mnyj687h5p3jr2m7pjh8bjgl9201fqbymv784886zfrm"; depends=[e1071 hexbin qualV klaR som]; };
+  tigerstats = derive { name="tigerstats"; version="0.1.3"; sha256="14cy7sz47ww5ag3h3i5yz44iy0g1n2hsdzvm9i2w4yhs40cqra8v"; depends=[lattice MASS]; };
+  tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
+  tikzDevice = derive { name="tikzDevice"; version="0.7.0"; sha256="12r6qk5qp4yvi3vqvdxp02799y6fhmg21qv6abp1s620n8hgva6d"; depends=[filehash]; };
+  tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
+  TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
+  tilting = derive { name="tilting"; version="1.0"; sha256="0s0lac39wnczjy6kb2a1an55fyndh61ya5cx4ic3799cgqvn8ba0"; depends=[mvtnorm]; };
+  timeDate = derive { name="timeDate"; version="3010.98"; sha256="12f4bdb9lv724p4p1490iznhnwznnn69c5b6wbljdvscl1yvys9a"; depends=[]; };
+  timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
+  timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
+  TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
+  timeordered = derive { name="timeordered"; version="0.9.6"; sha256="0h6y3asq1y788571c423bqkgdcx6k5i9jp6hp59x99g9l77y71sn"; depends=[igraph plyr]; };
+  TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; };
+  timereg = derive { name="timereg"; version="1.8.4"; sha256="1ar41dzl7pwh9rap87njyfqc5l4nvhzsv29xbysmcjflvgz15b4j"; depends=[survival prodlim]; };
+  timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; };
+  timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
+  timeSeries = derive { name="timeSeries"; version="3010.97"; sha256="0iv1jkh1h2qamsi22m7l3pdx0mgz96lafwjdxc99i558l2gdp2s3"; depends=[timeDate]; };
+  timetools = derive { name="timetools"; version="1.5.2"; sha256="1w6c4c31mnm5px3mrpwlrigqzr53nqpkk8myaa3vsv88ay6xsj0d"; depends=[]; };
+  TimeWarp = derive { name="TimeWarp"; version="1.0-7"; sha256="1qjr3kfdd1ym0fi4hgjqm32gigchbchxy4xyxmsyl8y7jh2jk9qj"; depends=[]; };
+  TIMP = derive { name="TIMP"; version="1.11.0"; sha256="0l8n3xg5ds1lbndd993nijny26s9p36n3j128527y53fs4915lxn"; depends=[fields vcd gplots colorspace gclus nnls deSolve minpack_lm MASS]; };
+  timsac = derive { name="timsac"; version="1.3.0"; sha256="1rndm71ia82g7jy717xqlwdmq0rklcaivd2qvxx3crad1zhh6zwc"; depends=[]; };
+  Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
+  TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
+  tipom = derive { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
+  tis = derive { name="tis"; version="1.23"; sha256="0k8g9r0ngiw5dnmg0vddcmfw2w7g69lamrpczabrd2jmvvy67npn"; depends=[]; };
+  titan = derive { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[MASS boot lattice]; };
+  tkrgl = derive { name="tkrgl"; version="0.7"; sha256="1kpq5p6izqrn1zr53firis3rmifq9lf6326lf3z7l1p82nf2yps5"; depends=[rgl]; };
+  tkrplot = derive { name="tkrplot"; version="0.0-23"; sha256="1cnyszn3rmr1kwvi5a178dr3074skdijfixf5ln8av5wwcy35947"; depends=[]; };
+  tlemix = derive { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
+  tlmec = derive { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
+  tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
+  tm = derive { name="tm"; version="0.5-10"; sha256="0gmlgayilnmq9pav0qk1jjv5i054wvmmkb03jaw9grv6x5k4c28i"; depends=[slam]; };
+  tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
+  tmle_npvi = derive { name="tmle.npvi"; version="0.8.1"; sha256="1vxkhf17x3zsf4fvx458qyqn0xi460db6kw6zmaw6jhagjk5yaj0"; depends=[R_utils MASS sgeostat]; };
+  tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.0"; sha256="08gf1gk9r030cngqz2sj8xkdiwq8qdpca205jqz0p6ilgciq17qs"; depends=[tm]; };
+  tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-6"; sha256="1agw9rgyrjd9a7dwsmsd6fa88xzss27awr338a0c0zfm43pa1bn3"; depends=[DSL tm slam]; };
+  tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.0.1"; sha256="0cscwdxm59rldgkl5jdjs9va4clfwn0c1svms4vd2ldri7nh7h52"; depends=[tm XML]; };
+  tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.3"; sha256="0yaw77azjzzf5raks7yf0blnx3jnby1mdf1wkgnq4ygmfbmrq9yg"; depends=[tm XML]; };
+  tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.0"; sha256="0mlgvkivlsjlgcxxpxgc697xxmy6k0rdrhdsy8cni8z11m9jabrr"; depends=[tm XML ISOcodes]; };
+  tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.0-7"; sha256="1054gl9hlfkilhi7wi1kwbyl9rllm31mnb35nlr78c1nqi3qj5hx"; depends=[tm]; };
+  tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="0.9"; sha256="0xcq8frpd2cfjp7vy7h5hadi90jrssq803p2mif4jjqggdr63z4c"; depends=[tm RCurl XML boilerpipeR RJSONIO]; };
+  tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; };
+  tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
+  toaster = derive { name="toaster"; version="0.2.5"; sha256="0yybv6lq22mzawyvywh1dpg5p5mx5qqqssdhgd3ff78cqp7j298r"; depends=[RODBC plyr reshape2 ggplot2 scales RColorBrewer wordcloud ggmap]; };
+  tolerance = derive { name="tolerance"; version="0.5.3"; sha256="058gl3vsqq4ylxrafj6fd70xsw4jbxjlxl30h8pd2dyv1h70b5zf"; depends=[rgl]; };
+  topicmodels = derive { name="topicmodels"; version="0.2-0"; sha256="1y5i0m46ci85d84b8sqyysgmha595raa5av41zdd1ck6a00kdwix"; depends=[modeltools slam tm]; };
+  TopKLists = derive { name="TopKLists"; version="1.0.1"; sha256="009i18qf3a06503gxbmm65dkkpji0pqi8140nli9ddckq4gwljx2"; depends=[Hmisc gplots]; };
+  topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
+  topologyGSA = derive { name="topologyGSA"; version="1.4.3"; sha256="0m6qw47jlg0yf66nd46lkji342303v2jf0a6zbkf7hb6zf3rgkfv"; depends=[gRbase fields]; };
+  topsis = derive { name="topsis"; version="1.0"; sha256="056cgi684qy2chh1rvhgkxwhfv9nnfd7dfzc05m24gy2wyypgxj3"; depends=[]; };
+  tosls = derive { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
+  tourr = derive { name="tourr"; version="0.5.3"; sha256="0jsj2r9lhy0pa4kxnfb1cpf28c8q26rcprssax765n5ip1w9ycra"; depends=[]; };
+  tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[tourr colorspace RGtk2 gWidgets Cairo]; };
+  tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
+  TPmsm = derive { name="TPmsm"; version="1.1.1"; sha256="0fd4l1rzclq32l97g7rdvhdvfdylgwaf079y24arfvkyphs2xga4"; depends=[KernSmooth]; };
+  tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; };
+  track = derive { name="track"; version="1.0-15"; sha256="05v6p2mfms59p3cs4vwpzvi9gaadrin50fc39l5kjqwqa9vhmkz7"; depends=[]; };
+  trackObjs = derive { name="trackObjs"; version="1.0-18"; sha256="0wwm9yx5wnmgvyd7zczkv8mdzixazb3kps112w19rdbnkiq1db3d"; depends=[]; };
+  TrackReconstruction = derive { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
+  tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
+  traitr = derive { name="traitr"; version="0.13"; sha256="0xn2w83w9mh2aal375snzv9r7yv7adly3axf8kchlcxs2kgrrn8f"; depends=[digest proto gWidgets]; };
+  TraMineR = derive { name="TraMineR"; version="1.8-8"; sha256="12zbk7bq4ff4dzq86zbh9pspl1b9a69k0rw9lg8sh3mmc0f09m8j"; depends=[RColorBrewer boot]; };
+  TraMineRextras = derive { name="TraMineRextras"; version="0.2.2"; sha256="0sb072ssg5q3kncb3b1a0nrnapjq8rly0ibh3gdrld9fdbdbjx68"; depends=[TraMineR RColorBrewer combinat survival]; };
+  TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
+  translate = derive { name="translate"; version="0.1"; sha256="0lpgpwwfgwg7mcgf6k460l4z2q4s6i2hqwbyb8l82qgcyvbf3ddb"; depends=[RCurl RJSONIO functional lisp]; };
+  transnet = derive { name="transnet"; version="0.1"; sha256="0apsb67dxcnnsjnldr1vsjpc7xwy4cipybk9d86rf86l6cmirci6"; depends=[rJava plyr reshape2]; };
+  trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
+  TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.1"; sha256="1l4k33cs3wy2hh5chkh7bb4kdh2vmqrp14nrbv639y5h16n3msba"; depends=[ggplot2]; };
+  tree = derive { name="tree"; version="1.0-35"; sha256="1k8c2kjk53gix68frprlyx5ww7cm373vz1xg2r2jxbzxg1y4v691"; depends=[]; };
+  treebase = derive { name="treebase"; version="0.0-7.1"; sha256="0kj1cyk14j4qzm31f47a8g7qh4842rqkzr0fqh9i5c8kzrqxbc0g"; depends=[ape XML RCurl reshape2 data_table]; };
+  treecm = derive { name="treecm"; version="1.2"; sha256="0085d3rq8c31g8mh6qjvmll13ikvii58ky0dcva7kmv7ac54nlqk"; depends=[plyr]; };
+  treelet = derive { name="treelet"; version="1.0"; sha256="16g4lmp4yrfg328d0qwrp101y1qnwcrff7kna60cjmqdpvg3wm15"; depends=[]; };
+  treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
+  TreePar = derive { name="TreePar"; version="2.5"; sha256="0x53s39gypg9dfi671i1lam1lpirm7kg4qvxgi5yrj6n8zaa788g"; depends=[ape Matrix subplex TreeSim deSolve]; };
+  TreeSim = derive { name="TreeSim"; version="1.9.1"; sha256="0kds8zwm7l4ljsfz32gwl4mg1gf2r5ixbpfdadpbamr0xn34hj3x"; depends=[ape geiger]; };
+  TreeSimGM = derive { name="TreeSimGM"; version="1.1"; sha256="01jgcdwnammznrq6ccy5bhhp27pzh4lb2i7ak096z996hf96xa77"; depends=[TreeSim]; };
+  treethresh = derive { name="treethresh"; version="0.1-7"; sha256="0757w8y7hqki9znn726h7ry1hdrhnfj9ps179jmh5cl0gb5p2qin"; depends=[EbayesThresh wavethresh]; };
+  TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
+  TRIANG = derive { name="TRIANG"; version="1.2"; sha256="09hfvfmqrmx8dphlk46ga0y9s986kb32qdhgiq95faqfhpirf0qa"; depends=[]; };
+  TRIANGG = derive { name="TRIANGG"; version="1.0"; sha256="1ycqyaijxmgi7v9rzdsq3gxx1wll51yfpdyxbjiyp9gpgmcs7h48"; depends=[]; };
+  triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; };
+  trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
+  TriMatch = derive { name="TriMatch"; version="0.9.1"; sha256="1207lnysdjd347m1lsbxy19lq73bjs1irqwk94y8idp1pcj4pfpd"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics]; };
+  trimcluster = derive { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
+  trioGxE = derive { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[msm mgcv gtools]; };
+  trip = derive { name="trip"; version="1.1-17"; sha256="1i1hc89bdws4k10w6yz0wqnkkk2mgbhkv0kdnx2q8ljir9p4gbyx"; depends=[sp maptools MASS spatstat]; };
+  tripack = derive { name="tripack"; version="1.3-6"; sha256="1dknz1arzfyknip04a9fxdhqmrkb0r0lr8hgria9s0d57hr1ay12"; depends=[]; };
+  tripEstimation = derive { name="tripEstimation"; version="0.0-41"; sha256="11cn9lz4vdcx8wb46cm5sj0rfjl9cs50z7zxfxrn79nz0pga4gwn"; depends=[lattice mgcv rgdal sp zoo]; };
+  TripleR = derive { name="TripleR"; version="1.2.1"; sha256="0ab0mb044594rixira088l2dr5r9jrbphiigi8nv8ggm6536sqf0"; depends=[reshape plyr]; };
+  trueskill = derive { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
+  truncdist = derive { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2dw1m4fj9fclb0r4vpgqywyaqjkdnhzmyn593g"; depends=[evd]; };
+  truncgof = derive { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
+  truncnorm = derive { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
+  truncreg = derive { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
+  truncSP = derive { name="truncSP"; version="1.2.1"; sha256="144ypplkxpnarab8zcc4kc3c62pvc117bnhrsjv5ln3vlsvp05y6"; depends=[truncreg boot]; };
+  trust = derive { name="trust"; version="0.1-6"; sha256="1jghgwnazhqgyn2k0b3x4n8swncyy6dzlkv86chv98zw4s3bnlak"; depends=[]; };
+  trustOptim = derive { name="trustOptim"; version="0.8.3"; sha256="04pkni5053r9czmf81jaq3y1kvw902g237pa6d3jgkvlqaznqwg3"; depends=[Rcpp RcppEigen Matrix]; };
+  TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
+  TSAgg = derive { name="TSAgg"; version="1.0.1"; sha256="01s0grwfbhhfipqdnc0932rjsz4k52rln2bs8dsvrk6f8wps7h1k"; depends=[lubridate]; };
+  tsbridge = derive { name="tsbridge"; version="1.0"; sha256="0frp6whd5c8gxw0nv1y1qngifxbvpakyagbx3i80c19ic3hk6q8p"; depends=[mvtnorm tsbugs]; };
+  tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
+  TSclust = derive { name="TSclust"; version="1.2.1"; sha256="1ixawrs686p5g8kdaiqpf4y8ndpz0vgz9ji1ahja8i6nscfzasd9"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
+  TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; };
+  TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; };
+  TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; };
+  tsDyn = derive { name="tsDyn"; version="0.9-33"; sha256="080bzbxvjfwayq9j7r1ghalvjcql9sk7ryzj880k2by4179fhnkk"; depends=[mnormt mgcv nnet tseriesChaos tseries vars urca forecast MASS Matrix foreach]; };
+  TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
+  tseries = derive { name="tseries"; version="0.10-32"; sha256="0jz8a3z3hx2ps7krmpg6m10jvz5ddgmcrmnd38jpxb6ndnhh3pzw"; depends=[quadprog zoo]; };
+  tseriesChaos = derive { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
+  tsfa = derive { name="tsfa"; version="2014.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
+  TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
+  TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; };
+  TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; };
+  TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
+  TSjson = derive { name="TSjson"; version="2014.4-1"; sha256="1rkxc4dm7hdva0hiqbka8isfszjy26if9hnarsm51cflk8b60zhk"; depends=[TSdbi findpython DBI tframe tframePlus rjson]; };
+  tslars = derive { name="tslars"; version="1.0"; sha256="0ylpn4jxmrck7hna3j420kw2yhsrklrq2664w85z30xij3zrrrci"; depends=[]; };
+  tsModel = derive { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
+  TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; };
+  tsne = derive { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
+  TSodbc = derive { name="TSodbc"; version="2013.9-1"; sha256="0s0bgid5slvyqlsrc0jvybqd73qjbs7qb0klws4ynk51rw6rilml"; depends=[TSdbi RODBC DBI tframe tframePlus TSsql]; };
+  TSP = derive { name="TSP"; version="1.0-8"; sha256="1yk4ivxa835l4808m1yiv3gqm0bdd5shwf9i5k8ngnmirj30d67j"; depends=[]; };
+  Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
+  tspmeta = derive { name="tspmeta"; version="1.1"; sha256="11kr5avf67v2cxy3k1yrpv9lcbmiprd0w43w7zvizhsij58h13vm"; depends=[ggplot2 TSP MASS BBmisc fpc vegan stringr splancs]; };
+  TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; };
+  TSsql = derive { name="TSsql"; version="2014.4-1"; sha256="10h83z0d9xjc1g0pnjvr4idz5c2vwf36x6qx1lpa48ybap50s215"; depends=[DBI tframe TSdbi]; };
+  TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; };
+  TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
+  TSxls = derive { name="TSxls"; version="2013.8-2"; sha256="1a0cmw41jf9jqibg25s4s04lawdb86c5r4bkxp8bznzkkhihpxn1"; depends=[TSdbi DBI tframe tframePlus gdata]; };
+  TSzip = derive { name="TSzip"; version="2013.9-1"; sha256="09fqjsppj7qmbiiy19s64j77kf6drqfiphk5dfz25w5df1lzdw0f"; depends=[TSdbi DBI tframe tframePlus gdata]; };
+  TTAinterfaceTrendAnalysis = derive { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[Hmisc pastecs reshape wq e1071 timeSeries fBasics relimp multcomp nlme lubridate tcltk2]; };
+  tth = derive { name="tth"; version="4.3-1"; sha256="0mdcwialbr0s3hzh0vf0wildra4xxxhmka35avnkj1jc8igpax3h"; depends=[]; };
+  TTR = derive { name="TTR"; version="0.22-0"; sha256="0aackwmmakjcynpq4nxi8xw1x3688rkg6kypgd5jiprzzdhsz5rq"; depends=[xts]; };
+  ttScreening = derive { name="ttScreening"; version="1.3"; sha256="1ixy3s0a1vwr5qf1w24n8bhbq6qbwraal8xb8ypbvpjkrl0d14z2"; depends=[matrixStats corpcor]; };
+  ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
+  ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
+  TukeyC = derive { name="TukeyC"; version="1.1-4"; sha256="0p6wiyk6k2jabbf1s8fgzd547f3c0paf8d9hfa9aan5vwfcfyld6"; depends=[]; };
+  TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
+  tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
+  turboEM = derive { name="turboEM"; version="2012.2-1"; sha256="1vv7bjkkqm96qkqqz6gzhz7ii4yzr252r8wf37dgv5qfh1jlbvp2"; depends=[numDeriv quantreg foreach]; };
+  turner = derive { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
+  TUWmodel = derive { name="TUWmodel"; version="0.1-2"; sha256="1k3gdsl8rv10ipa82rgyhjh4pqf4n2d2dj68s9r5pkv362kzk1ra"; depends=[]; };
+  tvm = derive { name="tvm"; version="0.2"; sha256="1fwa37xnp3idal8v1xxlc9gr25595f644i7a3h8xpd0k086sp1dg"; depends=[ggplot2 reshape2]; };
+  twang = derive { name="twang"; version="1.4-0"; sha256="0r9n0s421dhvsr3ppzhdxsq4viz18mbi9mglhyyl5r6slzyb4m0x"; depends=[gbm survey xtable latticeExtra]; };
+  tweedie = derive { name="tweedie"; version="2.1.7"; sha256="1ivyfpksxds9p26lmi67kxc2fldc7869lj58l81wrnnjzh0jpq8w"; depends=[statmod]; };
+  twiddler = derive { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
+  twitteR = derive { name="twitteR"; version="1.1.7"; sha256="0zkz44brvkrsp1g7i90j2lvnj462vav706vqyxv0jfkp52f0s1z4"; depends=[ROAuth RCurl rjson]; };
+  TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
+  twoStageGwasPower = derive { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
+  twostageTE = derive { name="twostageTE"; version="1.0"; sha256="18dkf92zc6l2s41hwp0kic64q313j9hrnkld65sh015l2lfinrq7"; depends=[isotone]; };
+  TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.2"; sha256="0z3jg0hl7v2g1bral94gn3b1d11dzrlnzc912yh52vrcawbkmckq"; depends=[survival]; };
+  txtplot = derive { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
+  UBCRM = derive { name="UBCRM"; version="1.0"; sha256="1lkj0pg3pmj91s8i9xzs3bpizpmvjn85bs89wl54whjjhfnnfynk"; depends=[]; };
+  ucminf = derive { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; };
+  udunits2 = derive { name="udunits2"; version="0.6"; sha256="1dlxcx7yw7yqpimnfikdraqcmjsjz7js0j24li0879dzwrqa27ja"; depends=[]; };
+  ump = derive { name="ump"; version="0.5-4"; sha256="05nd9bnysp8gaw916h7hk425banffcm0xfygalbp7brl71q0zby6"; depends=[]; };
+  unbalanced = derive { name="unbalanced"; version="1.1"; sha256="0crkykmyxbag4ri2zikz4r22bf92r3v6q1lfdcvwdvv27slhyfn2"; depends=[FNN RANN]; };
+  unbalhaar = derive { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
+  Unicode = derive { name="Unicode"; version="0.1-4"; sha256="0ja0l8b95r2wgybbrpbdbbfjzdq2ns0kcvffv47sq29m516dasyh"; depends=[]; };
+  uniCox = derive { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
+  uniReg = derive { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
+  unmarked = derive { name="unmarked"; version="0.10-4"; sha256="1mb9c6h51y476y50q4bh9v6wx6d91b2npf18a66gjs406nra3yck"; depends=[reshape lattice Rcpp plyr]; };
+  untb = derive { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
+  upclass = derive { name="upclass"; version="1.0"; sha256="0ga49pcxib4lp0pq1ljj1fjbrg7jz4vpjp5hq0c1v1hw2p7a3giy"; depends=[mclust classifly gclus]; };
+  uplift = derive { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[RItools MASS coin tables penalized]; };
+  urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl5276vlyaagizax8k20ns9ddl4b"; depends=[nlme]; };
+  UScancer = derive { name="UScancer"; version="0.1-1"; sha256="0x7hr7rwplbs8bny7qr8m1rljdzwm27v0nddd2jj0v4561ljkih2"; depends=[rgdal]; };
+  UScensus2000blkgrp = derive { name="UScensus2000blkgrp"; version="0.03"; sha256="196hpqrc3rq0m6ra6qinlhz1yknplx08pfp57l6yalni26c8pia0"; depends=[maptools sp foreign]; };
+  UScensus2000cdp = derive { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[maptools sp foreign]; };
+  UScensus2000tract = derive { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[maptools sp foreign]; };
+  UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[maptools sp foreign]; };
+  usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
+  useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
+  userfriendlyscience = derive { name="userfriendlyscience"; version="0.1-2"; sha256="1b2ypga0kzf8qsl160by1vfp8p6z2mczn3w1qgk042y83kiaiawx"; depends=[ggplot2 plyr psych pwr fBasics e1071 ltm MBESS foreign knitr xtable GGally lavaan]; };
+  UsingR = derive { name="UsingR"; version="0.1-18"; sha256="1mk1dnz9ssnn9k5plq4wxbqbb73ma7d3b89lv2jbzh2iglbn0r0s"; depends=[MASS]; };
+  usl = derive { name="usl"; version="1.2.2"; sha256="03kx14fs0qi8zjb29xp7pnjh124z290sr7biim8kal1w4a4s946p"; depends=[boot nlmrt]; };
+  utility = derive { name="utility"; version="1.2"; sha256="10dwmf4gcz0jbakwnvgm475sjjilqj1gf3zisil22pk0rcm51kgj"; depends=[]; };
+  uuid = derive { name="uuid"; version="0.1-1"; sha256="1b35h2n86233zb6dwkgxxlvnlld8kmv0j6j3m31xjbpmc3ppr7w3"; depends=[]; };
+  UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
+  vacem = derive { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
+  varbvs = derive { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
+  varComp = derive { name="varComp"; version="0.1-317"; sha256="16nmhipi0nlh0igc3g9jbv1pqvigmgxy8f395xx6hbzyg87x2ha9"; depends=[quadprog Matrix MASS CompQuadForm RLRsim SPA3G mvtnorm nlme]; };
+  varcompci = derive { name="varcompci"; version="1.0.1"; sha256="11fxb63479cha4apakfd1rs89ngrpfhy0h1412wxyn4k8kbibkk4"; depends=[]; };
+  vardiag = derive { name="vardiag"; version="0.2-0"; sha256="0avj900zx4nr67dk08n0n6arxx2cb2ymm0kd5xxnzsmyrmwm40mm"; depends=[]; };
+  VarEff = derive { name="VarEff"; version="1.0"; sha256="0zp024z5xl43z2z67fq5ryfiamfvdbbbv1iaaiyw3shjbg2bp8dp"; depends=[mcmc]; };
+  VaRES = derive { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
+  VAR_etp = derive { name="VAR.etp"; version="0.2"; sha256="1782x49mmx5cchndrcvcm4ffccszjv7kd4yzngk18j0ql1asx92s"; depends=[]; };
+  VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
+  VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="01jv5qrfw8y8yyd3jy3058bpnfyzz7d0m4rx0iibs79gv2rvq5sn"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
+  vars = derive { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[MASS strucchange urca lmtest sandwich]; };
+  varSelectIP = derive { name="varSelectIP"; version="0.2-1"; sha256="180lzsg48hnlcmhpk0a5yzmy2syw8yr7f5npnyspx3897hjag1vp"; depends=[MASS mvtnorm]; };
+  varSelRF = derive { name="varSelRF"; version="0.7-3"; sha256="11am1hdcaxh58mqa1v16siip6adg61pjxhdyl8mlgnnmffslnpq9"; depends=[randomForest]; };
+  VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
+  vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
+  VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
+  VBmix = derive { name="VBmix"; version="0.2.16"; sha256="1sb67bhvarf39v0sj0ccy0hss74iv923mdj6gnn64w63k3iw644z"; depends=[lattice pixmap mnormt]; };
+  vcd = derive { name="vcd"; version="1.3-1"; sha256="1sci4p9q45dfc12zihgismkjmp7fivvdf88jizfivvq2i4qk7f56"; depends=[MASS colorspace]; };
+  vcdExtra = derive { name="vcdExtra"; version="0.6-0"; sha256="16lvrjawm3b07614fqi3vg9g2zdx6s6k261zpn89mz3kr7hsxgih"; depends=[vcd gnm MASS]; };
+  vcf2geno = derive { name="vcf2geno"; version="2.3"; sha256="1ib9g3162d4mlwrk77fhzsgkcbrbvygav0ycl8527nxbdiyb77f1"; depends=[]; };
+  VDA = derive { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
+  Vdgraph = derive { name="Vdgraph"; version="2.1-3"; sha256="1vyx6q7h2xj9qipyh7pdnd0mh6cs379irxqaylnn2m9rcrmj191q"; depends=[]; };
+  VdgRsm = derive { name="VdgRsm"; version="1.01"; sha256="01hywwjmyvl9ls6gn2vl5z5cv2zlnxl2rfr3k1pachz3gq0yhdc1"; depends=[DoE_wrapper AlgDesign permute]; };
+  vec2dtransf = derive { name="vec2dtransf"; version="1.0"; sha256="0hi7x38f3lyxqgwzjz86ld4snva4ci5rinbqhap04d5hcr2sdpzi"; depends=[sp]; };
+  vecsets = derive { name="vecsets"; version="1.0"; sha256="0jj02fri400pzdqvydcdm3z70wzcwi9zgh45g3rwz3rh5lg15778"; depends=[]; };
+  VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
+  VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.5"; sha256="04x2xqnbgkbi626y9ihs3nlxzf84jz44zlapsdlrxqlswiw4n0mw"; depends=[rgl misc3d MASS]; };
+  vectoptim = derive { name="vectoptim"; version="0.2"; sha256="1n19sipx5r0qy08jmrbsrf0kgwgl31np88wc1zyc2bkx8h1zkmf2"; depends=[foreach doParallel]; };
+  vegan = derive { name="vegan"; version="2.0-10"; sha256="06anm8q82qziqhc3x8cll2xshhjiqkdbwnq1cyn98mshmxlg8i4z"; depends=[permute lattice]; };
+  vegclust = derive { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[vegan sp]; };
+  vegdata = derive { name="vegdata"; version="0.6-6"; sha256="0fwilqdzfhmdp8v0i6swmd6600g7mf5pdmz7r5076k0qzapalb3r"; depends=[foreign XML]; };
+  vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
+  VennDiagram = derive { name="VennDiagram"; version="1.6.5"; sha256="1zkxriznnfwxvg7rjq84jrhd990ldq0lyi5dmcbzsszql463lbla"; depends=[]; };
+  venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
+  verification = derive { name="verification"; version="1.38"; sha256="1nhyhpz427i122nxqrf7lyrvwp5mjj9kvy182rf329zws76hfwfq"; depends=[fields boot CircStats MASS dtw]; };
+  VGAM = derive { name="VGAM"; version="0.9-3"; sha256="1g1w0zh87cavpa8w80mvcyp440v5nxhp82lrbswfhmhlq9vzscmy"; depends=[]; };
+  VGAMdata = derive { name="VGAMdata"; version="0.9-3"; sha256="1fvmgblqwgg9diy2bdk5hcrp1rdj77hnqk27n13ld74lkx5637m7"; depends=[]; };
+  VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
+  VideoComparison = derive { name="VideoComparison"; version="0.9-4"; sha256="0xbsivqzxqciwi7zx78v5s4mrpp2zld1dkddx7n4z61r0mfk547c"; depends=[RJSONIO RCurl zoo pracma Rcpp]; };
+  VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
+  VIM = derive { name="VIM"; version="4.0.0"; sha256="1w62x5vvbpn3h1zwh0jvvy3lpwai1d708jq18zq99bh1qn8n6bfg"; depends=[colorspace car robustbase sp vcd MASS nnet e1071 Rcpp glmnet]; };
+  vimcom = derive { name="vimcom"; version="0.9-93"; sha256="1yy67s3pkwg3hj2ry0wfqknxnq2wg8n4yh14dmmig00m6cg0gswy"; depends=[]; };
+  VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
+  VineCopula = derive { name="VineCopula"; version="1.3"; sha256="1vxm7bk7p452p4kbm5q3ricxcd4f74zzlibxx13wj0cbza5p49nl"; depends=[MASS mvtnorm igraph copula]; };
+  vines = derive { name="vines"; version="1.0.11"; sha256="0rvrb03v696z3r2ybgkzdx3bzcdd3a6pid29j8zlrdg96zjwnqgr"; depends=[copula ADGofTest cubature TSP]; };
+  violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
+  vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
+  viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
+  visreg = derive { name="visreg"; version="2.0-4"; sha256="0ba673182kh6ds0s3mvc4qqaxiasl95090algrjqp3dabp1j4hkq"; depends=[lattice]; };
+  visualFields = derive { name="visualFields"; version="0.4"; sha256="07pkaccnk8c9zzizpcdw82vcbqdng2bi9aczpa68i7fz24bvcfan"; depends=[gridBase flip matrixStats Hmisc]; };
+  visualizationTools = derive { name="visualizationTools"; version="0.2.05"; sha256="08ry8bz2278ncjx0sdrg19mv448i0n497l5abpv9f8xhsfsqyrpf"; depends=[]; };
+  visualize = derive { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
+  VisuClust = derive { name="VisuClust"; version="1.1"; sha256="02jb8kg7bxakcn76zyl68z5ab2c9s2cdz3prrgzh95rf9k893sbc"; depends=[aplpack]; };
+  vitality = derive { name="vitality"; version="1.0"; sha256="0di72khz1mwqlirx78a86lwqhjmbbgmxm6vmlwq546dwvs6q071g"; depends=[IMIS]; };
+  VizOR = derive { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
+  VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
+  VLMC = derive { name="VLMC"; version="1.3-13"; sha256="16zi2sx4hhibviqi5j0jv271zvhzgwhyddjiazwa5v0252fmy93d"; depends=[MASS]; };
+  Voss = derive { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
+  vowels = derive { name="vowels"; version="1.2"; sha256="07w2jv5sswwwzrsc9hdnjh5kj5lqqmpmjn5ihrdj0xpmnhcm4vhp"; depends=[]; };
+  vows = derive { name="vows"; version="0.2-1"; sha256="0aqk09y45l4p814x83l07smy1m2aypsf0c341j56di5bsc55vl2m"; depends=[fda gamm4 RLRsim Rniftilib rpanel shape stringr tkrplot]; };
+  VoxR = derive { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
+  VPdtw = derive { name="VPdtw"; version="2.1-10"; sha256="1sipiqbk766czd1jxam3bc2hfq7wsn72x51j5ssn2s2q0gvpl7m1"; depends=[]; };
+  vrmlgen = derive { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
+  vrtest = derive { name="vrtest"; version="0.96"; sha256="1sg1w8n0729h2kxazg5lk2vjaraqhlwjbm9w276pa7dqh6iw2fa6"; depends=[]; };
+  vscc = derive { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[teigen mclust]; };
+  VSURF = derive { name="VSURF"; version="0.8.1"; sha256="07j2qvk5zj4jdj5cwvc4q3sjjv3pnr0sq0alvqpbdmahd3ifsm3w"; depends=[randomForest rpart doParallel]; };
+  vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; };
+  W2CWM2C = derive { name="W2CWM2C"; version="1.0"; sha256="14q1y4vpmrx8qz5nav8bbjkxqsqk646zcwr8h7yzi7cfa85b4cxz"; depends=[waveslim wavemulcor]; };
+  waffect = derive { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
+  waldwolf = derive { name="waldwolf"; version="0.1"; sha256="0gig3dqs8f44kdzr3abmm4wcnby2ifgqs72ck5wvny6gkwyfdvys"; depends=[]; };
+  walkscoreAPI = derive { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
+  WARN = derive { name="WARN"; version="1.0"; sha256="14gqcxvfh4z77z4qzk12mg0yhwg8gc06y7cn54az46vh4vmhg32y"; depends=[MASS]; };
+  wasim = derive { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[MASS qualV tiger fast]; };
+  waterData = derive { name="waterData"; version="1.0.3"; sha256="1vwawyn1hzfd9mknpfnysf2whskyg88hl70sgny0zbd2fy1287q5"; depends=[lattice latticeExtra XML]; };
+  waterfall = derive { name="waterfall"; version="0.9.9.20121030"; sha256="140s5639ayd9qgn4i1s1qk541vi34ndzdcqpaps7q53g42n8akfw"; depends=[lattice]; };
+  Wats = derive { name="Wats"; version="0.2-9"; sha256="0cx8806d946bbcc5my7mcyn0qvh766yy6lv9cb0afl6h4dlf3fsb"; depends=[boot colorspace ggplot2 lubridate plyr RColorBrewer scales testit zoo]; };
+  waveband = derive { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
+  WaveCD = derive { name="WaveCD"; version="1.0"; sha256="0gracn8lknw96nnir1m8fg5va3f45vvbiy69rxx8vibnfdg1q3l9"; depends=[waveslim lattice]; };
+  waved = derive { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
+  wavelets = derive { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
+  wavemulcor = derive { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; };
+  waveslim = derive { name="waveslim"; version="1.7.3"; sha256="0lkq8lcg8cd4iw95jb0r5iwl2habngzzzwcxfic05gbpj5gfmapk"; depends=[]; };
+  wavethresh = derive { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
+  wbs = derive { name="wbs"; version="1.1"; sha256="04hbmvhlmfv96s80riam7acjyaazdcr5dn7hb8f7qwadvlycrwsw"; depends=[]; };
+  wccsom = derive { name="wccsom"; version="1.2.8"; sha256="0dnqcmrrnzqys4mr1md7f0k0h434x25mdc576j00s3pmjjjh873a"; depends=[class MASS]; };
+  WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
+  WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
+  weatherData = derive { name="weatherData"; version="0.4"; sha256="0ka0mj59ivj073bwdinpwh44m3pkj44zzassw5175xj5fz8jvdxc"; depends=[plyr]; };
+  weathermetrics = derive { name="weathermetrics"; version="1.0"; sha256="1ay4gcxpblqnn6zqkdnr0mgnm9r42wlmpb6k3smhbz4zca4kjfzy"; depends=[]; };
+  WebDevelopR = derive { name="WebDevelopR"; version="1.0"; sha256="0q4plv5nh6xp35j53xl207d7x0l8041ipi7k7rjrspv9vx7ncgvl"; depends=[]; };
+  webvis = derive { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
+  WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[TraMineR cluster RColorBrewer]; };
+  weightedKmeans = derive { name="weightedKmeans"; version="1.2.0"; sha256="140cvl1jwwqyvcsf7pbsxh9k4bynd7c1q159pp7ia1f1sgimxafb"; depends=[lattice latticeExtra clv]; };
+  WeightedPortTest = derive { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
+  weightedScores = derive { name="weightedScores"; version="0.9"; sha256="0rmfikdpc0m1rsflq2cdhl3bwk8w1wmwyhwc7di8dqf5vlqyh6ws"; depends=[mvtnorm rootSolve]; };
+  weights = derive { name="weights"; version="0.80"; sha256="147fgs99sg1agq081ikj2fhb4b2vzsppdg1h1w036bb92vsjb0g5"; depends=[Hmisc gdata]; };
+  weirs = derive { name="weirs"; version="0.23"; sha256="1kp49r5ba7ii1mr1nszbssx3fn0c2hcfpawm3a1kbh4rmhvy3frs"; depends=[]; };
+  wesanderson = derive { name="wesanderson"; version="0.3"; sha256="169phanzwz3mgzqncwxc5kdshhmj922nzlbq8gz6grvh51bc7aaa"; depends=[]; };
+  wethepeople = derive { name="wethepeople"; version="0.6.1"; sha256="1qa3dla1fmzw80z0qly3vcqvyk86iylvr09h4awgdilihizf0007"; depends=[rjson ggplot2 plyr reshape tm wordcloud RColorBrewer RCurl]; };
+  wfe = derive { name="wfe"; version="1.2"; sha256="0pdjd3n4cbw995sbka4w75pha7wfdzzp66h8838dc3xqx0l4pfss"; depends=[arm Matrix MASS]; };
+  wgaim = derive { name="wgaim"; version="1.4-0"; sha256="0rm9p7c7kxzzpakcm6wc7viisn2y6rwayc0r0hgpiv8fkv3n1sai"; depends=[qtl lattice]; };
+  WGCNA = derive { name="WGCNA"; version="1.34"; sha256="08695i1fp70vkx4sj0wahvy4pmlf0h5x1ri1gj6xvrsl4qm40cgm"; depends=[dynamicTreeCut flashClust Hmisc reshape foreach doParallel matrixStats]; };
+  wgsea = derive { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[]; };
+  WhatIf = derive { name="WhatIf"; version="1.5-6"; sha256="02lqvirnf24jn8b2s08z5fjmpilp2z08lww1s793n3pn783adbky"; depends=[lpSolve]; };
+  whisker = derive { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
+  WhopGenome = derive { name="WhopGenome"; version="0.8.2"; sha256="145sn2ikjv1xykx5xv0djj4vainqj0v9c3lqnd1r7bygjl4n4v7c"; depends=[]; };
+  widals = derive { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; };
+  WideLM = derive { name="WideLM"; version="0.1-1"; sha256="0spxl960pgzh0cn1gkw2ayixpi982rr85qajcdqahmn9msk877h8"; depends=[Rcpp]; };
+  widenet = derive { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; };
+  wikibooks = derive { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
+  WikipediR = derive { name="WikipediR"; version="1.0.0"; sha256="01w9km1g0cynsgsq3bv6d8ggizym211c1ksyz7w3nkq25288fcds"; depends=[httr jsonlite]; };
+  WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
+  wild1 = derive { name="wild1"; version="1.09"; sha256="1ydjz3f4z6fdw4wynyd64bwwm68vh0xqxvg6zw8z7pdg8y2h89zl"; depends=[chron survival sp maptools spatstat ICSNP ks]; };
+  witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
+  wle = derive { name="wle"; version="0.9-9"; sha256="032zqfqg6ghg56zgr005g8q94zskmbzv1p08lxv227ikkbmnwn53"; depends=[circular]; };
+  WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; };
+  WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
+  wmtsa = derive { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[splus2R ifultools MASS]; };
+  wnominate = derive { name="wnominate"; version="0.98"; sha256="1c3g89f7xl781m8lqy730vlb6p5dxq16vgll80jmsx8p7fsy6pb4"; depends=[pscl]; };
+  wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
+  wordcloud = derive { name="wordcloud"; version="2.4"; sha256="0jdkbks4dxazwgz9862kfpkgnc4zlfc7vhzp7rib8ww7w0kandm3"; depends=[Rcpp RColorBrewer slam]; };
+  wordmatch = derive { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
+  wordnet = derive { name="wordnet"; version="0.1-9"; sha256="1cwrdfdv1ma429na9y2yci9vrms8vfqqwj9qkcq8hzkm02yzkdsf"; depends=[rJava]; };
+  WordPools = derive { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
+  wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
+  wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
+  wpp2012 = derive { name="wpp2012"; version="2.0-0"; sha256="0yqqkj3dj5x784k375xdcxkmg5z12h11jc0cassicyaa3zmwlhzv"; depends=[]; };
+  wppExplorer = derive { name="wppExplorer"; version="1.2-0"; sha256="0hvw6nxl0fvw0sspksgfab3m5y6aq4q60wiz8qlz20qzb4bhw5h5"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
+  wq = derive { name="wq"; version="0.3-11"; sha256="0asdkagnaqn9danry972i4n845ljfap8fy7hdm3z1aggx2fd3zw1"; depends=[zoo]; };
+  WrightMap = derive { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
+  write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
+  WriteXLS = derive { name="WriteXLS"; version="3.5.0"; sha256="0b5md3jy18wrigadqjzfnrpvm35nn0aa62zsq5d72k5fr7lbh3gr"; depends=[]; };
+  wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
+  wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
+  wsrf = derive { name="wsrf"; version="1.3.0"; sha256="0n4mzj3a0brs5mxynh34qwgqd7hkrsvv9p0vsviy6d4l4lh3rny6"; depends=[Rcpp]; };
+  wSVM = derive { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
+  wtcrsk = derive { name="wtcrsk"; version="1.2"; sha256="067ac52i22s6zban9x6dh4z956n76d22jxsrxbm2k1ms3zk9s4yp"; depends=[]; };
+  WWGbook = derive { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
+  x12 = derive { name="x12"; version="1.5.0"; sha256="0z5hsq0rv71jl9102fqci2wyklmqxly0nc4h7ky845dpvqfrg9yv"; depends=[stringr]; };
+  x12GUI = derive { name="x12GUI"; version="0.12.0"; sha256="0vks6m0jck6sl17z9qcw1p1wv5iqdblnmssmfrfjqv626sb9jsn6"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; };
+  XBRL = derive { name="XBRL"; version="0.99.11"; sha256="1rz2cyw028zkpj969mf4viqxgdbqzknx23dw2ikx3cyxqiiyvh7f"; depends=[Rcpp]; };
+  xgobi = derive { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
+  xgrid = derive { name="xgrid"; version="1.0-1"; sha256="1xg3frzybck2lmqsxnw448rw4si55k3ygwdkn88d1zfc6llswz9p"; depends=[]; };
+  XiMpLe = derive { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
+  xkcd = derive { name="xkcd"; version="0.0.3"; sha256="086kdy4dp7312pxv7zpx3qf8rk91lv0snrhipzcmcn1m4q77q9z2"; depends=[Hmisc ggplot2]; };
+  XLConnect = derive { name="XLConnect"; version="0.2-7"; sha256="15vqjlcdh51y3riqaifvj1gk8sfl657dyicbwagnwqq4vsniqihi"; depends=[rJava]; };
+  xlsx = derive { name="xlsx"; version="0.5.5"; sha256="0dl0j0rk9m0chv9yxx92gbbfv9mf5igvk75jrpm2105l2cq5j8jc"; depends=[rJava xlsxjars]; };
+  xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; };
+  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
+  XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
+  XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
+  xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
+  xpose4 = derive { name="xpose4"; version="4.4.1"; sha256="0jl7786rmc8yyvd6vpyyk4s318z647p432cyhpb5lp8vh0rmawl5"; depends=[xpose4data xpose4generic xpose4specific xpose4classic]; };
+  xpose4classic = derive { name="xpose4classic"; version="4.4.1"; sha256="09syj51ahccwkxyqmmg55s80hldy5r2mq4ly6dbjh0q75r5fpmm8"; depends=[lattice xpose4data xpose4generic xpose4specific]; };
+  xpose4data = derive { name="xpose4data"; version="4.4.1"; sha256="0c8ki1hlqqynl4v2g0mqin9swncaq89cg9ixd756gxyhshrcd9mc"; depends=[]; };
+  xpose4generic = derive { name="xpose4generic"; version="4.4.1"; sha256="0m2g3d3d8vydxjvphcydph6wlq1y7540dm1bgix7binm244789fc"; depends=[lattice xpose4data]; };
+  xpose4specific = derive { name="xpose4specific"; version="4.4.1"; sha256="13sffp76q9kvix4y6azcn75mldqz3spc6x1bvlpxz06lbv0ddfwq"; depends=[lattice gam xpose4data xpose4generic Hmisc survival]; };
+  xtable = derive { name="xtable"; version="1.7-3"; sha256="1rsfq0acf1pvpci3jq9fbhsv6ws4d46yap8m2xjk1cr463m9gdcc"; depends=[]; };
+  xtermStyle = derive { name="xtermStyle"; version="2.2-4"; sha256="0m1lwr7smym7aczcqqgqj5bx46j38ymmljilxl54bby188qhfcyz"; depends=[]; };
+  xts = derive { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
+  yacca = derive { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
+  yaImpute = derive { name="yaImpute"; version="1.0-21"; sha256="1lrxlxy3zq1cfmrcwv1qd18d6bihlsdfchbn64mss06y4pjvr0qj"; depends=[]; };
+  YaleToolkit = derive { name="YaleToolkit"; version="4.1"; sha256="1r1vf0gldvcfqa7ln87q5d4sc75d8b99v6zaynvbq02rggzzynmy"; depends=[lattice vcd MASS colorspace barcode gpairs]; };
+  yaml = derive { name="yaml"; version="2.1.11"; sha256="049kdmz6md5gx6x9sgfmi4sx67gz5ln4hdcsc2qbpgrzr085m4gm"; depends=[]; };
+  ycinterextra = derive { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
+  yhat = derive { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[yacca miscTools plotrix boot]; };
+  yhatr = derive { name="yhatr"; version="0.8.1"; sha256="16fcsmxzlkxa0kaavsi9qvfnspjlcan6pp96k7hkmmpm2wkdx2v9"; depends=[httr RCurl rjson plyr]; };
+  YieldCurve = derive { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
+  ykmeans = derive { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[plyr foreach]; };
+  YourCast = derive { name="YourCast"; version="1.6.1"; sha256="03aq01amg4cxnxcxnsd1hxkx63w323f8ldkibl1f826gd7lbcqf1"; depends=[ggplot2 gridExtra lattice foreign reshape2]; };
+  YplantQMC = derive { name="YplantQMC"; version="0.5"; sha256="0x3ndpamj1ayy1svh9q8pwmfnar9zyw5i6h1k1hqwc92h0k6jsmz"; depends=[rgl geometry LeafAngle devtools]; };
+  YPmodel = derive { name="YPmodel"; version="1.1"; sha256="036f5y8qrcxglblgnaa15xzlz9pxbhbysrbr2gl66h9dvcd6kavr"; depends=[]; };
+  YuGene = derive { name="YuGene"; version="1.1.1"; sha256="1shxvhdhf6ba8746p663s3xml0827vfcavqkx6xa4bmfj96br2l0"; depends=[]; };
+  yuima = derive { name="yuima"; version="1.0.10"; sha256="0rn2wr4xyvabx4nqzqafmayd5j8g1la2m9bvacp9h54w5z00zra4"; depends=[zoo expm]; };
+  ZeBook = derive { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[triangle deSolve]; };
+  Zelig = derive { name="Zelig"; version="4.2-1"; sha256="1hhr9jx25fdnkqwyj2bkgrvqlah4z2drphmb5mdn1an2p2g23v9z"; depends=[boot MASS sandwich]; };
+  ZeligChoice = derive { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[Zelig VGAM]; };
+  ZeligGAM = derive { name="ZeligGAM"; version="0.7-1"; sha256="1643ycx51mnlxwiarfkrwm8gr8clx00xi2llcaqsd3wsrr4z5j97"; depends=[Zelig mgcv]; };
+  ZeligMultilevel = derive { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[Zelig lme4]; };
+  zendeskR = derive { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
+  zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0gz5xnmlixr2dhkxc12ydj6zs5"; depends=[Rcpp RcppArmadillo coda]; };
+  ZIM = derive { name="ZIM"; version="1.0"; sha256="0s72xazpcxxv87fy0m7xal41xgng58ilmkk37qarnpnfcd50acq8"; depends=[MASS]; };
+  zipcode = derive { name="zipcode"; version="1.0"; sha256="0amzj2x103zxjv4iqjag226jmlzcrm52883xmkkrrvm4y4h5jqld"; depends=[]; };
+  zipfR = derive { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; };
+  zoeppritz = derive { name="zoeppritz"; version="1.0-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; };
+  zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; };
+  zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
+  zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
+  zyp = derive { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 
-  inherit (stdenv.lib) maintainers;
-
-  abind = buildRPackage {
-    name = "abind-1.4-0";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/abind_1.4-0.tar.gz";
-      sha256 = "1b9634bf6ad68022338d71a23a689f1af4afd9d6c12c0b982b88fc21363ff568";
-    };
-  };
-
-  chron = buildRPackage {
-    name = "chron-2.3-44";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/chron_2.3-44.tar.gz";
-      sha256 = "ba7d46223e615b4d09145a364a4c37ccff718384486ca154a6e025cf3ed91148";
-    };
-  };
-
-  codetools = buildRPackage {
-    name = "codetools-0.2-8";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/codetools_0.2-8.tar.gz";
-      sha256 = "0m326kfxihm5ayfn5b4k8awdf34002iy094gazbc3h0y42r4g86b";
-    };
-  };
-
-  colorspace = buildRPackage {
-    name = "colorspace-1.2-2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/colorspace_1.2-2.tar.gz";
-      sha256 = "7f6ca98e5d005bc7d6e37b03577d65995809150d1d293ce68b6720e7a6b2054d";
-    };
-  };
-
-  dataTable = buildRPackage {
-    name = "data.table-1.9.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/data.table_1.9.2.tar.gz";
-      sha256 = "1fchjg939av89m0zsv85w2xcc8qriwkskk0mcsqy8ip6pcfnlg66";
-    };
-    propagatedBuildInputs = [ reshape2 ];
-  };
-
-  Defaults = buildRPackage {
-    name = "Defaults-1.1-1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/Defaults_1.1-1.tar.gz";
-      sha256 = "0ikgd5mswlky327pzp09cz93bn3mq7qnybq1r64y19c2brbax00d";
-    };
-  };
-
-  DBI = buildRPackage {
-    name = "DBI-0.2-7";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/DBI_0.2-7.tar.gz";
-      sha256 = "e90a988740f99060d5c4aacb1f2b148b0eb81c5b468bafeadf3aaeccf563b5e3";
-    };
-  };
-
-  dichromat = buildRPackage {
-    name = "dichromat-2.0-0";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/dichromat_2.0-0.tar.gz";
-      sha256 = "31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1";
-    };
-  };
-
-  digest = buildRPackage {
-    name = "digest-0.6.3";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/digest_0.6.3.tar.gz";
-      sha256 = "5be8f1386c0c273fcc915df7b557393c5f3de43c44fd16614db9cc5ba6d1d57c";
-    };
-  };
-
-  foreach = buildRPackage {
-    name = "foreach-1.4.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/foreach_1.4.2.tar.gz";
-      sha256 = "097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl";
-    };
-    propagatedBuildInputs = [ codetools iterators ];
-  };
-
-  ggplot2 = buildRPackage {
-    name = "ggplot2-0.9.3.1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/ggplot2_0.9.3.1.tar.gz";
-      sha256 = "b4c97404fd44571f9980712af963949ed204b5d4e639d97df9ba9a17423a6601";
-    };
-    propagatedBuildInputs = [ digest plyr gtable reshape2 scales proto ];
-  };
-
-  gtable = buildRPackage {
-    name = "gtable-0.1.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/gtable_0.1.2.tar.gz";
-      sha256 = "b08ba8e62e0ce05e7a4c07ba3ffa67719161db62438b04f14343f8928d74304d";
-    };
-  };
-
-  gtools = buildRPackage {
-    name = "gtools-3.0.0";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/gtools_3.0.0.tar.gz";
-      sha256 = "e35f08ac9df875b57dcf23028baa226372d7482d7814a011f9b1fdd0697ee73c";
-    };
-  };
-
-  gsubfn = buildRPackage {
-    name = "gsubfn-0.6-5";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/gsubfn_0.6-5.tar.gz";
-      sha256 = "9a7b51ae6aabd1c99e8633d3dc75232d8c4a175df750c7d1c359bd0f5fc197be";
-    };
-    propagatedBuildInputs = [ proto ];
-  };
-
-  iterators = buildRPackage {
-    name = "iterators-1.0.7";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/iterators_1.0.7.tar.gz";
-      sha256 = "1zwqawhcpi95fx4qqj4cy31v5qln2z503f7cvv9v5ch3ard4xxqv";
-    };
-  };
-
-  labeling = buildRPackage {
-    name = "labeling-0.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/labeling_0.2.tar.gz";
-      sha256 = "8aaa7f8b91923088da4e47ae42620fadcff7f2bc566064c63d138e2145e38aa4";
-    };
-  };
-
-  lars = buildRPackage {
-    name = "lars-1.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/lars_1.2.tar.gz";
-      sha256 = "64745b568f20b2cfdae3dad02fba92ebf78ffee466a71aaaafd4f48c3921922e";
-    };
-  };
-
-  LiblineaR = buildRPackage {
-    name = "LiblineaR-1.80-7";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/LiblineaR_1.80-7.tar.gz";
-      sha256 = "9ba0280c5165bf0bbd46cb5ec7c66fdece38fc3f73fce2ec800763923ae8e4bd";
-    };
-  };
-
-  linprog = buildRPackage {
-    name = "linprog-0.9-2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/linprog_0.9-2.tar.gz";
-      sha256 = "8937b2e30692e38de1713f1513b78f505f73da6f5b4a576d151ad60bac2221ce";
-    };
-    propagatedBuildInputs = [ lpSolve ];
-  };
-
-  lpSolve = buildRPackage {
-    name = "lpSolve-5.6.7";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/lpSolve_5.6.7.tar.gz";
-      sha256 = "16def9237f38c4d7a59651173fd87df3cd3c563f640c6952e13bdd2a084737ef";
-    };
-  };
-
-  munsell = buildRPackage {
-    name = "munsell-0.4.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/munsell_0.4.2.tar.gz";
-      sha256 = "84e787f58f626c52a1e3fc1201f724835dfa8023358bfed742e7001441f425ae";
-    };
-    propagatedBuildInputs = [ colorspace ];
-  };
-
-  pamr = buildRPackage {
-    name = "pamr-1.54.1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/pamr_1.54.1.tar.gz";
-      sha256 = "139dbc39b4eccd6a55b6a3c42a1c8be61dcce0613535a634c3e42731fc315516";
-    };
-  };
-
-  penalized = buildRPackage {
-    name = "penalized-0.9-42";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/penalized_0.9-42.tar.gz";
-      sha256 = "98e8e39b02ecbabaa7050211e34941c73e1e687f39250cf3cbacb7c5dcbb1e98";
-    };
-  };
-
-  plyr = buildRPackage {
-    name = "plyr-1.8.1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/plyr_1.8.1.tar.gz";
-      sha256 = "0f2an3pr7flpng9y9mmrmyh08g3nivi6gdkfnw54arn0wxhkqfcm";
-    };
-    propagatedBuildInputs = [ Rcpp ];
-  };
-
-  proto = buildRPackage {
-    name = "proto-0.3-10";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/proto_0.3-10.tar.gz";
-      sha256 = "d0d941bfbf247879b3510c8ef3e35853b1fbe83ff3ce952e93d3f8244afcbb0e";
-    };
-  };
-
-  randomForest = buildRPackage {
-    name = "randomForest-4.6-7";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/randomForest_4.6-7.tar.gz";
-      sha256 = "8206e88b242c07efc10f148d17dfcc265a31361e1bcf44bfe17aed95c357be0b";
-    };
-    propagatedBuildInputs = [ plyr stringr ];
-  };
-
-  Rcpp = buildRPackage {
-    name = "Rcpp-0.11.1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/Rcpp_0.11.1.tar.gz";
-      sha256 = "1ccsvdij6yym9dziqsjf5gr37968imz8i81334vi2fc69z5xzf30";
-    };
-  };
-
-  reshape2 = buildRPackage {
-    name = "reshape2-1.4";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/reshape2_1.4.tar.gz";
-      sha256 = "0i3bim4clwyfdwwrmszsn9ga5gm4a2sh1i0jmpji3afbxc151yjp";
-    };
-    propagatedBuildInputs = [ plyr stringr Rcpp ];
-  };
-
-  RColorBrewer = buildRPackage {
-    name = "RColorBrewer-1.0-5";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/RColorBrewer_1.0-5.tar.gz";
-      sha256 = "5ac1c44c1a53f9521134e7ed7c148c72e49271cbd229c5263d2d7fd91c8b8e78";
-    };
-  };
-
-  RSQLite = buildRPackage {
-    name = "RSQlite-0.11.4";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/RSQLite_0.11.4.tar.gz";
-      sha256 = "bba0cbf2a1a3120d667a731da1ca5b9bd4db23b813e1abf6f51fb01540c2000c";
-    };
-    propagatedBuildInputs = [ DBI ];
-  };
-
-  RSQLiteExtfuns = buildRPackage {
-    name = "RSQlite.extfuns-0.0.1";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/RSQLite.extfuns_0.0.1.tar.gz";
-      sha256 = "ca5c7947c041e17ba83bed3f5866f7eeb9b7f361e5c050c9b58eec5670f03d0e";
-    };
-    propagatedBuildInputs = [ RSQLite ];
-  };
-
-  scales = buildRPackage {
-    name = "scales-0.2.3";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/scales_0.2.3.tar.gz";
-      sha256 = "46aef8eb261abc39f87b71184e5484bc8c2c94e01d3714ce4b2fd60727bc40d9";
-    };
-    propagatedBuildInputs = [ RColorBrewer stringr dichromat munsell plyr labeling ];
-  };
-
-  stringr = buildRPackage {
-    name = "stringr-0.6.2";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/stringr_0.6.2.tar.gz";
-      sha256 = "c3fc9c71d060ad592d2cfc51c36ab2f8e5f8cf9a25dfe42c637447dd416b6737";
-    };
-  };
-
-  sqldf = buildRPackage {
-    name = "sqldf-0.4-6.4";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/sqldf_0.4-6.4.tar.gz";
-      sha256 = "6c51e4e48b93310f765c661a1756fe068629da775248d38a98c38f5b6f7511c4";
-    };
-    propagatedBuildInputs = [ DBI gsubfn proto chron RSQLite RSQLiteExtfuns ];
-  };
-
-  xtable = buildRPackage {
-    name = "xtable-1.7-3";
-    src = fetchurl {
-      url = "mirror://cran/src/contrib/xtable_1.7-3.tar.gz";
-      sha256 = "1rsfq0acf1pvpci3jq9fbhsv6ws4d46yap8m2xjk1cr463m9gdcc";
-    };
-  };
 }; in self

From 834679ddab2a6be07d19524fbc1d47216ed1e4c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 20:51:30 +0200
Subject: [PATCH 0965/2033] all-packages.nix: move all R-related attributes
 into one place

---
 pkgs/top-level/all-packages.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6db0c86478a..ae9e46a5183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6428,17 +6428,20 @@ let
 
   ### DEVELOPMENT / R MODULES
 
-  buildRPackage = import ../development/r-modules/generic R;
+  R = callPackage ../applications/science/math/R {
+    inherit (xlibs) libX11 libXt;
+    texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
+  };
+
+  rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
+    packages = [];
+  };
 
   rPackages = recurseIntoAttrs (import ./r-packages.nix {
     inherit pkgs;
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   });
 
-  rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
-    packages = [];
-  };
-
   ### SERVERS
 
   rdf4store = callPackage ../servers/http/4store { };
@@ -10450,11 +10453,6 @@ let
     inherit (gnome) libglade gtksourceview;
   };
 
-  R = callPackage ../applications/science/math/R {
-    inherit (xlibs) libX11 libXt;
-    texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
-  };
-
   singular = callPackage ../applications/science/math/singular {};
 
   scilab = callPackage ../applications/science/math/scilab {

From ac6bcc78368a78197c898aff6c11b4a3653818cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 21:07:54 +0200
Subject: [PATCH 0966/2033] cosmetic: move the R-wrapper into its own directory

---
 .../r-modules/{generic/wrapper.nix => wrapper/default.nix}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/development/r-modules/{generic/wrapper.nix => wrapper/default.nix} (100%)

diff --git a/pkgs/development/r-modules/generic/wrapper.nix b/pkgs/development/r-modules/wrapper/default.nix
similarity index 100%
rename from pkgs/development/r-modules/generic/wrapper.nix
rename to pkgs/development/r-modules/wrapper/default.nix

From a329900977f2ec818baa667b47d8b4ceb0e1ed64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 21:09:14 +0200
Subject: [PATCH 0967/2033] Move r-packages.nix into the r-modules directory.

---
 .../r-packages.nix => development/r-modules/cran-packages.nix}  | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename pkgs/{top-level/r-packages.nix => development/r-modules/cran-packages.nix} (99%)

diff --git a/pkgs/top-level/r-packages.nix b/pkgs/development/r-modules/cran-packages.nix
similarity index 99%
rename from pkgs/top-level/r-packages.nix
rename to pkgs/development/r-modules/cran-packages.nix
index 3a164762138..9dd1a1691eb 100644
--- a/pkgs/top-level/r-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -39,7 +39,7 @@ let
 
   inherit (pkgs) R fetchurl stdenv;
 
-  buildRPackage = import ../development/r-modules/generic R;
+  buildRPackage = import ./generic R;
 
   derive = { name, version, sha256, depends ? [] }: buildRPackage {
     name = "${name}-${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae9e46a5183..23ba066967a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6437,7 +6437,7 @@ let
     packages = [];
   };
 
-  rPackages = recurseIntoAttrs (import ./r-packages.nix {
+  rPackages = recurseIntoAttrs (import ../development/r-modules/cran-packages.nix {
     inherit pkgs;
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
   });

From a9258080b1fc8b9d649754a3ef1e047b765752f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 21:12:34 +0200
Subject: [PATCH 0968/2033] R: don't install the "recommended packages"

These packages come with R, but if we install them as part of this build, then
we cannot update them without re-building R as well. Instead, we add those
packages to the R environment through the r-wrapper. This means that
recommended packages can be updated in cran-packgaes.nix, and those updates
have an effect on the installation without re-building R itself.
---
 pkgs/applications/science/math/R/default.nix   | 2 ++
 pkgs/development/r-modules/wrapper/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 4a58c15941c..452d9816b77 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -2,6 +2,7 @@
 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
 , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
 , imake, which, jdk, atlas
+, withRecommendedPackages ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlagsArray=(
       --disable-lto
+      --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
       --with-blas="-L${atlas}/lib -lf77blas -latlas"
       --with-lapack="-L${liblapack}/lib -llapack"
       --with-readline
diff --git a/pkgs/development/r-modules/wrapper/default.nix b/pkgs/development/r-modules/wrapper/default.nix
index 6a17c8447c8..b4b4c562873 100644
--- a/pkgs/development/r-modules/wrapper/default.nix
+++ b/pkgs/development/r-modules/wrapper/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, R, packages, makeWrapper }:
+{ stdenv, R, makeWrapper, recommendedPackages, packages }:
 
 stdenv.mkDerivation {
   name = R.name + "-wrapper";
 
-  buildInputs = [makeWrapper R] ++ packages;
+  buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages;
 
   unpackPhase = ":";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23ba066967a..457d347c143 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6431,9 +6431,15 @@ let
   R = callPackage ../applications/science/math/R {
     inherit (xlibs) libX11 libXt;
     texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
+    withRecommendedPackages = false;
   };
 
-  rWrapper = callPackage ../development/r-modules/generic/wrapper.nix {
+  rWrapper = callPackage ../development/r-modules/wrapper {
+    # Those packages are usually installed as part of the R build.
+    recommendedPackages = with rPackages; [ MASS lattice Matrix nlme
+      survival boot cluster codetools foreign KernSmooth rpart class
+      nnet spatial mgcv ];
+    # Override this attribute to register additional libraries.
     packages = [];
   };
 

From a306b28baa7f55dcee953e7382b513c8f9ebde67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 21:19:11 +0200
Subject: [PATCH 0969/2033] haskell-defaults: prefer cabal-install 1.20.x on
 ghc-head

---
 pkgs/top-level/haskell-defaults.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index f9b9560bf14..64478328921 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,8 +19,6 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-      cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; };
-      cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; };
     };
 
   ghc782Prefs =

From 49d62325ea001e666db5eaef551edb4ad409e20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 4 May 2014 21:37:28 +0200
Subject: [PATCH 0970/2033] haskell-wreq: disable check phase, it requires
 network

---
 pkgs/development/libraries/haskell/wreq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix
index 2197558ec08..30fa943d085 100644
--- a/pkgs/development/libraries/haskell/wreq/default.nix
+++ b/pkgs/development/libraries/haskell/wreq/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     aeson doctest filepath httpClient httpTypes HUnit lens temporary
     testFramework testFrameworkHunit text
   ];
+  doCheck = false;
   meta = {
     homepage = "http://www.serpentine.com/wreq";
     description = "An easy-to-use HTTP client library";

From 9dd7896cba876dfe996427b924d09c8e2277572a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 3 May 2014 21:12:24 +0200
Subject: [PATCH 0971/2033] async-2.0.1.3: jailbreak (see
 http://hydra.nixos.org/build/10766630/nixlog/1/raw)

---
 pkgs/development/libraries/haskell/async/2.0.1.3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
index 1b943208dea..a17e1fb8686 100644
--- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix
+++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh";
   buildDepends = [ stm ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/simonmar/async";
     description = "Run IO operations asynchronously and wait for their results";

From ef05fad51ab36c0064d542d8665ae27faab2e9d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:04:44 +0200
Subject: [PATCH 0972/2033] R: don't restrict meta.platforms to Linux; other
 architectures should build fine

---
 pkgs/applications/science/math/R/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 452d9816b77..772d9cdd6ce 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
       user-defined recursive functions and input and output facilities.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

From 4e1e248cf1dc0f90d7853d8dd716372a88dd7d85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:24:57 +0200
Subject: [PATCH 0973/2033] r-generic-builder: clean up the expression

---
 .../development/r-modules/generic/default.nix | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/r-modules/generic/default.nix b/pkgs/development/r-modules/generic/default.nix
index d405cc018d1..1e6977430d9 100644
--- a/pkgs/development/r-modules/generic/default.nix
+++ b/pkgs/development/r-modules/generic/default.nix
@@ -1,17 +1,9 @@
 R:
 
-{ buildInputs ? [], ... } @ attrs:
+{ name, buildInputs ? [], ... } @ attrs:
 
-R.stdenv.mkDerivation (
-  {
-  }
-  //
-  attrs
-  //
-  {
-    name = "r-" + attrs.name;
-    builder = ./builder.sh;
-    buildInputs = buildInputs ++ [ R ];
-    phases = [ "installPhase" "fixupPhase" ];
-  }
-)
+R.stdenv.mkDerivation (attrs // {
+  name = "r-" + name;
+  builder = ./builder.sh;
+  buildInputs = buildInputs ++ [ R ];
+})

From 18f49692ece3f9b7ea43e35e81d21fe7b1d0dd6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:25:56 +0200
Subject: [PATCH 0974/2033] haskell-wreq: fix reference to attoparsec

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 89efef945f3..b018e0bb00c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2818,10 +2818,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
   wreq = callPackage ../development/libraries/haskell/wreq {
-    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_2_1; };
-    attoparsec = self.attoparsec_0_11_2_1;
+    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_0; };
+    attoparsec = self.attoparsec_0_11_3_0;
     lens = self.lens.override {
-      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_2_1; };
+      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_0; };
     };
   };
 

From 14c4249b37330025f2bd8eda70c8d8c897d22914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 4 May 2014 16:26:19 +0200
Subject: [PATCH 0975/2033] haskell-case-insensitive-1.0.0.1: jailbreak

---
 pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
index b5fe61c13cb..ede59ad22cd 100644
--- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
+++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix
@@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
   sha256 = "1yp8895qvxcmai0hvxdq77qss9cia2f9fyn6rm0hln3rcx8n53xm";
   buildDepends = [ deepseq hashable text ];
   testDepends = [ HUnit testFramework testFrameworkHunit text ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/basvandijk/case-insensitive";
     description = "Case insensitive string comparison";

From d385835c3844f0956eaeb405f561e15ed69b2736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 4 May 2014 23:02:46 +0200
Subject: [PATCH 0976/2033] haskell-profiteur: new expression

---
 .../tools/haskell/profiteur/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/profiteur/default.nix

diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix
new file mode 100644
index 00000000000..748b0093ba2
--- /dev/null
+++ b/pkgs/development/tools/haskell/profiteur/default.nix
@@ -0,0 +1,20 @@
+{ cabal, aeson, attoparsec, filepath, text, unorderedContainers
+, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "profiteur";
+  version = "0.1.2.1";
+  sha256 = "1108hhh2ivhs85jkga4wps2yscgjnp211sw5w45j4wp9dgpz2hak";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    aeson attoparsec filepath text unorderedContainers vector
+  ];
+  meta = {
+    homepage = "http://github.com/jaspervdj/profiteur";
+    description = "Treemap visualiser for GHC prof files";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b018e0bb00c..62428795b41 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2092,6 +2092,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   pqueue = callPackage ../development/libraries/haskell/pqueue {};
 
   process = callPackage ../development/libraries/haskell/process {};
+  
+  profiteur = callPackage ../development/tools/haskell/profiteur {};
 
   preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};
 

From 401f4a28c1e5be0b35f1aea317a70cea7f535096 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 23:21:19 +0200
Subject: [PATCH 0977/2033] cryptol: fix reference to text library

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 62428795b41..1810dca6c0e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3040,7 +3040,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix {
     QuickCheck   = self.QuickCheck_2_7_3;
-    text         = self.text_1_1_0_1;
+    text         = self.text_1_1_1_1;
     cabalInstall = self.cabalInstall_1_18_0_3;
     Cabal        = self.Cabal_1_18_1_3;
   };

From 66bcd77f0ebdacb99ad54339945fb9a082f20df6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 23:54:11 +0200
Subject: [PATCH 0978/2033] R: simplify the generic builder

---
 pkgs/development/r-modules/cran-packages.nix  |  4 +--
 .../development/r-modules/generic-builder.nix | 33 +++++++++++++++++++
 pkgs/development/r-modules/generic/builder.sh | 23 -------------
 .../development/r-modules/generic/default.nix |  9 -----
 .../{wrapper/default.nix => wrapper.nix}      |  0
 pkgs/top-level/all-packages.nix               |  2 +-
 6 files changed, 36 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/r-modules/generic-builder.nix
 delete mode 100644 pkgs/development/r-modules/generic/builder.sh
 delete mode 100644 pkgs/development/r-modules/generic/default.nix
 rename pkgs/development/r-modules/{wrapper/default.nix => wrapper.nix} (100%)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 9dd1a1691eb..5b1671bc301 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -39,7 +39,7 @@ let
 
   inherit (pkgs) R fetchurl stdenv;
 
-  buildRPackage = import ./generic R;
+  buildRPackage = import ./generic-builder.nix R;
 
   derive = { name, version, sha256, depends ? [] }: buildRPackage {
     name = "${name}-${version}";
@@ -5510,7 +5510,7 @@ let self = _self // overrides; _self = with self; {
   XLConnect = derive { name="XLConnect"; version="0.2-7"; sha256="15vqjlcdh51y3riqaifvj1gk8sfl657dyicbwagnwqq4vsniqihi"; depends=[rJava]; };
   xlsx = derive { name="xlsx"; version="0.5.5"; sha256="0dl0j0rk9m0chv9yxx92gbbfv9mf5igvk75jrpm2105l2cq5j8jc"; depends=[rJava xlsxjars]; };
   xlsxjars = derive { name="xlsxjars"; version="0.6.0"; sha256="0mjfvd433iz742gn3avaq48172yi5hhd0ajc3v22y1j4k9w82pr7"; depends=[rJava]; };
-  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[]; };
+  XML = derive { name="XML"; version="3.98-1.1"; sha256="0n9i6746211wihglbpsgalj2cyvggn4rv6a4fbavqwnjw3h1hwwl"; depends=[ pkgs.libxml2 ]; };
   XML2R = derive { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[XML RCurl plyr]; };
   XNomial = derive { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
   xoi = derive { name="xoi"; version="0.61-1"; sha256="0ypy0rb0f0bns41vjzyln04k3hypgr3wysqbdi0b0r14ip5rb47k"; depends=[qtl]; };
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
new file mode 100644
index 00000000000..e1b3a6cc1a8
--- /dev/null
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -0,0 +1,33 @@
+R:
+
+{ name, buildInputs ? [], ... } @ attrs:
+
+R.stdenv.mkDerivation ({
+  name = "r-" + name;
+
+  buildInputs = buildInputs ++ [R];
+
+  configurePhase = ''
+    runHook preConfigure
+    export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/library
+    R CMD INSTALL -l $out/library $src
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    if test -e $out/nix-support/propagated-native-build-inputs; then
+        ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
+    fi
+  '';
+} // attrs)
diff --git a/pkgs/development/r-modules/generic/builder.sh b/pkgs/development/r-modules/generic/builder.sh
deleted file mode 100644
index 0c5d934c10c..00000000000
--- a/pkgs/development/r-modules/generic/builder.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-source $stdenv/setup
-
-export R_LIBS_SITE="$R_LIBS_SITE${R_LIBS_SITE:+:}$out/library"
-
-
-if test -n "$rPreHook"; then
-    eval "$rPreHook"
-fi
-
-installPhase() {
-	runHook preInstall
-	mkdir -p $out/library
-	R CMD INSTALL -l $out/library $src
-	runHook postInstall
-}
-
-postFixup() {
-    if test -e $out/nix-support/propagated-native-build-inputs; then
-        ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
-    fi
-}
-
-genericBuild
diff --git a/pkgs/development/r-modules/generic/default.nix b/pkgs/development/r-modules/generic/default.nix
deleted file mode 100644
index 1e6977430d9..00000000000
--- a/pkgs/development/r-modules/generic/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-R:
-
-{ name, buildInputs ? [], ... } @ attrs:
-
-R.stdenv.mkDerivation (attrs // {
-  name = "r-" + name;
-  builder = ./builder.sh;
-  buildInputs = buildInputs ++ [ R ];
-})
diff --git a/pkgs/development/r-modules/wrapper/default.nix b/pkgs/development/r-modules/wrapper.nix
similarity index 100%
rename from pkgs/development/r-modules/wrapper/default.nix
rename to pkgs/development/r-modules/wrapper.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 457d347c143..5f7841daa05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6434,7 +6434,7 @@ let
     withRecommendedPackages = false;
   };
 
-  rWrapper = callPackage ../development/r-modules/wrapper {
+  rWrapper = callPackage ../development/r-modules/wrapper.nix {
     # Those packages are usually installed as part of the R build.
     recommendedPackages = with rPackages; [ MASS lattice Matrix nlme
       survival boot cluster codetools foreign KernSmooth rpart class

From fed4f39c733b07933e5ebce2a853e3f5dba5a01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Mon, 5 May 2014 00:21:31 +0200
Subject: [PATCH 0979/2033] Updated to mutt-1.5.23

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

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 97722a51bb5..dbd5a41afd3 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -15,14 +15,14 @@ assert sslSupport -> openssl != null;
 assert saslSupport -> cyrus_sasl != null;
 
 let
-  version = "1.5.22";
+  version = "1.5.23";
 in
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
   
   src = fetchurl {
-    url = "ftp://ftp.mutt.org/mutt/devel/${name}.tar.gz";
-    sha256 = "19zk81spnb0gc8y5mwmcfn33g77wv1xz5bmgic8aan07xn8fislg";
+    url = "mirror://sourceforge/mutt/${name}.tar.gz";
+    sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
   };
 
   buildInputs = [

From f31f57c32dc9fb2cf97d16181a161a47b9004d70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 00:32:45 +0200
Subject: [PATCH 0980/2033] r-generic-builder: don't let derivation override
 the naming scheme

---
 pkgs/development/r-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index e1b3a6cc1a8..1899eaa61d4 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -3,8 +3,6 @@ R:
 { name, buildInputs ? [], ... } @ attrs:
 
 R.stdenv.mkDerivation ({
-  name = "r-" + name;
-
   buildInputs = buildInputs ++ [R];
 
   configurePhase = ''
@@ -30,4 +28,6 @@ R.stdenv.mkDerivation ({
         ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
     fi
   '';
-} // attrs)
+} // attrs // {
+  name = "r-" + name;
+})

From 97262a59b55695eaed16356b4a3fd135ccd837a7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 00:33:20 +0200
Subject: [PATCH 0981/2033] cran-packages.nix: provide meta.homepage links for
 all modules

---
 pkgs/development/r-modules/cran-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 5b1671bc301..cfac873d1f5 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -48,6 +48,7 @@ let
       inherit sha256;
     };
     propagatedBuildInputs = depends;
+    meta.homepage = "http://cran.r-project.org/web/packages/${name}/";
   };
 
 in

From 686fa3f2cc2353b47acf5fad969355a4622ee67f Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 5 May 2014 11:40:24 +1000
Subject: [PATCH 0982/2033] lbdb: fix build on darwin

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

diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix
index a26348f8f0f..20830bad6bf 100644
--- a/pkgs/tools/misc/lbdb/default.nix
+++ b/pkgs/tools/misc/lbdb/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     md5 = "a8e65f1400c90818ff324dc4fd67eba2";
   };
 
-  buildInputs = [ perl finger_bsd ];
+  buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd;
 
   meta = {
     homepage = "http://www.spinnaker.de/lbdb/";

From 05095ec48d0acb43a8e4d88a152c905c4a42c043 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 5 May 2014 11:43:23 +1000
Subject: [PATCH 0983/2033] goobook: fix build on darwin

---
 pkgs/development/python-modules/pycrypto/default.nix | 4 +++-
 pkgs/top-level/python-packages.nix                   | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix
index 5da727a08db..b203eebf90c 100644
--- a/pkgs/development/python-modules/pycrypto/default.nix
+++ b/pkgs/development/python-modules/pycrypto/default.nix
@@ -11,9 +11,11 @@ buildPythonPackage rec {
 
   buildInputs = [ gmp ];
 
+  doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long
+
   meta = {
     homepage = "http://www.pycrypto.org/";
     description = "Python Cryptography Toolkit";
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01c4f826f5e..5a9a0566bc5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5129,12 +5129,9 @@ rec {
 
     meta = {
       description = "ASN.1 tools for Python";
-
       homepage = http://pyasn1.sourceforge.net/;
-
       license = "mBSD";
-
-      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+      platforms = stdenv.lib.platforms.unix;  # arbitrary choice
     };
   });
 

From 14152efc5f0b923d5ae07088f022f1a6d50fd6c4 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 4 May 2014 22:11:15 -0300
Subject: [PATCH 0984/2033] Aegisub: update to version 3.1.3

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

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 9bbc7c9e739..3824582970f 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -21,11 +21,11 @@ assert portaudioSupport -> (portaudio != null);
 
 stdenv.mkDerivation rec {
   name = "aegisub-${version}";
-  version = "3.0.4";
+  version = "3.1.3";
 
   src = fetchurl {
     url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
-    md5 = "0f22d63ed4c502f3801795fa623a4f41";
+    sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg";
   };
 
   buildInputs = with stdenv.lib;

From 7e7d8d651af2923f069bc3aae1160ebb325382d1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 23 Apr 2014 00:09:41 +0200
Subject: [PATCH 0985/2033] v8: upgrade to 3.26.8

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

diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index db8e491caae..d3a2511c90c 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -8,12 +8,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "v8-${version}";
-  version = "3.25.9";
+  version = "3.26.8";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/"
         + "${name}.tar.bz2";
-    sha256 = "0x6czv99dr701vljyb4ghyhhc5rmv7vfkpvigcnrqz2an9q1pc28";
+    sha256 = "0w8mfy8jlqvp958c0zhsfwf0s3m6kw53jhcyg6aiwh877g6s21iz";
   };
 
   configurePhase = ''

From 9e7c905d983e7e551cf79e4679c66dd7504442ee Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 26 Apr 2014 20:12:20 +0200
Subject: [PATCH 0986/2033] re2: upgrade to 20140304

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

diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 26ef47199e3..301fcc84b9f 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "re2";
-  version = "20130802";
+  version = "20140304";
 
   src = fetchurl {
     url = "https://re2.googlecode.com/files/${name}-${version}.tgz";
-    sha256 = "12yxbjsnc1ym7jny470wbnb6h3rgsfv0z75vdp12npklck5nmwhp";
+    sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb";
   };
 
   preConfigure = ''

From b6d89551996475f7a1c7ba397e97efacf53bf166 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 26 Apr 2014 20:13:51 +0200
Subject: [PATCH 0987/2033] mongodb: upgrade to 2.6.0

---
 pkgs/servers/nosql/mongodb/default.nix | 29 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index a5a021b9354..78792c3a4f7 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchurl, scons, boost, v8_3_14, gperftools, pcre, snappy }:
+{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }:
 
-let version = "2.4.8"; in stdenv.mkDerivation rec {
+let version = "2.6.0";
+    system-libraries = [
+      "tcmalloc"
+      "pcre"
+      "boost"
+      "snappy"
+      # "v8"      -- mongo still bundles 3.12 and does not work with 3.15+
+      # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
+      # "yaml"    -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo
+    ];
+    system-lib-args = stdenv.lib.concatStringsSep " "
+                          (map (lib: "--use-system-${lib}") system-libraries);
+
+in stdenv.mkDerivation rec {
   name = "mongodb-${version}";
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
+    sha256 = "066kppjdmdpadjr09ildla3aw42anzsc9pa55iwp3wa4rgqd2i33";
   };
 
-  nativeBuildInputs = [ scons boost v8_3_14 gperftools pcre snappy ];
+  nativeBuildInputs = [ scons boost gperftools pcre snappy ];
 
   postPatch = ''
     substituteInPlace SConstruct \
-        --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \
-        --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]'
+        --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR"
   '';
 
   buildPhase = ''
-    export SCONSFLAGS="-j$NIX_BUILD_CORES"
-    scons all --use-system-all
+    scons all --release ${system-lib-args}
   '';
 
   installPhase = ''
     mkdir -p $out/lib
-    scons install --use-system-all --full --prefix=$out
+    scons install --release --prefix=$out ${system-lib-args}
   '';
 
   meta = {

From 1ebd6204850e90be2266854912e2d2947a307837 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 26 Apr 2014 20:15:28 +0200
Subject: [PATCH 0988/2033] rethinkdb: upgrade to 1.12.4

---
 pkgs/servers/nosql/rethinkdb/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index ec1dbd76364..67dff3f6572 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, which, protobuf, v8_3_14, ncurses, gperftools, boost, m4 }:
+{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, python, m4 }:
 
 stdenv.mkDerivation rec {
-  name = "rethinkdb-1.11.2";
+  name = "rethinkdb-1.12.4";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "04wz07y891vygc5ksrvkk1ch05xj16nahv20bnxwcllkbl4gf9lj";
+    sha256 = "1dq2vbgms016ic2hifclm1m58i4804khkn0lnvz47rkm7i0564if";
   };
 
   preConfigure = ''
@@ -15,10 +15,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--lib-path ${gperftools}/lib";
 
-  buildInputs = [ protobuf v8_3_14 ncurses boost ];
-
-  nativeBuildInputs = [ which m4 ];
+  buildInputs = [ protobuf zlib boost ];
 
+  nativeBuildInputs = [ which m4 python ];
 
   meta = {
     description = "An open-source distributed database built with love";

From 00a70b454ce58df7093fafc34d18923af982218b Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 26 Apr 2014 20:15:39 +0200
Subject: [PATCH 0989/2033] v8: remove old version 3.14

---
 pkgs/development/libraries/v8/3.14.nix | 65 --------------------------
 pkgs/top-level/all-packages.nix        |  4 --
 2 files changed, 69 deletions(-)
 delete mode 100644 pkgs/development/libraries/v8/3.14.nix

diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
deleted file mode 100644
index 0564e688795..00000000000
--- a/pkgs/development/libraries/v8/3.14.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, fetchsvn, gyp, readline, python, which }:
-
-assert readline != null;
-
-let
-  system = stdenv.system;
-  arch = if system == "i686-linux" then "ia32" else if system == "x86_64-linux" || system == "x86_64-darwin" then "x64" else "";
-  version = "3.14.5.9";
-in
-
-assert arch != "";
-
-stdenv.mkDerivation {
-    name = "v8-${version}";
-
-    src = fetchsvn {
-      url = "http://v8.googlecode.com/svn/tags/${version}";
-      sha256 = "18qp5qp5xrb6f00w01cklz358yrl54pks963f5rwvwz82d8sfyqr";
-      name = "v8-${version}-src";
-    };
-
-    patches = [ ./fix-GetLocalizedMessage-usage.patch ];
-
-    configurePhase = ''
-      mkdir build/gyp
-      ln -sv ${gyp}/bin/gyp build/gyp/gyp
-    '';
-
-    nativeBuildInputs = [ which ];
-    buildInputs = [ readline python ];
-
-    buildFlags = [
-      "library=shared"
-      "console=readline"
-      "${arch}.release"
-    ];
-
-    # http://code.google.com/p/v8/issues/detail?id=2149
-    NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs -Wno-aggressive-loop-optimizations";
-
-    enableParallelBuilding = true;
-
-    installPhase = ''
-      mkdir -p $out/bin
-      mkdir -p $out/lib
-      mv -v out/${arch}.release/d8 $out/bin
-
-      ${if stdenv.system == "x86_64-darwin" then
-        "mv -v out/${arch}.release/libv8.dylib $out/lib"
-      else
-        "mv -v out/${arch}.release/lib.target/libv8.so $out/lib"}
-      mv -v include $out/
-    '';
-
-    postFixup = if stdenv.isDarwin then ''
-      install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8
-      install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib
-    '' else null;
-
-    meta = with stdenv.lib; {
-      description = "V8 is Google's open source JavaScript engine";
-      platforms = platforms.linux ++ platforms.darwin;
-      license = licenses.bsd3;
-    };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7841daa05..e8d49a140e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6239,10 +6239,6 @@ let
     inherit (pythonPackages) gyp;
   };
 
-  v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
-    inherit (pythonPackages) gyp;
-  };
-
   xmlsec = callPackage ../development/libraries/xmlsec { };
 
   zziplib = callPackage ../development/libraries/zziplib { };

From 0a6b317071b8ee5200945802e686da155ea93db4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 00:58:23 -0500
Subject: [PATCH 0990/2033] Make Coq buildable on any Unix

---
 pkgs/applications/science/logic/coq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index aa3ba878eb5..21691f8fc01 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -55,6 +55,6 @@ stdenv.mkDerivation {
     homepage = "http://coq.inria.fr";
     license = "LGPL";
     maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 66f0275b41faeb7654a57f5483a2fbbf00eea553 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 01:03:51 -0500
Subject: [PATCH 0991/2033] Disable Texinfo tests on Darwin

---
 pkgs/development/tools/misc/texinfo/5.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 0a7446fe534..d5aeac2eef8 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     installTargets="install install-tex";
   '';
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   meta = {
     homepage = "http://www.gnu.org/software/texinfo/";

From d66cdd3c433ea049c466dac27e161af55f145234 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Mon, 5 May 2014 02:14:57 -0400
Subject: [PATCH 0992/2033] scala: Bump to 2.11.0, bump 2.10 to 2.10.4

---
 pkgs/development/compilers/scala/2.10.nix    | 37 ++++++++++++++++++++
 pkgs/development/compilers/scala/default.nix |  4 +--
 pkgs/top-level/all-packages.nix              |  5 +--
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/scala/2.10.nix

diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix
new file mode 100644
index 00000000000..11c3c0d8c31
--- /dev/null
+++ b/pkgs/development/compilers/scala/2.10.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "scala-2.10.4";
+
+  src = fetchurl {
+    url = "http://www.scala-lang.org/files/archive/${name}.tgz";
+    sha256 = "1hqhm1xvd7g78jspvl30zgdzw79xq5zl837h47p6w1n6qlwbcvdl";
+  };
+
+  buildInputs = [ jre makeWrapper ] ;
+
+  installPhase = ''
+    mkdir -p $out
+    rm bin/*.bat
+    mv * $out
+
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
+    done
+  '';
+
+  meta = {
+    description = "Scala is a general purpose programming language";
+    longDescription = ''
+      Scala is a general purpose programming language designed to express
+      common programming patterns in a concise, elegant, and type-safe way.
+      It smoothly integrates features of object-oriented and functional
+      languages, enabling Java and other programmers to be more productive.
+      Code sizes are typically reduced by a factor of two to three when
+      compared to an equivalent Java application.
+    '';
+    homepage = http://www.scala-lang.org/;
+    license = "BSD";
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index c128baf5100..f4a5a7bade0 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.10.3";
+  name = "scala-2.11.0";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "16ac935wydrxrvijv4ldnz4vl2xk8yb3yzb9bsi3nb9sic7fxl95";
+    sha256 = "00lap31c6rxvg7vipmj0j7f4mv6c58wpfyd3785bxwlhrzmmwgq7";
   };
 
   buildInputs = [ jre makeWrapper ] ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7841daa05..c562b91350a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3211,8 +3211,9 @@ let
   };
 
   scala_2_9 = callPackage ../development/compilers/scala/2.9.nix { };
-  scala_2_10 = callPackage ../development/compilers/scala { };
-  scala = scala_2_10;
+  scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };
+  scala_2_11 = callPackage ../development/compilers/scala { };
+  scala = scala_2_11;
 
   sdcc = callPackage ../development/compilers/sdcc { };
 

From 622aa834b72d4e8c10b8d61baec60706af26f170 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 02:18:47 -0500
Subject: [PATCH 0993/2033] Add -Wno-error=deprecated-declarations for nginx,
 required to build on Darwin

---
 pkgs/servers/http/nginx/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 3dc38575136..6f0b3ccf41c 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -74,8 +74,10 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}"
     ++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}";
 
+  additionalFlags = stdenv.lib.optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
+
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
   '';
 
   postInstall = ''

From c8f4775b8b7c741fda73639e6f9d477b407e4803 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 10:22:10 +0200
Subject: [PATCH 0994/2033] r-curl: fix build

---
 pkgs/development/r-modules/cran-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index cfac873d1f5..f7d52c08fb9 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4008,7 +4008,7 @@ let self = _self // overrides; _self = with self; {
   rcqp = derive { name="rcqp"; version="0.3"; sha256="0vxcgchnxdsdamclcshjbkn00ysmfmqp586a36wsyv3zqrd6rg7p"; depends=[plyr]; };
   Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
   rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[MASS Matrix lattice]; };
-  RCurl = derive { name="RCurl"; version="1.95-4.1"; sha256="1bphxniirak797rb2hjnv83i1sskdzcf3bl15lym171f79kx80w3"; depends=[bitops]; };
+  RCurl = derive { name="RCurl"; version="1.95-4.1"; sha256="1bphxniirak797rb2hjnv83i1sskdzcf3bl15lym171f79kx80w3"; depends=[bitops pkgs.curl]; };
   Rd2roxygen = derive { name="Rd2roxygen"; version="1.4"; sha256="09dxgp65zac5b9mxbjrvy3ihdwski98xva5afq659b8yfvkviq4g"; depends=[roxygen2 formatR]; };
   rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
   rdatamarket = derive { name="rdatamarket"; version="0.6.4"; sha256="16a1yxvf841505a8gh7jf09fx6ipysymrpvsd4b07xdg5hvbzx25"; depends=[zoo RCurl RJSONIO]; };

From 0ae6cde78a4ce14191829c6bff325bc18b265546 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:58:25 +0200
Subject: [PATCH 0995/2033] haskell-timezone-series: update to version 0.1.3

---
 .../development/libraries/haskell/timezone-series/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix
index 1ce1ca1f768..cb7e40243ff 100644
--- a/pkgs/development/libraries/haskell/timezone-series/default.nix
+++ b/pkgs/development/libraries/haskell/timezone-series/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timezone-series";
-  version = "0.1.2";
-  sha256 = "0clvm1kwmxid5bhb74vgrpzynn4sff2k6mfzb43i7737w5fy86gp";
+  version = "0.1.3";
+  sha256 = "0b13a929wrgfl1agkyp3d5wy89aw69zm4l0src7p16rh3kr38w73";
   buildDepends = [ time ];
   meta = {
     homepage = "http://projects.haskell.org/time-ng/";

From e7c207e10d73d403bbaa15eb53481f244d4a1789 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:58:58 +0200
Subject: [PATCH 0996/2033] haskell-hourglass: add version 0.1.1

---
 .../libraries/haskell/hourglass/default.nix   | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hourglass/default.nix

diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
new file mode 100644
index 00000000000..184270ad6ec
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hourglass/default.nix
@@ -0,0 +1,20 @@
+{ cabal, deepseq, HUnit, mtl, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hourglass";
+  version = "0.1.1";
+  sha256 = "1mxi98l9nsnddkkd35r70l1y04wq0lh6xsapjbkz411q5045wfk7";
+  buildDepends = [ deepseq ];
+  testDepends = [
+    deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 time
+  ];
+  meta = {
+    homepage = "https://github.com/vincenthz/hs-hourglass";
+    description = "simple performant time related library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1810dca6c0e..468119a13bb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1363,6 +1363,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
 
+  hourglass = callPackage ../development/libraries/haskell/hourglass {};
+
   hseCpp = callPackage ../development/libraries/haskell/hse-cpp {};
 
   hsimport = callPackage ../development/libraries/haskell/hsimport {};

From 986a42dfe7c4c90b22ebcbbce460e6b74962c711 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:12 +0200
Subject: [PATCH 0997/2033] haskell-cabal-lenses: add version 0.1

---
 .../libraries/haskell/cabal-lenses/default.nix      | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/cabal-lenses/default.nix

diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
new file mode 100644
index 00000000000..06777aadc4d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix
@@ -0,0 +1,13 @@
+{ cabal, Cabal, lens, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-lenses";
+  version = "0.1";
+  sha256 = "0jss4h7crh7mndl5ghbpziy37cg9i29cc64fgxvxb63hpk0q2m17";
+  buildDepends = [ Cabal lens unorderedContainers ];
+  meta = {
+    description = "Lenses and traversals for the Cabal library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 468119a13bb..ba2c4c827b2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -719,6 +719,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
 
+  cabalLenses = callPackage ../development/libraries/haskell/cabal-lenses {};
+
   cabalMacosx = callPackage ../development/libraries/haskell/cabal-macosx {};
 
   cairo = callPackage ../development/libraries/haskell/cairo {

From 76ca228a48c337a9cd5528489ec08fa5fd6a4c2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:22 +0200
Subject: [PATCH 0998/2033] haskell-SafeSemaphore: update to version 0.10.1

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

diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
index 20c879e0dc4..6e5e0bf4038 100644
--- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
+++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SafeSemaphore";
-  version = "0.10.0";
-  sha256 = "0zjm99jqkbn99p5d3mdggij4b4jfpz4fk1rwpd48ld4vmzzqh92c";
+  version = "0.10.1";
+  sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91";
   buildDepends = [ stm ];
   testDepends = [ HUnit ];
   meta = {

From bea71b95ffe63b93976873e9b10d4fb845bc1a0c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:24 +0200
Subject: [PATCH 0999/2033] haskell-geniplate: update to version 0.6.0.4

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

diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix
index eff79afa416..bebc611ddaa 100644
--- a/pkgs/development/libraries/haskell/geniplate/default.nix
+++ b/pkgs/development/libraries/haskell/geniplate/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "geniplate";
-  version = "0.6.0.3";
-  sha256 = "1n73p57gkn9qf7jn54izypc7zycd9i6y9z9i1gc8yn1wd8sv7vkn";
+  version = "0.6.0.4";
+  sha256 = "1sw1bs3nzbdmvphy5g65pl40y8wdqkgvszx1i6viqjymjq96xv20";
   buildDepends = [ mtl ];
   meta = {
     description = "Use template Haskell to generate Uniplate-like functions";

From e56622a1ef9855458f102f7a23adc7e305c537fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:25 +0200
Subject: [PATCH 1000/2033] haskell-gloss-raster: update to version 1.8.2.1

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

diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix
index 4a34c7195c2..3ae49673078 100644
--- a/pkgs/development/libraries/haskell/gloss-raster/default.nix
+++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss-raster";
-  version = "1.8.1.2";
-  sha256 = "1cpibilv027rfx7xz957f1d7wy6b5z6dgfjrw425ck497r8gfgp4";
+  version = "1.8.2.1";
+  sha256 = "0ls8rlwrbpisrmq2xigf9926pak028dmld6shrblcmdbykaz55ha";
   buildDepends = [ gloss repa ];
   extraLibraries = [ llvm ];
   meta = {

From 37df971a49b6264894df2584c45a65a358f5fade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:27 +0200
Subject: [PATCH 1001/2033] haskell-gloss: update to version 1.8.2.1

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

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 223a72ec381..65a46bf016a 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.8.1.2";
-  sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m";
+  version = "1.8.2.1";
+  sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {

From 10d6cf6116f6dd9f0a975a51c7765becad4f0ce8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:28 +0200
Subject: [PATCH 1002/2033] haskell-hit: update to version 0.6.0

---
 .../libraries/haskell/hit/default.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix
index abfe150c163..9e1a48d94e6 100644
--- a/pkgs/development/libraries/haskell/hit/default.nix
+++ b/pkgs/development/libraries/haskell/hit/default.nix
@@ -1,22 +1,22 @@
-{ cabal, attoparsec, bytedump, cryptohash, HUnit, mtl, parsec
-, patience, QuickCheck, random, systemFileio, systemFilepath
-, testFramework, testFrameworkQuickcheck2, time, vector, zlib
-, zlibBindings
+{ cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl
+, parsec, patience, QuickCheck, random, systemFileio
+, systemFilepath, testFramework, testFrameworkQuickcheck2, vector
+, zlib, zlibBindings
 }:
 
 cabal.mkDerivation (self: {
   pname = "hit";
-  version = "0.5.5";
-  sha256 = "18k2fgwflzs2lpkhxg2xvni3l9cdn3hk9ajrd4flz12j7vp0ga4c";
+  version = "0.6.0";
+  sha256 = "1haslqhnpfdll5cl3vq1y03h916lydhc9mq4gagm9qzjfjqv54k2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec cryptohash mtl parsec patience random systemFileio
-    systemFilepath time vector zlib zlibBindings
+    attoparsec cryptohash hourglass mtl parsec patience random
+    systemFileio systemFilepath vector zlib zlibBindings
   ];
   testDepends = [
-    bytedump HUnit QuickCheck testFramework testFrameworkQuickcheck2
-    time
+    bytedump hourglass HUnit QuickCheck testFramework
+    testFrameworkQuickcheck2
   ];
   meta = {
     homepage = "http://github.com/vincenthz/hit";

From 7780de27d1e45e90de123c81bdcf727f68b02d5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:30 +0200
Subject: [PATCH 1003/2033] haskell-modular-arithmetic: update to version
 1.2.0.0

---
 .../libraries/haskell/modular-arithmetic/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
index 9a15b32f307..6a6a7c99d70 100644
--- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
+++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "modular-arithmetic";
-  version = "1.1.0.0";
-  sha256 = "02zxxz204ydyj28p65fqb920x5gbm7gba4yf9mhiw6ff0dcmxp37";
+  version = "1.2.0.0";
+  sha256 = "1qlvi0xjdvr4730xj303i6gp610mz4xrlrk191yy8hr7afjysm0k";
   meta = {
     description = "A type for integers modulo some constant";
     license = self.stdenv.lib.licenses.bsd3;

From 59b5aa05f9c05d33ff0a11918b291728744191a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:31 +0200
Subject: [PATCH 1004/2033] haskell-persistent-postgresql: update to version
 1.3.1.1

---
 .../libraries/haskell/persistent-postgresql/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
index 3667c33e81c..49a505e8dd1 100644
--- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-postgresql";
-  version = "1.3.1";
-  sha256 = "19wmz9xd1jdmysr7zhlxf6z9v7pfgy0d3g7szifk8wjq8ai57lny";
+  version = "1.3.1.1";
+  sha256 = "1qi19fm7waxrbh795jvcny7aaj6b64jqcwv772xjzl9dbv3q9qhc";
   buildDepends = [
     aeson blazeBuilder conduit monadControl persistent postgresqlLibpq
     postgresqlSimple resourcet text time transformers

From 7f7a32db50d4ffb9a72cf16cbc7cd7beccf81c92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:33 +0200
Subject: [PATCH 1005/2033] haskell-repa-algorithms: update to version 3.2.5.1

---
 .../development/libraries/haskell/repa-algorithms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
index 2ec3fb3172e..06725444e86 100644
--- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix
+++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-algorithms";
-  version = "3.2.4.1";
-  sha256 = "0xb2r726z73ghiqik39n99q5hal16y7ydk16q2rbycbvc37yq24b";
+  version = "3.2.5.1";
+  sha256 = "1pk2w7qx1jfxqra66fflb71v6hmq6g05dss27kwhz0cdidpvcc7l";
   buildDepends = [ repa vector ];
   extraLibraries = [ llvm ];
   jailbreak = true;

From fbcd8f1702a3804c4bddf83b32a15557cc45b66e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:34 +0200
Subject: [PATCH 1006/2033] haskell-repa-examples: update to version 3.2.5.1

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

diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix
index 0d65439f2c5..571ef7f3d16 100644
--- a/pkgs/development/libraries/haskell/repa-examples/default.nix
+++ b/pkgs/development/libraries/haskell/repa-examples/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-examples";
-  version = "3.2.3.2";
-  sha256 = "1l8bvaaap5gl62j9zinjgj8vlqq4b52p46hnj8kq9n09lxq6xq96";
+  version = "3.2.5.1";
+  sha256 = "0xrjfmwbq8mhcim261da7i68mp5jxkqiwjy2mhd1lgkr63m6x18j";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From ff8c978e81554375eae5f8bbfad249ef733e64b8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:36 +0200
Subject: [PATCH 1007/2033] haskell-repa-io: update to version 3.2.5.1

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

diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix
index 046fafca43a..563fe84193b 100644
--- a/pkgs/development/libraries/haskell/repa-io/default.nix
+++ b/pkgs/development/libraries/haskell/repa-io/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa-io";
-  version = "3.2.3.2";
-  sha256 = "116qxq0jsq3hbj0hxjxfr9sl29vzj1rpfbzfxgc243v1hh4rdjfr";
+  version = "3.2.5.1";
+  sha256 = "0aizsr6r1ybydpwqiamcdr4jhvqh0fiq9gbd7n17lrmnagyla5n8";
   buildDepends = [ binary bmp repa vector ];
   jailbreak = true;
   meta = {

From f0e2d697aba7bf155bd50cbd6c42d624f5063f07 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:37 +0200
Subject: [PATCH 1008/2033] haskell-repa: update to version 3.2.5.1

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

diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index ae56ba5157a..ceb6fcadb0f 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.2.3.3";
-  sha256 = "0rdny7yjcmz9iy07sqnjmwyr58f0kyzzdycwi55j963rb4vqkacn";
+  version = "3.2.5.1";
+  sha256 = "0yrmia3ciagzrmrsmxh56qym4wc0malph7zhiw71gl9c9sp8hzvq";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";

From 8034dbdb0bc221751f515e75c7c174ac875b3d6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:39 +0200
Subject: [PATCH 1009/2033] haskell-shake: update to version 0.11.6

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 3e769f5e601..ab5ca8e70fb 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.11.4";
-  sha256 = "0gkj7zdy500zf58yscr5fq1ghj0kb3hywcv97r1xmi6ydccgf4ni";
+  version = "0.11.6";
+  sha256 = "1xb4w8zzikzqlx2jzbzclfpv49p85rhf17lz3c8hgdkrm6vr9diy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b658ce7db724089298d719ca407ed9ae10607790 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:40 +0200
Subject: [PATCH 1010/2033] haskell-streaming-commons: update to version
 0.1.2.2

---
 .../libraries/haskell/streaming-commons/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index dcef167cd82..e058a8bcd8f 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.2.1";
-  sha256 = "1skixb3cc47sfnq9w6r1qdw6d78wirrv4llrwikih0w7h0i8aqmx";
+  version = "0.1.2.2";
+  sha256 = "0hk01cq39f6rwnj1qpikfyfbq8vayjmvl211b97rvv8ris5y90r4";
   buildDepends = [ blazeBuilder network text transformers zlib ];
   testDepends = [
     async blazeBuilder deepseq hspec network QuickCheck text zlib

From 7b8cd6d788bf818eee6e3d045223106f3596496b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 22:59:42 +0200
Subject: [PATCH 1011/2033] haskell-cabal-bounds: update to version 0.5

---
 .../tools/haskell/cabal-bounds/default.nix            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix
index aabc9b010f5..5de7645a5e4 100644
--- a/pkgs/development/tools/haskell/cabal-bounds/default.nix
+++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix
@@ -1,15 +1,16 @@
-{ cabal, Cabal, cmdargs, either, filepath, lens, strict, tasty
-, tastyGolden, transformers, unorderedContainers
+{ cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens
+, strict, tasty, tastyGolden, transformers, unorderedContainers
 }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-bounds";
-  version = "0.4.1";
-  sha256 = "09l9ii26li178sw0rm49w4dhfkf46g4sjjdy4frmc74isvnzkpwj";
+  version = "0.5";
+  sha256 = "0sx6vyf3p62khg7qv7nwgd8fns6dsfpw34gpl7zmb6n0c1kjj60b";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal cmdargs either lens strict transformers unorderedContainers
+    Cabal cabalLenses cmdargs either lens strict transformers
+    unorderedContainers
   ];
   testDepends = [ filepath tasty tastyGolden ];
   jailbreak = true;

From f5a6b583745714e314b0312652d7b66fe8ac6dbe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 4 May 2014 23:01:52 +0200
Subject: [PATCH 1012/2033] cabal-install: update to version 1.20.0.1

---
 .../cabal-install/{1.20.0.0.nix => 1.20.0.1.nix}              | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/tools/package-management/cabal-install/{1.20.0.0.nix => 1.20.0.1.nix} (90%)

diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.0.nix b/pkgs/tools/package-management/cabal-install/1.20.0.1.nix
similarity index 90%
rename from pkgs/tools/package-management/cabal-install/1.20.0.0.nix
rename to pkgs/tools/package-management/cabal-install/1.20.0.1.nix
index 0c7bd5f473c..d0db9354ae0 100644
--- a/pkgs/tools/package-management/cabal-install/1.20.0.0.nix
+++ b/pkgs/tools/package-management/cabal-install/1.20.0.1.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-install";
-  version = "1.20.0.0";
-  sha256 = "0m05wjmi8b07xzri3d7y7bwcxmd1asj3kcg9c1idhjwmg2nla2dz";
+  version = "1.20.0.1";
+  sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ba2c4c827b2..af345b228dc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -173,7 +173,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     vector       = self.vector_0_10_9_1;
     xhtml        = self.xhtml_3000_2_1;
     zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_20_0_0;
+    cabalInstall = self.cabalInstall_1_20_0_1;
     alex         = self.alex_3_1_3;
     haddock      = self.haddock_2_14_2;
     happy        = self.happy_1_19_3;
@@ -3130,7 +3130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix {
     Cabal = self.Cabal_1_18_1_3;
   };
-  cabalInstall_1_20_0_0 = callPackage ../tools/package-management/cabal-install/1.20.0.0.nix {
+  cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix {
     Cabal = self.Cabal_1_20_0_0;
   };
   cabalInstall = self.cabalInstall_1_20_0_0;

From dbb561ae62da811079d85834ff0ddb9dbeecfd11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 10:52:11 +0200
Subject: [PATCH 1013/2033] haskell-packages.nix: strip trailing whitespace

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af345b228dc..91b437655b8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2096,7 +2096,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   pqueue = callPackage ../development/libraries/haskell/pqueue {};
 
   process = callPackage ../development/libraries/haskell/process {};
-  
+
   profiteur = callPackage ../development/tools/haskell/profiteur {};
 
   preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};

From 66997bba1eed5252abf8be8d1a15fe4cdbf9e8c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 10:53:56 +0200
Subject: [PATCH 1014/2033] haskell-gloss: require the latest OpenGL and GLUT
 libraries

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 91b437655b8..80503663dcb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1243,7 +1243,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
 
-  gloss = callPackage ../development/libraries/haskell/gloss {};
+  gloss = callPackage ../development/libraries/haskell/gloss {
+    OpenGL = self.OpenGL_2_9_1_0;
+    GLUT = self.GLUT_2_5_1_0;
+  };
 
   glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {};
 

From 90a7711e0867248a8a543e6ce892b51967861b75 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 5 May 2014 12:29:38 +0200
Subject: [PATCH 1015/2033] Re-introduce (marked as obsolete) mkStrict
 function, to allow old nixops deployments to keep working.

---
 lib/modules.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/modules.nix b/lib/modules.nix
index 017c9255246..633b6fc05b2 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -319,6 +319,8 @@ rec {
   mkForce = mkOverride 50;
   mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
 
+  mkStrict = builtins.trace "`mkStrict' is obsolete; use `mkOverride 0' instead." (mkOverride 0);
+
   mkFixStrictness = id; # obsolete, no-op
 
   mkOrder = priority: content:

From 9aa231abfafed902b7a04f28275af6e04460715f Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 5 May 2014 14:42:39 +0300
Subject: [PATCH 1016/2033] buildLocalCabal: include cabalInstall to
 buildDepends to preserve developer experience

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 80503663dcb..337c8d41e10 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3096,7 +3096,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
       ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
           | grep -v FILTERME | sed \
             -e 's/licenses.proprietary/licenses.unfree/' \
-            -e 's/{ cabal/{ cabal, src/' \
+            -e 's/{ cabal/{ cabal, cabalInstall, src/' \
+            -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \
             -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n  jailbreak = true;/'  > $out
       '';
 

From d056d1d37b4c08dffadaea4d5f38a2dc8a7469fa Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 5 May 2014 15:34:36 +0200
Subject: [PATCH 1017/2033] Fix users.*.extraGroups for users.mutableUsers =
 true.

(cherry picked from commit eb222923054fdc895ab73ff5d0260c1e1fc689c7)
---
 nixos/modules/config/users-groups.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 7daab98f7be..2c37dccd6ce 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -480,6 +480,7 @@ in {
           if ! id "${u.name}" &>/dev/null; then
             ${pkgs.shadow}/sbin/useradd \
               -g "${u.group}" \
+              -G "${toString u.extraGroups}" \
               -s "${u.shell}" \
               -d "${u.home}" \
               ${optionalString u.isSystemUser "--system"} \

From bac68f974721f07faebe749df8162f641e5d4528 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 May 2014 14:52:24 +0200
Subject: [PATCH 1018/2033] switch-to-configuration: Honour RefuseManualStop

This prevents spurious errors about systemd-tmpfiles-setup.service.

Backport: 14.04
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 7bce06cf3b5..12012698efe 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -188,7 +188,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                 if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) {
                     write_file($reloadListFile, { append => 1 }, "$unit\n");
                 }
-                elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes")) {
+                elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) {
                     push @unitsToSkip, $unit;
                 } else {
                     # If this unit is socket-activated, then stop the

From 014fe1a3c3877360b1e43540ccb9242a845bba10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 May 2014 15:46:20 +0200
Subject: [PATCH 1019/2033] sysinit.target: Don't depend on
 systemd-tmpfiles-setup.service

systemd-tmpfiles-setup.service pulls in local-fs.target, which
interferes with NixOps' send-keys feature (since sshd.service depends
indirectly on sysinit.target). Since in NixOS we don't use
systemd-tmpfiles for creating files (that's done by activation scripts
and preStart scripts), it's not a problem to start it a bit later.

Backport: 14.04
---
 pkgs/os-specific/linux/systemd/default.nix |  2 ++
 pkgs/os-specific/linux/systemd/fixes.patch | 39 +++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 147bc2352af..522907e2aee 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -3,6 +3,7 @@
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
 , kexectools, libmicrohttpd, linuxHeaders
 , python ? null, pythonSupport ? false
+, autoreconfHook
 }:
 
 assert stdenv.isLinux;
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
     [ pkgconfig intltool gperf libcap kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
       libmicrohttpd linuxHeaders
+      autoreconfHook
     ] ++ stdenv.lib.optional pythonSupport python;
 
   configureFlags =
diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index 562db98f5e8..b2c141f3aaf 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -1,3 +1,18 @@
+diff --git a/Makefile.am b/Makefile.am
+index 3d9e5c1..4d43cb4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1707,7 +1707,9 @@ dist_tmpfiles_DATA += \
+ endif
+ 
+ SYSINIT_TARGET_WANTS += \
+-	systemd-tmpfiles-setup-dev.service \
++	systemd-tmpfiles-setup-dev.service
++
++MULTI_USER_TARGET_WANTS += \
+ 	systemd-tmpfiles-setup.service
+ 
+ dist_zshcompletion_DATA += \
 diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in
 index db72373..2fc12ca 100644
 --- a/rules/99-systemd.rules.in
@@ -342,10 +357,32 @@ index 9d264a2..c505535 100644
  ExecStart=@rootlibexecdir@/systemd-rfkill load %I
  ExecStop=@rootlibexecdir@/systemd-rfkill save %I
 +X-RestartIfChanged=false
+diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
+index 01043b7..507f820 100644
+--- a/units/systemd-tmpfiles-setup.service.in
++++ b/units/systemd-tmpfiles-setup.service.in
+@@ -12,7 +12,7 @@ DefaultDependencies=no
+ Wants=local-fs.target
+ Conflicts=shutdown.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
+-Before=sysinit.target shutdown.target
++Before=shutdown.target
+ ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
+ ConditionDirectoryNotEmpty=|/lib/tmpfiles.d
+ ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
 diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
-index da7dda7..4cc550d 100644
+index da7dda7..e638145 100644
 --- a/units/systemd-update-utmp.service.in
 +++ b/units/systemd-update-utmp.service.in
+@@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
+ DefaultDependencies=no
+ RequiresMountsFor=/var/log/wtmp
+ Conflicts=shutdown.target
+-After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service auditd.service
+ Before=sysinit.target shutdown.target
+ 
+ [Service]
 @@ -19,3 +19,4 @@ Type=oneshot
  RemainAfterExit=yes
  ExecStart=@rootlibexecdir@/systemd-update-utmp reboot

From 4a08f3720635b7bb3b46dea80bba491302b16f68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 May 2014 15:54:38 +0200
Subject: [PATCH 1020/2033] Don't start getty@tty1 on headless machines (like
 EC2)

Backport: 14.04
---
 nixos/modules/profiles/headless.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix
index 14fc905f783..4be0fb44216 100644
--- a/nixos/modules/profiles/headless.nix
+++ b/nixos/modules/profiles/headless.nix
@@ -12,6 +12,8 @@ with lib;
   # Don't start a tty on the serial consoles.
   systemd.services."serial-getty@ttyS0".enable = false;
   systemd.services."serial-getty@hvc0".enable = false;
+  systemd.services."getty@tty1".enable = false;
+  systemd.services."autovt@".enable = false;
 
   # Since we can't manually respond to a panic, just reboot.
   boot.kernelParams = [ "panic=1" "boot.panic_on_fail" ];

From 24cbe874d6b97a6471b51bcbca956910d92fea9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 May 2014 16:18:20 +0200
Subject: [PATCH 1021/2033] systemd-journal-flush: Require /var/log/journal
 rather than all filesystems

Backport: 14.04
---
 pkgs/os-specific/linux/systemd/fixes.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch
index b2c141f3aaf..7410c87e277 100644
--- a/pkgs/os-specific/linux/systemd/fixes.patch
+++ b/pkgs/os-specific/linux/systemd/fixes.patch
@@ -326,6 +326,21 @@ index e945d87..77728f2 100644
  ExecStart=@rootlibexecdir@/systemd-backlight load %i
  ExecStop=@rootlibexecdir@/systemd-backlight save %i
 +X-RestartIfChanged=false
+diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
+index 503e8a6..fe23b8b 100644
+--- a/units/systemd-journal-flush.service.in
++++ b/units/systemd-journal-flush.service.in
+@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage
+ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
+ DefaultDependencies=no
+ Requires=systemd-journald.service
+-After=systemd-journald.service local-fs.target remote-fs.target
++After=systemd-journald.service
+ Before=systemd-user-sessions.service
++RequiresMountsFor=/var/log/journal
+ 
+ [Service]
+ ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
 diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
 index de93879..c9a49f3 100644
 --- a/units/systemd-journald.service.in

From 5bfe944907b0afcc979e4db7058cbfd884fd029b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 May 2014 16:23:38 +0200
Subject: [PATCH 1022/2033] Don't run hwclock if /dev/rtc doesn't exist

E.g. on EC2 instances.

Backport: 14.04
---
 nixos/modules/system/boot/shutdown.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/shutdown.nix b/nixos/modules/system/boot/shutdown.nix
index 68bc936c5b0..11041066e07 100644
--- a/nixos/modules/system/boot/shutdown.nix
+++ b/nixos/modules/system/boot/shutdown.nix
@@ -13,7 +13,7 @@ with lib;
 
       unitConfig = {
         DefaultDependencies = false;
-        ConditionVirtualization = "!systemd-nspawn";
+        ConditionPathExists = "/dev/rtc";
       };
 
       serviceConfig = {

From 4f3085d5f8916eb1afebdddda4e9bfe675b29c52 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 4 May 2014 15:01:06 +0200
Subject: [PATCH 1023/2033] chromium/source: Propagate system attribute.

The system attribute was already there in the function head of the
shared update helper but it actually wasn't used and thus later the
import of <nixpkgs> was done using builtins.currentSystem instead of the
system attribute inherited from the source derivation.

Now we correctly propagate the attribute, so that even when running a
64bit kernel you can run a 32bit Chromium with binary plugins.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/update.nix            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 09f834a90c6..de45d409937 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -1,7 +1,9 @@
 { system ? builtins.currentSystem }:
 
 let
-  inherit (import <nixpkgs> {}) lib writeText stdenv;
+  inherit (import <nixpkgs> {
+    inherit system;
+  }) lib writeText stdenv;
 
   sources = if builtins.pathExists ./sources.nix
             then import ./sources.nix

From 3de5e16627a2dee1905ca5b3cc6deb569f3aaee6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 4 May 2014 17:37:14 +0200
Subject: [PATCH 1024/2033] chromium: Fix userns sandbox patch for version 36.

This fixes build for version 36, which i accidentally broke in commit
f6e31fadd80486cdd68e3ad3d7ae888aa81400b9.

The reason this happened, was that my Hydra didn't pick up the latest
commit and I actually tested and built the parent commit instead of the
update commit.

So, this commit is the real "builds fine, tested" for all channels.

Also, the sandbox client initalization has moved into
setuid_sandbox_client.cc, so we need to move the lookup of the
CHROMIUM_SANDBOX_BINARY_PATH environment variable there.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix   |   8 +-
 .../chromium/source/sandbox_userns_36.patch   | 105 +++++++-----------
 2 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index dcc2a97547a..69e54e25c37 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -134,10 +134,14 @@ let
         -exec chmod u+w {} +
     '';
 
-    postPatch = ''
+    postPatch = let
+      toPatch = if versionOlder source.version "36.0.0.0"
+                then "content/browser/browser_main_loop.cc"
+                else "sandbox/linux/suid/client/setuid_sandbox_client.cc";
+    in ''
       sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
         sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
-      ' content/browser/browser_main_loop.cc
+      ' ${toPatch}
     '';
 
     gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {
diff --git a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
index a8f3ed0befd..8338aa65482 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
+++ b/pkgs/applications/networking/browsers/chromium/source/sandbox_userns_36.patch
@@ -1,4 +1,4 @@
-commit 3c80951744293441c2e66345ef7d82c199f4600e
+commit c66c07a2ebcd1b68f412a5a2945fef15b3ba567c
 Author: aszlig <aszlig@redmoonstudios.org>
 Date:   Thu May 16 14:17:56 2013 +0200
 
@@ -153,52 +153,28 @@ index fe4da1a..7f118b8 100644
        // While this isn't strictly disk IO, waiting for another process to
        // finish is the sort of thing ThreadRestrictions is trying to prevent.
 diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
-index 0106a7a..a0465af 100644
+index 94bdc16..3398615 100644
 --- a/content/browser/zygote_host/zygote_host_impl_linux.cc
 +++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
-@@ -124,25 +124,31 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+@@ -143,6 +143,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+   // A non empty sandbox_cmd means we want a SUID sandbox.
+   using_suid_sandbox_ = !sandbox_cmd.empty();
  
-   sandbox_binary_ = sandbox_cmd.c_str();
- 
--  // A non empty sandbox_cmd means we want a SUID sandbox.
--  using_suid_sandbox_ = !sandbox_cmd.empty();
 +  bool userns_sandbox = false;
 +  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
- 
--  if (using_suid_sandbox_) {
-+  if (!sandbox_cmd.empty()) {
-     struct stat st;
-     if (stat(sandbox_binary_.c_str(), &st) != 0) {
-       LOG(FATAL) << "The SUID sandbox helper binary is missing: "
-                  << sandbox_binary_ << " Aborting now.";
-     }
- 
--    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
--        (st.st_uid == 0) &&
--        (st.st_mode & S_ISUID) &&
--        (st.st_mode & S_IXOTH)) {
-+    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
-+      using_suid_sandbox_ = true;
 +
-       cmd_line.PrependWrapper(sandbox_binary_);
+   // Start up the sandbox host process and get the file descriptor for the
+   // renderers to talk to it.
+   const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
+@@ -162,11 +165,24 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+     dummy_fd.reset(socket(AF_UNIX, SOCK_DGRAM, 0));
+     CHECK_GE(dummy_fd.get(), 0);
+     fds_to_map.push_back(std::make_pair(dummy_fd.get(), kZygoteIdFd));
++    userns_sandbox = sandbox_client->IsNoSuid();
+   }
  
-       scoped_ptr<sandbox::SetuidSandboxClient>
-           sandbox_client(sandbox::SetuidSandboxClient::Create());
-       sandbox_client->SetupLaunchEnvironment();
-+
-+      if (!((st.st_uid == 0) &&
-+            (st.st_mode & S_ISUID) &&
-+            (st.st_mode & S_IXOTH))) {
-+        userns_sandbox = true;
-+        sandbox_client->SetNoSuid();
-+      }
-     } else {
-       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
-                     "configured correctly. Rather than run without sandboxing "
-@@ -167,7 +173,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
-   base::LaunchOptions options;
+   base::ProcessHandle process = -1;
    options.fds_to_remap = &fds_to_map;
-   options.allow_new_privs = using_suid_sandbox_;  // Don't PR_SET_NO_NEW_PRIVS.
 +  if (userns_sandbox)
 +    options.new_user_namespace = true;
    base::LaunchProcess(cmd_line.argv(), options, &process);
@@ -213,13 +189,13 @@ index 0106a7a..a0465af 100644
 +  }
 +
    CHECK(process != -1) << "Failed to launch zygote process";
+   dummy_fd.reset();
  
-   if (using_suid_sandbox_) {
 diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
-index 5dc09fa..4e09bc4 100644
+index cc28a6f..e8f665a 100644
 --- a/content/zygote/zygote_main_linux.cc
 +++ b/content/zygote/zygote_main_linux.cc
-@@ -397,6 +397,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) {
+@@ -389,6 +389,13 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox) {
      CHECK(CreateInitProcessReaper());
    }
  
@@ -234,10 +210,10 @@ index 5dc09fa..4e09bc4 100644
    // Previously, we required that the binary be non-readable. This causes the
    // kernel to mark the process as non-dumpable at startup. The thinking was
 diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-index 8ed1a97..cbdfadc 100644
+index 3300cb4..4bfa516 100644
 --- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
 +++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
-@@ -173,6 +173,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
+@@ -212,6 +212,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
    return env_->HasVar(kSandboxNETNSEnvironmentVarName);
  }
  
@@ -248,20 +224,34 @@ index 8ed1a97..cbdfadc 100644
  bool SetuidSandboxClient::IsSandboxed() const {
    return sandboxed_;
  }
-@@ -182,4 +186,8 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
-   SetSandboxAPIEnvironmentVariable(env_);
+@@ -267,8 +271,7 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line,
+                                     "LinuxSUIDSandboxDevelopment.";
+   }
+ 
+-  if (access(sandbox_binary.c_str(), X_OK) != 0 || (st.st_uid != 0) ||
+-      ((st.st_mode & S_ISUID) == 0) || ((st.st_mode & S_IXOTH)) == 0) {
++  if (access(sandbox_binary.c_str(), X_OK) != 0) {
+     LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
+                   "configured correctly. Rather than run without sandboxing "
+                   "I'm aborting now. You need to make sure that "
+@@ -284,6 +287,12 @@ void SetuidSandboxClient::PrependWrapper(base::CommandLine* cmd_line,
+     options->allow_new_privs = true;
+     UnsetExpectedEnvironmentVariables(&options->environ);
+   }
++
++  if (!((st.st_uid == 0) &&
++        (st.st_mode & S_ISUID) &&
++        (st.st_mode & S_IXOTH))) {
++    env_->SetVar(kSandboxNoSuidVarName, "1");
++  }
  }
  
-+void SetuidSandboxClient::SetNoSuid() {
-+  env_->SetVar(kSandboxNoSuidVarName, "1");
-+}
-+
- }  // namespace sandbox
+ void SetuidSandboxClient::SetupLaunchEnvironment() {
 diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
-index 0f6db7a..c629391 100644
+index 332c63b..4f603f8 100644
 --- a/sandbox/linux/suid/client/setuid_sandbox_client.h
 +++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
-@@ -46,6 +46,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
+@@ -70,6 +70,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
    bool IsInNewPIDNamespace() const;
    // Did the setuid helper create a new network namespace ?
    bool IsInNewNETNamespace() const;
@@ -270,15 +260,6 @@ index 0f6db7a..c629391 100644
    // Are we done and fully sandboxed ?
    bool IsSandboxed() const;
  
-@@ -53,6 +55,8 @@ class SANDBOX_EXPORT SetuidSandboxClient {
-   // helper.
-   void SetupLaunchEnvironment();
- 
-+  void SetNoSuid();
-+
-  private:
-   // Holds the environment. Will never be NULL.
-   base::Environment* env_;
 diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
 index 9345287..2db659e 100644
 --- a/sandbox/linux/suid/common/sandbox.h

From ec2d52fca825bd020624cc2ac818863215eabc1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 5 May 2014 21:30:25 +0200
Subject: [PATCH 1025/2033] idea 13.1.1 -> 13.1.2

---
 pkgs/applications/editors/idea/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index c6301bd8a30..6ccd9512978 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -64,27 +64,27 @@ let
 
 in {
 
-  idea_community_1311 = buildIdea rec {
+  idea_community_1312 = buildIdea rec {
     name = "idea-community-${version}";
-    version = "13.1.1";
-    build = "IC-135.480";
+    version = "13.1.2";
+    build = "IC-135.690";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "9e28d3e5682b037c9d6190622ab2a47112fa792539083cc7a4cb24f3f7bf7d22";
+      sha256 = "59fde67bf23e4638edd4b5ada133ac1c61c3132dea936eb7de7ee5ea259cc102";
     };
   };
 
-  idea_ultimate_1311 = buildIdea rec {
+  idea_ultimate_1312 = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "13.1.1";
-    build = "IU-135.480";
+    version = "13.1.2";
+    build = "IU-135.690";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "d699abcdcace387105a465049e015c1367dedf42f7a5f5a1f7b3d840e98b2658";
+      sha256 = "ccbaed495e2f099c92d1f747a59d7af9f9d41d75cf10e8a299d11825d78685ad";
     };
   };
 

From d56bbd63644ab6a243bc6fc0714c143d178fc2f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 22:25:10 +0200
Subject: [PATCH 1026/2033] haskell-defaults.nix: let ghc-7.8.2 use the HEAD
 prefs for the time being

The whole notion of per-compiler HP-compliant environments has failed
anyway and I'll try to get rid of that ASAP, so it feels pointless to
configure that stuff for GHC 7.8.2 to begin with.
---
 pkgs/top-level/haskell-defaults.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 64478328921..9c6741c124a 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -21,15 +21,6 @@
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
     };
 
-  ghc782Prefs =
-    self : self.haskellPlatformArgs_future self // {
-      haskellPlatform = null;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-      cabalInstall_1_18_0_3 = self.cabalInstall_1_18_0_3.override { Cabal = null; };
-      cabalInstall = self.cabalInstall_1_18_0_3.override { Cabal = null; };
-      binary_0_7_1_0 = null;
-    };
-
   ghc763Prefs =
     self : self.haskellPlatformArgs_2013_2_0_0 self // {
       haskellPlatform = self.haskellPlatform_2013_2_0_0;
@@ -405,7 +396,7 @@
   packages_ghc782 =
     packages { ghcPath = ../development/compilers/ghc/7.8.2.nix;
                ghcBinary = ghc742Binary;
-               prefFun = ghc782Prefs;
+               prefFun = ghcHEADPrefs;
              };
 
   # Reasonably current HEAD snapshot. Should *always* be lowPrio.

From f69be7d8af8c37b7400b0ef33d4784f3c95771f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 22:34:58 +0200
Subject: [PATCH 1027/2033] haskell-defaults.nix: let ghc 7.8.2 builds use the
 binary library shipped with the compiler

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 9c6741c124a..d9181afb916 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -19,6 +19,7 @@
     self : self.haskellPlatformArgs_future self // {
       haskellPlatform = null;
       extensibleExceptions = self.extensibleExceptions_0_1_1_4;
+      binary_0_7_1_0 = null;
     };
 
   ghc763Prefs =

From d2587a014fc3e414d11c5bbc69b2579df3e6ff74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 5 May 2014 22:39:37 +0200
Subject: [PATCH 1028/2033] eclipse: add Eclipse IDE for C/C++ Developers 4.3.2

---
 pkgs/applications/editors/eclipse/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3759ed8f35f..24ba2461027 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -176,6 +176,22 @@ in {
         };
   };
 
+  eclipse_cpp_43 = buildEclipse {
+    name = "eclipse-cpp-4.3.2";
+    description = "Eclipse IDE for C/C++ Developers";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl {
+          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk-x86_64.tar.gz;
+          sha256 = "16zhjm6bx78263b1clg75kfiliahkhwg0k116vp9fj039nlpc30l";
+        }
+      else
+        fetchurl {
+          url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/kepler/SR2/eclipse-cpp-kepler-SR2-linux-gtk.tar.gz;
+          sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
+        };
+  };
+
   eclipse_sdk_421 = buildEclipse {
     name = "eclipse-sdk-4.2.1";
     description = "Eclipse Classic";

From 7c2c5987d1d0a3b574b81e9659f5194a8835898c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org>
Date: Mon, 5 May 2014 22:57:48 +0200
Subject: [PATCH 1029/2033] Add setBfree a DSP tonewheel organ emulator

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

diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
new file mode 100644
index 00000000000..580874d1270
--- /dev/null
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, alsaLib, jackaudio, lv2, pkgconfig }:
+
+stdenv.mkDerivation  rec {
+  name = "setbfree-${version}";
+  version = "0.7.5";
+
+  src = fetchurl {
+    url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
+    sha256 = "1chlmgwricc6l4kyg35vc9v8f1n8psr28iihn4a9q2prj1ihqcbc";
+  };
+
+  patchPhase = "sed 's#/usr/local#$(out)#g' -i common.mak";
+
+  buildInputs = [ alsaLib jackaudio lv2 pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A DSP tonewheel organ emulator";
+    homepage = http://setbfree.org;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8d49a140e2..fc38595d390 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9139,6 +9139,8 @@ let
 
   seq24 = callPackage ../applications/audio/seq24 { };
 
+  setbfree = callPackage ../applications/audio/setbfree { };
+
   sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
     gtk = gtk3;
   };

From 7848f96b5824597965bba4acaf5c404cafe1d472 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 19:48:50 -0500
Subject: [PATCH 1030/2033] Add an expression for the Haskell library djinn

---
 .../libraries/haskell/djinn/default.nix       | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/djinn/default.nix

diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix
new file mode 100644
index 00000000000..6e8a52bb78b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/djinn/default.nix
@@ -0,0 +1,19 @@
+{ cabal, haskeline, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "djinn";
+  version = "2011.7.23";
+  sha256 = "14748pqzrd1r9jg2vc9v232pi38q99l9zdlia6ashm2v871hp1xv";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ haskeline mtl ];
+  preConfigure = self.stdenv.lib.optionalString self.stdenv.isDarwin ''
+    sed -i 's/-Wall -optl-Wl/-Wall/' djinn.cabal
+  '';
+  meta = {
+    homepage = "http://www.augustsson.net/Darcs/Djinn/";
+    description = "Generate Haskell code from a type";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1810dca6c0e..40c10e76daa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1008,6 +1008,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   distributive = callPackage ../development/libraries/haskell/distributive {};
 
+  djinn = callPackage ../development/libraries/haskell/djinn {};
+
   dlist = callPackage ../development/libraries/haskell/dlist {};
 
   dlistInstances = callPackage ../development/libraries/haskell/dlist-instances {};

From 854b1fb9fb5f482da697bb4658b97949380ce64e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 19:51:05 -0500
Subject: [PATCH 1031/2033] Build AgdaStdlib before installing it

---
 pkgs/development/compilers/agda/stdlib.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix
index d71713674f7..c07b3e7c7dd 100644
--- a/pkgs/development/compilers/agda/stdlib.nix
+++ b/pkgs/development/compilers/agda/stdlib.nix
@@ -1,4 +1,4 @@
-{ cabal, fetchurl }:
+{ cabal, fetchurl, filemanip, Agda }:
 
 cabal.mkDerivation (self: {
   pname = "Agda-stdlib";
@@ -9,11 +9,16 @@ cabal.mkDerivation (self: {
     sha256 = "1ynjgqk8hhnm6rbngy8fjsrd6i4phj2hlan9bk435bbywbl366k3";
   };
 
+  buildDepends = [ filemanip Agda ];
+
   preConfigure = "cd ffi";
 
   postInstall = ''
       mkdir -p $out/share
-      cp -pR ../src $out/share/agda
+      cd ..
+      runhaskell GenerateEverything
+      agda -i . -i src Everything.agda
+      cp -pR src $out/share/agda
   '';
 
   meta = {

From 2f971193cc1cc8132a66070a9665784903286146 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 20:53:32 -0500
Subject: [PATCH 1032/2033] Allow Dovecot to build with clucene, and on any
 Unix

---
 .../libraries/clucene-core/2.x.nix            |  6 +++++
 pkgs/servers/mail/dovecot/2.2.x.nix           | 24 +++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index 60e8da9c3fc..4173b75915c 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
       ./Install-contribs-lib.patch
     ];
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change libclucene-shared.1.dylib \
+        $out/lib/libclucene-shared.1.dylib \
+        $out/lib/libclucene-core.1.dylib
+  '';
+
   meta = {
     description = "Core library for full-featured text search engine";
     longDescription = ''
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 2b1aca3e926..40af354a7f9 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
-, inotifyTools }:
+, inotifyTools, clucene_core_2 }:
 
 stdenv.mkDerivation rec {
   name = "dovecot-2.2.12";
 
-  buildInputs = [perl systemd openssl pam bzip2 zlib openldap inotifyTools];
+  buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2]
+    ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
@@ -16,6 +17,15 @@ stdenv.mkDerivation rec {
       "/usr/bin/env perl" "${perl}/bin/perl"
   '';
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change libclucene-shared.1.dylib \
+        ${clucene_core_2}/lib/libclucene-shared.1.dylib \
+        $out/lib/dovecot/lib21_fts_lucene_plugin.so
+    install_name_tool -change libclucene-core.1.dylib \
+        ${clucene_core_2}/lib/libclucene-core.1.dylib \
+        $out/lib/dovecot/lib21_fts_lucene_plugin.so
+  '';
+
   patches = [
     # Make dovecot look for plugins in /var/lib/dovecot/modules
     # so we can symlink plugins from several packages there
@@ -28,14 +38,20 @@ stdenv.mkDerivation rec {
     # It will hardcode this for /var/lib/dovecot.
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
     "--localstatedir=/var"
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-ldap"
+    "--with-lucene"
+    "--with-ssl=openssl"
+    "--with-sqlite"
+    "--with-zlib"
+    "--with-bzlib"
+  ] ++ stdenv.lib.optionals (stdenv.isLinux) [
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
   meta = {
     homepage = "http://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
     maintainers = with stdenv.lib.maintainers; [viric simons rickynils];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 4c8aa8f333c5d80cdd6b6db672e0c197093c1cdf Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 6 May 2014 01:58:43 -0400
Subject: [PATCH 1033/2033] Add a bunch of Fedora mirrors and remove an old one

---
 pkgs/build-support/fetchurl/mirrors.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index c4841c50d94..eb3b8a105cd 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -180,11 +180,17 @@ rec {
   ];
 
   # Fedora (please only add full mirrors that carry old Fedora distributions as well).
+  # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content).
   fedora = [
+    http://archives.fedoraproject.org/pub/archive/fedora/
+    http://fedora.osuosl.org/
     http://ftp.nluug.nl/pub/os/Linux/distr/fedora/
     http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/
-    http://download.fedora.redhat.com/pub/fedora/
-    http://archives.fedoraproject.org/pub/archive/fedora/
+    http://fedora.bhs.mirrors.ovh.net/
+    http://mirror.csclub.uwaterloo.ca/fedora/
+    http://ftp.linux.cz/pub/linux/fedora/
+    http://ftp.heanet.ie/pub/fedora/
+    http://mirror.1000mbps.com/fedora/
   ];
 
   # Old SUSE distributions.  Unfortunately there is no master site,

From df0014488af9d0e6559143c2180fc20c6e865079 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 6 May 2014 03:48:04 -0400
Subject: [PATCH 1034/2033] First attempt at data/fonts/poly

---
 lib/maintainers.nix              |  1 +
 pkgs/data/fonts/poly/default.nix | 47 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/data/fonts/poly/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cf0743fa403..2c7bfe549b1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -67,6 +67,7 @@
   qknight = "Joachim Schiele <js@lastlog.de>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   redbaron = "Maxim Ivanov <ivanov.maxim@gmail.com>";
+  relrod = "Ricky Elrod <ricky@elrod.me>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix
new file mode 100644
index 00000000000..fbb1db8a28e
--- /dev/null
+++ b/pkgs/data/fonts/poly/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "poly";
+
+  regular = fetchurl {
+    # Finally a mirror that has a sha256 that doesn't change.
+    url = "https://googlefontdirectory.googlecode.com/hg-history/d7441308e589c9fa577f920fc4152fa32477a267/poly/src/Poly-Regular.otf";
+    sha256 = "1mxp2lvki6b1h7r9xcj1ld0g4z5y3dmsal85xam4yr764zpjzaiw";
+  };
+
+  italic = fetchurl {
+    # Finally a mirror that has a sha256 that doesn't change.
+    url = "https://googlefontdirectory.googlecode.com/hg-history/d7441308e589c9fa577f920fc4152fa32477a267/poly/src/Poly-Italic.otf";
+    sha256 = "1chzcy3kyi7wpr4iq4aj1v24fq1wwph1v5z96dimlqcrnvm66h2l";
+  };
+
+  buildInputs = [unzip];
+
+  sourceRoot = ".";
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp ${regular} $out/share/fonts/opentype/Poly-Regular.otf
+    cp ${italic} $out/share/fonts/opentype/Poly-Italic.otf
+  '';
+
+  meta = {
+    description = "Medium contrast serif font.";
+    longDescription = ''
+    With short ascenders and a very high x-height, Poly is efficient in small
+    sizes. Thanks to its careful balance between the x-height and glyph widths,
+    it allows more economy and legibility than standard web serifs, even in
+    small sizes. The aglutinative language for which it was designed contains
+    very long words. The goal was to develop a typeface that would tolerate
+    cramped tracking and that would increase the number of letters on a single
+    line. Poly is a Unicode typeface family that supports Open Type features
+    and languages that use the Latin script and its variants.
+    '';
+    homepage = http://www.fontsquirrel.com/fonts/poly;
+    license = [ "OFL" ];
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7841daa05..f2318a912e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7661,6 +7661,8 @@ let
 
   oldstandard = callPackage ../data/fonts/oldstandard { };
 
+  poly = callPackage ../data/fonts/poly { };
+
   posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { };

From 7eff825487ff08fba733fa56669fb3caa0a14726 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Mon, 5 May 2014 23:36:34 +0300
Subject: [PATCH 1035/2033] buildLocalCabal: allow cabalDrvArgs in
 buildLocalCabalWithArgs

allows to write neat expressions like (as we're still generating an
expression string):

```
{
  build = haskellPackages.buildLocalCabalWithArgs {
    inherit src name;
    cabalDrvArgs = {
      jailbreak = false;
      doCheck = false;
    };
  };
}
```

without resorting to weird kung-fu like darcs does:

```
darcs = haskellPackages.darcs.override {
  # A variant of the Darcs derivation that containts only the
  # executable and
  # thus has no dependencies on other Haskell packages.
  cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // {
            isLibrary = false;
            configureFlags = "-f-library"; }); }.final;
          };
};
```

While here, move the `jailbreak = true;` as the default `cabalDrvArgs`
option.
---
 pkgs/top-level/haskell-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 337c8d41e10..336d1253f41 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3088,7 +3088,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
 
   # Build a cabal package given a local .cabal file
-  buildLocalCabalWithArgs = { src, name, args ? {} }: let
+  buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; } }: let
     cabalExpr = pkgs.stdenv.mkDerivation ({
       name = "${name}.nix";
 
@@ -3096,16 +3096,17 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
       ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
           | grep -v FILTERME | sed \
             -e 's/licenses.proprietary/licenses.unfree/' \
-            -e 's/{ cabal/{ cabal, cabalInstall, src/' \
+            -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \
+            -e 's/cabal.mkDerivation (self: {/cabal.mkDerivation (self: cabalDrvArgs \/\/ {/' \
             -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \
-            -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n  jailbreak = true;/'  > $out
+            -e 's/pname = \([^\n]*\)/pname = \1\n  inherit src;\n/'  > $out
       '';
 
     } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
     });
-  in callPackage cabalExpr ({ inherit src; } // args);
+  in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args);
 
   buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; };
 

From 139c6fb180f4f95151003350e11ac9a3554541c9 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 6 May 2014 04:04:43 -0400
Subject: [PATCH 1036/2033] Add OFL as an actual license

---
 lib/licenses.nix                 | 6 ++++++
 pkgs/data/fonts/poly/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 68f91f80685..e49528f2a2e 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -208,6 +208,12 @@
     url = https://www.mozilla.org/MPL/2.0;
   };
 
+  ofl = {
+    shortName = "OFL";
+    fullName = "SIL Open Font License";
+    url = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web";
+  };
+
   openssl = {
     shortName = "openssl";
     fullName = "OpenSSL license";
diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix
index fbb1db8a28e..63006fdd4f8 100644
--- a/pkgs/data/fonts/poly/default.nix
+++ b/pkgs/data/fonts/poly/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     and languages that use the Latin script and its variants.
     '';
     homepage = http://www.fontsquirrel.com/fonts/poly;
-    license = [ "OFL" ];
+    license = stdenv.lib.licenses.ofl;
     maintainers = with stdenv.lib.maintainers; [ relrod ];
     platforms = with stdenv.lib.platforms; linux;
   };

From 81a05aabbe630a316d89ed717d9880ddd5e777a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 6 May 2014 10:59:23 +0200
Subject: [PATCH 1037/2033] haskell-packages.nix: update (unused) reference to
 cabal-install

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 337c8d41e10..322366a1591 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3137,7 +3137,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix {
     Cabal = self.Cabal_1_20_0_0;
   };
-  cabalInstall = self.cabalInstall_1_20_0_0;
+  cabalInstall = self.cabalInstall_1_20_0_1;
 
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
     hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; };

From b116679b246d9435558ce0a00ccc1b8d173e7dad Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 6 May 2014 14:57:58 +0200
Subject: [PATCH 1038/2033] Force --no-same-owner for unpacking node sources.

---
 pkgs/development/web/nodejs/build-node-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index b7cd7f32893..544634626b0 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -8,7 +8,7 @@ let
   npmFlags = concatStringsSep " " (map (v: "--${v}") flags);
 
   sources = runCommand "node-sources" {} ''
-    tar xf ${nodejs.src}
+    tar --no-same-owner -xf ${nodejs.src}
     mv *node* $out
   '';
 

From 1796a939d45afb0374b40c8ac58250bf5f98d471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 May 2014 11:47:04 +0200
Subject: [PATCH 1039/2033] b43-fwcutter: update 015 -> 018

---
 .../linux/firmware/b43-firmware-cutter/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
index 5019491d3fd..9d31fde2f0f 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "b43-fwcutter-015";
+  name = "b43-fwcutter-018";
 
   src = fetchurl {
     url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2";
-    sha256 = "1sznw1jrhyfbx0ilwzrj6mzlgc96fzjbx56j4ji8lsypyp8m6sjc";
+    sha256 = "13v34pa0y1jf4hkhsh3zagyb7s8b8ymplffaayscwsd3s7f6kc2p";
   };
 
   patches = [ ./no-root-install.patch ];

From f91a59474807a7ac580ea3b302f85c8f220ea9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 May 2014 11:56:40 +0200
Subject: [PATCH 1040/2033] libdrm: minor update 2.4.52 -> .54

Including support for AMD Mullins chips.
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 0969b51a168..c895f141850 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.52";
+  name = "libdrm-2.4.54";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "1h8q0azb5bxqljpi1dlxmh5i30c4wdrncffcpppzrgk13wpkqsgs";
+    sha256 = "1sg45y9yiz9yyp6dkyilqz8rhii9azgy53i2s4iia3p8zgmh2h6r";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6335d5bd3f35f537da4e687c19e24eacaa2724c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 May 2014 11:58:13 +0200
Subject: [PATCH 1041/2033] mesa: bugfix update 10.1.1 -> .2

Contains many driver fixes.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 6cf9af7ac3b..595c044f780 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.1.1";
+  version = "10.1.2";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1c4qcz7zi3qvdcxa56yxl6kps5amk4zq2xlhqlgcpzqzv0777bpk";
+    sha256 = "132vn3s5hiwksl7n099fw3g15h3nzj3fp09zzvgnikqcrrv0n8xi";
   };
 
   prePatch = "patchShebangs .";

From 6da5d7922dc166d0d6b09d3f8de5c482278424d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 May 2014 11:59:26 +0200
Subject: [PATCH 1042/2033] xorg: minor update of xf86-input-{evdev,synaptics}

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 07a6282a085..1c9f81e96e1 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1370,11 +1370,11 @@ let
   })) // {inherit ;};
 
   xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
-    name = "xf86-input-evdev-2.8.2";
+    name = "xf86-input-evdev-2.8.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2;
-      sha256 = "1cvyg425px92hr5ql1s7v0c7n9jyvg0aaajrf5vyxgc3k9s6213m";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2;
+      sha256 = "1c067h0452728s39rb1csw4r26ihdhzs4nr722z6gg9mhvb7zv02";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
   })) // {inherit inputproto udev xorgserver xproto ;};
@@ -1410,11 +1410,11 @@ let
   })) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.7.4";
+    name = "xf86-input-synaptics-1.7.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2;
-      sha256 = "1xssjj0qxarzsc4m69ay5ydkwgq27qajzih2c7sjk7nkgggx58jn";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2;
+      sha256 = "1iwiihwbqiq2lxd12ca7j3ajggjbmlk33wsfv2lyyizp3x92710z";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index a05241350fd..68d1157c62e 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2

From fead8862d698e43ead49e553ad7d7120c84edfaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 7 May 2014 00:02:30 +0800
Subject: [PATCH 1043/2033] gst-plugins-base: update from 1.2.3 to 1.2.4 (in
 #2440)

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

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 0c8dbb21cfb..b7d45caafb0 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.2.3";
+  name = "gst-plugins-base-1.2.4";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "1qfs4lv91ggcck61pw0ybn3gzvx4kl2vsd6lp8l6ky3hq8syrvb1";
+    sha256 = "0l35zh2cdv515zv6n4yif49y6jfxzlf73q6g7k2vr52s7zf76qjd";
   };
 
   nativeBuildInputs = [

From 5b4006cddb23c82a1d132d273db3833698f3d880 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 5 May 2014 14:53:51 +0200
Subject: [PATCH 1044/2033] paxctl: Update from 0.7 -> 0.8

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

diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix
index 69656f51042..8e70ddd8434 100644
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "paxctl-${version}";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchurl {
-    url = "http://pax.grsecurity.net/${name}.tar.bz2";
-    sha256 = "1j6dg6wd1v7na5i4xj8zmbff0mdqdnw6cvqy0rsbz5anra27f1zp";
+    url = "http://pax.grsecurity.net/${name}.tar.gz";
+    sha256 = "107gmriq5icsk9yni5q949rnjapjkcs0823pw6zra6h1xml2f0mm";
   };
 
   preBuild = ''

From a819e8f4efc4228a9c92df41679da490fd74098a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 6 May 2014 23:50:20 +0800
Subject: [PATCH 1045/2033] midori: fix build (close #2542)

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

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 5410800fabf..11a17709ade 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg";
   };
 
+  sourceRoot = ".";
+
   buildInputs = [
     cmake pkgconfig intltool vala makeWrapper
     webkitgtk librsvg libnotify

From 535de5e45acac5a64e762fd674de946e09493a6a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 00:06:56 +0200
Subject: [PATCH 1046/2033] Add nifskope

---
 pkgs/tools/graphics/nifskope/default.nix | 51 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/graphics/nifskope/default.nix

diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix
new file mode 100644
index 00000000000..32410caeeff
--- /dev/null
+++ b/pkgs/tools/graphics/nifskope/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "nifskope-1.1.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/niftools/${name}.tar.bz2";
+    sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase =
+    ''
+      for i in *.cpp gl/*.cpp widgets/*.cpp; do
+        substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope
+      done
+
+      qmake -after TARGET=nifskope
+    ''; # */
+
+  enableParallelBuilding = true;
+
+  # Inspired by linux-install/nifskope.spec.in.
+  installPhase =
+    ''
+      d=$out/share/nifskope
+      mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,doc,lang}
+      cp release/nifskope $out/bin/
+      cp nifskope.png $out/share/pixmaps/
+      cp nif.xml kfm.xml style.qss $d/
+      cp shaders/*.frag shaders/*.prog shaders/*.vert $d/shaders/
+      cp doc/*.html doc/docsys.css doc/favicon.ico $d/doc/
+      cp lang/*.ts lang/*.tm $d/lang/
+
+      substituteInPlace nifskope.desktop \
+        --replace 'Exec=nifskope' "Exec=$out/bin/nifskope" \
+        --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png"
+      cp nifskope.desktop $out/share/applications/
+
+      find $out/share -type f -exec chmod -x {} \;
+    ''; # */
+
+  meta = {
+    homepage = http://niftools.sourceforge.net/;
+    description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+    licence = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc38595d390..6ddb01d547e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1541,6 +1541,8 @@ let
 
   pa_applet = callPackage ../tools/audio/pa-applet { };
 
+  nifskope = callPackage ../tools/graphics/nifskope { };
+
   nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {};
 
   nlopt = callPackage ../development/libraries/nlopt {};

From df9427c535532e6cc7774c53bf6de9c9feb7008a Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 6 May 2014 19:45:54 -0400
Subject: [PATCH 1047/2033] Source Code Pro font

---
 pkgs/data/fonts/source-code-pro/default.nix | 42 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/data/fonts/source-code-pro/default.nix

diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
new file mode 100644
index 00000000000..d48fbed696c
--- /dev/null
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -0,0 +1,42 @@
+x@{builderDefsPackage
+  , unzip
+  , ...}:
+builderDefsPackage
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    version="1.017";
+    name="SourceCodePro";
+    url="mirror://sourceforge/sourcecodepro.adobe/${name}_FontsOnly-${version}.zip";
+    hash="07xjfxin883a3g3admdddxxqyzigihbsnmik0zpjii09cdlb8dl1";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  name = "${sourceInfo.name}-${sourceInfo.version}";
+  inherit buildInputs;
+
+  phaseNames = ["doUnpack" "installFonts"];
+
+  doUnpack = a.fullDepEntry (''
+    unzip ${src}
+    cd ${sourceInfo.name}*/OTF/
+  '') ["addInputs"];
+
+  meta = {
+    description = "A set of monospaced OpenType fonts designed for coding environments";
+    maintainers = with a.lib.maintainers; [ relrod ];
+    platforms = with a.lib.platforms; all;
+    homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
+    license = "OFL";
+  };
+}) x
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ddb01d547e..715284a85e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7681,6 +7681,8 @@ let
 
   r5rs = callPackage ../data/documentation/rnrs/r5rs.nix { };
 
+  sourceCodePro = callPackage ../data/fonts/source-code-pro {};
+
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme { };
 
   themes = name: import (../data/misc/themes + ("/" + name + ".nix")) {

From bd78e674c5daae0f142eda5720c123bb58358891 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 7 May 2014 03:21:55 +0200
Subject: [PATCH 1048/2033] vm/windows: Exit if VM has dropped out.

This ensures that the builder isn't waiting forever if the Windows VM
drops dead while we're waiting for the controller VM to signal that a
particular command has been executed on the Windows VM. It won't ever
happen in such cases so it doesn't make sense to wait for the timeout.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../vm/windows/controller/default.nix         | 46 +++++++++++++++----
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index fe4b5b7f6c2..ee9bf028694 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -86,6 +86,7 @@ let
       # Print a dot every 10 seconds only to shorten line length.
       ${coreutils}/bin/sleep 10
     done
+    ${coreutils}/bin/touch /xchg/waiting_done
     echo " success."
     # Loop forever, because this VM is going to be killed.
     ${loopForever}
@@ -123,6 +124,7 @@ let
       echo -n .
       ${coreutils}/bin/sleep 1
     done
+    ${coreutils}/bin/touch /xchg/waiting_done
     echo " success."
 
     ${openssh}/bin/ssh \
@@ -145,6 +147,7 @@ let
   ];
 
   controllerQemuArgs = concatStringsSep " " (maybeKvm64 ++ [
+    "-pidfile $CTRLVM_PIDFILE"
     "-nographic"
     "-no-reboot"
     "-virtfs local,path=/nix/store,security_model=none,mount_tag=store"
@@ -160,6 +163,7 @@ let
 
   cygwinQemuArgs = concatStringsSep " " (maybeKvm64 ++ [
     "-monitor unix:$MONITOR_SOCKET,server,nowait"
+    "-pidfile $WINVM_PIDFILE"
     "-nographic"
     "-net nic,vlan=0,macaddr=52:54:00:12:01:01"
     "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET"
@@ -181,42 +185,64 @@ let
 
     QEMU_VDE_SOCKET="$(pwd)/vde.ctl"
     MONITOR_SOCKET="$(pwd)/monitor"
+    WINVM_PIDFILE="$(pwd)/winvm.pid"
+    CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid"
     ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
     echo 'alive?' | ${socat}/bin/socat - \
       UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
   '';
 
-  bgBoth = optionalString (suspendTo != null) " &";
-
-  vmExec = if installMode then ''
+  vmExec = ''
     ${vmTools.qemuProg} ${controllerQemuArgs} &
-    ${vmTools.qemuProg} ${cygwinQemuArgs}${bgBoth}
-  '' else ''
     ${vmTools.qemuProg} ${cygwinQemuArgs} &
-    ${vmTools.qemuProg} ${controllerQemuArgs}${bgBoth}
+    echo -n "Waiting for VMs to start up..."
+    timeout=60
+    while ! test -e "$WINVM_PIDFILE" -a -e "$CTRLVM_PIDFILE"; do
+      timeout=$(($timeout - 1))
+      echo -n .
+      if test $timeout -le 0; then
+        echo " timed out."
+        exit 1
+      fi
+      ${coreutils}/bin/sleep 1
+    done
+    echo " done."
+  '';
+
+  checkDropOut = ''
+    if ! test -e "$XCHG_DIR/waiting_done" &&
+       ! kill -0 $(< "$WINVM_PIDFILE"); then
+      echo "Windows VM has dropped out early, bailing out!" >&2
+      exit 1
+    fi
   '';
 
   postVM = if suspendTo != null then ''
-    while ! test -e "$XCHG_DIR/suspend_now"; do sleep 1; done
+    while ! test -e "$XCHG_DIR/suspend_now"; do
+      ${checkDropOut}
+      ${coreutils}/bin/sleep 1
+    done
     ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
     stop
     migrate_set_speed 4095m
     migrate "exec:${gzip}/bin/gzip -c > '${suspendTo}'"
     quit
     CMD
-    wait %-
-
+    wait $(< "$WINVM_PIDFILE")
     eval "$postVM"
     exit 0
   '' else if installMode then ''
+    wait $(< "$WINVM_PIDFILE")
     eval "$postVM"
     exit 0
   '' else ''
+    while kill -0 $(< "$CTRLVM_PIDFILE"); do
+      ${checkDropOut}
+    done
     if ! test -e "$XCHG_DIR/in-vm-exit"; then
       echo "Virtual machine didn't produce an exit code."
       exit 1
     fi
-
     eval "$postVM"
     exit $(< "$XCHG_DIR/in-vm-exit")
   '';

From 97dc8a88e579d52828b987c371455a0943054ca5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 7 May 2014 06:48:53 +0200
Subject: [PATCH 1049/2033] vm/windows: Wait for migration to finish.

This ensures that the intermediate machine is shut down only after the
migration has finished writing the memory dump to disk, to ensure we
don't end up with empty state files depending on how fast the migration
finished before we actually shut down the VM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/vm/windows/bootstrap.nix       |  4 ++--
 .../vm/windows/controller/default.nix             | 15 ++++++++++++---
 pkgs/build-support/vm/windows/default.nix         |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix
index 47afce5b5a3..e3b44d1b6ab 100644
--- a/pkgs/build-support/vm/windows/bootstrap.nix
+++ b/pkgs/build-support/vm/windows/bootstrap.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd
 , python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu
-, samba, socat, vde2, cdrkit, pathsFromGraph
+, samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep
 }:
 
 { isoFile, productKey, arch ? null }:
@@ -10,7 +10,7 @@ with stdenv.lib;
 let
   controller = import ./controller {
     inherit stdenv writeScript vmTools makeInitrd;
-    inherit samba vde2 openssh socat netcat coreutils gzip;
+    inherit samba vde2 openssh socat netcat coreutils gzip gnugrep;
   };
 
   mkCygwinImage = import ./cygwin-iso {
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index ee9bf028694..0beaf401758 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -1,5 +1,5 @@
 { stdenv, writeScript, vmTools, makeInitrd
-, samba, vde2, openssh, socat, netcat, coreutils, gzip
+, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip
 }:
 
 { sshKey
@@ -217,17 +217,26 @@ let
     fi
   '';
 
+  toMonitor = "${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET";
+
   postVM = if suspendTo != null then ''
     while ! test -e "$XCHG_DIR/suspend_now"; do
       ${checkDropOut}
       ${coreutils}/bin/sleep 1
     done
-    ${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET <<CMD
+    ${toMonitor} <<CMD
     stop
     migrate_set_speed 4095m
     migrate "exec:${gzip}/bin/gzip -c > '${suspendTo}'"
-    quit
     CMD
+    echo -n "Waiting for memory dump to finish..."
+    while ! echo info migrate | ${toMonitor} | \
+          ${gnugrep}/bin/grep -qi '^migration *status: *complete'; do
+      ${coreutils}/bin/sleep 1
+      echo -n .
+    done
+    echo " done."
+    echo quit | ${toMonitor}
     wait $(< "$WINVM_PIDFILE")
     eval "$postVM"
     exit 0
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index f9b44d450d9..f9f1d75c70d 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -5,6 +5,7 @@ let
     inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd;
     inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba;
     inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph;
+    inherit (pkgs) gnugrep;
   };
 
   builder = ''

From 8263996d3ae209bff761bc07fff4a4d2d44f5ff4 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Wed, 7 May 2014 03:52:21 -0400
Subject: [PATCH 1050/2033] Use `find` instead of cp for installFonts.

This allows fonts to be installed from anywhere in an unzipped file
rather than having to cd deep into the directory and come back out in
order for e.g. `forceCopy` to work correctly.
---
 pkgs/build-support/builder-defs/builder-defs.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index e22aa6bc66e..5c9ec402d4b 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -545,11 +545,11 @@ let inherit (builtins) head tail trace; in
            mkdir -p $out/share/texmf/fonts/enc/${retrievedName}
            mkdir -p $out/share/texmf/fonts/map/${retrievedName}
 
-        cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts
-        cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts
-           cp *.{pfm,afm,pfb} $out/share/fonts/type1/public/${retrievedName} || echo No Type1 Fonts
-           cp *.enc $out/share/texmf/fonts/enc/${retrievedName} || echo No fontenc data
-           cp *.map $out/share/texmf/fonts/map/${retrievedName} || echo No fontmap data
+           find -name '*.ttf' -exec cp {} $out/share/fonts/truetype/public/${retrievedName} \;
+           find -name '*.otf' -exec cp {} $out/share/fonts/opentype/public/${retrievedName} \;
+           find -name '*.pfm' -o -name '*.afm' -o -name '*.pfb' -exec cp {} $out/share/fonts/type1/public/${retrievedName} \;
+           find -name '*.enc' -exec cp {} $out/share/texmf/fonts/enc/${retrievedName} \;
+           find -name '*.map' -exec cp {} $out/share/texmf/fonts/map/${retrievedName} \;
    '') ["minInit" "defEnsureDir"];
 
    simplyShare = shareName: fullDepEntry (''

From bf9612e797a9da1610b3c6bb7b68d1eed82fdbc4 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Tue, 6 May 2014 23:54:41 +0300
Subject: [PATCH 1051/2033] sysdig: update to 0.1.81

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 6f5bb3869bb..69bb5e43a54 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,16 +1,14 @@
-{stdenv, fetchurl, cmake, luajit, kernel}:
+{stdenv, fetchurl, cmake, luajit, kernel, zlib}:
 let
-  s = # Generated upstream information
-  rec {
+  s = rec {
     baseName="sysdig";
-    version="0.1.79";
+    version="0.1.81";
     name="${baseName}-${version}";
-    hash="04ng4q859xxlpsnavx6rcgmq7frzgbzxm0p5zmdsmhz8m6hfvz7l";
-    url="https://github.com/draios/sysdig/archive/0.1.79.tar.gz";
-    sha256="04ng4q859xxlpsnavx6rcgmq7frzgbzxm0p5zmdsmhz8m6hfvz7l";
+    url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
+    sha256="0p9j1fy7lr027nsvr5bq0416nlsbvk02irzazmigsbr03fg0x1wv";
   };
   buildInputs = [
-    cmake luajit kernel
+    cmake luajit kernel zlib
   ];
 in
 stdenv.mkDerivation {
@@ -22,13 +20,14 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DUSE_BUNDLED_LUAJIT=OFF"
+    "-DUSE_BUNDLED_ZLIB=OFF"
   ];
-  makeFlags = [
-    "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
+  preConfigure = ''
+    export INSTALL_MOD_PATH="$out"
+    export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  '';
   postInstall = ''
-    mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc/sysdig
-    cp driver/*.ko $out/lib/modules/${kernel.modDirVersion}/misc/sysdig
+    make install_driver
   '';
 
   meta = {

From 47530778db7b75a6ce3275dbfd54566a6d14ae3e Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 7 May 2014 09:50:18 +0100
Subject: [PATCH 1052/2033] haskellPackages.stripe: Update to 0.8.1

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

diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix
index 304cc3df8f7..36a7f9d2d66 100644
--- a/pkgs/development/libraries/haskell/stripe/default.nix
+++ b/pkgs/development/libraries/haskell/stripe/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stripe";
-  version = "0.8.0";
-  sha256 = "0bz932v7kcz2xsnmpx34ifqnf6kbgy7a7qd0dqnjqypc8g6kfl37";
+  version = "0.8.1";
+  sha256 = "0vmgj9n7q8ik31z7zzfjfv1qj8f8vrqn9cvk8kjp3k4shj25p7sy";
   buildDepends = [
     aeson httpConduit httpTypes mtl text time unorderedContainers
     utf8String

From fcc3ae1d84a670869bd6fe2903f5ecba3519548f Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Wed, 7 May 2014 09:57:27 +0100
Subject: [PATCH 1053/2033] haskellPackages.snapletStripe: New expression

---
 .../haskell/snaplet-stripe/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/snaplet-stripe/default.nix

diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
new file mode 100644
index 00000000000..37ffb827b6d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
@@ -0,0 +1,19 @@
+{ cabal, configurator, heist, mtl, snap, stripe, text, textFormat
+, transformers, xmlhtml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "snaplet-stripe";
+  version = "0.2.0";
+  sha256 = "01ichbwk31zfjq5rc09scz0j4ir6b7jnppdvmm8ilvkj7bl442xs";
+  buildDepends = [
+    configurator heist mtl snap stripe text textFormat transformers
+    xmlhtml
+  ];
+  meta = {
+    homepage = "https://github.com/LukeHoersten/snaplet-stripe";
+    description = "Stripe snaplet for the Snap Framework";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4b9c43c4f46..6f854098574 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2334,6 +2334,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   snapletAcidState = callPackage ../development/libraries/haskell/snaplet-acid-state {};
 
+  snapletStripe = callPackage ../development/libraries/haskell/snaplet-stripe {};
+
   snapBlaze = callPackage ../development/libraries/haskell/snap-blaze/default.nix {};
 
   snapCore = callPackage ../development/libraries/haskell/snap/core.nix {};

From 23d023008b45ed909eaf221d2025fee07ddcdde5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 04:11:54 -0500
Subject: [PATCH 1054/2033] pythonPackages: add pyrax

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/python-packages.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 01c4f826f5e..4c414cd4300 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5759,7 +5759,6 @@ rec {
     };
   };
 
-
   pyopengl =
     let version = "3.0.2";
     in
@@ -5808,6 +5807,23 @@ rec {
     propagatedBuildInputs = [ cssselect lxml ];
   };
 
+  pyrax = buildPythonPackage rec {
+    name = "pyrax-1.7.3";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyrax/${name}.tar.gz";
+      sha256 = "1br2kspw0sn7xgkk7z93h72s2v3qm88jvi4213zgz90jhzjj42bv";
+    };
+
+    meta = {
+      homepage    = "https://github.com/rackspace/pyrax";
+      license     = "MIT";
+      description = "Python API to interface with Rackspace";
+    };
+
+    doCheck = false;
+  };
+
 
   pyreport = buildPythonPackage (rec {
     name = "pyreport-0.3.4c";

From b6c7f18711fda53add929c4099ff5d862fe718f1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 04:12:25 -0500
Subject: [PATCH 1055/2033] nixpkgs: add COPRTHR 1.6

COPRTHR is a very excellent little SDK implementing OpenCL and related
tech for regular multicore processors, as well as things like my new
Parallella (along with remote/networked OpenCL compute support).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/libraries/coprthr/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/coprthr/default.nix

diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
new file mode 100644
index 00000000000..42b626c9927
--- /dev/null
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, libelf, libconfig, libevent, which, unzip, perl, python
+, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "coprthr-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url    = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip";
+    sha256 = "042aykmcxhdpck0j6k5rcp6a0b5i377fv2nz96v1bpfhzxd1mjwg";
+  };
+
+  buildInputs =
+    [ libelf libconfig libevent which unzip perl python bison flex ];
+
+  configureFlags =
+    [ "--with-libelf=${libelf}"
+      "--with-libevent=${libevent}"
+      "--with-libconfig=${libconfig}"
+      "--with-opencl-icd-path=$out/etc/OpenCL/vendors"
+      "--enable-user-install"
+    ];
+
+  meta = {
+    description = "The CO-PRocessing THReads SDK for OpenCL/STDCL";
+    homepage    = "http://www.browndeertechnology.com/coprthr.htm";
+    license     = stdenv.lib.licenses.lgpl3;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 672d80bcb88..4aec5637fcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -578,6 +578,10 @@ let
 
   capstone = callPackage ../development/libraries/capstone { };
 
+  coprthr = callPackage ../development/libraries/coprthr {
+    flex = flex_2_5_35;
+  };
+
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   direnv = callPackage ../tools/misc/direnv { };

From 0235fe48190831cb0c6ccc87462b6cde063bb25a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:27:44 +0200
Subject: [PATCH 1056/2033] haskell-shake: update to version 0.11.7

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index ab5ca8e70fb..9402c7f3868 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.11.6";
-  sha256 = "1xb4w8zzikzqlx2jzbzclfpv49p85rhf17lz3c8hgdkrm6vr9diy";
+  version = "0.11.7";
+  sha256 = "0f5m4fcrda58wrr6mca4rsyb3j5bmqfdj9sbbjvr3l611lafsa8y";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 95257307e0226379874bb78aea20059ba20f85ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:27:54 +0200
Subject: [PATCH 1057/2033] dovecot: build Linux packages on Hydra, and enable
 local builds on all other systems

---
 pkgs/servers/mail/dovecot/2.2.x.nix   | 2 +-
 pkgs/servers/mail/dovecot/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 40af354a7f9..366d0fb1f32 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage = "http://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
     maintainers = with stdenv.lib.maintainers; [viric simons rickynils];
-    platforms = stdenv.lib.platforms.unix;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 46cf742c452..5f779c75472 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "http://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
     maintainers = with stdenv.lib.maintainers; [viric simons];
-    platforms = with stdenv.lib.platforms; linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
   };
 
 }

From 262aecef743cfbddabb2a253605f1c69d086adf1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 12:28:46 +0200
Subject: [PATCH 1058/2033] r-generic-builder.nix: build packages from the
 extracted $srcdir so that we have a chance to patch them

---
 pkgs/development/r-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index 1899eaa61d4..da63566f38b 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -19,7 +19,7 @@ R.stdenv.mkDerivation ({
   installPhase = ''
     runHook preInstall
     mkdir -p $out/library
-    R CMD INSTALL -l $out/library $src
+    R CMD INSTALL -l $out/library .
     runHook postInstall
   '';
 

From cdf7d6a66f67f2498faa0dd698b1e14481ffbf69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 12:29:25 +0200
Subject: [PATCH 1059/2033] r-RcppArmadillo: fix build (and update to
 0.4.300.0)

---
 pkgs/development/r-modules/cran-packages.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index f7d52c08fb9..6068fce10d5 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -55,6 +55,16 @@ in
 
 let self = _self // overrides; _self = with self; {
 
+  RcppArmadillo = buildRPackage {
+    name="RcppArmadillo-0.4.300.0";
+    src = fetchurl {
+      url = "mirror://cran/src/contrib/RcppArmadillo_0.4.300.0.tar.gz";
+      sha256="01xsj98sgidlv47bswwaa41kqaz6k6yy57pssr1rkicnf5xg7abj";
+    };
+    propagatedBuildInputs = [Rcpp];
+    patchPhase = "patchShebangs configure";
+  };
+
   A3 = derive { name="A3"; version="0.9.2"; sha256="01s7znhph2mr3snpscci3y7nbcisa6kg6hy7im3742r6ah0z3jv7"; depends=[xtable pbapply]; };
   abc = derive { name="abc"; version="1.8"; sha256="042hnhk8npx6rhbsmrdpz4gcczjg5sy665hzvwqvcw8a6836fd1n"; depends=[nnet quantreg MASS]; };
   abcdeFBA = derive { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[Rglpk rgl corrplot lattice]; };
@@ -3989,7 +3999,6 @@ let self = _self // overrides; _self = with self; {
   RCPmod = derive { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[numDeriv gtools]; };
   Rcpp = derive { name="Rcpp"; version="0.11.1"; sha256="1ccsvdij6yym9dziqsjf5gr37968imz8i81334vi2fc69z5xzf30"; depends=[]; };
   Rcpp11 = derive { name="Rcpp11"; version="3.1.0.1"; sha256="17ymlnpyq2pdc9jbd31hzdrc69rp7ccj4kg6k793chq322y12bfx"; depends=[]; };
-  RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.200.0"; sha256="1bqicsxqcs66slphzqx55mf6dg1b65vnpmq1qql0q0fs8g9g3cyk"; depends=[Rcpp]; };
   RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp]; };
   rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp]; };
   RcppClassic = derive { name="RcppClassic"; version="0.9.5"; sha256="193nsplyqd1fb7hwxsk0s7dz6rm6rw7lp04jff08mswcjdkh69g4"; depends=[Rcpp]; };

From 16e7ae3b10f51f9415bd8a75aec2913942895948 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Wed, 7 May 2014 14:17:30 +0300
Subject: [PATCH 1060/2033] re-introduce phpXdebug as phpPackages.xdebug and
 bump to 2.2.5

this uses buildPecl now.
---
 .../interpreters/php-xdebug/default.nix       | 39 -------------------
 pkgs/top-level/all-packages.nix               |  8 ----
 pkgs/top-level/php-packages.nix               |  8 ++++
 3 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/interpreters/php-xdebug/default.nix

diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
deleted file mode 100644
index 99c5ad663af..00000000000
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, php, autoconf, automake }:
-
-stdenv.mkDerivation rec {
-  version = "2.2.3";
-  name = "php-xdebug-${version}";
-
-  src = fetchurl {
-    url = "http://xdebug.org/files/xdebug-2.2.3.tgz";
-    sha256 = "076px4ax3qcqr3mmhi9jjkfhn7pcymrpda4hzy6kgn3flhnqfldk";
-  };
-
-  buildInputs = [ php autoconf automake ];
-
-  configurePhase = ''
-    phpize
-    ./configure --prefix=$out
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # looks for this file for some reason -- isn't needed
-    touch unix.h
-  '';
-
-  buildPhase = ''
-    make && make test
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/xdebug
-    cp modules/xdebug.so $out/lib
-    cp LICENSE $out/lib/xdebug
-  '';
-
-  meta = {
-    description = "PHP debugger and profiler extension";
-    homepage = http://xdebug.org/;
-    license = "xdebug"; # based on PHP-3
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aec5637fcd..4f6212e9068 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3438,14 +3438,6 @@ let
 
   php_xcache = callPackage ../development/libraries/php-xcache { };
 
-  phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug {
-    php = php53;
-  });
-
-  phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { };
-
-  phpXdebug = phpXdebug_5_4;
-
   picolisp = callPackage ../development/interpreters/picolisp {};
 
   pltScheme = racket; # just to be sure
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 654a071a182..7ee05031404 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -32,4 +32,12 @@ let self = with self; {
 
     buildInputs = [ pkgs.cyrus_sasl ];
   };
+
+  xdebug = buildPecl rec {
+    name = "xdebug-2.2.5";
+    src = pkgs.fetchurl {
+      url = "http://pecl.php.net/get/${name}.tgz";
+      sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
+    };
+  };
 }; in self

From 255a6a9da84afb1707bc21ee1d4ae199d08cae10 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 14:02:25 +0200
Subject: [PATCH 1061/2033] libav: Disable tests

These appear to fail randomly sometimes:

http://hydra.nixos.org/build/10854615
---
 pkgs/development/libraries/libav/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 04d51edf531..a6b552613cc 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -84,7 +84,7 @@ let
       cp -s "$out"/bin/* "$tools/bin/"
     '';
 
-    doInstallCheck = true;
+    doInstallCheck = false; # fails randomly
     installCheckTarget = "check"; # tests need to be run *after* installation
 
     crossAttrs = {

From 1a6a797ec34e7dd0d80af9a16b1d03ee0ad96d61 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 May 2014 14:22:04 +0200
Subject: [PATCH 1062/2033] Add liblbfgs 1.10

---
 .../libraries/science/math/liblbfgs/default.nix  | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/liblbfgs/default.nix

diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix
new file mode 100644
index 00000000000..63de26ee90c
--- /dev/null
+++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+stdenv.mkDerivation {
+  name = "liblbfgs-1.10";
+
+  configureFlags = "--enable-sse2";
+  src = fetchurl {
+    url = https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz;
+    sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21";
+  };
+
+  meta = {
+    description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)";
+    homepage = http://www.chokkan.org/software/liblbfgs/;
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aec5637fcd..bffa3c28803 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10311,6 +10311,8 @@ let
 
   liblapack = callPackage ../development/libraries/science/math/liblapack { };
 
+  liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
+
   openblas = callPackage ../development/libraries/science/math/openblas { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };

From b30798a0a3578d968323f93beeb9b21bba44f17b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 14:45:52 +0200
Subject: [PATCH 1063/2033] dovecot-2.2.x: add missing sqlite build input

Fixes <http://hydra.nixos.org/build/10863508/nixlog/1/raw>.
---
 pkgs/servers/mail/dovecot/2.2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 366d0fb1f32..64ef3c44895 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
-, inotifyTools, clucene_core_2 }:
+, inotifyTools, clucene_core_2, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "dovecot-2.2.12";
 
-  buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2]
+  buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite]
     ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ];
 
   src = fetchurl {

From 30c3b81cc2fe4ee868bc924683f3b383448b5c88 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 8 May 2014 00:52:38 +1200
Subject: [PATCH 1064/2033] Update ffmpeg to 2.2.2

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

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 7ffc3a077ef..0e94b78c037 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.2.1";
+  name = "ffmpeg-2.2.2";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "153kfk8rzrfxx930rrk417b2m695dvy47v4hci3nd49iggx9jzz1";
+    sha256 = "062jn47sm1ifwswcd3lx47nff62rgcwp84964q0v983issnrfax4";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

From b799aa697d384194bba497bbd37d0be7ea517099 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 8 May 2014 00:53:07 +1200
Subject: [PATCH 1065/2033] Update pygtk to 2.24.0 to fix CPU pegging issues in
 xpra

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

diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix
index dfe805ec9e4..7d3804d264a 100644
--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -2,11 +2,11 @@
 , buildPythonPackage, libglade ? null }:
 
 buildPythonPackage rec {
-  name = "pygtk-2.22.0";
+  name = "pygtk-2.24.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygtk/2.22/${name}.tar.bz2";
-    sha256 = "4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8";
+    url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2";
+    sha256 = "04k942gn8vl95kwf0qskkv6npclfm31d78ljkrkgyqxxcni1w76d";
   };
 
   buildInputs = [ pkgconfig ]

From 1c7d11ac2a1dddaca9f8050456598a6882b45770 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 8 May 2014 00:54:15 +1200
Subject: [PATCH 1066/2033] Update xpra to 0.12.5

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index f96fa577323..0ceee457276 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -4,7 +4,7 @@
 , ffmpeg, x264, libvpx, pil, libwebp }:
 
 buildPythonPackage rec {
-  name = "xpra-0.9.5";
+  name = "xpra-0.12.5";
   namePrefix = "";
 
   src = fetchurl {

From 7cd55c7744e9d12b8142bb45be60133e27b872f3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 May 2014 16:37:38 +0200
Subject: [PATCH 1067/2033] USe maven.test.skip in stead of
 maven.test.skip.exec in mvn assembly, to prevent unnecessary compilation.

---
 pkgs/build-support/release/maven-build.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix
index 6b47bb9cae9..f7ea07baccb 100644
--- a/pkgs/build-support/release/maven-build.nix
+++ b/pkgs/build-support/release/maven-build.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation ( rec {
   '';  
 
   mvnAssembly = ''
-    mvn assembly:assembly -Dmaven.test.skip.exec=true ${mvnFlags}
+    mvn assembly:assembly -Dmaven.test.skip=true ${mvnFlags}
   '';
 
   mvnRelease = ''

From 437ed5aae4e1dade678b38e1b82f580a56b2567a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 15:13:48 +0200
Subject: [PATCH 1068/2033] haskell-defaults.nix: fix the "highPrio" variant of
 the haskell package set

"High priority" is not the same the thing as "not explicitly marked as
low priority".
---
 pkgs/top-level/haskell-defaults.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index d9181afb916..5ed0743b94b 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -8,7 +8,7 @@
 # The actual Haskell packages are composed in haskell-packages.nix. There is
 # more documentation in there.
 
-{ makeOverridable, lowPrio, stdenv, pkgs, newScope, config, callPackage } : rec {
+{ makeOverridable, lowPrio, hiPrio, stdenv, pkgs, newScope, config, callPackage } : rec {
 
   # Preferences functions.
   #
@@ -243,7 +243,7 @@
 
   packages = args : let r = packagesFun args;
                     in  r // { lowPrio     = r.override { modifyPrio   = lowPrio; };
-                               highPrio    = r.override { modifyPrio   = x : x; };
+                               highPrio    = r.override { modifyPrio   = hiPrio; };
                                noProfiling = r.override { profDefault  = false;
                                                           profExplicit = true;
                                                           modifyPrio   = defaultVersionPrioFun false; };

From 5b52d17d3ff2d789ddab027980327744a701bd5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 17:39:18 +0200
Subject: [PATCH 1069/2033] Mark the development version of weechat 'lowPrio'
 so that user install the stable release version by default.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412dcb3ed2e..ecbf706e6c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9486,7 +9486,7 @@ let
 
   weechat = callPackage ../applications/networking/irc/weechat { };
 
-  weechatDevel = callPackage ../applications/networking/irc/weechat/devel.nix { };
+  weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { });
 
   weston = callPackage ../applications/window-managers/weston { };
 

From 810680bcae1f8ca23744544e87fbf03b705e9493 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 16:06:47 +0200
Subject: [PATCH 1070/2033] Containers: Use systemd-nspawn's --keep-unit flag

This gets rid of some redundant scopes/slices.
---
 nixos/modules/virtualisation/containers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 4fca872d72e..7a8c8a4594b 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -220,6 +220,7 @@ in
             ''}
 
             exec $runInNetNs ${config.systemd.package}/bin/systemd-nspawn \
+              --keep-unit \
               -M "$INSTANCE" -D "$root" $extraFlags \
               --bind-ro=/nix/store \
               --bind-ro=/nix/var/nix/db \

From 6f7aaf10a5beb6cc10ebe75674d9c8664bd187fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 17:00:46 +0200
Subject: [PATCH 1071/2033] Containers: Use systemd-nspawn's --network-veth
 flag

Note that this causes the name of the host-side interface to change
from c-<name> to ve-<name>.
---
 nixos/doc/manual/containers.xml              |  8 +-
 nixos/doc/manual/release-notes.xml           | 22 +++++
 nixos/modules/services/networking/dhcpcd.nix |  5 +-
 nixos/modules/virtualisation/containers.nix  | 93 ++++++++++----------
 nixos/modules/virtualisation/run-in-netns.c  | 50 -----------
 5 files changed, 73 insertions(+), 105 deletions(-)
 delete mode 100644 nixos/modules/virtualisation/run-in-netns.c

diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml
index b8f170fc614..2530d519521 100644
--- a/nixos/doc/manual/containers.xml
+++ b/nixos/doc/manual/containers.xml
@@ -213,8 +213,8 @@ $ ping -c1 10.233.4.2
 <para>Networking is implemented using a pair of virtual Ethernet
 devices. The network interface in the container is called
 <literal>eth0</literal>, while the matching interface in the host is
-called <literal>c-<replaceable>container-name</replaceable></literal>
-(e.g., <literal>c-foo</literal>).  The container has its own network
+called <literal>ve-<replaceable>container-name</replaceable></literal>
+(e.g., <literal>ve-foo</literal>).  The container has its own network
 namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
 can perform arbitrary network configuration such as setting up
 firewall rules, without affecting or having access to the host’s
@@ -228,11 +228,11 @@ on the host:
 
 <programlisting>
 networking.nat.enable = true;
-networking.nat.internalInterfaces = ["c-+"];
+networking.nat.internalInterfaces = ["ve-+"];
 networking.nat.externalInterface = "eth0";
 </programlisting>
 where <literal>eth0</literal> should be replaced with the desired
-external interface. Note that <literal>c-+</literal> is a wildcard
+external interface. Note that <literal>ve-+</literal> is a wildcard
 that matches all container interfaces.</para>
 
 </section>
diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes.xml
index 836cb5c19f4..52e88bb4c86 100644
--- a/nixos/doc/manual/release-notes.xml
+++ b/nixos/doc/manual/release-notes.xml
@@ -4,6 +4,28 @@
 
 <title>Release notes</title>
 
+<!--==================================================================-->
+
+<section xml:id="sec-release-14.10">
+
+<title>Release 14.10 (“Caterpillar”, 2014/10/??)</title>
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+<itemizedlist>
+
+  <listitem><para>The host side of a container virtual Ethernet pair
+  is now called <literal>ve-<replaceable>container-name</replaceable></literal>
+  rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
+
+</itemizedlist>
+
+</para>
+
+</section>
+
+
 <!--==================================================================-->
 
 <section xml:id="sec-release-14.04">
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 757340b3c2c..8799d7d8a20 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -34,9 +34,8 @@ let
 
       # Ignore peth* devices; on Xen, they're renamed physical
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
-      # (Xen) and virbr* and vnet* (libvirt) and c-* and ctmp-* (NixOS
-      # containers).
-      denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* c-* ctmp-*
+      # (Xen) and virbr* and vnet* (libvirt).
+      denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet*
 
       ${config.networking.dhcpcd.extraConfig}
     '';
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 7a8c8a4594b..08c234b9413 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -4,16 +4,6 @@ with lib;
 
 let
 
-  runInNetns = pkgs.stdenv.mkDerivation {
-    name = "run-in-netns";
-    unpackPhase = "true";
-    buildPhase = ''
-      mkdir -p $out/bin
-      gcc ${./run-in-netns.c} -o $out/bin/run-in-netns
-    '';
-    installPhase = "true";
-  };
-
   nixos-container = pkgs.substituteAll {
     name = "nixos-container";
     dir = "bin";
@@ -23,6 +13,28 @@ let
     inherit (pkgs) socat;
   };
 
+  # The container's init script, a small wrapper around the regular
+  # NixOS stage-2 init script.
+  containerInit = pkgs.writeScript "container-init"
+    ''
+      #! ${pkgs.stdenv.shell} -e
+
+      # Initialise the container side of the veth pair.
+      if [ "$PRIVATE_NETWORK" = 1 ]; then
+        ip link set host0 name eth0
+        ip link set dev eth0 up
+        if [ -n "$HOST_ADDRESS" ]; then
+          ip route add $HOST_ADDRESS dev eth0
+          ip route add default via $HOST_ADDRESS
+        fi
+        if [ -n "$LOCAL_ADDRESS" ]; then
+          ip addr add $LOCAL_ADDRESS dev eth0
+        fi
+      fi
+
+      exec "$1"
+    '';
+
   system = config.nixpkgs.system;
 
 in
@@ -70,7 +82,7 @@ in
                 Whether to give the container its own private virtual
                 Ethernet interface.  The interface is called
                 <literal>eth0</literal>, and is hooked up to the interface
-                <literal>c-<replaceable>container-name</replaceable></literal>
+                <literal>ve-<replaceable>container-name</replaceable></literal>
                 on the host.  If this option is not set, then the
                 container shares the network interfaces of the host,
                 and can bind to any port on any interface.
@@ -176,39 +188,8 @@ in
               "/nix/var/nix/profiles/per-container/$INSTANCE" \
               "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
-            if [ -f "/etc/containers/$INSTANCE.conf" ]; then
-              . "/etc/containers/$INSTANCE.conf"
-            fi
-
-            # Cleanup from last time.
-            ifaceHost=c-$INSTANCE
-            ifaceCont=ctmp-$INSTANCE
-            ns=net-$INSTANCE
-            ip netns del $ns 2> /dev/null || true
-            ip link del $ifaceHost 2> /dev/null || true
-            ip link del $ifaceCont 2> /dev/null || true
-
             if [ "$PRIVATE_NETWORK" = 1 ]; then
-              # Create a pair of virtual ethernet devices.  On the host,
-              # we get ‘c-<container-name’, and on the guest, we get
-              # ‘eth0’.
-              ip link add $ifaceHost type veth peer name $ifaceCont
-              ip netns add $ns
-              ip link set $ifaceCont netns $ns
-              ip netns exec $ns ip link set $ifaceCont name eth0
-              ip netns exec $ns ip link set dev eth0 up
-              ip link set dev $ifaceHost up
-              if [ -n "$HOST_ADDRESS" ]; then
-                ip addr add $HOST_ADDRESS dev $ifaceHost
-                ip netns exec $ns ip route add $HOST_ADDRESS dev eth0
-                ip netns exec $ns ip route add default via $HOST_ADDRESS
-              fi
-              if [ -n "$LOCAL_ADDRESS" ]; then
-                ip netns exec $ns ip addr add $LOCAL_ADDRESS dev eth0
-                ip route add $LOCAL_ADDRESS dev $ifaceHost
-              fi
-              runInNetNs="${runInNetns}/bin/run-in-netns $ns"
-              extraFlags="--capability=CAP_NET_ADMIN"
+              extraFlags="--network-veth"
             fi
 
             # If the host is 64-bit and the container is 32-bit, add a
@@ -219,7 +200,7 @@ in
               fi
             ''}
 
-            exec $runInNetNs ${config.systemd.package}/bin/systemd-nspawn \
+            exec ${config.systemd.package}/bin/systemd-nspawn \
               --keep-unit \
               -M "$INSTANCE" -D "$root" $extraFlags \
               --bind-ro=/nix/store \
@@ -227,7 +208,11 @@ in
               --bind-ro=/nix/var/nix/daemon-socket \
               --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \
               --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \
-              "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
+              --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \
+              --setenv HOST_ADDRESS="$HOST_ADDRESS" \
+              --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \
+              --setenv PATH="$PATH" \
+              ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
           '';
 
         postStart =
@@ -237,6 +222,17 @@ in
             # until the start timeout expires if systemd-nspawn exits.
             read x < $root/var/lib/startup-done
             rm -f $root/var/lib/startup-done
+
+            if [ "$PRIVATE_NETWORK" = 1 ]; then
+              ifaceHost=ve-$INSTANCE
+              ip link set dev $ifaceHost up
+              if [ -n "$HOST_ADDRESS" ]; then
+                ip addr add $HOST_ADDRESS dev $ifaceHost
+              fi
+              if [ -n "$LOCAL_ADDRESS" ]; then
+                ip route add $LOCAL_ADDRESS dev $ifaceHost
+              fi
+            fi
           '';
 
         preStop =
@@ -251,14 +247,13 @@ in
           ''
             #! ${pkgs.stdenv.shell} -e
             SYSTEM_PATH=/nix/var/nix/profiles/system
-            if [ -f "/etc/containers/$INSTANCE.conf" ]; then
-              . "/etc/containers/$INSTANCE.conf"
-            fi
             echo $SYSTEM_PATH/bin/switch-to-configuration test | \
               ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket -
           '';
 
         serviceConfig.SyslogIdentifier = "container %i";
+
+        serviceConfig.EnvironmentFile = "-/etc/containers/%i.conf";
       };
 
     # Generate a configuration file in /etc/containers for each
@@ -288,6 +283,8 @@ in
         ${cfg.localAddress} ${name}.containers
       '') config.containers);
 
+    networking.dhcpcd.denyInterfaces = [ "ve-*" ];
+
     environment.systemPackages = [ nixos-container ];
 
   };
diff --git a/nixos/modules/virtualisation/run-in-netns.c b/nixos/modules/virtualisation/run-in-netns.c
deleted file mode 100644
index d375bddf2e6..00000000000
--- a/nixos/modules/virtualisation/run-in-netns.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <unistd.h>
-#include <sched.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <fcntl.h>
-#include <linux/limits.h>
-
-int main(int argc, char * * argv)
-{
-    if (argc < 3) {
-        fprintf(stderr, "%s: missing arguments\n", argv[0]);
-        return 1;
-    }
-
-    char nsPath[PATH_MAX];
-
-    sprintf(nsPath, "/run/netns/%s", argv[1]);
-
-    int fd = open(nsPath, O_RDONLY);
-    if (fd == -1) {
-        fprintf(stderr, "%s: opening network namespace: %s\n", argv[0], strerror(errno));
-        return 1;
-    }
-
-    if (setns(fd, CLONE_NEWNET) == -1) {
-        fprintf(stderr, "%s: setting network namespace: %s\n", argv[0], strerror(errno));
-        return 1;
-    }
-
-    umount2(nsPath, MNT_DETACH);
-    if (unlink(nsPath) == -1) {
-        fprintf(stderr, "%s: unlinking network namespace: %s\n", argv[0], strerror(errno));
-        return 1;
-    }
-
-    /* FIXME: Remount /sys so that /sys/class/net reflects the
-       interfaces visible in the network namespace. This requires
-       bind-mounting /sys/fs/cgroups etc. */
-
-    execv(argv[2], argv + 2);
-    fprintf(stderr, "%s: running command: %s\n", argv[0], strerror(errno));
-    return 1;
-}

From 333bfe16c454d759e801425b5ef7cd435320a4b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 17:17:19 +0200
Subject: [PATCH 1072/2033] Containers: Support setting up macvlan interfaces

By setting a line like

  MACVLANS="eno1"

in /etc/containers/<name>.conf, the container will get an Ethernet
interface named mv-eno1, which represents an additional MAC address on
the physical eno1 interface. Thus the container has direct access to
the physical network. You can specify multiple interfaces in MACVLANS.

Unfortunately, you can't do this with wireless interfaces.

Note that dhcpcd is disabled in containers by default, so you'll
probably want to set

  networking.useDHCP = true;

in the container, or configure a static IP address.

To do: add a containers.* option for this, and a flag for
"nixos-container create".
---
 nixos/modules/virtualisation/containers.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 08c234b9413..a0238277f5d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -189,9 +189,13 @@ in
               "/nix/var/nix/gcroots/per-container/$INSTANCE"
 
             if [ "$PRIVATE_NETWORK" = 1 ]; then
-              extraFlags="--network-veth"
+              extraFlags+=" --network-veth"
             fi
 
+            for iface in $MACVLANS; do
+              extraFlags+=" --network-macvlan=$iface"
+            done
+
             # If the host is 64-bit and the container is 32-bit, add a
             # --personality flag.
             ${optionalString (config.nixpkgs.system == "x86_64-linux") ''

From fae135b8711daa852c11b02c7624e145da0e0148 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 May 2014 18:20:55 +0200
Subject: [PATCH 1073/2033] Installer test: Increase amount of RAM

On x86_64, 384 MB is not enough anymore for running "nix-env -i".

http://hydra.nixos.org/build/10865007
---
 nixos/tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 782df7eab2a..9149b1bff02 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -98,6 +98,7 @@ let
       # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html
       iface = if useEFI || grubVersion == 1 then "scsi" else "virtio";
       qemuFlags =
+        (if iso.system == "x86_64-linux" then "-m 512 " else "-m 384 ") +
         (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") +
         (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} '');
       hdFlags = optionalString (!useEFI)

From 715efa194829e305d32d4131b168eadc38a07e87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 19:12:15 +0200
Subject: [PATCH 1074/2033] R: don't recurse into the rPackages set to conserve
 memory and CPU time

The addition of CRAN has made "nix-env -qa \*" run ~30% longer than before [1].

[1] https://github.com/NixOS/nixpkgs/commit/0d264c17616646a7d68e0a465fdc0f335e0d2fb3
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecbf706e6c6..cd63a1a96d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6437,10 +6437,10 @@ let
     packages = [];
   };
 
-  rPackages = recurseIntoAttrs (import ../development/r-modules/cran-packages.nix {
+  rPackages = import ../development/r-modules/cran-packages.nix {
     inherit pkgs;
     overrides = (config.rPackageOverrides or (p: {})) pkgs;
-  });
+  };
 
   ### SERVERS
 

From 6f5ee37d5c389b513df4a8c7a5af87faf6ca10b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 22:55:57 +0200
Subject: [PATCH 1075/2033] haskell-HTTP: update to version 4000.2.14

---
 .../haskell/HTTP/{4000.2.13.nix => 4000.2.14.nix}         | 8 ++------
 pkgs/top-level/haskell-packages.nix                       | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/development/libraries/haskell/HTTP/{4000.2.13.nix => 4000.2.14.nix} (66%)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
similarity index 66%
rename from pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
rename to pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
index 9963b7e9770..d9e7af97adc 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.13.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HTTP";
-  version = "4000.2.13";
-  sha256 = "1lff45nad6j2bc6waav1z95na0bif2figxiw86g2w741p7idxyy4";
+  version = "4000.2.14";
+  sha256 = "1js5r3rpy5wx0h29qsd3sfazqj0svfdcv13nsvwqi9jnwik8041c";
   buildDepends = [ mtl network parsec ];
   testDepends = [
     caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
@@ -14,14 +14,10 @@ cabal.mkDerivation (self: {
   ];
   jailbreak = true;
   doCheck = false;
-  preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) ''
-    sed -i -e 's|Extensions: |Extensions: FlexibleContexts, |' HTTP.cabal
-  '';
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 03d09898049..17cf5882e79 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -151,7 +151,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
     haskellSrc   = self.haskellSrc_1_0_1_6;
     hashable     = self.hashable_1_2_1_0;
     html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_13;
+    HTTP         = self.HTTP_4000_2_14;
     HUnit        = self.HUnit_1_2_5_2;
     mtl          = self.mtl_2_1_3_1;
     network      = self.network_2_5_0_0;
@@ -1387,8 +1387,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_13 = callPackage ../development/libraries/haskell/HTTP/4000.2.13.nix {};
-  HTTP = self.HTTP_4000_2_13;
+  HTTP_4000_2_14 = callPackage ../development/libraries/haskell/HTTP/4000.2.14.nix {};
+  HTTP = self.HTTP_4000_2_14;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 1b81577f095d810db262231531b5df4d6fe70f17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:49 +0200
Subject: [PATCH 1076/2033] haskell-contravariant: update to version 0.5.2

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

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 48dfaa44385..75ad1f188ae 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.5";
-  sha256 = "0jw66irh3mjpbd25jh4pzy73jxfaghvlqkngqa1vd0v2i99j6sap";
+  version = "0.5.2";
+  sha256 = "05lnipshhjh8ld0c24h675rgljr54203vv9a4fsivw4asaj24q7y";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From 3f1571b5a1a743e456c181c7fdd35336172624cc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:51 +0200
Subject: [PATCH 1077/2033] haskell-distributive: update to version 0.4.4

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

diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix
index e6ef8e06c8c..10f763ffa83 100644
--- a/pkgs/development/libraries/haskell/distributive/default.nix
+++ b/pkgs/development/libraries/haskell/distributive/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "distributive";
-  version = "0.4.3.2";
-  sha256 = "16d16ddd5i2pf5q6lkix4g1a1a6l7al6ximwp7jrvifaqcyr5inj";
+  version = "0.4.4";
+  sha256 = "0s2ln9jv7bh4ri2y31178pvjl8x6nik5d0klx7j2b77yjlsgblc2";
   buildDepends = [ tagged transformers transformersCompat ];
   testDepends = [ doctest filepath ];
   meta = {

From 32ca02ffac42deb7145236c707ff4cd3edfb1b85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:54 +0200
Subject: [PATCH 1078/2033] haskell-gtk-traymanager: update to version 0.1.4

---
 .../development/libraries/haskell/gtk-traymanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
index f55d9f2edef..21a06638f68 100644
--- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
+++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gtk-traymanager";
-  version = "0.1.3";
-  sha256 = "07671f3j3r07djgvrlpbdaqqnm2yc7sc5f5isjn5nczrwh8n0sj4";
+  version = "0.1.4";
+  sha256 = "0dprxds49ljn0n94ca423gvh5ks2jmb4qx3lkqwpxqbcp0j8il7p";
   buildDepends = [ glib gtk ];
   pkgconfigDepends = [ gtk x11 ];
   meta = {

From 8d6975cc758c29d382f08fc3a42d6ff5feadc748 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:56 +0200
Subject: [PATCH 1079/2033] haskell-hourglass: update to version 0.1.2

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

diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix
index 184270ad6ec..3fc43ef6348 100644
--- a/pkgs/development/libraries/haskell/hourglass/default.nix
+++ b/pkgs/development/libraries/haskell/hourglass/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hourglass";
-  version = "0.1.1";
-  sha256 = "1mxi98l9nsnddkkd35r70l1y04wq0lh6xsapjbkz411q5045wfk7";
+  version = "0.1.2";
+  sha256 = "18jvl4f8vfabvd9vlhxjjlswc80x8w4h6gdflvzdkjrknnyk118j";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq HUnit mtl QuickCheck testFramework testFrameworkHunit

From 375c29810d4a86d970f4cb20a2b8cf9c469ca436 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:57 +0200
Subject: [PATCH 1080/2033] haskell-html-conduit: update to version 1.1.0.5

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

diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix
index 244b1c2dcce..49a7d37e4aa 100644
--- a/pkgs/development/libraries/haskell/html-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/html-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "html-conduit";
-  version = "1.1.0.4";
-  sha256 = "1bl6h38fvhiidzxly49l7jickcg0s4fy59m4cizfjarxll9cspwb";
+  version = "1.1.0.5";
+  sha256 = "1yxvaiklg90fsiv2sfzrr3hp1wjs0fhcg709b24lqm81aryaq2sn";
   buildDepends = [
     conduit conduitExtra resourcet systemFilepath tagstreamConduit text
     transformers xmlConduit xmlTypes

From 0c60cac67f134988e90a001e18ff10d8c84fdcca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:03:59 +0200
Subject: [PATCH 1081/2033] haskell-http-client: update to version 0.3.2.2

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index 2a6ec370b90..cc8341e2ac4 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.2.1";
-  sha256 = "1ww88nwgpmjmqmni4lfzlv7z9y2772kd2d3m635mh412ygigsszs";
+  version = "0.3.2.2";
+  sha256 = "1znfcn549zxz4wdlv9rvyqz0x52ygx9jba9r1fzxk08mbi8xz6ff";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From 2fda5952a87537dfb1ce0f607ce1282c5fb0ec98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:00 +0200
Subject: [PATCH 1082/2033] haskell-monad-logger: update to version 0.3.6.1

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

diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix
index 5468f4127fc..e0902b7d4f7 100644
--- a/pkgs/development/libraries/haskell/monad-logger/default.nix
+++ b/pkgs/development/libraries/haskell/monad-logger/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monad-logger";
-  version = "0.3.6";
-  sha256 = "0a3dbk3c1jv8zbxrb5vzf5ypwwzkamxd35rm8pjn13aqcnnznniq";
+  version = "0.3.6.1";
+  sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss";
   buildDepends = [
     blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase
     monadControl monadLoops mtl resourcet stm stmChans text

From 33c1a9599c05af937a3a54a4445535e89d84623d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:02 +0200
Subject: [PATCH 1083/2033] haskell-optparse-applicative: update to version
 0.8.1

---
 .../libraries/haskell/optparse-applicative/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index da681b324a7..94d4b5746e2 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.8.0.1";
-  sha256 = "19k7jw9hrns5i8dr67jxadaqnj0cmn991hl00fwymg4awv34p1w3";
+  version = "0.8.1";
+  sha256 = "0zy295r2idrwz030i1slpgysyw08782cjc4vgpkxby8i6piixwlh";
   buildDepends = [ ansiWlPprint transformers ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit

From 7b52cc9676490611ae6aeb4613c8e834283ae229 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:03 +0200
Subject: [PATCH 1084/2033] haskell-pandoc-citeproc: update to version 0.3.1

---
 .../development/libraries/haskell/pandoc-citeproc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 62044cc9f5f..9738ad9e19c 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.3.0.1";
-  sha256 = "1w8ljf0mc5a3bqv0hymg2daafkrlzdzar23l4yqakjr21n75nvlx";
+  version = "0.3.1";
+  sha256 = "06ck5qfajzwdsmcqvkcs85andxxrifvsfsybf14m7jd6r8y4bg26";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 00302921b3970d6c2e09c18e25eb8baef4fbe36f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:05 +0200
Subject: [PATCH 1085/2033] haskell-resourcet: update to version 1.1.2.1

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

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index a7bc937ca65..8a4cdc57006 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "1.1.2";
-  sha256 = "1hm53zq61m1va9djxy0vi3nwdl4qz26dzk8a55qh40cpkf45zggk";
+  version = "1.1.2.1";
+  sha256 = "1nkgmkm1rwdb0knf0vs8p47flg97scfki775pdihjpsx87bhwwlr";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase

From b45c5cdd329503010a0310fc3cc0ddb693027aa5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:06 +0200
Subject: [PATCH 1086/2033] haskell-transformers-compat: update to version 0.3

---
 .../libraries/haskell/transformers-compat/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index 2abd6efa0ce..bdb101914a4 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.1.1.1";
-  sha256 = "0i0bcfmqsnqa8fyp81virr5bh3hk23261xyx28jcfamrc18ly9ij";
+  version = "0.3";
+  sha256 = "0dncakmg4wszi20apfzwdlgp69pka8bwwdrg1pl7nrn3sybq97yf";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";
-    description = "A small compatibility shim exposing the new types from transformers 0.3 to older Haskell platforms.";
+    description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From 895a8648c9a8619a2e112fd44520047c557256a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:04:08 +0200
Subject: [PATCH 1087/2033] haskell-yesod-core: update to version 1.2.15.1

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

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 761f36fcb22..433b3985269 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -11,8 +11,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "1.2.15";
-  sha256 = "06y95hbahrd23wwmprnhwglvg5arj0xw3r6cv3n2h93zrlfsb5b5";
+  version = "1.2.15.1";
+  sha256 = "0xvfkplxsvacwkmplhzdyqk028yqkj1bql5x6qsizvj60fwsnnyk";
   buildDepends = [
     aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
     caseInsensitive cereal clientsession conduit conduitExtra cookie

From efaac7c00639e4fd91ea2e86524c9927c4e27ab7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:08:13 +0200
Subject: [PATCH 1088/2033] haskell-syb-0.4.1: disable the test suite when
 compiling with GHC HEAD

The test suite fails in a seemingly harmless way:

  ### Failure in: All:0
  expected: "(MyDataType Int,(DataType {tycon = \"MyDataType\", datarep = AlgRep [MyDataType]},(\"\",(\"MyDataType\",(\"\",\"MyDataType\")))))"
   but got: "(MyDataType Int,(DataType {tycon = \"Datatype.MyDataType\", datarep = AlgRep [MyDataType]},(\"\",(\"MyDataType\",(\"Datatype\",\"MyDataType\")))))"
---
 pkgs/development/libraries/haskell/syb/0.4.1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/syb/0.4.1.nix b/pkgs/development/libraries/haskell/syb/0.4.1.nix
index 63fb364511f..38c4f2cae3f 100644
--- a/pkgs/development/libraries/haskell/syb/0.4.1.nix
+++ b/pkgs/development/libraries/haskell/syb/0.4.1.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.4.1";
   sha256 = "1lkh4rrqdzvb8kyry07x2z88v478hrw5cp8wmhjgpg0ck8ywncma";
   testDepends = [ HUnit mtl ];
+  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
     description = "Scrap Your Boilerplate";

From 23b0bb002b0883095ca1bac86402356f6d8293cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:27:41 +0200
Subject: [PATCH 1089/2033] haskell-comonad: update to version 4.2

---
 pkgs/development/libraries/haskell/comonad/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix
index 92c70b55156..00b970ea112 100644
--- a/pkgs/development/libraries/haskell/comonad/default.nix
+++ b/pkgs/development/libraries/haskell/comonad/default.nix
@@ -1,13 +1,13 @@
-{ cabal, contravariant, distributive, doctest, filepath, mtl
-, semigroups, tagged, transformers
+{ cabal, contravariant, distributive, doctest, filepath, semigroups
+, tagged, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "comonad";
-  version = "4.0.1";
-  sha256 = "1ib3spgyjbdsnpbz4alaqb1m13v48l5dpv7s68c0mi2nyjkli7lx";
+  version = "4.2";
+  sha256 = "161dgmjfff85sj6yijzgzyb4dvnn1zsm3q5q96qwypynj0am5sr7";
   buildDepends = [
-    contravariant distributive mtl semigroups tagged transformers
+    contravariant distributive semigroups tagged transformers
   ];
   testDepends = [ doctest filepath ];
   meta = {

From d43c34b6a4304876436040253f666b3c6de5a9be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 May 2014 23:27:43 +0200
Subject: [PATCH 1090/2033] haskell-derive: update to version 2.5.16

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

diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index 3e8cf02dddb..5dba1b6af56 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.15";
-  sha256 = "18r7n6bd3w5347yx6m352r8jbyn6qf2364mdz62891hdv7vqb629";
+  version = "2.5.16";
+  sha256 = "0vahwnb2hzdm990b2m139kbg9jkk4whcxjdfjvlpimqk72s27viy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8a446a01d7b01b84140efe2eed3be5cff318345f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:40 +0200
Subject: [PATCH 1091/2033] haskell-HsSyck: update to version 0.52

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

diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/default.nix
index 1c10075d13c..2340c339ea7 100644
--- a/pkgs/development/libraries/haskell/HsSyck/default.nix
+++ b/pkgs/development/libraries/haskell/HsSyck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "HsSyck";
-  version = "0.51";
-  sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49";
+  version = "0.52";
+  sha256 = "1hdckbm60pzmydaz4rsw3kz9byd205987jcddakyhmgfinzvqwvc";
   buildDepends = [ hashtables syb utf8String ];
   meta = {
     description = "Fast, lightweight YAML loader and dumper";

From 2ac07cfc0054b7b95cb89b06e865f5e279fbb344 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:40 +0200
Subject: [PATCH 1092/2033] haskell-JuicyPixels: update to version 3.1.5.2

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

diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
index 8f922a5b7b9..414118f33c9 100644
--- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix
+++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "JuicyPixels";
-  version = "3.1.5.1";
-  sha256 = "0i6q9dkansphnymfrmbsqd0mdbf9vwc7xn7vxp0ds3y8gg1jzhiw";
+  version = "3.1.5.2";
+  sha256 = "0afw7kwyaqw2lwgrdc1mamz45vmqy471fgsyvn9rhla8znr3a9nq";
   buildDepends = [
     binary deepseq mtl primitive transformers vector zlib
   ];

From d1fdb0cbb0e2c1a3162c0763242ecb1445fb04d2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:40 +0200
Subject: [PATCH 1093/2033] haskell-concurrent-extra: update to version 0.7.0.7

---
 .../libraries/haskell/concurrent-extra/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
index 9f97f730472..5fe73a33964 100644
--- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix
+++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "concurrent-extra";
-  version = "0.7.0.6";
-  sha256 = "12wq86hkgy22qydkj4fw6vb7crzv3010c2mkhsph4rdynr0v588i";
+  version = "0.7.0.7";
+  sha256 = "1736y8am24x29qq1016f2dvb6adavl1h46bsjfwnkw40a9djd5cr";
   buildDepends = [ baseUnicodeSymbols stm unboundedDelays ];
   testDepends = [
     baseUnicodeSymbols HUnit stm testFramework testFrameworkHunit

From 1ca4ac68d7eb38ee7e2749bed94c24d985e784d3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:40 +0200
Subject: [PATCH 1094/2033] haskell-conduit: update to version 1.1.2.1

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index e4c15c7900a..99308d43272 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.1.1";
-  sha256 = "18i96faiik16375y2ysnfkfnrjgir4dnbq3w5ykzhrvw43z8pm7g";
+  version = "1.1.2.1";
+  sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From de899153b1a24ac360d3c3982c7cfa2cb1957479 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:40 +0200
Subject: [PATCH 1095/2033] haskell-criterion: update to version 0.8.1.0

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

diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix
index e106138ef24..f1965012946 100644
--- a/pkgs/development/libraries/haskell/criterion/default.nix
+++ b/pkgs/development/libraries/haskell/criterion/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "criterion";
-  version = "0.8.0.2";
-  sha256 = "126c3i9i88wqs5ihif4kpsc1gdqas57acd8h5jbyfqhgbwi1s7gz";
+  version = "0.8.1.0";
+  sha256 = "0yzrnma2whd4dnjiy4w24syxgnz1b5bflsi20hrbgd5rmx85k2zd";
   buildDepends = [
     aeson binary deepseq filepath Glob hastache mtl mwcRandom parsec
     statistics text time transformers vector vectorAlgorithms

From a688dd068784b6c71292219c0390c6b5e71f1901 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:41 +0200
Subject: [PATCH 1096/2033] haskell-language-c-inline: update to version
 0.5.0.0

---
 .../libraries/haskell/language-c-inline/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix
index 58c3e37c853..691c1e70662 100644
--- a/pkgs/development/libraries/haskell/language-c-inline/default.nix
+++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "language-c-inline";
-  version = "0.3.0.1";
-  sha256 = "0dw1fqwg9hhwgvak0ykhafbxp4gnb2ww9lc83m8kzkyzn1ccb6hg";
+  version = "0.5.0.0";
+  sha256 = "1cyl45bi2d38yyd1ybxippl8mv3hsl1chzn7rqm40fds97h07j2z";
   buildDepends = [ filepath languageCQuote mainlandPretty ];
   testDepends = [ languageCQuote ];
   doCheck = false;

From b127783bf4cc5464fd7ad215e153ac67682cb420 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:46:41 +0200
Subject: [PATCH 1097/2033] haskell-largeword: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix
index aeb24ca278d..814fe50bca7 100644
--- a/pkgs/development/libraries/haskell/largeword/default.nix
+++ b/pkgs/development/libraries/haskell/largeword/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "largeword";
-  version = "1.2.2";
-  sha256 = "04l55q2q8k7q8cz5gwmb9sc211pgqazjwvgs0np1xi9z9d7ylcjg";
+  version = "1.2.3";
+  sha256 = "1ldcsnnji6p84sn03j17pdcpg7vqn1xrhyn4wys0v5fyy0d383ln";
   buildDepends = [ binary ];
   testDepends = [
     binary HUnit QuickCheck testFramework testFrameworkHunit

From 1ca94859d35bed05c80783e0c7a69e9070fd4488 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1098/2033] haskell-mmorph: update to version 1.0.3

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

diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix
index b2c3212bb17..4b3e687fd8f 100644
--- a/pkgs/development/libraries/haskell/mmorph/default.nix
+++ b/pkgs/development/libraries/haskell/mmorph/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mmorph";
-  version = "1.0.2";
-  sha256 = "0d0nn5x7f3yyck10znqa13iihkshq04xgg1d9bn1nvl7kjzicjwh";
+  version = "1.0.3";
+  sha256 = "0b8pzb63zxw3cjw8yj73swvqhmi9c4lgw1mis1xbraya7flxc6qm";
   buildDepends = [ transformers ];
   meta = {
     description = "Monad morphisms";

From 08549cdb021e474e89d2afac346f260cc10ef800 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1099/2033] haskell-network-multicast: update to version 0.0.11

---
 .../libraries/haskell/network-multicast/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix
index 3a9531488bb..78d1b36f34d 100644
--- a/pkgs/development/libraries/haskell/network-multicast/default.nix
+++ b/pkgs/development/libraries/haskell/network-multicast/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-multicast";
-  version = "0.0.10";
-  sha256 = "092v4ba6mrl5ykx2fscclcsc5dbnq99hbn93sc2mjnnr8c9r0n5x";
+  version = "0.0.11";
+  sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
   buildDepends = [ network ];
   meta = {
     description = "Simple multicast library";

From 98c5572642976a0a36f3f0858333ef3afb96ce16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1100/2033] haskell-resourcet: update to version 1.1.2.2

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

diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 8a4cdc57006..60358a228d2 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "1.1.2.1";
-  sha256 = "1nkgmkm1rwdb0knf0vs8p47flg97scfki775pdihjpsx87bhwwlr";
+  version = "1.1.2.2";
+  sha256 = "1j468zkjd7j2xpgzx1i36h3lpamnqpk0rj3miwfr9a0ibm7bz1as";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl transformers
     transformersBase

From ce57c7aac18ce5c9c172f566157e90607e768bce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1101/2033] haskell-semigroupoids: update to version 4.0.2

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

diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix
index c46bfa910b0..45e2adb35fd 100644
--- a/pkgs/development/libraries/haskell/semigroupoids/default.nix
+++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroupoids";
-  version = "4.0.1";
-  sha256 = "0w4r4nmyq94aq9xlyvrankipfwdmlcz2ghqicn9drqfjirhi8lrl";
+  version = "4.0.2";
+  sha256 = "07xzqqdra2d5jr4wclislj1lhbb1nlry65m0y42hdxsjf3n05931";
   buildDepends = [
     comonad contravariant distributive semigroups transformers
   ];

From bb6695798767e6055e3f31f1db00a3e09131df5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1102/2033] haskell-shelly: update to version 1.5.3

---
 .../libraries/haskell/shelly/default.nix            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 5a7171c4619..f3885506d21 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -1,13 +1,16 @@
-{ cabal, async, mtl, systemFileio, systemFilepath, text, time
-, unixCompat
+{ cabal, async, enclosedExceptions, exceptions, liftedAsync
+, liftedBase, monadControl, mtl, systemFileio, systemFilepath, text
+, time, transformers, transformersBase, unixCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.2";
-  sha256 = "1iyn3xxmqbrx6xfay364m2qgflscmz9crr051jpzg0b629b8wssa";
+  version = "1.5.3";
+  sha256 = "1s4j2jp0nflv1nn29f4x2j1vfjf2mimjz0ljy4hg9hn7jp028s8h";
   buildDepends = [
-    async mtl systemFileio systemFilepath text time unixCompat
+    async enclosedExceptions exceptions liftedAsync liftedBase
+    monadControl mtl systemFileio systemFilepath text time transformers
+    transformersBase unixCompat
   ];
   meta = {
     homepage = "https://github.com/yesodweb/Shelly.hs";

From 390b804b2381e7149a06fc7c17e594e2015a1608 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1103/2033] haskell-snap: update to version 0.13.2.5

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

diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix
index 3d361a69b87..26533c8ce0e 100644
--- a/pkgs/development/libraries/haskell/snap/snap.nix
+++ b/pkgs/development/libraries/haskell/snap/snap.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap";
-  version = "0.13.2.4";
-  sha256 = "1806nd6gzih66c9gg2iz3dxr4qcd4jkgamz8pv9x3zkk7n5jqga0";
+  version = "0.13.2.5";
+  sha256 = "1xvwx4zg2b78fdyb2yvqd5i5g195di7rzzpn3va43vkq2lk5vcqj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 5034c2b1f93b379d70907d8ae15594c02bea6d5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1104/2033] haskell-streaming-commons: update to version
 0.1.2.3

---
 .../libraries/haskell/streaming-commons/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index e058a8bcd8f..a6c5ce7ec60 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.2.2";
-  sha256 = "0hk01cq39f6rwnj1qpikfyfbq8vayjmvl211b97rvv8ris5y90r4";
+  version = "0.1.2.3";
+  sha256 = "1f8lngnxx0ml7bph8lfx3azv6fh6gwm86yhb8i5v9ghnflblaxxs";
   buildDepends = [ blazeBuilder network text transformers zlib ];
   testDepends = [
     async blazeBuilder deepseq hspec network QuickCheck text zlib

From 06d91b1f0ef5d5f0f4cedbd58565b63920ee677b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1105/2033] haskell-yesod-static: update to version 1.2.3

---
 .../haskell/yesod-static/default.nix          | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix
index 3bc0a22a4a6..b6763871c40 100644
--- a/pkgs/development/libraries/haskell/yesod-static/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-static/default.nix
@@ -1,21 +1,22 @@
-{ cabal, async, base64Bytestring, byteable, conduit, conduitExtra
-, cryptohash, cryptohashConduit, dataDefault, fileEmbed, filepath
-, hjsmin, hspec, httpTypes, HUnit, mimeTypes, resourcet
-, shakespeareCss, systemFileio, systemFilepath, text, transformers
-, unixCompat, unorderedContainers, wai, waiAppStatic, waiTest
-, yesodCore, yesodTest
+{ cabal, async, attoparsec, base64Bytestring, blazeBuilder
+, byteable, conduit, conduitExtra, cryptohash, cryptohashConduit
+, cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin
+, hspec, httpTypes, HUnit, mimeTypes, resourcet, shakespeareCss
+, systemFileio, systemFilepath, text, transformers, unixCompat
+, unorderedContainers, wai, waiAppStatic, waiTest, yesodCore
+, yesodTest
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-static";
-  version = "1.2.2.5";
-  sha256 = "0n084dnvrswfqsvy5kdiq4ajfna2hwyzbb9sn2lj4s8jyiw1fs61";
+  version = "1.2.3";
+  sha256 = "093lvg7pl71dfnr7qyfmp9r1m3bs64849k0dw4w2qb618y8wb9jh";
   buildDepends = [
-    async base64Bytestring byteable conduit conduitExtra cryptohash
-    cryptohashConduit dataDefault fileEmbed filepath hjsmin httpTypes
-    mimeTypes resourcet shakespeareCss systemFileio systemFilepath text
-    transformers unixCompat unorderedContainers wai waiAppStatic
-    yesodCore
+    async attoparsec base64Bytestring blazeBuilder byteable conduit
+    conduitExtra cryptohash cryptohashConduit cssText dataDefault
+    fileEmbed filepath hashable hjsmin httpTypes mimeTypes resourcet
+    shakespeareCss systemFileio systemFilepath text transformers
+    unixCompat unorderedContainers wai waiAppStatic yesodCore
   ];
   testDepends = [
     async base64Bytestring byteable conduit conduitExtra cryptohash

From 9acc4ccb291b39f6a8824620e2a30a5ed25fc8c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1106/2033] haskell-yesod-test: update to version 1.2.1.5

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

diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix
index d943d12de41..a70490320e0 100644
--- a/pkgs/development/libraries/haskell/yesod-test/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-test/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-test";
-  version = "1.2.1.4";
-  sha256 = "1m3fh0s46s2d7q876bvqj1iww7s7nhpcjsnj1547hm7ymfsa29r8";
+  version = "1.2.1.5";
+  sha256 = "0ylm6zisz6l2rbn5dr8k0rxszgg1aa1w4ixpvai1xm6y8m17cy0i";
   buildDepends = [
     attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive
     cookie hspec htmlConduit httpTypes HUnit monadControl network

From bd36eadf98bf16ff08bcdfeb2c6f78a1eeab10ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:48:03 +0200
Subject: [PATCH 1107/2033] haskell-zeromq4-haskell: update to version 0.6

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

diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
index e9a19c8fb97..abe8cd3430c 100644
--- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
+++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zeromq4-haskell";
-  version = "0.5";
-  sha256 = "1gimkcaa1n9c85v44yl4n3ljh0xv23pwgbds5g1x8n47x8s0ak9g";
+  version = "0.6";
+  sha256 = "1n8vvlwnmvi2hlqhkmzsqgpbpxnhdcs8jy3rj1srsg729m2aqc8y";
   buildDepends = [ async exceptions semigroups transformers ];
   testDepends = [
     async QuickCheck tasty tastyHunit tastyQuickcheck

From fc51c1d16341f1d5a2a55832fe0ca7b3152864ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:56:23 +0200
Subject: [PATCH 1108/2033] cabal: enable the split-objects feature again for
 current versions of GHC

---
 pkgs/build-support/cabal/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 45bd5567fc4..047bccebf09 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -133,9 +133,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             jailbreak = false;
 
             # pass the '--enable-split-objs' flag to cabal in the configure stage
-            enableSplitObjs = !(  stdenv.isDarwin                       # http://hackage.haskell.org/trac/ghc/ticket/4013
-                               || versionOlder "7.6.99" ghc.version     # -fsplit-ojbs is broken in 7.7 snapshot
-                               );
+            enableSplitObjs = !stdenv.isDarwin;         # http://hackage.haskell.org/trac/ghc/ticket/4013
 
             # pass the '--enable-tests' flag to cabal in the configure stage
             # and run any regression test suites the package might have

From ee1a03577c0cec7a64f198e3924d116812f6d31c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 11:58:11 +0200
Subject: [PATCH 1109/2033] haskell-statistics: drop obsolete version 0.10.5.2

---
 .../libraries/haskell/statistics/0.10.5.2.nix | 28 -------------------
 .../statistics/{0.11.0.0.nix => default.nix}  |  0
 pkgs/top-level/haskell-packages.nix           |  7 +----
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/statistics/0.10.5.2.nix
 rename pkgs/development/libraries/haskell/statistics/{0.11.0.0.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/statistics/0.10.5.2.nix b/pkgs/development/libraries/haskell/statistics/0.10.5.2.nix
deleted file mode 100644
index 518d22ee1d4..00000000000
--- a/pkgs/development/libraries/haskell/statistics/0.10.5.2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions
-, monadPar, mwcRandom, primitive, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, vector
-, vectorAlgorithms, vectorBinaryInstances
-}:
-
-cabal.mkDerivation (self: {
-  pname = "statistics";
-  version = "0.10.5.2";
-  sha256 = "13wbxz83ci78k41c6swyiwi82rikm9i9vwjwj3d3w327xs59bvvy";
-  buildDepends = [
-    binary deepseq erf mathFunctions monadPar mwcRandom primitive
-    vector vectorAlgorithms vectorBinaryInstances
-  ];
-  testDepends = [
-    erf HUnit ieee754 mathFunctions mwcRandom primitive QuickCheck
-    testFramework testFrameworkHunit testFrameworkQuickcheck2 vector
-    vectorAlgorithms
-  ];
-  doCheck = false;
-  meta = {
-    homepage = "https://github.com/bos/statistics";
-    description = "A library of statistical types, data, and functions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/statistics/0.11.0.0.nix b/pkgs/development/libraries/haskell/statistics/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/statistics/0.11.0.0.nix
rename to pkgs/development/libraries/haskell/statistics/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 17cf5882e79..947e571dafd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2368,15 +2368,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
-  statistics_0_10_5_2 = callPackage ../development/libraries/haskell/statistics/0.10.5.2.nix {
+  statistics = callPackage ../development/libraries/haskell/statistics {
     binary = self.binary_0_7_1_0;
     vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; };
   };
-  statistics_0_11_0_0 = callPackage ../development/libraries/haskell/statistics/0.11.0.0.nix {
-    binary = self.binary_0_7_1_0;
-    vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; };
-  };
-  statistics = self.statistics_0_10_5_2;
 
   statvfs = callPackage ../development/libraries/haskell/statvfs {};
 

From 4ee0cd2bbba5d6306af531f8f9216e7644485975 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 12:31:43 +0200
Subject: [PATCH 1110/2033] haskell-gloss: Revert "update to version 1.8.2.1"

This reverts commit 37df971a49b6264894df2584c45a65a358f5fade. The new
version doesn't compile.
---
 pkgs/development/libraries/haskell/gloss/default.nix | 4 ++--
 pkgs/top-level/haskell-packages.nix                  | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 65a46bf016a..223a72ec381 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.8.2.1";
-  sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2";
+  version = "1.8.1.2";
+  sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m";
   buildDepends = [ bmp GLUT OpenGL ];
   jailbreak = true;
   meta = {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 947e571dafd..1e7a7297758 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1245,10 +1245,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
 
-  gloss = callPackage ../development/libraries/haskell/gloss {
-    OpenGL = self.OpenGL_2_9_1_0;
-    GLUT = self.GLUT_2_5_1_0;
-  };
+  gloss = callPackage ../development/libraries/haskell/gloss {};
 
   glossAccelerate = callPackage ../development/libraries/haskell/gloss-accelerate {};
 

From b8bb480212fdeb9507fa0f9b382b15f24fa3aaa2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 12:54:34 +0200
Subject: [PATCH 1111/2033] cabal-install: fix build of 1.20.0.1 with GHC 7.2.2

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 5ed0743b94b..01352707dff 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -52,6 +52,7 @@
       deepseq = self.deepseq_1_3_0_2;
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
       cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
+      cabalInstall_1_20_0_1 = self.cabalInstall_1_20_0_1.override { HTTP = self.HTTP_4000_2_14; };
       cabalInstall = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
       cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
       binary = self.binary_0_6_0_0;

From 366e3bd7a1050654114d4410fd0ae0fd861e218d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 19:27:09 +0200
Subject: [PATCH 1112/2033] ghc-7.0.1: fix download URL

---
 pkgs/development/compilers/ghc/7.0.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix
index da7e81f5730..b0b03d4b8cc 100644
--- a/pkgs/development/compilers/ghc/7.0.1.nix
+++ b/pkgs/development/compilers/ghc/7.0.1.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://new-www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    url = "http://www.haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
     sha256 = "1iciljngxmqy465cw3pkl6jp0ydiils4bfz6ixfaxk7aqv7r7xsi";
   };
 

From 31428612c231725671ee9cbbde58a3289eb0eac7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 7 May 2014 20:55:21 +0200
Subject: [PATCH 1113/2033] Upgrade rtmpdump and get_iplayer

---
 pkgs/applications/misc/get_iplayer/default.nix | 8 ++++----
 pkgs/tools/video/rtmpdump/default.nix          | 4 ++--
 pkgs/top-level/all-packages.nix                | 4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 308b181fe88..08fad5a021d 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
 buildPerlPackage {
-  name = "get_iplayer-2.83";
+  name = "get_iplayer-2.86";
 
   buildInputs = [makeWrapper perl];
   propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
@@ -12,12 +12,12 @@ buildPerlPackage {
     mkdir -p $out/bin
     cp get_iplayer $out/bin
     sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
-    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
   '';  
   
   src = fetchurl {
-    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.83.tar.gz;
-    sha256 = "169zji0rr3z5ng6r4cyzvs89779m4iklln9gsqpryvm81ipalfga";
+    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz;
+    sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1";
   };
   
 }
diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 615f300aaf5..2034331c8e0 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation {
   name = "rtmpdump-2.4";
   src = fetchgit {
     url = git://git.ffmpeg.org/rtmpdump;
-    rev = "c28f1bab7822de97353849e7787b59e50bbb1428";
-    sha256 = "927e7ea7a686adb7cbce9d0a0c710de1e0921bbb1f0c1b35d17bdb816e6c73d8";
+    rev = "79459a2b43f41ac44a2ec001139bcb7b1b8f7497";
+    sha256 = "5af22362004566794035f989879b13d721f85d313d752abd10a7e45806e3944c";
   };
 
   buildInputs = [ zlib gnutls libgcrypt ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd63a1a96d6..bd39b080d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1826,9 +1826,7 @@ let
 
   privateer = callPackage ../games/privateer { };
 
-  rtmpdump = callPackage ../tools/video/rtmpdump {
-    gnutls = gnutls31; # gnutls32: undefined reference to gnutls_calc_dh_{key,secret}
-  };
+  rtmpdump = callPackage ../tools/video/rtmpdump { };
 
   reaverwps = callPackage ../tools/networking/reaver-wps {};
 

From ba085ee318482ecd2589a30b0b48dd645199121d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 15:33:34 -0500
Subject: [PATCH 1114/2033] libevent: fix event_rpcgen.py

This should help fix the COPRTHR build. Although a Python dependency was
added, it was broken anyway...

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/libevent/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index a2a8403b498..bb854139b79 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, python }:
 
 let version = "2.0.21"; in
 stdenv.mkDerivation {
@@ -9,6 +9,11 @@ stdenv.mkDerivation {
     sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992";
   };
 
+  patchPhase = ''
+    substituteInPlace event_rpcgen.py \
+      --replace "/usr/bin/env python2" "${python}/bin/python"
+  '';
+
   meta = {
     description = "libevent, an event notification library";
 

From 3b873648b3aae5f2364bbd7f865ec4f8af40076c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 15:34:14 -0500
Subject: [PATCH 1115/2033] coprthr: ensure we use the right perl

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/coprthr/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
index 42b626c9927..0e521aa19e8 100644
--- a/pkgs/development/libraries/coprthr/default.nix
+++ b/pkgs/development/libraries/coprthr/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ libelf libconfig libevent which unzip perl python bison flex ];
 
+  patchPhase = ''
+    for x in src/libocl/gen_oclcall_hook.pl tools/cltrace/gen_interceptor.pl src/libocl/gen_oclcall.pl src/scripts/gen_ocl_call_vector.pl src/libstdcl/gen_clarg_setn.pl; do
+      substituteInPlace $x --replace "/usr/bin/perl" ${perl}/bin/perl
+    done
+  '';
+
   configureFlags =
     [ "--with-libelf=${libelf}"
       "--with-libevent=${libevent}"

From 8c75363c719f1ac161a295f240dedf339863f092 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 22:13:26 +0200
Subject: [PATCH 1116/2033] The logic behind 'libiconvOrLibc' is flawed and
 that attribute should be removed.

See https://github.com/NixOS/nixpkgs/pull/2532 for further details.
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd39b080d4c..f81dc83491b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5085,6 +5085,9 @@ let
     then null
     else libiconv;
 
+  # The logic behind this attribute is broken: libiconvOrNull==null does
+  # NOT imply libiconv=glibc! On Darwin, for example, we have a native
+  # libiconv library which is not glibc.
   libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv;
 
   # On non-GNU systems we need GNU Gettext for libintl.

From c61d607340391bad86cd4167527874dd8d7552e5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 22:13:35 +0200
Subject: [PATCH 1117/2033] tkgate: rewrite expressions to get along without
 the broken 'libiconvOrLibc' attribute

---
 .../science/electronics/tkgate/1.x.nix             | 14 ++++++++------
 .../science/electronics/tkgate/2.x.nix             | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index 07c266c62c5..1feac0b31c1 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc, which, yacc, flex, imake, xproto, gccmakedep }:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
 
+let
+  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
+  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
+in
 stdenv.mkDerivation rec {
   name = "tkgate-1.8.7";
 
@@ -10,13 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
   };
 
-  buildInputs = [ tcl tk libX11 libiconvOrLibc which yacc flex imake xproto gccmakedep ];
+  buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ];
 
   patchPhase = ''
     sed -i config.h \
       -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "8.5"|' \
-      -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvOrLibc}/include ${libX11}/include"|' \
-      -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib ${libX11}/lib"|' \
+      -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
+      -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \
       \
       -e '20 i #define TCL_LIBRARY "${tcl}/lib"' \
       -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \
diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
index fdb9e9b5692..25c6a309cf3 100644
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/2.x.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, tcl, tk, libX11, libiconvOrLibc }:
-
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+{ stdenv, fetchurl, tcl, tk, libX11, glibc }:
 
+let
+  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
+  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
+in
 stdenv.mkDerivation rec {
   name = "tkgate-2.0-b10";
 
@@ -16,8 +18,8 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i configure \
-      -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvOrLibc}/include"|' \
-      -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvOrLibc}/lib"|'
+      -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvInc}"|' \
+      -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvLib}"|'
     sed -i options.h \
       -e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \
       -e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|'

From 130cb5d00508c606e15ad5fee19e549a261f68a3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 15:55:33 -0500
Subject: [PATCH 1118/2033] criu: upgrade, hopefully fix Hydra build

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/criu/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 349d690e4d1..8cb39927353 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, protobuf, protobufc, asciidoc, xmlto, utillinux }:
 
-assert stdenv.system == "x86_64-linux";
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "1.2";
+  version = "1.3-rc1";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "04xlnqvgbjd5wfmi97m5rr76a3agkz8g96hdyzhc6x8gd52bbg9y";
+    sha256 = "00q3kyvaizg5x2zladj0mazmp69c9kg7nvlazcqf0w6bqp0y7sp0";
   };
 
   enableParallelBuilding = true;
@@ -16,12 +15,11 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     chmod +w ./scripts/gen-offsets.sh
     substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
+    substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
   '';
 
-  buildPhase = ''
-    make config PREFIX=$out
-    make PREFIX=$out
-  '';
+  configurePhase = "make config PREFIX=$out";
+  buildPhase     = "make PREFIX=$out";
 
   installPhase = ''
     mkdir -p $out/etc/logrotate.d

From eabfc509ef98c856eab12421ae2e7200ed3b9a95 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 7 May 2014 23:53:28 +0200
Subject: [PATCH 1119/2033] nginx: fix syslog module

---
 pkgs/servers/http/nginx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 3dc38575136..e8923559c03 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -26,8 +26,8 @@ let
 
   syslog-ext = fetchgit {
     url = https://github.com/yaoweibin/nginx_syslog_patch.git;
-    rev = "690a054a0e440323bba58ed3be12d705d3fb9cf2";
-    sha256 = "0678bc2960dfa31adfc2997c079947c32dde28d6785ee423fa7f5badbb925fbe";
+    rev = "3ca5ba65541637f74467038aa032e2586321d0cb";
+    sha256 = "15z9r17lx42fdcw8lalddc86wpabgmc1rqi7f90v4mcirjzrpgyi";
   };
 
   moreheaders-ext = fetchgit {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     [ openssl zlib pcre libxml2 libxslt gd geoip
     ] ++ stdenv.lib.optional fullWebDAV expat;
 
-  patches = if syslog then [ "${syslog-ext}/syslog_1.5.6.patch" ] else [];
+  patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
 
   configureFlags = [
     "--with-http_ssl_module"

From aa5c2292236c3df6a4a82ed604adc7fd0bc2d835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Thu, 8 May 2014 00:49:19 +0200
Subject: [PATCH 1120/2033] androidsdk: upgrade 22.3 -> 22.6.2

---
 pkgs/development/mobile/androidenv/androidsdk.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index f1bbdc35bcd..1a2124754a2 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -7,17 +7,18 @@
 }:
 {platformVersions, abiVersions, useGoogleAPIs}:
 
-stdenv.mkDerivation {
-  name = "android-sdk-22.3";
+stdenv.mkDerivation rec {
+  name = "android-sdk-${version}";
+  version = "22.6.2";
   
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
     then fetchurl {
-      url = http://dl.google.com/android/android-sdk_r22.3-linux.tgz;
-      md5 = "6ae581a906d6420ad67176dff25a31cc";
+      url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz";
+      md5 = "ff1541418a44d894bedc5cef10622220";
     }
     else if stdenv.system == "x86_64-darwin" then fetchurl {
-      url = http://dl.google.com/android/android-sdk_r22.3-macosx.zip;
-      md5 = "ecde88ca1f05955826697848fcb4a9e7";
+      url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip";
+      md5 = "2a319c862dd1dcf450bfe2a6b3d9c608";
     }
     else throw "platform not ${stdenv.system} supported!";
   

From 719bcde6cc017800294600a29fcad3672733da5b Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 08:59:32 +0200
Subject: [PATCH 1121/2033] nixpkgs: bump tmux to 1.9

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 272656349f6..10e22c3aad0 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tmux";
-  version = "1.8";
+  version = "1.9";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "f265401ca890f8223e09149fcea5abcd6dfe75d597ab106e172b01e9d0c9cd44";
+    sha256 = "09qykbcyvsspg6bfsdx2lp9b32dbybwn5k6kx4baib0k6l4wmriy";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 30180e8a24999a96c93d20be7cba1bee6961d2c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 12:29:51 +0200
Subject: [PATCH 1122/2033] Fix incorrect comment

---
 nixos/modules/installer/tools/nixos-install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 126d5b185e8..359ac43c7d0 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -1,12 +1,11 @@
 #! @shell@
 
-# - [mount target device] <- currently disabled
 # - make Nix store etc.
 # - copy closure of Nix to target device
 # - register validity
 # - with a chroot to the target device:
 #   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
-#   * run the activation script of the configuration (also installs Grub)
+#   * install the boot loader
 
 # Parse the command line for the -I flag
 extraBuildFlags=()

From 313900d8194f6e410a8db2ac0a4fefd41bf8e8f2 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 11:52:08 +0200
Subject: [PATCH 1123/2033] nixpkgs: Bump feh to 2.11

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 4f52e6dec0f..47a52817549 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.10";
+  name = "feh-2.11";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "10ya8j0mxlni08qli3gdkyjhy54g4d2q2kc0hhragmzd9s42ly5w";
+    sha256 = "1y41ixsp5nhvb29hhiyh8g1g28lc0kki619skgxcv5iisc93dk4x";
   };
 
   buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];

From 709ccd520bd3c9277ce97eb0dc96d06bae4deae3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 8 May 2014 14:59:42 +0200
Subject: [PATCH 1124/2033] patchutils: Update to new upstream version 0.3.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/text/patchutils/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 0ab73142ea0..50232c5a41d 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "patchutils-0.3.0";
+stdenv.mkDerivation rec {
+  name = "patchutils-0.3.3";
 
   src = fetchurl {
-    url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2;
-    sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7";
+    url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
+    sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
   };
 
-  meta = { 
+  meta = {
     description = "Tools to manipulate patch files";
     homepage = http://cyberelk.net/tim/software/patchutils;
     license = "GPLv2";

From 2aa3580a5e49d04bfa63c7509092317b49f54952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 May 2014 15:22:01 +0200
Subject: [PATCH 1125/2033] nixos-generate-config.pl: add new PCI IDs for
 broadcom_sta

The last ID wasn't in official README,
but it was reported by third3ye on IRC.
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index fe191047b87..804de8b25d8 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -130,13 +130,14 @@ sub pciCheck {
 
     # broadcom STA driver (wl.ko)
     # list taken from http://www.broadcom.com/docs/linux_sta/README.txt
-    # FIXME: still needed?
     if ($vendor eq "0x14e4" &&
         ($device eq "0x4311" || $device eq "0x4312" || $device eq "0x4313" ||
          $device eq "0x4315" || $device eq "0x4327" || $device eq "0x4328" ||
          $device eq "0x4329" || $device eq "0x432a" || $device eq "0x432b" ||
          $device eq "0x432c" || $device eq "0x432d" || $device eq "0x4353" ||
-         $device eq "0x4357" || $device eq "0x4358" || $device eq "0x4359" ) )
+         $device eq "0x4357" || $device eq "0x4358" || $device eq "0x4359" ||
+         $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1"
+        ) )
      {
         push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
         push @kernelModules, "wl";

From 46b77d3bb4f98e934958becd231aa12d0a6aa9ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 13:34:51 +0200
Subject: [PATCH 1126/2033] fetchurl_gnome -> fetchurlGnome

---
 pkgs/applications/graphics/dia/default.nix                | 4 ++--
 pkgs/desktops/gnome-2/platform/ORBit2/default.nix         | 4 ++--
 pkgs/desktops/gnome-2/platform/gconfmm/default.nix        | 4 ++--
 pkgs/desktops/gnome-2/platform/gnome-common/default.nix   | 4 ++--
 pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix      | 4 ++--
 pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix     | 4 ++--
 pkgs/desktops/gnome-2/platform/libIDL/default.nix         | 4 ++--
 pkgs/desktops/gnome-2/platform/libbonobo/default.nix      | 4 ++--
 pkgs/desktops/gnome-2/platform/libbonoboui/default.nix    | 4 ++--
 pkgs/desktops/gnome-2/platform/libgnome/default.nix       | 4 ++--
 pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix | 4 ++--
 pkgs/desktops/gnome-2/platform/libgnomeui/default.nix     | 4 ++--
 pkgs/development/libraries/gtkmm/2.x.nix                  | 4 ++--
 pkgs/development/libraries/json-glib/default.nix          | 4 ++--
 pkgs/development/tools/misc/gob2/default.nix              | 4 ++--
 pkgs/top-level/all-packages.nix                           | 2 +-
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index ab421cee158..c7582fd6c33 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl_gnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+{stdenv, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
 , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
 , withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "dia";
     major = "0"; minor = "97"; patchlevel = "2"; extension = "xz";
     sha256 = "1qgawm7rrf4wd1yc0fp39ywv8gbz4ry1s16k00dzg5w6p67lfqd7";
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 94aaf30a49d..45f29496f62 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
+{ stdenv, fetchurlGnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
   
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "ORBit2";
     major = "2"; minor = "14"; patchlevel = "19";
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
index 8f6075375d6..371382b2607 100644
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, GConf, gtkmm, glibmm }:
+{ stdenv, fetchurlGnome, pkgconfig, GConf, gtkmm, glibmm }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gconfmm";
     major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2";
     sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index 929ed44b752..dba47b6e541 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, fetchurl_gnome, which }:
+{ stdenv, fetchurl, fetchurlGnome, which }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gnome-common";
     major = "2"; minor = "34"; patchlevel = "0";
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 55daa496afc..dd8b7822858 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+{ stdenv, fetchurlGnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
 , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gnome-vfs";
     major = "2"; minor = "24"; patchlevel = "4";
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index 93bb44c54e1..46218c8f601 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
+{ stdenv, fetchurlGnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gtkglextmm";
     major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
     sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index 64f2b19c3e9..73b4fb9cc49 100644
--- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, gettext}:
+{stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, gettext}:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libIDL";
     major = "0"; minor = "8"; patchlevel = "14";
     sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index 2303fb15a6f..d9867f25a4c 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+{ stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
   
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libbonobo";
     major = "2"; minor = "32"; patchlevel = "1";
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 55a4ecec695..00a0c4763a1 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl_gnome, bison, pkgconfig, popt, libxml2, gtk, libtool
+{ stdenv, fetchurlGnome, bison, pkgconfig, popt, libxml2, gtk, libtool
 , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
   
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libbonoboui";
     major = "2"; minor = "24"; patchlevel = "5";
     sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index c190b9578e9..2535398380b 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, popt, zlib, libcanberra
+{ stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra
 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool}:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libgnome";
     major = "2"; minor = "32"; patchlevel = "1";
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index dd6ebbb9174..8a1b7706409 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+{ stdenv, fetchurlGnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
   
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libgnomecanvas";
     major = "2"; minor = "30"; patchlevel = "3";
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index cc8db43ad13..125a4507275 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl_gnome, pkgconfig, libxml2, xlibs, glib, pango
+{ stdenv, fetchurlGnome, pkgconfig, libxml2, xlibs, glib, pango
 , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
 , gnome_vfs, libgnome_keyring, libglade }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
   
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "libgnomeui";
     major = "2"; minor = "24"; patchlevel = "5";
     sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index c7ae2ee5312..0b59cbfc489 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
+{ stdenv, fetchurlGnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gtkmm";
     major = "2"; minor = "24"; patchlevel = "4"; extension = "xz";
     sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 1380cec86ae..255c5f1ccba 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection, dbus }:
+{ stdenv, fetchurlGnome, glib, pkgconfig, gobjectIntrospection, dbus }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "json-glib";
     major = "0";
     minor = "16";
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix
index c86a65f33b6..2f35f96e932 100644
--- a/pkgs/development/tools/misc/gob2/default.nix
+++ b/pkgs/development/tools/misc/gob2/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, bison, flex }:
+{ stdenv, fetchurlGnome, pkgconfig, glib, bison, flex }:
 
 stdenv.mkDerivation rec {
   name = src.pkgname;
 
-  src = fetchurl_gnome {
+  src = fetchurlGnome {
     project = "gob2";
     major = "2"; minor = "0"; patchlevel = "18"; extension = "gz";
     sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f81dc83491b..48d117fcb03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -329,7 +329,7 @@ let
   };
 
   # A wrapper around fetchurl that generates miror://gnome URLs automatically
-  fetchurl_gnome = callPackage ../build-support/fetchurl/gnome.nix { };
+  fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { };
 
   # fetchurlBoot is used for curl and its dependencies in order to
   # prevent a cyclic dependency (curl depends on curl.tar.bz2,

From 2a43a4163a237b963bd68629735b7303e077ec94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 13:49:17 +0200
Subject: [PATCH 1127/2033] Fix indentation

---
 pkgs/tools/networking/dd-agent/default.nix | 56 +++++++++++-----------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 1edfc02bb38..3f06f2d1354 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,39 +2,39 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-    version = "4.2.1";
-    name = "dd-agent-${version}";
+  version = "4.2.1";
+  name = "dd-agent-${version}";
 
-    src = fetchurl {
-      url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
-    };
+  src = fetchurl {
+    url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
+    sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
+  };
 
-    buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
-    propagatedBuildInputs = [ python tornado ];
+  buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
+  propagatedBuildInputs = [ python tornado ];
 
-    postUnpack = "export sourceRoot=$sourceRoot/packaging";
+  postUnpack = "export sourceRoot=$sourceRoot/packaging";
 
-    makeFlags = [ "BUILD=$(out)" ];
+  makeFlags = [ "BUILD=$(out)" ];
 
-    installTargets = [ "install_base" "install_full" ];
+  installTargets = [ "install_base" "install_full" ];
 
-    postInstall = ''
-      mv $out/usr/* $out
-      rmdir $out/usr
-      wrapProgram $out/bin/dd-forwarder \
-        --prefix PYTHONPATH : $PYTHONPATH
-      wrapProgram $out/bin/dd-agent \
-        --prefix PYTHONPATH : $PYTHONPATH
-      wrapProgram $out/bin/dogstatsd \
-        --prefix PYTHONPATH : $PYTHONPATH
-    '';
+  postInstall = ''
+    mv $out/usr/* $out
+    rmdir $out/usr
+    wrapProgram $out/bin/dd-forwarder \
+      --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/bin/dd-agent \
+      --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/bin/dogstatsd \
+      --prefix PYTHONPATH : $PYTHONPATH
+  '';
 
-    meta = {
-      description = "Event collector for the DataDog analysis service";
-      homepage    = http://www.datadoghq.com;
-      license     = stdenv.lib.licenses.bsd3;
-      platforms   = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ];
-    };
+  meta = {
+    description = "Event collector for the DataDog analysis service";
+    homepage    = http://www.datadoghq.com;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48d117fcb03..ea44c4934bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7950,7 +7950,7 @@ let
     inherit (gnome) GConf libglade;
   };
 
-  "dd-agent" = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
+  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
 
   dia = callPackage ../applications/graphics/dia {
     inherit (pkgs.gnome) libart_lgpl libgnomeui;

From c8df88885891bdb6d1f207cf203e4b0af48d5486 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 14:57:20 +0200
Subject: [PATCH 1128/2033] Add a function "fetchzip"

This function downloads and unpacks a file in one fixed-output
derivation. This is primarily useful for dynamically generated zip
files, such as GitHub's /archive URLs, where the unpacked content of
the zip file doesn't change, but the zip file itself may (e.g. due to
minor changes in the compression algorithm, or changes in timestamps).

Fetchzip is implemented by extending fetchurl with a "postFetch" hook
that is executed after the file has been downloaded. This hook can
thus perform arbitrary checks or transformations on the downloaded
file.
---
 pkgs/build-support/fetchurl/builder.sh     |  8 ++++-
 pkgs/build-support/fetchurl/default.nix    | 22 ++++++++++--
 pkgs/build-support/fetchzip/default.nix    | 42 ++++++++++++++++++++++
 pkgs/tools/networking/dd-agent/default.nix |  6 ++--
 pkgs/top-level/all-packages.nix            |  2 ++
 5 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/build-support/fetchzip/default.nix

diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 402fe0cba5b..0c6e16551b4 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -17,12 +17,16 @@ curl="curl \
  $NIX_CURL_FLAGS"
 
 
+downloadedFile="$out"
+if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi
+
+
 tryDownload() {
     local url="$1"
     echo
     header "trying $url"
     success=
-    if $curl --fail "$url" --output "$out"; then
+    if $curl --fail "$url" --output "$downloadedFile"; then
         success=1
     fi
     stopNest
@@ -30,6 +34,8 @@ tryDownload() {
 
 
 finish() {
+    set +o noglob
+    runHook postFetch
     stopNest
     exit 0
 }
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index af4a6700153..eac38a773c1 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -54,6 +54,9 @@ in
   # first element of `urls').
   name ? ""
 
+, # A string to be appended to the name, if the name is derived from `url'.
+  nameSuffix ? ""
+
   # Different ways of specifying the hash.
 , outputHash ? ""
 , outputHashAlgo ? ""
@@ -61,6 +64,17 @@ in
 , sha1 ? ""
 , sha256 ? ""
 
+, recursiveHash ? false
+
+, # Shell code executed after the file has been fetched
+  # succesfully. This can do things like check or transform the file.
+  postFetch ? ""
+
+, # Whether to download to a temporary path rather than $out. Useful
+  # in conjunction with postFetch. The location of the temporary file
+  # is communicated to postFetch via $downloadedFile.
+  downloadToTemp ? false
+
 , # If set, don't download the file, but write a list of all possible
   # URLs (resulting from resolving mirror:// URLs) to $out.
   showURLs ? false
@@ -83,11 +97,11 @@ stdenv.mkDerivation {
   name =
     if showURLs then "urls"
     else if name != "" then name
-    else baseNameOf (toString (builtins.head urls_));
+    else baseNameOf (toString (builtins.head urls_)) + nameSuffix;
 
   builder = ./builder.sh;
 
-  buildInputs = [curl];
+  buildInputs = [ curl ];
 
   urls = urls_;
 
@@ -101,7 +115,9 @@ stdenv.mkDerivation {
   outputHash = if outputHash != "" then outputHash else
       if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
 
-  inherit curlOpts showURLs mirrorsFile impureEnvVars;
+  outputHashMode = if recursiveHash then "recursive" else "flat";
+
+  inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp;
 
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
new file mode 100644
index 00000000000..6b77b6474ef
--- /dev/null
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -0,0 +1,42 @@
+# This function downloads and unpacks a zip file. This is primarily
+# useful for dynamically generated zip files, such as GitHub's
+# /archive URLs, where the unpacked content of the zip file doesn't
+# change, but the zip file itself may (e.g. due to minor changes in
+# the compression algorithm, or changes in timestamps).
+
+{ lib, fetchurl, unzip }:
+
+{ # Optionally move the contents of the unpacked tree up one level.
+  stripRoot ? true
+, ... } @ args:
+
+fetchurl (args // {
+  # Apply a suffix to the name. Otherwise, unpackPhase will get
+  # confused by the .zip extension.
+  nameSuffix = "-unpacked";
+
+  recursiveHash = true;
+
+  downloadToTemp = true;
+
+  postFetch =
+    ''
+      export PATH=${unzip}/bin:$PATH
+      mkdir $out
+      cd $out
+      renamed="$TMPDIR/''${name%-unpacked}"
+      mv "$downloadedFile" "$renamed"
+      unpackFile "$renamed"
+    ''
+    # FIXME: handle zip files that contain a single regular file.
+    + lib.optionalString stripRoot ''
+      shopt -s dotglob
+      if [ "$(ls -d $out/* | wc -l)" != 1 ]; then
+        echo "error: zip file must contain a single directory."
+        exit 1
+      fi
+      fn=$(cd "$out" && echo *)
+      mv $out/$fn/* "$out/"
+      rmdir "$out/$fn"
+    '';
+})
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 3f06f2d1354..ca240f76d84 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, python, pythonPackages, sysstat, unzip, tornado
+{ stdenv, fetchzip, python, pythonPackages, sysstat, unzip, tornado
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "dd-agent-${version}";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-    sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
+    sha256 = "06f9nkvnpfzs2nw75cac2y9wnp2bay4sg94zz0wjm8886rigjjjm";
   };
 
   buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea44c4934bb..f402eb50f48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -338,6 +338,8 @@ let
   # linked curl in the case of stdenv-linux).
   fetchurlBoot = stdenv.fetchurlBoot;
 
+  fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;

From ebd8573046dee7d76fab1da3859e7480b716ee03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 15:26:42 +0200
Subject: [PATCH 1129/2033] Add a utility function "fetchGitHub"

This is a small wrapper around fetchzip. It allows you to say:

  src = fetchGitHub {
    owner = "NixOS";
    repo = "nix";
    rev = "924e19341a5ee488634bc9ce1ea9758ac496afc3"; # or a tag
    sha256 = "1ld1jc26wy0smkg63chvdzsppfw6zy1ykf3mmc50hkx397wcbl09";
  };
---
 pkgs/tools/networking/dd-agent/default.nix |  8 +++++---
 pkgs/tools/text/recode/default.nix         | 11 ++++++-----
 pkgs/top-level/all-packages.nix            |  5 +++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index ca240f76d84..02ad58e7799 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchzip, python, pythonPackages, sysstat, unzip, tornado
+{ stdenv, fetchGitHub, python, pythonPackages, sysstat, unzip, tornado
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "dd-agent-${version}";
 
-  src = fetchzip {
-    url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
+  src = fetchGitHub {
+    owner = "DataDog";
+    repo = "dd-agent";
+    rev = version;
     sha256 = "06f9nkvnpfzs2nw75cac2y9wnp2bay4sg94zz0wjm8886rigjjjm";
   };
 
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index db9ed5d30f3..81b863a35df 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,14 +1,15 @@
 # XXX: this may need -liconv on non-glibc systems.. 
 
-{ stdenv, fetchgit, python, perl, autoconf, automake, libtool, intltool, flex }:
+{ stdenv, fetchGitHub, python, perl, autoconf, automake, libtool, intltool, flex }:
 
 stdenv.mkDerivation rec {
-  name = "recode-3.7-pff85fdbd";
+  name = "recode-3.7-2fd838565";
 
-  src = fetchgit {
-    url = https://github.com/pinard/Recode.git;
+  src = fetchGitHub {
+    owner = "pinard";
+    repo = "Recode";
     rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd";
-    sha256 = "1xhlfmqld6af16l444jli9crj9brym2jihg1n6lkxh2gar68f5l7";
+    sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
   };
 
   buildInputs = [ python perl autoconf automake libtool intltool flex ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f402eb50f48..573810135b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -340,6 +340,11 @@ let
 
   fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
 
+  fetchGitHub = { owner, repo, rev, sha256 }: fetchzip {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.zip";
+    inherit sha256;
+  };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;

From 6aeb59bbe0e5a90017be3350e519ec818d675a0d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 15:49:39 +0200
Subject: [PATCH 1130/2033] Rename fetchGitHub -> fetchFromGitHub

We're not fetching all of GitHub, after all.
---
 pkgs/tools/networking/dd-agent/default.nix | 4 ++--
 pkgs/tools/text/recode/default.nix         | 4 ++--
 pkgs/top-level/all-packages.nix            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 02ad58e7799..1674d01af8f 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchGitHub, python, pythonPackages, sysstat, unzip, tornado
+{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
   version = "4.2.1";
   name = "dd-agent-${version}";
 
-  src = fetchGitHub {
+  src = fetchFromGitHub {
     owner = "DataDog";
     repo = "dd-agent";
     rev = version;
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 81b863a35df..8a15d0b9b56 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,11 +1,11 @@
 # XXX: this may need -liconv on non-glibc systems.. 
 
-{ stdenv, fetchGitHub, python, perl, autoconf, automake, libtool, intltool, flex }:
+{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex }:
 
 stdenv.mkDerivation rec {
   name = "recode-3.7-2fd838565";
 
-  src = fetchGitHub {
+  src = fetchFromGitHub {
     owner = "pinard";
     repo = "Recode";
     rev = "2fd8385658e5a08700e3b916053f6680ff85fdbd";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 573810135b8..de242046893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -340,7 +340,7 @@ let
 
   fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
 
-  fetchGitHub = { owner, repo, rev, sha256 }: fetchzip {
+  fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip {
     url = "https://github.com/${owner}/${repo}/archive/${rev}.zip";
     inherit sha256;
   };

From 141d1a1253a8e5cf1bba17c812f01b1f7be25198 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 15:16:57 +0200
Subject: [PATCH 1131/2033] nixpkgs: Bump screen to 4.2.1

---
 pkgs/tools/misc/screen/default.nix            |  7 ++---
 .../screen/screen-4.0.3-caption-colors.patch  | 25 ----------------
 .../misc/screen/screen-4.0.3-long-term.patch  | 29 -------------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
 delete mode 100644 pkgs/tools/misc/screen/screen-4.0.3-long-term.patch

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 7dd04d25120..6e3f8edbb9c 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchurl, ncurses, pam ? null }:
 
 stdenv.mkDerivation rec {
-  name = "screen-4.0.3";
+  name = "screen-4.2.1";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q";
+    sha256 = "105hp6qdd8rl71p81klmxiz4mlb60kh9r7czayrx40g38x858s2l";
   };
 
-  patches = [ ./screen-4.0.3-caption-colors.patch
-              ./screen-4.0.3-long-term.patch ];
-
   preConfigure = ''
     configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man --with-sys-screenrc=/etc/screenrc"
     sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
diff --git a/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch b/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
deleted file mode 100644
index 14365dc81c1..00000000000
--- a/pkgs/tools/misc/screen/screen-4.0.3-caption-colors.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Source:
-# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-caption-colors.patch
-# modified by hand for nixpkgs
-
-From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
-From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
-Date: Tue, 26 Jan 2010 20:17:26 +0000
-Subject: Accommodate more color changes in the caption.
-
----
-diff --git a/src/screen.c b/src/screen.c
-index b1c3dfb..2cceae0 100644
---- a/screen.c
-+++ b/screen.c
-@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
- #endif
- 
- static char winmsg_buf[MAXSTR];
--#define MAX_WINMSG_REND 16	/* rendition changes */
-+#define MAX_WINMSG_REND 256	/* rendition changes */
- static int winmsg_rend[MAX_WINMSG_REND];
- static int winmsg_rendpos[MAX_WINMSG_REND];
- static int winmsg_numrend;
---
-cgit v0.8.3.4
diff --git a/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch b/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
deleted file mode 100644
index f94f9da8ac4..00000000000
--- a/pkgs/tools/misc/screen/screen-4.0.3-long-term.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# Source:
-# https://projects.archlinux.org/svntogit/packages.git/plain/screen/trunk/screen-4.0.3-long-term.patch
-
-# This fixes long terminal names handling, e.g. TERM=rxvt-unicode-256colors works
-# as expected.
-diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
---- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
-+++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
-@@ -85,7 +85,7 @@
-   struct win *d_other;		/* pointer to other window */
-   int   d_nonblock;		/* -1 don't block if obufmax reached */
- 				/* >0: block after nonblock secs */
--  char  d_termname[20 + 1];	/* $TERM */
-+  char  d_termname[40 + 1];	/* $TERM */
-   char	*d_tentry;		/* buffer for tgetstr */
-   char	d_tcinited;		/* termcap inited flag */
-   int	d_width, d_height;	/* width/height of the screen */
-diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
---- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
-+++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
-@@ -202,7 +202,7 @@
- 	  char preselect[20];
- 	  int esc;		/* his new escape character unless -1 */
- 	  int meta_esc;		/* his new meta esc character unless -1 */
--	  char envterm[20 + 1];	/* terminal type */
-+	  char envterm[40 + 1];	/* terminal type */
- 	  int encoding;		/* encoding of display */
- 	}
-       attach;

From c833d7ce162a3568c4f179e44fcbfe6bc2106348 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 8 May 2014 16:41:38 +0200
Subject: [PATCH 1132/2033] chromium: Allow config.chromium for PPAPI plugins.

This should make it easier to enable proprietary pepper API plugins
though nixpkgs config, so it can be easily installed using something
like:

nix-env -i chromium-stable

With something like:

{ chromium.enablePepperFlash = true; }

In ~/.nixpkgs/config.nix to enable pepper API based Flash and to avoid
the browser wrapper from Firefox entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de242046893..60389bb7263 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7886,6 +7886,8 @@ let
   chromium = lowPrio (callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     pulseSupport = config.pulseaudio or true;
+    enablePepperFlash = config.chromium.enablePepperFlash or false;
+    enablePepperPDF = config.chromium.enablePepperPDF or false;
   });
 
   chromiumBeta = lowPrio (chromium.override { channel = "beta"; });

From 84031981a546cadbd676a4d0cceacb64c68398b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 May 2014 16:35:47 +0200
Subject: [PATCH 1133/2033] dropbox-cli: use stable URL, version 1.6.2

Thanks to @darklajid for reporting and testing on IRC.
---
 .../networking/dropbox-cli/default.nix        | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 6af15211a52..5262c121bb2 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -1,31 +1,30 @@
-{ stdenv, coreutils, fetchurl, python, dropbox }:
-
+{ stdenv, pkgconfig, fetchurl, python, dropbox }:
+let
+  version = "1.6.2";
+in
 stdenv.mkDerivation {
-  # 1.6.0 because it's the only version mentioned in the script
-  name = "dropbox-cli-1.6.0";
+  name = "dropbox-cli-${version}";
 
   src = fetchurl {
-    # Note: dropbox doesn't version this file. Annoying.
-    url = "https://linux.dropbox.com/packages/dropbox.py";
-    sha256 = "0505k0xrhbmsv7g5phxxnz5wbff6m5gdsqyxkhd95wdi9d71c43c";
+    url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
+    sha256 = "1r1kqvnf5a0skby6rr8bmxg128z97fz4gb1n7zlc1vyhqw4k3mb3";
   };
 
-  buildInputs = [ coreutils python ];
+  buildInputs = [ pkgconfig python ];
 
-  phases = "installPhase fixupPhase";
+  phases = "unpackPhase installPhase";
 
   installPhase = ''
-    mkdir -pv $out/bin/
-    cp $src $out/bin/dropbox-cli
-  '';
+    ensureDir "$out/bin/" "$out/share/applications"
+    cp data/dropbox.desktop "$out/share/applications"
+    substitute "dropbox.in" "$out/bin/dropbox" \
+      --replace '@PACKAGE_VERSION@' ${version} \
+      --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \
+      --replace '@IMAGEDATA16@' '"too-lazy-to-fix"' \
+      --replace '@IMAGEDATA64@' '"too-lazy-to-fix"'
 
-  fixupPhase = ''
-    substituteInPlace $out/bin/dropbox-cli \
-      --replace "/usr/bin/python" ${python}/bin/python \
-      --replace "use dropbox help" "use dropbox-cli help" \
-      --replace "~/.dropbox-dist/dropboxd" ${dropbox}/bin/dropbox
-
-    chmod +x $out/bin/dropbox-cli
+    chmod +x "$out/bin/"*
+    patchShebangs "$out/bin"
   '';
 
   meta = {

From d4bd4650d666c44e38f3629ae0371531fddb25fa Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Thu, 8 May 2014 12:01:45 -0400
Subject: [PATCH 1134/2033] Rework the knot-tying code for defining Haskell
 packages.

The existing knot-tying code I felt was a bit incoherent with result, finalReturn, self, refering to different various forms of the "haskellPackages" value and often
different forms in the same place.

This commit instills some object-oriented discipline to the construction of hasekllPackages using a small number of fundamental OO concepts:

* An class is a open recursive function of the form (self : fooBody) where fooBody is a set.
* An instance of a class is the fixed point of the class.
  This value is sometimes refered to as an object and the values in the resulting set are sometimes refered to as methods.
* A class, foo = self : fooBody, can be extended by an extension which is a function bar = (self : super : barBody) where barBody a set of overrides for fooBody.
  The result of a class extension is a new class whose value is self : foo self // bar self (foo self).
  The super parameter gives access to the original methods that barBody may be overriding.

This commit turns the haskell-packages value into a "class".

The knot-tying, a.k.a the object instanitation, is moved into haskells-defaults.  The "finalReturn" is no longer needed and is eliminated from the body of
haskell-packages. All the work done by prefFun is moved to haskell-defaults, so that parameter is eliminated form haskell-packages.  Notice that the old prefFun took
two pameters named "self" and "super", but both parameters got passed the same value "result".  There seems to have been some confusion in the old code.

Inside haskell-defaults, the haskell-packages class is extended twice before instantiation.  The first extension is done using prefFun argument.
The second extension is done the extension argument, which is a renamed version of extraPrefs.

This two stage approach means that extension's super gets access to the post "perfFun" object while previously the extraPrefs only had access to the pre "prefFun"
object.  Also the extension function has access to both the super (post "perfFun") object and to self, the final object.  With extraPrefs, one needed to use the
"finalReturn" of the haskell packages to get access to the final object.  Due to significant changes in semantics, I thought it best to replace extraPrefs with
extension so that people using extraPrefs know to update thier cod.

Lastly, all the Prefs functions have renamed the "self" parameter to "super".  This is because "self" was never actually a self-reference in the object oriented sense
of the word.  For example

    Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };

doesn't actually make sense from an object oriented standpoint because, barring further method overriding, the value of Cabal_1_18_1_3 would be trying to override it's
own value which simply causes a loop exception.  Thankfully all these uses of self were really uses of super:

    Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };

In this notation the overriden Cabal_1_18_1_3 method calls the Cabal_1_18_1_3 of the super-class, which is a well-founded notion.

Below is an example use of using "extension" parameter

{
  packageOverrides = pkgs : {
    testHaskellPackages = pkgs.haskellPackages.override {
      extension = self : super : {
        transformers_0_4_1_0 = self.cabal.mkDerivation (pkgs: {
        pname = "transformers";
        version = "0.4.1.0";
        sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
        meta = {
          description = "Concrete functor and monad transformers";
          license = pkgs.stdenv.lib.licenses.bsd3;
          platforms = pkgs.ghc.meta.platforms;
          maintainers = [ pkgs.stdenv.lib.maintainers.andres ];
        };
       });

      transformers = self.transformers_0_4_1_0;

      lensFamilyCore = super.lensFamilyCore.override { transformers = self.transformers_0_3_0_0; };
     };
   };
 };
}

Notice the use of self in the body of the override of the transformers method which references the newly defined transformers_0_4_1_0 method.

With the previous code, one would have to instead akwardly write

      transformers = super.finalReturn.transformers_0_4_1_0;

or use a rec clause, which would prevent futher overriding of transformers_0_4_1_0.
---
 pkgs/top-level/haskell-defaults.nix | 306 ++++++++++++++--------------
 pkgs/top-level/haskell-packages.nix |  14 +-
 2 files changed, 158 insertions(+), 162 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 01352707dff..8f0f0f7d245 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -16,204 +16,204 @@
   # for a particular GHC version.
 
   ghcHEADPrefs =
-    self : self.haskellPlatformArgs_future self // {
+    super : super.haskellPlatformArgs_future super // {
       haskellPlatform = null;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
+      extensibleExceptions = super.extensibleExceptions_0_1_1_4;
       binary_0_7_1_0 = null;
     };
 
   ghc763Prefs =
-    self : self.haskellPlatformArgs_2013_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2013_2_0_0;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
+    super : super.haskellPlatformArgs_2013_2_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2013_2_0_0;
+      extensibleExceptions = super.extensibleExceptions_0_1_1_4;
     };
 
   ghc742Prefs =
-    self : self.haskellPlatformArgs_2012_4_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_4_0_0;
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+    super : super.haskellPlatformArgs_2012_4_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2012_4_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc741Prefs =
-    self : self.haskellPlatformArgs_2012_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_2_0_0;
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+    super : super.haskellPlatformArgs_2012_2_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2012_2_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc722Prefs =
-    self : self.haskellPlatformArgs_2012_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_2_0_0;
-      deepseq = self.deepseq_1_3_0_2;
-      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabalInstall_1_20_0_1 = self.cabalInstall_1_20_0_1.override { HTTP = self.HTTP_4000_2_14; };
-      cabalInstall = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      prettyShow = self.prettyShow_1_2;
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+    super : super.haskellPlatformArgs_2012_2_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2012_2_0_0;
+      deepseq = super.deepseq_1_3_0_2;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
+      cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { HTTP = super.HTTP_4000_2_14; };
+      cabalInstall = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      binary = super.binary_0_6_0_0;
+      prettyShow = super.prettyShow_1_2;
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc721Prefs = ghc722Prefs;
 
   ghc704Prefs =
-    self : self.haskellPlatformArgs_2011_4_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2011_4_0_0;
-      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+    super : super.haskellPlatformArgs_2011_4_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2011_4_0_0;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
+      monadPar = super.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      prettyShow = super.prettyShow_1_2;
+      binary = super.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc703Prefs =
-    self : self.haskellPlatformArgs_2011_2_0_1 self // {
-      haskellPlatform = self.haskellPlatform_2011_2_0_1;
-      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+    super : super.haskellPlatformArgs_2011_2_0_1 super // {
+      haskellPlatform = super.haskellPlatform_2011_2_0_1;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; zlib = super.zlib_0_5_3_3; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3; };
+      monadPar = super.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      prettyShow = super.prettyShow_1_2;
+      binary = super.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc702Prefs = ghc701Prefs;
 
   ghc701Prefs =
-    self : self.haskellPlatformArgs_2011_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2011_2_0_0;
-      cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = self.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+    super : super.haskellPlatformArgs_2011_2_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2011_2_0_0;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; zlib = super.zlib_0_5_3_3; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3; };
+      monadPar = super.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      prettyShow = super.prettyShow_1_2;
+      binary = super.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc6123Prefs = ghc6122Prefs;
 
   ghc6122Prefs =
-    self : self.haskellPlatformArgs_2010_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2010_2_0_0;
-      mtl1 = self.mtl_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
-      deepseq = self.deepseq_1_1_0_2;
+    super : super.haskellPlatformArgs_2010_2_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2010_2_0_0;
+      mtl1 = super.mtl_1_1_0_2;
+      monadPar = super.monadPar_0_1_0_3;
+      deepseq = super.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      binary = super.binary_0_6_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
+        Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3;
+        mtl = super.mtl_2_1_2;
+        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
       };
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc6121Prefs =
-    self : self.haskellPlatformArgs_2010_1_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2010_1_0_0;
-      mtl1 = self.mtl_1_1_0_2;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      deepseq = self.deepseq_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
+    super : super.haskellPlatformArgs_2010_1_0_0 super // {
+      haskellPlatform = super.haskellPlatform_2010_1_0_0;
+      mtl1 = super.mtl_1_1_0_2;
+      extensibleExceptions = super.extensibleExceptions_0_1_1_0;
+      deepseq = super.deepseq_1_1_0_2;
+      monadPar = super.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3;
-        zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
+      binary = super.binary_0_6_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
+        Cabal = super.Cabal_1_16_0_3;
+        zlib = super.zlib_0_5_3_3;
+        mtl = super.mtl_2_1_2;
+        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
       };
-      quickcheckIo = self.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
+      quickcheckIo = super.quickcheckIo.override {
+        HUnit = super.HUnit_1_2_5_2;
+        QuickCheck = super.QuickCheck2;
       };
-      hspecExpectations = self.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
+      hspecExpectations = super.hspecExpectations.override {
+        HUnit = super.HUnit_1_2_5_2;
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   ghc6104Prefs =
-    self : self.haskellPlatformArgs_2009_2_0_2 self // {
-      haskellPlatform = self.haskellPlatform_2009_2_0_2;
-      mtl = self.mtl_1_1_0_2;
-      mtl1 = self.mtl_1_1_0_2;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      text = self.text_0_11_0_6;
-      deepseq = self.deepseq_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
+    super : super.haskellPlatformArgs_2009_2_0_2 super // {
+      haskellPlatform = super.haskellPlatform_2009_2_0_2;
+      mtl = super.mtl_1_1_0_2;
+      mtl1 = super.mtl_1_1_0_2;
+      extensibleExceptions = super.extensibleExceptions_0_1_1_0;
+      text = super.text_0_11_0_6;
+      deepseq = super.deepseq_1_1_0_2;
+      monadPar = super.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3;
-        zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
+      binary = super.binary_0_6_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
+        Cabal = super.Cabal_1_16_0_3;
+        zlib = super.zlib_0_5_3_3;
+        mtl = super.mtl_2_1_2;
+        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
       };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
+      haskeline = super.haskeline_0_7_1_1;
+      terminfo = super.terminfo_0_3_2_6;
     };
 
   # Abstraction for Haskell packages collections
@@ -221,20 +221,22 @@
    ({ ghcPath
     , ghcBinary ? ghc6101Binary
     , prefFun
-    , extraPrefs ? (x : {})
+    , extension ? (self : super : {})
     , profExplicit ? false, profDefault ? false
     , modifyPrio ? lowPrio
     , extraArgs ? {}
     } :
-      import ./haskell-packages.nix {
-        inherit pkgs newScope modifyPrio;
-        prefFun = self : super : self // prefFun super // extraPrefs super;
-        # prefFun = self : super : self;
-        enableLibraryProfiling =
-          if profExplicit then profDefault
-                          else config.cabal.libraryProfiling or profDefault;
-        ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs);
-      });
+    let haskellPackagesClass = import ./haskell-packages.nix {
+          inherit pkgs newScope modifyPrio;
+          enableLibraryProfiling =
+            if profExplicit then profDefault
+                            else config.cabal.libraryProfiling or profDefault;
+          ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs);
+        };
+        haskellPackagesPrefsClass = self : let super = haskellPackagesClass self; in super // prefFun super;
+        haskellPackagesExtensionClass = self : let super = haskellPackagesPrefsClass self; in super // extension self super;
+        haskellPackages = haskellPackagesExtensionClass haskellPackages;
+    in haskellPackages);
 
   defaultVersionPrioFun =
     profDefault :
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1e7a7297758..edb21dd4303 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -58,7 +58,7 @@
 #
 # For most packages, however, we keep only one version, and use default.nix.
 
-{ pkgs, newScope, ghc, prefFun, modifyPrio ? (x : x)
+{ pkgs, newScope, ghc, modifyPrio ? (x : x)
 , enableLibraryProfiling ? false
 , enableSharedLibraries ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
 , enableSharedExecutables ? pkgs.stdenv.lib.versionOlder "7.7" ghc.version
@@ -70,17 +70,13 @@
 # modifyPrio argument can be set to lowPrio to make all Haskell packages have
 # low priority.
 
-let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x y);
-                 self = (prefFun result) result; in
+self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
 # Indentation deliberately broken at this point to keep the bulk
 # of this file at a low indentation level.
 
 {
-
-  finalReturn = self;
-
-  callPackage = callPackage;
+  inherit callPackage;
 
   # GHC and its wrapper
   #
@@ -3171,6 +3167,4 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
 # End of the main part of the file.
 
-};
-
-in result.finalReturn
+}

From 69188e87c3d8fb90275120e2af973b229a76ae8a Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 20:55:03 +0200
Subject: [PATCH 1135/2033] nixpkgs: Bump lftp to 4.4.16

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

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 434ddbce3e7..7a369744525 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, xz }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.4.15";
+  name = "lftp-4.4.16";
 
   src = fetchurl {
     url = "http://lftp.yar.ru/ftp/${name}.tar.gz";
-    sha256 = "1iw0xvvi9wr7grm6dwbxgm8ms98pg5skj44q477gxzrrff9dvvvp";
+    sha256 = "1wivcynm4pc18vj4x6r2saczk34ds3slagmz3y3b04rzklplf7s4";
   };
 
   patches = [ ./no-gets.patch ];

From e5fcc046321cca432ea1b0175059fe85666c4f2c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 8 May 2014 11:09:47 -0500
Subject: [PATCH 1136/2033] qtcurve version bump 1.8.17 -> 1.8.18

---
 pkgs/misc/themes/qtcurve/default.nix          | 16 ++++++------
 .../qtcurve-1.8.17-install-paths.patch        | 25 -------------------
 .../qtcurve-1.8.18-install-paths.patch        | 24 ++++++++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch
 create mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch

diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index ec5feb27c85..78f2a594569 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, gettext, gtk2, kde_workspace, kdelibs, libpthreadstubs, libXdmcp
-, libxcb, pkgconfig, xlibs }:
+{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools
+, gtk2, kde_workspace, kdelibs # Toolkit dependencies
+, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies
+}:
 
 stdenv.mkDerivation {
-  name = "qtcurve-1.8.17";
+  name = "qtcurve-1.8.18";
   src = fetchurl {
-    url = "https://github.com/QtCurve/qtcurve/archive/1.8.17.tar.gz";
-    sha256 = "1ixgill9lfhmcfsk5csk6ww3ljzbvb4x48m73apprv949xgr4wyn";
+    url = "https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz";
+    sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5";
   };
 
   buildInputs = [
@@ -18,10 +20,10 @@ stdenv.mkDerivation {
     libXdmcp
     libxcb
     pkgconfig
-    xlibs.xcbutilimage
+    xlibs.libxshmfence
   ];
 
-  patches = [ ./qtcurve-1.8.17-install-paths.patch ];
+  patches = [ ./qtcurve-1.8.18-install-paths.patch ];
 
   cmakeFlags = ''
     -DENABLE_QT5=OFF
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch
deleted file mode 100644
index bb8fd185c77..00000000000
--- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.17-install-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur qtcurve-1.8.17-a/CMakeLists.txt qtcurve-1.8.17-b/CMakeLists.txt
---- qtcurve-1.8.17-a/CMakeLists.txt	2013-10-18 07:35:20.000000000 -0500
-+++ qtcurve-1.8.17-b/CMakeLists.txt	2013-12-30 10:58:43.303808246 -0600
-@@ -135,8 +135,9 @@
- if(ENABLE_GTK2)
-   find_package(PkgConfig REQUIRED)
-   pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
-+  set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}")
-   if(GTK2_THEME_PREFIX)
--    set(GTK2_PREIX "${GTK2_THEME_PREFIX}")
-+    set(GTK2_PREFIX "${GTK2_THEME_PREFIX}")
-   elseif(NOT GTK2_PREFIX)
-     set(GTK2_PREFIX "${CMAKE_INSTALL_PREFIX}")
-   endif()
-diff -ur qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt
---- qtcurve-1.8.17-a/gtk2/style/CMakeLists.txt	2013-10-18 07:35:20.000000000 -0500
-+++ qtcurve-1.8.17-b/gtk2/style/CMakeLists.txt	2013-12-30 11:23:41.370548328 -0600
-@@ -88,6 +88,6 @@
-   m ${QTC_X11_LIBRARIES} qtcurve-utils)
- 
- install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
--  ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)
-+  lib/gtk-2.0/${GTK2_BIN_VERSION}/engines)
- install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals
-   DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
new file mode 100644
index 00000000000..345ac25bbbb
--- /dev/null
+++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2be588..4cb9115 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,6 +116,7 @@ if(ENABLE_GTK2)
+   find_package(PkgConfig REQUIRED)
+   unset(__pkg_config_checked_GTK2 CACHE)
+   pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
++  set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}")
+   if(GTK2_THEME_PREFIX)
+     set(GTK2_PREFIX "${GTK2_THEME_PREFIX}")
+   elseif(NOT GTK2_PREFIX)
+diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt
+index 01e8891..a2c767e 100644
+--- a/gtk2/style/CMakeLists.txt
++++ b/gtk2/style/CMakeLists.txt
+@@ -88,6 +88,6 @@ target_link_libraries(qtcurve-gtk2
+   qtcurve-utils qtcurve-cairo m)
+ 
+ install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
+-  ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)
++  lib/gtk-2.0/${GTK2_BIN_VERSION}/engines)
+ install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals
+   DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)

From 119414ddcded64aa6db0cec87a517fc9fe64716b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 8 May 2014 12:54:36 -0500
Subject: [PATCH 1137/2033] qtcurve: add toolbar alpha patch

---
 pkgs/misc/themes/qtcurve/default.nix          |  5 ++-
 .../qtcurve-1.8.18-toolbar-alpha.patch        | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch

diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
index 78f2a594569..e63f6846002 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation {
     xlibs.libxshmfence
   ];
 
-  patches = [ ./qtcurve-1.8.18-install-paths.patch ];
+  patches = [
+    ./qtcurve-1.8.18-install-paths.patch
+    ./qtcurve-1.8.18-toolbar-alpha.patch
+  ];
 
   cmakeFlags = ''
     -DENABLE_QT5=OFF
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch
new file mode 100644
index 00000000000..85400e6f0f6
--- /dev/null
+++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch
@@ -0,0 +1,34 @@
+diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp
+index d7659f5..aede882 100644
+--- a/qt4/style/qtcurve.cpp
++++ b/qt4/style/qtcurve.cpp
+@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
+     if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
+         (menu && SHADE_NONE != opts.shadeMenubars)) {
+         p->save();
++#if 0
++        // Revert for now
++        // This is necessary for correct opacity on the menubar but may
++        // break transparent gradient.
+         p->setCompositionMode(QPainter::CompositionMode_Source);
++#endif
+         QRect rx(r);
+         QColor col(menu && (option->state & State_Enabled ||
+                             SHADE_NONE != opts.shadeMenubars) ?
+diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp
+index c43b8a3..135eddc 100644
+--- a/qt5/style/qtcurve.cpp
++++ b/qt5/style/qtcurve.cpp
+@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
+     if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
+         (menu && opts.shadeMenubars != SHADE_NONE)) {
+         p->save();
++#if 0
++        // Revert for now
++        // This is necessary for correct opacity on the menubar but may
++        // break transparent gradient.
+         p->setCompositionMode(QPainter::CompositionMode_Source);
++#endif
+         QRect rx(r);
+         QColor col(menu && (option->state & State_Enabled ||
+                             opts.shadeMenubars != SHADE_NONE) ?

From 3a9917bf1856a85dbee3332dd32f2884a8320cc1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 8 May 2014 14:54:51 -0500
Subject: [PATCH 1138/2033] zotero: version bump 4.0.19 -> 4.0.20 (close #2581)

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

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 4afd250a549..5b311956da9 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -3,7 +3,7 @@
 assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
 
 let
-  version = "4.0.19";
+  version = "4.0.20";
   arch = if stdenv.system == "x86_64-linux"
            then "linux-x86_64"
            else "linux-i686";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2";
     sha256 = if stdenv.system == "x86_64-linux"
-               then "0xihvk7ms1vvzmxvpw8hs15pl1vvmf3zd72nwyaqhg469kwcz9s1"
-               else "1z4q8nzl90snb03ywk0cp64nv3cgasj9fvbcw2d4bgl2zlgwzpy9";
+               then "0d7813k3h60fpxabdwiw83g5zfy9knxc9irgxxz60z31vd14zi0x"
+               else "0nj4mj22bkn2nwbkfs40kg4br6h6gcf718v9lfnvs13cyhx0wapc";
   };
 
   # Strip the bundled xulrunner

From db98ce61d20051fbccd2b7c7220a02076c2447cf Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Thu, 8 May 2014 16:34:19 -0400
Subject: [PATCH 1139/2033] httpie: Update -> 0.8.0

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/tools/networking/httpie/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index cdbb52fe739..a31511beeab 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "httpie-0.4.1";
+  name = "httpie-0.8.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz";
-    sha256 = "1qd03vd4657vdvkfhbd2wnlz4xh6hyw75m7wmfhgac5m2028y3cv";
+    sha256 = "16f3scm794plxbyw7a5b4541hb2psa85kfi98g83785i2qwz98ag";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pygments requests ];
+  propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
 
   doCheck = false;
 
   meta = {
     description = "A command line HTTP client whose goal is to make CLI human-friendly";
     homepage = http://httpie.org/;
-    license = "BSD";
-    maintainers = [ stdenv.lib.maintainers.antono ];
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ antono relrod ];
   };
 }

From ae6a65e811630f58c5a43b339157b400b4d52c37 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 20:50:47 +0200
Subject: [PATCH 1140/2033] nixpkgs: Bump filezilla to 3.8.0 (close #2578)

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index a8b4cfaf926..e88cf5b3f73 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK28, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite }:
 
-let version = "3.7.3"; in
+let version = "3.8.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0hn043jjb7qh040dgyhffp9jrrmca1xxbc998vyqyg83lrq2j09b";
+    sha256 = "02635sh88zvmqhqs7yx982dmfa1qd0rhk4z1fqvgh5pr2ac1r74d";
   };
 
   configureFlags = [

From 08aba1d669b034611142547a24e86a55926cb165 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 13:58:21 +0200
Subject: [PATCH 1141/2033] nixpkgs: Bump spice-gtk to 0.24 (close #2571)

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

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index adb1fe90558..f649401c5ca 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
 , openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
-, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir
+, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
 , gtk3, enableGTK3 ? false }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-gtk-0.22";
+  name = "spice-gtk-0.24";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "0fpsn6qhy9a701lmd4yym6qz6zhpp8xp6vw42al0b4592pcybs85";
+    sha256 = "1l8y1pbaqyzb6w8w8xa097dvj4zxhksn85pif1b9847r8l451zkf";
   };
 
   buildInputs = [
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
   ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
 
-  nativeBuildInputs = [ pkgconfig intltool libtool autoconf automake ];
+  nativeBuildInputs = [ pkgconfig intltool libtool libsoup autoconf automake ];
 
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 

From 07a5187063487d734d8bb2777bfa64621e61e0e8 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 11:18:02 +0200
Subject: [PATCH 1142/2033] taskwarrior: bump to 2.3.0 (close #2567)

vcunat fixed the evaluation
---
 pkgs/applications/misc/taskwarrior/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index dc1fce1d64c..998c34e5610 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchurl, cmake, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "057fh50qp9bd5s08rw51iybpamn55v5nhn3s6ds89g76hp95vqir";
+    sha256 = "0wxcfq0n96vmcbwrlk2x377k8cc5k4i64ca6p02y74g6168ji6ib";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake libuuid ];
 
   meta = {
     description = "GTD (getting things done) implementation";

From 0008a4b6c467977469b9b3bdec15fcc580204145 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Wed, 7 May 2014 15:30:59 +0200
Subject: [PATCH 1143/2033] sylpheed: 3.2 (2012) -> 3.4.1 (2014) (close #2558)

vcunat fixed eval and tested it runs.
---
 .../networking/mailreaders/sylpheed/default.nix           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index 31e65a857df..70d01f5df3e 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@@ -10,12 +10,14 @@ with stdenv.lib;
 assert sslSupport -> openssl != null;
 assert gpgSupport -> gpgme != null;
 
+let version = "3.4.1"; in
+
 stdenv.mkDerivation {
-  name = "sylpheed-3.2.0";
+  name = "sylpheed-${version}";
 
   src = fetchurl {
-    url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2;
-    sha256 = "1cdjwn1f8rgcxzfxj7j7qvacmaw4zfhnip81q4n5lj5d6rj7rssa";
+    url = "http://sylpheed.sraoss.jp/sylpheed/v3.4/sylpheed-${version}.tar.bz2";
+    sha256 = "11wpifvn8a0p4dqmvi7r61imqkgm6rjjp3h057c344vny37livbx";
   };
 
   buildInputs =

From 08834b061ccc96659e5201c87db8dcfb1714f445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 May 2014 23:49:01 +0200
Subject: [PATCH 1144/2033] pidgin-sipe: fix build by updating

Also add platforms (linux).
---
 .../pidgin-plugins/sipe/default.nix                   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 9c787867e5a..b387ed350af 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, pidgin, intltool, libxml2 }:
 
-let version = "1.12.0"; in
+let version = "1.18.1"; in
 
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
-    sha256 = "12ki6n360v2ja961fzw4mwpgb8jdp9k21y5mbiab151867c862r6";
+    sha256 = "18ch7jpi7ki7xlpahi88xrnmnhc6dcq4hafm0z6d5nfjfp8ldal5";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SIPE plugin for Pidgin IM";
     homepage = http://sipe.sourceforge.net/;
-    license = "GPLv2";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 
   postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";

From 1bd8ced9c0eb4002ffa2afb3e4a60c5bccfc28ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 20:20:12 +0200
Subject: [PATCH 1145/2033] Don't enable the NVIDIA driver by default because
 it's unfree

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 804de8b25d8..23f9c3a4ca0 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -159,7 +159,7 @@ sub pciCheck {
     # Assume that all NVIDIA cards are supported by the NVIDIA driver.
     # There may be exceptions (e.g. old cards).
     # FIXME: do we want to enable an unfree driver here?
-    $videoDriver = "nvidia" if $vendor eq "0x10de" && $class =~ /^0x03/;
+    #$videoDriver = "nvidia" if $vendor eq "0x10de" && $class =~ /^0x03/;
 }
 
 foreach my $path (glob "/sys/bus/pci/devices/*") {

From 91afe9eb8d8f86db6b97b4aee5b77ab486657726 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 21:00:06 +0200
Subject: [PATCH 1146/2033] nixos-generate-config: Use stable device paths
 (e.g. /dev/disk/by-uuid/X)

---
 .../installer/tools/nixos-generate-config.pl  | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 23f9c3a4ca0..e8b725d6ea4 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -1,9 +1,11 @@
 #! @perl@
 
+use Cwd 'abs_path';
 use File::Spec;
 use File::Path;
 use File::Basename;
 use File::Slurp;
+use File::stat;
 
 
 sub uniq {
@@ -236,6 +238,24 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
 }
 
 
+# For a device name like /dev/sda1, find a more stable path like
+# /dev/disk/by-uuid/X or /dev/disk/by-label/Y.
+sub findStableDevPath {
+    my ($dev) = @_;
+    return $dev if substr($dev, 0, 1) ne "/";
+    return $dev unless -e $dev;
+
+    my $st = stat($dev) or return $dev;
+
+    foreach my $dev2 (glob("/dev/disk/by-uuid/*"), glob("/dev/mapper/*"), glob("/dev/disk/by-label/*")) {
+        my $st2 = stat($dev2) or next;
+        return $dev2 if $st->rdev == $st2->rdev;
+    }
+
+    return $dev;
+}
+
+
 # Generate the swapDevices option from the currently activated swap
 # devices.
 my @swaps = read_file("/proc/swaps");
@@ -243,7 +263,9 @@ shift @swaps;
 my @swapDevices;
 foreach my $swap (@swaps) {
     $swap =~ /^(\S+)\s/;
-    push @swapDevices, "{ device = \"$1\"; }";
+    next unless -e $1;
+    my $dev = findStableDevPath $1;
+    push @swapDevices, "{ device = \"$dev\"; }";
 }
 
 
@@ -315,7 +337,7 @@ EOF
     # Emit the filesystem.
     $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
-    { device = \"$device\";
+    { device = \"${\(findStableDevPath $device)}\";
       fsType = \"$fsType\";
 EOF
 
@@ -344,7 +366,7 @@ sub toNixExpr {
 
 sub multiLineList {
     my $indent = shift;
-    return "[ ]" if !@_;
+    return " [ ]" if !@_;
     $res = "\n${indent}[ ";
     my $first = 1;
     foreach my $s (@_) {

From dc78ae327c5e20c5e24214c956be219fc8d213c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 21:01:34 +0200
Subject: [PATCH 1147/2033] nixos-generate-config: Don't include
 /var/setuid-wrappers

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index e8b725d6ea4..d54539edfa3 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -291,6 +291,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
+    next if $mountPoint eq "/var/setuid-wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;

From 4b7c606589be8440c982dc19bc9497b13e82abce Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 21:02:40 +0200
Subject: [PATCH 1148/2033] nixos-generator-config: Don't emit a double / in
 bind mounts

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index d54539edfa3..ab058efc709 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -305,9 +305,11 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     # Maybe this is a bind-mount of a filesystem we saw earlier?
     if (defined $fsByDev{$fields[2]}) {
         my $path = $fields[3]; $path = "" if $path eq "/";
+        my $base = $fsByDev{$fields[2]};
+        $base = "" if $base eq "/";
         $fileSystems .= <<EOF;
   fileSystems.\"$mountPoint\" =
-    { device = \"$fsByDev{$fields[2]}$path\";
+    { device = \"$base$path\";
       fsType = \"none\";
       options = \"bind\";
     };

From e0e656ef46851f40b581153facc7bca506143656 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 21:04:58 +0200
Subject: [PATCH 1149/2033] nixos-install: Don't pass --show-trace by default

---
 nixos/modules/installer/tools/nixos-install.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 359ac43c7d0..b9dffb2bf17 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -18,6 +18,9 @@ while [ "$#" -gt 0 ]; do
             absolute_path=$(readlink -m $given_path)
             extraBuildFlags+=("$i" "/mnt$absolute_path")
             ;;
+        --show-trace)
+            extraBuildFlags+=("$i")
+            ;;
         --help)
             exec man nixos-install
             exit 1
@@ -198,7 +201,7 @@ mount --bind $(readlink -f $(nix-instantiate --find-file nixpkgs)) $mountPoint/m
 echo "building the system configuration..."
 NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixpkgs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
-    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system --show-trace
+    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
 
 
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents

From 171d43ba4f51384670c8af0e5188c023f5bb0d94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 23:20:36 +0200
Subject: [PATCH 1150/2033] nixos-install: Run in a private mount namespace

This ensures that all mounts are automatically cleaned up.
---
 .../modules/installer/tools/nixos-install.sh  | 63 +++++++------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index b9dffb2bf17..7f3cfa2ca7d 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -7,6 +7,17 @@
 #   * nix-env -p /nix/var/nix/profiles/system -i <nix-expr for the configuration>
 #   * install the boot loader
 
+# Re-exec ourselves in a private mount namespace so that our bind
+# mounts get cleaned up automatically.
+if [ "$(id -u)" = 0 ]; then
+    if [ -z "$NIXOS_INSTALL_REEXEC" ]; then
+        export NIXOS_INSTALL_REEXEC=1
+        exec unshare --mount -- "$0" "$@"
+    else
+        mount --make-rprivate /
+    fi
+fi
+
 # Parse the command line for the -I flag
 extraBuildFlags=()
 
@@ -59,45 +70,19 @@ if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
 fi
 
 
-
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
 # accounts in /etc/passwd.  But we do need the target's /etc/nixos.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixpkgs $mountPoint/etc /etc/nixos
-mount --make-private / # systemd makes / shared, which is annoying
-mount --bind / $mountPoint/mnt
-mount --bind /nix $mountPoint/mnt/nix
-mount --bind /nix/store $mountPoint/mnt/nix/store
-mount --bind /dev $mountPoint/dev
-mount --bind /dev/shm $mountPoint/dev/shm
-mount --bind /proc $mountPoint/proc
-mount --bind /sys $mountPoint/sys
-mount --bind /sys/firmware/efi/efivars $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
-mount --bind $mountPoint/etc/nixos $mountPoint/mnt2
-mount --bind /etc $mountPoint/etc
-mount --bind $mountPoint/mnt2 $mountPoint/etc/nixos
-
-cleanup() {
-    set +e
-    mountpoint -q $mountPoint/etc/nixos && umount $mountPoint/etc/nixos
-    mountpoint -q $mountPoint/etc && umount $mountPoint/etc
-    umount $mountPoint/mnt2
-    umount $mountPoint/mnt-nixpkgs
-    umount $mountPoint/sys/firmware/efi/efivars &>/dev/null || true
-    umount $mountPoint/sys
-    umount $mountPoint/proc
-    umount $mountPoint/dev/shm
-    umount $mountPoint/dev
-    umount $mountPoint/mnt/nix/store
-    umount $mountPoint/mnt/nix
-    umount $mountPoint/mnt
-    rmdir $mountPoint/mnt $mountPoint/mnt2 $mountPoint/mnt-nixpkgs
-}
-
-trap "cleanup" EXIT
-
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc
 mkdir -m 01777 -p $mountPoint/tmp
+mkdir -m 0755 -p $mountPoint/tmp/root
 mkdir -m 0755 -p $mountPoint/var
+mount --rbind /dev $mountPoint/dev
+mount --rbind /proc $mountPoint/proc
+mount --rbind /sys $mountPoint/sys
+mount --rbind / $mountPoint/tmp/root
+mount --bind /etc $mountPoint/etc
+mount --bind $mountPoint/tmp/root/$mountPoint/etc/nixos $mountPoint/etc/nixos
 
 
 # Create the necessary Nix directories on the target device, if they
@@ -177,8 +162,8 @@ fi
 
 
 # Make the build below copy paths from the CD if possible.  Note that
-# /mnt in the chroot is the root of the CD.
-export NIX_OTHER_STORES=/mnt/nix:$NIX_OTHER_STORES
+# /tmp/root in the chroot is the root of the CD.
+export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES
 
 p=@nix@/libexec/nix/substituters
 export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl
@@ -193,15 +178,15 @@ done
 
 
 # Get the absolute path to the NixOS/Nixpkgs sources.
-mount --bind $(readlink -f $(nix-instantiate --find-file nixpkgs)) $mountPoint/mnt-nixpkgs
+nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))"
 
 
 # Build the specified Nix expression in the target store and install
 # it into the system configuration profile.
 echo "building the system configuration..."
-NIX_PATH="nixpkgs=/mnt-nixpkgs:nixos=/mnt-nixpkgs/nixos:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
+NIX_PATH="nixpkgs=/tmp/root/$nixpkgs:nixos-config=$NIXOS_CONFIG" NIXOS_CONFIG= \
     chroot $mountPoint @nix@/bin/nix-env \
-    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixos>' --set -A system
+    "${extraBuildFlags[@]}" -p /nix/var/nix/profiles/system -f '<nixpkgs/nixos>' --set -A system
 
 
 # Copy the NixOS/Nixpkgs sources to the target as the initial contents

From 22f102cbdc7e88ecb41b5d0a8720c8117e161aca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 23:22:21 +0200
Subject: [PATCH 1151/2033] nixos-install: Assume the build user group is
 "nixbld"

The build user group is always "nixbld", so no need to detect it.
---
 nixos/modules/installer/tools/nixos-install.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 7f3cfa2ca7d..3fd8bdbd69e 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -97,12 +97,7 @@ mkdir -m 0755 -p \
     $mountPoint/nix/var/log/nix/drvs
 
 mkdir -m 1775 -p $mountPoint/nix/store
-build_users_group=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};')
-if test -n "$build_users_group"; then
-    chown root:"$build_users_group" $mountPoint/nix/store
-else
-    chown root $mountPoint/nix/store
-fi
+chown root:nixbld $mountPoint/nix/store
 
 
 # Get the store paths to copy from the references graph.
@@ -130,9 +125,7 @@ unset NIX_REMOTE
 
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
-if test -n "$build_users_group"; then
-    echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
-fi
+echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf # FIXME: remove in Nix 1.8
 binary_caches=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')
 if test -n "$binary_caches"; then
     echo "binary-caches = $binary_caches" >> $mountPoint/tmp/nix.conf

From 8919d736a034c85eb3e38bc3d9baedcb00356e4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 May 2014 23:40:17 +0200
Subject: [PATCH 1152/2033] nixos-install: Don't copy the bootstrap Nix if it's
 already there

This makes re-running nixos-install a bit faster.
---
 .../modules/installer/tools/nixos-install.sh  | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 3fd8bdbd69e..1b481d4c65f 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -100,17 +100,8 @@ mkdir -m 1775 -p $mountPoint/nix/store
 chown root:nixbld $mountPoint/nix/store
 
 
-# Get the store paths to copy from the references graph.
-storePaths=$(@perl@/bin/perl @pathsFromGraph@ @nixClosure@)
-
-
-# Copy Nix to the Nix store on the target device.
-echo "copying Nix to $mountPoint...."
-for i in $storePaths; do
-    echo "  $i"
-    chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
-    rsync -a $i $mountPoint/nix/store/
-done
+# There is no daemon in the chroot.
+unset NIX_REMOTE
 
 
 # We don't have locale-archive in the chroot, so clear $LANG.
@@ -119,10 +110,6 @@ export LC_ALL=
 export LC_TIME=
 
 
-# There is no daemon in the chroot
-unset NIX_REMOTE
-
-
 # Create a temporary Nix config file that causes the nixbld users to
 # be used.
 echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf # FIXME: remove in Nix 1.8
@@ -133,12 +120,22 @@ fi
 export NIX_CONF_DIR=/tmp
 
 
-# Register the paths in the Nix closure as valid.  This is necessary
-# to prevent them from being deleted the first time we install
-# something.  (I.e., Nix will see that, e.g., the glibc path is not
-# valid, delete it to get it out of the way, but as a result nothing
-# will work anymore.)
-chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
+# Copy Nix to the Nix store on the target device, unless it's already there.
+if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /dev/null; then
+    echo "copying Nix to $mountPoint...."
+    for i in $(@perl@/bin/perl @pathsFromGraph@ @nixClosure@); do
+        echo "  $i"
+        chattr -R -i $mountPoint/$i 2> /dev/null || true # clear immutable bit
+        rsync -a $i $mountPoint/nix/store/
+    done
+
+    # Register the paths in the Nix closure as valid.  This is necessary
+    # to prevent them from being deleted the first time we install
+    # something.  (I.e., Nix will see that, e.g., the glibc path is not
+    # valid, delete it to get it out of the way, but as a result nothing
+    # will work anymore.)
+    chroot $mountPoint @nix@/bin/nix-store --register-validity < @nixClosure@
+fi
 
 
 # Create the required /bin/sh symlink; otherwise lots of things

From 4fc151b5a3c749833554379a96bd87676f6c5740 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 00:04:48 +0200
Subject: [PATCH 1153/2033] nixos-install: Ask the user to set a root password

This removes the need to have an initially empty root password.
---
 nixos/doc/manual/installation.xml             | 15 +++++++++++++-
 nixos/doc/manual/man-nixos-install.xml        |  3 +++
 nixos/modules/config/users-groups.nix         |  8 ++++----
 .../modules/installer/tools/nixos-install.sh  | 20 +++++++++++++++++--
 nixos/modules/virtualisation/amazon-image.nix |  5 -----
 nixos/modules/virtualisation/containers.nix   |  1 -
 .../virtualisation/google-compute-image.nix   |  5 -----
 .../modules/virtualisation/nixos-container.pl |  1 -
 .../virtualisation/virtualbox-image.nix       |  5 -----
 9 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml
index dcbb20b19ee..fa4b89e6ba8 100644
--- a/nixos/doc/manual/installation.xml
+++ b/nixos/doc/manual/installation.xml
@@ -209,7 +209,20 @@ $ nixos-install</screen>
     a network issue while downloading binaries from the NixOS binary
     cache), you can just re-run <command>nixos-install</command>.
     Otherwise, fix your <filename>configuration.nix</filename> and
-    then re-run <command>nixos-install</command>.</para></listitem>
+    then re-run <command>nixos-install</command>.</para>
+
+    <para>As the last step, <command>nixos-install</command> will ask
+    you to set the password for the <literal>root</literal> user, e.g.
+
+<screen>
+setting root password...
+Enter new UNIX password: ***
+Retype new UNIX password: ***
+</screen>
+
+    </para>
+
+  </listitem>
 
   <listitem><para>If everything went well:
 
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index d5157859857..0ebee7d23f9 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -42,6 +42,9 @@ the following steps:
   and generates a GRUB configuration file that boots into the NixOS
   configuration just installed.</para></listitem>
 
+  <listitem><para>It prompts you for a password for the root
+  account.</para></listitem>
+
 </itemizedlist>
 
 </para>
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 2c37dccd6ce..e7afb518157 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -374,8 +374,8 @@ in {
 
     security.initialRootPassword = mkOption {
       type = types.str;
-      default = "";
-      example = "!";
+      default = "!";
+      example = "";
       description = ''
         The (hashed) password for the root account set on initial
         installation. The empty string denotes that root can login
@@ -383,9 +383,9 @@ in {
         as SSH, or indirectly via <command>su</command> or
         <command>sudo</command>). The string <literal>!</literal>
         prevents root from logging in using a password.
-        Note, setting this option sets
+        Note that setting this option sets
         <literal>users.extraUsers.root.hashedPassword</literal>.
-        Note, if <literal>users.mutableUsers</literal> is false
+        Also, if <literal>users.mutableUsers</literal> is false
         you cannot change the root password manually, so in that case
         the name of this option is a bit misleading, since it will define
         the root password beyond the user initialisation phase.
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 1b481d4c65f..e708521c93f 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -73,16 +73,18 @@ fi
 # Mount some stuff in the target root directory.  We bind-mount /etc
 # into the chroot because we need networking and the nixbld user
 # accounts in /etc/passwd.  But we do need the target's /etc/nixos.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run
 mkdir -m 01777 -p $mountPoint/tmp
 mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var
+mkdir -m 0755 -p $mountPoint/var/setuid-wrappers
 mount --rbind /dev $mountPoint/dev
 mount --rbind /proc $mountPoint/proc
 mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/tmp/root
 mount --bind /etc $mountPoint/etc
 mount --bind $mountPoint/tmp/root/$mountPoint/etc/nixos $mountPoint/etc/nixos
+mount -t tmpfs -o "mode=0755" none $mountPoint/run
+mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 
 
 # Create the necessary Nix directories on the target device, if they
@@ -215,3 +217,17 @@ touch $mountPoint/etc/NIXOS
 echo "finalising the installation..."
 NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
     /nix/var/nix/profiles/system/bin/switch-to-configuration boot
+
+
+# Run the activation script.
+chroot $mountPoint /nix/var/nix/profiles/system/activate
+
+
+# Ask the user to set a root password.
+if [ -t 0 ] ; then
+    echo "setting root password..."
+    chroot $mountPoint passwd
+fi
+
+
+echo "installation finished!"
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 18b18dd4b23..8ce89c09b24 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -160,9 +160,4 @@ with lib;
   environment.systemPackages = [ pkgs.cryptsetup ];
 
   boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
-
-  # Prevent logging in as root without a password.  This doesn't really matter,
-  # since the only PAM services that allow logging in with a null
-  # password are local ones that are inaccessible on EC2 machines.
-  security.initialRootPassword = mkDefault "!";
 }
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index a0238277f5d..d0d04d9a1e5 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -117,7 +117,6 @@ in
                   modules =
                     let extraConfig =
                       { boot.isContainer = true;
-                        security.initialRootPassword = mkDefault "!";
                         networking.hostName = mkDefault name;
                         networking.useDHCP = false;
                       };
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 34b8b0e9c1c..d55b7420243 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -114,11 +114,6 @@ in
   # Always include cryptsetup so that NixOps can use it.
   environment.systemPackages = [ pkgs.cryptsetup ];
 
-  # Prevent logging in as root without a password.  This doesn't really matter,
-  # since the only PAM services that allow logging in with a null
-  # password are local ones that are inaccessible on Google Compute machines.
-  security.initialRootPassword = mkDefault "!";
-
   # Configure default metadata hostnames
   networking.extraHosts = ''
     169.254.169.254 metadata.google.internal metadata
diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 8a1e6f927b3..c60662d8d39 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -64,7 +64,6 @@ sub writeNixOSConfig {
 with lib;
 
 { boot.isContainer = true;
-  security.initialRootPassword = mkDefault "!";
   networking.hostName = mkDefault "$containerName";
   networking.useDHCP = false;
   $extraConfig
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 3247881784e..594b3e93ffe 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -107,9 +107,4 @@ with lib;
   boot.loader.grub.device = "/dev/sda";
 
   services.virtualbox.enable = true;
-
-  # Prevent logging in as root without a password.  For NixOps, we
-  # don't need this because the user can login via SSH, and for the
-  # demo images, there is a demo user account that can sudo to root.
-  security.initialRootPassword = mkDefault "!";
 }

From 3ef8d6ad5c33a0bc9d0350155c19cac757ca16dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 00:25:05 +0200
Subject: [PATCH 1154/2033] nixos-install: Add operation --chroot

"nixos-install --chroot" runs a command (by default a login shell) in
a chroot inside the NixOS installation in /mnt. This might useful for
poking around a new installation.
---
 nixos/doc/manual/development.xml              | 14 +++--
 .../modules/installer/tools/nixos-install.sh  | 55 ++++++++++++-------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index a93b4b163bd..6873710205d 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -729,18 +729,22 @@ $ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
 
 <title>Testing the installer</title>
 
-<para>Building, burning, and
-booting from an installation CD is rather
+<para>Building, burning, and booting from an installation CD is rather
 tedious, so here is a quick way to see if the installer works
 properly:
 
 <screen>
 $ nix-build -A config.system.build.nixos-install
-$ dd if=/dev/zero of=diskimage seek=2G count=0 bs=1
-$ yes | mke2fs -j diskimage
-$ mount -o loop diskimage /mnt
+$ mount -t tmpfs none /mnt
 $ ./result/bin/nixos-install</screen>
 
+To start a login shell in the new NixOS installation in
+<filename>/mnt</filename>:
+
+<screen>
+$ ./result/bin/nixos-install --chroot
+</screen>
+
 </para>
 
 </section>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index e708521c93f..0ada85a26e2 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -20,6 +20,7 @@ fi
 
 # Parse the command line for the -I flag
 extraBuildFlags=()
+chrootCommand=(/run/current-system/sw/bin/bash)
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -32,6 +33,11 @@ while [ "$#" -gt 0 ]; do
         --show-trace)
             extraBuildFlags+=("$i")
             ;;
+        --chroot)
+            runChroot=1
+            chrootCommand=("$@")
+            break
+            ;;
         --help)
             exec man nixos-install
             exit 1
@@ -50,10 +56,6 @@ if test -z "$mountPoint"; then
     mountPoint=/mnt
 fi
 
-if test -z "$NIXOS_CONFIG"; then
-    NIXOS_CONFIG=/etc/nixos/configuration.nix
-fi
-
 if ! test -e "$mountPoint"; then
     echo "mount point $mountPoint doesn't exist"
     exit 1
@@ -64,15 +66,8 @@ if ! grep -F -q " $mountPoint " /proc/mounts; then
     exit 1
 fi
 
-if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
-    echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
-    exit 1
-fi
 
-
-# Mount some stuff in the target root directory.  We bind-mount /etc
-# into the chroot because we need networking and the nixbld user
-# accounts in /etc/passwd.  But we do need the target's /etc/nixos.
+# Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run
 mkdir -m 01777 -p $mountPoint/tmp
 mkdir -m 0755 -p $mountPoint/tmp/root
@@ -81,12 +76,38 @@ mount --rbind /dev $mountPoint/dev
 mount --rbind /proc $mountPoint/proc
 mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/tmp/root
-mount --bind /etc $mountPoint/etc
-mount --bind $mountPoint/tmp/root/$mountPoint/etc/nixos $mountPoint/etc/nixos
 mount -t tmpfs -o "mode=0755" none $mountPoint/run
 mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 
 
+if [ -n "$runChroot" ]; then
+    if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
+        echo "$0: installation not finished; cannot chroot into installation directory"
+        exit 1
+    fi
+    ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
+    exec chroot $mountPoint "${chrootCommand[@]}"
+fi
+
+
+# Bind-mount /etc into the chroot because we need networking and the
+# nixbld user accounts in /etc/passwd.  But we do need the target's
+# /etc/nixos.
+mount --bind /etc $mountPoint/etc
+mount --bind $mountPoint/tmp/root/$mountPoint/etc/nixos $mountPoint/etc/nixos
+
+
+# Get the path of the NixOS configuration file.
+if test -z "$NIXOS_CONFIG"; then
+    NIXOS_CONFIG=/etc/nixos/configuration.nix
+fi
+
+if ! test -e "$mountPoint/$NIXOS_CONFIG"; then
+    echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist"
+    exit 1
+fi
+
+
 # Create the necessary Nix directories on the target device, if they
 # don't already exist.
 mkdir -m 0755 -p \
@@ -147,12 +168,6 @@ mkdir -m 0755 -p $mountPoint/bin
 ln -sf @shell@ $mountPoint/bin/sh
 
 
-if test -n "$NIXOS_PREPARE_CHROOT_ONLY"; then
-    echo "User requested only to prepare chroot. Exiting."
-    exit 0
-fi
-
-
 # Make the build below copy paths from the CD if possible.  Note that
 # /tmp/root in the chroot is the root of the CD.
 export NIX_OTHER_STORES=/tmp/root/nix:$NIX_OTHER_STORES

From 61bdad677595ab45d69880a190ee01aba9b555cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 00:49:18 +0200
Subject: [PATCH 1155/2033] nixos-install: Don't bind-mount all of /etc

We only need a copy of /etc/resolv.conf for networking, and
/etc/{passwd,group} for building.
---
 .../modules/installer/tools/nixos-install.sh  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 0ada85a26e2..4c19f62ef03 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -68,7 +68,7 @@ fi
 
 
 # Mount some stuff in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run
+mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
 mkdir -m 01777 -p $mountPoint/tmp
 mkdir -m 0755 -p $mountPoint/tmp/root
 mkdir -m 0755 -p $mountPoint/var/setuid-wrappers
@@ -78,6 +78,9 @@ mount --rbind /sys $mountPoint/sys
 mount --rbind / $mountPoint/tmp/root
 mount -t tmpfs -o "mode=0755" none $mountPoint/run
 mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
+rm -rf $mountPoint/var/run
+ln -s /run $mountPoint/var/run
+cp -f /etc/resolv.conf $mountPoint/etc/resolv.conf
 
 
 if [ -n "$runChroot" ]; then
@@ -90,13 +93,6 @@ if [ -n "$runChroot" ]; then
 fi
 
 
-# Bind-mount /etc into the chroot because we need networking and the
-# nixbld user accounts in /etc/passwd.  But we do need the target's
-# /etc/nixos.
-mount --bind /etc $mountPoint/etc
-mount --bind $mountPoint/tmp/root/$mountPoint/etc/nixos $mountPoint/etc/nixos
-
-
 # Get the path of the NixOS configuration file.
 if test -z "$NIXOS_CONFIG"; then
     NIXOS_CONFIG=/etc/nixos/configuration.nix
@@ -142,6 +138,10 @@ if test -n "$binary_caches"; then
 fi
 export NIX_CONF_DIR=/tmp
 
+touch $mountPoint/etc/passwd $mountPoint/etc/group
+mount --bind -o ro /etc/passwd $mountPoint/etc/passwd
+mount --bind -o ro /etc/group $mountPoint/etc/group
+
 
 # Copy Nix to the Nix store on the target device, unless it's already there.
 if ! NIX_DB_DIR=$mountPoint/nix/var/nix/db nix-store --check-validity @nix@ 2> /dev/null; then
@@ -211,10 +211,8 @@ mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
 ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
 
 
-# We're done building/downloading, so we don't need the /etc bind
-# mount anymore.  In fact, below we want to modify the target's /etc.
-umount $mountPoint/etc/nixos
-umount $mountPoint/etc
+# Get rid of the /etc bind mounts.
+umount $mountPoint/etc/passwd $mountPoint/etc/group
 
 
 # Grub needs an mtab.

From c06786759cafbd27c4d2b79d54f08c99b7a4910b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 00:50:05 +0200
Subject: [PATCH 1156/2033] /var/run -> /run

---
 nixos/modules/system/activation/activation-script.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 41fe7d309a5..fe5935c2ffa 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -109,12 +109,12 @@ in
       ''
         # Various log/runtime directories.
 
-        touch /var/run/utmp # must exist
-        chgrp ${toString config.ids.gids.utmp} /var/run/utmp
-        chmod 664 /var/run/utmp
+        touch /run/utmp # must exist
+        chgrp ${toString config.ids.gids.utmp} /run/utmp
+        chmod 664 /run/utmp
 
-        mkdir -m 0755 -p /var/run/nix/current-load # for distributed builds
-        mkdir -m 0700 -p /var/run/nix/remote-stores
+        mkdir -m 0755 -p /run/nix/current-load # for distributed builds
+        mkdir -m 0700 -p /run/nix/remote-stores
 
         mkdir -m 0755 -p /var/log
 

From a9f85aa4e909da5ca17cb6564a5267d068d8764f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 3 May 2014 04:36:20 +0200
Subject: [PATCH 1157/2033] cantata: create version 1.3.4

---
 pkgs/applications/audio/cantata/default.nix | 103 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |   2 +
 2 files changed, 105 insertions(+)
 create mode 100644 pkgs/applications/audio/cantata/default.nix

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
new file mode 100644
index 00000000000..f3cba4ca819
--- /dev/null
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -0,0 +1,103 @@
+{ stdenv, fetchurl, cmake
+, withQt4 ? true, qt4
+, withQt5 ? false, qt5
+
+# I'm unable to make KDE work here, crashes at runtime so I simply
+# make Qt4 the default until someone who wants KDE can figure it out.
+, withKDE4 ? false, kde4
+
+# Cantata doesn't build with cdparanoia enabled so we disable that
+# default for now until I (or someone else) figure it out.
+, withCdda ? false, cdparanoia
+, withCddb ? false, libcddb
+, withLame ? false, lame
+, withMusicbrainz ? false, libmusicbrainz5
+
+, withTaglib ? true, taglib, taglib_extras
+, withReplaygain ? true, ffmpeg, speex, mpg123
+, withMtp ? true, libmtp
+, withOnlineServices ? true
+, withDevices ? true, udisks2
+, withDynamic ? true
+, withHttpServer ? true
+, withStreams ? true
+}:
+
+# One and only one front-end.
+assert withQt5 -> withQt4 == false && withKDE4 == false;
+assert withQt4 -> withQt5 == false && withKDE4 == false;
+assert withKDE4 -> withQt4 == false && withQt5 == false;
+assert withQt4 || withQt5 || withKDE4;
+
+# Inter-dependencies.
+assert withCddb -> withCdda && withTaglib;
+assert withCdda -> withCddb && withMusicbrainz;
+assert withLame -> withCdda && withTaglib;
+assert withMtp -> withTaglib;
+assert withMusicbrainz -> withCdda && withTaglib;
+assert withOnlineServices -> withTaglib;
+assert withReplaygain -> withTaglib;
+
+let
+  version = "1.3.4";
+  pname = "cantata";
+  fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
+  fstats = x: map (fstat x);
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    inherit name;
+    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WTYtaXk3c1IzNVU";
+    sha256 = "0ris41v44nwd68f3zis9n9lyyc089dyhlxp37rrzflanrc6glpwq";
+  };
+
+  buildInputs =
+    [ cmake ]
+    ++ stdenv.lib.optional withQt4 qt4
+    ++ stdenv.lib.optional withQt5 qt5
+    ++ stdenv.lib.optional withKDE4 kde4.kdelibs
+    ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
+    ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
+    ++ stdenv.lib.optional withCdda cdparanoia
+    ++ stdenv.lib.optional withCddb libcddb
+    ++ stdenv.lib.optional withLame lame
+    ++ stdenv.lib.optional withMtp libmtp
+    ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
+    ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
+
+  unpackPhase = "tar -xvf $src";
+
+  # Qt4 is implicit when KDE is switched off.
+  cmakeFlags = stdenv.lib.flatten [
+    (fstats withKDE4 [ "KDE" "KWALLET" ])
+    (fstat withQt5 "QT5")
+    (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
+    (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
+    (fstat withCdda "CDPARANOIA")
+    (fstat withCddb "CDDB")
+    (fstat withLame "LAME")
+    (fstat withMtp "MTP")
+    (fstat withMusicbrainz "MUSICBRAINZ")
+    (fstat withOnlineServices "ONLINE_SERVICES")
+    (fstat withDynamic "DYNAMIC")
+    (fstat withDevices "DEVICES_SUPPORT")
+    (fstat withHttpServer "HTTP_SERVER")
+    (fstat withStreams "STREAMS")
+    "-DENABLE_HTTPS_SUPPORT=ON"
+    "-DENABLE_UDISKS2=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://code.google.com/p/cantata/";
+    description = "A graphical client for MPD.";
+    license = licenses.gpl3;
+
+    # Technically Cantata can run on Windows so if someone wants to
+    # bother figuring that one out, be my guest.
+    platforms = platforms.linux;
+    maintainers = [ maintainers.fuuzetsu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60389bb7263..ec3e2209758 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -682,6 +682,8 @@ let
 
   cabextract = callPackage ../tools/archivers/cabextract { };
 
+  cantata = callPackage ../applications/audio/cantata { };
+
   can-utils = callPackage ../os-specific/linux/can-utils { };
 
   ccid = callPackage ../tools/security/ccid { };

From 46ccebe413b96f7b0b1d33240c4b86f5e5dd97a6 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Thu, 8 May 2014 22:01:36 -0400
Subject: [PATCH 1158/2033] Allow for later binding in ghcPrefs

Now that both self and super are available to prefFun, we can use self, where appropriate to access late bound versions of most
packages.

When extensions are not used, there is no difference between self and super.
---
 pkgs/top-level/haskell-defaults.nix | 255 ++++++++++++++--------------
 pkgs/top-level/haskell-packages.nix |  10 --
 2 files changed, 128 insertions(+), 137 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 8f0f0f7d245..b5a74e255ce 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -16,204 +16,205 @@
   # for a particular GHC version.
 
   ghcHEADPrefs =
-    super : super.haskellPlatformArgs_future super // {
+    self : super : super.haskellPlatformArgs_future self // {
       haskellPlatform = null;
-      extensibleExceptions = super.extensibleExceptions_0_1_1_4;
+      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
       binary_0_7_1_0 = null;
     };
 
   ghc763Prefs =
-    super : super.haskellPlatformArgs_2013_2_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2013_2_0_0;
-      extensibleExceptions = super.extensibleExceptions_0_1_1_4;
+    self : super : super.haskellPlatformArgs_2013_2_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2013_2_0_0;
+      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
     };
 
   ghc742Prefs =
-    super : super.haskellPlatformArgs_2012_4_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2012_4_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+    self : super : super.haskellPlatformArgs_2012_4_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2012_4_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc741Prefs =
-    super : super.haskellPlatformArgs_2012_2_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2012_2_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+    self : super : super.haskellPlatformArgs_2012_2_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2012_2_0_0;
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc722Prefs =
-    super : super.haskellPlatformArgs_2012_2_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2012_2_0_0;
-      deepseq = super.deepseq_1_3_0_2;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
-      cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { HTTP = super.HTTP_4000_2_14; };
-      cabalInstall = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      binary = super.binary_0_6_0_0;
-      prettyShow = super.prettyShow_1_2;
+    self : super : super.haskellPlatformArgs_2012_2_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2012_2_0_0;
+      deepseq = self.deepseq_1_3_0_2;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
+      cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { HTTP = self.HTTP_4000_2_14; };
+      cabalInstall = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      binary = self.binary_0_6_0_0;
+      prettyShow = self.prettyShow_1_2;
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc721Prefs = ghc722Prefs;
 
   ghc704Prefs =
-    super : super.haskellPlatformArgs_2011_4_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2011_4_0_0;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; };
-      monadPar = super.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      prettyShow = super.prettyShow_1_2;
-      binary = super.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+    self : super : super.haskellPlatformArgs_2011_4_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2011_4_0_0;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
+      monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      prettyShow = self.prettyShow_1_2;
+      binary = self.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc703Prefs =
-    super : super.haskellPlatformArgs_2011_2_0_1 super // {
-      haskellPlatform = super.haskellPlatform_2011_2_0_1;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; zlib = super.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3; };
-      monadPar = super.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      prettyShow = super.prettyShow_1_2;
-      binary = super.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+    self : super : super.haskellPlatformArgs_2011_2_0_1 self // {
+      haskellPlatform = self.haskellPlatform_2011_2_0_1;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
+      monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      prettyShow = self.prettyShow_1_2;
+      binary = self.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc702Prefs = ghc701Prefs;
 
   ghc701Prefs =
-    super : super.haskellPlatformArgs_2011_2_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2011_2_0_0;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = super.Cabal_1_14_0; zlib = super.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3; };
-      monadPar = super.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      prettyShow = super.prettyShow_1_2;
-      binary = super.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = super.deepseq_1_3_0_2; };
+    self : super : super.haskellPlatformArgs_2011_2_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2011_2_0_0;
+      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
+      monadPar = self.monadPar_0_1_0_3;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      prettyShow = self.prettyShow_1_2;
+      binary = self.binary_0_6_0_0;
+      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc6123Prefs = ghc6122Prefs;
 
   ghc6122Prefs =
-    super : super.haskellPlatformArgs_2010_2_0_0 super // {
+    self : super : super.haskellPlatformArgs_2010_2_0_0 self // {
       haskellPlatform = super.haskellPlatform_2010_2_0_0;
-      mtl1 = super.mtl_1_1_0_2;
-      monadPar = super.monadPar_0_1_0_3;
-      deepseq = super.deepseq_1_1_0_2;
+      mtl1 = self.mtl_1_1_0_2;
+      monadPar = self.monadPar_0_1_0_3;
+      deepseq = self.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      binary = super.binary_0_6_0_0;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      binary = self.binary_0_6_0_0;
       cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = super.Cabal_1_16_0_3; zlib = super.zlib_0_5_3_3;
-        mtl = super.mtl_2_1_2;
-        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
+        Cabal = self.Cabal_1_16_0_3; 
+        zlib = self.zlib_0_5_3_3;
+        mtl = self.mtl_2_1_2;
+        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
       };
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc6121Prefs =
-    super : super.haskellPlatformArgs_2010_1_0_0 super // {
-      haskellPlatform = super.haskellPlatform_2010_1_0_0;
-      mtl1 = super.mtl_1_1_0_2;
-      extensibleExceptions = super.extensibleExceptions_0_1_1_0;
-      deepseq = super.deepseq_1_1_0_2;
-      monadPar = super.monadPar_0_1_0_3;
+    self : super : super.haskellPlatformArgs_2010_1_0_0 self // {
+      haskellPlatform = self.haskellPlatform_2010_1_0_0;
+      mtl1 = self.mtl_1_1_0_2;
+      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
+      deepseq = self.deepseq_1_1_0_2;
+      monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = super.Cabal_1_16_0_3; hackageDb = super.hackageDb.override { Cabal = super.Cabal_1_16_0_3; }; };
-      binary = super.binary_0_6_0_0;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
+      binary = self.binary_0_6_0_0;
       cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = super.Cabal_1_16_0_3;
-        zlib = super.zlib_0_5_3_3;
-        mtl = super.mtl_2_1_2;
-        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
+        Cabal = self.Cabal_1_16_0_3;
+        zlib = self.zlib_0_5_3_3;
+        mtl = self.mtl_2_1_2;
+        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
       };
       quickcheckIo = super.quickcheckIo.override {
-        HUnit = super.HUnit_1_2_5_2;
-        QuickCheck = super.QuickCheck2;
+        HUnit = self.HUnit_1_2_5_2;
+        QuickCheck = self.QuickCheck2;
       };
       hspecExpectations = super.hspecExpectations.override {
-        HUnit = super.HUnit_1_2_5_2;
+        HUnit = self.HUnit_1_2_5_2;
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   ghc6104Prefs =
-    super : super.haskellPlatformArgs_2009_2_0_2 super // {
-      haskellPlatform = super.haskellPlatform_2009_2_0_2;
-      mtl = super.mtl_1_1_0_2;
-      mtl1 = super.mtl_1_1_0_2;
-      extensibleExceptions = super.extensibleExceptions_0_1_1_0;
-      text = super.text_0_11_0_6;
-      deepseq = super.deepseq_1_1_0_2;
-      monadPar = super.monadPar_0_1_0_3;
+    self : super : super.haskellPlatformArgs_2009_2_0_2 self // {
+      haskellPlatform = self.haskellPlatform_2009_2_0_2;
+      mtl = self.mtl1;
+      mtl1 = self.mtl_1_1_0_2;
+      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
+      text = self.text_0_11_0_6;
+      deepseq = self.deepseq_1_1_0_2;
+      monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = super.disableTest super.Cabal_1_14_0; };
-      binary = super.binary_0_6_0_0;
+      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
+      binary = self.binary_0_6_0_0;
       cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = super.Cabal_1_16_0_3;
-        zlib = super.zlib_0_5_3_3;
-        mtl = super.mtl_2_1_2;
-        HTTP = super.HTTP_4000_1_1.override { mtl = super.mtl_2_1_2; };
+        Cabal = self.Cabal_1_16_0_3;
+        zlib = self.zlib_0_5_3_3;
+        mtl = self.mtl_2_1_2;
+        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
       };
-      haskeline = super.haskeline_0_7_1_1;
-      terminfo = super.terminfo_0_3_2_6;
+      haskeline = self.haskeline_0_7_1_1;
+      terminfo = self.terminfo_0_3_2_6;
     };
 
   # Abstraction for Haskell packages collections
@@ -233,7 +234,7 @@
                             else config.cabal.libraryProfiling or profDefault;
           ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs);
         };
-        haskellPackagesPrefsClass = self : let super = haskellPackagesClass self; in super // prefFun super;
+        haskellPackagesPrefsClass = self : let super = haskellPackagesClass self; in super // prefFun self super;
         haskellPackagesExtensionClass = self : let super = haskellPackagesPrefsClass self; in super // extension self super;
         haskellPackages = haskellPackagesExtensionClass haskellPackages;
     in haskellPackages);
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index edb21dd4303..95e7fb2f1d9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -136,7 +136,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   # NOTE: 2013.2.0.0 is the current default.
 
   haskellPlatformArgs_future = self : {
-    inherit (self) cabal ghc;
     async        = self.async_2_0_1_5;
     attoparsec   = self.attoparsec_0_11_3_0;
     caseInsensitive = self.caseInsensitive_1_2_0_0;
@@ -177,7 +176,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   };
 
   haskellPlatformArgs_2013_2_0_0 = self : {
-    inherit (self) cabal ghc;
     async        = self.async_2_0_1_4;
     attoparsec   = self.attoparsec_0_10_4_0;
     caseInsensitive = self.caseInsensitive_1_0_0_1;
@@ -222,7 +220,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2013_2_0_0 self);
 
   haskellPlatformArgs_2012_4_0_0 = self : {
-    inherit (self) cabal ghc;
     async        = self.async_2_0_1_3;
     cgi          = self.cgi_3001_1_7_4;
     fgl          = self.fgl_5_4_2_4;
@@ -261,7 +258,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2012_4_0_0 self);
 
   haskellPlatformArgs_2012_2_0_0 = self : {
-    inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_1_2_1;
@@ -296,7 +292,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2012_2_0_0 self);
 
   haskellPlatformArgs_2011_4_0_0 = self : {
-    inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;
     fgl          = self.fgl_5_4_2_4;
     GLUT         = self.GLUT_2_1_2_1;
@@ -331,7 +326,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2011_4_0_0 self);
 
   haskellPlatformArgs_2011_2_0_1 = self : {
-    inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;
     fgl          = self.fgl_5_4_2_3;
     GLUT         = self.GLUT_2_1_2_1;
@@ -366,7 +360,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2011_2_0_1 self);
 
   haskellPlatformArgs_2011_2_0_0 = self : {
-    inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_4;
     fgl          = self.fgl_5_4_2_3;
     GLUT         = self.GLUT_2_1_2_1;
@@ -401,7 +394,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2011_2_0_0 self);
 
   haskellPlatformArgs_2010_2_0_0 = self : {
-    inherit (self) cabal ghc;
     cgi          = self.cgi_3001_1_7_3;
     fgl          = self.fgl_5_4_2_3;
     GLUT         = self.GLUT_2_1_2_1;
@@ -433,7 +425,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2010_2_0_0 self);
 
   haskellPlatformArgs_2010_1_0_0 = self : {
-    inherit (self) cabal ghc;
     haskellSrc   = self.haskellSrc_1_0_1_3;
     html         = self.html_1_0_1_2;
     fgl          = self.fgl_5_4_2_2;
@@ -463,7 +454,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
       (self.haskellPlatformArgs_2010_1_0_0 self);
 
   haskellPlatformArgs_2009_2_0_2 = self : {
-    inherit (self) cabal ghc;
     time         = self.time_1_1_2_4;
     haddock      = self.haddock_2_4_2;
     cgi          = self.cgi_3001_1_7_1;

From 1c4fd9b25d50c3ef99438d0a14222281d4d931a3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 13:19:02 +0200
Subject: [PATCH 1159/2033] nixos-install: Run in a separate UTS namespace

This prevents the activation script from clobbering our hostname.
---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 4c19f62ef03..3311e4c8e9a 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -12,7 +12,7 @@
 if [ "$(id -u)" = 0 ]; then
     if [ -z "$NIXOS_INSTALL_REEXEC" ]; then
         export NIXOS_INSTALL_REEXEC=1
-        exec unshare --mount -- "$0" "$@"
+        exec unshare --mount --uts -- "$0" "$@"
     else
         mount --make-rprivate /
     fi

From 253bbb8e2bdae01403443d50acf5e98061750c43 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 13:24:42 +0200
Subject: [PATCH 1160/2033] nixos-container: Ensure umask 022

Fixes #2585.
---
 nixos/modules/virtualisation/nixos-container.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index c60662d8d39..718630fe8b9 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -9,6 +9,9 @@ use Getopt::Long qw(:config gnu_getopt);
 
 my $socat = '@socat@/bin/socat';
 
+# Ensure a consistent umask.
+umask 0022;
+
 # Parse the command line.
 
 sub showHelp {

From 2d5462e29cf271e07f8cf734992815ade5e92540 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Tue, 6 May 2014 12:58:07 +0800
Subject: [PATCH 1161/2033] jquery-ui: Update to 1.10.4

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

diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix
index 24217657b10..9a485906e53 100644
--- a/pkgs/development/libraries/javascript/jquery-ui/default.nix
+++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "jquery-ui-1.10.3";
+  name = "jquery-ui-1.10.4";
 
   src = fetchurl {
     url = "http://jqueryui.com/resources/download/${name}.custom.zip";
-    sha256 = "1nqh3fmjgy73cbwb5sj775242i6jhz3f5b9fxgrkq00dfvkls779";
+    sha256 = "04kp27ln74j4k2jacs54264x2bsdjx1dxlw5zlpd889jqv2m6dfc";
   };
 
   buildInputs = [ unzip ];

From 3db83835a83d1399ca82f0bba1c41e7756f649d5 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Thu, 8 May 2014 12:11:58 +0200
Subject: [PATCH 1162/2033] nixpkgs: Bump libvirt to 1.2.4

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 587fbfe48d3..c69d787b086 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -4,14 +4,14 @@
 , dnsmasq, libnl
 }:
 
-let version = "1.2.2"; in
+let version = "1.2.4"; in
 
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "1hxvgh2fp2fk3wva7fnbz2pk6g5217wrmf9xwikiphn50zipg0x4";
+    sha256 = "0xg8m7x4a3dqrg2b9pqcikaghdp6jyl07gkp2z8grsmsnbvcafp4";
   };
 
   buildInputs = [

From 265c489391f0b87a962b226e00d10eac8387b48f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Mon, 5 May 2014 08:55:34 -0400
Subject: [PATCH 1163/2033] rsyncd: default read/write permissions should be
 nobody:nogroup

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

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 0b3343b6731..6a5c574f638 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];
 
+  configureFlags = "--with-nobody-group=nogroup";
+
   meta = {
     homepage = http://samba.anu.edu.au/rsync/;
     description = "A fast incremental file transfer utility";

From fcd7d741e290ec84d796bc49bd93332db8682df1 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 5 May 2014 01:01:16 -0500
Subject: [PATCH 1164/2033] Make geoip buildable on any Unix

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

diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 1abcb7c6943..2b4c291f7f5 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
     description = "Geolocation API";
     maintainers = [ stdenv.lib.maintainers.raskin ];
     license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 8b0d0e36010682ffcd211f1516ff6d879f84d68e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 26 Apr 2014 10:20:37 +0200
Subject: [PATCH 1165/2033] Add potrace-1.11, a tool for tracing bitmaps

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

diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
new file mode 100644
index 00000000000..81af6db9a4c
--- /dev/null
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zlib }:
+
+let version = "1.11"; in
+
+stdenv.mkDerivation {
+  name = "potrace-${version}";
+
+  src = fetchurl {
+    url = "http://potrace.sourceforge.net/download/potrace-${version}.tar.gz";
+    sha256 = "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as";
+  };
+
+  buildInputs = [ zlib ];
+
+  meta = {
+    homepage = http://potrace.sourceforge.net/;
+    description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pSub ];
+    license = "GPL2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01d120deb81..c885d096dd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8997,6 +8997,8 @@ let
     inherit (xorg) libXpm;
   };
 
+  potrace = callPackage ../applications/graphics/potrace {};
+
   pqiv = callPackage ../applications/graphics/pqiv { };
 
   qiv = callPackage ../applications/graphics/qiv { };

From 3e3e9daafe4b2affebe50bdb7889dbb3cb83b300 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Fri, 9 May 2014 15:45:21 +0200
Subject: [PATCH 1166/2033] Update Node.js to 0.10.28

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

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 44a7890e21f..4b79a500b1f 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -6,7 +6,7 @@ let
     ln -sv /usr/sbin/dtrace $out/bin
   '';
 
-  version = "0.10.26";
+  version = "0.10.28";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1ahx9cf2irp8injh826sk417wd528awi4l1mh7vxg7k8yak4wppg";
+    sha256 = "043pc6sb3y2b0aiakmmjvzvafgki7wly0id0v1p8y80g3r2cdpdb";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps);

From ea36f3b86892263d172fa3d0d0d4ae00d82a0edc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 May 2014 15:50:40 +0200
Subject: [PATCH 1167/2033] fetchFromGitHub: Use .tar.gz instead of .zip

Also clean up the name attribute of fetchzip derivations a bit.
---
 lib/strings.nix                         | 10 ++++++++++
 pkgs/build-support/fetchurl/default.nix |  5 +----
 pkgs/build-support/fetchzip/default.nix | 24 +++++++++++++-----------
 pkgs/top-level/all-packages.nix         |  3 ++-
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index cd748f02cc6..a903aa9fbc4 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -160,6 +160,16 @@ rec {
       else
         s;
 
+  removeSuffix = suf: s:
+    let
+      sufLen = stringLength suf;
+      sLen = stringLength s;
+    in
+      if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
+        substring 0 (sLen - sufLen) s
+      else
+        s;
+
   # Return true iff string v1 denotes a version older than v2.
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index eac38a773c1..f34640901bb 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -54,9 +54,6 @@ in
   # first element of `urls').
   name ? ""
 
-, # A string to be appended to the name, if the name is derived from `url'.
-  nameSuffix ? ""
-
   # Different ways of specifying the hash.
 , outputHash ? ""
 , outputHashAlgo ? ""
@@ -97,7 +94,7 @@ stdenv.mkDerivation {
   name =
     if showURLs then "urls"
     else if name != "" then name
-    else baseNameOf (toString (builtins.head urls_)) + nameSuffix;
+    else baseNameOf (toString (builtins.head urls_));
 
   builder = ./builder.sh;
 
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 6b77b6474ef..7c6e16a0589 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -1,19 +1,21 @@
-# This function downloads and unpacks a zip file. This is primarily
-# useful for dynamically generated zip files, such as GitHub's
-# /archive URLs, where the unpacked content of the zip file doesn't
-# change, but the zip file itself may (e.g. due to minor changes in
-# the compression algorithm, or changes in timestamps).
+# This function downloads and unpacks an archive file, such as a zip
+# or tar file. This is primarily useful for dynamically generated
+# archives, such as GitHub's /archive URLs, where the unpacked content
+# of the zip file doesn't change, but the zip file itself may
+# (e.g. due to minor changes in the compression algorithm, or changes
+# in timestamps).
 
 { lib, fetchurl, unzip }:
 
 { # Optionally move the contents of the unpacked tree up one level.
   stripRoot ? true
+, url
 , ... } @ args:
 
-fetchurl (args // {
-  # Apply a suffix to the name. Otherwise, unpackPhase will get
-  # confused by the .zip extension.
-  nameSuffix = "-unpacked";
+fetchurl ({
+  # Remove the extension, because otherwise unpackPhase will get
+  # confused. FIXME: fix unpackPhase.
+  name = args.name or lib.removeSuffix ".zip" (lib.removeSuffix ".tar.gz" (baseNameOf url));
 
   recursiveHash = true;
 
@@ -24,7 +26,7 @@ fetchurl (args // {
       export PATH=${unzip}/bin:$PATH
       mkdir $out
       cd $out
-      renamed="$TMPDIR/''${name%-unpacked}"
+      renamed="$TMPDIR/${baseNameOf url}"
       mv "$downloadedFile" "$renamed"
       unpackFile "$renamed"
     ''
@@ -39,4 +41,4 @@ fetchurl (args // {
       mv $out/$fn/* "$out/"
       rmdir "$out/$fn"
     '';
-})
+} // args)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60389bb7263..5fa278924b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -341,7 +341,8 @@ let
   fetchzip = import ../build-support/fetchzip { inherit lib fetchurl unzip; };
 
   fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip {
-    url = "https://github.com/${owner}/${repo}/archive/${rev}.zip";
+    name = "${repo}-${rev}-src";
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
     inherit sha256;
   };
 

From b87b6870f81c66b34c6eab1857f642b66b68c114 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 9 May 2014 14:32:12 +0200
Subject: [PATCH 1168/2033] When auto-formatting ext devices, use the -F flag
 to make it work with unpartioned disks

---
 nixos/modules/tasks/filesystems.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 954d0b0781f..d350bc1b5d0 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -187,6 +187,8 @@ in
           let
             mountPoint' = escapeSystemdPath fs.mountPoint;
             device' = escapeSystemdPath fs.device;
+            # -F needed to allow bare block device without partitions
+            mkfsOpts = optional ((builtins.substring 0 3 fs.fsType) == "ext") "-F";
           in nameValuePair "mkfs-${device'}"
           { description = "Initialisation of Filesystem ${fs.device}";
             wantedBy = [ "${mountPoint'}.mount" ];
@@ -201,7 +203,7 @@ in
                 type=$(blkid -p -s TYPE -o value "${fs.device}" || true)
                 if [ -z "$type" ]; then
                   echo "creating ${fs.fsType} filesystem on ${fs.device}..."
-                  mkfs.${fs.fsType} "${fs.device}"
+                  mkfs.${fs.fsType} ${concatStringsSep " " mkfsOpts} "${fs.device}"
                 fi
               '';
             unitConfig.RequiresMountsFor = [ "${dirOf fs.device}" ];

From 349d87d47c8ab24fb2defbafbdba5f0a57ff8971 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 9 May 2014 16:50:36 +0200
Subject: [PATCH 1169/2033] cccc: New package 3.1.4

---
 .../tools/analysis/cccc/cccc.patch            | 24 ++++++++++++++
 .../tools/analysis/cccc/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/cccc/cccc.patch
 create mode 100644 pkgs/development/tools/analysis/cccc/default.nix

diff --git a/pkgs/development/tools/analysis/cccc/cccc.patch b/pkgs/development/tools/analysis/cccc/cccc.patch
new file mode 100644
index 00000000000..9454e3b18ad
--- /dev/null
+++ b/pkgs/development/tools/analysis/cccc/cccc.patch
@@ -0,0 +1,24 @@
+diff --git a/cccc/cccc_tbl.cc b/cccc/cccc_tbl.cc
+index df98e2b..59f2572 100644
+--- a/cccc/cccc_tbl.cc
++++ b/cccc/cccc_tbl.cc
+@@ -96,7 +96,7 @@ bool CCCC_Table<T>::remove(T* old_item_ptr)
+   typename map_t::iterator value_iterator=map_t::find(old_item_ptr->key());
+   if(value_iterator!=map_t::end())
+     {
+-      erase(value_iterator);
++      map_t::erase(value_iterator);
+       retval=true;
+     }
+   return retval;
+diff --git a/makefile b/makefile
+index 23ad004..2cca469 100644
+--- a/makefile
++++ b/makefile
+@@ -20,5 +20,5 @@ test :
+ 	cd test ; make -f posix.mak
+ 
+ install : 
+-	cd install ; su root -c "make -f install.mak" 
++	cd install ; make -f install.mak
+ 
diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix
new file mode 100644
index 00000000000..c672c7964e7
--- /dev/null
+++ b/pkgs/development/tools/analysis/cccc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+let
+  name = "cccc";
+  version = "3.1.4";
+in
+stdenv.mkDerivation {
+  name = "${name}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz";
+    sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7";
+  };
+  patches = [ ./cccc.patch ];
+  preConfigure = ''
+    substituteInPlace install/install.mak --replace /usr/local/bin $out/bin
+    substituteInPlace install/install.mak --replace MKDIR=mkdir "MKDIR=mkdir -p"
+  '';
+
+  meta = {
+    description = "C and C++ Code Counter";
+    longDescription = ''
+      CCCC is a tool which analyzes C++ and Java files and generates a report
+      on various metrics of the code. Metrics supported include lines of code, McCabe's
+      complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura.
+    '';
+    homepage = "http://cccc.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.linquize ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2817906d281..d814667be56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3643,6 +3643,8 @@ let
      wrapGCC (ccache.links extraConfig)) {};
   ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper);
 
+  cccc = callPackage ../development/tools/analysis/cccc { };
+
   cgdb = callPackage ../development/tools/misc/cgdb { };
 
   chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; };

From 1e711ee42d09673f4336cba05dace87ff4db0554 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Fri, 9 May 2014 22:47:45 +0200
Subject: [PATCH 1170/2033] Fix OpenSSL requirement

---
 pkgs/tools/system/monit/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index cbd9c20389c..28d58abe5aa 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ bison flex ];
   buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];
 
-  configureFlags = stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
+  configureFlags = [
+    "--with-ssl-incl-dir=${openssl}/include"
+    "--with-ssl-lib-dir=${openssl}/lib"
+  ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
 
   meta = {
     homepage = http://mmonit.com/monit/;

From 2525aac13432f274367373f61dc02839a5cf7d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 17:32:23 +0200
Subject: [PATCH 1171/2033] haskell-unix-memory: new expression

---
 .../libraries/haskell/unix-memory/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/unix-memory/default.nix

diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix
new file mode 100644
index 00000000000..d4c65ff0475
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-memory/default.nix
@@ -0,0 +1,19 @@
+{ cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "unix-memory";
+  version = "0.1.1";
+  sha256 = "02jmccs7mcg2lhpnb1ps7ycxzmn46b4drf994vv0pawwjrkrhnhk";
+  testDepends = [
+    HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-unix-memory";
+    description = "Unix memory syscalls";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1e7a7297758..01512765333 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2681,6 +2681,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
+  unixMemory = callPackage ../development/libraries/haskell/unix-memory {};
+
   unixProcessConduit = callPackage ../development/libraries/haskell/unix-process-conduit {};
 
   unixTime = callPackage ../development/libraries/haskell/unix-time {};

From 97dde61662a7968e1849dc24fbae67c570c615ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 17:33:05 +0200
Subject: [PATCH 1172/2033] haskell-system-time-monotonic: new expression

---
 .../haskell/system-time-monotonic/default.nix      | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/system-time-monotonic/default.nix

diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
new file mode 100644
index 00000000000..230dc5fd6d1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix
@@ -0,0 +1,14 @@
+{ cabal, time }:
+
+cabal.mkDerivation (self: {
+  pname = "system-time-monotonic";
+  version = "0.2";
+  sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
+  buildDepends = [ time ];
+  meta = {
+    homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
+    description = "Simple library for using the system's monotonic clock";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 01512765333..06dadad9539 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2500,6 +2500,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {};
 
+  systemTimeMonotonic = callPackage ../development/libraries/haskell/system-time-monotonic {};
+
   TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {};
 
   tabular = callPackage ../development/libraries/haskell/tabular {};

From b49de7164e929e26e1c5bf8d729dad6563c5afc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 21:43:10 +0200
Subject: [PATCH 1173/2033] haskell-generate: new expression

---
 .../haskell/haskell-generate/default.nix          | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/haskell-generate/default.nix

diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix
new file mode 100644
index 00000000000..b650714127c
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix
@@ -0,0 +1,15 @@
+{ cabal, doctest, filepath, haskellSrcExts, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "haskell-generate";
+  version = "0.2";
+  sha256 = "0bkaarc40lcw3v2y6qdf91rx21v3w82y62kaadhmmh5ikq99pybw";
+  buildDepends = [ haskellSrcExts transformers ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    homepage = "http://github.com/bennofs/haskell-generate/";
+    description = "haskell-generate";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 06dadad9539..b45dcfc2695 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1339,6 +1339,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
 
+  haskellGenerate = callPackage ../development/libraries/haskell/haskell-generate {};
+
   haskellLexer = callPackage ../development/libraries/haskell/haskell-lexer {};
 
   haskellMpi = callPackage ../development/libraries/haskell/haskell-mpi {

From e61e23b6c7cd31ebe60e3455fe8f88ba666a5e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 21:44:28 +0200
Subject: [PATCH 1174/2033] haskell-hcltest: new expression

---
 .../libraries/haskell/hcltest/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hcltest/default.nix

diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix
new file mode 100644
index 00000000000..170c885d240
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hcltest/default.nix
@@ -0,0 +1,22 @@
+{ cabal, dlist, doctest, either, filepath, free, lens, mmorph
+, monadControl, mtl, optparseApplicative, randomShuffle, split, stm
+, tagged, tasty, temporary, text, transformers, transformersBase
+}:
+
+cabal.mkDerivation (self: {
+  pname = "hcltest";
+  version = "0.3.1";
+  sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9";
+  buildDepends = [
+    dlist either filepath free lens mmorph monadControl mtl
+    optparseApplicative randomShuffle split stm tagged tasty temporary
+    text transformers transformersBase
+  ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    homepage = "http://github.com/bennofs/hcltest/";
+    description = "A testing library for command line applications";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b45dcfc2695..89bc849915d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1365,6 +1365,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   hastache = callPackage ../development/libraries/haskell/hastache {};
 
+  hcltest = callPackage ../development/libraries/haskell/hcltest {};
+
   heredoc = callPackage ../development/libraries/haskell/heredoc {};
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};

From 52bd5978a047ab63e7bc61870c019b49c5255899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 21:45:42 +0200
Subject: [PATCH 1175/2033] haskell-quickcheck-property-monad: new expression

---
 .../haskell/quickcheck-property-monad/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix

diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
new file mode 100644
index 00000000000..203f22146b1
--- /dev/null
+++ b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix
@@ -0,0 +1,15 @@
+{ cabal, doctest, either, filepath, QuickCheck, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "quickcheck-property-monad";
+  version = "0.2.1";
+  sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds";
+  buildDepends = [ either QuickCheck transformers ];
+  testDepends = [ doctest filepath QuickCheck ];
+  meta = {
+    homepage = "http://github.com/bennofs/quickcheck-property-monad/";
+    description = "quickcheck-property-monad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 89bc849915d..2019ec0c8ff 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2182,6 +2182,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
+  quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {};
+
   qrencode = callPackage ../development/libraries/haskell/qrencode {
     inherit (pkgs) qrencode;
   };

From fb2d8ab9aa1aa672b0bae71a9f8d968534eb5f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 21:47:14 +0200
Subject: [PATCH 1176/2033] haskell-th-lift-instances: new expression

---
 .../haskell/th-lift-instances/default.nix         | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/th-lift-instances/default.nix

diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
new file mode 100644
index 00000000000..27eb090443b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
@@ -0,0 +1,15 @@
+{ cabal, doctest, filepath, QuickCheck, text, thLift, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "th-lift-instances";
+  version = "0.1.2";
+  sha256 = "0xfz7jnhqxqxd6ijn6vpd0nay38kj862ylsb71xqi35137g5zl9w";
+  buildDepends = [ text thLift vector ];
+  testDepends = [ doctest filepath QuickCheck text vector ];
+  meta = {
+    homepage = "http://github.com/bennofs/th-lift-instances/";
+    description = "Lift instances for template-haskell for common data types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2019ec0c8ff..4c63b3e0ad2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2602,6 +2602,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};
 
+  thLiftInstances = callPackage ../development/libraries/haskell/th-lift-instances {};
+
   thOrphans = callPackage ../development/libraries/haskell/th-orphans {};
 
   threadmanager = callPackage ../development/libraries/haskell/threadmanager {};

From 631e74963f7597dc2296bfeea219a22ea4beb19e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 5 May 2014 21:48:53 +0200
Subject: [PATCH 1177/2033] haskell-dynamic-cabal: new expression

---
 .../haskell/dynamic-cabal/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/dynamic-cabal/default.nix

diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
new file mode 100644
index 00000000000..c2ecb09824f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix
@@ -0,0 +1,20 @@
+{ cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate
+, haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "dynamic-cabal";
+  version = "0.3.1";
+  sha256 = "0jjhz6h1ggznbvi4qgv0p5x1s7j0fgv1xvkfgid57jrjvdvd4gic";
+  buildDepends = [
+    dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time
+    void
+  ];
+  testDepends = [ doctest filepath HUnit tasty tastyHunit tastyTh ];
+  meta = {
+    homepage = "http://github.com/bennofs/dynamic-cabal/";
+    description = "dynamic-cabal";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4c63b3e0ad2..c421a5e3b65 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1040,6 +1040,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   dualTree = callPackage ../development/libraries/haskell/dual-tree {};
 
+  dynamicCabal = callPackage ../development/libraries/haskell/dynamic-cabal {};
+
   dyre = callPackage ../development/libraries/haskell/dyre {};
 
   editDistance = callPackage ../development/libraries/haskell/edit-distance {};

From 4ec21f6ecdd0088b719956b12e83aff339d89e69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 May 2014 22:57:20 +0200
Subject: [PATCH 1178/2033] haskell-Strafunski-StrategyLib: jailbreak to fix
 build with GHC 7.8.2

---
 .../libraries/haskell/Strafunski-StrategyLib/default.nix         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
index b7b8b6336e6..3bcdb30fd12 100644
--- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
+++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "5.0.0.3";
   sha256 = "1s7410dfzkqd9j8n5g92pvh9rwglngj3ca9ipcr6xsq0n6yhs51y";
   buildDepends = [ mtl syb ];
+  jailbreak = true;
   meta = {
     description = "Library for strategic programming";
     license = self.stdenv.lib.licenses.bsd3;

From 06c8438bd8e9e3104a854211c78daceaad30edac Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Fri, 9 May 2014 07:15:32 +0200
Subject: [PATCH 1179/2033] conkeror: upgrade to latest snapshot

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

diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 79402c31f8b..cd96c0a6be8 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, unzip, xulrunner, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20140212";
+  name = "conkeror-1.0pre-20140509";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "07064d76d10e0978c6de535e21f4597d44560fbd";
-    sha256 = "b03a7debee8583ff7a3f2d95474f60e956f0e24dbd1a8fd22412de1d6627f322";
+    rev = "eaf02dccf979d824667d177544103af000ae40bf";
+    sha256 = "1896db59d260f34a459402cb0c252b636aab9bf0378ae663a6d039f15af5b350";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 96373a40414d5d989b3ec03b01f83e5386a30416 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 9 May 2014 09:52:14 +0300
Subject: [PATCH 1180/2033] sysdig: update to 0.1.82

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 69bb5e43a54..c6a2d5ae5ba 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -2,10 +2,10 @@
 let
   s = rec {
     baseName="sysdig";
-    version="0.1.81";
+    version="0.1.82";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256="0p9j1fy7lr027nsvr5bq0416nlsbvk02irzazmigsbr03fg0x1wv";
+    sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk";
   };
   buildInputs = [
     cmake luajit kernel zlib

From e5f7e4ec3ca40d100feec03b73a59be8b26280d2 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 9 May 2014 10:06:29 +0300
Subject: [PATCH 1181/2033] luajit: support Darwin builds

---
 pkgs/development/interpreters/luajit/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 46c0b49c3b8..00c4ddc447f 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patchPhase = stdenv.lib.optionalString (stdenv.gcc.libc != null)
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out
+  '' + stdenv.lib.optionalString (stdenv.gcc.libc != null)
   ''
     substituteInPlace Makefile \
       --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig
@@ -21,11 +24,11 @@ stdenv.mkDerivation rec {
   buildFlags     = [ "amalg" ]; # Build highly optimized version
   installPhase   = "make install PREFIX=$out";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "high-performance JIT compiler for Lua 5.1";
     homepage    = http://luajit.org;
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = licenses.mit;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }

From 96903d5e480cdf45a0783c3d7fb4adbbdf43d577 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 9 May 2014 10:06:56 +0300
Subject: [PATCH 1182/2033] sysdig: support builds without the kernel module,
 add pkgs.sysdig attr

---
 pkgs/os-specific/linux/sysdig/default.nix | 18 ++++++++++--------
 pkgs/top-level/all-packages.nix           |  4 ++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index c6a2d5ae5ba..6734563f0ab 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,5 +1,6 @@
 {stdenv, fetchurl, cmake, luajit, kernel, zlib}:
 let
+  inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
     version="0.1.82";
@@ -8,8 +9,8 @@ let
     sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk";
   };
   buildInputs = [
-    cmake luajit kernel zlib
-  ];
+    cmake zlib luajit
+  ] ++ optional (kernel != null) kernel;
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -24,17 +25,18 @@ stdenv.mkDerivation {
   ];
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"
+  '' + optionalString (kernel != null) ''
     export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   '';
-  postInstall = ''
+  postInstall = optionalString (kernel != null) ''
     make install_driver
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''A tracepoint-based system tracing tool for Linux'';
-    license = stdenv.lib.licenses.gpl2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = ''A tracepoint-based system tracing tool for Linux (with clients for other OSes)'';
+    license = licenses.gpl2;
+    maintainers = [maintainers.raskin];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa278924b6..7fd9bd6aa26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7377,6 +7377,10 @@ let
 
   statifier = builderDefsPackage (import ../os-specific/linux/statifier) { };
 
+  sysdig = callPackage ../os-specific/linux/sysdig {
+    kernel = null;
+  }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
+
   sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
 
   sysprof = callPackage ../development/tools/profiling/sysprof {

From 8999a7c5503beffb57fce66ff407b81431e83ff8 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Sat, 10 May 2014 14:34:50 +0200
Subject: [PATCH 1183/2033] nixpkgs: Bump libvirt-python to 1.2.4 - libvirt is
 already updated and this package is therefor broken

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c414cd4300..26345d73950 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8891,11 +8891,11 @@ rec {
 
   libvirt = pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
-    version = "1.2.2";
+    version = "1.2.4";
 
     src = fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "0fccpyppz79kbbnzwdgsiza3cxq7jlnnp1dqi33gc4305dk9vmwl";
+      sha256 = "0zi1mxjcv9dz5hy54lwgk9j4i8r20hhijbxxn843h2w7p1ch1wx2";
     };
 
     buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From cd7c5fe19820368c91b1305c475348848bf32e95 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 10 May 2014 14:04:13 -0500
Subject: [PATCH 1184/2033] Allow dar to build on Darwin

---
 pkgs/tools/archivers/dar/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix
index 9309886db80..17b0b77f872 100644
--- a/pkgs/tools/archivers/dar/default.nix
+++ b/pkgs/tools/archivers/dar/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1";
   };
 
-  buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];
+  buildInputs = [ zlib bzip2 openssl lzo libgcrypt ]
+    ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ];
 
   configureFlags = "--disable-dar-static";
 
@@ -16,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://dar.linux.free.fr/;
     description = "Disk ARchiver, allows backing up files into indexed archives";
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 4971bdc930f3dd44162c419a2cfe30f5586ab473 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 24 Mar 2014 17:21:21 -0500
Subject: [PATCH 1185/2033] hplip version bump 3.11.1 -> 3.14.4

---
 pkgs/misc/drivers/hplip/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 5b9ef87a129..c6bf3b6411c 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, cups, zlib, libjpeg, libusb, pythonPackages, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
+{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
+, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake
 }:
 
 stdenv.mkDerivation rec {
-  name = "hplip-3.11.1";
+  name = "hplip-3.14.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0y68s4xm5d0kv7p5j41qq0xglp4vdbjwbrjs89b4a21wwn69hp9g";
+    sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f";
   };
 
   #preBuild=''
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
   prePatch = ''
     sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
     sed -i s,/etc/hp/,$out/etc/hp/, base/g.py
+    substituteInPlace Makefile.in \
+      --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \
+      --replace "/usr/lib/systemd/system" "$out/lib/systemd/system"
   '';
 
   # --disable-network-build Until we have snmp
@@ -49,7 +52,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
       libjpeg
       cups
-      libusb
+      libusb1
       pythonPackages.python
       pythonPackages.wrapPython
       saneBackends

From cb7c920e2493040d7ac82656bf4382f6db87098c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 11 May 2014 01:03:27 +0200
Subject: [PATCH 1186/2033] virt-manager: add missing gsettings schema

Without this it'll complain and abort when clicking "Take Screenshot" or
"Browse Local" when creating a new VM and looking for an CD-ROM image to boot
from:

GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed
---
 pkgs/applications/virtualization/virt-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index dba0d11b425..9df6967704a 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
             --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
             --prefix GSETTINGS_SCHEMA_DIR : $out/share/glib-2.0/schemas \
             --prefix LD_LIBRARY_PATH : ${gtk3}/lib/:${libvirt-glib}/lib/:${vte}/lib:${gtkvnc}/lib${optionalString spiceSupport ":${spice_gtk}/lib"} \
-            --prefix XDG_DATA_DIRS : "$out/share:${gsettings_desktop_schemas}/share:${gtk3}/share:\$XDG_DATA_DIRS"
+            --prefix XDG_DATA_DIRS : "$out/share:${gsettings_desktop_schemas}/share:${gtk3}/share:$GSETTINGS_SCHEMAS_PATH:\$XDG_DATA_DIRS"
     done
 
     ${glib}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas

From 6223cbd7a836eedd6af2068416ba4531e44886c8 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sat, 10 May 2014 22:18:03 -0400
Subject: [PATCH 1187/2033] supercollider: added emacs support

---
 .../interpreters/supercollider/default.nix    | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 77a9392ba8b..97808f6faf1 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,9 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig
 , jackaudio, libsndfile, fftw, curl
-, libXt, qt
+, libXt, qt, readline
+, useSCEL ? false, emacs
 }:
+  
+let optional = stdenv.lib.optional; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {  
   name = "supercollider-3.6.6";
 
   meta = {
@@ -24,15 +27,14 @@ stdenv.mkDerivation rec {
       --replace Q_WS_X11 Q_GTK_STYLE
   '';
 
-  cmakeFlags = [
-    "-DSC_WII=OFF"
-    "-DSC_EL=OFF"
-  ];
+  cmakeFlags = ''
+    -DSC_WII=OFF
+    -DSC_EL=${if useSCEL then "ON" else "OFF"} 
+  '';
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [
-    jackaudio libsndfile fftw curl
-    libXt qt
-  ];
+  buildInputs = [ 
+    jackaudio libsndfile fftw curl libXt qt readline ] 
+    ++ optional useSCEL emacs;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa278924b6..563ccf238dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3544,6 +3544,8 @@ let
     fftw = fftwSinglePrec;
   };
 
+  supercollider_scel = supercollider.override { useSCEL = true; };
+
   sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
 
   tcl = callPackage ../development/interpreters/tcl { };

From a0dc20719bbe1cdb8a66841556bf939614f94fb4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 10 May 2014 17:33:46 -0500
Subject: [PATCH 1188/2033] hplip: add binary plugin

---
 pkgs/misc/drivers/hplip/default.nix | 75 +++++++++++++++++++++++------
 pkgs/misc/drivers/hplip/hplip.state |  4 ++
 pkgs/top-level/all-packages.nix     |  2 +
 3 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/misc/drivers/hplip/hplip.state

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c6bf3b6411c..90d5967a29c 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,5 +1,7 @@
-{stdenv, fetchurl, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
-, pkgconfig, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp, automake
+{ stdenv, fetchurl, automake, pkgconfig
+, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
+, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
+, withPlugin ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -10,20 +12,23 @@ stdenv.mkDerivation rec {
     sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f";
   };
 
-  #preBuild=''
-  #  makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
-  #'';
+  plugin = fetchurl {
+    url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
+    sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874";
+  };
+
+  hplip_state = ./hplip.state;
 
   prePatch = ''
-    sed -i s,/etc/sane.d,$out/etc/sane.d/, Makefile.in
-    sed -i s,/etc/hp/,$out/etc/hp/, base/g.py
-    substituteInPlace Makefile.in \
-      --replace "/usr/include/libusb-1.0" "${libusb1}/include/libusb-1.0" \
-      --replace "/usr/lib/systemd/system" "$out/lib/systemd/system"
+    # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
+    find . -type f -exec sed -i s,/etc/hp,$out/etc/hp, {} \;
+    find . -type f -exec sed -i s,/etc/sane.d,$out/etc/sane.d, {} \;
+    find . -type f -exec sed -i s,/usr/include/libusb-1.0,${libusb1}/include/libusb-1.0, {} \;
+    find . -type f -exec sed -i s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, {} \;
+    find . -type f -exec sed -i s,/usr/lib/systemd/system,$out/lib/systemd/system, {} \;
+    find . -type f -exec sed -i s,/var/lib/hp,$out/var/lib/hp, {} \;
   '';
 
-  # --disable-network-build Until we have snmp
-
   preConfigure = ''
     export configureFlags="$configureFlags
       --with-cupsfilterdir=$out/lib/cups/filter
@@ -36,18 +41,56 @@ stdenv.mkDerivation rec {
 
     export makeFlags="
       halpredir=$out/share/hal/fdi/preprobe/10osvendor
-      hplip_statedir=$out/var
       rulesdir=$out/etc/udev/rules.d
       policykit_dir=$out/share/polkit-1/actions
       policykit_dbus_etcdir=$out/etc/dbus-1/system.d
       policykit_dbus_sharedir=$out/share/dbus-1/system-services
       hplip_confdir=$out/etc/hp
+      hplip_statedir=$out/var/lib/hp
     ";
   '';
 
-  postInstall = ''
+  postInstall =
+    ''
     wrapPythonPrograms
-    '';
+    ''
+    + (stdenv.lib.optionalString withPlugin
+    (let hplip_arch =
+          if builtins.currentSystem == "i686-linux"
+            then "x86_32"
+            else if builtins.currentSystem == "x86_64-linux"
+              then "x86_64"
+              else abort "Platform must be i686-linux or x86_64-linux!";
+    in
+    ''
+    sh ${plugin} --noexec --keep
+    cd plugin_tmp
+
+    cp plugin.spec $out/share/hplip/
+
+    mkdir -p $out/share/hplip/data/firmware
+    cp *.fw.gz $out/share/hplip/data/firmware
+
+    mkdir -p $out/share/hplip/data/plugins
+    cp license.txt $out/share/hplip/data/plugins
+
+    mkdir -p $out/share/hplip/prnt/plugins
+    for plugin in lj hbpl1; do
+      cp $plugin-${hplip_arch}.so $out/share/hplip/prnt/plugins
+      ln -s $out/share/hplip/prnt/plugins/$plugin-${hplip_arch}.so \
+        $out/share/hplip/prnt/plugins/$plugin.so
+    done
+
+    mkdir -p $out/share/hplip/scan/plugins
+    for plugin in bb_soap bb_marvell bb_soapht fax_marvell; do
+      cp $plugin-${hplip_arch}.so $out/share/hplip/scan/plugins
+      ln -s $out/share/hplip/scan/plugins/$plugin-${hplip_arch}.so \
+        $out/share/hplip/scan/plugins/$plugin.so
+    done
+
+    mkdir -p $out/var/lib/hp
+    cp ${hplip_state} $out/var/lib/hp/hplip.state
+    ''));
 
   buildInputs = [
       libjpeg
@@ -70,7 +113,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
-    license = "free"; # MIT/BSD/GPL
+    license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/misc/drivers/hplip/hplip.state b/pkgs/misc/drivers/hplip/hplip.state
new file mode 100644
index 00000000000..52679963f06
--- /dev/null
+++ b/pkgs/misc/drivers/hplip/hplip.state
@@ -0,0 +1,4 @@
+[plugin]
+installed=1
+eula=1
+version=3.14.4
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa278924b6..5ae4e923e6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10604,6 +10604,8 @@ let
 
   hplip = callPackage ../misc/drivers/hplip { };
 
+  hplipWithPlugin = hplip.override { withPlugin = true; };
+
   # using the new configuration style proposal which is unstable
   jack1d = callPackage ../misc/jackaudio/jack1.nix { };
 

From 2666dcd21869658c2d3038c417eb27556b2cd289 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 10 May 2014 21:56:28 -0500
Subject: [PATCH 1189/2033] hplip: assume maintainership

---
 pkgs/misc/drivers/hplip/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 90d5967a29c..efa0b480319 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -115,5 +115,6 @@ stdenv.mkDerivation rec {
     homepage = http://hplipopensource.com/;
     license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL
     platforms = platforms.linux;
+    maintainers = with maintainers; [ ttuegel ];
   };
 }

From c43003b87c31c74f2bda89b0eddf940598d90d5c Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 11 May 2014 05:29:11 +0200
Subject: [PATCH 1190/2033] pandoc: Update to 1.12.4

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

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 5a93cb023c9..92345c91256 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.12.3.3";
-  sha256 = "0v7wvh93rz3k7phlz21627j5xakpi83174mchr3lwg4bmkfxn25s";
+  version = "1.12.4";
+  sha256 = "0dpvp630a5z7wp5a7q9f2i98vhv3c4m2acsb3qmw5ybs1awi3yry";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 3729ead3af168737489656d9ceb83a6e772a29b9 Mon Sep 17 00:00:00 2001
From: "Robert M. Mather" <robert.mather.rmm@gmail.com>
Date: Sat, 3 May 2014 02:24:11 -0700
Subject: [PATCH 1191/2033] Ur/Web compiler: new release, 20130421 -> 20140426

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index a2423bee9b9..2073104c6fd 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20130421";
+  version = "20140426";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1dglcial9bzximw778wbfqx99khy34qpf9gw4bbncn9f742ji872";
+    sha256 = "0d7mbmjc59y0dwk4k7r4wpxfsn4fzswrdxai9xh2nzjsxg2fa7d2";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];

From 56994ce2ebfac75f0e4bcc06e43b47bdbb51790a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 10 May 2014 22:16:13 -0500
Subject: [PATCH 1192/2033] hplip: add pillow and reportlab dependencies

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index efa0b480319..593b346fc3b 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -105,9 +105,11 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optional qtSupport qt4;
 
   pythonPath = with pythonPackages; [
+      pillow
       pythonDBus
       pygobject
       recursivePthLoader
+      reportlab
     ] ++ stdenv.lib.optional qtSupport pyqt4;
 
   meta = with stdenv.lib; {

From 31a0844f794512336d1795c6f99ed697a5256327 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 05:41:08 -0400
Subject: [PATCH 1193/2033] wicd: enable curses, urwid is packaged

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/tools/networking/wicd/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix
index 524c93d218a..e0537c8e1fa 100644
--- a/pkgs/tools/networking/wicd/default.nix
+++ b/pkgs/tools/networking/wicd/default.nix
@@ -2,9 +2,6 @@
  wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, openresolv, iproute, iputils,
  pythonPackages, locale ? "C" }:
 
-# Wicd has a ncurses interface that we do not build because it depends
-# on urwid which has not been packaged at this time (2009-12-27).
-
 stdenv.mkDerivation rec {
   name = "wicd-${version}";
   version = "1.7.2.4";
@@ -14,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "15ywgh60xzmp5z8l1kzics7yi95isrjg1paz42dvp7dlpdfzpzfw";
   };
 
-  buildInputs = [ python pythonPackages.Babel ];
+  buildInputs = [ python pythonPackages.Babel pythonPackages.urwid ];
 
   patches = [
     ./no-var-install.patch
@@ -83,7 +80,6 @@ stdenv.mkDerivation rec {
     --no-install-kde \
     --no-install-acpi \
     --no-install-pmutils \
-    --no-install-ncurses \
   '';
 
   installPhase = ''

From 68325d8eaece110e1ee8d0d01d52bc073679bcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 11 May 2014 12:50:54 +0200
Subject: [PATCH 1194/2033] setbfree: build the GUI

---
 pkgs/applications/audio/setbfree/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 580874d1270..0d5b6929753 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, alsaLib, jackaudio, lv2, pkgconfig }:
+{ stdenv, fetchurl, alsaLib, freetype, ftgl, jackaudio, libX11, lv2
+, mesa, pkgconfig, ttf_bitstream_vera
+}:
 
 stdenv.mkDerivation  rec {
   name = "setbfree-${version}";
@@ -9,9 +11,16 @@ stdenv.mkDerivation  rec {
     sha256 = "1chlmgwricc6l4kyg35vc9v8f1n8psr28iihn4a9q2prj1ihqcbc";
   };
 
-  patchPhase = "sed 's#/usr/local#$(out)#g' -i common.mak";
+  patchPhase = ''
+    sed 's#/usr/local#$(out)#g' -i common.mak
+    sed 's#/usr/share/fonts/truetype/ttf-bitstream-vera#${ttf_bitstream_vera}/share/fonts/truetype#g' \
+      -i b_synth/Makefile
+  '';
 
-  buildInputs = [ alsaLib jackaudio lv2 pkgconfig ];
+  buildInputs = [
+    alsaLib freetype ftgl jackaudio libX11 lv2 mesa pkgconfig
+    ttf_bitstream_vera
+  ];
 
   meta = with stdenv.lib; {
     description = "A DSP tonewheel organ emulator";

From c0a30a4b510d05218c0a672b93b0724e99e40f51 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 06:26:45 -0400
Subject: [PATCH 1195/2033] htop: Bump to 1.0.3 (close #2611)

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/os-specific/linux/htop/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index 613adb5f5d2..d35b5340e9d 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.2";
+  name = "htop-1.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/htop/${name}.tar.gz";
-    sha256 = "18fqrhvnm7h4c3939av8lpiwrwxbyw6hcly0jvq0vkjf0ixnaq7f";
+    url = "http://hisham.hm/htop/releases/1.0.3/htop-1.0.3.tar.gz";
+    sha256 = "0a8qbpsifzjwc4f45xfwm48jhm59g6q5hlib4bf7z13mgy95fp05";
   };
 
   buildInputs = [ ncurses ];
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "An interactive process viewer for Linux";
     homepage = "http://htop.sourceforge.net";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.rob stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ rob simons relrod ];
   };
 }

From c96d5fe1702430df15a3313cd46f7de7c924718f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Tue, 25 Mar 2014 16:39:10 -0400
Subject: [PATCH 1196/2033] nixos: f2fs filesystem module support (close #2085)

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/profiles/base.nix           |  3 ++-
 nixos/modules/system/boot/stage-1-init.sh |  2 +-
 nixos/modules/tasks/filesystems/f2fs.nix  | 21 +++++++++++++++++++++
 nixos/tests/partition.nix                 | 18 ++++++++++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/tasks/filesystems/f2fs.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f98b621111f..5beaeb5388b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -306,6 +306,7 @@
   ./tasks/filesystems.nix
   ./tasks/filesystems/btrfs.nix
   ./tasks/filesystems/ext.nix
+  ./tasks/filesystems/f2fs.nix
   ./tasks/filesystems/nfs.nix
   ./tasks/filesystems/reiserfs.nix
   ./tasks/filesystems/unionfs-fuse.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 20b808c29e0..562419b3fac 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -34,6 +34,7 @@
     pkgs.dosfstools
     pkgs.xfsprogs
     pkgs.jfsutils
+    pkgs.f2fs-tools
     #pkgs.jfsrec # disabled because of Boost dependency
 
     # Some compression/archiver tools.
@@ -50,6 +51,6 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" ];
 
 }
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 216937a619b..c4a21b02cac 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -204,7 +204,7 @@ checkFS() {
     # does (minutes versus seconds).
     if test -z "@checkJournalingFS@" -a \
         \( "$fsType" = ext3 -o "$fsType" = ext4 -o "$fsType" = reiserfs \
-        -o "$fsType" = xfs -o "$fsType" = jfs \)
+        -o "$fsType" = xfs -o "$fsType" = jfs -o "$fsType" = f2fs \)
     then
         return 0
     fi
diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix
new file mode 100644
index 00000000000..8655107360c
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/f2fs.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems;
+in
+{
+  config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.f2fs-tools ];
+
+    boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ];
+
+    boot.initrd.extraUtilsCommands = mkIf inInitrd ''
+      mkdir -p $out/bin $out/lib
+      cp -v   ${pkgs.f2fs-tools}/sbin/fsck.f2fs $out/bin
+      cp -pdv ${pkgs.f2fs-tools}/lib/lib*.so.* $out/lib
+    '';
+  };
+}
diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix
index 309afa4ce9d..120ecaad881 100644
--- a/nixos/tests/partition.nix
+++ b/nixos/tests/partition.nix
@@ -24,6 +24,14 @@ let
     btrfs / --data=0 --metadata=1 --label=root btrfs.1 btrfs.2
   '';
 
+  ksF2fs = pkgs.writeText "ks-f2fs" ''
+    clearpart --all --initlabel --drives=vdb
+
+    part swap  --recommended --label=swap --fstype=swap --ondisk=vdb
+    part /boot --recommended --label=boot --fstype=f2fs --ondisk=vdb
+    part /     --recommended --label=root --fstype=f2fs --ondisk=vdb
+  '';
+
   ksRaid = pkgs.writeText "ks-raid" ''
     clearpart --all --initlabel --drives=vdb,vdc
 
@@ -193,6 +201,16 @@ in {
       remountAndCheck;
     };
 
+    parttest "f2fs filesystem", sub {
+      $machine->succeed("modprobe f2fs");
+      kickstart("${ksF2fs}");
+      ensurePartition("swap", "swap");
+      ensurePartition("boot", "f2fs");
+      ensurePartition("root", "f2fs");
+      remoteAndCheck;
+      ensureMountPoint("/mnt/boot", "f2fs");
+    };
+
     parttest "RAID1 with XFS", sub {
       kickstart("${ksRaid}");
       ensurePartition("swap1", "swap");

From e47172ce38da3afd215989ed22aaf19371d8c890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 4 May 2014 21:49:37 +0800
Subject: [PATCH 1197/2033] fcitx: build im modules for gtk2, gtk3 and qt4

Close #2498.
---
 pkgs/tools/inputmethods/fcitx/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix
index 94d819680ab..747c4b44ac8 100644
--- a/pkgs/tools/inputmethods/fcitx/default.nix
+++ b/pkgs/tools/inputmethods/fcitx/default.nix
@@ -1,24 +1,33 @@
 { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp
+, dbus, gtk2, gtk3, qt4
 }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-4.2.8.3";
+
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
     sha256 = "05dw6cbjh2jyjrkr4qx2bcq6nyhhrs0akf6fcjk5a72bgphhwqnb";
   };
 
-  buildInputs = [
+  patchPhase = ''
+    substituteInPlace src/frontend/qt/CMakeLists.txt \
+      --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
+  '';
+
+  buildInputs = with stdenv.lib; [
     cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile
     intltool cairo icu libpthreadstubs libXau libXdmcp
+    dbus gtk2 gtk3 qt4
   ];
 
   cmakeFlags = ''
-    -DENABLE_DBUS=OFF
-    -DENABLE_QT=OFF
-    -DENABLE_QT_IM_MODULE=OFF
+    -DENABLE_QT_IM_MODULE=ON
+    -DENABLE_GTK2_IM_MODULE=ON
+    -DENABLE_GTK3_IM_MODULE=ON
+    -DENABLE_GIR=OFF
     -DENABLE_OPENCC=OFF
     -DENABLE_PRESAGE=OFF
     -DENABLE_XDGAUTOSTART=OFF

From ce02e8c1db0abc14383cac02a41ff9b954e099ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 May 2014 14:29:13 +0200
Subject: [PATCH 1198/2033] bedup: add top-level attribute

Currently I see no standard way of having package name
without the "pythonX.Y-" prefix.

This is replacement to #2339.
---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 563ccf238dd..183fb4319a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6834,6 +6834,8 @@ let
 
   bluez = bluez4;
 
+  inherit (pythonPackages) bedup;
+
   beret = callPackage ../games/beret { };
 
   bridge_utils = callPackage ../os-specific/linux/bridge-utils { };

From 4b87687a84766271089b26323ca467986e3f5ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 13 Apr 2014 13:46:23 +0200
Subject: [PATCH 1199/2033] cloogppl: patch to use ppl version 1.0 (close
 #2236)

---
 pkgs/development/libraries/cloog-ppl/default.nix | 15 ++++++++++++++-
 .../libraries/cloog-ppl/fix-ppl-version.patch    | 16 ++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch

diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 2c723e2c8b2..a6ebbf8dfdc 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ppl }:
+{ fetchurl, stdenv, ppl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.11";
@@ -10,8 +10,21 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ppl ];
 
+  buildInputs = [ automake autoconf libtool ];
+
+  patches = [ ./fix-ppl-version.patch ];
+
   configureFlags = "--with-ppl=${ppl}";
 
+  preConfigure = ''
+    touch NEWS ChangeLog AUTHORS
+    ${libtool}/bin/libtoolize -c --force
+    ${automake}/bin/aclocal
+    ${automake}/bin/automake --add-missing
+    ${automake}/bin/automake -a -c --foreign
+    ${autoconf}/bin/autoreconf
+  '';
+
   crossAttrs = {
     configureFlags = "--with-ppl=${ppl.crossDrv}";
   };
diff --git a/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch b/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch
new file mode 100644
index 00000000000..8440d839411
--- /dev/null
+++ b/pkgs/development/libraries/cloog-ppl/fix-ppl-version.patch
@@ -0,0 +1,16 @@
+diff -rupN src/configure.in cloog-ppl-0.15.11/configure.in
+--- src/configure.in	2014-04-13 13:33:43.349392305 +0200
++++ cloog-ppl-0.15.11/configure.in	2014-04-13 13:34:12.695379888 +0200
+@@ -337,11 +337,7 @@ if test "x$with_ppl" != "x" -a "x$with_p
+ 		        [AC_MSG_ERROR(Can't find PPL headers.)])
+ 
+ 	AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
+-	AC_TRY_COMPILE([#include "ppl_c.h"],[
+-	#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
+-	choke me
+-	#endif
+-	], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ])
++	AC_MSG_RESULT([yes])
+ 
+ 	LIBS="$LIBS -lppl_c -lppl -lgmpxx"
+ 	AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend])

From b4c89810648cce7c2c55b06443d9f5373e9d7230 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 11 May 2014 13:30:33 -0500
Subject: [PATCH 1200/2033] sane: add mkSaneConfig

---
 pkgs/applications/graphics/sane/config.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/graphics/sane/config.nix

diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
new file mode 100644
index 00000000000..fc1cd81ebc6
--- /dev/null
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -0,0 +1,27 @@
+{ stdenv }:
+
+{ paths }:
+
+with stdenv.lib;
+let installSanePath = path: ''
+      find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
+        ln -s $backend $out/lib/sane/$(basename $backend)
+      done
+
+      find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
+        ln -s $conf $out/etc/sane.d/$(basename $conf)
+      done
+
+      find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
+        ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
+      done
+    '';
+in
+stdenv.mkDerivation {
+  name = "sane-config";
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane
+  '' + concatMapStrings installSanePath paths;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ae4e923e6a..fbc3106afce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10735,6 +10735,8 @@ let
     hotplugSupport = config.sane.hotplugSupport or true;
   };
 
+  mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
+
   saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
   seafile-shared = callPackage ../misc/seafile-shared { };

From 4fb9c3700a2fcb5132994e8ecbbe07dc3574f9ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 11 May 2014 13:31:13 -0500
Subject: [PATCH 1201/2033] hplip: avoid name collision with sane config files

---
 pkgs/misc/drivers/hplip/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 593b346fc3b..50106dfb477 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -90,6 +90,9 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/var/lib/hp
     cp ${hplip_state} $out/var/lib/hp/hplip.state
+
+    mkdir -p $out/etc/sane.d/dll.d
+    mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
     ''));
 
   buildInputs = [

From 8df521bf0f73d2ac6a01aa912725b30d78973bcc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 11 May 2014 13:31:21 -0500
Subject: [PATCH 1202/2033] sane: use mkSaneConfig to set system environment

---
 nixos/modules/services/hardware/sane.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 01d910575bb..56e28b50350 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -5,6 +5,8 @@ with lib;
 let
 
   pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends;
+  backends = [ pkg ] ++ config.hardware.sane.extraBackends;
+  saneConfig = pkgs.mkSaneConfig { paths = backends; };
 
 in
 
@@ -26,6 +28,12 @@ in
       description = "Use a development snapshot of SANE scanner drivers.";
     };
 
+    hardware.sane.extraBackends = mkOption {
+      type = types.listOf types.path;
+      default = [];
+      description = "Packages providing extra SANE backends to enable.";
+    };
+
   };
 
 
@@ -33,8 +41,12 @@ in
 
   config = mkIf config.hardware.sane.enable {
 
-    environment.systemPackages = [ pkg ];
-    services.udev.packages = [ pkg ];
+    environment.systemPackages = backends;
+    environment.variables = {
+      SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d";
+      LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
+    };
+    services.udev.packages = backends;
 
     users.extraGroups."scanner".gid = config.ids.gids.scanner;
 

From 0ca3b9a549f05ef18e28138a74dc375c735e9e00 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 11 May 2014 21:05:34 +0200
Subject: [PATCH 1203/2033] pandoc-citeproc: Update to 0.3.1

---
 .../development/libraries/haskell/pandoc-citeproc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
index 62044cc9f5f..9738ad9e19c 100644
--- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc-citeproc";
-  version = "0.3.0.1";
-  sha256 = "1w8ljf0mc5a3bqv0hymg2daafkrlzdzar23l4yqakjr21n75nvlx";
+  version = "0.3.1";
+  sha256 = "06ck5qfajzwdsmcqvkcs85andxxrifvsfsybf14m7jd6r8y4bg26";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2efda9dce749bf98b567f519f6ea48c4ed3f978a Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sun, 11 May 2014 12:35:28 -0700
Subject: [PATCH 1204/2033] add jmtpfs - a FUSE filesystem for MTP

---
 pkgs/tools/filesystems/jmtpfs/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/filesystems/jmtpfs/default.nix

diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
new file mode 100644
index 00000000000..904ade20048
--- /dev/null
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl
+, autoconf, automake
+, unzip, pkgconfig
+, file, fuse, libmtp }:
+
+stdenv.mkDerivation rec {
+  version = "0.5";
+  name = "jmtpfs-${version}";
+
+  rev = "928fb8f2eec34232e3b2cecc121195caa8865e15";
+
+  src = fetchurl {
+    url = "https://github.com/JasonFerrara/jmtpfs/archive/${rev}.zip";
+    sha256 = "11904f8pkb84gah0h1m7s1hwkp9wa6dzcjj6d8nk4r37lqbillxc";
+  };
+
+  buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ];
+
+  meta = {
+    description = "A FUSE filesystem for MTP devices like Android phones.";
+    homepage = https://github.com/JasonFerrara/jmtpfs;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.coconnor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4388b990d41..37dc31c413a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1274,6 +1274,8 @@ let
 
   jing = callPackage ../tools/text/xml/jing { };
 
+  jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
+
   jnettop = callPackage ../tools/networking/jnettop { };
 
   jq = callPackage ../development/tools/jq {};

From ce5dd5681e7a6069df337aabf5e7e434630574ac Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sun, 11 May 2014 13:06:26 -0700
Subject: [PATCH 1205/2033] use 0.5 archive of jmtpfs

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

diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix
index 904ade20048..5ee79397707 100644
--- a/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -7,11 +7,9 @@ stdenv.mkDerivation rec {
   version = "0.5";
   name = "jmtpfs-${version}";
 
-  rev = "928fb8f2eec34232e3b2cecc121195caa8865e15";
-
   src = fetchurl {
-    url = "https://github.com/JasonFerrara/jmtpfs/archive/${rev}.zip";
-    sha256 = "11904f8pkb84gah0h1m7s1hwkp9wa6dzcjj6d8nk4r37lqbillxc";
+    url = "https://github.com/JasonFerrara/jmtpfs/archive/v0.5.zip";
+    sha256 = "09fw4g350mjz1mnga7ws5nvnsnfzs8s7cscl300mas1m9s6vmhz6";
   };
 
   buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ];

From 36c6072b8c7300aec2c234c5825f154a65a1ed41 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 16:37:19 -0400
Subject: [PATCH 1206/2033] perlPackages.ExtUtilsMakeMaker: Bump to 6.98

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index bbea59005f6..2733443dde3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3319,10 +3319,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   ExtUtilsMakeMaker = buildPerlPackage rec{
-    name = "ExtUtils-MakeMaker-6.84";
+    name = "ExtUtils-MakeMaker-6.98";
     src = fetchurl {
       url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "1s3fn1fkm9l6pjhz7dbzsc6nhw1jm2hpf08fqhsqh1h50nj5pv5b";
+      sha256 = "1vv3v9rc2dnx8amwa7lpdywg3lakx7yv2n38qvfbk9jzkqc27c1f";
     };
     propagatedBuildInputs =
       [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta

From 951ad60025ed5db1532bba0e01032c3b0f2c78d1 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 16:37:43 -0400
Subject: [PATCH 1207/2033] Package hamlib library

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/development/libraries/hamlib/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/hamlib/default.nix

diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
new file mode 100644
index 00000000000..495c7e99d4b
--- /dev/null
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, perl, python, swig, gd, libxml2, tcl, libusb, pkgconfig,
+ boost, libtool, perlPackages }:
+
+stdenv.mkDerivation rec {
+  name = "hamlib";
+  version = "1.2.15.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
+    sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
+  };
+
+  buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python swig gd libxml2
+                  tcl libusb pkgconfig boost libtool ];
+
+  configureFlags = [ "--with-perl-binding" "--with-python-binding"
+                     "--with-tcl-binding" "--with-rigmatrix" ];
+
+  meta = {
+    description = "Runtime library to control radio transceivers and receivers";
+    longDescription = ''
+    Hamlib provides a standardized programming interface that applications
+    can use to send the appropriate commands to a radio.
+
+    Also included in the package is a simple radio control program 'rigctl',
+    which lets one control a radio transceiver or receiver, either from
+    command line interface or in a text-oriented interactive interface.
+    '';
+    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    homepage = http://hamlib.sourceforge.net;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4388b990d41..20cf14e2a1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4717,6 +4717,8 @@ let
 
   gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
 
+  hamlib = callPackage ../development/libraries/hamlib { };
+
   # TODO : Add MIT Kerberos and let admin choose.
   kerberos = heimdal;
 

From 70c682b837b0e032d03e0d4a368dffa9a8cbaea9 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Mon, 12 May 2014 05:08:47 +0800
Subject: [PATCH 1208/2033] Move non-java libraries to "DEVELOPMENT /
 LIBRARIES" section

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4388b990d41..7dbcec4fa50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6052,6 +6052,10 @@ let
 
   ucommon = callPackage ../development/libraries/ucommon { };
 
+  v8 = callPackage ../development/libraries/v8 {
+    inherit (pythonPackages) gyp;
+  };
+
   vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
 
   vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
@@ -6163,6 +6167,8 @@ let
 
   xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };
 
+  xmlsec = callPackage ../development/libraries/xmlsec { };
+
   xvidcore = callPackage ../development/libraries/xvidcore { };
 
   yajl = callPackage ../development/libraries/yajl { };
@@ -6183,6 +6189,8 @@ let
   zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
   zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
 
+  zziplib = callPackage ../development/libraries/zziplib { };
+
 
   ### DEVELOPMENT / LIBRARIES / JAVA
 
@@ -6244,14 +6252,6 @@ let
     inherit (gnome) libsoup;
   };
 
-  v8 = callPackage ../development/libraries/v8 {
-    inherit (pythonPackages) gyp;
-  };
-
-  xmlsec = callPackage ../development/libraries/xmlsec { };
-
-  zziplib = callPackage ../development/libraries/zziplib { };
-
 
   ### DEVELOPMENT / LIBRARIES / JAVASCRIPT
 

From 913e340c9a991fb739fd03263d3e0309718546c9 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 17:11:10 -0400
Subject: [PATCH 1209/2033] Add fldigi package

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/applications/audio/fldigi/default.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/audio/fldigi/default.nix

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
new file mode 100644
index 00000000000..578619eb3f8
--- /dev/null
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, hamlib, fltk13, libjpeg, libpng, portaudio, libsndfile,
+  libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
+
+stdenv.mkDerivation rec {
+  version = "3.21.82";
+  name = "fldigi";
+
+  src = fetchurl {
+    url = "http://www.w1hkj.com/downloads/${name}/${name}-${version}.tar.gz";
+    sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
+  };
+
+  buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
+                  libsndfile libsamplerate pulseaudio pkgconfig alsaLib ];
+
+  meta = {
+    description = "Digital modem program";
+    homepage = http://www.w1hkj.com/Fldigi.html;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20cf14e2a1f..8a7192c970e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8222,6 +8222,8 @@ let
     inherit stdenv fetchurl openssl;
   };
 
+  fldigi = callPackage ../applications/audio/fldigi { };
+
   fluidsynth = callPackage ../applications/audio/fluidsynth { };
 
   fossil = callPackage ../applications/version-management/fossil { };

From 0c45c818129a65de402eaf332a46007281640308 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 18:16:11 -0400
Subject: [PATCH 1210/2033] Use name and pname to follow conventions

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/applications/audio/fldigi/default.nix    | 5 +++--
 pkgs/development/libraries/hamlib/default.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 578619eb3f8..e78095a9c5d 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -3,10 +3,11 @@
 
 stdenv.mkDerivation rec {
   version = "3.21.82";
-  name = "fldigi";
+  pname = "fldigi";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.w1hkj.com/downloads/${name}/${name}-${version}.tar.gz";
+    url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
     sha256 = "1q2fc1zm9kfsjir4g6fh95vmjdq984iyxfcs6q4gjqy1znhqcyqs";
   };
 
diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 495c7e99d4b..e0a6e23c972 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -2,11 +2,12 @@
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hamlib";
+  pname = "hamlib";
   version = "1.2.15.3";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
     sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
   };
 

From 6e2fe51190ab3cf5f77f3ae41220103bff66fc8f Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Sun, 11 May 2014 18:44:38 -0400
Subject: [PATCH 1211/2033] Add minimodem package

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/applications/audio/minimodem/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/audio/minimodem/default.nix

diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
new file mode 100644
index 00000000000..6f2bf8cdb1c
--- /dev/null
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, fftw, fftwSinglePrec, alsaLib, libsndfile, pulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "0.19";
+  pname = "minimodem";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.whence.com/${pname}/${name}.tar.gz";
+    sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
+  };
+
+  buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile pulseaudio ];
+
+  meta = {
+    description = "General-purpose software audio FSK modem";
+    longDescription = ''
+    Minimodem is a command-line program which decodes (or generates) audio
+    modem tones at any specified baud rate, using various framing protocols. It
+    acts a general-purpose software FSK modem, and includes support for various
+    standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and
+    Caller-ID.
+    '';
+    homepage = http://www.whence.com/minimodem/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4388b990d41..9c3a84bdeff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8776,6 +8776,8 @@ let
 
   minicom = callPackage ../tools/misc/minicom { };
 
+  minimodem = callPackage ../applications/audio/minimodem { };
+
   minidjvu = callPackage ../applications/graphics/minidjvu { };
 
   mirage = callPackage ../applications/graphics/mirage {};

From f63b1038e9f8c9948340f6a13722091225be3ccc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 12 May 2014 10:32:46 +0200
Subject: [PATCH 1212/2033] uzbl: Add gsettings_desktop_schemas as build input.
 Closes #2332

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

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 81b4f5c01d9..318b9576392 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -35,5 +35,5 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
 
-  buildInputs = [ webkit pygtk ];
+  buildInputs = [ gsettings_desktop_schemas webkit pygtk ];
 }

From 7d3dcd9a8c36bf33314a664c9d7c90b7ef4d73dd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 12 May 2014 12:29:04 +0200
Subject: [PATCH 1213/2033] Set console=ttyS0 for Amazon EC2 instances, as
 suggested by Amazon.

---
 nixos/modules/virtualisation/amazon-image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 8ce89c09b24..138047a07db 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -70,6 +70,7 @@ with lib;
 
   boot.initrd.kernelModules = [ "xen-blkfront" ];
   boot.kernelModules = [ "xen-netfront" ];
+  boot.kernelParams = [ "console=ttyS0" ];
 
   # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
   boot.loader.grub.version = 1;

From c927cee2c3ad9b205a18535301a9ca7a3c484c95 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 12 May 2014 15:03:42 +0200
Subject: [PATCH 1214/2033] dhcpcd: Allow adding hook code

---
 nixos/modules/services/networking/dhcpcd.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 8799d7d8a20..5a353fc0942 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -57,6 +57,8 @@ let
       #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then
       #    ${config.systemd.package}/bin/systemctl start ip-down.target
       #fi
+
+      ${config.networking.dhcpcd.runHook}
     '';
 
 in
@@ -86,6 +88,16 @@ in
       '';
     };
 
+    networking.dhcpcd.runHook = mkOption {
+      type = types.lines;
+      default = "";
+      example = "if [[ $reason =~ BOUND ]]; then echo $interface: Routers are $new_routers - were $old_routers; fi";
+      description = ''
+         Shell code that will be run after all other hooks. See
+         `man dhcpcd-run-hooks` for details on what is possible.
+      '';
+    };
+
   };
 
 

From 1b22c53fa6fe4386d81a6a96019ffa51c5abce2b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 12 May 2014 16:15:04 +0200
Subject: [PATCH 1215/2033] nm-connection-editor: fix missing schema for gtk3
 FileChooser

---
 pkgs/tools/networking/network-manager-applet/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 8d0d4521b86..85683b16b79 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"
+    wrapProgram "$out/bin/nm-connection-editor" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 6d5db3e93b88fa2c46891eecea90eb42334e2b88 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 25 Apr 2014 16:40:51 -0400
Subject: [PATCH 1216/2033] rust: update to 0.10 release

---
 pkgs/development/compilers/rust/default.nix   | 63 +++++++++----------
 .../compilers/rust/hardcode_paths.patch       | 27 ++++----
 .../compilers/rust/local_stage0.patch         | 13 ++++
 3 files changed, 56 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/local_stage0.patch

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index ebdd49479e0..08dea1f0f7f 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -16,66 +16,65 @@
 
 with if stdenv.system == "i686-linux" then {
   platform = "linux-i386";
-  snapshot = "03e60be1f1b90dddd15f3597bc45ec8d9626b35d";
-  snapshot_sha = "1v1l082gj7d2d4p53xgsxz2k965jcgqhw4cyxmjxc6yh5fw0idx6";
+  snapshot = "3bef5684fd0582fbd4ddebd4514182d4f72924f7";
+  snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
   target = "i686-unknown-linux-gnu";
 } else if stdenv.system == "x86_64-linux" then {
   platform = "linux-x86_64";
-  snapshot = "aa8fbbacdb1d8a078f3a3fe3478dcbc506bd4090";
-  snapshot_sha = "17inc23jpznqp0vnskvznm74mm24c1nffhz2bkadhvp2ww0vpjjx";
+  snapshot = "a7b2af1076d48e4a687a71a21478293e834349bd";
+  snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy";
   target = "x86_64-unknown-linux-gnu";
 } else if stdenv.system == "x86_64-darwin" then {
   platform = "macos-x86_64";
-  snapshot = "ec746585cb20d1f9edffec74f6ff8be6e93a75f7";
-  snapshot_sha = "0r8f8x3x8jb1hm40pbgj4i9ll2y5dgjgvj24qg7mp4crbqcqhkd2";
+  snapshot = "22b884a3876cb3e40ad942ad68a496b5f239fca5";
+  snapshot_sha = "0qabkvyryiwlqhzy1kscff27rx788bv7lh7d8m1hnsv38wqhwqqb";
 } else {};
-let snapshotDate = "2014-01-05";
-    snapshotRev = "a6d3e57";
+let snapshotDate = "2014-03-28";
+    snapshotRev = "b8601a3";
     snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in
 stdenv.mkDerivation {
-  name = "rust-0.9";
+  name = "rust-0.10";
 
   src = fetchurl {
-    url = http://static.rust-lang.org/dist/rust-0.9.tar.gz;
-    sha256 = "1lfmgnn00wrc30nf5lgg52w58ir3xpsnpmzk2v5a35xp8lsir4f0";
+    url = http://static.rust-lang.org/dist/rust-0.10.tar.gz;
+    sha256 = "c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9";
   };
 
-  # We need rust to build rust. If we don't provide it, configure will try to download it
-  snapshot = fetchurl {
-    url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-    sha256 = snapshot_sha;
+  # We need rust to build rust. If we don't provide it, configure will try to download it.
+  snapshot = stdenv.mkDerivation {
+    name = "rust-stage0";
+    src = fetchurl {
+      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+      sha256 = snapshot_sha;
+    };
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + (if stdenv.isLinux then ''
+      patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
+               --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \
+               $out/bin/rustc
+    '' else "");
   };
 
-  # Put the snapshot where it is expected
-  postUnpack = ''
-    mkdir $sourceRoot/dl
-    ln -s $snapshot $sourceRoot/dl/${snapshotName}
-  '';
+  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ];
 
   # The compiler requires cc, so we patch the source to tell it where to find it
-  patches = [ ./hardcode_paths.patch ];
+  patches = [ ./hardcode_paths.patch ./local_stage0.patch ];
   postPatch = ''
     substituteInPlace src/librustc/back/link.rs \
       --subst-var-by "gccPath" ${stdenv.gcc}/bin/cc \
       --subst-var-by "binutilsPath" ${stdenv.gcc.binutils}/bin/ar
   '';
 
-  # Modify the snapshot compiler so that is can be executed
-  preBuild = if stdenv.isLinux then ''
-    make ${target}/stage0/bin/rustc
-    patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \
-             --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \
-             ${target}/stage0/bin/rustc
-  '' else null;
-
   buildInputs = [ which file perl curl python27 makeWrapper ];
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.rust-lang.org/;
     description = "A safe, concurrent, practical language";
-    maintainers = [ stdenv.lib.maintainers.madjar ];
-    license = map (builtins.getAttr "shortName") [ stdenv.lib.licenses.mit stdenv.lib.licenses.asl20 ];
+    maintainers = with maintainers; [ madjar cstrahan ];
+    license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
     # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started
     platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rust/hardcode_paths.patch
index 1500446cea9..b3e26281644 100644
--- a/pkgs/development/compilers/rust/hardcode_paths.patch
+++ b/pkgs/development/compilers/rust/hardcode_paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs
-index 101b2e3..124267f 100644
+index f198a41..3a47e51 100644
 --- a/src/librustc/back/link.rs
 +++ b/src/librustc/back/link.rs
-@@ -728,7 +728,7 @@ pub fn get_cc_prog(sess: Session) -> ~str {
+@@ -730,7 +730,7 @@ pub fn get_cc_prog(sess: &Session) -> ~str {
          _ => {},
      }
  
@@ -10,18 +10,17 @@ index 101b2e3..124267f 100644
 +    ~"@gccPath@"
  }
  
- pub fn get_ar_prog(sess: Session) -> ~str {
-@@ -737,27 +737,9 @@ pub fn get_ar_prog(sess: Session) -> ~str {
+ pub fn get_ar_prog(sess: &Session) -> ~str {
+@@ -739,26 +739,7 @@ pub fn get_ar_prog(sess: &Session) -> ~str {
          None => {}
      }
  
 -    get_system_tool(sess, "ar")
-+    ~"@binutilsPath@"
- }
- 
--fn get_system_tool(sess: Session, tool: &str) -> ~str {
+-}
+-
+-fn get_system_tool(sess: &Session, tool: &str) -> ~str {
 -    match sess.targ_cfg.os {
--        abi::OsAndroid => match sess.opts.android_cross_path {
+-        abi::OsAndroid => match sess.opts.cg.android_cross_path {
 -            Some(ref path) => {
 -                let tool_str = match tool {
 -                    "cc" => "gcc",
@@ -31,14 +30,12 @@ index 101b2e3..124267f 100644
 -            }
 -            None => {
 -                sess.fatal(format!("need Android NDK path for the '{}' tool \
--                                    (--android-cross-path)", tool))
+-                                    (-C android-cross-path)", tool))
 -            }
 -        },
 -        _ => tool.to_owned(),
 -    }
--}
++    ~"@binutilsPath@"
+ }
  
- /// Perform the linkage portion of the compilation phase. This will generate all
- /// of the requested outputs for this compilation session.
-
-
+ fn remove(sess: &Session, path: &Path) {
diff --git a/pkgs/development/compilers/rust/local_stage0.patch b/pkgs/development/compilers/rust/local_stage0.patch
new file mode 100644
index 00000000000..1261b2d458d
--- /dev/null
+++ b/pkgs/development/compilers/rust/local_stage0.patch
@@ -0,0 +1,13 @@
+diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
+index e78f231..6b6773b 100755
+--- a/src/etc/local_stage0.sh
++++ b/src/etc/local_stage0.sh
+@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then
+ fi
+
+ cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
+-cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
+-cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/

From 25e0d51a6793a5773227bda92ae494b73c8df624 Mon Sep 17 00:00:00 2001
From: Strahinja Popovic <stralep@gmail.com>
Date: Mon, 12 May 2014 19:59:40 +0200
Subject: [PATCH 1217/2033] Phabricator, a web application, snapshot of
 2014-05-12

---
 .../web-servers/apache-httpd/phabricator.nix  | 41 ++++++++++++
 nixos/tests/phabricator.nix                   | 66 +++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/apache-httpd/phabricator.nix
 create mode 100644 nixos/tests/phabricator.nix

diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
new file mode 100644
index 00000000000..c7a9bdf68c5
--- /dev/null
+++ b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+let
+  phabricatorRoot = pkgs.stdenv.mkDerivation rec {
+    version = "2014-05-12";
+    name = "phabricator-${version}";
+    srcLibphutil = pkgs.fetchgit {
+        url = git://github.com/facebook/libphutil.git;
+        rev = "2f3b5a1cf6ea464a0250d4b1c653a795a90d2716";
+        sha256 = "9598cec400984dc149162f1e648814a54ea0cd34fcd529973dc83f5486fdd9fd";
+    };
+    srcArcanist = pkgs.fetchgit {
+        url = git://github.com/facebook/arcanist.git;
+        rev = "54c377448db8dbc40f0ca86d43c837d30e493485";
+        sha256 = "086db3c0d1154fbad23e7c6def31fd913384ee20247b329515838b669c3028e0";
+    };
+    srcPhabricator = pkgs.fetchgit {
+        url = git://github.com/facebook/phabricator.git;
+        rev = "1644ef185ecf1e9fca3eb6b16351ef46b19d110f";
+        sha256 = "e1135e4ba76d53f48aad4161563035414ed7e878f39a8a34a875a01b41b2a084";
+    };
+    
+    buildCommand = ''
+      mkdir -p $out
+      cp -R ${srcLibphutil} $out/libphutil
+      cp -R ${srcArcanist} $out/arcanist
+      cp -R ${srcPhabricator} $out/phabricator
+    '';
+  };
+in {
+  enablePHP = true;
+  extraApacheModules = [ "mod_rewrite" ];
+  DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
+  extraConfig = ''
+      DocumentRoot ${phabricatorRoot}/phabricator/webroot
+
+      RewriteEngine on
+      RewriteRule ^/rsrc/(.*) - [L,QSA]
+      RewriteRule ^/favicon.ico - [L,QSA]
+      RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
+  '';
+}
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
new file mode 100644
index 00000000000..8a8c6cb784c
--- /dev/null
+++ b/nixos/tests/phabricator.nix
@@ -0,0 +1,66 @@
+import ./make-test.nix ({ pkgs, ... }: {
+
+  nodes = {
+    storage =
+      { config, pkgs, ... }:
+      { services.nfs.server.enable = true;
+        services.nfs.server.exports = ''
+          /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
+        '';
+        services.nfs.server.createMountPoints = true;
+      };
+
+    webserver =
+      { config, pkgs, ... }:
+      { fileSystems = pkgs.lib.mkVMOverride
+          [ { mountPoint = "/repos";
+              device = "storage:/repos";
+              fsType = "nfs";
+            }
+          ];
+        networking.firewall.enable = false;
+        networking.useDHCP = false;
+
+        services = {
+          httpd = {
+            enable = true;
+            adminAddr = "root@localhost";
+            virtualHosts = [{
+              hostName = "phabricator.local";
+              extraSubservices = [{serviceType = "phabricator";}];
+            }];
+          };
+
+          mysql = {
+            enable = true;
+            package = pkgs.mysql;
+          };
+        };
+
+        environment.systemPackages = [ pkgs.php ];
+      };
+
+    client =
+      { config, pkgs, ... }:
+      { imports = [ ./common/x11.nix ];
+        services.xserver.desktopManager.kde4.enable = true;
+      };
+  };
+
+  testScript =
+    ''
+      startAll;
+
+      $client->waitForX;
+
+      $webserver->waitForUnit("mysql");
+      $webserver->waitForUnit("httpd");
+      $webserver->execute("cd /nix/store; less >/repos/log1");
+
+      $client->sleep(30); # loading takes a long time
+      $client->execute("konqueror http://webserver/ &");
+      $client->sleep(90); # loading takes a long time
+
+      $client->screenshot("screen");
+    '';
+})

From f8a62ff00245c3b051cd9c93020a820f5bc8621d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 13 May 2014 00:08:45 +0400
Subject: [PATCH 1218/2033] Allow no-kernel-module build of SysDig

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 6734563f0ab..1f9abe97f75 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   cmakeFlags = [
     "-DUSE_BUNDLED_LUAJIT=OFF"
     "-DUSE_BUNDLED_ZLIB=OFF"
-  ];
+  ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
   preConfigure = ''
     export INSTALL_MOD_PATH="$out"
   '' + optionalString (kernel != null) ''

From 7be94d3b5956cfd0b1ca36d932490c830b4c2f51 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 12 May 2014 16:48:51 -0500
Subject: [PATCH 1219/2033] Add an expression for build fullly local Hoogle
 docs

---
 .../haskell/hoogle/hoogle-local.diff          |  28 +++++
 .../libraries/haskell/hoogle/local.nix        | 116 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |   3 +
 3 files changed, 147 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hoogle/hoogle-local.diff
 create mode 100644 pkgs/development/libraries/haskell/hoogle/local.nix

diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff
new file mode 100644
index 00000000000..df507c5a470
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local.diff
@@ -0,0 +1,28 @@
+diff --git a/src/CmdLine/All.hs b/src/CmdLine/All.hs
+index 94b1d48..f41f270 100644
+--- a/src/CmdLine/All.hs
++++ b/src/CmdLine/All.hs
+@@ -86,8 +86,10 @@ guessLocal = do
+     ghc <- findExecutable "ghc"
+     home <- getHomeDirectory
+     lib <- getLibDir
++    path <- lookup "HOOGLE_DOC_PATH" <$> getEnvironment
+     let xs = [takeDirectory (takeDirectory lib) </> "doc" {- Windows, installed with Cabal -}  ] ++
+              [takeDirectory (takeDirectory ghc) </> "doc/html/libraries" | Just ghc <- [ghc] {- Windows, installed by GHC -} ] ++
++             maybeToList path ++
+              [home </> ".cabal/share/doc" {- Linux -} ]
+     filterM doesDirectoryExist xs
+ 
+diff --git a/src/Hoogle/Language/Haskell.hs b/src/Hoogle/Language/Haskell.hs
+index b037f11..f2ac047 100644
+--- a/src/Hoogle/Language/Haskell.hs
++++ b/src/Hoogle/Language/Haskell.hs
+@@ -112,7 +112,7 @@ setPriority pkg mod x = x{itemPriority = pri}
+ 
+ setModuleURL (Just pkg) _ x | itemLevel x == 1 = x{itemURL=if null $ itemURL x then f $ itemName x else itemURL x}
+     where f xs = if "http://hackage.haskell.org/package/" `isPrefixOf` itemURL pkg
+-                 then "http://hackage.haskell.org/packages/archive/" ++ itemName pkg ++ "/latest/doc/html/" ++ file
++                 then "http://hackage.haskell.org/package/" ++ itemName pkg ++ "/docs/" ++ file
+                  else takeDirectory (itemURL pkg) ++ "/" ++ file
+               where file = reps '.' '-' xs ++ ".html"
+ setModuleURL _ _ x = x
diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
new file mode 100644
index 00000000000..20816d3b2f9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -0,0 +1,116 @@
+# Install not only the Hoogle library and executable, but also a local Hoogle
+# database which provides "Source" links to all specified 'packages' -- or the
+# current Haskell Platform if no custom package set is provided.
+#
+# It is intended to be used in config.nix similarly to:
+#
+# { packageOverrides = pkgs: rec {
+# 
+#   haskellPackages =
+#     let callPackage = pkgs.lib.callPackageWith haskellPackages;
+#     in pkgs.recurseIntoAttrs (pkgs.haskellPackages.override {
+#         extraPrefs = self: {
+#           hoogleLocal = pkgs.haskellPackages.hoogleLocal.override {
+#             packages = with pkgs.haskellPackages; [
+#               mmorph
+#               monadControl
+#             ]
+#           };
+#         };
+#       });
+# }}
+#
+# This will build mmorph and monadControl, and have the hoogle installation
+# refer to their documentation via symlink so they are not garbage collected.
+
+{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive
+, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes
+, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text
+, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp
+
+, parallel, perl, wget, rehoo, haskellPlatform
+, packages ? haskellPlatform.propagatedUserEnvPkgs
+}:
+
+cabal.mkDerivation (self: rec {
+  pname = "hoogle";
+  version = "4.2.32";
+  sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc";
+  isLibrary = true;
+  isExecutable = true;
+  buildInputs = [ self.ghc Cabal parallel perl wget rehoo ]
+    ++ self.extraBuildInputs ++ packages;
+  buildDepends = [
+      aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
+      deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
+      resourcet safe shake tagsoup text time transformers uniplate vector
+      vectorAlgorithms wai warp parallel perl wget rehoo
+    ];
+  testDepends = [ filepath ];
+  testTarget = "--test-option=--no-net";
+
+  # The tests will fail because of the added documentation.
+  doCheck = false;
+  patches = [ ./hoogle-local.diff ];
+
+  docPackages = packages;
+
+  postInstall = ''
+    if [ -z "$docPackages" ]; then
+        echo "ERROR: The packages attribute has not been set"
+        exit 1
+    fi
+
+    ensureDir $out/share/hoogle/doc
+    export HOOGLE_DOC_PATH=$out/share/hoogle/doc
+
+    cd $out/share/hoogle
+
+    function import_dbs() {
+        find $1 -name '*.txt' \
+            | parallel -j$NIX_BUILD_CORES 'cp -p {} .; perl -i -pe "print \"\@url file://{//}/index.html\n\" if /^\@version/;" {/}; $out/bin/hoogle convert {/}'
+    }
+
+    for i in $docPackages; do
+        import_dbs $i/share/doc
+        ln -sf $i/share/doc/* $out/share/hoogle/doc
+    done
+
+    import_dbs ${self.ghc}/share/doc/ghc*/html/libraries
+    ln -sf ${self.ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc
+
+    unset http_proxy
+    unset ftp_proxy
+
+    chmod 644 *.hoo *.txt
+    $out/bin/hoogle data -d $PWD --redownload -l $(echo *.txt | sed 's/\.txt//g')
+    PATH=$out/bin:$PATH ${rehoo}/bin/rehoo -j4 -c64 .
+
+    rm -fr downloads *.txt *.dep
+    mv default.hoo x || exit 0
+    rm -f *.hoo
+    mv x default.hoo || exit 1
+
+    if [ ! -f default.hoo ]; then
+        echo "Unable to build the default Hoogle database"
+        exit 1
+    fi
+
+    mv $out/bin/hoogle $out/bin/.hoogle-wrapped
+    cat - > $out/bin/hoogle <<EOF
+    #! ${self.stdenv.shell}
+    COMMAND=\$1
+    shift
+    HOOGLE_DOC_PATH=$out/share/hoogle/doc exec $out/bin/.hoogle-wrapped \$COMMAND -d $out/share/hoogle "\$@"
+    EOF
+    chmod +x $out/bin/hoogle
+  '';
+
+  meta = {
+    homepage = "http://www.haskell.org/hoogle/";
+    description = "Haskell API Search";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bfe563a5fcb..27dd8329459 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1464,6 +1464,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {};
 
   hoogle = callPackage ../development/libraries/haskell/hoogle {};
+  hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {
+    parallel = pkgs.parallel;
+  };
 
   hopenssl = callPackage ../development/libraries/haskell/hopenssl {};
 

From 61b94dff81d11b85b7300b5f517344ac6808b395 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 12 May 2014 16:53:11 -0500
Subject: [PATCH 1220/2033] Get glib, gtk+, harfbuzz and pango working on
 Darwin

---
 pkgs/development/libraries/glib/default.nix     |  4 +++-
 pkgs/development/libraries/gtk+/2.x.nix         | 11 +++++++----
 pkgs/development/libraries/harfbuzz/default.nix |  2 +-
 pkgs/development/libraries/pango/default.nix    |  7 ++++++-
 pkgs/top-level/all-packages.nix                 |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 033a1def3ce..b1dd66584f4 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -55,7 +55,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext perl python ];
 
-  propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty;
+  propagatedBuildInputs = [ pcre zlib libffi ]
+    ++ optional (!stdenv.isDarwin) libiconvOrEmpty
+    ++ libintlOrEmpty;
 
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 92c6debaa66..c57179364a7 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -23,14 +23,17 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ glib cairo pango gdk_pixbuf atk ]
-    ++ optionals stdenv.isLinux
-      [ libXrandr libXrender libXcomposite libXi libXcursor ]
-    ++ optional stdenv.isDarwin x11
+    ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
+         libXrandr libXrender libXcomposite libXi libXcursor
+       ]
+    ++ optionals stdenv.isDarwin [ x11 libXdamage ]
     ++ libintlOrEmpty
     ++ optional xineramaSupport libXinerama
     ++ optionals cupsSupport [ cups ];
 
-  configureFlags = "--with-xinput=yes";
+  configureFlags = if stdenv.isDarwin
+    then "--disable-glibtest --disable-introspection --disable-visibility"
+    else "--with-xinput=yes";
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 2e596b17af3..9cdd2a275bf 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
 , icu, graphite2
 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
-, withGraphite2 ? true # it is small and major distros do include it
+, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it
 }:
 
 # TODO: split non-icu and icu lib into different outputs?
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 2dc71bb2d11..1c62a64d006 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -19,7 +19,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # jww (2014-05-05): The tests currently fail on Darwin:
+  #
+  # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)
+  # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
+  # FAIL: testiter
+  doCheck = !stdenv.isDarwin;
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa278924b6..33c3664686f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10762,7 +10762,7 @@ let
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
+      withIcu = true; withGraphite2 = !stdenv.isDarwin;
     };
   };
 

From 5bbcebf2dbe29b7e17d718db6b774991e3070748 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Mon, 12 May 2014 22:17:00 -0400
Subject: [PATCH 1221/2033] Bump coq version to 8.4pl4.

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

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index aa3ba878eb5..687306151e0 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -3,7 +3,7 @@
 {stdenv, fetchurl, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
 
 let 
-  version = "8.4pl3";
+  version = "8.4pl4";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
   idePath = if buildIde then ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0f7v3j4zsrhpswdh47bb30vwgsr0ck79jkkz01a5a74qgxiksn4p";
+    sha256 = "00bzf4kfbd0g279jrr8ynzvb9wqcly3wi577bkrxivhrg2msxhq6";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

From 180bd65cd048c328dd8123fef7d0ba757d93a23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 May 2014 13:07:02 +0200
Subject: [PATCH 1222/2033] lib/strings: simplify removePrefix readability

It was discussed as a part of #2570.
---
 lib/strings.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index a903aa9fbc4..fa3cdd9711e 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -155,8 +155,8 @@ rec {
       preLen = stringLength pre;
       sLen = stringLength s;
     in
-      if pre == substring 0 preLen s then
-        substring preLen (sub sLen preLen) s
+      if hasPrefix pre s then
+        substring preLen (sLen - preLen) s
       else
         s;
 

From bf2bc0f0dc5177bfe5833520b06ae2830031de85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 May 2014 11:05:37 +0200
Subject: [PATCH 1223/2033] lib/strings: add hasPrefix and simplify hasSuffix

It was discussed as a part of #2570.
---
 lib/strings.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index fa3cdd9711e..5f76da5c33c 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -56,12 +56,14 @@ rec {
   optionalString = cond: string: if cond then string else "";
 
 
-  # Determine whether a filename ends in the given suffix.
-  hasSuffix = ext: fileName:
-    let lenFileName = stringLength fileName;
-        lenExt = stringLength ext;
-    in !(lessThan lenFileName lenExt) &&
-       substring (sub lenFileName lenExt) lenFileName fileName == ext;
+  # Determine whether a string has given prefix/suffix.
+  hasPrefix = pref: str:
+     substring 0 (stringLength pref) str == pref;
+  hasSuffix = suff: str:
+    let lenStr = stringLength str;
+        lenSuff = stringLength suff;
+    in lenStr >= lenSuff &&
+       substring (lenStr - lenSuff) lenStr str == suff;
 
 
   # Convert a string to a list of characters (i.e. singleton strings).

From 5112e6476b52927c35ac8ef91656b6db5cde88d6 Mon Sep 17 00:00:00 2001
From: Corey O'Connor <coreyoconnor@gmail.com>
Date: Sun, 11 May 2014 12:56:03 -0700
Subject: [PATCH 1224/2033] resolve issue #2308

---
 nixos/tests/jenkins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index 9d3f76ca3e1..ad7ea78ac49 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -36,6 +36,6 @@ import ./make-test.nix {
     print $slave->execute("sudo -u jenkins groups");
     $slave->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
 
-    $slave->mustFail("systemctl status jenkins.service");
+    $slave->mustFail("systemctl is-enabled jenkins.service");
   '';
 }

From f40db99c7ba2e66c80363dc95d7f4a965720e3f8 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Fri, 9 May 2014 23:25:59 +0800
Subject: [PATCH 1225/2033] fetchurl: Fix typo in comment (close #2591)

---
 pkgs/build-support/fetchurl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index f34640901bb..c74131a9e60 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -64,7 +64,7 @@ in
 , recursiveHash ? false
 
 , # Shell code executed after the file has been fetched
-  # succesfully. This can do things like check or transform the file.
+  # successfully. This can do things like check or transform the file.
   postFetch ? ""
 
 , # Whether to download to a temporary path rather than $out. Useful

From 9e7e3978f9af711ccffcd91b06c126a4f18729f9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 9 May 2014 13:48:27 +0200
Subject: [PATCH 1226/2033] shadow: Fix lastlog and faillog to find logs in
 /var/log

Fixes #2575 and closes #2586.
---
 pkgs/os-specific/linux/shadow/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 9d024ae3109..b52801cacff 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
 
   # Assume System V `setpgrp (void)', which is the default on GNU variants
   # (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
-  preConfigure = "export ac_cv_func_setpgrp_void=yes";
+  preConfigure = ''
+    export ac_cv_func_setpgrp_void=yes
+    export shadow_cv_logdir=/var/log
+  '';
 
   preBuild = assert glibc != null;
     ''

From 8f5fea5ab01106f4043b0e2dbac07d10017c1c22 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Thu, 8 May 2014 14:27:48 +0200
Subject: [PATCH 1227/2033] cppcheck: Build the cfg files (close #2572)

---
 pkgs/development/tools/analysis/cppcheck/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index b3769245bbe..500cef43bcb 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -14,7 +14,11 @@ stdenv.mkDerivation {
     sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff";
   };
 
-  configurePhase = "makeFlags=PREFIX=$out";
+  configurePhase = ''
+    makeFlags="PREFIX=$out CFGDIR=$out/cfg"
+  '';
+
+  postInstall = "cp -r cfg $out/cfg";
 
   meta = {
     description = "Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overrun and more";

From 6db0e3efe54b62f310c6ce1b39993744bfeadc25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 11:48:38 +0200
Subject: [PATCH 1228/2033] python-packages.nix: drop trailing whitespace

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 26345d73950..b9186324811 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1208,16 +1208,16 @@ rec {
 
   cython = buildPythonPackage rec {
     name = "Cython-0.20.1";
-  
+
     src = fetchurl {
       url = "http://www.cython.org/release/${name}.tar.gz";
       sha256 = "0v3nc9z5ynnnjdgcgkyy5g9wazmkjv53nnpjal1v3mr199s6799i";
     };
-  
+
     setupPyBuildFlags = ["--build-base=$out"];
-  
+
     buildInputs = [ pkgs.pkgconfig ];
-  
+
     meta = {
       description = "An interpreter to help writing C extensions for Python 2";
       platforms = stdenv.lib.platforms.all;
@@ -1595,7 +1595,7 @@ rec {
       platforms = stdenv.lib.platforms.all;
     };
   };
-  
+
   urllib3 = buildPythonPackage rec {
     name = "urllib3-1.8";
 
@@ -1603,11 +1603,11 @@ rec {
       url = "https://pypi.python.org/packages/source/u/urllib3/${name}.tar.gz";
       sha256 = "0pdigfxkq8mhzxxsn6isx8c4h9azqywr1k18yanwyxyj8cdzm28s";
     };
-    
+
     preConfigure = ''
       substituteInPlace test-requirements.txt --replace 'nose==1.3' 'nose'
     '';
-    
+
     checkPhase = ''
       nosetests --cover-min-percentage 70
     '';
@@ -1621,7 +1621,7 @@ rec {
     };
   };
 
-  
+
   dropbox = buildPythonPackage rec {
     name = "dropbox-2.0.0";
 
@@ -3114,8 +3114,8 @@ rec {
       maintainers = [ maintainers.bjornfor ];
     };
   };
-  
-  
+
+
   gevent-socketio = buildPythonPackage rec {
     name = "gevent-socketio-0.3.6";
 
@@ -3128,7 +3128,7 @@ rec {
     propagatedBuildInputs = [ gevent ];
 
   };
-  
+
   gevent-websocket = buildPythonPackage rec {
     name = "gevent-websocket-0.9.3";
 
@@ -3306,7 +3306,7 @@ rec {
       url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz";
       md5 = "c7138b9ac7515a42066922d2b6120fbe";
     };
-    
+
     buildInputs = [ pytest ];
 
     meta = {
@@ -6134,8 +6134,8 @@ rec {
       homepage = http://docs.python-requests.org/en/latest/;
     };
   };
-  
-  
+
+
   requests2 = buildPythonPackage rec {
     name = "requests-2.2.1";
 
@@ -7036,7 +7036,7 @@ rec {
       md5 = "ecf0738eaf1229bae27ad2be0f9978a8";
     };
   });
-   
+
   sqlalchemy9 = buildPythonPackage rec {
     name = "SQLAlchemy-0.9.3";
 
@@ -7050,7 +7050,7 @@ rec {
     propagatedBuildInputs = [ modules.sqlite3 ];
 
     checkPhase = ''
-      ${python.executable} sqla_nose.py 
+      ${python.executable} sqla_nose.py
     '';
 
     meta = {
@@ -8698,7 +8698,7 @@ rec {
       maintainers = [ stdenv.lib.maintainers.rickynils ];
     };
   };
-  
+
   versiontools = buildPythonPackage rec {
     name = "versiontools-1.9.1";
 

From dd592d7ef363cf7d8922105f8a89f6fd271bbab1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 13 May 2014 12:04:20 +0200
Subject: [PATCH 1229/2033] spotify: Fix missing src url for qt. Add missing
 dependencies.

---
 pkgs/applications/audio/spotify/default.nix | 64 ++++++++++++++++++---
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 874cc321f8b..a76e7148846 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,24 +1,62 @@
 { fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer, udev }:
+, libgcrypt, chromium, sqlite, gst_plugins_base, gstreamer, udev, fontconfig
+, dbus, expat }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 let
   version = "0.9.4.183";
+
   qt4webkit =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        name = "libqtwebkit4_2.2_i386.deb";
-        url = http://mirrors.us.kernel.org/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_i386.deb;
+        name = "libqtwebkit4_2.3.2_i386.deb";
+        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_i386.deb;
         sha256 = "0hi6cwx2b2cwa4nv5phqqw526lc8p9x7kjkcza9x47ny3npw2924";
       }
     else
       fetchurl {
-        name = "libqtwebkit4_2.2_amd64.deb";
-        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.2~2011week36-0ubuntu1_amd64.deb;
-        sha256 = "0bvy6qz9y19ck391z8c049v07y4vdyvgykpxi7x1nvn078p1imiw";
+        name = "libqtwebkit4_2.3.2_amd64.deb";
+        url = http://ie.archive.ubuntu.com/ubuntu/pool/main/q/qtwebkit-source/libqtwebkit4_2.3.2-0ubuntu7_amd64.deb;
+        sha256 = "0sac88avfivwkfhmd6fik7ili8fdznqas6741dbspf9mfnawbwch";
       };
+
+  deps = [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    GConf
+    gdk_pixbuf
+    glib
+    gst_plugins_base
+    gstreamer
+    gtk
+    libgcrypt
+    libpng
+    nss
+    pango
+    qt4
+    sqlite
+    stdenv.gcc.gcc
+    xlibs.libX11
+    xlibs.libXcomposite
+    xlibs.libXdamage
+    xlibs.libXext
+    xlibs.libXfixes
+    xlibs.libXi
+    xlibs.libXrandr
+    xlibs.libXrender
+    xlibs.libXrender
+    xlibs.libXScrnSaver
+    #xlibs.libXss
+  ];
+
 in
 
 stdenv.mkDerivation {
@@ -64,21 +102,29 @@ stdenv.mkDerivation {
 
       mkdir -p $out/bin
 
+      rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.gcc.gcc}/lib64"
+
       ln -s $out/spotify-client/spotify $out/bin/spotify
+
       patchelf \
         --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        --set-rpath $out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.lib.makeLibraryPath [ xlibs.libXScrnSaver xlibs.libX11 qt4 alsaLib stdenv.gcc.gcc freetype glib pango cairo atk gdk_pixbuf gtk GConf cups sqlite xlibs.libXdamage ]}:${stdenv.gcc.gcc}/lib64 \
-        $out/spotify-client/spotify
+        --set-rpath $rpath $out/spotify-client/spotify
+
+      patchelf \
+        --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper
 
       dpkg-deb -x ${qt4webkit} ./
       mkdir -p $out/lib/
       cp -v usr/lib/*/* $out/lib/
 
       preload=$out/libexec/spotify/libpreload.so
+      librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib"
       mkdir -p $out/libexec/spotify
       gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
 
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ GConf libpng cups libgcrypt sqlite gst_plugins_base gstreamer xlibs.libXdamage ]}:$out/lib"
+      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
+      wrapProgram $out/spotify-client/Data/SpotifyHelper --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
 
       # Desktop file
       mkdir -p "$out/share/applications/"

From b56e41aebe17462a663984dd8a73190582bf7f12 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Wed, 7 May 2014 03:56:41 -0400
Subject: [PATCH 1230/2033] Add eb-garamond font (close #2553)

@vcunat added license, changed attribute name according to the [rules],
and trivial refactoring.
[rules]: http://nixos.org/nixpkgs/manual/#idm140333184443184 ("package naming")
---
 pkgs/data/fonts/eb-garamond/default.nix | 50 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/data/fonts/eb-garamond/default.nix

diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix
new file mode 100644
index 00000000000..99c9b53217e
--- /dev/null
+++ b/pkgs/data/fonts/eb-garamond/default.nix
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+  , unzip
+  , ...}:
+builderDefsPackage
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    version="0.016";
+    name="EBGaramond";
+    url="https://bitbucket.org/georgd/eb-garamond/downloads/${name}-${version}.zip";
+    hash="0y630khn5zh70al3mm84fs767ac94ffyz1w70zzhrhambx07pdx0";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  name = "eb-garamond-${sourceInfo.version}";
+  inherit buildInputs;
+
+  phaseNames = ["doUnpack" "installFonts"];
+
+  # This will clean up if/when 8263996 lands.
+  doUnpack = a.fullDepEntry (''
+    unzip ${src}
+    cd ${sourceInfo.name}*
+    mv {ttf,otf}/* .
+  '') ["addInputs"];
+
+  meta = with a.lib; {
+    description = "Digitization of the Garamond shown on the Egenolff-Berner specimen";
+    maintainers = with maintainers; [ relrod ];
+    platforms = platforms.all;
+    license = licenses.ofl;
+    homepage = http://www.georgduffner.at/ebgaramond/;
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "https://github.com/georgd/EB-Garamond/releases";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fd1ca0490c..c206d32eeac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7638,6 +7638,8 @@ let
 
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
 
+  eb-garamond = callPackage ../data/fonts/eb-garamond { };
+
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   freepats = callPackage ../data/misc/freepats { };

From 64948222bab3abaefc57587eba25b2feebcd3c61 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 5 May 2014 22:56:41 -0300
Subject: [PATCH 1231/2033] Aegisub: update to 3.1.3 (close #2550)

New dependencies: icu, intltool, boost (default = 1.55), wxGTK 3.0
Fixes a bug on Boost detection
@vcunat: minor refactoring.
---
 pkgs/applications/video/aegisub/default.nix | 19 +++++++++++--------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 3824582970f..41b25401367 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -4,6 +4,7 @@
 , mesa
 , libass, fftw, ffms
 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
+, icu, boost, intltool # New dependencies
 , spellChecking ? true, hunspell ? null
 , automationSupport ? true, lua ? null
 , openalSupport ? false, openal ? null
@@ -28,8 +29,10 @@ stdenv.mkDerivation rec {
     sha256 = "0n2y5cggayr8246p2cvrz0ajlhhvmzcgsp7nljnm21jypk15pspg";
   };
 
+  nativeBuildInputs = [ intltool ];
+
   buildInputs = with stdenv.lib;
-  [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib ]
+  [ libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost ]
   ++ optional spellChecking hunspell
   ++ optional automationSupport lua
   ++ optional openalSupport openal
@@ -38,13 +41,13 @@ stdenv.mkDerivation rec {
   ++ optional portaudioSupport portaudio
   ;
 
-  NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm";
+  NIX_LDFLAGS = "-liconv -lavutil -lavformat -lavcodec -lswscale -lz -lm -lGL";
 
-  preConfigure = "cd aegisub";
+  configureFlags = "--with-boost-libdir=${boost}/lib/";
 
-  postInstall = "ln -s $out/bin/aegisub-3.0 $out/bin/aegisub";
+  postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An advanced subtitle editor";
     longDescription = ''
       Aegisub is a free, cross-platform open source tool for creating and
@@ -53,12 +56,12 @@ stdenv.mkDerivation rec {
       built-in real-time video preview.
     '';
     homepage = http://www.aegisub.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
               # The Aegisub sources are itself BSD/ISC,
               # but they are linked against GPL'd softwares
               # - so the resulting program will be GPL
-    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
 
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c206d32eeac..e7d257d422e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -426,7 +426,7 @@ let
   aefs = callPackage ../tools/filesystems/aefs { };
 
   aegisub = callPackage ../applications/video/aegisub {
-    wxGTK = wxGTK29;
+    wxGTK = wxGTK30;
     lua = lua5_1;
   };
 

From 11f1d0e377fbc951fa34b729400d1d190fc40299 Mon Sep 17 00:00:00 2001
From: Dario Bertini <berdario@gmail.com>
Date: Tue, 6 May 2014 17:05:08 +0200
Subject: [PATCH 1232/2033] redis: update to 2.8.9 (close #2541)

---
 pkgs/servers/nosql/redis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 777fb31ac97..e8736f237c1 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "redis-2.6.13";
+  name = "redis-2.8.9";
 
   src = fetchurl {
-    url = "http://redis.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0j79a5vmdy0c1df89ymqk37kz8q2iqlzg81qwnz0djjqdiikk51v";
+    url = "http://download.redis.io/releases/${name}.tar.gz";
+    sha256 = "7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f";
   };
 
   makeFlags = "PREFIX=$(out)";

From 977248ba15ddaab007d4eeb48aa6f1bee6527ec3 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Sun, 20 Apr 2014 10:21:04 +0800
Subject: [PATCH 1233/2033] codeblocks: new package 13.12 (close #2533)

@vcunat: minor refactoring.
---
 .../editors/codeblocks/default.nix            | 37 +++++++++++++++++++
 .../codeblocks/writable-projects.patch        | 18 +++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 3 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/editors/codeblocks/default.nix
 create mode 100644 pkgs/applications/editors/codeblocks/writable-projects.patch

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
new file mode 100644
index 00000000000..73e9189e63a
--- /dev/null
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
+, contribPlugins ? false, hunspell, gamin , boost
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
+  version = "13.12";
+  pname = "codeblocks";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz";
+    sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p";
+  };
+
+  buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
+    ++ stdenv.lib.optionals contribPlugins [ hunspell gamin boost ];
+  enableParallelBuilding = true;
+  patches = [ ./writable-projects.patch ];
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+  postConfigure = "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
+  configureFlags = [ "--enable-pch=no" ]
+    ++ stdenv.lib.optional contribPlugins "--with-contrib-plugins";
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.linquize ];
+    platforms = platforms.all;
+    description = "The open source, cross platform, free C, C++ and Fortran IDE";
+    longDescription =
+      ''
+        Code::Blocks is a free C, C++ and Fortran IDE built to meet the most demanding needs of its users.
+        It is designed to be very extensible and fully configurable.
+        Finally, an IDE with all the features you need, having a consistent look, feel and operation across platforms.
+      '';
+    homepage = http://www.codeblocks.org;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/editors/codeblocks/writable-projects.patch b/pkgs/applications/editors/codeblocks/writable-projects.patch
new file mode 100644
index 00000000000..3b6364a52a1
--- /dev/null
+++ b/pkgs/applications/editors/codeblocks/writable-projects.patch
@@ -0,0 +1,18 @@
+diff --git a/src/plugins/scriptedwizard/wiz.cpp b/src/plugins/scriptedwizard/wiz.cpp
+index 0eb4b27..7d469fe 100644
+--- a/src/plugins/scriptedwizard/wiz.cpp
++++ b/src/plugins/scriptedwizard/wiz.cpp
+@@ -785,6 +785,13 @@ void Wiz::CopyFiles(cbProject* theproject, const wxString&  prjdir, const wxStri
+             }
+         }
+         if (do_copy) wxCopyFile(srcfile, dstfile, true);
++        // Noticed! Files in Nix Store are readonly, so make the copied file writable
++        if (do_copy)
++        {
++            struct stat statbuf;
++            if (!::stat(dstfile.mb_str(), &statbuf))
++                ::chmod(dstfile.mb_str(), statbuf.st_mode | 0200);
++        }
+ 
+         // and add it to the project
+         fname.MakeRelativeTo(prjdir);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7d257d422e..7584f46688d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7931,6 +7931,9 @@ let
     libpng = libpng12;
   };
 
+  codeblocks = callPackage ../applications/editors/codeblocks { };
+  codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
+
   codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
     inherit makeWrapper;
     python = pythonFull;

From 9120a5a717852671a15fff7680b49fa0907d6b37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 13:19:38 +0200
Subject: [PATCH 1234/2033] python-avro: add version 1.7.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9186324811..783005ce355 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -483,6 +483,20 @@ rec {
     };
   });
 
+  avro = buildPythonPackage (rec {
+    name = "avro-1.7.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
+      md5 = "7f4893205e5ad69ac86f6b44efb7df72";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A serialization and RPC framework";
+      homepage = "https://pypi.python.org/pypi/avro/";
+    };
+  });
+
   backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec {
     name = "backports.ssl_match_hostname-3.4.0.2";
 

From e9aa157ab92c0c4b2f32fdf3c062172dac7071bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 13:19:50 +0200
Subject: [PATCH 1235/2033] python-redis: add version 2.9.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 783005ce355..49c584d6eb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6213,6 +6213,23 @@ rec {
     };
   };
 
+  redis = buildPythonPackage rec {
+    name = "redis-2.9.1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/r/redis/${name}.tar.gz";
+      sha256 = "1r7lrh4kxccyhr4pyp13ilymmvh22pi7aa9514dmnhi74zn4g5xg";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "Python client for Redis key-value store";
+      homepage = "https://pypi.python.org/pypi/redis/";
+    };
+  };
+
+
   requests_oauth2 = buildPythonPackage rec {
     name = "requests-oauth2-0.1.1";
 

From abbf643ae2dc03278133a65b3eb220a3293b3bbf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 13 May 2014 13:27:21 +0200
Subject: [PATCH 1236/2033] linux: Update to 3.12.19

Backport: 14.04
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index c5997532e57..79fead697b5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.18";
+  version = "3.12.19";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0w0nwkhrbxa9yqnj6mvckkxdqn291mw4pxa309alcga3wn29mwis";
+    sha256 = "1f59lyyyc4anaj50dzb9448gz6n9fdrcy2mvd7f193pp6018gdp6";
   };
 
   features.iwlwifi = true;

From 45e1c78a81171ecf444327fc60592fc49f6b3be4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 15:47:03 +0200
Subject: [PATCH 1237/2033] python-shapely: add version 1.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49c584d6eb3..d83e6beaa2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6708,6 +6708,30 @@ rec {
     };
   };
 
+  shapely = buildPythonPackage rec {
+    name = "Shapely-1.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/S/Shapely/${name}.tar.gz";
+      sha256 = "099sc7ajpp6hbgrx3c0bl6hhkz1mhnr0ahvc7s4i3f3b7q1zfn7l";
+    };
+
+    propagatedBuildInputs = [ pkgs.geos ];
+
+    preConfigure = ''
+      export LANG="en_US.UTF-8";
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
+      export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive";
+    '';
+
+    doCheck = false; # won't suceed for unknown reasons that look harmless, though
+
+    meta = with stdenv.lib; {
+      description = "Geometric objects, predicates, and operations";
+      homepage = "https://pypi.python.org/pypi/Shapely/";
+    };
+  };
+
   pydns = buildPythonPackage rec {
     name = "pydns-2.3.6";
 

From f76e56fb38c15ff5aa1b6da5773ceb32b22b9383 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 8 May 2014 01:17:03 +1200
Subject: [PATCH 1238/2033] Update tor to 0.2.4.21

---
 pkgs/tools/security/tor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index dd4d797825f..5062d26595e 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libevent, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.3.25";
+  name = "tor-0.2.4.21";
 
   src = fetchurl {
-    url = "http://www.torproject.org/dist/${name}.tar.gz";
-    sha256 = "bb2d6f1136f33e11d37e6e34184143bf191e59501613daf33ae3d6f78f3176a0";
+    url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
+    sha256 = "1kpijqapml7y4sl54qgyrzppxxhmy4xgk2y7wkqwjxn7q24g97d1";
   };
 
   buildInputs = [ libevent openssl zlib ];

From 9bea7981633a0a2612b739f961cb2f9c8f60c898 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 15:54:54 +0200
Subject: [PATCH 1239/2033] python-itsdangerous: add version 0.24

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d83e6beaa2a..73dfa9beb81 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1895,6 +1895,20 @@ rec {
     };
   };
 
+  itsdangerous = buildPythonPackage rec {
+    name = "itsdangerous-0.24";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/i/itsdangerous/${name}.tar.gz";
+      sha256 = "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb";
+    };
+
+    meta = with stdenv.lib; {
+      description = "helpers to pass trusted data to untrusted environments and back";
+      homepage = "https://pypi.python.org/pypi/itsdangerous/";
+    };
+  };
+
   # TODO: this shouldn't use a buildPythonPackage
   koji = buildPythonPackage (rec {
     name = "koji-1.8";

From f8e185776a81c7e7467122ca6d2d1609dd5f9940 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 15:55:09 +0200
Subject: [PATCH 1240/2033] python-werkzeug: update to 0.9.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 73dfa9beb81..9e8a826941a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7810,13 +7810,17 @@ rec {
 
 
   werkzeug = buildPythonPackage {
-    name = "werkzeug-0.8.3";
+    name = "werkzeug-0.9.4";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.3.tar.gz";
-      md5 = "12aa03e302ce49da98703938f257347a";
+      url = "http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.9.4.tar.gz";
+      md5 = "670fad41f57c13b71a6816765765a3dd";
     };
 
+    propagatedBuildInputs = [ itsdangerous ];
+
+    doCheck = false;            # tests fail, not sure why
+
     meta = {
       homepage = http://werkzeug.pocoo.org/;
       description = "A WSGI utility library for Python";

From 50cf5549c2ffc1f56334df250f02fdaa7048f00f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 15:55:23 +0200
Subject: [PATCH 1241/2033] python-flask: update to 0.10.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e8a826941a..0bd70aab470 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2919,11 +2919,11 @@ rec {
 
 
   flask = buildPythonPackage {
-    name = "flask-0.9";
+    name = "flask-0.10.1";
 
     src = fetchurl {
-      url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.9.tar.gz";
-      md5 = "4a89ef2b3ab0f151f781182bd0cc8933";
+      url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz";
+      md5 = "378670fe456957eb3c27ddaef60b2b24";
     };
 
     propagatedBuildInputs = [ werkzeug jinja2 ];

From 1d1a1c258590c876071762f6ac341ae29ac8752f Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 8 May 2014 01:24:20 +1200
Subject: [PATCH 1242/2033] Update tor-browser to 3.6

---
 pkgs/tools/security/tor/torbrowser.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 2554e999e0d..8ee33272eda 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "3.5";
+  version = "3.6.1";
 
   src = fetchurl {
-    url = "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
+    url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "e448dc90365a88d73a6ff85347adbe763ef0f800d0cb2e7b7165d7f0646f7c41" else
-      "b0b29b4e75cd4a1aaecf7f4716216edcfc5947516744e2eaeae38bec1d03cea1";
+      "1461l54zc7xgx2zcmi8wra38dknjyy8d2xk84chrwl6ckn2dfzv3" else
+      "183a1wf4a88sijfqr3m6gmvncq8w60i2rkymccg422n7q96j7hqs";
   };
 
   patchPhase = ''

From ade6cd25be321f71ceccc61aa178e6e4c643e95d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:10:17 +0200
Subject: [PATCH 1243/2033] python-astroid: add version 1.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0bd70aab470..0c9b34cd1d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -460,6 +460,15 @@ rec {
     };
   });
 
+  astroid = buildPythonPackage (rec {
+    name = "astroid-1.1.1";
+    propagatedBuildInputs = [ logilab_common ];
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz";
+      sha256 = "1x7103mlzndgg66yas6xrfwkwpihcq4bi9m8py1fjnhz8p5ka1vq";
+    };
+  });
+
   autopep8 = buildPythonPackage (rec {
     name = "autopep8-1.0";
 

From 55a99f6bd54edeb5c5732f4a7b74a16e3d5c5b9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:10:35 +0200
Subject: [PATCH 1244/2033] python-avro3k: add version 1.7.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c9b34cd1d6..bc6953b34a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -506,6 +506,20 @@ rec {
     };
   });
 
+  avro3k = pkgs.lowPrio (buildPythonPackage (rec {
+    name = "avro3k-1.7.7-SNAPSHOT";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
+      sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A serialization and RPC framework";
+      homepage = "https://pypi.python.org/pypi/avro3k/";
+    };
+  }));
+
   backports_ssl_match_hostname_3_4_0_2 = pythonPackages.buildPythonPackage rec {
     name = "backports.ssl_match_hostname-3.4.0.2";
 

From 1fe094d2b84bb01e16d30087d66a29fba3c4c944 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:11:06 +0200
Subject: [PATCH 1245/2033] pylint: update to version 1.2.1

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index df95e56377d..552def7241b 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "pylint-0.28.0";
+  name = "pylint-1.2.1";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://download.logilab.org/pub/pylint/${name}.tar.gz";
-    sha256 = "1077hs8zpl1q5yc6wcg645nfqc4pwbdk8vjcv0qrldbb87f3yv7a";
+    url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz";
+    sha256 = "0q7zj5hgmz27wifhcqyaddc9yc5b2q6p16788zzm3da6qshv7xk3";
   };
 
-  propagatedBuildInputs = [ pythonPackages.logilab_astng ];
+  propagatedBuildInputs = with pythonPackages; [ astroid ];
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp

From acca749e663660b450b73d16d26db26723b0f08b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:13:49 +0200
Subject: [PATCH 1246/2033] python-avro3k: test suite no work

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc6953b34a7..3ebcf7955bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -514,6 +514,8 @@ rec {
       sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
     };
 
+    doCheck = false;        # No such file or directory: './run_tests.py
+
     meta = with stdenv.lib; {
       description = "A serialization and RPC framework";
       homepage = "https://pypi.python.org/pypi/avro3k/";

From 2083a2307300a3e9a487f5d8c4ff237c8610809c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:33:05 +0200
Subject: [PATCH 1247/2033] all-packages.nix: switch 'python3' to python 3.4.x

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7584f46688d..413f3c34115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3454,18 +3454,13 @@ let
     llvm = llvm_33 ;
   };
 
-  python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { });
+  python26 = callPackage ../development/interpreters/python/2.6 { db = db47; };
+  python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; };
   python32 = callPackage ../development/interpreters/python/3.2 { };
   python33 = callPackage ../development/interpreters/python/3.3 { };
-  python34 = callPackage ../development/interpreters/python/3.4 { };
-
+  python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
   python = python27;
-  python26 = callPackage ../development/interpreters/python/2.6 {
-    db = db47;
-  };
-  python27 = callPackage ../development/interpreters/python/2.7 {
-    libX11 = xlibs.libX11;
-  };
+  python3 = python34;
 
   pypy = callPackage ../development/interpreters/pypy/2.2 { };
 

From b86f2172816acdb4b53e81ee77e6cce2bf79f21b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 16:49:34 +0200
Subject: [PATCH 1248/2033] python-shapely: bake path to libgeos_c into the
 library

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ebcf7955bd..9a18791a190 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6755,7 +6755,7 @@ rec {
       sha256 = "099sc7ajpp6hbgrx3c0bl6hhkz1mhnr0ahvc7s4i3f3b7q1zfn7l";
     };
 
-    propagatedBuildInputs = [ pkgs.geos ];
+    buildInputs = [ pkgs.geos ];
 
     preConfigure = ''
       export LANG="en_US.UTF-8";
@@ -6763,6 +6763,10 @@ rec {
       export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive";
     '';
 
+    patchPhase = ''
+      sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py
+    '';
+
     doCheck = false; # won't suceed for unknown reasons that look harmless, though
 
     meta = with stdenv.lib; {

From 5fc3df831c41a1ad3cd2a0215c38d9f0a5b3b682 Mon Sep 17 00:00:00 2001
From: Athan Clark <athan.clark@gmail.com>
Date: Tue, 13 May 2014 10:35:57 -0600
Subject: [PATCH 1249/2033] Simple typo

---
 nixos/modules/hardware/video/nvidia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 0ca5558ee10..2b9221ec5d7 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -18,7 +18,7 @@ let
       config.boot.kernelPackages.nvidia_x11
     else if elem "nvidiaLegacy173" drivers then
       config.boot.kernelPackages.nvidia_x11_legacy173
-    else if elem "nvidiaLegacy304" videoDrivers then
+    else if elem "nvidiaLegacy304" drivers then
       config.boot.kernelPackages.nvidia_x11_legacy304
     else throw "impossible";
 

From 9c8ee7a7e55259d1c351c8343e00c6db9353eca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 May 2014 14:07:58 +0200
Subject: [PATCH 1250/2033] linux: minor updates, probably often fixing
 CVE-2014-0196

---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.2.nix  | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index c6a20ec26dd..cb20cd8bf69 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.38";
+  version = "3.10.39";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1y4aalwf8nh3g5x59zgfjrzs1y4x2cv6c5c981db0ixbn963nbpx";
+    sha256 = "1zl51dhcfyynii808mfvdjfq349wgfj1p4i8qbb786ancxam2ln4";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 0a1775d32c1..e513fa2e3cd 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.2";
+  version = "3.14.4";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0grf6hksx4gidqim05blsnvk5037y852smr8mn0hcnbwvvp1hxal";
+    sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index a73ded41edf..c0c32b051d6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.57";
+  version = "3.2.58";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0njiqa5fi82a4dls9z1cp33lza00bg15x93c19bsyalp53xqbnab";
+    sha256 = "1mszzixiv4k61m241dl2n5s8rca26l6hc40v23lha814nrahjkn1";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 5585c6ee07a..09d970065c5 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.88";
+  version = "3.4.89";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0l2ccrsr7ga6rhjb58vq7xxhym7n90m7n181hwpi707wikhz80rd";
+    sha256 = "1ldhdbfjvha1z9csnl518qdm3w8w284f59dgn4adg8a0ig6lybk6";
   };
 
   features.iwlwifi = true;

From 93e65a4d5308d3d6e4ea95e7cad6997b037dfd7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 May 2014 20:07:13 +0200
Subject: [PATCH 1251/2033] codeblocks: fix eval on non-linux, minor
 refactoring

---
 pkgs/applications/editors/codeblocks/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 73e9189e63a..1bf4bb1f8e6 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk
-, contribPlugins ? false, hunspell, gamin , boost
+, contribPlugins ? false, hunspell, gamin, boost
 }:
 
+with { inherit (stdenv.lib) optionalString optional optionals; };
+
 stdenv.mkDerivation rec {
   name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}";
   version = "13.12";
@@ -13,13 +15,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ]
-    ++ stdenv.lib.optionals contribPlugins [ hunspell gamin boost ];
+    ++ optionals contribPlugins [ hunspell gamin boost ];
   enableParallelBuilding = true;
   patches = [ ./writable-projects.patch ];
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-  postConfigure = "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
+  postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig";
   configureFlags = [ "--enable-pch=no" ]
-    ++ stdenv.lib.optional contribPlugins "--with-contrib-plugins";
+    ++ optional contribPlugins "--with-contrib-plugins";
 
   meta = with stdenv.lib; {
     maintainers = [ maintainers.linquize ];

From 61cd66944e02c26d1c8cdefff8aaa681ab0bbee9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 23:31:44 +0200
Subject: [PATCH 1252/2033] all-packages.nix: ensure that python3 and
 python3Packages refer to the same version!
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Vladimír for the suggestion.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 413f3c34115..bc232e91bbc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3460,7 +3460,7 @@ let
   python33 = callPackage ../development/interpreters/python/3.3 { };
   python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
   python = python27;
-  python3 = python34;
+  python3 = python3Packages.python;
 
   pypy = callPackage ../development/interpreters/pypy/2.2 { };
 
@@ -6326,7 +6326,7 @@ let
     python = python26;
   };
 
-  python3Packages = python33Packages;
+  python3Packages = python34Packages;
 
   python33Packages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;

From 633e396f3e3bbc1f6a8b821ca2bfd62564040f41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 23:35:39 +0200
Subject: [PATCH 1253/2033] python-avro3k: use more reliable download link

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a18791a190..e51bc9e9440 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -510,7 +510,7 @@ rec {
     name = "avro3k-1.7.7-SNAPSHOT";
 
     src = fetchurl {
-      url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz";
       sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky";
     };
 

From 10773e19177826368aa54d599a65265f77f4f1d4 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 9 May 2014 23:20:13 -0500
Subject: [PATCH 1254/2033] notbit: Bump to git-faf0930

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

diff --git a/pkgs/applications/networking/notbit/default.nix b/pkgs/applications/networking/notbit/default.nix
index db900f9ff25..8a7d7d3aedc 100644
--- a/pkgs/applications/networking/notbit/default.nix
+++ b/pkgs/applications/networking/notbit/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "notbit-0.2-28-g06f9160";
+  name = "notbit-git-faf0930";
 
   src = fetchgit {
-    url = "git://git.busydoingnothing.co.uk/notbit";
-    rev = "06f916081836de12f8e57a9f50c95d4d1b51627f";
-    sha256 = "d5c38eea1d9ca213bfbea5c88350478a5088b5532e939de9680d72e60aa65288";
+    url = "git://github.com/bpeel/notbit";
+    rev = "faf09304bf723e75f3d98cca93cf45236ee9d6b6";
+    sha256 = "b229f87c4c5e901bfd8b13dffe31157126d98ed02118fff6553e8b58eb9ed030";
   };
 
   buildInputs = [ autoconf automake pkgconfig openssl ];

From 6ddafad82a2928dce84ad6a741478161ee50e790 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 13 May 2014 16:49:31 -0500
Subject: [PATCH 1255/2033] openvpn: Update 2.3.3 -> 2.3.4

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 0ce22b7800e..f06a36a96f5 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.3";
+  name = "openvpn-2.3.4";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "04xiwim56sb1vis93k9hhm1s29jdrlq7i2fa07jncnhh653d29gh";
+    sha256 = "0nn8rrh6jadsydnym69r4s7rm6jzsgxb6p23yb9ai3sn91gnsl5g";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;

From f43d070865aabc43ef7c226ed8a261fa6a138dc9 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 13 May 2014 00:31:10 -0400
Subject: [PATCH 1256/2033] biosdevname: add package

---
 pkgs/tools/networking/biosdevname/default.nix | 36 +++++++++++++++++++
 .../networking/biosdevname/makefile.patch     | 13 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 pkgs/tools/networking/biosdevname/default.nix
 create mode 100644 pkgs/tools/networking/biosdevname/makefile.patch

diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
new file mode 100644
index 00000000000..89872548aa9
--- /dev/null
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchgit, automake, autoconf, zlib, pciutils}:
+let
+  version = "0.5.1";
+in
+stdenv.mkDerivation {
+  name = "biosdevname-${version}";
+  
+  src = fetchgit {
+    url = git://linux.dell.com/biosdevname.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "0qmgfyqv13qwh86140q0qdjxys76arg2d1slyvijx6r314ca4r7z";
+  };
+
+  buildInputs = [
+    automake
+    autoconf
+    zlib
+    pciutils
+  ];
+
+  preConfigure = ''
+    autoreconf -i
+  '';
+
+  # Don't install /lib/udev/rules.d/*-biosdevname.rules
+  patches = [ ./makefile.patch ];
+
+  configureFlags = [ "--sbindir=\${out}/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "Udev helper for naming devices per BIOS names";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/networking/biosdevname/makefile.patch b/pkgs/tools/networking/biosdevname/makefile.patch
new file mode 100644
index 00000000000..0fc083f9096
--- /dev/null
+++ b/pkgs/tools/networking/biosdevname/makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 14d9a92..9e324d2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,8 +8,6 @@ dist_noinst_DATA = biosdevname.rules.in biosdevname.spec.fedora biosdevname.spec
+ 
+ CLEANFILES = version src/bios_dev_name.h
+ install-data-local:
+-	mkdir -p $(DESTDIR)@RULEDIR@
+-	$(INSTALL_DATA) $(top_srcdir)/biosdevname.rules.in $(DESTDIR)@RULEDEST@
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)@RULEDEST@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84ee89aa461..80b6bd40d9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ let
 
   usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { };
 
+  biosdevname = callPackage ../tools/networking/biosdevname { };
+
   clamav = callPackage ../tools/security/clamav { };
 
   cloc = callPackage ../tools/misc/cloc {

From 8915390baba34222e61af7e9172dd141fa8f653a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 13 May 2014 20:19:27 -0500
Subject: [PATCH 1257/2033] notbit: Use the correct default port

---
 nixos/modules/services/networking/notbit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index b9743504239..63a33289346 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -35,7 +35,7 @@ with lib;
 
       port = mkOption {
         type = types.uniq types.int;
-        default = 8443;
+        default = 8444;
         description = "The port which the daemon listens for other bitmessage clients";
       };
 

From 042273e528b5e5837984f56f435053b8c5382770 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 13 May 2014 20:19:57 -0500
Subject: [PATCH 1258/2033] notbit: Don't include unecessary notbit binaries in
 the environment

---
 nixos/modules/services/networking/notbit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index 63a33289346..b6a2b7897ca 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -53,7 +53,7 @@ with lib;
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.notbit sendmail ];
+    environment.systemPackages = [ sendmail ];
 
     systemd.services.notbit = {
       description = "Notbit daemon";

From 08467c14deffcf33e0a1861c2dd50f7ebfd98852 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Tue, 13 May 2014 20:20:19 -0500
Subject: [PATCH 1259/2033] notbit: Add additional options to the daemon

---
 nixos/modules/services/networking/notbit.nix | 39 +++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
index b6a2b7897ca..3e8c956f191 100644
--- a/nixos/modules/services/networking/notbit.nix
+++ b/nixos/modules/services/networking/notbit.nix
@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 
+with pkgs.lib;
 let
   cfg = config.services.notbit;
   varDir = "/var/lib/notbit";
@@ -14,6 +15,10 @@ let
         --set XDG_RUNTIME_DIR ${varDir}
     '';
   };
+  opts = "${optionalString cfg.allowPrivateAddresses "-L"} ${optionalString cfg.noBootstrap "-b"} ${optionalString cfg.specifiedPeersOnly "-e"}";
+  peers = concatStringsSep " " (map (str: "-P \"${str}\"") cfg.peers);
+  listen = if cfg.listenAddress == [] then "-p ${toString cfg.port}" else
+    concatStringsSep " " (map (addr: "-a \"${addr}:${toString cfg.port}\"") cfg.listenAddress);
 in
 
 with lib;
@@ -45,6 +50,38 @@ with lib;
         description = "Set the nice level for the notbit daemon";
       };
 
+      listenAddress = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "localhost" "myhostname" ];
+        description = "The addresses which notbit will use to listen for incoming connections. These addresses are advertised to connecting clients.";
+      };
+
+      peers = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "bitmessage.org:8877" ];
+        description = "The initial set of peers notbit will connect to.";
+      };
+
+      specifiedPeersOnly = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "If true, notbit will only connect to peers specified by the peers option.";
+      };
+
+      allowPrivateAddresses = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "If true, notbit will allow connections to to RFC 1918 addresses.";
+      };
+
+      noBootstrap = mkOption {
+        type = types.uniq types.bool;
+        default = false;
+        description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers";
+      };
+
     };
 
   };
@@ -70,7 +107,7 @@ with lib;
 
       serviceConfig = {
         Type = "forking";
-        ExecStart = "${pkgs.notbit}/bin/notbit -d -p ${toString cfg.port}";
+        ExecStart = "${pkgs.notbit}/bin/notbit -d ${listen} ${peers} ${opts}";
         User = "notbit";
         Group = "notbit";
         UMask = "0077";

From 4fcdc3292487d594494a059c59264009a3b564c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 14 May 2014 09:59:36 +0200
Subject: [PATCH 1260/2033] Adding rkflashtool, to flash MK802IV.

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

diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
new file mode 100644
index 00000000000..895455df61c
--- /dev/null
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libusb1 }:
+
+stdenv.mkDerivation rec {
+  name = "rkflashtool-5.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/rkflashtool/${name}-src.tar.bz2";
+    sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c";
+  };
+
+  versionh = fetchurl {
+    url = "mirror://sourceforge/rkflashtool/version.h";
+    sha256 = "1mkcy3yyfaddhzg524hjnhvmwdmdfzbavib8d9p5y38pcqy8xgdp";
+  };
+
+  buildInputs = [ libusb1 ];
+
+  preBuild = ''
+    cp $versionh version.h
+  '';
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp rkflashtool $out/bin
+  '';
+
+  meta = {
+    homepage = http://sourceforge.net/projects/rkflashtool/;
+    description = "Tools for flashing Rockchip devices";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.viric ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb6566e4635..9988f37e8a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1868,6 +1868,8 @@ let
 
   ripmime = callPackage ../tools/networking/ripmime {};
 
+  rkflashtool = callPackage ../tools/misc/rkflashtool { };
+
   rmlint = callPackage ../tools/misc/rmlint {};
 
   rng_tools = callPackage ../tools/security/rng-tools { };

From 950fd7644cbc584cd4074cf418f6b407a8a52b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 14 May 2014 10:14:28 +0200
Subject: [PATCH 1261/2033] go: updating to 1.2.2

---
 pkgs/development/compilers/go/1.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 7b7e16d837d..b519b96415b 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.2.1";
+  name = "go-1.2.2";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.2.1.src.tar.gz;
-    sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f";
+    url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
+    sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];

From 418f0b01690a74d4fff4e86c220b0a6906a5d528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 14 May 2014 10:16:35 +0200
Subject: [PATCH 1262/2033] Revert "go: updating to 1.2.2"

Now I've read in Release Notes that the '.2' affected only binary releases.
http://golang.org/doc/devel/release.html#go1.2.minor
---
 pkgs/development/compilers/go/1.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index b519b96415b..7b7e16d837d 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.2.2";
+  name = "go-1.2.1";
 
   src = fetchurl {
-    url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
-    sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
+    url = http://go.googlecode.com/files/go1.2.1.src.tar.gz;
+    sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];

From 172391272da6514ba0c17e1a01e3ea492391e66c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 14 May 2014 12:12:58 +0200
Subject: [PATCH 1263/2033] chicken(-dev): Update to 4.8.0.5 / 4.9.0rc1

---
 pkgs/development/compilers/chicken/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 6ad87982d52..7effd72be4c 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, devSnapshot ? false }:
 
 let
-  version = if devSnapshot
-    then "4.8.2"
-    else "4.8.0.5";
+  stableVersion = "4.8.0.6";
+  devVersion = "4.9.0rc1";
+  version = if devSnapshot then devVersion else stableVersion;
   srcRelease = fetchurl {
-    url = "http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz";
-    sha256 = "1yrhqirqj3l535zr5mv8d1mz9gq876wwwg4nsjfw27663far54av";
+    url = "http://code.call-cc.org/releases/4.8.0/chicken-${stableVersion}.tar.gz";
+    sha256 = "0an6l09y9pa6r4crkn33w6l4j6nwhvk6fibx2ajv6h0pfl2jqkd5";
   };
   srcDev = fetchurl {
-    url = "http://code.call-cc.org/dev-snapshots/2013/08/08/chicken-4.8.2.tar.gz";
-    sha256 = "01g7h0664342nl536mnri4c72kwj4z40vmv1250xfndlr218qdqg";
+    url = "http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-${devVersion}.tar.gz";
+    sha256 = "168f5ib02hh6cnilsrfg103ijhlg4j0z0fgs7i55kzd4aggy1w42";
   };
   platform = with stdenv;
     if isDarwin then "macosx"

From 3d1d9bb7dd624780c2e550bc0ed8fbc2fb76e0e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 14 May 2014 14:10:49 +0200
Subject: [PATCH 1264/2033] linux-3.12: Apply patch for CVE-2014-0196

---
 .../linux/kernel/cve-2014-0196.patch          | 22 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/linux-3.12.nix  |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cve-2014-0196.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2014-0196.patch b/pkgs/os-specific/linux/kernel/cve-2014-0196.patch
new file mode 100644
index 00000000000..5234bab2207
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cve-2014-0196.patch
@@ -0,0 +1,22 @@
+https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=4291086b1f081b869c6d79e5b7441633dc3ace00
+
+diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
+index 41fe8a0..fe9d129 100644
+--- a/drivers/tty/n_tty.c
++++ b/drivers/tty/n_tty.c
+@@ -2353,8 +2353,12 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
+ 			if (tty->ops->flush_chars)
+ 				tty->ops->flush_chars(tty);
+ 		} else {
++			struct n_tty_data *ldata = tty->disc_data;
++
+ 			while (nr > 0) {
++				mutex_lock(&ldata->output_lock);
+ 				c = tty->ops->write(tty, b, nr);
++				mutex_unlock(&ldata->output_lock);
+ 				if (c < 0) {
+ 					retval = c;
+ 					goto break_out;
+-- 
+cgit v0.10.1
+
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 79fead697b5..9c10d40fd3e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -9,6 +9,8 @@ import ./generic.nix (args // rec {
     sha256 = "1f59lyyyc4anaj50dzb9448gz6n9fdrcy2mvd7f193pp6018gdp6";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2014-0196"; patch = ./cve-2014-0196.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;

From fd0f9e6fc11ce86cec228f764353b674535083f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 May 2014 19:36:45 +0200
Subject: [PATCH 1265/2033] Re-write the Haskell Platform out of
 haskell-defaults.nix.

 1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
---
 .../version-management/darcs/default.nix      |   6 +-
 pkgs/build-support/cabal/default.nix          |   6 +-
 .../libraries/haskell/HTTP/4000.2.14.nix      |   1 +
 .../libraries/haskell/HsSyck/0.51.nix         |  13 +
 .../haskell/HsSyck/{default.nix => 0.52.nix}  |   0
 .../libraries/haskell/QuickCheck/2.7.3.nix    |   1 +
 .../libraries/haskell/binary/0.6.0.0.nix      |  13 -
 .../libraries/haskell/bmp/default.nix         |   1 -
 .../filepath/{default.nix => 1.3.0.2.nix}     |   0
 .../libraries/haskell/gitit/default.nix       |   3 +
 .../libraries/haskell/gloss/default.nix       |   5 +-
 .../libraries/haskell/haskeline/0.7.1.1.nix   |  16 -
 .../haskeline/{0.7.1.2.nix => default.nix}    |   0
 .../haskell/haskell-platform/2009.2.0.2.nix   |   9 +-
 .../haskell/haskell-platform/2010.1.0.0.nix   |  13 +-
 .../haskell/haskell-platform/2010.2.0.0.nix   |   9 +-
 .../haskell/haskell-platform/2011.2.0.0.nix   |  10 +-
 .../haskell/haskell-platform/2011.2.0.1.nix   |  10 +-
 .../haskell/haskell-platform/2011.4.0.0.nix   |  11 +-
 .../haskell/haskell-platform/2012.2.0.0.nix   |  11 +-
 .../haskell/haskell-platform/2012.4.0.0.nix   |  11 +-
 .../haskell/haskell-platform/2013.2.0.0.nix   |  11 +-
 .../haskell/haskell-platform/default.nix      | 310 +++++++++
 .../libraries/haskell/network/2.3.0.13.nix    |   1 +
 .../process/{default.nix => 1.2.0.0.nix}      |   0
 .../libraries/haskell/wxHaskell/wxdirect.nix  |   1 +
 pkgs/top-level/all-packages.nix               |  31 +-
 pkgs/top-level/haskell-defaults.nix           | 422 +++---------
 pkgs/top-level/haskell-packages.nix           | 616 +++---------------
 29 files changed, 588 insertions(+), 953 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/HsSyck/0.51.nix
 rename pkgs/development/libraries/haskell/HsSyck/{default.nix => 0.52.nix} (100%)
 delete mode 100644 pkgs/development/libraries/haskell/binary/0.6.0.0.nix
 rename pkgs/development/libraries/haskell/filepath/{default.nix => 1.3.0.2.nix} (100%)
 delete mode 100644 pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix
 rename pkgs/development/libraries/haskell/haskeline/{0.7.1.2.nix => default.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/haskell-platform/default.nix
 rename pkgs/development/libraries/haskell/process/{default.nix => 1.2.0.0.nix} (100%)

diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index 8ec65e50adf..b564242c946 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -20,14 +20,12 @@ cabal.mkDerivation (self: {
     mkdir -p $out/etc/bash_completion.d
     mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
   '';
+  jailbreak = true;
   meta = {
     homepage = http://darcs.net/;
     description = "A distributed, interactive, smart revision control system";
     license = "GPL";
-    # FIXME: this gives an infinite recursion in the "darcs" attribute
-    # in all-packages.nix.
-    #platforms = self.ghc.meta.platforms;
-    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 047bccebf09..70fb72f99fb 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -7,6 +7,7 @@
 , enableSharedExecutables ? false
 , enableStaticLibraries ? true
 , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
+, extension ? (self : super : {})
 }:
 
 let
@@ -262,5 +263,8 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             # in Cabal derivations.
             inherit stdenv ghc;
           };
-    in  stdenv.mkDerivation (postprocess ((rec { f = defaults f // args f; }).f)) ;
+    in
+    stdenv.mkDerivation (postprocess (let super = defaults self // args self;
+                                          self  = super // extension self super;
+                                      in self));
 }
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
index d9e7af97adc..1aaa048eefc 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
   ];
   jailbreak = true;
   doCheck = false;
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     homepage = "https://github.com/haskell/HTTP";
     description = "A library for client-side HTTP";
diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix
new file mode 100644
index 00000000000..3033eb7b19d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HsSyck/0.51.nix
@@ -0,0 +1,13 @@
+{ cabal, hashtables, syb, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "HsSyck";
+  version = "0.51";
+  sha256 = "13y5vbzrix33dzwhdrvng2ds2dnipkxn1h22jvbf47rwnkyh2g49";
+  buildDepends = [ hashtables syb utf8String ];
+  meta = {
+    description = "Fast, lightweight YAML loader and dumper";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/HsSyck/default.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/HsSyck/default.nix
rename to pkgs/development/libraries/haskell/HsSyck/0.52.nix
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
index b3acd535d8f..fafea2eb7d1 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.3.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "196pz0b32m84ydwm4wk7m8512bmsxw7nsqpxbyfxsyi3ykq220yh";
   buildDepends = [ random tfRandom ];
   testDepends = [ testFramework ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     homepage = "http://code.haskell.org/QuickCheck";
     description = "Automatic testing of Haskell programs";
diff --git a/pkgs/development/libraries/haskell/binary/0.6.0.0.nix b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix
deleted file mode 100644
index 01e909212e8..00000000000
--- a/pkgs/development/libraries/haskell/binary/0.6.0.0.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "binary";
-  version = "0.6.0.0";
-  sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv";
-  meta = {
-    homepage = "https://github.com/kolmodin/binary";
-    description = "Binary serialisation for Haskell values using lazy ByteStrings";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
index 6c85c9349c9..63a86d82bb6 100644
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ b/pkgs/development/libraries/haskell/bmp/default.nix
@@ -5,7 +5,6 @@ cabal.mkDerivation (self: {
   version = "1.2.5.2";
   sha256 = "0f88f2ynm1fpzbjijy5fa8blfrdv42h5h28hfjlpd4fp0h96in5x";
   buildDepends = [ binary ];
-  jailbreak = true;
   meta = {
     homepage = "http://code.ouroborus.net/bmp";
     description = "Read and write uncompressed BMP image files";
diff --git a/pkgs/development/libraries/haskell/filepath/default.nix b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/filepath/default.nix
rename to pkgs/development/libraries/haskell/filepath/1.3.0.2.nix
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 905d02b7011..69f611cfe74 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
                           sha256 = "0xdg9frr8lany8ry6vj4vpskmhkpww8jswnb05pzl8a4xfqxh9gd";
                         })
             ];
+  preConfigure = ''
+    sed -i -e 's|network .*< 2.5|network|' gitit.cabal
+  '';
   meta = {
     homepage = "http://gitit.net";
     description = "Wiki using happstack, git or darcs, and pandoc";
diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix
index 223a72ec381..5fff36e66ea 100644
--- a/pkgs/development/libraries/haskell/gloss/default.nix
+++ b/pkgs/development/libraries/haskell/gloss/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "gloss";
-  version = "1.8.1.2";
-  sha256 = "1ky1gckvyww855dy3fzllf1ixbmc3jpdvz85hx719pcygy7qh71m";
+  version = "1.8.2.1";
+  sha256 = "0wnrss7j7zf4lbmr5rryx7m5qb4pqh7vvz11ksbsfn3d3hf285y2";
   buildDepends = [ bmp GLUT OpenGL ];
-  jailbreak = true;
   meta = {
     homepage = "http://gloss.ouroborus.net";
     description = "Painless 2D vector graphics, animations and simulations";
diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix b/pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix
deleted file mode 100644
index 2799b732292..00000000000
--- a/pkgs/development/libraries/haskell/haskeline/0.7.1.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, filepath, terminfo, transformers, utf8String }:
-
-cabal.mkDerivation (self: {
-  pname = "haskeline";
-  version = "0.7.1.1";
-  sha256 = "1xwbjrak0jicbckk609sqwdlizpkn5zab0kqzrcw9swg1fxpwx5m";
-  buildDepends = [ filepath terminfo transformers utf8String ];
-  configureFlags = "-fterminfo";
-  meta = {
-    homepage = "http://trac.haskell.org/haskeline";
-    description = "A command-line interface for user input, written in Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.1.2.nix b/pkgs/development/libraries/haskell/haskeline/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/haskeline/0.7.1.2.nix
rename to pkgs/development/libraries/haskell/haskeline/default.nix
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
index e87d59582f2..369d7fbb8c8 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline,
  haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
  stm, time, xhtml, zlib, parsec, network,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
@@ -10,6 +10,7 @@ cabal.mkDerivation (self : {
     url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
     sha256 = "e0469fac9b1d091d8299ae16a4e2e7fcd504285bba066b17153a0f0104a049bd";
   };
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
     haskellSrc html parallel regexBase regexCompat regexPosix
@@ -18,7 +19,9 @@ cabal.mkDerivation (self : {
   ];
   meta = {
     description = "Haskell Platform meta package";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
+    broken = true;              # cgi and cabal-install won't compile
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
index fc7de20f6c1..65395662a89 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix
@@ -1,24 +1,27 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
  stm, xhtml, zlib, parsec,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
   version = "2010.1.0.0";
   src = fetchurl {
     url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "64c9fec5cdc4b6f515b7f296d59984d2dee05927b7e24ea67324ad5f4ac3e994";
+    sha256 = "0cadj0ql2i5d5njwcbhmjkf4qrkfmxirg5vjv1wlx3ayzbynbrp4";
   };
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel regexBase regexCompat regexPosix
     stm xhtml zlib parsec
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   meta = {
     description = "Haskell Platform meta package";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
+    broken = true;              # cgi libary doesn't compile
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
index 8f00f5fb48b..b9a3a841af5 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
  stm, xhtml, zlib, mtl, parsec, deepseq,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
@@ -10,14 +10,17 @@ cabal.mkDerivation (self : {
     url = "http://pkgs.fedoraproject.org/repo/pkgs/haskell-platform/haskell-platform-2010.2.0.0.tar.gz/9c9c6422ebfe1a5e78e69ae017f4d54b/haskell-platform-2010.2.0.0.tar.gz";
     sha256 = "c0b0b45151e74cff759ae25083c2ff7a7af4d2f74c19294b78730c879864f3c0";
   };
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel regexBase regexCompat regexPosix
     stm xhtml zlib mtl parsec deepseq
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   meta = {
     description = "Haskell Platform meta package";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
index 8eb1b457aa3..4a9752a0611 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.0.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
  stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
@@ -11,16 +11,18 @@ cabal.mkDerivation (self : {
     url = "http://lambda.haskell.org/hp-tmp/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
     sha256 = "01ppv8jdyvbngml9vgvrvnani6fj1nbk8mqmrkd8c508l7q9g6vb";
   };
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel parsec regexBase regexCompat regexPosix
     stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   noHaddock = true;
   meta = {
     description = "Haskell Platform meta package";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
index da70d32861d..cae4cc6796c 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2011.2.0.1.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
  stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 # This is just a meta-package. Because upstream fails to provide proper versioned
 # release tarballs that can be used for the purpose of verifying this package, we
@@ -14,11 +14,12 @@ cabal.mkDerivation (self : {
   cabalFile = ./haskell-platform-2011.2.0.1.cabal;
   setupFile = ./Setup.hs;
   src = null;
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel parsec regexBase regexCompat regexPosix
     stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   unpackPhase = ''
     sourceRoot=haskell-platform
@@ -30,7 +31,8 @@ cabal.mkDerivation (self : {
   noHaddock = true;
   meta = {
     description = "Haskell Platform meta package";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
index 8dd833a7bf0..61aa32aff45 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2011.4.0.0.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
  stm, syb, deepseq, text, transformers, mtl, xhtml, zlib,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 # This is just a meta-package. Because upstream fails to provide proper versioned
 # release tarballs that can be used for the purpose of verifying this package, we
@@ -14,11 +14,12 @@ cabal.mkDerivation (self : {
   cabalFile = ./haskell-platform-2011.4.0.0.cabal;
   setupFile = ./Setup.hs;
   src = null;
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel parsec regexBase regexCompat regexPosix
     stm syb deepseq text transformers mtl xhtml zlib
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   unpackPhase = ''
     sourceRoot=haskell-platform
@@ -33,10 +34,6 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
index be2aa50e396..9873342fa8d 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2012.2.0.0.nix
@@ -1,7 +1,7 @@
 {cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
  haskellSrc, html, network, parallel, parsec, regexBase, regexCompat, regexPosix,
  stm, syb, deepseq, text, transformers, mtl, xhtml, zlib, random,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 # This is just a meta-package. Because upstream fails to provide proper versioned
 # release tarballs that can be used for the purpose of verifying this package, we
@@ -14,11 +14,12 @@ cabal.mkDerivation (self : {
   cabalFile = ./haskell-platform-2012.2.0.0.cabal;
   setupFile = ./Setup.hs;
   src = null;
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
     haskellSrc html network parallel parsec regexBase regexCompat regexPosix
     stm syb deepseq text transformers mtl xhtml zlib random
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   unpackPhase = ''
     sourceRoot=haskell-platform
@@ -33,10 +34,6 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
index c9f269eebef..e54f9264159 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix
@@ -2,7 +2,7 @@
  haskellSrc, html, network, parallel, parsec, primitive,
  regexBase, regexCompat, regexPosix,
  split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random,
- cabalInstall, alex, happy, haddock, ghc}:
+ cabalInstall, alex, happy, ghc}:
 
 # This is just a meta-package. Because upstream fails to provide proper versioned
 # release tarballs that can be used for the purpose of verifying this package, we
@@ -15,12 +15,13 @@ cabal.mkDerivation (self : {
   cabalFile = ./haskell-platform-2012.4.0.0.cabal;
   setupFile = ./Setup.hs;
   src = null;
+  isLibrary = false;
   propagatedBuildInputs = [
     GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl
     haskellSrc html network parallel parsec primitive
     regexBase regexCompat regexPosix
     split stm syb deepseq text transformers mtl vector xhtml zlib random
-    cabalInstall alex happy ghc haddock
+    cabalInstall alex happy ghc
   ];
   unpackPhase = ''
     sourceRoot=haskell-platform
@@ -35,10 +36,6 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
-
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
index f209c39d438..c7ce9b09815 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/2013.2.0.0.nix
@@ -3,7 +3,7 @@
 , hashable, html, HTTP, HUnit, mtl, network, OpenGL, OpenGLRaw, parallel
 , parsec, QuickCheck, random, regexBase, regexCompat, regexPosix, split, stm
 , syb, text, transformers, unorderedContainers, vector, xhtml, zlib
-, cabalInstall, alex, haddock, happy, primitive, ghc
+, cabalInstall, alex, happy, primitive, ghc
 }:
 
 # This is just a meta-package. Because upstream fails to provide proper versioned
@@ -17,12 +17,13 @@ cabal.mkDerivation (self : {
   cabalFile = ./haskell-platform-2013.2.0.0.cabal;
   setupFile = ./Setup.hs;
   src = null;
+  isLibrary = false;
   propagatedBuildInputs = [
     async attoparsec caseInsensitive cgi fgl GLUT GLURaw haskellSrc
     hashable html HTTP HUnit mtl network OpenGL OpenGLRaw parallel
     parsec QuickCheck random regexBase regexCompat regexPosix split stm
     syb text transformers unorderedContainers vector xhtml zlib
-    cabalInstall alex haddock happy primitive ghc
+    cabalInstall alex happy primitive ghc
   ];
   unpackPhase = ''
     sourceRoot=haskell-platform
@@ -30,7 +31,6 @@ cabal.mkDerivation (self : {
     cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal
     cp ${self.setupFile} $sourceRoot/Setup.hs
     touch $sourceRoot/LICENSE
-    sed -i -e 's|hashable  *==1.1.2.5,|hashable,|' $sourceRoot/${self.pname}.cabal
   '';
   noHaddock = true;
   meta = {
@@ -38,9 +38,6 @@ cabal.mkDerivation (self : {
     description = "Haskell Platform meta package";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = with self.stdenv.lib.maintainers; [andres simons];
   };
 })
diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
new file mode 100644
index 00000000000..efe33d6a265
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix
@@ -0,0 +1,310 @@
+{ pkgs }:
+
+let
+  haskellPlatformPackages_2013_2_0_0 = pkgs.haskell.packages_ghc763.override {
+    extension = self : super : {
+      async                     = self.async_2_0_1_4;
+      attoparsec                = self.attoparsec_0_10_4_0;
+      caseInsensitive           = self.caseInsensitive_1_0_0_1;
+      cgi                       = self.cgi_3001_1_7_5;
+      fgl                       = self.fgl_5_4_2_4;
+      GLUT                      = self.GLUT_2_4_0_0;
+      GLURaw                    = self.GLURaw_1_3_0_0;
+      haskellSrc                = self.haskellSrc_1_0_1_5;
+      hashable                  = self.hashable_1_1_2_5;
+      html                      = self.html_1_0_1_2;
+      HTTP                      = self.HTTP_4000_2_8;
+      HUnit                     = self.HUnit_1_2_5_2;
+      mtl                       = self.mtl_2_1_2;
+      network                   = self.network_2_4_1_2;
+      OpenGL                    = self.OpenGL_2_8_0_0;
+      OpenGLRaw                 = self.OpenGLRaw_1_3_0_0;
+      parallel                  = self.parallel_3_2_0_3;
+      parsec                    = self.parsec_3_1_3;
+      QuickCheck                = self.QuickCheck_2_6;
+      random                    = self.random_1_0_1_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_95_1;
+      regexPosix                = self.regexPosix_0_95_2;
+      split                     = self.split_0_2_2;
+      stm                       = self.stm_2_4_2;
+      syb                       = self.syb_0_4_0;
+      text                      = self.text_0_11_3_1;
+      transformers              = self.transformers_0_3_0_0;
+      unorderedContainers       = self.unorderedContainers_0_2_3_0;
+      vector                    = self.vector_0_10_0_1;
+      xhtml                     = self.xhtml_3000_2_1;
+      zlib                      = self.zlib_0_5_4_1;
+      cabalInstall              = self.cabalInstall_1_16_0_2;
+      alex                      = self.alex_3_0_5;
+      happy                     = self.happy_1_18_10;
+      primitive                 = self.primitive_0_5_0_1; # semi-official, but specified
+    };
+  };
+
+  haskellPlatformPackages_2012_4_0_0 = pkgs.haskell.packages_ghc742.override {
+    extension = self : super : {
+      async                     = self.async_2_0_1_3;
+      cgi                       = self.cgi_3001_1_7_4;
+      fgl                       = self.fgl_5_4_2_4;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_5;
+      html                      = self.html_1_0_1_2;
+      HTTP                      = self.HTTP_4000_2_5;
+      HUnit                     = self.HUnit_1_2_5_1;
+      mtl                       = self.mtl_2_1_2;
+      network                   = self.network_2_3_1_0;
+      OpenGL                    = self.OpenGL_2_2_3_1;
+      parallel                  = self.parallel_3_2_0_3;
+      parsec                    = self.parsec_3_1_3;
+      QuickCheck                = self.QuickCheck_2_5_1_1;
+      random                    = self.random_1_0_1_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_95_1;
+      regexPosix                = self.regexPosix_0_95_2;
+      split                     = self.split_0_2_1_1;
+      stm                       = self.stm_2_4;
+      syb                       = self.syb_0_3_7;
+      text                      = self.text_0_11_2_3;
+      transformers              = self.transformers_0_3_0_0;
+      vector                    = self.vector_0_10_0_1;
+      xhtml                     = self.xhtml_3000_2_1;
+      zlib                      = self.zlib_0_5_4_0;
+      cabalInstall              = self.cabalInstall_0_14_0;
+      alex                      = self.alex_3_0_2;
+      happy                     = self.happy_1_18_10;
+      primitive                 = self.primitive_0_5_0_1; # semi-official, but specified
+    };
+  };
+
+  haskellPlatformPackages_2012_2_0_0 = pkgs.haskell.packages_ghc742.override {
+    ghcPath = ../../../compilers/ghc/7.4.1.nix;
+    extension = self : super : {
+      cgi                       = self.cgi_3001_1_7_4;
+      fgl                       = self.fgl_5_4_2_4;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_5;
+      html                      = self.html_1_0_1_2;
+      HTTP                      = self.HTTP_4000_2_3;
+      HUnit                     = self.HUnit_1_2_4_2;
+      mtl                       = self.mtl_2_1_1;
+      network                   = self.network_2_3_0_13;
+      OpenGL                    = self.OpenGL_2_2_3_1;
+      parallel                  = self.parallel_3_2_0_2;
+      parsec                    = self.parsec_3_1_2;
+      QuickCheck                = self.QuickCheck_2_4_2;
+      random                    = self.random_1_0_1_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_95_1;
+      regexPosix                = self.regexPosix_0_95_1;
+      stm                       = self.stm_2_3;
+      syb                       = self.syb_0_3_6_1;
+      text                      = self.text_0_11_2_0;
+      transformers              = self.transformers_0_3_0_0;
+      xhtml                     = self.xhtml_3000_2_1;
+      zlib                      = self.zlib_0_5_3_3;
+      cabalInstall              = self.cabalInstall_0_14_0;
+      alex                      = self.alex_3_0_1;
+      happy                     = self.happy_1_18_9;
+    };
+  };
+
+  haskellPlatformPackages_2011_4_0_0 = pkgs.haskell.packages_ghc704.override {
+    extension = self : super : {
+      cgi                       = self.cgi_3001_1_7_4;
+      fgl                       = self.fgl_5_4_2_4;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_4;
+      html                      = self.html_1_0_1_2;
+      HUnit                     = self.HUnit_1_2_4_2;
+      network                   = self.network_2_3_0_5;
+      OpenGL                    = self.OpenGL_2_2_3_0;
+      parallel                  = self.parallel_3_1_0_1;
+      parsec                    = self.parsec_3_1_1;
+      QuickCheck                = self.QuickCheck_2_4_1_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_95_1;
+      regexPosix                = self.regexPosix_0_95_1;
+      stm                       = self.stm_2_2_0_1;
+      syb                       = self.syb_0_3_3;
+      xhtml                     = self.xhtml_3000_2_0_4;
+      zlib                      = self.zlib_0_5_3_1;
+      HTTP                      = self.HTTP_4000_1_2;
+      deepseq                   = self.deepseq_1_1_0_2;
+      text                      = self.text_0_11_1_5;
+      transformers              = self.transformers_0_2_2_0;
+      mtl                       = self.mtl_2_0_1_0;
+      cabalInstall              = self.cabalInstall_0_10_2;
+      alex                      = self.alex_2_3_5;
+      happy                     = self.happy_1_18_6;
+    };
+  };
+
+  haskellPlatformPackages_2011_2_0_1 = pkgs.haskell.packages_ghc704.override {
+    ghcPath = ../../../compilers/ghc/7.0.3.nix;
+    extension = self : super : {
+      cgi                       = self.cgi_3001_1_7_4;
+      fgl                       = self.fgl_5_4_2_3;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_4;
+      html                      = self.html_1_0_1_2;
+      HUnit                     = self.HUnit_1_2_2_3;
+      network                   = self.network_2_3_0_2;
+      OpenGL                    = self.OpenGL_2_2_3_0;
+      parallel                  = self.parallel_3_1_0_1;
+      parsec                    = self.parsec_3_1_1;
+      QuickCheck                = self.QuickCheck_2_4_0_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_93_1;
+      regexPosix                = self.regexPosix_0_94_4;
+      stm                       = self.stm_2_2_0_1;
+      syb                       = self.syb_0_3;
+      xhtml                     = self.xhtml_3000_2_0_1;
+      zlib                      = self.zlib_0_5_3_1;
+      HTTP                      = self.HTTP_4000_1_1;
+      deepseq                   = self.deepseq_1_1_0_2;
+      text                      = self.text_0_11_0_6;
+      transformers              = self.transformers_0_2_2_0;
+      mtl                       = self.mtl_2_0_1_0;
+      cabalInstall              = self.cabalInstall_0_10_2;
+      alex                      = self.alex_2_3_5;
+      happy                     = self.happy_1_18_6;
+    };
+  };
+
+  haskellPlatformPackages_2011_2_0_0 = pkgs.haskell.packages_ghc704.override {
+    ghcPath = ../../../compilers/ghc/7.0.2.nix;
+    extension = self : super : {
+      cgi                       = self.cgi_3001_1_7_4;
+      fgl                       = self.fgl_5_4_2_3;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_4;
+      html                      = self.html_1_0_1_2;
+      HUnit                     = self.HUnit_1_2_2_3;
+      network                   = self.network_2_3_0_2;
+      OpenGL                    = self.OpenGL_2_2_3_0;
+      parallel                  = self.parallel_3_1_0_1;
+      parsec                    = self.parsec_3_1_1;
+      QuickCheck                = self.QuickCheck_2_4_0_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_93_1;
+      regexPosix                = self.regexPosix_0_94_4;
+      stm                       = self.stm_2_2_0_1;
+      syb                       = self.syb_0_3;
+      xhtml                     = self.xhtml_3000_2_0_1;
+      zlib                      = self.zlib_0_5_3_1;
+      HTTP                      = self.HTTP_4000_1_1;
+      deepseq                   = self.deepseq_1_1_0_2;
+      text                      = self.text_0_11_0_5;
+      transformers              = self.transformers_0_2_2_0;
+      mtl                       = self.mtl_2_0_1_0;
+      cabalInstall              = self.cabalInstall_0_10_2;
+      alex                      = self.alex_2_3_5;
+      happy                     = self.happy_1_18_6;
+    };
+  };
+
+  haskellPlatformPackages_2010_2_0_0 = pkgs.haskell.packages_ghc6123.override {
+    extension = self : super : {
+      cgi                       = self.cgi_3001_1_7_3;
+      fgl                       = self.fgl_5_4_2_3;
+      GLUT                      = self.GLUT_2_1_2_1;
+      haskellSrc                = self.haskellSrc_1_0_1_3;
+      html                      = self.html_1_0_1_2;
+      HUnit                     = self.HUnit_1_2_2_1;
+      mtl                       = self.mtl_1_1_0_2;
+      network                   = self.network_2_2_1_7;
+      OpenGL                    = self.OpenGL_2_2_3_0;
+      parallel                  = self.parallel_2_2_0_1;
+      parsec                    = self.parsec_2_1_0_1;
+      QuickCheck                = self.QuickCheck_2_1_1_1;
+      regexBase                 = self.regexBase_0_93_2;
+      regexCompat               = self.regexCompat_0_93_1;
+      regexPosix                = self.regexPosix_0_94_2;
+      stm                       = self.stm_2_1_2_1;
+      xhtml                     = self.xhtml_3000_2_0_1;
+      zlib                      = self.zlib_0_5_2_0;
+      HTTP                      = self.HTTP_4000_0_9;
+      deepseq                   = self.deepseq_1_1_0_0;
+      text                      = self.text_0_11_0_5;
+      cabalInstall              = self.cabalInstall_0_8_2;
+      alex                      = self.alex_2_3_3;
+      happy                     = self.happy_1_18_5;
+    };
+  };
+
+  haskellPlatformPackages_2010_1_0_0 = pkgs.haskell.packages_ghc6123.override {
+    extension = self : super : {
+      haskellSrc                = self.haskellSrc_1_0_1_3;
+      html                      = self.html_1_0_1_2;
+      fgl                       = self.fgl_5_4_2_2;
+      cabalInstall              = self.cabalInstall_0_8_0;
+      GLUT                      = self.GLUT_2_1_2_1;
+      OpenGL                    = self.OpenGL_2_2_3_0;
+      zlib                      = self.zlib_0_5_2_0;
+      alex                      = self.alex_2_3_2;
+      cgi                       = self.cgi_3001_1_7_2;
+      QuickCheck                = self.QuickCheck_2_1_1_1;
+      HTTP                      = self.HTTP_4000_0_9;
+      deepseq                   = self.deepseq_1_1_0_0;
+      HUnit                     = self.HUnit_1_2_2_1;
+      network                   = self.network_2_2_1_7;
+      parallel                  = self.parallel_2_2_0_1;
+      parsec                    = self.parsec_2_1_0_1;
+      regexBase                 = self.regexBase_0_93_1;
+      regexCompat               = self.regexCompat_0_92;
+      regexPosix                = self.regexPosix_0_94_1;
+      stm                       = self.stm_2_1_1_2;
+      xhtml                     = self.xhtml_3000_2_0_1;
+      happy                     = self.happy_1_18_4;
+    };
+  };
+
+  haskellPlatformPackages_2009_2_0_2 = pkgs.haskell.packages_ghc6104.override {
+    extension = self : super : {
+      time                      = self.time_1_1_2_4;
+      cgi                       = self.cgi_3001_1_7_1;
+      editline                  = self.editline_0_2_1_0;
+      fgl                       = self.fgl_5_4_2_2;
+      GLUT                      = self.GLUT_2_1_1_2;
+      haskellSrc                = self.haskellSrc_1_0_1_3;
+      html                      = self.html_1_0_1_2;
+      HUnit                     = self.HUnit_1_2_0_3;
+      network                   = self.network_2_2_1_4;
+      OpenGL                    = self.OpenGL_2_2_1_1;
+      parallel                  = self.parallel_1_1_0_1;
+      parsec                    = self.parsec_2_1_0_1;
+      QuickCheck                = self.QuickCheck_1_2_0_0;
+      regexBase                 = self.regexBase_0_72_0_2;
+      regexCompat               = self.regexCompat_0_71_0_1;
+      regexPosix                = self.regexPosix_0_72_0_3;
+      stm                       = self.stm_2_1_1_2;
+      xhtml                     = self.xhtml_3000_2_0_1;
+      zlib                      = self.zlib_0_5_0_0;
+      HTTP                      = self.HTTP_4000_0_6;
+      cabalInstall              = self.cabalInstall_0_6_2;
+      alex                      = self.alex_2_3_1;
+      happy                     = self.happy_1_18_4;
+    };
+  };
+
+in
+{
+  "2013_2_0_0" = haskellPlatformPackages_2013_2_0_0.callPackage ./2013.2.0.0.nix {};
+
+  "2012_4_0_0" = haskellPlatformPackages_2012_4_0_0.callPackage ./2012.4.0.0.nix {};
+
+  "2012_2_0_0" = haskellPlatformPackages_2012_2_0_0.callPackage ./2012.2.0.0.nix {};
+
+  "2011_4_0_0" = haskellPlatformPackages_2011_4_0_0.callPackage ./2011.4.0.0.nix {};
+
+  "2011_2_0_1" = haskellPlatformPackages_2011_2_0_1.callPackage ./2011.2.0.1.nix {};
+
+  "2011_2_0_0" = haskellPlatformPackages_2011_2_0_0.callPackage ./2011.2.0.0.nix {};
+
+  "2010_2_0_0" = haskellPlatformPackages_2010_2_0_0.callPackage ./2010.2.0.0.nix {};
+
+  "2010_1_0_0" = haskellPlatformPackages_2010_1_0_0.callPackage ./2010.1.0.0.nix {};
+
+  "2009_2_0_2" = haskellPlatformPackages_2009_2_0_2.callPackage ./2009.2.0.2.nix {};
+}
diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
index 557dea081fd..834b7872c6b 100644
--- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix
+++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0xw53czvcw8k49aqxmchc1rcd6pyxp4icwgp64625fnm3l4yjiq7";
   buildDepends = [ parsec ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/haskell/network";
     description = "Low-level networking interface";
diff --git a/pkgs/development/libraries/haskell/process/default.nix b/pkgs/development/libraries/haskell/process/1.2.0.0.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/process/default.nix
rename to pkgs/development/libraries/haskell/process/1.2.0.0.nix
diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
index 63bc82d6f67..b369fe407da 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath parsec strict time ];
+  jailbreak = true;
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "helper tool for building wxHaskell";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9988f37e8a4..88cbb2b3f97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2858,36 +2858,27 @@ let
     builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"
   ) haskell));
 
-  # Current default version: 7.6.3.
   haskellPackages = haskellPackages_ghc763;
-  # Current Haskell Platform: 2013.2.0.0
-  haskellPlatform = haskellPackages.haskellPlatform;
+  haskellPlatform = haskellPlatformPackages."2013_2_0_0";
 
   haskellPackages_ghc6104 = haskell.packages_ghc6104;
-  haskellPackages_ghc6121 = haskell.packages_ghc6121;
-  haskellPackages_ghc6122 = haskell.packages_ghc6122;
   haskellPackages_ghc6123 = haskell.packages_ghc6123;
-  haskellPackages_ghc701  = haskell.packages_ghc701;
-  haskellPackages_ghc702  = haskell.packages_ghc702;
-  haskellPackages_ghc703  = haskell.packages_ghc703;
   haskellPackages_ghc704  = haskell.packages_ghc704;
-  haskellPackages_ghc721  = haskell.packages_ghc721;
   haskellPackages_ghc722  = haskell.packages_ghc722;
-  haskellPackages_ghc741  = haskell.packages_ghc741;
   haskellPackages_ghc742  = haskell.packages_ghc742;
-  haskellPackages_ghc761  = haskell.packages_ghc761;
-  haskellPackages_ghc762  = haskell.packages_ghc762;
   # For the default version, we build profiling versions of the libraries, too.
   # The following three lines achieve that: the first two make Hydra build explicit
   # profiling and non-profiling versions; the final respects the user-configured
   # default setting.
-  haskellPackages_ghc763_no_profiling = recurseIntoAttrs (haskell.packages_ghc763.noProfiling);
-  haskellPackages_ghc763_profiling    = recurseIntoAttrs (haskell.packages_ghc763.profiling);
-  haskellPackages_ghc763              = recurseIntoAttrs (haskell.packages_ghc763.highPrio);
+  haskellPackages_ghc763_no_profiling = recurseIntoAttrs haskell.packages_ghc763.noProfiling;
+  haskellPackages_ghc763_profiling    = recurseIntoAttrs haskell.packages_ghc763.profiling;
+  haskellPackages_ghc763              = recurseIntoAttrs haskell.packages_ghc763.highPrio;
   # Reasonably current HEAD snapshot.
   haskellPackages_ghc782 = haskell.packages_ghc782;
   haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;
 
+  haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; });
+
   haxe = callPackage ../development/compilers/haxe { };
 
   hiphopvm = callPackage ../development/interpreters/hiphopvm {
@@ -7965,10 +7956,12 @@ let
   darcs = haskellPackages.darcs.override {
     # A variant of the Darcs derivation that containts only the executable and
     # thus has no dependencies on other Haskell packages.
-    cabal = { mkDerivation = x: rec { final = haskellPackages.cabal.mkDerivation (self: (x final) // {
-              isLibrary = false;
-              configureFlags = "-f-library"; }); }.final;
-            };
+    cabal = haskellPackages.cabal.override {
+      extension = self : super : {
+        isLibrary = false;
+        configureFlags = "-f-library " + super.configureFlags or "";
+      };
+    };
   };
 
   darktable = callPackage ../applications/graphics/darktable {
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index b5a74e255ce..f40ce2bf6df 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -10,212 +10,79 @@
 
 { makeOverridable, lowPrio, hiPrio, stdenv, pkgs, newScope, config, callPackage } : rec {
 
-  # Preferences functions.
-  #
-  # Change these if you want to change the default versions of packages being used
-  # for a particular GHC version.
+  # haskell-packages.nix provides the latest possible version of every package,
+  # and this file overrides those version choices per compiler when appropriate.
+  # Older compilers inherit the overrides from newer ones.
 
-  ghcHEADPrefs =
-    self : super : super.haskellPlatformArgs_future self // {
-      haskellPlatform = null;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-      binary_0_7_1_0 = null;
+  ghcHEADPrefs = self : super : super // {
+  };
+
+  ghc782Prefs = self : super : ghcHEADPrefs self super // {
+  };
+
+  ghc763Prefs = self : super : ghc782Prefs self super // {
+    criterion = super.criterion.override {
+      statistics = self.statistics.override {
+        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_0_1; };
+      };
     };
+    haddock = self.haddock_2_13_2;
+    transformers = self.transformers_0_3_0_0;
+  };
 
-  ghc763Prefs =
-    self : super : super.haskellPlatformArgs_2013_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2013_2_0_0;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_4;
-    };
+  ghc742Prefs = self : super : ghc763Prefs self super // {
+    aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; };
+    hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
+    haddock = self.haddock_2_11_0;
+    haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+  };
 
-  ghc742Prefs =
-    self : super : super.haskellPlatformArgs_2012_4_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_4_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
+  ghc722Prefs = self : super : ghc742Prefs self super // {
+    deepseq = self.deepseq_1_3_0_2;
+    extensibleExceptions = null;        # core package in ghc <= 7.4.x
+    haddock = self.haddock_2_9_4;
+    syb = self.syb_0_4_0;
+  };
 
-  ghc741Prefs =
-    self : super : super.haskellPlatformArgs_2012_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_2_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
+  ghc704Prefs = self : super : ghc722Prefs self super // {
+    binary = self.binary_0_7_0_1;       # core package in ghc >= 7.2.2
+    haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; };
+    HsSyck = self.HsSyck_0_51;
+    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
+    random = null;                      # core package in ghc <= 7.0.x
+  };
 
-  ghc722Prefs =
-    self : super : super.haskellPlatformArgs_2012_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2012_2_0_0;
-      deepseq = self.deepseq_1_3_0_2;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { HTTP = self.HTTP_4000_2_14; };
-      cabalInstall = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      prettyShow = self.prettyShow_1_2;
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
+  ghc6123Prefs = self : super : ghc704Prefs self super // {
+    alex = self.alex_3_1_3;
+    cabalInstall = self.cabalInstall_1_16_0_2;
+    cgi = self.cgi_3001_1_7_5;
+    deepseq = self.deepseq_1_2_0_1;
+    haddock = self.haddock_2_7_2;
+    parallel = self.parallel_3_2_0_3;
+    primitive = self.primitive_0_5_0_1;
+    stm = self.stm_2_4_2;
+    syb = null;                         # core package in ghc < 7
+  };
 
-  ghc721Prefs = ghc722Prefs;
-
-  ghc704Prefs =
-    self : super : super.haskellPlatformArgs_2011_4_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2011_4_0_0;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
-
-  ghc703Prefs =
-    self : super : super.haskellPlatformArgs_2011_2_0_1 self // {
-      haskellPlatform = self.haskellPlatform_2011_2_0_1;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
-
-  ghc702Prefs = ghc701Prefs;
-
-  ghc701Prefs =
-    self : super : super.haskellPlatformArgs_2011_2_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2011_2_0_0;
-      cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; };
-      monadPar = self.monadPar_0_1_0_3;
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      prettyShow = self.prettyShow_1_2;
-      binary = self.binary_0_6_0_0;
-      Cabal_1_18_1_3 = super.Cabal_1_18_1_3.override { deepseq = self.deepseq_1_3_0_2; };
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
-
-  ghc6123Prefs = ghc6122Prefs;
-
-  ghc6122Prefs =
-    self : super : super.haskellPlatformArgs_2010_2_0_0 self // {
-      haskellPlatform = super.haskellPlatform_2010_2_0_0;
-      mtl1 = self.mtl_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
-      deepseq = self.deepseq_1_1_0_2;
-      # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3; 
-        zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
-      };
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
-
-  ghc6121Prefs =
-    self : super : super.haskellPlatformArgs_2010_1_0_0 self // {
-      haskellPlatform = self.haskellPlatform_2010_1_0_0;
-      mtl1 = self.mtl_1_1_0_2;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      deepseq = self.deepseq_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
-      # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      cabal2nix = super.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3;
-        zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
-      };
-      quickcheckIo = super.quickcheckIo.override {
-        HUnit = self.HUnit_1_2_5_2;
-        QuickCheck = self.QuickCheck2;
-      };
-      hspecExpectations = super.hspecExpectations.override {
-        HUnit = self.HUnit_1_2_5_2;
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
-
-  ghc6104Prefs =
-    self : super : super.haskellPlatformArgs_2009_2_0_2 self // {
-      haskellPlatform = self.haskellPlatform_2009_2_0_2;
-      mtl = self.mtl1;
-      mtl1 = self.mtl_1_1_0_2;
-      extensibleExceptions = self.extensibleExceptions_0_1_1_0;
-      text = self.text_0_11_0_6;
-      deepseq = self.deepseq_1_1_0_2;
-      monadPar = self.monadPar_0_1_0_3;
-      # deviating from Haskell platform here, to make some packages (notably statistics) compile
-      jailbreakCabal = super.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; };
-      binary = self.binary_0_6_0_0;
-      cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
-        Cabal = self.Cabal_1_16_0_3;
-        zlib = self.zlib_0_5_3_3;
-        mtl = self.mtl_2_1_2;
-        HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; };
-      };
-      haskeline = self.haskeline_0_7_1_1;
-      terminfo = self.terminfo_0_3_2_6;
-    };
+  ghc6104Prefs = self : super : ghc6123Prefs self super // {
+    alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    Cabal = self.Cabal_1_16_0_3;
+    GLUT = self.GLUT_2_2_2_1;
+    haddock = self.haddock_2_4_2;
+    happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    hashable = self.hashable_1_1_2_5;
+    HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    OpenGLRaw = self.OpenGLRaw_1_3_0_0;
+    OpenGL = self.OpenGL_2_6_0_1;
+    QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+ };
 
   # Abstraction for Haskell packages collections
   packagesFun = makeOverridable
@@ -260,16 +127,6 @@
   #
   # GHC binaries are around for bootstrapping purposes
 
-  # If we'd want to reactivate the 6.6 and 6.8 series of ghc, we'd
-  # need to reenable an old binary such as this.
-  /*
-  ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix {
-    inherit fetchurl stdenv ncurses gmp;
-    readline = if stdenv.system == "i686-linux" then readline4 else readline5;
-    perl = perl58;
-  });
-  */
-
   ghc6101Binary = lowPrio (callPackage ../development/compilers/ghc/6.10.1-binary.nix {
     gmp = pkgs.gmp4;
   });
@@ -298,113 +155,6 @@
   # Here, we associate compiler versions with bootstrap compiler versions and
   # preference functions.
 
-  packages_ghc6104 =
-    packages { ghcPath = ../development/compilers/ghc/6.10.4.nix;
-               prefFun = ghc6104Prefs;
-             };
-
-  packages_ghc6121 =
-    packages { ghcPath =  ../development/compilers/ghc/6.12.1.nix;
-               prefFun = ghc6121Prefs;
-             };
-
-  packages_ghc6122 =
-    packages { ghcPath = ../development/compilers/ghc/6.12.2.nix;
-               prefFun = ghc6122Prefs;
-             };
-
-  packages_ghc6123 =
-    packages { ghcPath = ../development/compilers/ghc/6.12.3.nix;
-               prefFun = ghc6123Prefs;
-             };
-
-  # Will never make it into a platform release, severe bugs; leave at lowPrio.
-  packages_ghc701 =
-    packages { ghcPath = ../development/compilers/ghc/7.0.1.nix;
-               prefFun = ghc701Prefs;
-             };
-
-  packages_ghc702 =
-    packages { ghcPath = ../development/compilers/ghc/7.0.2.nix;
-               prefFun = ghc702Prefs;
-             };
-
-  packages_ghc703 =
-    packages { ghcPath = ../development/compilers/ghc/7.0.3.nix;
-               prefFun = ghc703Prefs;
-             };
-
-  # The following items are a bit convoluted, but they serve the
-  # following purpose:
-  #   - for the default version of GHC, both profiling and
-  #     non-profiling versions should be built by Hydra --
-  #     therefore, the _no_profiling and _profiling calls;
-  #   - however, if a user just upgrades a profile, then the
-  #     cabal/libraryProfiling setting should be respected; i.e.,
-  #     the versions not matching the profiling config setting
-  #     should have low priority -- therefore, the use of
-  #     defaultVersionPrioFun;
-  #   - it should be possible to select library versions that
-  #     respect the config setting using the standard
-  #     packages_ghc704 path -- therefore, the additional
-  #     call in packages_ghc704, without recurseIntoAttrs,
-  #     so that Hydra doesn't build these.
-
-  packages_ghc704 =
-    packages { ghcPath = ../development/compilers/ghc/7.0.4.nix;
-               ghcBinary = ghc6101BinaryDarwin;
-               prefFun = ghc704Prefs;
-             };
-
-  packages_ghc721 =
-    packages { ghcPath = ../development/compilers/ghc/7.2.1.nix;
-               ghcBinary = ghc6121BinaryDarwin;
-               prefFun = ghc721Prefs;
-             };
-
-  packages_ghc722 =
-    packages { ghcPath = ../development/compilers/ghc/7.2.2.nix;
-               ghcBinary = ghc6121BinaryDarwin;
-               prefFun = ghc722Prefs;
-             };
-
-  packages_ghc741 =
-    packages { ghcPath = ../development/compilers/ghc/7.4.1.nix;
-               ghcBinary = ghc6121BinaryDarwin;
-               prefFun = ghc741Prefs;
-             };
-
-  packages_ghc742 =
-    packages { ghcPath = ../development/compilers/ghc/7.4.2.nix;
-               ghcBinary = ghc6121BinaryDarwin;
-               prefFun = ghc742Prefs;
-             };
-
-  packages_ghc761 =
-    packages { ghcPath = ../development/compilers/ghc/7.6.1.nix;
-               ghcBinary = ghc704Binary;
-               prefFun = ghc763Prefs;
-             };
-
-  packages_ghc762 =
-    packages { ghcPath = ../development/compilers/ghc/7.6.2.nix;
-               ghcBinary = ghc704Binary;
-               prefFun = ghc763Prefs;
-             };
-
-  packages_ghc763 =
-    packages { ghcPath = ../development/compilers/ghc/7.6.3.nix;
-               ghcBinary = ghc704Binary;
-               prefFun = ghc763Prefs;
-             };
-
-  packages_ghc782 =
-    packages { ghcPath = ../development/compilers/ghc/7.8.2.nix;
-               ghcBinary = ghc742Binary;
-               prefFun = ghcHEADPrefs;
-             };
-
-  # Reasonably current HEAD snapshot. Should *always* be lowPrio.
   packages_ghcHEAD =
     packages { ghcPath = ../development/compilers/ghc/head.nix;
                ghcBinary = pkgs.haskellPackages.ghcPlain;
@@ -415,4 +165,44 @@
                };
              };
 
+  packages_ghc782 =
+    packages { ghcPath = ../development/compilers/ghc/7.8.2.nix;
+               ghcBinary = ghc742Binary;
+               prefFun = ghc782Prefs;
+             };
+
+  packages_ghc763 =
+    packages { ghcPath = ../development/compilers/ghc/7.6.3.nix;
+               ghcBinary = ghc704Binary;
+               prefFun = ghc763Prefs;
+             };
+
+  packages_ghc742 =
+    packages { ghcPath = ../development/compilers/ghc/7.4.2.nix;
+               ghcBinary = ghc6121BinaryDarwin;
+               prefFun = ghc742Prefs;
+             };
+
+  packages_ghc722 =
+    packages { ghcPath = ../development/compilers/ghc/7.2.2.nix;
+               ghcBinary = ghc6121BinaryDarwin;
+               prefFun = ghc722Prefs;
+             };
+
+  packages_ghc704 =
+    packages { ghcPath = ../development/compilers/ghc/7.0.4.nix;
+               ghcBinary = ghc6101BinaryDarwin;
+               prefFun = ghc704Prefs;
+             };
+
+  packages_ghc6123 =
+    packages { ghcPath = ../development/compilers/ghc/6.12.3.nix;
+               prefFun = ghc6123Prefs;
+             };
+
+  packages_ghc6104 =
+    packages { ghcPath = ../development/compilers/ghc/6.10.4.nix;
+               prefFun = ghc6104Prefs;
+             };
+
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bfe563a5fcb..e34bdd635b7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1,20 +1,5 @@
 # Haskell packages in Nixpkgs
 #
-# If you have any questions about the packages defined here or how to
-# contribute, please contact Andres Loeh.
-#
-# This file defines all packages that depend on GHC, the Glasgow Haskell
-# compiler. They are usually distributed via Hackage, the central Haskell
-# package repository. Since at least the libraries are incompatible between
-# different compiler versions, the whole file is parameterized by the GHC
-# that is being used. GHC itself is composed in haskell-defaults.nix.
-#
-# Note that next to the packages defined here, there is another way to build
-# arbitrary packages from HackageDB in Nix, using the hack-nix tool that is
-# developed by Marc Weber.
-# -> http://github.com/MarcWeber/hack-nix. Read its README file.
-#
-#
 # This file defines a function parameterized by the following:
 #
 #    pkgs:
@@ -110,9 +95,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   # packages. It isn't the Cabal library, which is spelled "Cabal".
 
   cabal = callPackage ../build-support/cabal {
+    Cabal = null;               # prefer the Cabal version shipped with the compiler
     inherit enableLibraryProfiling enableCheckPhase
       enableStaticLibraries enableSharedLibraries enableSharedExecutables;
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
+    extension = self : super : {};
   };
 
   # A variant of the cabal build driver that disables unit testing.
@@ -123,367 +110,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   # Convenience helper function.
   disableTest = x: x.override { cabal = self.cabalNoTest; };
 
-  # Haskell Platform
-  #
-  # We try to support several platform versions. For these, we set all
-  # versions explicitly.
-  #
-  # DO NOT CHANGE THE VERSIONS LISTED HERE from the actual Haskell
-  # Platform defaults. If you must update the defaults for a particular
-  # GHC version, change the "preferences function" for that GHC version
-  # in haskell-defaults.nix.
-
-  # NOTE: 2013.2.0.0 is the current default.
-
-  haskellPlatformArgs_future = self : {
-    async        = self.async_2_0_1_5;
-    attoparsec   = self.attoparsec_0_11_3_0;
-    caseInsensitive = self.caseInsensitive_1_2_0_0;
-    cgi          = self.cgi_3001_1_8_5;
-    fgl          = self.fgl_5_5_0_1;
-    GLUT         = self.GLUT_2_5_1_0;
-    GLURaw       = self.GLURaw_1_4_0_0;
-    haskellSrc   = self.haskellSrc_1_0_1_6;
-    hashable     = self.hashable_1_2_1_0;
-    html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_14;
-    HUnit        = self.HUnit_1_2_5_2;
-    mtl          = self.mtl_2_1_3_1;
-    network      = self.network_2_5_0_0;
-    OpenGL       = self.OpenGL_2_9_1_0;
-    OpenGLRaw    = self.OpenGLRaw_1_4_0_0;
-    parallel     = self.parallel_3_2_0_4;
-    parsec       = self.parsec_3_1_5;
-    QuickCheck   = self.QuickCheck_2_6;
-    random       = self.random_1_0_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_95_1;
-    regexPosix   = self.regexPosix_0_95_2;
-    split        = self.split_0_2_2;
-    stm          = self.stm_2_4_3;
-    syb          = self.syb_0_4_1;
-    text         = self.text_1_1_1_1;
-    transformers = self.transformers_0_3_0_0;   # this has become a core package in GHC 7.7
-    unorderedContainers = self.unorderedContainers_0_2_4_0;
-    vector       = self.vector_0_10_9_1;
-    xhtml        = self.xhtml_3000_2_1;
-    zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_20_0_1;
-    alex         = self.alex_3_1_3;
-    haddock      = self.haddock_2_14_2;
-    happy        = self.happy_1_19_3;
-    primitive    = self.primitive_0_5_2_1;      # semi-official, but specified
-  };
-
-  haskellPlatformArgs_2013_2_0_0 = self : {
-    async        = self.async_2_0_1_4;
-    attoparsec   = self.attoparsec_0_10_4_0;
-    caseInsensitive = self.caseInsensitive_1_0_0_1;
-    cgi          = self.cgi_3001_1_7_5;
-    fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_4_0_0;
-    GLURaw       = self.GLURaw_1_3_0_0;
-    haskellSrc   = self.haskellSrc_1_0_1_5;
-    hashable     = self.hashable_1_2_1_0;       # not HP (1.1.2.5), but fixes many builds
-    html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_8;
-    HUnit        = self.HUnit_1_2_5_2;
-    mtl          = self.mtl_2_1_2;
-    network      = self.network_2_4_1_2;
-    OpenGL       = self.OpenGL_2_8_0_0;
-    OpenGLRaw    = self.OpenGLRaw_1_3_0_0;
-    parallel     = self.parallel_3_2_0_3;
-    parsec       = self.parsec_3_1_3;
-    QuickCheck   = self.QuickCheck_2_6;
-    random       = self.random_1_0_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_95_1;
-    regexPosix   = self.regexPosix_0_95_2;
-    split        = self.split_0_2_2;
-    stm          = self.stm_2_4_2;
-    syb          = self.syb_0_4_0;
-    text         = self.text_0_11_3_1;
-    transformers = self.transformers_0_3_0_0;
-    unorderedContainers = self.unorderedContainers_0_2_3_0;
-    vector       = self.vector_0_10_0_1;
-    xhtml        = self.xhtml_3000_2_1;
-    zlib         = self.zlib_0_5_4_1;
-    cabalInstall = self.cabalInstall_1_16_0_2;
-    alex         = self.alex_3_0_5;
-    haddock      = self.haddock_2_13_2;
-    happy        = self.happy_1_18_10;
-    primitive    = self.primitive_0_5_0_1;      # semi-official, but specified
-  };
-
-  haskellPlatform_2013_2_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2013.2.0.0.nix
-      (self.haskellPlatformArgs_2013_2_0_0 self);
-
-  haskellPlatformArgs_2012_4_0_0 = self : {
-    async        = self.async_2_0_1_3;
-    cgi          = self.cgi_3001_1_7_4;
-    fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_5;
-    html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_5;
-    HUnit        = self.HUnit_1_2_5_1;
-    mtl          = self.mtl_2_1_2;
-    network      = self.network_2_3_1_0;
-    OpenGL       = self.OpenGL_2_2_3_1;
-    parallel     = self.parallel_3_2_0_3;
-    parsec       = self.parsec_3_1_3;
-    QuickCheck   = self.QuickCheck_2_5_1_1;
-    random       = self.random_1_0_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_95_1;
-    regexPosix   = self.regexPosix_0_95_2;
-    split        = self.split_0_2_1_1;
-    stm          = self.stm_2_4;
-    syb          = self.syb_0_3_7;
-    text         = self.text_0_11_2_3;
-    transformers = self.transformers_0_3_0_0;
-    vector       = self.vector_0_10_0_1;
-    xhtml        = self.xhtml_3000_2_1;
-    zlib         = self.zlib_0_5_4_0;
-    cabalInstall = self.cabalInstall_0_14_0;
-    alex         = self.alex_3_0_2;
-    haddock      = self.haddock_2_11_0;
-    happy        = self.happy_1_18_10;
-    primitive    = self.primitive_0_5_0_1; # semi-official, but specified
-  };
-
-  haskellPlatform_2012_4_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2012.4.0.0.nix
-      (self.haskellPlatformArgs_2012_4_0_0 self);
-
-  haskellPlatformArgs_2012_2_0_0 = self : {
-    cgi          = self.cgi_3001_1_7_4;
-    fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_5;
-    html         = self.html_1_0_1_2;
-    HTTP         = self.HTTP_4000_2_3;
-    HUnit        = self.HUnit_1_2_4_2;
-    mtl          = self.mtl_2_1_1;
-    network      = self.network_2_3_0_13;
-    OpenGL       = self.OpenGL_2_2_3_1;
-    parallel     = self.parallel_3_2_0_2;
-    parsec       = self.parsec_3_1_2;
-    QuickCheck   = self.QuickCheck_2_4_2;
-    random       = self.random_1_0_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_95_1;
-    regexPosix   = self.regexPosix_0_95_1;
-    stm          = self.stm_2_3;
-    syb          = self.syb_0_3_6_1;
-    text         = self.text_0_11_2_0;
-    transformers = self.transformers_0_3_0_0;
-    xhtml        = self.xhtml_3000_2_1;
-    zlib         = self.zlib_0_5_3_3;
-    cabalInstall = self.cabalInstall_0_14_0;
-    alex         = self.alex_3_0_1;
-    haddock      = self.haddock_2_10_0;
-    happy        = self.happy_1_18_9;
-  };
-
-  haskellPlatform_2012_2_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2012.2.0.0.nix
-      (self.haskellPlatformArgs_2012_2_0_0 self);
-
-  haskellPlatformArgs_2011_4_0_0 = self : {
-    cgi          = self.cgi_3001_1_7_4;
-    fgl          = self.fgl_5_4_2_4;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_4;
-    html         = self.html_1_0_1_2;
-    HUnit        = self.HUnit_1_2_4_2;
-    network      = self.network_2_3_0_5;
-    OpenGL       = self.OpenGL_2_2_3_0;
-    parallel     = self.parallel_3_1_0_1;
-    parsec       = self.parsec_3_1_1;
-    QuickCheck   = self.QuickCheck_2_4_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_95_1;
-    regexPosix   = self.regexPosix_0_95_1;
-    stm          = self.stm_2_2_0_1;
-    syb          = self.syb_0_3_3;
-    xhtml        = self.xhtml_3000_2_0_4;
-    zlib         = self.zlib_0_5_3_1;
-    HTTP         = self.HTTP_4000_1_2;
-    deepseq      = self.deepseq_1_1_0_2;
-    text         = self.text_0_11_1_5;
-    transformers = self.transformers_0_2_2_0;
-    mtl          = self.mtl_2_0_1_0;
-    cabalInstall = self.cabalInstall_0_10_2;
-    alex         = self.alex_2_3_5;
-    happy        = self.happy_1_18_6;
-    haddock      = self.haddock_2_9_2;
-  };
-
-  haskellPlatform_2011_4_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2011.4.0.0.nix
-      (self.haskellPlatformArgs_2011_4_0_0 self);
-
-  haskellPlatformArgs_2011_2_0_1 = self : {
-    cgi          = self.cgi_3001_1_7_4;
-    fgl          = self.fgl_5_4_2_3;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_4;
-    html         = self.html_1_0_1_2;
-    HUnit        = self.HUnit_1_2_2_3;
-    network      = self.network_2_3_0_2;
-    OpenGL       = self.OpenGL_2_2_3_0;
-    parallel     = self.parallel_3_1_0_1;
-    parsec       = self.parsec_3_1_1;
-    QuickCheck   = self.QuickCheck_2_4_0_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_93_1;
-    regexPosix   = self.regexPosix_0_94_4;
-    stm          = self.stm_2_2_0_1;
-    syb          = self.syb_0_3;
-    xhtml        = self.xhtml_3000_2_0_1;
-    zlib         = self.zlib_0_5_3_1;
-    HTTP         = self.HTTP_4000_1_1;
-    deepseq      = self.deepseq_1_1_0_2;
-    text         = self.text_0_11_0_6;
-    transformers = self.transformers_0_2_2_0;
-    mtl          = self.mtl_2_0_1_0;
-    cabalInstall = self.cabalInstall_0_10_2;
-    alex         = self.alex_2_3_5;
-    happy        = self.happy_1_18_6;
-    haddock      = self.haddock_2_9_2;
-  };
-
-  haskellPlatform_2011_2_0_1 =
-    callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.1.nix
-      (self.haskellPlatformArgs_2011_2_0_1 self);
-
-  haskellPlatformArgs_2011_2_0_0 = self : {
-    cgi          = self.cgi_3001_1_7_4;
-    fgl          = self.fgl_5_4_2_3;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_4;
-    html         = self.html_1_0_1_2;
-    HUnit        = self.HUnit_1_2_2_3;
-    network      = self.network_2_3_0_2;
-    OpenGL       = self.OpenGL_2_2_3_0;
-    parallel     = self.parallel_3_1_0_1;
-    parsec       = self.parsec_3_1_1;
-    QuickCheck   = self.QuickCheck_2_4_0_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_93_1;
-    regexPosix   = self.regexPosix_0_94_4;
-    stm          = self.stm_2_2_0_1;
-    syb          = self.syb_0_3;
-    xhtml        = self.xhtml_3000_2_0_1;
-    zlib         = self.zlib_0_5_3_1;
-    HTTP         = self.HTTP_4000_1_1;
-    deepseq      = self.deepseq_1_1_0_2;
-    text         = self.text_0_11_0_5;
-    transformers = self.transformers_0_2_2_0;
-    mtl          = self.mtl_2_0_1_0;
-    cabalInstall = self.cabalInstall_0_10_2;
-    alex         = self.alex_2_3_5;
-    happy        = self.happy_1_18_6;
-    haddock      = self.haddock_2_9_2;
-  };
-
-  haskellPlatform_2011_2_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.0.nix
-      (self.haskellPlatformArgs_2011_2_0_0 self);
-
-  haskellPlatformArgs_2010_2_0_0 = self : {
-    cgi          = self.cgi_3001_1_7_3;
-    fgl          = self.fgl_5_4_2_3;
-    GLUT         = self.GLUT_2_1_2_1;
-    haskellSrc   = self.haskellSrc_1_0_1_3;
-    html         = self.html_1_0_1_2;
-    HUnit        = self.HUnit_1_2_2_1;
-    mtl          = self.mtl_1_1_0_2;
-    network      = self.network_2_2_1_7;
-    OpenGL       = self.OpenGL_2_2_3_0;
-    parallel     = self.parallel_2_2_0_1;
-    parsec       = self.parsec_2_1_0_1;
-    QuickCheck   = self.QuickCheck_2_1_1_1;
-    regexBase    = self.regexBase_0_93_2;
-    regexCompat  = self.regexCompat_0_93_1;
-    regexPosix   = self.regexPosix_0_94_2;
-    stm          = self.stm_2_1_2_1;
-    xhtml        = self.xhtml_3000_2_0_1;
-    zlib         = self.zlib_0_5_2_0;
-    HTTP         = self.HTTP_4000_0_9;
-    deepseq      = self.deepseq_1_1_0_0;
-    cabalInstall = self.cabalInstall_0_8_2;
-    alex         = self.alex_2_3_3;
-    happy        = self.happy_1_18_5;
-    haddock      = self.haddock_2_7_2;
-  };
-
-  haskellPlatform_2010_2_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2010.2.0.0.nix
-      (self.haskellPlatformArgs_2010_2_0_0 self);
-
-  haskellPlatformArgs_2010_1_0_0 = self : {
-    haskellSrc   = self.haskellSrc_1_0_1_3;
-    html         = self.html_1_0_1_2;
-    fgl          = self.fgl_5_4_2_2;
-    cabalInstall = self.cabalInstall_0_8_0;
-    GLUT         = self.GLUT_2_1_2_1;
-    OpenGL       = self.OpenGL_2_2_3_0;
-    zlib         = self.zlib_0_5_2_0;
-    alex         = self.alex_2_3_2;
-    cgi          = self.cgi_3001_1_7_2;
-    QuickCheck   = self.QuickCheck_2_1_1_1;
-    HTTP         = self.HTTP_4000_0_9;
-    HUnit        = self.HUnit_1_2_2_1;
-    network      = self.network_2_2_1_7;
-    parallel     = self.parallel_2_2_0_1;
-    parsec       = self.parsec_2_1_0_1;
-    regexBase    = self.regexBase_0_93_1;
-    regexCompat  = self.regexCompat_0_92;
-    regexPosix   = self.regexPosix_0_94_1;
-    stm          = self.stm_2_1_1_2;
-    xhtml        = self.xhtml_3000_2_0_1;
-    haddock      = self.haddock_2_7_2;
-    happy        = self.happy_1_18_4;
-  };
-
-  haskellPlatform_2010_1_0_0 =
-    callPackage ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix
-      (self.haskellPlatformArgs_2010_1_0_0 self);
-
-  haskellPlatformArgs_2009_2_0_2 = self : {
-    time         = self.time_1_1_2_4;
-    haddock      = self.haddock_2_4_2;
-    cgi          = self.cgi_3001_1_7_1;
-    editline     = self.editline_0_2_1_0;
-    fgl          = self.fgl_5_4_2_2;
-    GLUT         = self.GLUT_2_1_1_2;
-    haskellSrc   = self.haskellSrc_1_0_1_3;
-    html         = self.html_1_0_1_2;
-    HUnit        = self.HUnit_1_2_0_3;
-    network      = self.network_2_2_1_4;
-    OpenGL       = self.OpenGL_2_2_1_1;
-    parallel     = self.parallel_1_1_0_1;
-    parsec       = self.parsec_2_1_0_1;
-    QuickCheck   = self.QuickCheck_1_2_0_0;
-    regexBase    = self.regexBase_0_72_0_2;
-    regexCompat  = self.regexCompat_0_71_0_1;
-    regexPosix   = self.regexPosix_0_72_0_3;
-    stm          = self.stm_2_1_1_2;
-    xhtml        = self.xhtml_3000_2_0_1;
-    zlib         = self.zlib_0_5_0_0;
-    HTTP         = self.HTTP_4000_0_6;
-    cabalInstall = self.cabalInstall_0_6_2;
-    alex         = self.alex_2_3_1;
-    happy        = self.happy_1_18_4;
-  };
-
-  haskellPlatform_2009_2_0_2 =
-    callPackage ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix
-      (self.haskellPlatformArgs_2009_2_0_2 self);
-
   # Haskell libraries.
 
   acidState = callPackage ../development/libraries/haskell/acid-state {};
@@ -513,7 +139,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   aes = callPackage ../development/libraries/haskell/aes {};
 
   aeson = callPackage ../development/libraries/haskell/aeson {
-    blazeBuilder = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6") then self.blazeBuilder else null;
+    blazeBuilder = null;
   };
 
   aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
@@ -536,18 +162,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ansiWlPprint = callPackage ../development/libraries/haskell/ansi-wl-pprint {};
 
-  ariadne = callPackage ../development/libraries/haskell/ariadne {
-    Cabal = self.Cabal_1_18_1_3;
-    haskellPackages = self.haskellPackages.override {
-      Cabal = self.Cabal_1_18_1_3;
-    };
-    haskellNames = self.haskellNames.override {
-      Cabal = self.Cabal_1_18_1_3;
-      haskellPackages = self.haskellPackages.override {
-        Cabal = self.Cabal_1_18_1_3;
-      };
-    };
-  };
+  ariadne = callPackage ../development/libraries/haskell/ariadne {};
 
   arithmoi = callPackage ../development/libraries/haskell/arithmoi {};
 
@@ -614,13 +229,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bimap = callPackage ../development/libraries/haskell/bimap {};
 
-  binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {};
-  binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
-  binary = null;                # core package starting with GHC 7.4.x
+  binary_0_7_0_1 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
+  binary = null;                # core package since ghc >= 7.2.x
 
-  binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {
-    binary = self.binary_0_7_1_0;
-  };
+  binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
 
   binaryShared = callPackage ../development/libraries/haskell/binary-shared {};
 
@@ -657,17 +269,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
   bmp = callPackage ../development/libraries/haskell/bmp {
-    binary = self.binary_0_7_1_0;
+    binary = self.binary_0_7_0_1;
   };
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
   brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
 
-  bson = callPackage ../development/libraries/haskell/bson {
-    binary = self.binary_0_7_1_0;
-    dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_1_0; };
-  };
+  bson = callPackage ../development/libraries/haskell/bson {};
 
   boomerang = callPackage ../development/libraries/haskell/boomerang {};
 
@@ -697,11 +306,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   c2hsc = callPackage ../development/libraries/haskell/c2hsc {};
 
-  Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix { cabal = self.cabal.override { Cabal = null; }; };
-  Cabal = null; # core package in GHC
+  Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix {};
+  Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix {};
+  Cabal_1_18_1_3 = callPackage ../development/libraries/haskell/Cabal/1.18.1.3.nix {};
+  Cabal_1_20_0_0 = callPackage ../development/libraries/haskell/Cabal/1.20.0.0.nix {};
+  Cabal = null;                 # core package since forever
 
   cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {};
 
@@ -942,7 +551,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {};
   deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {};
   deepseq_1_3_0_2 = callPackage ../development/libraries/haskell/deepseq/1.3.0.2.nix {};
-  deepseq = null; # a core package in recent GHCs
+  deepseq = null;               # core package since ghc >= 7.4.x
 
   deepseqTh = callPackage ../development/libraries/haskell/deepseq-th {};
 
@@ -1041,13 +650,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   elerea = callPackage ../development/libraries/haskell/elerea {};
 
-  Elm = callPackage ../development/compilers/elm/elm.nix {
-    binary = self.binary_0_7_1_0;
-    pandoc = self.pandoc.override {
-      binary = self.binary_0_7_1_0;
-      zipArchive = self.zipArchive.override { binary = self.binary_0_7_1_0; };
-    };
-  };
+  Elm = callPackage ../development/compilers/elm/elm.nix {};
 
   elmServer = callPackage ../development/compilers/elm/elm-server.nix {};
 
@@ -1087,9 +690,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   exceptionTransformers = callPackage ../development/libraries/haskell/exception-transformers {};
 
-  exceptions = callPackage ../development/libraries/haskell/exceptions {
-    QuickCheck = self.QuickCheck_2_5_1_1;
-  };
+  exceptions = callPackage ../development/libraries/haskell/exceptions {};
 
   explicitException = callPackage ../development/libraries/haskell/explicit-exception {};
 
@@ -1103,8 +704,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   fdoNotify = callPackage ../development/libraries/haskell/fdo-notify {};
 
-  filepath_1_3_0_0 = callPackage ../development/libraries/haskell/filepath {};
-  filepath = null; # a core package in recent GHCs
+  filepath_1_3_0_2 = callPackage ../development/libraries/haskell/filepath/1.3.0.2.nix {};
+  filepath = null;              # core package since forever
 
   fileLocation = callPackage ../development/libraries/haskell/file-location {};
 
@@ -1116,7 +717,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   extensibleExceptions_0_1_1_2 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.2.nix {};
   extensibleExceptions_0_1_1_3 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.3.nix {};
   extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {};
-  extensibleExceptions = null; # a core package in recent GHCs
+  extensibleExceptions = self.extensibleExceptions_0_1_1_4;
 
   failure = callPackage ../development/libraries/haskell/failure {};
 
@@ -1243,21 +844,23 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
 
-  GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix {};
-  GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix {};
+  GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; };
+  GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; };
   GLURaw = self.GLURaw_1_4_0_0;
 
   GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
   GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
   GLUT_2_1_2_2 = callPackage ../development/libraries/haskell/GLUT/2.1.2.2.nix {};
   GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix {
-    OpenGL = self.OpenGL_2_4_0_2;
+    OpenGL = self.OpenGL_2_6_0_1;
   };
   GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix {
     OpenGL = self.OpenGL_2_6_0_1;
   };
   GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
-    OpenGL = self.OpenGL_2_8_0_0;
+    OpenGLRaw = self.OpenGLRaw_1_3_0_0;
+    OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; };
+
   };
   GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix {
     OpenGL = self.OpenGL_2_9_1_0;
@@ -1321,9 +924,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   haskelldb = callPackage ../development/libraries/haskell/haskelldb {};
 
-  haskeline_0_7_1_1 = callPackage ../development/libraries/haskell/haskeline/0.7.1.1.nix {};
-  haskeline_0_7_1_2 = callPackage ../development/libraries/haskell/haskeline/0.7.1.2.nix {};
-  haskeline = self.haskeline_0_7_1_2;
+  haskeline = callPackage ../development/libraries/haskell/haskeline {};
 
   haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {};
 
@@ -1481,7 +1082,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hsdns = callPackage ../development/libraries/haskell/hsdns {};
 
-  hsemail = callPackage ../development/libraries/haskell/hsemail {};
+  hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else
+    callPackage ../development/libraries/haskell/hsemail {};
 
   hslua = callPackage ../development/libraries/haskell/hslua {
     lua = pkgs.lua5_1;
@@ -1491,7 +1093,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hsini = callPackage ../development/libraries/haskell/hsini {};
 
-  HsSyck = callPackage ../development/libraries/haskell/HsSyck {};
+  HsSyck_0_51 = callPackage ../development/libraries/haskell/HsSyck/0.51.nix {};
+  HsSyck_0_52 = callPackage ../development/libraries/haskell/HsSyck/0.52.nix {};
+  HsSyck = self.HsSyck_0_52;
 
   HsOpenSSL = callPackage ../development/libraries/haskell/HsOpenSSL {};
 
@@ -1640,9 +1244,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   languageJava = callPackage ../development/libraries/haskell/language-java {};
 
-  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {
-    alex = self.alex_3_1_3;
-  };
+  languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};
 
   languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {};
 
@@ -1757,7 +1359,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {
-    binary = self.binary_0_7_1_0;
+    binary = self.binary_0_7_0_1;
   };
 
   mimeMail = callPackage ../development/libraries/haskell/mime-mail {};
@@ -1768,9 +1370,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   missingForeign = callPackage ../development/libraries/haskell/missing-foreign {};
 
-  MissingH = callPackage ../development/libraries/haskell/MissingH {
-    testpack = null;
-  };
+  MissingH = callPackage ../development/libraries/haskell/MissingH { testpack = null; };
 
   mmap = callPackage ../development/libraries/haskell/mmap {};
 
@@ -1831,15 +1431,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
   mtl_1_1_1_1 = callPackage ../development/libraries/haskell/mtl/1.1.1.1.nix {};
   mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {};
-  mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {
-    transformers = self.transformers_0_3_0_0;
-  };
-  mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {
-    transformers = self.transformers_0_3_0_0;
-  };
-  mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {
-    transformers = self.transformers_0_3_0_0;
-  };
+  mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {};
+  mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {};
+  mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {};
   mtl = self.mtl_2_1_3_1;
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
@@ -1856,7 +1450,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   multiset_0_2_1 = callPackage ../development/libraries/haskell/multiset/0.2.1.nix {};
   multiset_0_2_2 = callPackage ../development/libraries/haskell/multiset/0.2.2.nix {};
-  multiset = self.multiset_0_2_1;   # later versions work only with ghc 7.6 and beyond
+  multiset = self.multiset_0_2_2;
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 
@@ -1948,10 +1542,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
   OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
   OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
-  OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {
-    OpenGLRaw = self.OpenGLRaw_1_4_0_0;
-    GLURaw = self.GLURaw_1_4_0_0.override { OpenGLRaw = self.OpenGLRaw_1_4_0_0; };
-  };
+  OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {};
   OpenGL = self.OpenGL_2_9_1_0;
 
   OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};
@@ -2004,7 +1595,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
   parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {};
-  parsers = self.parsers_0_10_3;
+  parsers = self.parsers_0_11;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
@@ -2042,9 +1633,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pipesAttoparsec = callPackage ../development/libraries/haskell/pipes-attoparsec {};
 
-  pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {
-    binary = self.binary_0_7_1_0;
-  };
+  pipesBinary = callPackage ../development/libraries/haskell/pipes-binary {};
 
   pipesBytestring = callPackage ../development/libraries/haskell/pipes-bytestring {};
 
@@ -2089,16 +1678,15 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pqueue = callPackage ../development/libraries/haskell/pqueue {};
 
-  process = callPackage ../development/libraries/haskell/process {};
+  process_1_2_0_0 = callPackage ../development/libraries/haskell/process/1.2.0.0.nix {};
+  process = null;      # core package since forever
 
   profiteur = callPackage ../development/tools/haskell/profiteur {};
 
   preludeExtras = callPackage ../development/libraries/haskell/prelude-extras {};
 
   preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {};
-
   preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {};
-
   preprocessorTools = self.preprocessorTools_1_0_1;
 
   presburger = callPackage ../development/libraries/haskell/presburger {};
@@ -2106,16 +1694,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
   prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {
-    happy = self.happy_1_19_2;
-  };
+  prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {};
   prettyShow = self.prettyShow_1_6_7;
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 
   primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
   primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {};
-  primitive = self.primitive_0_5_0_1;
+  primitive = self.primitive_0_5_2_1;
 
   profunctors = callPackage ../development/libraries/haskell/profunctors {};
 
@@ -2130,12 +1716,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
 
   prolog = callPackage ../development/libraries/haskell/prolog {};
-  prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {
-    fgl = self.fgl_5_4_2_4;
-  };
-  prologGraph = callPackage ../development/libraries/haskell/prolog-graph {
-    fgl = self.fgl_5_4_2_4;
-  };
+  prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {};
+  prologGraph = callPackage ../development/libraries/haskell/prolog-graph {};
 
   protocolBuffers = callPackage ../development/libraries/haskell/protocol-buffers {};
 
@@ -2158,15 +1740,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {};
   QuickCheck_2_6 = callPackage ../development/libraries/haskell/QuickCheck/2.6.nix {};
   QuickCheck_2_7_3 = callPackage ../development/libraries/haskell/QuickCheck/2.7.3.nix {};
-  QuickCheck1 = self.QuickCheck_1_2_0_1;
-  QuickCheck2 = self.QuickCheck_2_6;
-  QuickCheck  = self.QuickCheck2;
+  QuickCheck = self.QuickCheck_2_7_3;
 
   quickcheckAssertions = callPackage ../development/libraries/haskell/quickcheck-assertions {};
 
-  quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {
-    QuickCheck = self.QuickCheck_2_7_3;
-  };
+  quickcheckInstances = callPackage ../development/libraries/haskell/quickcheck-instances {};
 
   quickcheckIo = callPackage ../development/libraries/haskell/quickcheck-io {};
 
@@ -2179,7 +1757,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {};
 
   random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {};
-  random = null; # core package until ghc-7.2.1
+  random = self.random_1_0_1_1;
 
   randomFu = callPackage ../development/libraries/haskell/random-fu {};
 
@@ -2220,8 +1798,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   regexCompat_0_92     = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {};
   regexCompat_0_93_1   = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {};
   regexCompat_0_95_1   = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {};
-  regexCompat93 = self.regexCompat_0_93_1;
-  regexCompat = self.regexCompat_0_71_0_1;
+  regexCompat = self.regexCompat_0_95_1;
 
   regexCompatTdfa = callPackage ../development/libraries/haskell/regex-compat-tdfa {};
 
@@ -2237,8 +1814,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   regexTdfaText = callPackage ../development/libraries/haskell/regex-tdfa-text {};
 
-  regexPCRE = callPackage ../development/libraries/haskell/regex-pcre {};
-  regexPcre = self.regexPCRE;
+  regexPcre = callPackage ../development/libraries/haskell/regex-pcre {};
 
   regexpr = callPackage ../development/libraries/haskell/regexpr {};
 
@@ -2359,10 +1935,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   StateVar = callPackage ../development/libraries/haskell/StateVar {};
 
-  statistics = callPackage ../development/libraries/haskell/statistics {
-    binary = self.binary_0_7_1_0;
-    vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; };
-  };
+  statistics = callPackage ../development/libraries/haskell/statistics {};
 
   statvfs = callPackage ../development/libraries/haskell/statvfs {};
 
@@ -2398,8 +1971,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   syb_0_3_7 = callPackage ../development/libraries/haskell/syb/0.3.7.nix {};
   syb_0_4_0 = callPackage ../development/libraries/haskell/syb/0.4.0.nix {};
   syb_0_4_1 = callPackage ../development/libraries/haskell/syb/0.4.1.nix {};
-  syb = null;  # by default, we assume that syb ships with GHC, which is
-               # true for the older GHC versions
+  syb = self.syb_0_4_1;
 
   sybWithClass = callPackage ../development/libraries/haskell/syb/syb-with-class.nix {};
 
@@ -2518,9 +2090,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   tastyHunit = callPackage ../development/libraries/haskell/tasty-hunit {};
 
-  tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {
-    QuickCheck = self.QuickCheck_2_7_3;
-  };
+  tastyQuickcheck = callPackage ../development/libraries/haskell/tasty-quickcheck {};
 
   tastyRerun = callPackage ../development/libraries/haskell/tasty-rerun {};
 
@@ -2547,7 +2117,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   testFrameworkHunit = callPackage ../development/libraries/haskell/test-framework-hunit {};
 
   testFrameworkQuickcheck = callPackage ../development/libraries/haskell/test-framework-quickcheck {
-    QuickCheck = self.QuickCheck1;
+    QuickCheck = self.QuickCheck_1_2_0_1; # doesn't support version 2.x
   };
 
   testFrameworkQuickcheck2 = callPackage ../development/libraries/haskell/test-framework-quickcheck2 {};
@@ -2576,7 +2146,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   textStreamDecode = callPackage ../development/libraries/haskell/text-stream-decode {};
 
-  tfRandom = callPackage ../development/libraries/haskell/tf-random {};
+  tfRandom = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else
+    callPackage ../development/libraries/haskell/tf-random {};
 
   these = callPackage ../development/libraries/haskell/these {};
 
@@ -2604,9 +2175,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {};
   time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {};
-  # time is in the core package set. It should only be necessary to
-  # pass it explicitly in rare circumstances.
-  time = null;
+  time = null;                  # core package since ghc >= 6.12.x
 
   timeparsers = callPackage ../development/libraries/haskell/timeparsers {
     convertible = self.convertible_1_0_11_1;
@@ -2629,9 +2198,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   };
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
-  transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then
-     (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null;
-  transformers = self.transformers_0_3_0_0;
+  transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
+  transformers = null;          # core package since ghc >= 7.8.2
 
   transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
 
@@ -2928,24 +2496,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   zipper = callPackage ../development/libraries/haskell/zipper {};
 
-  zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix {
-    inherit (pkgs) zlib;
-  };
-  zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix {
-    inherit (pkgs) zlib;
-  };
-  zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix {
-    inherit (pkgs) zlib;
-  };
-  zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix {
-    inherit (pkgs) zlib;
-  };
-  zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix {
-    inherit (pkgs) zlib;
-  };
-  zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix {
-    inherit (pkgs) zlib;
-  };
+  zlib_0_5_0_0 = callPackage ../development/libraries/haskell/zlib/0.5.0.0.nix { inherit (pkgs) zlib; };
+  zlib_0_5_2_0 = callPackage ../development/libraries/haskell/zlib/0.5.2.0.nix { inherit (pkgs) zlib; };
+  zlib_0_5_3_1 = callPackage ../development/libraries/haskell/zlib/0.5.3.1.nix { inherit (pkgs) zlib; };
+  zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; };
+  zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { inherit (pkgs) zlib; };
+  zlib_0_5_4_1 = callPackage ../development/libraries/haskell/zlib/0.5.4.1.nix { inherit (pkgs) zlib;};
   zlib = self.zlib_0_5_4_1;
 
   zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {};
@@ -2991,8 +2547,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {};
 
-  haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
-  haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
+  haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; };
+  haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; };
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
   haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
   haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {};
@@ -3042,10 +2598,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   arbtt = callPackage ../applications/misc/arbtt {};
 
   cryptol = callPackage ../development/compilers/cryptol/2.0.x.nix {
-    QuickCheck   = self.QuickCheck_2_7_3;
-    text         = self.text_1_1_1_1;
+    Cabal = self.Cabal_1_18_1_3;
     cabalInstall = self.cabalInstall_1_18_0_3;
-    Cabal        = self.Cabal_1_18_1_3;
+    process = self.process_1_2_0_0;
   };
 
   darcs = callPackage ../applications/version-management/darcs {};
@@ -3057,9 +2612,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};
 
-  leksah = callPackage ../applications/editors/leksah {
-    QuickCheck = self.QuickCheck2;
-  };
+  leksah = callPackage ../applications/editors/leksah {};
 
   nc-indicators = callPackage ../applications/misc/nc-indicators {};
 
@@ -3114,7 +2667,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
               else self.Cabal_1_18_1_3;
   };
 
-  cabalDev = callPackage ../development/tools/haskell/cabal-dev {};
+  cabalDev = callPackage ../development/tools/haskell/cabal-dev {
+    HTTP = self.HTTP.override { network = self.network_2_4_1_2; };
+  };
 
   cabalMeta = callPackage ../development/tools/haskell/cabal-meta {};
 
@@ -3127,18 +2682,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
-  cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
-  cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix {
-    Cabal = self.Cabal_1_18_1_3;
-  };
-  cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix {
-    Cabal = self.Cabal_1_20_0_0;
-  };
+  cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
+  cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
+  cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; };
   cabalInstall = self.cabalInstall_1_20_0_1;
 
-  gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {
-    hS3 = self.hS3.override { Crypto = self.Crypto.override { QuickCheck = self.QuickCheck_2_7_3; }; };
-  };
+  gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
 
@@ -3163,8 +2712,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   # Games.
 
   LambdaHack = callPackage ../games/LambdaHack {
-    binary = self.binary_0_7_1_0;
-    vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_1_0; };
+    vectorBinaryInstances = self.vectorBinaryInstances.override {
+      binary = self.binary_0_7_0_1; # the miniutter build input requires this version
+    };
   };
 
   MazesOfMonad = callPackage ../games/MazesOfMonad {};

From 8de39550371d05c7563dada0a5cf5ae933d4cd66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 13:30:14 +0200
Subject: [PATCH 1266/2033] haskell-packages.nix: remove references to parsec2

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e34bdd635b7..9f762ba47a1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2352,10 +2352,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   warpTls = callPackage ../development/libraries/haskell/warp-tls {};
 
   WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
-    parsec = self.parsec2;
+    parsec = self.parsec_2_1_0_1;
   };
   WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
-    parsec = self.parsec2;
+    parsec = self.parsec_2_1_0_1;
   };
   WebBits_2_2 = callPackage ../development/libraries/haskell/WebBits/2.2.nix {};
   WebBits = self.WebBits_2_2;

From 6ca2c509c15dd7f56017bd956aa23fc180fb7788 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 13:28:51 +0200
Subject: [PATCH 1267/2033] haskell-wxcore: jailbreak to fix build with recent
 versions of array

---
 pkgs/development/libraries/haskell/wxHaskell/wxcore.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
index ae01992db97..d404099bf53 100644
--- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
+++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix
@@ -8,6 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1ma6vjf87b493vz3sj6hxzifqixk62n6b5gvixpfzfig1lysddgp";
   buildDepends = [ filepath parsec stm time wxc wxdirect ];
   extraLibraries = [ libX11 mesa wxGTK ];
+  patchPhase = ''
+    sed -i -e 's|array >= .*,|array,|' wxcore.cabal
+  '';
   meta = {
     homepage = "http://haskell.org/haskellwiki/WxHaskell";
     description = "wxHaskell core";

From fde79166ccc705bb88d07059ed98a86598699812 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:17:48 +0200
Subject: [PATCH 1268/2033] haskell-ConfigFile: update to version 1.1.2

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

diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix
index 29d417562cc..b0c77eb1116 100644
--- a/pkgs/development/libraries/haskell/ConfigFile/default.nix
+++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ConfigFile";
-  version = "1.1.1";
-  sha256 = "0w2yhbnqldhmj3d98j720l4lj4d08abqcff751p2slszdm5pw1jm";
+  version = "1.1.2";
+  sha256 = "0xidr8dk5sc9g1v9gw7fmmrsyqiawx2rxg4c36pm4jbcj8jdzxiq";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ MissingH mtl parsec ];

From f2e81ce7cb39b0fbc006b65c1c1db3be4e61caf7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:17:55 +0200
Subject: [PATCH 1269/2033] haskell-Glob: update to version 0.7.5

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

diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix
index d6f07e9168d..85fe7f2e88e 100644
--- a/pkgs/development/libraries/haskell/Glob/default.nix
+++ b/pkgs/development/libraries/haskell/Glob/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Glob";
-  version = "0.7.4";
-  sha256 = "00f6xznqh27vbr8rggsrdphqsq1cvv931pa06b1grs7w01dcmw8s";
+  version = "0.7.5";
+  sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0";
   buildDepends = [ dlist filepath transformers ];
   meta = {
     homepage = "http://iki.fi/matti.niemenmaa/glob/";

From a984b8a0125b4c9ea66822c19deb08ccfab29947 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:17:59 +0200
Subject: [PATCH 1270/2033] haskell-RepLib: update to version 0.5.3.3

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

diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix
index ca593bb2ab8..89e13f1eddc 100644
--- a/pkgs/development/libraries/haskell/RepLib/default.nix
+++ b/pkgs/development/libraries/haskell/RepLib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RepLib";
-  version = "0.5.3.2";
-  sha256 = "0adqq49kbdh0755694hrldsd9rm76bpj5ylmmli4fjxs203m5f5y";
+  version = "0.5.3.3";
+  sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
   buildDepends = [ mtl typeEquality ];
   meta = {
     homepage = "http://code.google.com/p/replib/";

From bebeef404d1a4d0f296cfc49f25a274cd54db0b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:02 +0200
Subject: [PATCH 1271/2033] haskell-data-lens: update to version 2.10.5

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

diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix
index 5276c1c9707..24755738fdb 100644
--- a/pkgs/development/libraries/haskell/data-lens/default.nix
+++ b/pkgs/development/libraries/haskell/data-lens/default.nix
@@ -2,12 +2,12 @@
 
 cabal.mkDerivation (self: {
   pname = "data-lens";
-  version = "2.10.4";
-  sha256 = "1pzswlpphpipsqja825pyqjixp4akc5nmw9y61jwv6r4vsgdpg5i";
+  version = "2.10.5";
+  sha256 = "11na4wx0f0ihk87d00njwrfc430nb25dkkadv1n47yvcyfc60i90";
   buildDepends = [ comonad semigroupoids transformers ];
   meta = {
     homepage = "http://github.com/roconnor/data-lens/";
-    description = "Haskell 98 Lenses";
+    description = "Used to be Haskell 98 Lenses";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };

From acaad29162cc095f9905216dd3e21a24f6572f31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:06 +0200
Subject: [PATCH 1272/2033] haskell-digestive-functors-aeson: update to version
 1.1.8

---
 .../libraries/haskell/digestive-functors-aeson/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
index ba0866b72d7..b6a5ae78f82 100644
--- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors-aeson";
-  version = "1.1.7";
-  sha256 = "07dnwmbcyb64yp51ijwsc84r6gf4rxxc4bi3wkzwxq1ijm1qhpni";
+  version = "1.1.8";
+  sha256 = "0qvzr9s0vzgzh7mix6ncjn731krln9w47zrqb5jkj92rv7mf5sgz";
   buildDepends = [ aeson digestiveFunctors lens safe text vector ];
   testDepends = [
     aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text

From b3ea4264b9984ccd1b6a074e802ba8d06f8fccbf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:09 +0200
Subject: [PATCH 1273/2033] haskell-esqueleto: update to version 1.4.1

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

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 3ff5dd6d3f3..0a92db399e5 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.4";
-  sha256 = "1v9fjcslp4jwzgan758327q60h8x3xf8bwca57fy0n1z1pqdn8s9";
+  version = "1.4.1";
+  sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers

From 91ecc85a37519289c0f88071b129e38ab50293ff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:13 +0200
Subject: [PATCH 1274/2033] haskell-hledger-lib: update to version 0.23.2

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

diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix
index 47c55e22c30..5c0c94b2678 100644
--- a/pkgs/development/libraries/haskell/hledger-lib/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.23";
-  sha256 = "1zyg4py321lvgy1al4flyxrmsz0vj8z2y99v9k5fa8s8rfa1qxvl";
+  version = "0.23.2";
+  sha256 = "1z9gxbah649r9vzq012mqnk07rfnd6c4ik82klksk0zzd4yxf07d";
   buildDepends = [
     cmdargs csv filepath HUnit mtl parsec prettyShow regexpr regexTdfa
     safe split time transformers utf8String

From b82a30aa8d6066b93d9681b1237e10773b8f0919 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:16 +0200
Subject: [PATCH 1275/2033] haskell-hledger-web: update to version 0.23.2

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

diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix
index b63c1f9b8e2..675e6b32fb5 100644
--- a/pkgs/development/libraries/haskell/hledger-web/default.nix
+++ b/pkgs/development/libraries/haskell/hledger-web/default.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.23";
-  sha256 = "1g1brcwkzs3nz5sllsv4zqyz97vydfbbdhbvgh0x9fgxd89qc3cj";
+  version = "0.23.2";
+  sha256 = "1n4n2zj6nqwvwmb6cxr16x2fnmzs7v21snjhq2nnvlik613rnnq7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 2fff26941ef0716826fe47d93d47fa9bac570edb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:20 +0200
Subject: [PATCH 1276/2033] haskell-hledger: update to version 0.23.2

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

diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix
index 51475ea73dd..331e857ee14 100644
--- a/pkgs/development/libraries/haskell/hledger/default.nix
+++ b/pkgs/development/libraries/haskell/hledger/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.23";
-  sha256 = "1cylviyz3n6kcsdcr1vx699v6fn1878n4z8y8cnxawq2daz4xhpk";
+  version = "0.23.2";
+  sha256 = "1q57mb37qkngdvivaj4dykrkg4sb2pchg2ssdxx8ss4zhbsrk713";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 8ae67934ce3df6936ba4fcac842522a8706e538f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:23 +0200
Subject: [PATCH 1277/2033] haskell-iCalendar: update to version 0.4.0.1

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

diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix
index 9d54e8531ab..e877e8d8d50 100644
--- a/pkgs/development/libraries/haskell/iCalendar/default.nix
+++ b/pkgs/development/libraries/haskell/iCalendar/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iCalendar";
-  version = "0.4";
-  sha256 = "1wjgrgm4m21fic7a83k5jql4jxknk7mhh3shhrgb2kvxrj0bfw8b";
+  version = "0.4.0.1";
+  sha256 = "08m47nxxz70lmmndlgycfb27x8xfwakxi8izbba0f6w23ddaljp3";
   buildDepends = [
     base64Bytestring caseInsensitive dataDefault mime mtl network
     parsec text time

From cfb676e7ce5f4c831b347374a6767f54db9ed143 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:27 +0200
Subject: [PATCH 1278/2033] haskell-pandoc: update to version 1.12.4

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

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index 92345c91256..d6358708a3e 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -2,7 +2,7 @@
 , binary, blazeHtml, blazeMarkup, dataDefault, Diff
 , extensibleExceptions, filepath, happy, highlightingKate, hslua
 , HTTP, httpConduit, httpTypes, HUnit, mtl, network, pandocTypes
-, parsec, QuickCheck, random, syb, tagsoup, temporary
+, parsec, QuickCheck, random, scientific, syb, tagsoup, temporary
 , testFramework, testFrameworkHunit, testFrameworkQuickcheck2
 , texmath, text, time, unorderedContainers, vector, xml, yaml
 , zipArchive, zlib
@@ -18,8 +18,8 @@ cabal.mkDerivation (self: {
     aeson alex attoparsec base64Bytestring binary blazeHtml blazeMarkup
     dataDefault extensibleExceptions filepath happy highlightingKate
     hslua HTTP httpConduit httpTypes mtl network pandocTypes parsec
-    random syb tagsoup temporary texmath text time unorderedContainers
-    vector xml yaml zipArchive zlib
+    random scientific syb tagsoup temporary texmath text time
+    unorderedContainers vector xml yaml zipArchive zlib
   ];
   testDepends = [
     ansiTerminal Diff filepath highlightingKate HUnit pandocTypes

From 76586faed106dfe9cf147349527cb43742b51d51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:30 +0200
Subject: [PATCH 1279/2033] haskell-shake: update to version 0.12

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

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 9402c7f3868..58325a1afe0 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.11.7";
-  sha256 = "0f5m4fcrda58wrr6mca4rsyb3j5bmqfdj9sbbjvr3l611lafsa8y";
+  version = "0.12";
+  sha256 = "060bvbhk84zagghalg5nh5g17vj8z2kv0qb8vibcq58ahfayj655";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 388c60124fc1bd9b23f06e4f60639a3c7a3d70a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:37 +0200
Subject: [PATCH 1280/2033] haskell-statistics: update to version 0.11.0.1

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

diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix
index 11d2ff6daa6..58a9c835696 100644
--- a/pkgs/development/libraries/haskell/statistics/default.nix
+++ b/pkgs/development/libraries/haskell/statistics/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "statistics";
-  version = "0.11.0.0";
-  sha256 = "1pmkdy7v78ajl5b5rjshgabhcakb9ji5wlq79ajr1b5adif1d1d9";
+  version = "0.11.0.1";
+  sha256 = "17p4dj7wimnl5fcwxpmcmgcmwpypfkk3gzmgmx9qvxl8p38lwacc";
   buildDepends = [
     binary deepseq erf mathFunctions monadPar mwcRandom primitive
     vector vectorAlgorithms vectorBinaryInstances

From 2511e063308e53497cd59f14619b7727d7a18f3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:40 +0200
Subject: [PATCH 1281/2033] haskell-system-fileio: update to version 0.3.13

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

diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix
index d2c40213886..f9cf911678a 100644
--- a/pkgs/development/libraries/haskell/system-fileio/default.nix
+++ b/pkgs/development/libraries/haskell/system-fileio/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "system-fileio";
-  version = "0.3.12";
-  sha256 = "0mfkny5fwksrwkvz59f5xnb7b47rmm4cbiygmri5wklnc3vdn0hs";
+  version = "0.3.13";
+  sha256 = "12xsxcg2jk63x8aiikj5gx1an794zdfxzkx1sjnr2qyqyirk311v";
   buildDepends = [ systemFilepath text time ];
   meta = {
     homepage = "https://john-millikin.com/software/haskell-filesystem/";

From 86fc581dbf3bc4701ad08dcad570b5e28c9b6206 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 00:18:44 +0200
Subject: [PATCH 1282/2033] haskell-unbound: update to version 0.4.3.1

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

diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix
index 4667ed956f0..761246b396c 100644
--- a/pkgs/development/libraries/haskell/unbound/default.nix
+++ b/pkgs/development/libraries/haskell/unbound/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "unbound";
-  version = "0.4.3";
-  sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4";
+  version = "0.4.3.1";
+  sha256 = "1xkp47y7yg8dl95gf4w3iwddc3yivrhcxj184cfhrx6a9rbsflpz";
   buildDepends = [ binary mtl RepLib transformers ];
   meta = {
     homepage = "http://code.google.com/p/replib/";

From e1b52f54e3c9359765c159cc6d606261b8e90d74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 13:59:21 +0200
Subject: [PATCH 1283/2033] haskell-hakyll: jailbreak to allow building with
 network 2.5.x

https://github.com/jaspervdj/hakyll/issues/255
---
 pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 5e40bb851f0..e0168e4f12c 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -26,6 +26,9 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|network .*,|network,|' hakyll.cabal
+  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

From 9417188afcdc21314a93eddaa9a57c5c35baf5b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 14:19:57 +0200
Subject: [PATCH 1284/2033] haskell-oeis: jailbreak to fix build with network
 2.5.x

---
 pkgs/development/libraries/haskell/oeis/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix
index d5ec97b6f6a..e7da848e4b2 100644
--- a/pkgs/development/libraries/haskell/oeis/default.nix
+++ b/pkgs/development/libraries/haskell/oeis/default.nix
@@ -6,6 +6,9 @@ cabal.mkDerivation (self: {
   sha256 = "0r23mqbfvvvx6shzdclzfrqi8r95gxl93cih7ny7w7px3w5yc5x6";
   buildDepends = [ HTTP network ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
+  patchPhase = ''
+    sed -i -e 's|network *==.*|network|' oeis.cabal
+  '';
   meta = {
     description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)";
     license = self.stdenv.lib.licenses.bsd3;

From 7710da49505b862fbf144ebdd20b40318ece8390 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 10 May 2014 14:55:05 +0200
Subject: [PATCH 1285/2033] haskell-tar: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/tar/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix
index 04257960a64..41ea62d8126 100644
--- a/pkgs/development/libraries/haskell/tar/default.nix
+++ b/pkgs/development/libraries/haskell/tar/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.4.0.1";
   sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254";
   buildDepends = [ filepath time ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     description = "Reading, writing and manipulating \".tar\" archive files.";
     license = self.stdenv.lib.licenses.bsd3;

From 16958ffaf9e42bd6e06747c07c917bc2cc0abeb6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:04:31 +0200
Subject: [PATCH 1286/2033] haskell-bson: fix build with ghc < 7.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index f40ce2bf6df..248d3b511bb 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -21,6 +21,7 @@
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {
+    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_0_1; }; };
     criterion = super.criterion.override {
       statistics = self.statistics.override {
         vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_0_1; };

From 44d03082d4a07b9f286512e62b1803cad8e3ee5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:06:06 +0200
Subject: [PATCH 1287/2033] haskell-GLUT-2.3.1.0: fix build

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9f762ba47a1..5af33397758 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -855,12 +855,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     OpenGL = self.OpenGL_2_6_0_1;
   };
   GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix {
-    OpenGL = self.OpenGL_2_6_0_1;
+    OpenGLRaw = self.OpenGLRaw_1_3_0_0;
+    OpenGL = self.OpenGL_2_6_0_1.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; };
   };
   GLUT_2_4_0_0 = callPackage ../development/libraries/haskell/GLUT/2.4.0.0.nix {
     OpenGLRaw = self.OpenGLRaw_1_3_0_0;
     OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; };
-
   };
   GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix {
     OpenGL = self.OpenGL_2_9_1_0;

From 8fe9c64b132bdeb2ec9b4faf5f5289c22ded23de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:07:41 +0200
Subject: [PATCH 1288/2033] haskell-binary-conduit: fix build with ghc < 7.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 248d3b511bb..c3d03cdbc84 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -21,6 +21,7 @@
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {
+    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_0_1; };
     bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_0_1; }; };
     criterion = super.criterion.override {
       statistics = self.statistics.override {

From 557c48a067aa4731f97faf76f5c938e4097ea285 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:18:21 +0200
Subject: [PATCH 1289/2033] haskell-cabal-macosx: jailbreak to fix build with
 fgl >= 5.5

---
 pkgs/development/libraries/haskell/cabal-macosx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
index 351979627cb..be59a3897c2 100644
--- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ Cabal fgl filepath parsec text ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/gimbo/cabal-macosx";
     description = "Cabal support for creating Mac OSX application bundles";

From 5e7de2f4576067bd8bee47eba59c4fd5ea28cd21 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:19:11 +0200
Subject: [PATCH 1290/2033] haskell-ariadne: fix build with ghc < 7.8

---
 pkgs/top-level/haskell-defaults.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index c3d03cdbc84..852eeebe21e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -21,6 +21,11 @@
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {
+    ariadne = super.ariadne.override {
+      haskellNames = self.haskellNames.override {
+        haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
+      };
+    };
     binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_0_1; };
     bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_0_1; }; };
     criterion = super.criterion.override {

From f6341cb43f0990672f7ad8634c54e45d66d5c757 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:20:00 +0200
Subject: [PATCH 1291/2033] haskell-checkers: require QuickCheck < 2.7

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5af33397758..1556aeb1bae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -361,7 +361,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cheapskate = callPackage ../development/libraries/haskell/cheapskate {};
 
-  checkers = callPackage ../development/libraries/haskell/checkers {};
+  checkers = callPackage ../development/libraries/haskell/checkers { QuickCheck = self.QuickCheck_2_6; };
 
   chell = callPackage ../development/libraries/haskell/chell {};
 

From 9b8fdfb8b12771323aed7595e37458fc30addabf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:21:07 +0200
Subject: [PATCH 1292/2033] haskell-xdot: jailbreak to fix build with text >=
 1.1

---
 pkgs/development/libraries/haskell/xdot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index 700a838f894..9c1a938234d 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.4.2";
   sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
+  jailbreak = true;
   meta = {
     description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
     license = self.stdenv.lib.licenses.bsd3;

From 06691d6b1e390f4aa9a02b134264b5e9f18f07b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:22:20 +0200
Subject: [PATCH 1293/2033] haskell-openssl-streams: jailbreak to fix build
 with network >= 2.5

And re-enable the test suite.
---
 pkgs/development/libraries/haskell/openssl-streams/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
index 74f9c180275..14d256a471e 100644
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix
@@ -10,7 +10,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit
   ];
-  doCheck = false;
+  jailbreak = true;
   meta = {
     description = "OpenSSL network support for io-streams";
     license = self.stdenv.lib.licenses.bsd3;

From 7eaca0cab77564f5a296ea2542bd606483ae6370 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:23:12 +0200
Subject: [PATCH 1294/2033] haskell-network-simple: jailbreak to fix build with
 network >= 2.5

---
 pkgs/development/libraries/haskell/network-simple/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
index cde31643c71..c69ac2a8a63 100644
--- a/pkgs/development/libraries/haskell/network-simple/default.nix
+++ b/pkgs/development/libraries/haskell/network-simple/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.1";
   sha256 = "0bk015d0np07887flah76vgrgrqaqj4x1sdxmghvazj8c78nkan8";
   buildDepends = [ exceptions network transformers ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/k0001/network-simple";
     description = "Simple network sockets usage patterns";

From b7e383487bd8caec8585e654d2d5f81c84393516 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:25:12 +0200
Subject: [PATCH 1295/2033] haskell-packages: remove obsolete parsec2 and
 parsec3 aliases

---
 pkgs/top-level/haskell-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1556aeb1bae..9a614c1f822 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1589,9 +1589,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   parsec_3_1_2   = callPackage ../development/libraries/haskell/parsec/3.1.2.nix {};
   parsec_3_1_3   = callPackage ../development/libraries/haskell/parsec/3.1.3.nix {};
   parsec_3_1_5   = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {};
-  parsec2 = self.parsec_2_1_0_1;
-  parsec3 = self.parsec_3_1_5;
-  parsec  = self.parsec3;
+  parsec = self.parsec_3_1_5;
 
   parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
   parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {};

From 2220e24ee36915002cda37fc4afd1819b87d934b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:26:26 +0200
Subject: [PATCH 1296/2033] haskell-parsec-3.1.2: jailbreak to fix build with
 text >= 1

---
 pkgs/development/libraries/haskell/parsec/3.1.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
index ecbdbb3aef0..d043fde0120 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "3.1.2";
   sha256 = "0lhn9j2j5jlh7g0qx9f6ms63n9x1xlxg9isdvm6z0ksy3ywj9wch";
   buildDepends = [ mtl text ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.cs.uu.nl/~daan/parsec.html";
     description = "Monadic parser combinators";

From d51617e877cf3a065bca08fd28363b6d5d0050f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:28:00 +0200
Subject: [PATCH 1297/2033] haskell-pipes-binary: fix build with ghc < 7.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 852eeebe21e..5a541c160bf 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -34,6 +34,7 @@
       };
     };
     haddock = self.haddock_2_13_2;
+    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_0_1; };
     transformers = self.transformers_0_3_0_0;
   };
 

From ca078e43f31c018400352982c5891b9eb8c3fbdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:31:31 +0200
Subject: [PATCH 1298/2033] haskell-cuda: don't try to build this package on
 Hydra

---
 pkgs/development/libraries/haskell/cuda/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix
index 0f5233d9660..71825f5fbd6 100644
--- a/pkgs/development/libraries/haskell/cuda/default.nix
+++ b/pkgs/development/libraries/haskell/cuda/default.nix
@@ -35,6 +35,7 @@ cabal.mkDerivation (self: {
     description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    hydraPlatforms = self.stdenv.lib.platforms.none;
     maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

From 614e6d46e6ef7f4ecf7f78477f2bd7b3c28e5667 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 14:31:41 +0200
Subject: [PATCH 1299/2033] haskell-libsystemd-journal: build only on Linux

---
 .../libraries/haskell/libsystemd-journal/default.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
index b30b0714d1f..67f336241ca 100644
--- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
+++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
@@ -16,6 +16,6 @@ cabal.mkDerivation (self: {
     homepage = "http://github.com/ocharles/libsystemd-journal";
     description = "Haskell bindings to libsystemd-journal";
     license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
+    platforms = self.stdenv.lib.platforms.linux;
   };
 })

From 45bd1ddb7da699f2610348ad0fdf92ea1cca3f86 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 17:41:07 +0200
Subject: [PATCH 1300/2033] haskell-ChasingBottoms: require QuickCheck < 2.7

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9a614c1f822..6d2792f0605 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -357,7 +357,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {};
   ChartGtk = callPackage ../development/libraries/haskell/Chart-gtk {};
 
-  ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms {};
+  ChasingBottoms = callPackage ../development/libraries/haskell/ChasingBottoms { QuickCheck = self.QuickCheck_2_6; };
 
   cheapskate = callPackage ../development/libraries/haskell/cheapskate {};
 

From cd03e41fc721afa4cb80f9f8a085e9b3aecc7abc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:08:35 +0200
Subject: [PATCH 1301/2033] haskell-xmlgen: the test suite needs libxml2 plus
 some DTDs

---
 pkgs/development/libraries/haskell/xmlgen/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix
index 6bc1a4b6f59..c466ddb1d55 100644
--- a/pkgs/development/libraries/haskell/xmlgen/default.nix
+++ b/pkgs/development/libraries/haskell/xmlgen/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   sha256 = "1rmsg9wxs0bsj0xpagxrm3fmlqd63b0dfyc21rx9jj76g9za29wh";
   buildDepends = [ blazeBuilder mtl text ];
   testDepends = [ filepath HUnit hxt QuickCheck text ];
+  doCheck = false;
   meta = {
     description = "Fast XML generation library";
     license = self.stdenv.lib.licenses.bsd3;

From cb644cafa85337f9424f747029ee27e90f63edee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 May 2014 17:41:24 +0200
Subject: [PATCH 1302/2033] Agda: require QuickCheck < 2.7

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6d2792f0605..7b6cdaaf664 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2510,7 +2510,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   # Compilers.
 
-  Agda = callPackage ../development/compilers/agda/agda.nix {};
+  Agda = callPackage ../development/compilers/agda/agda.nix { QuickCheck = self.QuickCheck_2_6; };
   AgdaStdlib = callPackage ../development/compilers/agda/stdlib.nix {};
 
   uhc = callPackage ../development/compilers/uhc {};

From 6c61d41dc910a6faa27dbae888b3b5c30ce75717 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 13:58:15 +0200
Subject: [PATCH 1303/2033] Drop obsolete Haskell packages WebBits,
 WebBitsHtml, JsContracts, and flapjax.

None of our compilers can build these packages. I suppose that stuff has
been replaced by language-ecmascript.
---
 .../development/compilers/flapjax/default.nix | 30 -------------------
 .../libraries/haskell/JsContracts/default.nix | 17 -----------
 .../libraries/haskell/WebBits-Html/1.0.1.nix  | 15 ----------
 .../libraries/haskell/WebBits-Html/1.0.2.nix  | 15 ----------
 .../libraries/haskell/WebBits/1.0.nix         | 15 ----------
 .../libraries/haskell/WebBits/2.0.nix         | 15 ----------
 .../libraries/haskell/WebBits/2.2.nix         | 15 ----------
 pkgs/top-level/haskell-packages.nix           | 24 ---------------
 8 files changed, 146 deletions(-)
 delete mode 100644 pkgs/development/compilers/flapjax/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/JsContracts/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebBits/1.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebBits/2.0.nix
 delete mode 100644 pkgs/development/libraries/haskell/WebBits/2.2.nix

diff --git a/pkgs/development/compilers/flapjax/default.nix b/pkgs/development/compilers/flapjax/default.nix
deleted file mode 100644
index 5167bf7d795..00000000000
--- a/pkgs/development/compilers/flapjax/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{cabal, fetchurl, unzip, xhtml, WebBits, WebBitsHtml, JsContracts}:
-
-cabal.mkDerivation ( self: {
-  pname = "flapjax";
-  version = "2.1";
-
-  src = fetchurl {
-    url = https://github.com/brownplt/flapjax/zipball/Flapjax-2.1;
-    name = "flapjax-2.1.zip";
-    sha256 = "1cp9g570528a813ljnvd1lb389iz0i6511xynf6kzryv8ckc1n7v";
-  };
-
-  # The Makefile copies some files to update the flapjax website into
-  # missing directories; the -p is to avoid these errors.
-  preConfigure = ''
-    cd fx
-    sed -i 's/mkdir/mkdir -p/' Makefile
-    make
-    cd ../compiler
-  '';
-
-  extraBuildInputs = [ unzip JsContracts ];
-  propagatedBuildInputs = [ xhtml WebBits WebBitsHtml ];
-
-  meta = { 
-      description = "programming language designed around the demands of modern, client-based Web applications";
-      homepage = http://www.flapjax-lang.org/;
-      license = "BSD";
-  };
-})
diff --git a/pkgs/development/libraries/haskell/JsContracts/default.nix b/pkgs/development/libraries/haskell/JsContracts/default.nix
deleted file mode 100644
index 713e67fbf60..00000000000
--- a/pkgs/development/libraries/haskell/JsContracts/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, filepath, mtl, parsec, syb, WebBits, WebBitsHtml }:
-
-cabal.mkDerivation (self: {
-  pname = "JsContracts";
-  version = "0.5.3";
-  sha256 = "17l6kdpdc7lrpd9j4d2b6vklkpclshcjy6hzpi442b7pj96sn589";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ filepath mtl parsec syb WebBits WebBitsHtml ];
-  meta = {
-    homepage = "http://www.cs.brown.edu/research/plt/";
-    description = "Design-by-contract for JavaScript";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
deleted file mode 100644
index d69ac78b83d..00000000000
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, mtl, parsec, syb, WebBits }:
-
-cabal.mkDerivation (self: {
-  pname = "WebBits-Html";
-  version = "1.0.1";
-  sha256 = "134rmm5ccfsjdr0pdwn2mf81l81rgxapa3wjjfjkxrkxq6hav35n";
-  buildDepends = [ mtl parsec syb WebBits ];
-  meta = {
-    homepage = "http://www.cs.brown.edu/research/plt/";
-    description = "JavaScript analysis tools";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix b/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
deleted file mode 100644
index 26f14a08774..00000000000
--- a/pkgs/development/libraries/haskell/WebBits-Html/1.0.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, mtl, parsec, syb, WebBits }:
-
-cabal.mkDerivation (self: {
-  pname = "WebBits-Html";
-  version = "1.0.2";
-  sha256 = "18dd52970cd27kra4l89vvrx2mrdbqd4w4f76xrq3142daxsagal";
-  buildDepends = [ mtl parsec syb WebBits ];
-  meta = {
-    homepage = "http://www.cs.brown.edu/research/plt/";
-    description = "JavaScript analysis tools";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebBits/1.0.nix b/pkgs/development/libraries/haskell/WebBits/1.0.nix
deleted file mode 100644
index 49bcd8ed112..00000000000
--- a/pkgs/development/libraries/haskell/WebBits/1.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "WebBits";
-  version = "1.0";
-  sha256 = "1xqk4ajywlaq9nb9a02i7c25na5p2qbpc2k9zw93gbapppjiapsc";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://www.cs.brown.edu/research/plt/";
-    description = "JavaScript analysis tools";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebBits/2.0.nix b/pkgs/development/libraries/haskell/WebBits/2.0.nix
deleted file mode 100644
index 0638ce06ef9..00000000000
--- a/pkgs/development/libraries/haskell/WebBits/2.0.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "WebBits";
-  version = "2.0";
-  sha256 = "14a1rqlq925f6rdbi8yx44xszj5pvskcmw1gi1bj8hbilgmlwi7f";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://www.cs.brown.edu/research/plt/";
-    description = "JavaScript analysis tools";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/WebBits/2.2.nix b/pkgs/development/libraries/haskell/WebBits/2.2.nix
deleted file mode 100644
index 4240d7b9ce9..00000000000
--- a/pkgs/development/libraries/haskell/WebBits/2.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, mtl, parsec, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "WebBits";
-  version = "2.2";
-  sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
-  buildDepends = [ mtl parsec syb ];
-  meta = {
-    homepage = "http://github.com/brownplt/webbits";
-    description = "JavaScript analysis tools";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7b6cdaaf664..07dab1986e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1215,11 +1215,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   jpeg = callPackage ../development/libraries/haskell/jpeg {};
 
-  JsContracts = callPackage ../development/libraries/haskell/JsContracts {
-    WebBits = self.WebBits_1_0;
-    WebBitsHtml = self.WebBitsHtml_1_0_1;
-  };
-
   json = callPackage ../development/libraries/haskell/json {};
 
   jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {};
@@ -2349,23 +2344,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   warpTls = callPackage ../development/libraries/haskell/warp-tls {};
 
-  WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix {
-    parsec = self.parsec_2_1_0_1;
-  };
-  WebBits_2_0 = callPackage ../development/libraries/haskell/WebBits/2.0.nix {
-    parsec = self.parsec_2_1_0_1;
-  };
-  WebBits_2_2 = callPackage ../development/libraries/haskell/WebBits/2.2.nix {};
-  WebBits = self.WebBits_2_2;
-
-  WebBitsHtml_1_0_1 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.1.nix {
-    WebBits = self.WebBits_2_0;
-  };
-  WebBitsHtml_1_0_2 = callPackage ../development/libraries/haskell/WebBits-Html/1.0.2.nix {
-    WebBits = self.WebBits_2_0;
-  };
-  WebBitsHtml = self.WebBitsHtml_1_0_2;
-
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};
 
   webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
@@ -2517,8 +2495,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   epic = callPackage ../development/compilers/epic {};
 
-  flapjax = callPackage ../development/compilers/flapjax {};
-
   pakcs = callPackage ../development/compilers/pakcs {};
 
   # Development tools.

From 7dcce5b013c0d46d6b22e7bca4c9faddf1091dfd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:05:40 +0200
Subject: [PATCH 1304/2033] ebnf2ps: drop un-maintained package that doesn't
 compile

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 07dab1986e6..0296b2e602a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2519,8 +2519,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cpphs = callPackage ../development/tools/misc/cpphs {};
 
-  Ebnf2ps = callPackage ../development/tools/parsing/Ebnf2ps {};
-
   haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; };
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; };
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};

From d5307df65f5b63bb5aea2e21b556d50de05590cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:22:46 +0200
Subject: [PATCH 1305/2033] haskell-Hipmunk: remove broken package

---
 .../libraries/haskell/Hipmunk/default.nix         | 15 ---------------
 pkgs/top-level/haskell-packages.nix               |  2 --
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/Hipmunk/default.nix

diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix
deleted file mode 100644
index 9ffb5640e9d..00000000000
--- a/pkgs/development/libraries/haskell/Hipmunk/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, StateVar, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "Hipmunk";
-  version = "5.2.0.14";
-  sha256 = "1jzsalib2y6r4aw7d10v3pgapmnj1knvq3fyad3w5d11qmvx9zwc";
-  buildDepends = [ StateVar transformers ];
-  meta = {
-    homepage = "https://github.com/meteficha/Hipmunk";
-    description = "A Haskell binding for Chipmunk";
-    license = "unknown";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0296b2e602a..da5688d651c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1030,8 +1030,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hint = callPackage ../development/libraries/haskell/hint {};
 
-  Hipmunk = callPackage ../development/libraries/haskell/Hipmunk {};
-
   hit = callPackage ../development/libraries/haskell/hit {};
 
   hjsmin = callPackage ../development/libraries/haskell/hjsmin {};

From 6be622c178749fc9a3a46f5037f0baf28df2a28b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:24:15 +0200
Subject: [PATCH 1306/2033] haskell-NanoProlog: remove broken package

---
 .../libraries/haskell/NanoProlog/default.nix     | 16 ----------------
 pkgs/top-level/haskell-packages.nix              |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/NanoProlog/default.nix

diff --git a/pkgs/development/libraries/haskell/NanoProlog/default.nix b/pkgs/development/libraries/haskell/NanoProlog/default.nix
deleted file mode 100644
index 490aeb4167b..00000000000
--- a/pkgs/development/libraries/haskell/NanoProlog/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, ListLike, uuParsinglib }:
-
-cabal.mkDerivation (self: {
-  pname = "NanoProlog";
-  version = "0.3";
-  sha256 = "0wjjwzzc78sj7nsaq1hgxiwv0pc069mxns425lhmrlxcm0vf8fmn";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ ListLike uuParsinglib ];
-  meta = {
-    description = "Very small interpreter for a Prolog-like language";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index da5688d651c..e208583e6a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1456,8 +1456,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   mysqlSimple = callPackage ../development/libraries/haskell/mysql-simple {};
 
-  NanoProlog = callPackage ../development/libraries/haskell/NanoProlog {};
-
   nanospec = callPackage ../development/libraries/haskell/nanospec {};
 
   nat = callPackage ../development/libraries/haskell/nat {};

From 5d1b8ea3b5edb8c96f40739ccf001644c5da4179 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:24:54 +0200
Subject: [PATCH 1307/2033] haskell-MazesOfMonad: remove broken package

---
 pkgs/games/MazesOfMonad/default.nix | 16 ----------------
 pkgs/top-level/haskell-packages.nix |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/games/MazesOfMonad/default.nix

diff --git a/pkgs/games/MazesOfMonad/default.nix b/pkgs/games/MazesOfMonad/default.nix
deleted file mode 100644
index 0e2abf6d7c7..00000000000
--- a/pkgs/games/MazesOfMonad/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, filepath, HUnit, mtl, random, regexPosix, time }:
-
-cabal.mkDerivation (self: {
-  pname = "MazesOfMonad";
-  version = "1.0.7";
-  sha256 = "1zk6bckll03b40iq8z13753glkmcan6439w8cc6rn5h2fhp189v9";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ filepath HUnit mtl random regexPosix time ];
-  meta = {
-    description = "Console-based Role Playing Game";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e208583e6a0..a7f047a3ac5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2685,8 +2685,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     };
   };
 
-  MazesOfMonad = callPackage ../games/MazesOfMonad {};
-
 # End of the main part of the file.
 
 }

From 514a57c6d93ea42e91071aec959bfe0212237622 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:25:50 +0200
Subject: [PATCH 1308/2033] haskell-AspectAG: remove broken package

---
 .../libraries/haskell/AspectAG/default.nix        | 15 ---------------
 pkgs/top-level/haskell-packages.nix               |  2 --
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/AspectAG/default.nix

diff --git a/pkgs/development/libraries/haskell/AspectAG/default.nix b/pkgs/development/libraries/haskell/AspectAG/default.nix
deleted file mode 100644
index 6cbd760b4ac..00000000000
--- a/pkgs/development/libraries/haskell/AspectAG/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, HList, mtl }:
-
-cabal.mkDerivation (self: {
-  pname = "AspectAG";
-  version = "0.3.6.1";
-  sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
-  buildDepends = [ HList mtl ];
-  meta = {
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
-    description = "Attribute Grammars in the form of an EDSL";
-    license = "LGPL";
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a7f047a3ac5..71140be0fc7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -178,8 +178,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   asn1Types = callPackage ../development/libraries/haskell/asn1-types {};
 
-  AspectAG = callPackage ../development/libraries/haskell/AspectAG {};
-
   async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {};
   async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {};
   async_2_0_1_5 = callPackage ../development/libraries/haskell/async/2.0.1.5.nix {};

From f77b806b46cb9657bd08cdfc77d7ba330d08bb95 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:27:58 +0200
Subject: [PATCH 1309/2033] haskell-Pathfinder and DSH: remove broken packages

---
 .../development/libraries/haskell/DSH/default.nix | 14 --------------
 .../libraries/haskell/Pathfinder/default.nix      | 15 ---------------
 pkgs/top-level/haskell-packages.nix               |  4 ----
 3 files changed, 33 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/DSH/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/Pathfinder/default.nix

diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix
deleted file mode 100644
index 409afcd45b0..00000000000
--- a/pkgs/development/libraries/haskell/DSH/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }:
-
-cabal.mkDerivation (self: {
-  pname = "DSH";
-  version = "0.8.2.3";
-  sha256 = "0d5jh1vxjx3874rgwvxjm00lj3vvp8ggz2c54x6ymhmgav3pd8vy";
-  buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
-  meta = {
-    description = "Database Supported Haskell";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/Pathfinder/default.nix b/pkgs/development/libraries/haskell/Pathfinder/default.nix
deleted file mode 100644
index 19d7d8abaa5..00000000000
--- a/pkgs/development/libraries/haskell/Pathfinder/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, libxml2, text }:
-
-cabal.mkDerivation (self: {
-  pname = "Pathfinder";
-  version = "0.5.10";
-  sha256 = "1k38p73jnkfcmmz94iqpzg2g6apsxflidvy8p9lwqyzfmg70brqf";
-  buildDepends = [ text ];
-  extraLibraries = [ libxml2 ];
-  meta = {
-    description = "Relational optimiser and code generator";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 71140be0fc7..af03903a967 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -625,8 +625,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   DRBG = callPackage ../development/libraries/haskell/DRBG {};
 
-  DSH = callPackage ../development/libraries/haskell/DSH {};
-
   dsp = callPackage ../development/libraries/haskell/dsp {};
 
   dstring = callPackage ../development/libraries/haskell/dstring {};
@@ -1586,8 +1584,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 
-  Pathfinder = callPackage ../development/libraries/haskell/Pathfinder {};
-
   pathtype = callPackage ../development/libraries/haskell/pathtype {};
 
   pbkdf = callPackage ../development/libraries/haskell/pbkdf {};

From 55e5a1546e4b852894552d89d582c3ae0d9811eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 14:31:16 +0200
Subject: [PATCH 1310/2033] haskell-GloveVec: re-generate with cabal2nix

---
 pkgs/development/libraries/haskell/GlomeVec/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix
index 710605c52e3..93d4bb8a6da 100644
--- a/pkgs/development/libraries/haskell/GlomeVec/default.nix
+++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, llvm }:
 
 cabal.mkDerivation (self: {
   pname = "GlomeVec";
   version = "0.2";
   sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
+  buildTools = [ llvm ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Glome";
     description = "Simple 3D vector library";

From f10bf6653c5beac0d8a8c0794c099d2cb308f2dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:08:29 +0200
Subject: [PATCH 1311/2033] haskell-HTF: disable test suite to fix the build

https://github.com/skogsbaer/HTF/issues/37
---
 pkgs/development/libraries/haskell/HTF/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix
index aeb80822f61..4ef4c4d7519 100644
--- a/pkgs/development/libraries/haskell/HTF/default.nix
+++ b/pkgs/development/libraries/haskell/HTF/default.nix
@@ -17,6 +17,7 @@ cabal.mkDerivation (self: {
     aeson filepath mtl random regexCompat temporary text
     unorderedContainers
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/skogsbaer/HTF/";
     description = "The Haskell Test Framework";

From f57d6ebaea4ef18054336fc87121972d158e33c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:09:43 +0200
Subject: [PATCH 1312/2033] haskell-timeparsers: jailbreak to fix build with
 attoparsec 0.11.x

---
 pkgs/development/libraries/haskell/timeparsers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix
index 57c9c7e3da7..4920c0b3adb 100644
--- a/pkgs/development/libraries/haskell/timeparsers/default.nix
+++ b/pkgs/development/libraries/haskell/timeparsers/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.3.2";
   sha256 = "1dicp58f2amn5rgmnlfjpv4aj7ak6jrdlba2marglddvj4ycq1h7";
   buildDepends = [ attoparsec convertible mtl time ];
+  jailbreak = true;
   meta = {
     description = "Attoparsec parsers for various Date/Time formats";
     license = self.stdenv.lib.licenses.bsd3;

From 3512c3c5233463e8715be42aac96e95b16cb01b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:11:17 +0200
Subject: [PATCH 1313/2033] haskell-ghc-vis: jailbreak to fix build with recent
 fgl and text libraries

---
 pkgs/development/libraries/haskell/ghc-vis/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index a768a101145..be0b72aa963 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -14,6 +14,7 @@ cabal.mkDerivation (self: {
     ensureDir "$out/share/ghci"
     ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
   '';
+  jailbreak = true;
   meta = {
     homepage = "http://felsin9.de/nnis/ghc-vis";
     description = "Live visualization of data structures in GHCi";

From 438a8d1cb877598c3cfe6583f53c8c0dc400ea39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:30:46 +0200
Subject: [PATCH 1314/2033] haskell-HTTP-4000.2.5: require network < 2.5

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index af03903a967..957d1b9b285 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -971,7 +971,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
   HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
-  HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {};
+  HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; };
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
   HTTP_4000_2_14 = callPackage ../development/libraries/haskell/HTTP/4000.2.14.nix {};
   HTTP = self.HTTP_4000_2_14;

From 237b2de6a0a4ef6cfd74fbbf640541bf93200f51 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:32:58 +0200
Subject: [PATCH 1315/2033] haskell-parsec-3.1.3: jailbreak to fix build with
 text 1.x

---
 pkgs/development/libraries/haskell/parsec/3.1.3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
index b9b10f2e5b0..20902162169 100644
--- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix
+++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "3.1.3";
   sha256 = "1a64gzirgpa1i78gbbp9z059nh29xmcja4g8vgjb1fbylx6vn54z";
   buildDepends = [ mtl text ];
+  jailbreak = true;
   meta = {
     homepage = "http://www.cs.uu.nl/~daan/parsec.html";
     description = "Monadic parser combinators";

From ded83927ba27ee199169559faa71e96a20e1ee87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:35:21 +0200
Subject: [PATCH 1316/2033] haskell-snaplet-stripe: jailbreak to fix build with
 text 1.x

---
 pkgs/development/libraries/haskell/snaplet-stripe/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
index 37ffb827b6d..1f74f646cae 100644
--- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
+++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     configurator heist mtl snap stripe text textFormat transformers
     xmlhtml
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/LukeHoersten/snaplet-stripe";
     description = "Stripe snaplet for the Snap Framework";

From 481ec8ab9b46dc733dc74d500131417e971ecc41 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:36:12 +0200
Subject: [PATCH 1317/2033] haskell-usb: jailbreak to fix build with text 1.x

---
 pkgs/development/libraries/haskell/usb/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix
index 41a71618546..05f151bfd2c 100644
--- a/pkgs/development/libraries/haskell/usb/default.nix
+++ b/pkgs/development/libraries/haskell/usb/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "1.2";
   sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b";
   buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ];
+  jailbreak = true;
   meta = {
     homepage = "http://basvandijk.github.com/usb";
     description = "Communicate with USB devices";

From edd71867e53af57a182aa552b2ef4731e40b7ef4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:40:38 +0200
Subject: [PATCH 1318/2033] haskell-websockets: require QuickCheck 2.6

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 957d1b9b285..2d5f37c536e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2338,7 +2338,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};
 
-  websockets = callPackage ../development/libraries/haskell/websockets {};
+  websockets = callPackage ../development/libraries/haskell/websockets {
+    testFrameworkQuickcheck2 = self.testFrameworkQuickcheck2.override { QuickCheck = self.QuickCheck_2_6; };
+  };
 
   websocketsSnap = callPackage ../development/libraries/haskell/websockets-snap {};
 

From 3c656b702c77d8d7c54f0459ceb89ecc16633f9d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 May 2014 18:46:41 +0200
Subject: [PATCH 1319/2033] haskell-defaults.nix: don't provide gloss to ghc <
 7.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 5a541c160bf..d45b6a1996e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -33,6 +33,7 @@
         vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_0_1; };
       };
     };
+    gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_0_1; };
     transformers = self.transformers_0_3_0_0;

From 8d6a9400572fec5fdfdb019f6b8c5c97efdfe297 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Wed, 14 May 2014 20:01:31 +0200
Subject: [PATCH 1320/2033] Add ori, a secure distributed filesystem.

---
 pkgs/tools/backup/ori/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/backup/ori/default.nix

diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
new file mode 100644
index 00000000000..fe8b7dd4f0a
--- /dev/null
+++ b/pkgs/tools/backup/ori/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.1";
+  name = "ori-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
+    sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca";
+  };
+
+  buildInputs = [ 
+    boost pkgconfig scons utillinux fuse libevent openssl zlib
+  ];
+
+  buildPhase = ''
+    scons PREFIX=$out install
+  '';
+
+  installPhase = ":";
+
+  meta = with stdenv.lib; {
+    description = "A secure distributed file system";
+    homepage = http://ori.scs.stanford.edu/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cbb2b3f97..2d580bea35c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -677,6 +677,8 @@ let
     par2Support = (config.bup.par2Support or false);
   };
 
+  ori = callPackage ../tools/backup/ori { };
+
   atool = callPackage ../tools/archivers/atool { };
 
   bzip2 = callPackage ../tools/compression/bzip2 { };

From 26f2d67a65a56eba46f95c2ac416c7925ab03293 Mon Sep 17 00:00:00 2001
From: Jordan Patterson <jordan@evolarium.ca>
Date: Wed, 14 May 2014 12:25:26 -0600
Subject: [PATCH 1321/2033] Update Awesome WM to 3.5.5

Fix LGI test
Prefix LD_LIBRARY_PATH instead of clobbering it
---
 pkgs/applications/window-managers/awesome/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b8e1257c5bc..26987565636 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -5,7 +5,7 @@
 , which, dbus, nettools, git, asciidoc, doxygen }:
 
 let
-  version = "3.5.2";
+  version = "3.5.5";
 in
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  
   src = fetchurl {
     url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "11iya03yzr8sa3snmywlw22ayg0d3dcy49pi8fz0bycf5aq6b38q";
+    sha256 = "0iwd4pjvq0akm9dbipbl4m4fm24m017l06arasr445v2qkbxnc5z";
   };
 
   meta = with stdenv.lib; {
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
     xlibs.libXau
     xlibs.libXdmcp
     xlibs.libxcb
+    xlibs.libxshmfence
     xlibs.xcbutil
     xlibs.xcbutilimage
     xlibs.xcbutilkeysyms
@@ -53,8 +54,8 @@ stdenv.mkDerivation rec {
     xlibs.xcbutilwm
   ];
 
-  AWESOME_IGNORE_LGI = 1;
-
+  LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib";
+  GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";
   LUA_CPATH = "${lgi}/lib/lua/5.1/?.so";
   LUA_PATH  = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua";
 
@@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
       --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \
       --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \
       --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \
-      --set LD_LIBRARY_PATH "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \
+      --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \
       --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin"
 
     wrapProgram $out/bin/awesome-client \

From 2baeefee2744e1d3df82ba8292c76997a3172015 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 14 May 2014 13:35:31 -0400
Subject: [PATCH 1322/2033] Add function for fetching from a private git repo

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cbb2b3f97..d0b3a67a625 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -303,6 +303,26 @@ let
     inherit stdenv git cacert;
   };
 
+  fetchgitPrivate = args: derivation ((fetchgit args).drvAttrs // {
+    SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success
+      then builtins.toString <ssh-auth-sock>
+      else null;
+    GIT_SSH = pkgs.writeScript "fetchgit-ssh" ''
+      #! ${pkgs.stdenv.shell}
+      exec -a ssh ${pkgs.openssh}/bin/ssh -F ${let
+        sshConfigFile = if (builtins.tryEval <ssh-config-file>).success
+          then <ssh-config-file>
+          else builtins.trace ''
+            Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
+
+            Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
+
+            You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
+          '' "/var/lib/empty/config";
+      in builtins.toString sshConfigFile} "$@"
+    '';
+  });
+
   fetchgitrevision = import ../build-support/fetchgitrevision runCommand git;
 
   fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});

From bc847600a9ab833164d0d6bd308023932eb4eec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 13 May 2014 22:51:54 +0200
Subject: [PATCH 1323/2033] python-pyusb: new package

PyUSB is a Python module that wraps libusb 1.0. (It can wrap other USB
libraries too, but I've hardcoded it for libusb as it seems the most
appropriate.)
---
 pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e51bc9e9440..3d8021344f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8783,6 +8783,31 @@ rec {
     };
   };
 
+
+  pyusb = buildPythonPackage rec {
+    name = "pyusb-1.0.0b1";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
+      md5 = "5cc9c7dd77b4d12fcc22fee3b39844bc";
+    };
+
+    # Fix the USB backend library lookup
+    postPatch = ''
+      libusb=${pkgs.libusb1}/lib/libusb-1.0.so
+      test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+      sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
+      homepage = http://pyusb.sourceforge.net/;
+      license = "BSD";
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   txamqp = buildPythonPackage rec {
     name = "txamqp-${version}";
     version = "0.3";

From 77000f7af019bacd3d3714c3c8ad8e995a446b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 13 May 2014 22:53:29 +0200
Subject: [PATCH 1324/2033] python-usbtmc: new package

This Python package supports the USBTMC instrument control protocol for
controlling instruments over USB.

http://alexforencich.com/wiki/en/python-usbtmc/start
---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d8021344f7..7a157aa925e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8808,6 +8808,26 @@ rec {
   };
 
 
+  usbtmc = buildPythonPackage rec {
+    name = "usbtmc-${version}";
+    version = "0.5";
+
+    src = fetchurl {
+      url = "https://github.com/python-ivi/python-usbtmc/archive/v${version}.tar.gz";
+      sha256 = "0xn8whjcdn8wgs9j1gj7sw7fh425akdmq3hi448m36fywldbhryg";
+    };
+
+    propagatedBuildInputs = [ pyusb ];
+
+    meta = {
+      description = "Python implementation of the USBTMC instrument control protocol";
+      homepage = http://alexforencich.com/wiki/en/python-usbtmc/start;
+      license = licenses.mit;
+      maintainers = [ maintainers.bjornfor ];
+    };
+  };
+
+
   txamqp = buildPythonPackage rec {
     name = "txamqp-${version}";
     version = "0.3";

From 2ce516225293b3cdd67ab8bafed5d9a0ff81a3b1 Mon Sep 17 00:00:00 2001
From: Benjamin Podszun <dar@darklajid.de>
Date: Sat, 10 May 2014 10:37:59 +0200
Subject: [PATCH 1325/2033] Bump virt-viewer to 0.6.0, from the 2009 version

---
 .../virtualization/virt-viewer/default.nix    | 56 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index d2e608ba3fa..a5d7c775412 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,50 +1,40 @@
-x@{builderDefsPackage
-  , gnome, gtk, glib, libxml2, pkgconfig, libvirt, gtkvnc, cyrus_sasl, libtasn1
-  , gnupg, libgcrypt, perl, nettle, yajl, libcap_ng
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["gnome"];
+{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
+, libgcrypt, gnupg, cyrus_sasl, spiceSupport ? true, spice_gtk, shared_mime_info
+, libvirt, libcap_ng, yajl
+}:
 
-  buildInputs = (map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)))
-    ++ [gnome.libglade];
-  sourceInfo = rec {
+with stdenv.lib;
+
+let sourceInfo = rec {
     baseName="virt-viewer";
-    version="0.2.0";
+    version="0.6.0";
     name="${baseName}-${version}";
     url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
-    hash="0lhkmp4kn0s2z8241lqf2fdi55jg9iclr5hjw3m4wzaznpiajwlp";
-  };
-in
-rec {
-  src = a.fetchurl {
+    hash="0svalnr6k8rjadysnxixygk3bdx04asmwx75bhrbljyicba216v6";
+}; in
+
+stdenv.mkDerivation  {
+  inherit (sourceInfo) name version;
+
+  src = fetchurl {
     url = sourceInfo.url;
     sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ 
+    pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
+    shared_mime_info libvirt libcap_ng yajl
+  ] ++ optional spiceSupport spice_gtk;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "A viewer for remote virtual machines";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2;
+    maintainers = maintainers.raskin;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
   passthru = {
     updateInfo = {
       downloadPage = "http://virt-manager.org/download.html";
     };
   };
-}) x
-
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bc387bb681..afb208cc940 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9500,7 +9500,10 @@ let
     vimrc = config.vim.vimrc or "";
   };
 
-  virtviewer = callPackage ../applications/virtualization/virt-viewer {};
+  virtviewer = callPackage ../applications/virtualization/virt-viewer {
+    gtkvnc = gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = spice_gtk.override { enableGTK3 = true; };
+  };
   virtmanager = callPackage ../applications/virtualization/virt-manager {
     inherit (gnome) gnome_python;
     vte = gnome3.vte;

From 2e950bd72ebe7e5f81346ce999f1b55d34dba42e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 7 May 2014 22:31:43 -0300
Subject: [PATCH 1326/2033] 8086tiny: update to 1.25

Locally build BIOS support
---
 .../virtualization/8086tiny/builder.sh        | 23 +++++++++++++------
 .../virtualization/8086tiny/default.nix       | 16 ++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/virtualization/8086tiny/builder.sh b/pkgs/applications/virtualization/8086tiny/builder.sh
index 36c381becec..7cff2589abe 100644
--- a/pkgs/applications/virtualization/8086tiny/builder.sh
+++ b/pkgs/applications/virtualization/8086tiny/builder.sh
@@ -6,14 +6,23 @@ mkdir -p ./$name $out/bin $out/share/$name $out/share/doc/$name/images
 cd $name
 tar xf $src
 make 8086tiny
+if [ $bios ]; then
+    cd bios_source
+    nasm -f bin bios.asm -o bios
+    cd ..
+fi
 
-install 8086tiny $out/bin
-install bios $out/share/$name/8086tiny-bios
-install fd.img $out/share/$name/8086tiny-floppy.img
-install bios_source/bios.asm  $out/share/$name/8086tiny-bios-src.asmn
-install docs/8086tiny.css  $out/share/doc/$name
-install docs/doc.html  $out/share/doc/$name
+install -m 755 8086tiny $out/bin
+install -m 644 fd.img $out/share/$name/8086tiny-floppy.img
+install -m 644 bios_source/bios.asm  $out/share/$name/8086tiny-bios-src.asm
+install -m 644 docs/8086tiny.css  $out/share/doc/$name
+install -m 644 docs/doc.html  $out/share/doc/$name
 for i in docs/images/*.gif
 do
-    install $i $out/share/doc/$name/images
+    install -m 644 $i $out/share/doc/$name/images
 done
+if [ $bios ]; then
+    install -m 644 bios_source/bios $out/share/$name/8086tiny-bios
+else
+    install -m 644 bios $out/share/$name/8086tiny-bios
+fi
diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix
index 8e5108b4410..a16f052f622 100644
--- a/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/pkgs/applications/virtualization/8086tiny/default.nix
@@ -1,32 +1,32 @@
 { stdenv, fetchurl
-, localBios ? false, nasm ? null
+, localBios ? true, nasm ? null
 , sdlSupport ? true, SDL ? null
 }:
 
-
 assert sdlSupport -> (SDL != null);
 
-
 stdenv.mkDerivation rec {
 
   name = "8086tiny-${version}";
-  version = "1.20";
+  version = "1.25";
 
   src = fetchurl {
-    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_120.tar.bz2";
-    sha256 = "0yapnr8wvlx7h1q1w98yfy2vsbf0rlp4wd99r3xb0b7l70b36mpw";
+    url ="http://www.megalith.co.uk/8086tiny/downloads/8086tiny_125.tar.bz2";
+    sha256 = "0kmq4iiwhi2grjwq43ljjk1b1f1v1x9gzrgrgq2fzfsj7m7s6ris";
   };
 
   buildInputs = with stdenv.lib;
   optionals localBios [ nasm ]
   ++  optionals sdlSupport [ SDL ];
-
+  
+  bios = localBios;
+  
   builder = ./builder.sh;
 
   meta = {
     description = "An open-source 8086 emulator";
     longDescription = ''
-    8086tiny is a tiny, open source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine.
+    8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny emulates a "late 80's era" PC XT-type machine.
 
     8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :)
     '';

From b11c9c582b5cddddda51406ce4915f720bc68184 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 7 May 2014 08:50:06 +1000
Subject: [PATCH 1327/2033] perlPackages.MHonArc: add expression

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2733443dde3..d654d4fe2c3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5142,6 +5142,23 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MHonArc = buildPerlPackage rec {
+    name = "MHonArc-2.6.18";
+
+    src = fetchurl {
+      url    = "http://dcssrv1.oit.uci.edu/indiv/ehood/release/MHonArc/tar/${name}.tar.gz";
+      sha256 = "1xmf26dfwr8achprc3n1pxgl0mkiyr6pf25wq3dqgzqkghrrsxa2";
+    };
+    propagatedBuildInputs = [ ];
+    meta = with stdenv.lib; {
+      homepage    = http://dcssrv1.oit.uci.edu/indiv/ehood/mhonarch.html;
+      description = "A mail-to-HTML converter";
+      maintainers = with maintainers; [ lovek323 ];
+      license     = licenses.gpl2;
+      platforms   = platforms.unix;
+    };
+  };
+
   MIMEBase64 = buildPerlPackage rec {
     name = "MIME-Base64-3.14";
     src = fetchurl {

From 432998852c1e6cc6719c08e14a5dbf1cd842aa43 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Wed, 14 May 2014 15:15:34 -0430
Subject: [PATCH 1328/2033] Add the Mercury compiler to nixpkgs.

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

diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
new file mode 100644
index 00000000000..5ea922a371a
--- /dev/null
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, gcc, flex, bison, texinfo, jdk, erlang, makeWrapper
+, readline }:
+
+stdenv.mkDerivation rec {
+  name    = "mercury-${version}";
+  version = "14.01";
+
+  src = fetchurl {
+    url    = "http://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
+    sha256 = "1hgwmsaacxhgx2p2hikl5px8xf0wny9wx47gjl258dgxxasbfij4";
+  };
+
+  buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper
+                  readline ];
+
+  patchPhase = ''
+    # Fix calls to programs in /bin
+    for p in uname pwd ; do
+      for f in $(egrep -lr /bin/$p *) ; do
+        sed -i 's@/bin/'$p'@'$p'@g' $f ;
+      done
+    done
+  '';
+
+  preConfigure = ''
+    ensureDir $out/lib/mercury/cgi-bin ;
+    configureFlags="--enable-deep-profiler=$out/lib/mercury/cgi-bin";
+  '';
+
+  preBuild = ''
+    # Mercury buildsystem does not take -jN directly.
+    makeFlags="PARALLEL=-j$NIX_BUILD_CORES" ;
+  '';
+
+  postInstall = ''
+    # Wrap with compilers for the different targets.
+    for e in $(ls $out/bin) ; do
+      wrapProgram $out/bin/$e \
+        --prefix PATH ":" "${gcc}/bin" \
+        --prefix PATH ":" "${jdk}/bin" \
+        --prefix PATH ":" "${erlang}/bin"
+    done
+  '';
+
+  meta = {
+    description = "Mercury is a pure logic programming language.";
+    longDescription = ''
+      Mercury is a logic/functional programming language which combines the
+      clarity and expressiveness of declarative programming with advanced
+      static analysis and error detection features.  Its highly optimized
+      execution algorithm delivers efficiency far in excess of existing logic
+      programming systems, and close to conventional programming systems.
+      Mercury addresses the problems of large-scale program development,
+      allowing modularity, separate compilation, and numerous optimization/time
+      trade-offs.
+    '';
+    homepage    = "http://mercurylang.org";
+    license     = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afb208cc940..ffc91cf50f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3047,6 +3047,8 @@ let
     callPackage_i686 ../development/compilers/mentor {}
   );
 
+  mercury = callPackage ../development/compilers/mercury { };
+
   mitscheme = callPackage ../development/compilers/mit-scheme { };
 
   mlton = callPackage ../development/compilers/mlton { };

From a50fc668c1370390a8dc43d0c610aa9cb66583b1 Mon Sep 17 00:00:00 2001
From: Chris Rooney <christopher.j.rooney@gmail.com>
Date: Wed, 14 May 2014 16:46:51 -0430
Subject: [PATCH 1329/2033] cabal2nix derivation for haskellPackages.fayText

---
 .../libraries/haskell/fay-text/default.nix         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fay-text/default.nix

diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix
new file mode 100644
index 00000000000..ff2ba21187e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fay-text/default.nix
@@ -0,0 +1,14 @@
+{ cabal, fay, fayBase, text }:
+
+cabal.mkDerivation (self: {
+  pname = "fay-text";
+  version = "0.3.0.1";
+  sha256 = "1bwsnhrj94j8jks5nhb0al8mymcgn2lp1pj9q7n935ygkzsaasbm";
+  buildDepends = [ fay fayBase text ];
+  meta = {
+    homepage = "https://github.com/faylang/fay-text";
+    description = "Fay Text type represented as JavaScript strings";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

From 3c4b9b26cfe9474b2ef6a63431adabe6d7539b50 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Thu, 15 May 2014 09:05:02 +1000
Subject: [PATCH 1330/2033] Updated some CRAN packages and fixed dependencies

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

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 6068fce10d5..52bde801992 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -2660,7 +2660,7 @@ let self = _self // overrides; _self = with self; {
   marg = derive { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
   margie = derive { name="margie"; version="1.0"; sha256="1jkhg15xdiqjvpzbbc39l8jlfw0yrbarnd3zbgb3p0rh733x5g4j"; depends=[]; };
   marginalmodelplots = derive { name="marginalmodelplots"; version="0.4.2"; sha256="0d7m7sddz9rp1mkvirhcmk7hlbxsag3nm3vqfampnr7l2h158baa"; depends=[locfit]; };
-  markdown = derive { name="markdown"; version="0.6.5"; sha256="0gixql675hyl38cha2xxklx8x2jin88iqs7mndfqmq7mfms62i31"; depends=[]; };
+  markdown = derive { name="markdown"; version="0.7"; sha256="18q1yvzv9fk5j09ngrldm32cnswxhrmqx6g8d17srriis6ng6i5v"; depends=[ mime ]; };
   marked = derive { name="marked"; version="1.1.3"; sha256="0nvk7fq2q7yqxmw507bsbss04wggy13kgvcv5v01g8a0wb3ig9ym"; depends=[R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr]; };
   MarkedPointProcess = derive { name="MarkedPointProcess"; version="0.2.21"; sha256="06bypa124raa4vbcvi082vpd8bndnar4p1v18dq261z6j3ixk44k"; depends=[RandomFields R2Cuba]; };
   maRketSim = derive { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
@@ -2670,7 +2670,7 @@ let self = _self // overrides; _self = with self; {
   marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
   maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
-  MASS = derive { name="MASS"; version="7.3-32"; sha256="1nmd5b9yillca3gczq82n5kpxslkvdhq0nl3cw2wp9s9vax29ymh"; depends=[]; };
+  MASS = derive { name="MASS"; version="7.3-33"; sha256="1bq005zxyc7842z4cz5ilhh917clfdmhg5czfq6plkdgwq8nfhlk"; depends=[]; };
   MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; };
   MASSTIMATE = derive { name="MASSTIMATE"; version="1.1"; sha256="10hs2mprdfa747sz2bjy29jixblbnyb744wxf8gh4jq3d5f5xpiq"; depends=[epicalc]; };
   MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; };
@@ -2826,7 +2826,7 @@ let self = _self // overrides; _self = with self; {
   migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; };
   MIICD = derive { name="MIICD"; version="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; };
   MILC = derive { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
-  mime = derive { name="mime"; version="0.1"; sha256="1qmflb4339mx666ak7h47k5jgvp7prisvpay00b639sg7pwp2hbx"; depends=[]; };
+  mime = derive { name="mime"; version="0.1.1"; sha256="1kgm06n9flw2kh9f63h3i20wg663qscfdvs7dpyb68ic3c7aimci"; depends=[]; };
   MImix = derive { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MindOnStats = derive { name="MindOnStats"; version="0.8"; sha256="1fsswkbrxd3f0hz3nd25xvp36si292s4q2r52hw6rsps2mx6bgqi"; depends=[]; };
   minerva = derive { name="minerva"; version="1.3"; sha256="0ph65jfm05wck3zz0lh3bmaj0p4c9309nzkrjpjxqkcnrfdbw6wf"; depends=[]; };
@@ -4005,7 +4005,7 @@ let self = _self // overrides; _self = with self; {
   RcppClassicExamples = derive { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
   RcppCNPy = derive { name="RcppCNPy"; version="0.2.3"; sha256="1baz9272vwc44yab7xb6ig0gd2gj8idrhywir2zq77q8bfhqc9gh"; depends=[Rcpp]; };
   RcppDE = derive { name="RcppDE"; version="0.1.2"; sha256="0ji5csfygqvrcahgx5gxy7dddpykckzw8hmqslsdl7l68wj60qkc"; depends=[Rcpp RcppArmadillo]; };
-  RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.1"; sha256="099hrj4r2dh0yfn63lazmqcja1gwxqzy1zlsfia31kkaw6i82g5l"; depends=[Matrix Rcpp]; };
+  RcppEigen = derive { name="RcppEigen"; version="0.3.2.1.2"; sha256="010a27jby8c61mgw2qb47zkln1v33gj0xcn8lf7sw0kb2mdh58yl"; depends=[Matrix Rcpp]; };
   RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5nncsah0lrkls8dqqcka9fnbvfg8ikl4cqjri17rpbv"; depends=[Rcpp]; };
   RcppGSL = derive { name="RcppGSL"; version="0.2.0"; sha256="0qdm5igjrifw8a0m36k9xrbnaj11j18236a1gvdz689vy6a4hfqz"; depends=[Rcpp]; };
   RcppOctave = derive { name="RcppOctave"; version="0.14.1"; sha256="0fdljr0jdnardcm2qm29ibz16xymal8xac3p4grscipa44vm1w0b"; depends=[Rcpp pkgmaker digest stringr]; };

From a6ddfbceac2003253753ea1229133eb79ce68877 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 15 May 2014 18:38:45 +1200
Subject: [PATCH 1331/2033] Add -p to mkdir in build-fhs-chrootenv to prevent
 error if directory exists

---
 pkgs/build-support/build-fhs-chrootenv/init.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/init.sh.in b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
index 2dfa95219c8..5b0ab94bc4e 100644
--- a/pkgs/build-support/build-fhs-chrootenv/init.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/init.sh.in
@@ -36,9 +36,9 @@ rm $chrootenvDest/etc/pam.d
 ln -s ../host-etc/static/pam.d $chrootenvDest/etc/pam.d
 
 # Symlink Font stuff
-mkdir $chrootenvDest/etc/fonts
+mkdir -p $chrootenvDest/etc/fonts
 ln -s ../../host-etc/static/fonts/fonts.conf $chrootenvDest/etc/fonts
-mkdir $chrootenvDest/etc/fonts/conf.d
+mkdir -p $chrootenvDest/etc/fonts/conf.d
 ln -s ../../../host-etc/static/fonts/conf.d/00-nixos.conf $chrootenvDest/etc/fonts/conf.d
 
 # Create root folder

From b750d03defb48bf2c6ca1c6f289e6f3c6ef4b642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Thu, 15 May 2014 18:17:06 +0800
Subject: [PATCH 1332/2033] libmodplug: update to 0.8.8.5

---
 .../libraries/libmodplug/default.nix          | 59 +++++--------------
 1 file changed, 16 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index a45bc9fdf8d..c1fb0033aa9 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -1,47 +1,20 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libmodplug";
-    version="0.8.8.4";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/modplug-xmms/${baseName}/${version}/${name}.tar.gz";
-    hash="1xv44bd84c4qi41i1wwjr6qzazx15l85yvi74sz49ldyvlyy2pjw";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+let
+  version = "0.8.8.5";
+in stdenv.mkDerivation rec {
+  name = "libmodplug-${version}";
+
+  meta = with stdenv.lib; {
+    description = "MOD playing library";
+    homepage    = "http://modplug-xmms.sourceforge.net/";
+    license     = licenses.publicDomain;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "Music library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.publicDomain;
+  src = fetchurl {
+    url = "mirror://sourceforge/project/modplug-xmms/libmodplug/${version}/${name}.tar.gz";
+    sha256 = "1bfsladg7h6vnii47dd66f5vh1ir7qv12mfb8n36qiwrxq92sikp";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/modplug-xmms/files/libmodplug/";
-    };
-  };
-}) x
-
+}

From 8fbe635fa65329eb838408ac9bee64c04eab45a8 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 15 May 2014 13:37:24 +0200
Subject: [PATCH 1333/2033] syncthing: update to version 0.8.5

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index e658264e5cb..72a4a55069a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "syncthing-${version}";
-  version = "0.8.2";
+  version = "0.8.5";
 
   src = fetchgit {
     url = "git://github.com/calmh/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1yhl0mk6f2cyib82jyzwz20iw1l5pxppmlgw5xn9pkmqm53wp4z4";
+    sha256 = "0525fvar5c22sxg7737ajny80srds1adhi73a8yr12wsjnsqfi6x";
   };
 
   buildInputs = [ go ];

From b1feffd1a19a0f80ff36cd9843a3235df0c27b1e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 15 May 2014 13:46:20 +0200
Subject: [PATCH 1334/2033] haskell-glfw-b: add package version 1.4.6

---
 .../libraries/haskell/GLFW-b/default.nix       | 17 +++++++++++++++++
 .../haskell/bindings-GLFW/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix            |  4 ++++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/GLFW-b/default.nix
 create mode 100644 pkgs/development/libraries/haskell/bindings-GLFW/default.nix

diff --git a/pkgs/development/libraries/haskell/GLFW-b/default.nix b/pkgs/development/libraries/haskell/GLFW-b/default.nix
new file mode 100644
index 00000000000..5dea14a106d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GLFW-b/default.nix
@@ -0,0 +1,17 @@
+{ cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }:
+
+cabal.mkDerivation (self: {
+  pname = "GLFW-b";
+  version = "1.4.6";
+  sha256 = "1d9vacb9nsf5cqqwxhn49wsfbhmw1263kgimk5qxpqpg1jiy35hy";
+  buildDepends = [ bindingsGLFW ];
+  testDepends = [
+    bindingsGLFW HUnit testFramework testFrameworkHunit
+  ];
+  doCheck = false;
+  meta = {
+    description = "Bindings to GLFW OpenGL library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
new file mode 100644
index 00000000000..8f3a729699e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
@@ -0,0 +1,18 @@
+{ cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi, libXrandr, libXxf86vm
+, mesa, testFramework, testFrameworkHunit
+}:
+
+cabal.mkDerivation (self: {
+  pname = "bindings-GLFW";
+  version = "3.0.3.2";
+  sha256 = "1w4y2ha5x678fiyan79jd59mjrkf4q25v8049sj20fbmabgdqla9";
+  buildDepends = [ bindingsDSL ];
+  testDepends = [ HUnit testFramework testFrameworkHunit ];
+  extraLibraries = [ libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa ];
+  doCheck = false;
+  meta = {
+    description = "Low-level bindings to GLFW OpenGL library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d5f37c536e..b090cafeefd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -236,6 +236,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bindingsDSL = callPackage ../development/libraries/haskell/bindings-DSL {};
 
+  bindingsGLFW = callPackage ../development/libraries/haskell/bindings-GLFW {};
+
   bindingsLibusb = callPackage ../development/libraries/haskell/bindings-libusb {
     libusb = pkgs.libusb1;
   };
@@ -821,6 +823,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   GLFW = callPackage ../development/libraries/haskell/GLFW {};
 
+  GLFWb = callPackage ../development/libraries/haskell/GLFW-b {};
+
   glib = callPackage ../development/libraries/haskell/glib {
     glib = pkgs.glib;
     libc = pkgs.stdenv.gcc.libc;

From 10fa1bcf66d43c5ec1ec0b64c182b39e3b47a8d6 Mon Sep 17 00:00:00 2001
From: Linquize <linquize@yahoo.com.hk>
Date: Thu, 15 May 2014 21:32:10 +0800
Subject: [PATCH 1335/2033] git: Update to 1.9.3

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 861030bae99..283e9ac18ac 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.9.2";
+  version = "1.9.3";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1x4rb06vw4ckdflmn01r5l9spvn7cng4i5mm3sbd0n8cz0n6xz13";
+    sha256 = "0pyhqwy9g875frf1qyfjj6rz64qhlyvr29n7pljzcy536x9qcczn";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

From cc51572bd593c1343f15a96589bc8a6c2a630960 Mon Sep 17 00:00:00 2001
From: chris rooney <christopher.j.rooney@gmail.com>
Date: Thu, 15 May 2014 11:11:47 -0430
Subject: [PATCH 1336/2033] Register expression for fay-text in catalog.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d5f37c536e..8c7ccdaaf44 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -698,6 +698,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   fayBase = callPackage ../development/libraries/haskell/fay-base {};
 
+  fayText = callPackage ../development/libraries/haskell/fay-text {};
+
   fdoNotify = callPackage ../development/libraries/haskell/fdo-notify {};
 
   filepath_1_3_0_2 = callPackage ../development/libraries/haskell/filepath/1.3.0.2.nix {};

From 4b668bb5548c4771578445cb90163dff5d4814e6 Mon Sep 17 00:00:00 2001
From: Jordan Patterson <jordan@evolarium.ca>
Date: Wed, 14 May 2014 18:43:45 -0600
Subject: [PATCH 1337/2033] rxvt-unicode: update to 9.20, fixing CVE-2014-3121
 (close #2649)

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

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 2e3ef9f0d10..7ba01167c7f 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -3,7 +3,7 @@
 
 let
   name = "rxvt-unicode";
-  version = "9.16";
+  version = "9.20";
   n = "${name}-${version}";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "0x28wyslqnhn2q11y4hncqdl07wgh5ypywl92fq0jxycr36ibfvn";
+    sha256 = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e";
   };
 
   buildInputs =

From 0c142b2a1860a9a8e56a14f375f24f8055ec76cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 10 May 2014 17:28:53 +0200
Subject: [PATCH 1338/2033] mesa: small bugfix update 10.1.2 -> .3

Mainly fixes performance regression for vmware.
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 595c044f780..a25079c5617 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.1.2";
+  version = "10.1.3";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "132vn3s5hiwksl7n099fw3g15h3nzj3fp09zzvgnikqcrrv0n8xi";
+    sha256 = "1hzcmpa7ykqm0qrvkm52bkfvf855wb9bs8449fwhypgjdqimwqdj";
   };
 
   prePatch = "patchShebangs .";

From cf1dbbbf7278be6b6c9a531d8c9b781836200697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 10 May 2014 17:29:41 +0200
Subject: [PATCH 1339/2033] llvm+clang: maintenance update 3.4 -> 3.4.1

Slightly hacky for clang at some points, as directory names change strangely.
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 16 +++++++-------
 .../compilers/llvm/3.4/default.nix            | 22 ++++++++++++++-----
 pkgs/development/compilers/llvm/3.4/llvm.nix  |  9 ++++----
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 7032056f7e4..7fe94cbf8d8 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "clang" "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"}
-    mv clang-${version} clang
+    unpackFile ${fetch "cfe" "1dvbkld0a1aqj6wcn0ia1wa8lwha30yfgq16j1r7akdka44z70xb"}
+    mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
-    unpackFile ${fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds"}
-    mv clang-tools-extra-${version} $sourceRoot/tools/extra
+    unpackFile ${clang-tools-extra_src}
+    mv clang-tools-extra-* $sourceRoot/tools/extra
     # !!! Hopefully won't be needed for 3.5
     unpackFile ${llvm.src}
-    export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE=$PWD/llvm-${version}"
-    (cd llvm-${version} && patch -Np1 -i ${./llvm-separate-build.patch})
+    export cmakeFlags="$cmakeFlags -DCLANG_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
+    (cd llvm-* && patch -Np1 -i ${./llvm-separate-build.patch})
   '';
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   # Clang expects to find sanitizer libraries in its own prefix
   postInstall = ''
     ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-    ln -sv ${llvm}/lib/clang/3.4/lib $out/lib/clang/3.4/
+    ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
   '';
 
   passthru.gcc = stdenv.gcc.gcc;
diff --git a/pkgs/development/compilers/llvm/3.4/default.nix b/pkgs/development/compilers/llvm/3.4/default.nix
index 0a8a72f59a9..237c7f73d7f 100644
--- a/pkgs/development/compilers/llvm/3.4/default.nix
+++ b/pkgs/development/compilers/llvm/3.4/default.nix
@@ -4,15 +4,27 @@ let
 
   version = "3.4";
 
-  fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/releases/${version}/${name}-${version}.src.tar.gz";
+  fetch = fetch_v version;
+  fetch_v = ver: name: sha256: fetchurl {
+    url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.gz";
     inherit sha256;
   };
 
-  self = {
-    llvm = callPackage ./llvm.nix {};
+  compiler-rt_src = fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1d1822mwxxl9agmyacqjw800kzz5x8xr0sdmi8fgx5xfa5sii1ds";
 
-    clang = callPackage ./clang.nix {};
+  self = {
+    llvm = callPackage ./llvm.nix rec {
+      version = "3.4.1";
+      fetch = fetch_v version;
+      inherit compiler-rt_src;
+    };
+
+    clang = callPackage ./clang.nix rec {
+      version = "3.4.1";
+      fetch = fetch_v version;
+      inherit clang-tools-extra_src;
+    };
 
     lld = callPackage ./lld.nix {};
 
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index fad11b7a123..3aea2a12a11 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -11,19 +11,20 @@
 , ncurses
 , version
 , zlib
+, compiler-rt_src
 }:
 
 let
-  src = fetch "llvm" "0a169ba045r4apb9cv6ncrwl83l7yiajnzirkcdlhj1cd4nn3995";
+  src = fetch "llvm" "0fprxrilnlwk9qv7f0kplxc7kd8mp4x781asssv2nfi4r9pbna3x";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
   unpackPhase = ''
     unpackFile ${src}
-    mv llvm-${version} llvm
+    mv llvm-${version}.src llvm
     sourceRoot=$PWD/llvm
-    unpackFile ${fetch "compiler-rt" "0p5b6varxdqn7q3n77xym63hhq4qqxd2981pfpa65r1w72qqjz7k"}
-    mv compiler-rt-${version} $sourceRoot/projects/compiler-rt
+    unpackFile ${compiler-rt_src}
+    mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
   buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;

From f1ded0d7bdbc1db51e8b35b8f27566d4bd300970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 12 May 2014 22:04:26 +0200
Subject: [PATCH 1340/2033] gtk3: bugfix update 3.12.1 -> .2

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

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 82e2e41aff8..ef8f3e39883 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
 
 let
   ver_maj = "3.12";
-  ver_min = "1";
+  ver_min = "2";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "1kbp0bmyzh7lbxv9y349vrj3d0n0hn68r5kyvg5683snvdgsx6ki";
+    sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
   };
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];

From 4da7eb78ec259b5bd4fa54c5a71d77e6b849f4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 May 2014 21:11:17 +0200
Subject: [PATCH 1341/2033] lib/maintainers: add "berdario", maintain redis

Relates #2541.
---
 lib/maintainers.nix                  | 1 +
 pkgs/servers/nosql/redis/default.nix | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 122606363bc..80d0bed23dc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -18,6 +18,7 @@
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
+  berdario = "Dario Bertini <berdario@gmail.com>";
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index e8736f237c1..1a44aa6a804 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://redis.io;
     description = "An open source, advanced key-value store";
     license = "BSD";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.berdario ];
   };
 }

From 658c1366151483d612199b716a88fd30ca0999e2 Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@numergy.com>
Date: Tue, 6 May 2014 11:38:46 +0200
Subject: [PATCH 1342/2033] add Posterazor (close #2538)

@vcunat patched for newer gcc.
---
 pkgs/applications/misc/posterazor/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/misc/posterazor/default.nix

diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
new file mode 100644
index 00000000000..0cad2fbd2cd
--- /dev/null
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
+
+stdenv.mkDerivation rec {
+  name = "posterazor-1.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/posterazor/1.5/PosteRazor-1.5-Source.zip";
+    sha256 = "0xy313d2j57s4wy2y3hjapbjr5zfaki0lhkfz6nw2p9gylcmwmjy";
+  };
+
+  buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ];
+
+  unpackPhase = ''
+    unzip $src -d posterazor
+    cd posterazor/src
+  '';
+
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328
+  patchPhase = ''
+    sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include <unistd.h>\n\1/" -i FlPosteRazorDialog.cpp
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp PosteRazor $out/bin
+  '';
+
+  meta = {
+    homepage = "http://posterazor.sourceforge.net/";
+    description = "The PosteRazor cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
+    maintainers = [ stdenv.lib.maintainers.madjar ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21c2843b627..12178d57485 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9092,6 +9092,8 @@ let
 
   potrace = callPackage ../applications/graphics/potrace {};
 
+  posterazor = callPackage ../applications/misc/posterazor { };
+
   pqiv = callPackage ../applications/graphics/pqiv { };
 
   qiv = callPackage ../applications/graphics/qiv { };

From 4eee3b66bc1d76c4fc9d1fbcf87076eecdd9f753 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 15 May 2014 15:08:39 -0500
Subject: [PATCH 1343/2033] mumble: Update 1.2.5 -> 1.2.6

---
 pkgs/applications/networking/mumble/default.nix | 4 ++--
 pkgs/applications/networking/mumble/murmur.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 9d2050d10fe..b2b2e37fd66 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "mumble-" + version;
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/${name}.tar.gz";
-    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
+    sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47";
   };
 
   patches = optional jackSupport ./mumble-jack-support.patch;
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index b886896c071..17254aa2fdd 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "murmur-" + version;
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "1bsgains6xgpgpd1b5bq682z0kswp5fcjh2cir4c4qkndya5clci";
+    sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47";
   };
 
   patchPhase = optional iceSupport ''

From 2e6c46ce36b2006befeb9b6c7678f0af3e8355f9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 15 May 2014 23:00:18 +0200
Subject: [PATCH 1344/2033] ori: enable orilocal

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

diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix
index fe8b7dd4f0a..d95716864c8 100644
--- a/pkgs/tools/backup/ori/default.nix
+++ b/pkgs/tools/backup/ori/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildPhase = ''
-    scons PREFIX=$out install
+    scons PREFIX=$out WITH_ORILOCAL=1 install
   '';
 
   installPhase = ":";

From cde9461d06a2adb041e42ba65648ec19b3b56f93 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Fri, 16 May 2014 14:26:47 +0800
Subject: [PATCH 1345/2033] Update haskell-http-kit to version 0.3.0

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

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
index 5e25f44057f..517fe41e716 100644
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-kit";
-  version = "0.2.2";
-  sha256 = "09pq3wzcg8piil6bcp713dfscrfald155456dfir9dljviamhvsv";
+  version = "0.3.0";
+  sha256 = "06w19znw6qkf1rcigi83pqx8cpp82q5jd6szlqy0qzrr57336071";
   buildDepends = [ caseInsensitive httpTypes ];
   testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
   meta = {

From 26fb26e3311b5a80b0bb635aa4cc4855aff18b30 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Fri, 16 May 2014 15:21:22 +0800
Subject: [PATCH 1346/2033] nix-prefetch-git: Print git revision

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 6e79f82eae8..d4819574acb 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -217,6 +217,8 @@ clone_user_rev() {
             fi;;
     esac
 
+    echo "git revision is $(cd $dir && git rev-parse $rev)"
+
     # Allow doing additional processing before .git removal
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
     if test -z "$leaveDotGit"; then

From 26f158c9945ec4ad1f53fffafbfb2ba11a4e3516 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 17:51:38 +0200
Subject: [PATCH 1347/2033] R-MASS: update to version 7.3-33

---
 pkgs/development/r-modules/cran-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 6068fce10d5..4aa089da498 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -2670,7 +2670,7 @@ let self = _self // overrides; _self = with self; {
   marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   MARSS = derive { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[nlme mvtnorm KFAS]; };
   maSAE = derive { name="maSAE"; version="0.1-2"; sha256="18a1zbfmjhrmi3fgqd7vaicpsca59kp8r1003pwl7l4032p32fxk"; depends=[]; };
-  MASS = derive { name="MASS"; version="7.3-32"; sha256="1nmd5b9yillca3gczq82n5kpxslkvdhq0nl3cw2wp9s9vax29ymh"; depends=[]; };
+  MASS = derive { name="MASS"; version="7.3-33"; sha256="1bq005zxyc7842z4cz5ilhh917clfdmhg5czfq6plkdgwq8nfhlk"; depends=[]; };
   MASSI = derive { name="MASSI"; version="1.1"; sha256="13kavfsm48qq9zyp10scfjcgrk0x2n4my7cz2xy78s14knlrks5y"; depends=[fpc gplots]; };
   MASSTIMATE = derive { name="MASSTIMATE"; version="1.1"; sha256="10hs2mprdfa747sz2bjy29jixblbnyb744wxf8gh4jq3d5f5xpiq"; depends=[epicalc]; };
   MasterBayes = derive { name="MasterBayes"; version="2.51"; sha256="0mbvhn6yspralmlajimdin14hszh78m0bxb3zdxd73xhjqxl4ixk"; depends=[coda genetics gtools kinship2]; };

From 0430f59d648b6b1c6fd9e8fedd100814b033534a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 16 May 2014 18:27:05 +0200
Subject: [PATCH 1348/2033] llvmPackages.lld: fix build after 3.4.1 update

Somehow I forgot this package.
---
 pkgs/development/compilers/llvm/3.4/lld.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index 22eb02a0e35..c28c03fbdd1 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   preUnpack = ''
     # !!! Hopefully won't be needed for 3.5
     unpackFile ${llvm.src}
-    export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE=$PWD/llvm-${version}"
+    export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
   '';
 
   buildInputs = [ cmake ncurses zlib python ];

From 832c66182232a2ecfe5a0f63629804274bc73902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 16 May 2014 18:33:24 +0200
Subject: [PATCH 1349/2033] xorg.libXfont: security update,
 CVE-2014-{0209,0210,0211}

For details see http://lists.x.org/archives/xorg-announce/2014-May/002431.html
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1c9f81e96e1..795fa8a60af 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -700,11 +700,11 @@ let
   })) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
-    name = "libXfont-1.4.7";
+    name = "libXfont-1.4.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2;
-      sha256 = "0hqm3nainxpc0922i4zbwzc768f69zkdf1gvkjqrdlim31aa6vni";
+      url = mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2;
+      sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 68d1157c62e..5edff19c431 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
-mirror://xorg/individual/lib/libXfont-1.4.7.tar.bz2
+mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2

From aae174b36130c13859a589b3bd7d416f0b358a91 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:07:55 +0200
Subject: [PATCH 1350/2033] haskell-temporary-rc: add version 1.2.0.3

---
 .../libraries/haskell/temporary-rc/default.nix     | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/temporary-rc/default.nix

diff --git a/pkgs/development/libraries/haskell/temporary-rc/default.nix b/pkgs/development/libraries/haskell/temporary-rc/default.nix
new file mode 100644
index 00000000000..2f8cc9fad84
--- /dev/null
+++ b/pkgs/development/libraries/haskell/temporary-rc/default.nix
@@ -0,0 +1,14 @@
+{ cabal, exceptions, filepath, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "temporary-rc";
+  version = "1.2.0.3";
+  sha256 = "1nqih0qks439k3pr5kmbbc8rjdw730slrxlflqb27fbxbzb8skqs";
+  buildDepends = [ exceptions filepath transformers ];
+  meta = {
+    homepage = "http://www.github.com/feuerbach/temporary";
+    description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index bbbe4d99465..7e8a5128a6d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2091,6 +2091,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   temporary = callPackage ../development/libraries/haskell/temporary {};
 
+  temporaryRc = callPackage ../development/libraries/haskell/temporary-rc {};
+
   Tensor = callPackage ../development/libraries/haskell/Tensor {};
 
   terminalProgressBar = callPackage ../development/libraries/haskell/terminal-progress-bar {};

From a82d0962eb76459b1665cfbe98c9d6310f6a7069 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:09 +0200
Subject: [PATCH 1351/2033] haskell-data-lens-light: add version 0.1.1

---
 .../libraries/haskell/data-lens-light/default.nix  | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-lens-light/default.nix

diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix
new file mode 100644
index 00000000000..14614b8ab00
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "data-lens-light";
+  version = "0.1.1";
+  sha256 = "03nsfwpcl7wmw2bgcb8z3w04krlbrbks7bjpnzfdz6cgdr5mnjrs";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "https://github.com/feuerbach/data-lens-light";
+    description = "Simple lenses, minimum dependencies";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7e8a5128a6d..21f1554c89a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -527,6 +527,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   dataLens = callPackage ../development/libraries/haskell/data-lens {};
 
+  dataLensLight = callPackage ../development/libraries/haskell/data-lens-light {};
+
   dataLensTemplate = callPackage ../development/libraries/haskell/data-lens-template {};
 
   dataMemocombinators = callPackage ../development/libraries/haskell/data-memocombinators {};

From beeda31e3bc140a39bb2dee4362aa2a114f64c8b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:14 +0200
Subject: [PATCH 1352/2033] haskell-X11: update to version 1.6.1.2

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

diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix
index c304a58b9a5..64c6d50c609 100644
--- a/pkgs/development/libraries/haskell/X11/default.nix
+++ b/pkgs/development/libraries/haskell/X11/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "X11";
-  version = "1.6.1.1";
-  sha256 = "1bkfnxcmf8qia0l3x5n3j4f1zakjwnlq0mhdnbpp6v3q2g37brbw";
+  version = "1.6.1.2";
+  sha256 = "1kzjcynm3rr83ihqx2y2d852jc49da4p18gv6jzm7g87z22x85jj";
   buildDepends = [ dataDefault ];
   extraLibraries = [
     libX11 libXext libXinerama libXrandr libXrender

From fedef2e73e1a4670aac440e9c1c953c1290b5bb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:15 +0200
Subject: [PATCH 1353/2033] haskell-AES: update to version 0.2.9

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

diff --git a/pkgs/development/libraries/haskell/aes/default.nix b/pkgs/development/libraries/haskell/aes/default.nix
index 6b239bd4e77..6ffa795929f 100644
--- a/pkgs/development/libraries/haskell/aes/default.nix
+++ b/pkgs/development/libraries/haskell/aes/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "AES";
-  version = "0.2.8";
-  sha256 = "1yf0mhmj294gf1b1m11gixa1xxlbvv0yl60b59fnv5lf0s170jn3";
+  version = "0.2.9";
+  sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc";
   buildDepends = [ cereal monadsTf random transformers ];
   meta = {
     description = "Fast AES encryption/decryption for bytestrings";

From 7cc0d519c4916f2d069dcc02522bd638d2b0fbaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:17 +0200
Subject: [PATCH 1354/2033] haskell-aeson: update to version 0.7.0.4

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

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index e7e35162111..9672111dc42 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson";
-  version = "0.7.0.3";
-  sha256 = "0d2mgy35q7jkg18wh0ms7i26v74nj5mffa6z80bdblihizif6100";
+  version = "0.7.0.4";
+  sha256 = "009grccll41mkf7rarpcrn06l8vc0q0y8l4j9nbdfcl89153rj2k";
   buildDepends = [
     attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
     text time unorderedContainers vector

From cf00b5ae97d5db4018ff4cdf3ee4714a1fe3423e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:19 +0200
Subject: [PATCH 1355/2033] haskell-bindings-GLFW: update to version 3.0.3.2

---
 .../libraries/haskell/bindings-GLFW/default.nix           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
index 8f3a729699e..a5fef2474a7 100644
--- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix
@@ -1,5 +1,5 @@
-{ cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi, libXrandr, libXxf86vm
-, mesa, testFramework, testFrameworkHunit
+{ cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi
+, libXrandr, libXxf86vm, mesa, testFramework, testFrameworkHunit
 }:
 
 cabal.mkDerivation (self: {
@@ -8,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1w4y2ha5x678fiyan79jd59mjrkf4q25v8049sj20fbmabgdqla9";
   buildDepends = [ bindingsDSL ];
   testDepends = [ HUnit testFramework testFrameworkHunit ];
-  extraLibraries = [ libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa ];
+  extraLibraries = [
+    libX11 libXext libXfixes libXi libXrandr libXxf86vm mesa
+  ];
   doCheck = false;
   meta = {
     description = "Low-level bindings to GLFW OpenGL library";

From 71c322a3c6d9682ef19483b8bfc7d2a659cb7f43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:21 +0200
Subject: [PATCH 1356/2033] haskell-classy-prelude-conduit: update to version
 0.9.2

---
 .../libraries/haskell/classy-prelude-conduit/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
index e63f2e8ac78..a5bc5316b7f 100644
--- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude-conduit";
-  version = "0.9.1";
-  sha256 = "1y3jxhly9y1yhr2qz3b1jf6sg4s0mwq9xq1mp765wa20hmwjayvg";
+  version = "0.9.2";
+  sha256 = "07qdhha58yl1dq4mpbyrpjwzk2yhn8dbkg2qg2yaq1j780a6dwcv";
   buildDepends = [
     classyPrelude conduit conduitCombinators monadControl resourcet
     systemFileio transformers void

From 72da0b2b69c91bc66d13ae65cbdc6454f1b4de00 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:23 +0200
Subject: [PATCH 1357/2033] haskell-classy-prelude: update to version 0.9.2

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

diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix
index f64235c8602..8b740ded6e7 100644
--- a/pkgs/development/libraries/haskell/classy-prelude/default.nix
+++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "classy-prelude";
-  version = "0.9.1";
-  sha256 = "08rcfgr2mjgjvacmyih693pvq9jwfj9nshkazw8x6wlzlwr56ag8";
+  version = "0.9.2";
+  sha256 = "0n006ld2kifh2bmwgbzx282s7xxpcml9g433x132prcblw4axkgr";
   buildDepends = [
     basicPrelude chunkedData enclosedExceptions exceptions hashable
     liftedBase monoTraversable semigroups stm systemFilepath text time

From c2e628585ce0f3749b5d2494de761bdfa80ea3ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:24 +0200
Subject: [PATCH 1358/2033] haskell-cond: update to version 0.4.1

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

diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix
index c0c3d6ca784..58efe5dd29d 100644
--- a/pkgs/development/libraries/haskell/cond/default.nix
+++ b/pkgs/development/libraries/haskell/cond/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cond";
-  version = "0.4.0.2";
-  sha256 = "13m7bcsx4nch767kf9wza0vqql711b8vjd3m5cahrvb7xbh3g593";
+  version = "0.4.1";
+  sha256 = "16xk8clsxv5qi5f745xvs44y8p8dnmlmjkjzwqz9jl8fbmkmki3b";
   meta = {
     homepage = "https://github.com/kallisti-dev/cond";
     description = "Basic conditional and boolean operators with monadic variants";

From 1558af28c6b2ec2de45f9e83e76c47fa8c3d9cce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:26 +0200
Subject: [PATCH 1359/2033] haskell-conduit-combinators: update to version
 0.2.5.2

---
 .../libraries/haskell/conduit-combinators/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
index dc0e872a032..99ac99ebc82 100644
--- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix
+++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.5.1";
-  sha256 = "1xz8vh9pvh3897lnv1vs69g079q6qvbh334gpfnkc5lb7hvdw7qv";
+  version = "0.2.5.2";
+  sha256 = "00zvai14cgh2g9wa436kfdgyfzm3pksnhzy365y1yn96dwbbh1ih";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

From cd2da3afc4b1c476c5eb561778186b37e6f99c10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:28 +0200
Subject: [PATCH 1360/2033] haskell-contravariant: update to version 0.6

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

diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix
index 75ad1f188ae..f1372d7630b 100644
--- a/pkgs/development/libraries/haskell/contravariant/default.nix
+++ b/pkgs/development/libraries/haskell/contravariant/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "contravariant";
-  version = "0.5.2";
-  sha256 = "05lnipshhjh8ld0c24h675rgljr54203vv9a4fsivw4asaj24q7y";
+  version = "0.6";
+  sha256 = "031kwn2hpw25p2q0bhfgby0ihxjbcyv6w0v0nsj2zygif9jkfrrh";
   buildDepends = [ tagged transformers transformersCompat ];
   meta = {
     homepage = "http://github.com/ekmett/contravariant/";

From 51c5803431ae5d19311e9e7985e3841fbbd7b66b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:30 +0200
Subject: [PATCH 1361/2033] haskell-digestive-functors: update to version
 0.7.1.1

---
 .../libraries/haskell/digestive-functors/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix
index d0bd50e584b..8764f3e2b6c 100644
--- a/pkgs/development/libraries/haskell/digestive-functors/default.nix
+++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "digestive-functors";
-  version = "0.7.1.0";
-  sha256 = "0ry0ircxs6ml4wdz6hrn3jnyhniwdnn1dn21imq3kv68jlhfn3by";
+  version = "0.7.1.1";
+  sha256 = "161461y8gil2922gx6kdc59g50ywk9nk74gkxl0yrwvz80a118c9";
   buildDepends = [ mtl text time ];
   testDepends = [
     HUnit mtl QuickCheck testFramework testFrameworkHunit

From 7aaec99bebea8c83f7962dd9a82bd2f7f20b37eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:32 +0200
Subject: [PATCH 1362/2033] haskell-dns: update to version 1.2.3

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

diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix
index 6bef995580c..badc718f32b 100644
--- a/pkgs/development/libraries/haskell/dns/default.nix
+++ b/pkgs/development/libraries/haskell/dns/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dns";
-  version = "1.2.2";
-  sha256 = "0xba8bwxn5n3bh1qfbrmnrfsnf20iwa10acx1z4017jbnx0s025v";
+  version = "1.2.3";
+  sha256 = "0h03zh75yzrx08p99ll123qd9a7a2ccj9gad1f8y3340dz3pa7ld";
   buildDepends = [
     attoparsec attoparsecConduit binary blazeBuilder conduit
     conduitExtra iproute mtl network random resourcet

From 93018b49399e904b62c86a7368c32ce12cb8b95a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:34 +0200
Subject: [PATCH 1363/2033] haskell-either: update to version 4.1.2

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

diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix
index 46348d7e4bb..75e29603e5e 100644
--- a/pkgs/development/libraries/haskell/either/default.nix
+++ b/pkgs/development/libraries/haskell/either/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "either";
-  version = "4.1.1";
-  sha256 = "0wipgwrca7bm4rm843gc0p69f2hvm2z067mjrv8qvnivyxhy8i6k";
+  version = "4.1.2";
+  sha256 = "1c2dp22al9qq2w1xks5s3n8dcan9wpashvn24i4g8avs8yfrr5v4";
   buildDepends = [
     monadControl MonadRandom mtl semigroupoids semigroups transformers
     transformersBase

From d3b2eb8283289f74b1e77489a66de1ccc1f3f573 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:35 +0200
Subject: [PATCH 1364/2033] haskell-ex-pool: update to version 0.2

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

diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix
index 9bf966e749a..b8e4e024afc 100644
--- a/pkgs/development/libraries/haskell/ex-pool/default.nix
+++ b/pkgs/development/libraries/haskell/ex-pool/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ex-pool";
-  version = "0.1.0.2";
-  sha256 = "11q63yfr59r6cfzi635xj75nhcc2yi83snc75k638wyamxgvxng4";
+  version = "0.2";
+  sha256 = "0da5grl2fdca24zhlngq2n16smdb4f5vvxqzc29ipsc3j7wkbmva";
   buildDepends = [
     exceptions hashable stm time transformers vector
   ];

From 19ddd4c3bb205372738d95ed9072f49d3ba617af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:37 +0200
Subject: [PATCH 1365/2033] haskell-exceptions: update to version 0.6.1

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

diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix
index 5d58654e51d..1cde47f48e1 100644
--- a/pkgs/development/libraries/haskell/exceptions/default.nix
+++ b/pkgs/development/libraries/haskell/exceptions/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "exceptions";
-  version = "0.5";
-  sha256 = "0l9gpifp23j6hvyq8p48rxsnv9adqbf7z096dzvd8v5xqqybgyxi";
+  version = "0.6.1";
+  sha256 = "09jv5jskv48fd5la1pdvafwc9j2jxj1ncf6yxzkwcjddynbkyszm";
   buildDepends = [ mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers

From 7e74937230ad9f5e354d3805207b8ac6cb19ac27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:39 +0200
Subject: [PATCH 1366/2033] haskell-fay: update to version 0.20.0.3

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

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index 4a9bfe93e68..d67cc988a2d 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.0.0";
-  sha256 = "04rjmn280f87xlzv4h9as3cxnwaapfvpvq7zaig2rrw0l342pxy0";
+  version = "0.20.0.3";
+  sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From d3e09c21c2a66794fcdd887f5bd41374ce7a5fa8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:41 +0200
Subject: [PATCH 1367/2033] haskell-foldl: update to version 1.0.4

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

diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix
index 926c2a812a0..5224bf11f29 100644
--- a/pkgs/development/libraries/haskell/foldl/default.nix
+++ b/pkgs/development/libraries/haskell/foldl/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "foldl";
-  version = "1.0.3";
-  sha256 = "0jl50bh7k8wp0nz0s0sb2zwh92yrgsm2l6szib41g7zq34mwamn9";
+  version = "1.0.4";
+  sha256 = "0l5gyaw2rb0wfdm5q13vsxfr0z2y9ad5nsjh605p1jp8i0rgwgkv";
   buildDepends = [ primitive text transformers vector ];
   meta = {
     description = "Composable, streaming, and efficient left folds";

From 9778f505de11776d6a36171fb6565b30fde05fca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:43 +0200
Subject: [PATCH 1368/2033] haskell-ghc-mtl: update to version 1.2.1.0

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

diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
index 592961aa554..29e00d8a2d3 100644
--- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mtl";
-  version = "1.2.0.0";
-  sha256 = "0fk3adc56nhi46nf2w5ybp3cd9l13qqbpd5nbhfhbqj3g73j8p5a";
+  version = "1.2.1.0";
+  sha256 = "0h6r6gip9nsjlsq88wj105hhqliy7ac2dmmndsfzbjz07b03cklk";
   buildDepends = [ exceptions extensibleExceptions mtl ];
   meta = {
     homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";

From 3c83531c7ede2251c50f230c59e47749f0b37db5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:45 +0200
Subject: [PATCH 1369/2033] haskell-graphviz: update to version 2999.17.0.0

---
 .../libraries/haskell/graphviz/default.nix         | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index 7bdcfd71101..bd3ccbba7a4 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -4,19 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.16.0.0";
-  sha256 = "1g4q4wyj5amz9xvgnqn143p5nq6m4a0lggxz7jn9l2hwp41bx1g8";
+  version = "2999.17.0.0";
+  sha256 = "1wi5yzs0b321as10h9awin87501njbd4ii40nak1fr534g1abhf5";
+  isLibrary = true;
+  isExecutable = true;
   buildDepends = [
     colour dlist fgl filepath polyparse temporary text transformers
     wlPprintText
   ];
-  testDepends = [
-    colour dlist fgl filepath polyparse QuickCheck temporary text
-    transformers wlPprintText
-  ];
-  patchPhase = ''
-    sed -i -e 's|fgl ==.*,|fgl,|' -e 's|polyparse.*,|polyparse,|' -e 's|dlist ==.*|dlist|' -e 's|temporary.*,|temporary,|' graphviz.cabal
-  '';
+  testDepends = [ fgl filepath QuickCheck text ];
   doCheck = false;
   meta = {
     homepage = "http://projects.haskell.org/graphviz/";

From 557b40de008f366055f6026a25a0d1ec1720ed9c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:46 +0200
Subject: [PATCH 1370/2033] haskell-hakyll: update to version 4.5.3.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index e0168e4f12c..06e835b9ab5 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.5.1.0";
-  sha256 = "0p78wscz9gwg1as49wjl49ydzbv972w6wmbmvhw1rfb9d5xana1i";
+  version = "4.5.3.0";
+  sha256 = "11ibpjff1zkihpxydlzvvzbgd1vxswi4c7g3lr0hhaaw89bikypy";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -26,9 +26,6 @@ cabal.mkDerivation (self: {
     testFrameworkHunit testFrameworkQuickcheck2 text time
   ];
   doCheck = false;
-  patchPhase = ''
-    sed -i -e 's|network .*,|network,|' hakyll.cabal
-  '';
   meta = {
     homepage = "http://jaspervdj.be/hakyll";
     description = "A static website compiler library";

From 09668488d826f4de65c529b4da38a5c210d4f1c0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:48 +0200
Subject: [PATCH 1371/2033] haskell-haskell-names: update to version 0.4

---
 .../libraries/haskell/haskell-names/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix
index c10ba3c904d..18720818459 100644
--- a/pkgs/development/libraries/haskell/haskell-names/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-names/default.nix
@@ -1,17 +1,16 @@
-{ cabal, aeson, Cabal, dataLens, dataLensTemplate, filemanip
-, filepath, haskellPackages, haskellSrcExts, hseCpp, mtl
-, prettyShow, tagged, tasty, tastyGolden, transformers
-, traverseWithClass, typeEq, uniplate, utf8String
+{ cabal, aeson, Cabal, dataLensLight, filemanip, filepath
+, haskellPackages, haskellSrcExts, hseCpp, mtl, prettyShow, tagged
+, tasty, tastyGolden, transformers, traverseWithClass, typeEq
+, uniplate, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "haskell-names";
-  version = "0.3.3.2";
-  sha256 = "0dg31b9bm3p4fxajqk4wp29vlcbhcwm9f4hwc4f9pyhxv2s8i77p";
+  version = "0.4";
+  sha256 = "02cbs3bwakm9bwh4yy242msh5hibxfr9dsc6a0nbpihj1fhbv6b4";
   buildDepends = [
-    aeson Cabal dataLens dataLensTemplate filepath haskellPackages
-    haskellSrcExts hseCpp mtl tagged transformers traverseWithClass
-    typeEq uniplate
+    aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts
+    hseCpp mtl tagged transformers traverseWithClass typeEq uniplate
   ];
   testDepends = [
     aeson Cabal filemanip filepath haskellPackages haskellSrcExts

From 6412e24b6adfa0799b2ea4390ee6fb10354acf9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:50 +0200
Subject: [PATCH 1372/2033] haskell-haskell-src-meta: update to version 0.6.0.7

---
 .../libraries/haskell/haskell-src-meta/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
index cad077f7c9c..b54b1ff753d 100644
--- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "haskell-src-meta";
-  version = "0.6.0.5";
-  sha256 = "1cx3fkhmyhj18b4nm460xrcb1w53qw198gkqb38cjyafr2frlbyh";
+  version = "0.6.0.7";
+  sha256 = "0cxqh35cd2j6ljsmgjisgm9pn26rj01x43mkn9jk6qs1fbqspb4d";
   buildDepends = [ haskellSrcExts syb thOrphans uniplate ];
   jailbreak = true;
   meta = {

From 8403401120aa2b63522cb6c74517145b150ebcb8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:52 +0200
Subject: [PATCH 1373/2033] haskell-highlighting-kate: update to version
 0.5.8.1

---
 .../libraries/haskell/highlighting-kate/default.nix    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 497d1083f55..1604db4ec6a 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -1,12 +1,14 @@
-{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre }:
+{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre, utf8String }:
 
 cabal.mkDerivation (self: {
   pname = "highlighting-kate";
-  version = "0.5.6.1";
-  sha256 = "0hwzybihx5znd2z00kqcffqmng7vwynmav0x0zf2b9g415c2lx23";
+  version = "0.5.8.1";
+  sha256 = "10hbsra6ifjj765shf6x4c8kgb5bmv3zcgya3lcswvwa9xn78h9p";
   isLibrary = true;
   isExecutable = true;
-  buildDepends = [ blazeHtml filepath mtl parsec regexPcre ];
+  buildDepends = [
+    blazeHtml filepath mtl parsec regexPcre utf8String
+  ];
   jailbreak = true;
   prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
   meta = {

From c2dc0277be0fa04f292277f841b97d5a17b8a790 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:54 +0200
Subject: [PATCH 1374/2033] haskell-hint: update to version 0.4.2.0

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

diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix
index 09fdfe232a6..a29235d8512 100644
--- a/pkgs/development/libraries/haskell/hint/default.nix
+++ b/pkgs/development/libraries/haskell/hint/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hint";
-  version = "0.4.1.0";
-  sha256 = "1hc66yfzg9jrm5h3hd52rm4ca8ha0j93rhjpjh6hhzr4a40jv0pl";
+  version = "0.4.2.0";
+  sha256 = "08cq9zyyry7cxc30jmsdgrnvw6v2jbxnxcwcjs3bh77rds947mmd";
   buildDepends = [
     exceptions extensibleExceptions filepath ghcMtl ghcPaths mtl random
     utf8String

From ed4911dda0b7e1145f2b097d3f82fe4eda663690 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:56 +0200
Subject: [PATCH 1375/2033] haskell-instant-generics: update to version 0.4

---
 .../libraries/haskell/instant-generics/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix
index 61e580b6293..8337fe51655 100644
--- a/pkgs/development/libraries/haskell/instant-generics/default.nix
+++ b/pkgs/development/libraries/haskell/instant-generics/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "instant-generics";
-  version = "0.3.7";
-  sha256 = "0kkfx009ij3pwga7x18vr8p0ffhahlp8sb6ykzfh8rhcqd4ryzyv";
+  version = "0.4";
+  sha256 = "14z6135jvmry9b52p21cqnwgp2w0g6frh1fm7z5byph06xls9r7l";
   buildDepends = [ syb ];
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";

From 8da91d47a120802c1caa44a40e2f5770c4d45d89 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:57 +0200
Subject: [PATCH 1376/2033] haskell-irc: update to version 0.6.0.1

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

diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix
index 524c2de1f73..49f732e857c 100644
--- a/pkgs/development/libraries/haskell/irc/default.nix
+++ b/pkgs/development/libraries/haskell/irc/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "irc";
-  version = "0.6.0.0";
-  sha256 = "037hpdb4b6nb5w62w34alwybchzybz0bq2cgp0mv4xlw7bks2nqv";
+  version = "0.6.0.1";
+  sha256 = "0524phrxjv0i5qabrf4sj0zpcvkdvcivv1lg46591pmvndfhpyn4";
   buildDepends = [ attoparsec ];
   meta = {
     description = "A small library for parsing IRC messages";

From a5cc3d2391bca3b764891ae31ee040661bdded46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:08:59 +0200
Subject: [PATCH 1377/2033] haskell-leksah-server: update to version 0.13.1.0

---
 .../haskell/leksah/leksah-server.nix          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
index 1a907a384f1..a0d3fcc6a5c 100644
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
@@ -1,20 +1,21 @@
-{ cabal, attoparsec, attoparsecEnumerator, binary, binaryShared
-, Cabal, deepseq, enumerator, filepath, haddock, hslogger, HUnit
-, ltk, network, parsec, processLeksah, strict, time, transformers
+{ cabal, attoparsec, attoparsecConduit, binary, binaryShared, Cabal
+, conduit, deepseq, executablePath, filepath, haddock, hslogger
+, HUnit, ltk, network, parsec, processLeksah, strict, text, time
+, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "leksah-server";
-  version = "0.12.1.2";
-  sha256 = "0fzfyq1g1jrfl40nklgvkahlcv32m4gjbcyw52dky2qzc05b0g6m";
+  version = "0.13.1.0";
+  sha256 = "11dggg9zaf7fhh8s6bc3dwr4b1qk7k5bj429i1vvqhrxc6968yjb";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    attoparsec attoparsecEnumerator binary binaryShared Cabal deepseq
-    enumerator filepath haddock hslogger ltk network parsec
-    processLeksah strict time transformers
+    attoparsec attoparsecConduit binary binaryShared Cabal conduit
+    deepseq executablePath filepath haddock hslogger ltk network parsec
+    processLeksah strict text time transformers
   ];
-  testDepends = [ enumerator hslogger HUnit transformers ];
+  testDepends = [ conduit hslogger HUnit transformers ];
   meta = {
     homepage = "http://leksah.org";
     description = "Metadata collection for leksah";

From 52e746d9817e35368b5c293b055c1d1a07bdbcd6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:01 +0200
Subject: [PATCH 1378/2033] haskell-libsystemd-journal: update to version 1.2.0

---
 .../libraries/haskell/libsystemd-journal/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
index 67f336241ca..a7eadddac3d 100644
--- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
+++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "libsystemd-journal";
-  version = "1.1.0";
-  sha256 = "0zdql5y40d0d044mwbsr3xxmfzgnnp02a36wbbslxmrm5c3w1qi2";
+  version = "1.2.0";
+  sha256 = "10gsqcy5f7m6f0giqhfcqspb17b3gyib4cpw5nrdl7hiah13hi7x";
   buildDepends = [
     hashable hsyslog pipes pipesSafe text transformers uniplate
     unixBytestring unorderedContainers uuid vector

From f8c842660edd69ccb22442aaab634813aaf7f608 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:05 +0200
Subject: [PATCH 1379/2033] haskell-monad-control: update to version 0.3.3.0

---
 .../libraries/haskell/monad-control/default.nix        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix
index e9c6088b5f4..c865d964c54 100644
--- a/pkgs/development/libraries/haskell/monad-control/default.nix
+++ b/pkgs/development/libraries/haskell/monad-control/default.nix
@@ -1,12 +1,10 @@
-{ cabal, baseUnicodeSymbols, transformers, transformersBase }:
+{ cabal, transformers, transformersBase }:
 
 cabal.mkDerivation (self: {
   pname = "monad-control";
-  version = "0.3.2.3";
-  sha256 = "1fk3cqzsiwyjpyd20z1j0i4m669rcag2q7kpl78m6vm1a405iwlw";
-  buildDepends = [
-    baseUnicodeSymbols transformers transformersBase
-  ];
+  version = "0.3.3.0";
+  sha256 = "0vjff64iwnd9vplqfjyylbd900qmsr92h62hnh715wk06yacji7g";
+  buildDepends = [ transformers transformersBase ];
   meta = {
     homepage = "https://github.com/basvandijk/monad-control";
     description = "Lift control operations, like exception catching, through monad transformers";

From ae5ab1638b7e5bab954623a494335cc158ef955f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:07 +0200
Subject: [PATCH 1380/2033] haskell-monadLib: update to version 3.7.3

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

diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix
index 361e177aa01..a893eb6f4e4 100644
--- a/pkgs/development/libraries/haskell/monadlib/default.nix
+++ b/pkgs/development/libraries/haskell/monadlib/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monadLib";
-  version = "3.7.2";
-  sha256 = "01s7jfwzr4jmwz1k4bkxi38q8v364vg6fnn77n5v8zpbimcv3rds";
+  version = "3.7.3";
+  sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
   meta = {
     homepage = "http://wiki.github.com/yav/monadlib";
     description = "A collection of monad transformers";

From a29b9d25cae8f67ded722fd946eb2abdeee90ad0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:08 +0200
Subject: [PATCH 1381/2033] haskell-mono-traversable: update to version 0.6.0

---
 .../libraries/haskell/mono-traversable/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix
index 43dd75154ed..a296b3d310e 100644
--- a/pkgs/development/libraries/haskell/mono-traversable/default.nix
+++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "mono-traversable";
-  version = "0.5.0";
-  sha256 = "1dbsysg7r32ni15rvm21g41ivcgggns8nx9r797bbkid9n8fs1ja";
+  version = "0.6.0";
+  sha256 = "1ibf7iz24ic2vz0dvmbn5w06vz73g05ipl2q8f93a6zlkqysrkm4";
   buildDepends = [
     comonad dlist dlistInstances hashable semigroupoids semigroups text
     transformers unorderedContainers vector vectorAlgorithms

From 521b27f45ed26cc668adc250a15fbda31fc8ae12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:10 +0200
Subject: [PATCH 1382/2033] haskell-nats: update to version 0.2

---
 pkgs/development/libraries/haskell/nats/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix
index 93ff65db67f..74303667a07 100644
--- a/pkgs/development/libraries/haskell/nats/default.nix
+++ b/pkgs/development/libraries/haskell/nats/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, hashable }:
 
 cabal.mkDerivation (self: {
   pname = "nats";
-  version = "0.1.3";
-  sha256 = "1kh7wvgjqq39f0dp2pnbazvr1zp6anb1ksgx3q1m1x0qgxkj0xxz";
+  version = "0.2";
+  sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73";
+  buildDepends = [ hashable ];
   meta = {
     homepage = "http://github.com/ekmett/nats/";
     description = "Natural numbers";

From e85b9efe3f4ea14c397f0cba769502338dc3d050 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:14 +0200
Subject: [PATCH 1383/2033] haskell-operational: update to version 0.2.3.2

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

diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix
index f059f86d68f..2fbe5a7f210 100644
--- a/pkgs/development/libraries/haskell/operational/default.nix
+++ b/pkgs/development/libraries/haskell/operational/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "operational";
-  version = "0.2.2.1";
-  sha256 = "1w4bln8mj4hw5i40amah570p77wimxfpn7l2mmjk9z07zavx1rv2";
+  version = "0.2.3.2";
+  sha256 = "1aj3jhiyz4190b0qmyp684b8lbzrp8jn56s898892rvbp0hxa0pd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl random ];

From a83c84e370cf93d6dd35cbade97fdc6e7e3b4e2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:16 +0200
Subject: [PATCH 1384/2033] haskell-pandoc: update to version 1.12.4.2

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

diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix
index d6358708a3e..04738c0c00e 100644
--- a/pkgs/development/libraries/haskell/pandoc/default.nix
+++ b/pkgs/development/libraries/haskell/pandoc/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pandoc";
-  version = "1.12.4";
-  sha256 = "0dpvp630a5z7wp5a7q9f2i98vhv3c4m2acsb3qmw5ybs1awi3yry";
+  version = "1.12.4.2";
+  sha256 = "0ibzladj0xm0xnsphd26lzndxzkawz73pfd7rnlnmllqckrzairg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 4f52801b8b672ccc51dbf71201c23130c4249313 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:18 +0200
Subject: [PATCH 1385/2033] haskell-persistent: update to version 1.3.1.1

---
 .../libraries/haskell/persistent/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index b16c89dac70..dd37b96c2d8 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,5 +1,5 @@
 { cabal, aeson, attoparsec, base64Bytestring, blazeHtml
-, blazeMarkup, conduit, hspec, liftedBase, monadControl
+, blazeMarkup, conduit, exceptions, hspec, liftedBase, monadControl
 , monadLogger, pathPieces, resourcePool, resourcet, scientific
 , silently, sqlite, text, time, transformers, transformersBase
 , unorderedContainers, vector
@@ -7,12 +7,12 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "1.3.0.6";
-  sha256 = "0rj5yi8nziym9cb9c9vw6vdjflf2yfz02i39p6dsdy084f1ivpk8";
+  version = "1.3.1.1";
+  sha256 = "0na1mci7m8hzv40d5qc75dqdkw2kbw8i6xpjlpwgd1flznmqkdvx";
   buildDepends = [
     aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
-    liftedBase monadControl monadLogger pathPieces resourcePool
-    resourcet scientific silently text time transformers
+    exceptions liftedBase monadControl monadLogger pathPieces
+    resourcePool resourcet scientific silently text time transformers
     transformersBase unorderedContainers vector
   ];
   testDepends = [

From 7fbc69eb966e23e49a714ca086bfe86dcc6a21e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:19 +0200
Subject: [PATCH 1386/2033] haskell-pipes: update to version 4.1.2

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

diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix
index 3240f89d8ca..21f349768c0 100644
--- a/pkgs/development/libraries/haskell/pipes/default.nix
+++ b/pkgs/development/libraries/haskell/pipes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes";
-  version = "4.1.1";
-  sha256 = "1ib7vs4x8ckajlg3nz9lx2snnwj75by90fbv4znwhwgrhj4h13dn";
+  version = "4.1.2";
+  sha256 = "0prxk4qjdcmxjdvpi1bwql0s3l1kwlaz9sydr9swa8bc8ams3a11";
   buildDepends = [ mmorph mtl transformers ];
   testDepends = [
     mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers

From 60a116705620854d16f43cd275d058761a0de5ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:21 +0200
Subject: [PATCH 1387/2033] haskell-postgresql-libpq: update to version 0.9.0.1

---
 .../libraries/haskell/postgresql-libpq/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
index d630f063391..40acabad1cd 100644
--- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-libpq";
-  version = "0.9.0.0";
-  sha256 = "09bi0npvly02zjhp463bmzm1n8w1cqsln676z82xi2in86317pv3";
+  version = "0.9.0.1";
+  sha256 = "0fdz9pkmrajqm026s6d5ib9kqg5ph93fw7l2xrgf22zagl53rzx3";
   extraLibraries = [ postgresql ];
   meta = {
     homepage = "http://github.com/lpsmith/postgresql-libpq";

From ddb935096d70ef0cd555703540a64753296f7a7b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:23 +0200
Subject: [PATCH 1388/2033] haskell-profunctors: update to version 4.0.4

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

diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix
index 300d2e66f89..f8d2e727353 100644
--- a/pkgs/development/libraries/haskell/profunctors/default.nix
+++ b/pkgs/development/libraries/haskell/profunctors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "profunctors";
-  version = "4.0.3";
-  sha256 = "0rdr75nqzxaly47vnpbmska608k457dgpzi5wfcqhmw996kh5inh";
+  version = "4.0.4";
+  sha256 = "1hs6cs6y6zwf0c4jb92wnhp23qaxzw3xy7k07m9z98h8ziyqbqhx";
   buildDepends = [ comonad semigroupoids tagged transformers ];
   meta = {
     homepage = "http://github.com/ekmett/profunctors/";

From f02b8c91fdc71c48b7c9b6fea9caf5fcc08d0e35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:25 +0200
Subject: [PATCH 1389/2033] haskell-resource-pool: update to version 0.2.2.0

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

diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix
index 77bc9105193..677243190b1 100644
--- a/pkgs/development/libraries/haskell/resource-pool/default.nix
+++ b/pkgs/development/libraries/haskell/resource-pool/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resource-pool";
-  version = "0.2.1.1";
-  sha256 = "1ypyzy7mkmpab6rghsizrx6raam3l2acwxm56x7jmcv8s2algi1g";
+  version = "0.2.2.0";
+  sha256 = "0h00q6lmv21nqjs81r7y3ig4y65zpap1r6xqz9lc3zxx29bgl8xk";
   buildDepends = [
     hashable monadControl stm time transformers transformersBase vector
   ];

From 149dda252724dd84a0cde2602bd4e07ac44ba31e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:29 +0200
Subject: [PATCH 1390/2033] haskell-semigroups: update to version 0.14

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

diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix
index 22dfb5e8896..7b68d75c906 100644
--- a/pkgs/development/libraries/haskell/semigroups/default.nix
+++ b/pkgs/development/libraries/haskell/semigroups/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "semigroups";
-  version = "0.13.0.1";
-  sha256 = "12zd1pvggjj81hi7vm9z8fxcwsg6r2xbsg3qjs8snnybadi0qlfl";
+  version = "0.14";
+  sha256 = "07jmfb3h4kz3a2ysrkhzzpfdhxglszq6qqsmg2011f0hdzm24ay7";
   buildDepends = [ hashable nats text unorderedContainers ];
   meta = {
     homepage = "http://github.com/ekmett/semigroups/";

From 2ce311dac729301b17f2889717b153e1d1a91ccc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:31 +0200
Subject: [PATCH 1391/2033] haskell-shelly: update to version 1.5.3.1

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

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index f3885506d21..01f07ae6a08 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.3";
-  sha256 = "1s4j2jp0nflv1nn29f4x2j1vfjf2mimjz0ljy4hg9hn7jp028s8h";
+  version = "1.5.3.1";
+  sha256 = "0lhan549nkxihd94byaknswczlr757smha2fwq7y82rr0k16im4y";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers

From 9d2a9034912ba2e2a1943967d9871bb9335f1be7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:33 +0200
Subject: [PATCH 1392/2033] haskell-singletons: update to version 1.0

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

diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
index e233dc60cc0..77087279edf 100644
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "singletons";
-  version = "0.10.0";
-  sha256 = "14vnkw9ihrs3xg3lhb3wkyfz59lsaz4c3iqh3hqy7x9gmifgggwr";
+  version = "1.0";
+  sha256 = "1rd1728wghhqlg2djd7az8i01rf4i3wwwcnz2v43a39jjvhlklkg";
   buildDepends = [ mtl thDesugar ];
   testDepends = [ Cabal constraints filepath tasty tastyGolden ];
   noHaddock = true;

From b1bbb8f7bc1b180feb3337d08113fa8b8ea5471b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:34 +0200
Subject: [PATCH 1393/2033] haskell-streaming-commons: update to version
 0.1.2.4

---
 .../libraries/haskell/streaming-commons/default.nix    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index a6c5ce7ec60..f98e6a7b4a2 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -1,12 +1,14 @@
 { cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck
-, text, transformers, zlib
+, random, text, transformers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.2.3";
-  sha256 = "1f8lngnxx0ml7bph8lfx3azv6fh6gwm86yhb8i5v9ghnflblaxxs";
-  buildDepends = [ blazeBuilder network text transformers zlib ];
+  version = "0.1.2.4";
+  sha256 = "1wy1cdmx3fhxg9xb7v5r3nyyjhr7irvcwy3l4g6br671zh8j8kcg";
+  buildDepends = [
+    blazeBuilder network random text transformers zlib
+  ];
   testDepends = [
     async blazeBuilder deepseq hspec network QuickCheck text zlib
   ];

From cebd3d783ad336d7dd2c74bb344caf53e3692ade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:36 +0200
Subject: [PATCH 1394/2033] haskell-tasty-golden: update to version 2.2.1.1

---
 .../libraries/haskell/tasty-golden/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix
index f2fe7cfb0ad..159a5fd9eb8 100644
--- a/pkgs/development/libraries/haskell/tasty-golden/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix
@@ -1,13 +1,13 @@
 { cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty
-, temporary
+, temporaryRc
 }:
 
 cabal.mkDerivation (self: {
   pname = "tasty-golden";
-  version = "2.2.1";
-  sha256 = "1q3x3vmck1yq7bf96f3ah5nadahfxjd4wr3dfh3ls549yz40x668";
+  version = "2.2.1.1";
+  sha256 = "0a265l7fwc0sxzdy9b0jf8f5w4nws6pwhhaw1pa7qx3c8fm9v54i";
   buildDepends = [
-    deepseq filepath mtl optparseApplicative tagged tasty temporary
+    deepseq filepath mtl optparseApplicative tagged tasty temporaryRc
   ];
   meta = {
     homepage = "https://github.com/feuerbach/tasty-golden";

From b455a81f2202a73692ce2aa9e8493f6473672f5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:38 +0200
Subject: [PATCH 1395/2033] haskell-tasty-quickcheck: update to version 0.8.1

---
 .../libraries/haskell/tasty-quickcheck/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
index ee848359509..d4eb45eaa08 100644
--- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-quickcheck";
-  version = "0.8.0.3";
-  sha256 = "0dng415dsdg86rliwmz5hpn2111cn0x494c0vmdmzv5qgvx5naf6";
+  version = "0.8.1";
+  sha256 = "1diqc5dmddrfc6i0zqkmlnnhsv8paqy2fdmbx8484qa4ylk5r6bs";
   buildDepends = [ QuickCheck tagged tasty ];
   meta = {
     description = "QuickCheck support for the Tasty test framework";

From 2d891e031b122623e1f17dfae5e4d6a9e4f7a279 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:40 +0200
Subject: [PATCH 1396/2033] haskell-temporary: update to version 1.2.0.3

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

diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix
index 585eaf58682..4db5446bce0 100644
--- a/pkgs/development/libraries/haskell/temporary/default.nix
+++ b/pkgs/development/libraries/haskell/temporary/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "temporary";
-  version = "1.2.0.2";
-  sha256 = "1ynvhmc6b385sn8qw3sni3cwmz7pmppns546416xil9mhbiya87z";
+  version = "1.2.0.3";
+  sha256 = "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a";
   buildDepends = [ exceptions filepath transformers ];
   jailbreak = true;
   meta = {

From 2c462d0c1aec4e40ec3a031e22337031586bd2df Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:42 +0200
Subject: [PATCH 1397/2033] haskell-th-desugar: update to version 1.4.0

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

diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix
index 827828d6474..b8f47865424 100644
--- a/pkgs/development/libraries/haskell/th-desugar/default.nix
+++ b/pkgs/development/libraries/haskell/th-desugar/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-desugar";
-  version = "1.3.1";
-  sha256 = "1wi0c5d1w6vjjk580zhypgqnnkndcsx4cmx5qy01w97h6kyj8913";
+  version = "1.4.0";
+  sha256 = "0jadwqhk9dqnicg3p958a6cyfvl70amjc1hl7bhlygpxpdfffwad";
   buildDepends = [ mtl syb ];
   testDepends = [ hspec HUnit mtl syb ];
   meta = {

From 7cba5944b4b59cc5ee14b5cba59462be986563ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:43 +0200
Subject: [PATCH 1398/2033] haskell-thyme: update to version 0.3.5.0

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

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index e321f21b2ca..da736231221 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -1,15 +1,15 @@
 { cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl
 , profunctors, QuickCheck, random, systemPosixRedirect, text, time
-, vector, vectorSpace
+, vector, vectorSpace, vectorThUnbox
 }:
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.3.0";
-  sha256 = "0mpwwpc82xcdyawz87rcmvga1miw7cx538nnh379m2ibn0g71zaa";
+  version = "0.3.5.0";
+  sha256 = "0jc687hdxz97qjslminwqgj40pnnyhpfv73j6d8pmg064svdrg0q";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
-    time vector vectorSpace
+    time vector vectorSpace vectorThUnbox
   ];
   testDepends = [
     attoparsec Cabal filepath mtl profunctors QuickCheck random

From c26a3b338737c382c7882eb070339175d98addb3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:45 +0200
Subject: [PATCH 1399/2033] haskell-transformers-base: update to version 0.4.2

---
 .../libraries/haskell/transformers-base/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix
index e323905f81b..ea48a566dc0 100644
--- a/pkgs/development/libraries/haskell/transformers-base/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-base/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-base";
-  version = "0.4.1";
-  sha256 = "1d3w7k7smvdnnn4q6xpdhsj9zvj6372ihyhz4lrhdvgh72pfiaag";
+  version = "0.4.2";
+  sha256 = "030w5p209bam77z6grq6279qwvwip1ax7phrc5wanxrshiw8699m";
   buildDepends = [ transformers ];
   meta = {
     homepage = "https://github.com/mvv/transformers-base";

From 948a00ac49d391891d0dfb533f502e9b6ad97d79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:47 +0200
Subject: [PATCH 1400/2033] haskell-vacuum: update to version 2.2.0.0

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

diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix
index 8506e580502..fa37f089348 100644
--- a/pkgs/development/libraries/haskell/vacuum/default.nix
+++ b/pkgs/development/libraries/haskell/vacuum/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vacuum";
-  version = "2.1.0.1";
-  sha256 = "0gzh5v9mr0mgz9hxjnm8n3jcl2702wad7qaqaar1zc95lkabpf65";
+  version = "2.2.0.0";
+  sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
   extraLibraries = [ ghcPaths ];
   meta = {
     homepage = "http://thoughtpolice.github.com/vacuum";

From d198cd7f34b0781c42e8790516819ef73513eaa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:49 +0200
Subject: [PATCH 1401/2033] haskell-yesod-auth: update to version 1.3.0.5

---
 .../libraries/haskell/yesod-auth/default.nix  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix
index 182e6bcf5b2..ecea7b9f99d 100644
--- a/pkgs/development/libraries/haskell/yesod-auth/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix
@@ -1,23 +1,23 @@
-{ cabal, aeson, authenticate, base16Bytestring, blazeHtml
-, blazeMarkup, cryptohash, dataDefault, emailValidate, fileEmbed
-, hamlet, httpConduit, httpTypes, liftedBase, mimeMail, network
-, persistent, persistentTemplate, pwstoreFast, random, resourcet
-, safe, shakespeare, shakespeareCss, shakespeareJs, text, time
-, transformers, unorderedContainers, wai, yesodCore, yesodForm
-, yesodPersistent
+{ cabal, aeson, authenticate, base16Bytestring, base64Bytestring
+, binary, blazeHtml, blazeMarkup, byteable, cryptohash, dataDefault
+, emailValidate, fileEmbed, hamlet, httpConduit, httpTypes
+, liftedBase, mimeMail, network, persistent, persistentTemplate
+, random, resourcet, safe, shakespeare, shakespeareCss
+, shakespeareJs, text, time, transformers, unorderedContainers, wai
+, yesodCore, yesodForm, yesodPersistent
 }:
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "1.3.0.4";
-  sha256 = "0r4xhr9xg6n3jxpj3mrcaf4mgzz8h4is772k84sgnir5my9lrsr7";
+  version = "1.3.0.5";
+  sha256 = "03vwmc2hql07mfl2s7a3sry82x0y0icr1977p1ljfhinyh35zc6l";
   buildDepends = [
-    aeson authenticate base16Bytestring blazeHtml blazeMarkup
-    cryptohash dataDefault emailValidate fileEmbed hamlet httpConduit
-    httpTypes liftedBase mimeMail network persistent persistentTemplate
-    pwstoreFast random resourcet safe shakespeare shakespeareCss
-    shakespeareJs text time transformers unorderedContainers wai
-    yesodCore yesodForm yesodPersistent
+    aeson authenticate base16Bytestring base64Bytestring binary
+    blazeHtml blazeMarkup byteable cryptohash dataDefault emailValidate
+    fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network
+    persistent persistentTemplate random resourcet safe shakespeare
+    shakespeareCss shakespeareJs text time transformers
+    unorderedContainers wai yesodCore yesodForm yesodPersistent
   ];
   meta = {
     homepage = "http://www.yesodweb.com/";

From ee9b13b7518cb3a155136de805e4a67874b9d5b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:51 +0200
Subject: [PATCH 1402/2033] haskell-yesod-bin: update to version 1.2.9.3

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

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 0b64573d0ae..23eaa047f8e 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-bin";
-  version = "1.2.9.1";
-  sha256 = "0x7r960sq6r3lds0sgjvrp8z6b275iggr0isny0b6rz5ynwd6bcz";
+  version = "1.2.9.3";
+  sha256 = "1gjcg798d7xpd8hgz8s1napgxm9dnbsks1g1s5hgx8ml5xkp2la7";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 63a94f2941a7429febd4afd230c4a3d6c5d2b77a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:52 +0200
Subject: [PATCH 1403/2033] haskell-yesod-form: update to version 1.3.9

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

diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix
index a38751f9340..6744a230ca7 100644
--- a/pkgs/development/libraries/haskell/yesod-form/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-form/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-form";
-  version = "1.3.8.3";
-  sha256 = "0fw2hza78z3cv2d9laawi60vjd9msk7a6im3wsq3vbbfh6rh5br9";
+  version = "1.3.9";
+  sha256 = "1jq281avpw9x5nz6qn6zgc3fh76i48xh9pj980g53rx8ndg3g7x4";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable
     dataDefault emailValidate hamlet network persistent resourcet

From 2bc81759826eba4c053e5d6354e9a078276f2bcd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:54 +0200
Subject: [PATCH 1404/2033] haskell-cake3: update to version 0.5.0.0

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

diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix
index c5c35ac571c..f7b678ad9fb 100644
--- a/pkgs/development/tools/haskell/cake3/default.nix
+++ b/pkgs/development/tools/haskell/cake3/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cake3";
-  version = "0.4.0.0";
-  sha256 = "15v50m60fr2mgfm2irxfaw4pi2s3bx187p0y0ns20rqfy0dasxyx";
+  version = "0.5.0.0";
+  sha256 = "0hfnda0xp8saav85pgqmcb6ib699gm6gy5f087nlrx7058f4n7ji";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From c44c96a2a06c75d73dabd6a12c9662e2177c3dd1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:09:56 +0200
Subject: [PATCH 1405/2033] haskell-hasktags: update to version 0.69.0

---
 pkgs/development/tools/haskell/hasktags/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix
index 036c308a712..8942a1b79c2 100644
--- a/pkgs/development/tools/haskell/hasktags/default.nix
+++ b/pkgs/development/tools/haskell/hasktags/default.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self: {
   pname = "hasktags";
-  version = "0.68.7";
-  sha256 = "0z98ha2xjc6npcyn15arp6h6ad87bs4acdhd1rnqrsy4lc0lny04";
-  isLibrary = false;
+  version = "0.69.0";
+  sha256 = "1bba6w5h5a5frc899cdlxcyshiqdni6lcqby618akr1917ih1qh8";
+  isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath json utf8String ];
   meta = {

From 17b80ebf0699085e3ea003107e0ee2f052e2fca7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:12:02 +0200
Subject: [PATCH 1406/2033] haskell-HTTP: update to version 4000.2.15

---
 .../libraries/haskell/HTTP/4000.2.14.nix      | 24 -------------------
 .../libraries/haskell/HTTP/4000.2.15.nix      | 23 ++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++--
 3 files changed, 25 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
 create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.15.nix

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
deleted file mode 100644
index 1aaa048eefc..00000000000
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.14.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes
-, HUnit, mtl, network, parsec, pureMD5, split, testFramework
-, testFrameworkHunit, wai, warp
-}:
-
-cabal.mkDerivation (self: {
-  pname = "HTTP";
-  version = "4000.2.14";
-  sha256 = "1js5r3rpy5wx0h29qsd3sfazqj0svfdcv13nsvwqi9jnwik8041c";
-  buildDepends = [ mtl network parsec ];
-  testDepends = [
-    caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl
-    network pureMD5 split testFramework testFrameworkHunit wai warp
-  ];
-  jailbreak = true;
-  doCheck = false;
-  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
-  meta = {
-    homepage = "https://github.com/haskell/HTTP";
-    description = "A library for client-side HTTP";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
new file mode 100644
index 00000000000..2147cf5c417
--- /dev/null
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
@@ -0,0 +1,23 @@
+{ cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed
+, httpTypes, HUnit, mtl, network, parsec, pureMD5, split
+, testFramework, testFrameworkHunit, wai, warp
+}:
+
+cabal.mkDerivation (self: {
+  pname = "HTTP";
+  version = "4000.2.15";
+  sha256 = "1bw79hq5nzx1gab9p3d3szr0wkiv9zvf2ld9d4i48z6fnmil4qwj";
+  buildDepends = [ mtl network parsec ];
+  testDepends = [
+    caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes
+    HUnit mtl network pureMD5 split testFramework testFrameworkHunit
+    wai warp
+  ];
+  noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
+  meta = {
+    homepage = "https://github.com/haskell/HTTP";
+    description = "A library for client-side HTTP";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 21f1554c89a..168eb700165 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -981,8 +981,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
   HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix { network = self.network_2_4_1_2; };
   HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {};
-  HTTP_4000_2_14 = callPackage ../development/libraries/haskell/HTTP/4000.2.14.nix {};
-  HTTP = self.HTTP_4000_2_14;
+  HTTP_4000_2_15 = callPackage ../development/libraries/haskell/HTTP/4000.2.15.nix {};
+  HTTP = self.HTTP_4000_2_15;
 
   httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {};
 

From 63a69164d006a1dff4fd472cbdaefb5034e0822c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:13:12 +0200
Subject: [PATCH 1407/2033] haskell-transformers: update to version 0.4.1.0

---
 .../libraries/haskell/transformers/0.4.1.0.nix      | 13 +++++++++++++
 pkgs/top-level/haskell-defaults.nix                 |  2 +-
 pkgs/top-level/haskell-packages.nix                 |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/transformers/0.4.1.0.nix

diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
new file mode 100644
index 00000000000..88ae33de784
--- /dev/null
+++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "transformers";
+  version = "0.4.1.0";
+  sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg";
+  meta = {
+    description = "Concrete functor and monad transformers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index d45b6a1996e..62fd1dcc884 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -36,7 +36,7 @@
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_0_1; };
-    transformers = self.transformers_0_3_0_0;
+    transformers = self.transformers_0_4_1_0;
   };
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 168eb700165..1cd3948f929 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2192,6 +2192,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};
   transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};
+  transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {};
   transformers = null;          # core package since ghc >= 7.8.2
 
   transformersBase = callPackage ../development/libraries/haskell/transformers-base {};

From 9bc73e0f1e329bed1d6771d14be54edfeba8f768 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:14:59 +0200
Subject: [PATCH 1408/2033] haskell-binary: update to version 0.7.2.0

---
 .../haskell/binary/{0.7.1.0.nix => 0.7.2.0.nix}        |  4 ++--
 pkgs/top-level/haskell-defaults.nix                    | 10 +++++-----
 pkgs/top-level/haskell-packages.nix                    |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename pkgs/development/libraries/haskell/binary/{0.7.1.0.nix => 0.7.2.0.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/binary/0.7.1.0.nix b/pkgs/development/libraries/haskell/binary/0.7.2.0.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/binary/0.7.1.0.nix
rename to pkgs/development/libraries/haskell/binary/0.7.2.0.nix
index 245c80ef1cc..102206b5947 100644
--- a/pkgs/development/libraries/haskell/binary/0.7.1.0.nix
+++ b/pkgs/development/libraries/haskell/binary/0.7.2.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "binary";
-  version = "0.7.1.0";
-  sha256 = "16cb94z57ijw0q3h5p8jbvrv1vmnchsfjhrzvh3gdm3wf75fy8ln";
+  version = "0.7.2.0";
+  sha256 = "149pdhzjg9bhl66azgv0nmj3fy38s4klzk01vhzazngdiagfq6wn";
   testDepends = [
     Cabal filepath HUnit QuickCheck random testFramework
     testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 62fd1dcc884..ff1db4c5ab8 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -26,16 +26,16 @@
         haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
       };
     };
-    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_0_1; };
-    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_0_1; }; };
+    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_0; };
+    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_0; }; };
     criterion = super.criterion.override {
       statistics = self.statistics.override {
-        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_0_1; };
+        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_0; };
       };
     };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
-    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_0_1; };
+    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; };
     transformers = self.transformers_0_4_1_0;
   };
 
@@ -54,7 +54,7 @@
   };
 
   ghc704Prefs = self : super : ghc722Prefs self super // {
-    binary = self.binary_0_7_0_1;       # core package in ghc >= 7.2.2
+    binary = self.binary_0_7_2_0;       # core package in ghc >= 7.2.2
     haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; };
     HsSyck = self.HsSyck_0_51;
     jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 1cd3948f929..8df7cef6efa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -227,7 +227,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bimap = callPackage ../development/libraries/haskell/bimap {};
 
-  binary_0_7_0_1 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {};
+  binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {};
   binary = null;                # core package since ghc >= 7.2.x
 
   binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
@@ -269,7 +269,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
   bmp = callPackage ../development/libraries/haskell/bmp {
-    binary = self.binary_0_7_0_1;
+    binary = self.binary_0_7_2_0;
   };
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
@@ -1356,7 +1356,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {
-    binary = self.binary_0_7_0_1;
+    binary = self.binary_0_7_2_0;
   };
 
   mimeMail = callPackage ../development/libraries/haskell/mime-mail {};
@@ -2688,7 +2688,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   LambdaHack = callPackage ../games/LambdaHack {
     vectorBinaryInstances = self.vectorBinaryInstances.override {
-      binary = self.binary_0_7_0_1; # the miniutter build input requires this version
+      binary = self.binary_0_7_2_0; # the miniutter build input requires this version
     };
   };
 

From 9847b8d1480f2fabf8e0148525abc7e4f184032a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:16:23 +0200
Subject: [PATCH 1409/2033] haskell-mtl: update to version 2.2.0.1

---
 .../development/libraries/haskell/mtl/2.2.0.1.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-defaults.nix               |  2 ++
 pkgs/top-level/haskell-packages.nix               |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/mtl/2.2.0.1.nix

diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
new file mode 100644
index 00000000000..649ce516286
--- /dev/null
+++ b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix
@@ -0,0 +1,15 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "mtl";
+  version = "2.2.0.1";
+  sha256 = "0486cg4dp0p942zsg7yxpwn1jykx8p3gb794jaq0v3j44a7x00rb";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/mtl";
+    description = "Monad classes, using functional dependencies";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index ff1db4c5ab8..72a328ad69e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -15,6 +15,7 @@
   # Older compilers inherit the overrides from newer ones.
 
   ghcHEADPrefs = self : super : super // {
+    mtl = self.mtl_2_1_3_1;
   };
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
@@ -35,6 +36,7 @@
     };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
+    mtl = self.mtl_2_2_0_1;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; };
     transformers = self.transformers_0_4_1_0;
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8df7cef6efa..98e7ee84d2a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1431,7 +1431,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {};
   mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {};
   mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {};
-  mtl = self.mtl_2_1_3_1;
+  mtl_2_2_0_1 = callPackage ../development/libraries/haskell/mtl/2.2.0.1.nix {};
+  mtl = null; # tightly coupled with 'transformers' which is a core package
 
   mtlparse = callPackage ../development/libraries/haskell/mtlparse {};
 

From 51fc4fe84268561d5db8f9a8d121e3be94c516c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:17:12 +0200
Subject: [PATCH 1410/2033] haskell-primitive: update to version 0.5.3.0

---
 .../libraries/haskell/primitive/0.5.3.0.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.3.0.nix

diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
new file mode 100644
index 00000000000..a22ea14cd53
--- /dev/null
+++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "primitive";
+  version = "0.5.3.0";
+  sha256 = "11wfdnhrgb7606d5sywqzlvnhzf45a9ywl9wghysvmr0mq2iypvn";
+  meta = {
+    homepage = "https://github.com/haskell/primitive";
+    description = "Primitive memory-related operations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 98e7ee84d2a..28237d0c4e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1693,7 +1693,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {};
   primitive_0_5_2_1 = callPackage ../development/libraries/haskell/primitive/0.5.2.1.nix {};
-  primitive = self.primitive_0_5_2_1;
+  primitive_0_5_3_0 = callPackage ../development/libraries/haskell/primitive/0.5.3.0.nix {};
+  primitive = self.primitive_0_5_3_0;
 
   profunctors = callPackage ../development/libraries/haskell/profunctors {};
 

From 8d51acf74f5cfd3b76803652c9f2253c13d6376f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:18:00 +0200
Subject: [PATCH 1411/2033] haskell-text: update to version 1.1.1.2

---
 .../libraries/haskell/text/{1.1.1.1.nix => 1.1.1.2.nix}       | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/text/{1.1.1.1.nix => 1.1.1.2.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/text/1.1.1.1.nix b/pkgs/development/libraries/haskell/text/1.1.1.2.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/text/1.1.1.1.nix
rename to pkgs/development/libraries/haskell/text/1.1.1.2.nix
index b9cc3cf14ae..6054e3c6471 100644
--- a/pkgs/development/libraries/haskell/text/1.1.1.1.nix
+++ b/pkgs/development/libraries/haskell/text/1.1.1.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "text";
-  version = "1.1.1.1";
-  sha256 = "10d3j73cvjyhs8lcgzzalzwci42qf866iqvhyf7qik8ym793m4y9";
+  version = "1.1.1.2";
+  sha256 = "11kj0pf0v24a0xg61caaqz5d8w3s8i4nbgl416xgdvrbfd39ssj8";
   buildDepends = [ deepseq ];
   testDepends = [
     deepseq HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 28237d0c4e6..96a4c484e74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2132,8 +2132,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
   text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {};
   text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {};
-  text_1_1_1_1 = callPackage ../development/libraries/haskell/text/1.1.1.1.nix {};
-  text = self.text_1_1_1_1;
+  text_1_1_1_2 = callPackage ../development/libraries/haskell/text/1.1.1.2.nix {};
+  text = self.text_1_1_1_2;
 
   textFormat = callPackage ../development/libraries/haskell/text-format {};
 

From e50442a35bfb91e42135ecb2bab5e4c0daebe4f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:19:02 +0200
Subject: [PATCH 1412/2033] haskell-tls: update to version 1.2.7

---
 .../libraries/haskell/tls/{1.2.6.nix => 1.2.7.nix}            | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/tls/{1.2.6.nix => 1.2.7.nix} (92%)

diff --git a/pkgs/development/libraries/haskell/tls/1.2.6.nix b/pkgs/development/libraries/haskell/tls/1.2.7.nix
similarity index 92%
rename from pkgs/development/libraries/haskell/tls/1.2.6.nix
rename to pkgs/development/libraries/haskell/tls/1.2.7.nix
index 15019265f91..fbd9b048f06 100644
--- a/pkgs/development/libraries/haskell/tls/1.2.6.nix
+++ b/pkgs/development/libraries/haskell/tls/1.2.7.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.2.6";
-  sha256 = "16r60acz9q84dv91jms9qaqvc53r98761ap9ijj3pifizzxcyswi";
+  version = "1.2.7";
+  sha256 = "0f0zlyiw6bgqkhg0czlpqyz8jgb1zbgbpzpk73v5p7hsjffsblgs";
   buildDepends = [
     asn1Encoding asn1Types byteable cereal cipherAes cipherRc4
     cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 96a4c484e74..b10bf73c592 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2185,8 +2185,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
   tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_6 = callPackage ../development/libraries/haskell/tls/1.2.6.nix {};
-  tls = self.tls_1_2_6;
+  tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {};
+  tls = self.tls_1_2_7;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
     tls = self.tls_1_1_5;

From e62a8e5b828c45900a3beda22728fecf7215d484 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:19:55 +0200
Subject: [PATCH 1413/2033] haskell-hashable: update to version 1.2.2.0

---
 .../libraries/haskell/hashable/{1.2.1.0.nix => 1.2.2.0.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/hashable/{1.2.1.0.nix => 1.2.2.0.nix} (87%)

diff --git a/pkgs/development/libraries/haskell/hashable/1.2.1.0.nix b/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix
similarity index 87%
rename from pkgs/development/libraries/haskell/hashable/1.2.1.0.nix
rename to pkgs/development/libraries/haskell/hashable/1.2.2.0.nix
index 092a3f69156..2ae7f353992 100644
--- a/pkgs/development/libraries/haskell/hashable/1.2.1.0.nix
+++ b/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashable";
-  version = "1.2.1.0";
-  sha256 = "09m1glpcxm3f6s9cwz8xzljy6j0n271cym4d9dllw5rpzrwp9h2f";
+  version = "1.2.2.0";
+  sha256 = "08cfm1rzhf3d8dzn0iqadfs35151ff6szhnh4bwrpxcs6sq90fh3";
   buildDepends = [ text ];
   testDepends = [
     HUnit QuickCheck random testFramework testFrameworkHunit
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b10bf73c592..effbda08301 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -919,8 +919,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   happstackFastCGI = callPackage ../development/libraries/haskell/happstack/happstack-fastcgi.nix {};
 
   hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {};
-  hashable_1_2_1_0 = callPackage ../development/libraries/haskell/hashable/1.2.1.0.nix {};
-  hashable = self.hashable_1_2_1_0;
+  hashable_1_2_2_0 = callPackage ../development/libraries/haskell/hashable/1.2.2.0.nix {};
+  hashable = self.hashable_1_2_2_0;
 
   hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {};
 

From 413401f760528b0f300905ce49e8243594e02dff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 16:20:45 +0200
Subject: [PATCH 1414/2033] haskell-attoparsec: update to version 0.11.3.1

---
 .../haskell/attoparsec/{0.11.3.0.nix => 0.11.3.1.nix}  |  4 ++--
 pkgs/top-level/haskell-packages.nix                    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/libraries/haskell/attoparsec/{0.11.3.0.nix => 0.11.3.1.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix
rename to pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
index 2a46c5a6b8d..74920ea7b09 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.0.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.11.3.0";
-  sha256 = "1vnkm5pf0a381is4i0zyi41p4jv184lqpv1z9aadsnavpg0841qs";
+  version = "0.11.3.1";
+  sha256 = "0mmyab3a9mgmfxj1kc7xgxkmmcdj90ph9nzniv7bf2vyf8vhvirl";
   buildDepends = [ deepseq scientific text ];
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2 text
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index effbda08301..8aa4ac59de3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -190,8 +190,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   attoLisp = callPackage ../development/libraries/haskell/atto-lisp {};
 
   attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
-  attoparsec_0_11_3_0 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.0.nix {};
-  attoparsec = self.attoparsec_0_11_3_0;
+  attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
+  attoparsec = self.attoparsec_0_11_3_1;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
 
@@ -2372,10 +2372,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
   wreq = callPackage ../development/libraries/haskell/wreq {
-    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_0; };
-    attoparsec = self.attoparsec_0_11_3_0;
+    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; };
+    attoparsec = self.attoparsec_0_11_3_1;
     lens = self.lens.override {
-      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_0; };
+      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; };
     };
   };
 

From c7a09ba40aed90ae3371e7fec7172e718fe08890 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:27:49 +0200
Subject: [PATCH 1415/2033] haskell-free: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/free/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix
index ba2c09ff019..9d84bf87435 100644
--- a/pkgs/development/libraries/haskell/free/default.nix
+++ b/pkgs/development/libraries/haskell/free/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     bifunctors comonad distributive mtl preludeExtras profunctors
     semigroupoids semigroups transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ekmett/free/";
     description = "Monads for free";

From 19e56fafaf35158e5fc9ebd5c1114e42b37596eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:27:56 +0200
Subject: [PATCH 1416/2033] haskell-reducers: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/reducers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix
index 335cee497ea..7d7ad6d4917 100644
--- a/pkgs/development/libraries/haskell/reducers/default.nix
+++ b/pkgs/development/libraries/haskell/reducers/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     comonad fingertree hashable keys pointed semigroupoids semigroups
     text transformers unorderedContainers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ekmett/reducers/";
     description = "Semigroups, specialized containers and a general map/reduce framework";

From f0b034f13d00ee79327368d33c50c837da4233a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:28:03 +0200
Subject: [PATCH 1417/2033] haskell-pointed: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/pointed/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
index 15f4ba59aaa..65048ca757c 100644
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ b/pkgs/development/libraries/haskell/pointed/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     comonad dataDefaultClass semigroupoids semigroups stm tagged
     transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ekmett/pointed/";
     description = "Pointed and copointed data";

From 6a46d71832d4e4d300e5f339cdbf2310ded0b434 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:28:08 +0200
Subject: [PATCH 1418/2033] haskell-keys: jailbreak to fix build with
 transformers 0.4.x

---
 pkgs/development/libraries/haskell/keys/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix
index b657f3dd6b9..570c88b1fbd 100644
--- a/pkgs/development/libraries/haskell/keys/default.nix
+++ b/pkgs/development/libraries/haskell/keys/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     comonad free semigroupoids semigroups transformers
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/ekmett/keys/";
     description = "Keyed functors and containers";

From 8f7bfaca4d09e794f6ef5595a96dcbc35b960fad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:29:51 +0200
Subject: [PATCH 1419/2033] haskell-attoparsec: jailbreak to fix build with
 scientific 0.3.x

---
 pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
index 74920ea7b09..84e7f6147a7 100644
--- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
   testDepends = [
     QuickCheck testFramework testFrameworkQuickcheck2 text
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/bos/attoparsec";
     description = "Fast combinator parsing for bytestrings and text";

From cd134371207d086671382b17822fa88499b7c9f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:32:14 +0200
Subject: [PATCH 1420/2033] haskell-aeson: jailbreak to fix build with
 scientific 0.3.x

---
 pkgs/development/libraries/haskell/aeson/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix
index 9672111dc42..7c8dd42c005 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/default.nix
@@ -16,6 +16,9 @@ cabal.mkDerivation (self: {
     attoparsec HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text time unorderedContainers vector
   ];
+  patchPhase = ''
+    sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal
+  '';
   meta = {
     homepage = "https://github.com/bos/aeson";
     description = "Fast JSON parsing and encoding";

From e048994d58b0c1bb3387ea938958c7439786bedd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:39:56 +0200
Subject: [PATCH 1421/2033] haskell-defaults.nix: stick to transformers 0.3.x

---
 pkgs/top-level/haskell-defaults.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 72a328ad69e..65cd02e132b 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -36,9 +36,8 @@
     };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
-    mtl = self.mtl_2_2_0_1;
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; };
-    transformers = self.transformers_0_4_1_0;
+    transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
   };
 
   ghc742Prefs = self : super : ghc763Prefs self super // {

From 728ea66754d34b7ef6814ac3f33599596cd5529f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:53:05 +0200
Subject: [PATCH 1422/2033] haskell-enummapset: jailbreak to fix build with
 recent versions of containers

---
 pkgs/development/libraries/haskell/enummapset/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix
index c43c246557b..2bd953e65e8 100644
--- a/pkgs/development/libraries/haskell/enummapset/default.nix
+++ b/pkgs/development/libraries/haskell/enummapset/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.5.2.0";
   sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js";
   buildDepends = [ deepseq ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/michalt/enummapset";
     description = "IntMap and IntSet with Enum keys/elements";

From 53ecf3fe1724b08c2c71074bcf5a8692a2e66e87 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:54:59 +0200
Subject: [PATCH 1423/2033] haskell-modular-arithmetic: require ghc >7.8

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 65cd02e132b..79d58e91e34 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -36,6 +36,7 @@
     };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
+    modularArithmetic = null;           # requires base >= 4.7
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; };
     transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
   };

From 8baf727bad4252923b643177e04b4b0292e798d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:56:16 +0200
Subject: [PATCH 1424/2033] haskell-yap: jailbreak to fix build with recent
 versions of 'base'

---
 pkgs/development/libraries/haskell/yap/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix
index ab162988c95..e21948de974 100644
--- a/pkgs/development/libraries/haskell/yap/default.nix
+++ b/pkgs/development/libraries/haskell/yap/default.nix
@@ -4,6 +4,7 @@ cabal.mkDerivation (self: {
   pname = "yap";
   version = "0.2";
   sha256 = "14lq549jhgnf51pgy1jv31ik8qx71yl7d53w8dpq1f9mlsn1g16i";
+  jailbreak = true;
   meta = {
     description = "yet another prelude - a simplistic refactoring with algebraic classes";
     license = self.stdenv.lib.licenses.bsd3;

From 14958391df931b605c2093881af6fd7ef79ce458 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 19:58:36 +0200
Subject: [PATCH 1425/2033] haskell-multiset: drop obsolete version 0.2.1

---
 .../libraries/haskell/multiset/0.2.1.nix            | 13 -------------
 .../haskell/multiset/{0.2.2.nix => default.nix}     |  0
 pkgs/top-level/haskell-packages.nix                 |  4 +---
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/multiset/0.2.1.nix
 rename pkgs/development/libraries/haskell/multiset/{0.2.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/multiset/0.2.1.nix b/pkgs/development/libraries/haskell/multiset/0.2.1.nix
deleted file mode 100644
index 9f85317505c..00000000000
--- a/pkgs/development/libraries/haskell/multiset/0.2.1.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "multiset";
-  version = "0.2.1";
-  sha256 = "0snlm6s9ikf5gngdwb7rm7v6017f5bffajv6777y56pjmd7bk9sy";
-  meta = {
-    description = "The Data.MultiSet container type";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/multiset/0.2.2.nix b/pkgs/development/libraries/haskell/multiset/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/multiset/0.2.2.nix
rename to pkgs/development/libraries/haskell/multiset/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8aa4ac59de3..3da37133dc6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1446,9 +1446,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   multirec = callPackage ../development/libraries/haskell/multirec {};
 
-  multiset_0_2_1 = callPackage ../development/libraries/haskell/multiset/0.2.1.nix {};
-  multiset_0_2_2 = callPackage ../development/libraries/haskell/multiset/0.2.2.nix {};
-  multiset = self.multiset_0_2_2;
+  multiset = callPackage ../development/libraries/haskell/multiset {};
 
   murmurHash = callPackage ../development/libraries/haskell/murmur-hash {};
 

From 0611807038c7355efad34729cca26147613c32e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 20:05:46 +0200
Subject: [PATCH 1426/2033] haskell-lifted-base: update to version 0.2.2.2

The test suite must be disabled because it depends on transformers 0.4.x, which
we cannot provide because it's a core package that no compiler ships yet.
---
 .../libraries/haskell/lifted-base/default.nix       | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix
index 9dd46754164..cc8781ae1e1 100644
--- a/pkgs/development/libraries/haskell/lifted-base/default.nix
+++ b/pkgs/development/libraries/haskell/lifted-base/default.nix
@@ -1,18 +1,17 @@
-{ cabal, baseUnicodeSymbols, HUnit, monadControl, testFramework
-, testFrameworkHunit, transformers, transformersBase
+{ cabal, HUnit, monadControl, testFramework, testFrameworkHunit
+, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "lifted-base";
-  version = "0.2.2.1";
-  sha256 = "13w1y67wng5rv90fsikkwpvx2ajmq5ybnxrx9b2x0y0zbcy7pzk8";
-  buildDepends = [
-    baseUnicodeSymbols monadControl transformersBase
-  ];
+  version = "0.2.2.2";
+  sha256 = "02qjagh4a3zvad7xyvwjd6nkh44c41bqj32ddpn7ms1fv4sl0mam";
+  buildDepends = [ monadControl transformersBase ];
   testDepends = [
     HUnit monadControl testFramework testFrameworkHunit transformers
     transformersBase
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/basvandijk/lifted-base";
     description = "lifted IO operations from the base library";

From 07479ee66422ced2d1d32514d4c4fba1826a7732 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 20:07:26 +0200
Subject: [PATCH 1427/2033] haskell-fay-text: update to version 0.3.0.2

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

diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix
index ff2ba21187e..c8d9188d421 100644
--- a/pkgs/development/libraries/haskell/fay-text/default.nix
+++ b/pkgs/development/libraries/haskell/fay-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay-text";
-  version = "0.3.0.1";
-  sha256 = "1bwsnhrj94j8jks5nhb0al8mymcgn2lp1pj9q7n935ygkzsaasbm";
+  version = "0.3.0.2";
+  sha256 = "12hgamqbrflmnr3ri0ajvzf6al5nn4adcdmv6ag6h5mrsik2sklf";
   buildDepends = [ fay fayBase text ];
   meta = {
     homepage = "https://github.com/faylang/fay-text";

From b8f0602b5cae509770fb7b00fdb5541da7b0c6ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 22:30:54 +0200
Subject: [PATCH 1428/2033] haskell-HTTP: don't run the test suite, it fails
 real bad

---
 pkgs/development/libraries/haskell/HTTP/4000.2.15.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
index 2147cf5c417..8e51ad6d2b5 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.2.15.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     HUnit mtl network pureMD5 split testFramework testFrameworkHunit
     wai warp
   ];
+  doCheck = false;
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11";
   meta = {
     homepage = "https://github.com/haskell/HTTP";

From 268433f6e51e8d90c44f2551823e4674bb9c404f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 22:35:40 +0200
Subject: [PATCH 1429/2033] haskell-these: jailbreak to fix build with recent
 semigroups

---
 pkgs/development/libraries/haskell/these/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix
index 4962ace783c..f41f8a4f302 100644
--- a/pkgs/development/libraries/haskell/these/default.nix
+++ b/pkgs/development/libraries/haskell/these/default.nix
@@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
     bifunctors mtl profunctors semigroupoids semigroups transformers
     vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/isomorphism/these";
     description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";

From ced64472771b439396b756c35d86c4167b8f15d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 15 May 2014 22:45:03 +0200
Subject: [PATCH 1430/2033] haskell-highlighting-kate: update jailbreaking code

---
 .../libraries/haskell/highlighting-kate/default.nix            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
index 1604db4ec6a..0f984c50e5f 100644
--- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix
+++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix
@@ -9,8 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     blazeHtml filepath mtl parsec regexPcre utf8String
   ];
-  jailbreak = true;
-  prePatch = "sed -i -e 's|regex-pcre-builtin|regex-pcre|' highlighting-kate.cabal";
+  prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal";
   meta = {
     homepage = "http://github.com/jgm/highlighting-kate";
     description = "Syntax highlighting";

From 6ce3c69cf8225bcd145b832198e2a647d5095a9b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:27:48 +0200
Subject: [PATCH 1431/2033] haskell-acid-state: update to version 0.12.2

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

diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix
index 8b9bce21d73..066532d117a 100644
--- a/pkgs/development/libraries/haskell/acid-state/default.nix
+++ b/pkgs/development/libraries/haskell/acid-state/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "acid-state";
-  version = "0.12.1";
-  sha256 = "0smqhj4layckdsm8xjz1rwgpcqwm5xj2vr8g4i463vgq776fl0q6";
+  version = "0.12.2";
+  sha256 = "0hwi2254bj84djxmah23vy3xw8binh75fsn8ac6y89rwc8i35w1f";
   buildDepends = [
     cereal extensibleExceptions filepath mtl network safecopy stm
   ];

From 07cfcbd1d07445cf4fff1a4ab4cf6e88c15654a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:27:55 +0200
Subject: [PATCH 1432/2033] haskell-active: update to version 0.1.0.14

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

diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix
index 4de6f255196..b9488bbcf61 100644
--- a/pkgs/development/libraries/haskell/active/default.nix
+++ b/pkgs/development/libraries/haskell/active/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "active";
-  version = "0.1.0.13";
-  sha256 = "12ljr12xj1kpj5llxfyigwf6340m17bx56a6qmrn580fshic670z";
+  version = "0.1.0.14";
+  sha256 = "0ibigflx3krmf7gw0zqmqx73rw1p62cwjyl26rxbj5vzbl3bdb4g";
   buildDepends = [ newtype semigroupoids semigroups vectorSpace ];
   testDepends = [
     newtype QuickCheck semigroupoids semigroups vectorSpace

From 48dde3b7cda1e8dec03a6e3970585a6738f3855e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:27:58 +0200
Subject: [PATCH 1433/2033] haskell-diagrams-contrib: update to version 1.1.1.5

---
 pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index aca28a02490..4cbe8b7c193 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.1.1.4";
-  sha256 = "0n2r6k65kxvk5mwm193yhzwnj3bhignq4xdslfpv2m1afdvws2y1";
+  version = "1.1.1.5";
+  sha256 = "1165qq5pzj3vr8f6545hpa5ri8jy43r1ydmimzy7xg9iynjgxass";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec

From 5d89ce7db55d8b7211a04ece9391ada0f2c62865 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:00 +0200
Subject: [PATCH 1434/2033] haskell-diagrams-core: update to version 1.1.0.3

---
 pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index eb9207a936f..8c6a87b7e05 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.1.0.2";
-  sha256 = "1py1dk6w6f00kd48kxbdbxmd3rakxdmwgpb09g346vmkbxkj56mq";
+  version = "1.1.0.3";
+  sha256 = "0kl4bc5mvly227rzalzy9q6ki321drcdfsjqriv3ac70qmcfqyma";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints

From f19d74e207876cda83e2e237d4c52e538208bf88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:01 +0200
Subject: [PATCH 1435/2033] haskell-diagrams-lib: update to version 1.1.0.7

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index fd839e42857..775553bc2a4 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.1.0.6";
-  sha256 = "125krfaf73k2m73scnjdl0d76acwc6n9vhvvaqxxy1ln57caqh5x";
+  version = "1.1.0.7";
+  sha256 = "0ad5105aa2ds0hrx0184jhvzw1mw5l659hx745rsyl8wyi5yrcy7";
   buildDepends = [
     active colour dataDefaultClass diagramsCore filepath fingertree
     hashable intervals lens MemoTrie monoidExtras optparseApplicative

From 4f877f923590da99099de41fa5b05e9494845745 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:03 +0200
Subject: [PATCH 1436/2033] haskell-dual-tree: update to version 0.2.0.3

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

diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix
index 7b2023c0812..120fac409f0 100644
--- a/pkgs/development/libraries/haskell/dual-tree/default.nix
+++ b/pkgs/development/libraries/haskell/dual-tree/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dual-tree";
-  version = "0.2.0.2";
-  sha256 = "0w0kfzij22209slddyzr2g77khcgpv4ridhvkgl8z3d5sp7ggby1";
+  version = "0.2.0.3";
+  sha256 = "17l0jjxi8lj17hbn73wg252gdpbnp81aay7xlmx42g99pj377bmb";
   buildDepends = [ monoidExtras newtype semigroups ];
   jailbreak = true;
   meta = {

From cb4d80b4f4ac33d56b45cbcd6527e8c52e10c4d8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:04 +0200
Subject: [PATCH 1437/2033] haskell-errors: update to version 1.4.7

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

diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix
index 7207bfbb185..21ed85bb91f 100644
--- a/pkgs/development/libraries/haskell/errors/default.nix
+++ b/pkgs/development/libraries/haskell/errors/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "errors";
-  version = "1.4.6";
-  sha256 = "1h8va76rhvs76ljdccxbmb659qk1slzkal118m85bw6lpy5wv6fi";
+  version = "1.4.7";
+  sha256 = "09g53dylwsw1phxq5zhkbq8pnpwqzipvqclmcrdypzkpwkmfncl7";
   buildDepends = [ either safe transformers ];
   jailbreak = true;
   meta = {

From 7926c20ca5820788417820d6678769e60e15c0e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:06 +0200
Subject: [PATCH 1438/2033] haskell-fb: update to version 1.0.1

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

diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix
index 89f8a2121f8..02f9f03588a 100644
--- a/pkgs/development/libraries/haskell/fb/default.nix
+++ b/pkgs/development/libraries/haskell/fb/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fb";
-  version = "1.0";
-  sha256 = "1pkjpzhdysq5vn302wipz62w6v9fibpvd4smaylv8wgn09si91ji";
+  version = "1.0.1";
+  sha256 = "0xhwv8fmhb1an15fnfjxzq0ijnhxxmfjwzd99dq1lsm0f7gd4hfi";
   buildDepends = [
     aeson attoparsec base16Bytestring base64Bytestring cereal conduit
     conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault

From 9fe86905b5d182579818d4449d1272a545fa7b3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:07 +0200
Subject: [PATCH 1439/2033] haskell-ghc-mod: update to version 4.1.1

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

diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index feaf0c9be6e..b83d9de4552 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "4.1.0";
-  sha256 = "18vzcpafdxai9k8lxaiw9g9mf964ipjwil6kvw50gj1lfgvjlfqm";
+  version = "4.1.1";
+  sha256 = "0jsm881khbpa316rvka2ixzmm4kim7w9gbriz94m08b3yj3f00q9";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 1f136e3b8c27ff6d5cc8c5ba66dee829822d8e80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:09 +0200
Subject: [PATCH 1440/2033] haskell-lens: update to version 4.1.2.1

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

diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix
index 1c1fe9b7cd3..8576ed1d804 100644
--- a/pkgs/development/libraries/haskell/lens/default.nix
+++ b/pkgs/development/libraries/haskell/lens/default.nix
@@ -10,8 +10,8 @@
 
 cabal.mkDerivation (self: {
   pname = "lens";
-  version = "4.1.2";
-  sha256 = "0jpr78bn7bh5v11vw21hjwzmwpzl1zgyq9l3yk3k711vz6689dg2";
+  version = "4.1.2.1";
+  sha256 = "1fi6960m2rvr538mwhrxavvrj8pvjnyw3akcbgaaph5p8f214alw";
   buildDepends = [
     aeson bifunctors comonad contravariant distributive exceptions
     filepath free hashable mtl parallel primitive profunctors

From d4c25a3d497afc04506277a5719ab4c1c50d6032 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:10 +0200
Subject: [PATCH 1441/2033] haskell-monoid-extras: update to version 0.3.3.3

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

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index b9987255c0f..e3be47f16a0 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.3.3.2";
-  sha256 = "0v4xir47ki83f9w2rii06w3jwrvqljnbiivgh6k8jxl0bdfslh11";
+  version = "0.3.3.3";
+  sha256 = "0i4c2yn0kbkqi478x93r2xvl05l4r3x7nyjd47zy3r4bb38qwj89";
   buildDepends = [ groups semigroupoids semigroups ];
   jailbreak = true;
   meta = {

From 9ec6a526918794e89cd59454541414661c4ea843 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:12 +0200
Subject: [PATCH 1442/2033] haskell-ncurses: update to version 0.2.10

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

diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix
index b4e48f6e432..2b566f79a98 100644
--- a/pkgs/development/libraries/haskell/ncurses/default.nix
+++ b/pkgs/development/libraries/haskell/ncurses/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "ncurses";
-  version = "0.2.8";
-  sha256 = "0i8kbi8q0l6vka5i64aanhsid2yf8w2fj3fk33y7bv7kl791hynp";
+  version = "0.2.10";
+  sha256 = "0qdw5dwi1w42nygvzyq8la7i917f0fz9qjw6ivgl2h1rjxc5j9cb";
   buildDepends = [ text transformers ];
   buildTools = [ c2hs ];
   extraLibraries = [ ncurses ];

From beb5d5fb84062730c4348e5c5b81b3369381e32b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:14 +0200
Subject: [PATCH 1443/2033] haskell-pipes-safe: update to version 2.2.0

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

diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix
index c1d5a603da0..2e664631f1f 100644
--- a/pkgs/development/libraries/haskell/pipes-safe/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-safe";
-  version = "2.1.0";
-  sha256 = "0qm02hwmrqlncnlxix7mdgzbf0mzally4k7ydwg06nqi35bb7s3j";
+  version = "2.2.0";
+  sha256 = "1m44a2pbws73jbr2ca48i94mrfwzlsibyc22i2w3fqq159qfg6ca";
   buildDepends = [ exceptions pipes transformers ];
   meta = {
     description = "Safety for the pipes ecosystem";

From 25747d8ca96e8d756165c2f0d5d5c7b5093cd1a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:15 +0200
Subject: [PATCH 1444/2033] haskell-postgresql-simple: update to version
 0.4.2.2

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 20222609cff..b9783089987 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.4.2.1";
-  sha256 = "1547n7rh0gsrjaa8f9lc4diljpps09kdf0gkm0cjf1gk2kr7lh94";
+  version = "0.4.2.2";
+  sha256 = "0ipwpggzgqsi8ii12pk4c1bmwv2y5yj6yvyh8ma9rsz9f081bzyy";
   buildDepends = [
     aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq
     scientific text time transformers uuid vector

From 65b6ac1d67561283f80a75f1c99c1ac07db48e65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:17 +0200
Subject: [PATCH 1445/2033] haskell-safecopy: update to version 0.8.3

---
 .../libraries/haskell/safecopy/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix
index c700ff0df3d..5d761c69349 100644
--- a/pkgs/development/libraries/haskell/safecopy/default.nix
+++ b/pkgs/development/libraries/haskell/safecopy/default.nix
@@ -1,10 +1,15 @@
-{ cabal, cereal, text, time }:
+{ cabal, cereal, lens, quickcheckInstances, tasty, tastyQuickcheck
+, text, time, vector
+}:
 
 cabal.mkDerivation (self: {
   pname = "safecopy";
-  version = "0.8.2";
-  sha256 = "0l2kqymsxv244fahxcpxlrspk6xipz3br6j854ipbfh8b0bfvr4m";
-  buildDepends = [ cereal text time ];
+  version = "0.8.3";
+  sha256 = "10xd42a1i84fwiy3db0ji4bd8ssk9jqysqwc00wdcdjyp50c333n";
+  buildDepends = [ cereal text time vector ];
+  testDepends = [
+    cereal lens quickcheckInstances tasty tastyQuickcheck time vector
+  ];
   meta = {
     homepage = "http://acid-state.seize.it/safecopy";
     description = "Binary serialization with version control";

From cdbaa41f24cb6c6a8b734b87c65d10749bdbe189 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:18 +0200
Subject: [PATCH 1446/2033] haskell-thyme: update to version 0.3.5.1

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

diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix
index da736231221..c127116ffca 100644
--- a/pkgs/development/libraries/haskell/thyme/default.nix
+++ b/pkgs/development/libraries/haskell/thyme/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "thyme";
-  version = "0.3.5.0";
-  sha256 = "0jc687hdxz97qjslminwqgj40pnnyhpfv73j6d8pmg064svdrg0q";
+  version = "0.3.5.1";
+  sha256 = "0v3aq7zv4fnkjhfc7mm6vx2wb5dh2npf2lsgpvcrdpy5zlfsrx50";
   buildDepends = [
     aeson attoparsec deepseq mtl profunctors QuickCheck random text
     time vector vectorSpace vectorThUnbox

From 1f1fa7cac498e6de5fecf8a9e98d580bef2c6f84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:20 +0200
Subject: [PATCH 1447/2033] haskell-vcs-revision: update to version 0.0.2

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

diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix
index a1cd2783931..64402ea8464 100644
--- a/pkgs/development/libraries/haskell/vcs-revision/default.nix
+++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vcs-revision";
-  version = "0.0.1";
-  sha256 = "1zfv9b02ml8622kz755azhi4ajyxrqniiachd92znfrry4n8z1mn";
+  version = "0.0.2";
+  sha256 = "1lp1wf440n7kinmxz7la0gyfqfdlip6f0bn8pmwkxd1dqyrvg5cg";
   meta = {
     description = "Facilities for accessing the version control revision of the current directory";
     license = self.stdenv.lib.licenses.bsd3;

From 26b568149bf8350f14c68554c2c1eef0f755addd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:21 +0200
Subject: [PATCH 1448/2033] haskell-vector-th-unbox: update to version 0.2.1.0

---
 .../development/libraries/haskell/vector-th-unbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
index db328836616..b9da8408c55 100644
--- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
+++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector-th-unbox";
-  version = "0.2.0.2";
-  sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp";
+  version = "0.2.1.0";
+  sha256 = "0r8yxj63hvkm923y8mk1b5kv1b15lqadxhlncc02glvmy8zf1prh";
   buildDepends = [ vector ];
   testDepends = [ dataDefault vector ];
   meta = {

From 1d14076943944ebb5cb9840ca39f0dd88ff76484 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:23 +0200
Subject: [PATCH 1449/2033] haskell-splot: update to version 0.3.12

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

diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix
index 4e99a1e68cd..987715a9cf8 100644
--- a/pkgs/development/tools/haskell/splot/default.nix
+++ b/pkgs/development/tools/haskell/splot/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "splot";
-  version = "0.3.11";
-  sha256 = "0mpyfmafjjcf85v740h69p5mggyqsq3li8m1fa5c0z4rdd0395an";
+  version = "0.3.12";
+  sha256 = "0xk5p2ikrzrmhvl69cl36sskcqgfnhxbbdlyp7bzl5pny0l0h9in";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From d31052058e938779f1be3ecf91a0762b79f771fb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 May 2014 21:28:24 +0200
Subject: [PATCH 1450/2033] haskell-timeplot: update to version 1.0.25

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

diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix
index 84444522d19..6ae2b40b081 100644
--- a/pkgs/development/tools/haskell/timeplot/default.nix
+++ b/pkgs/development/tools/haskell/timeplot/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "timeplot";
-  version = "1.0.24";
-  sha256 = "1k6xinnnc0723mbf0yvqn6qipjr3hcvy2qjv38sy7f5h0gp8lfhc";
+  version = "1.0.25";
+  sha256 = "14zyzr53gpp0i7wx49zzdrndqdhsw3q4z3w5hdl8c4m541pr25fw";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 4ac818601e5b38c2be4add23a2932810f977210b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 16 May 2014 22:54:20 +0200
Subject: [PATCH 1451/2033] blender: fix build and minor update to 2.70a

It seems it needs to explicitly know python version in case of 3.4.
---
 pkgs/applications/misc/blender/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 2e9cf46bf86..0435cf66271 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.70";
+  name = "blender-2.70a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0j73yfpavcrzg5v54kcha7sig6179g5ykrlhih8d288pnb5c7596";
+    sha256 = "1rgkijn1nirj3jwh058zv6piw8q4j5wwjapgbvh2hh6fpbj84bgb";
   };
 
   buildInputs = [
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     "-DPYTHON_LIBRARY=python${python.majorVersion}m"    
     "-DPYTHON_LIBPATH=${python}/lib"
     "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
+    "-DPYTHON_VERSION=${python.majorVersion}"
   ];
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";

From d04c84d0ac45d98c081487d8eb6a493b89a0f26d Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Fri, 16 May 2014 23:28:19 +0200
Subject: [PATCH 1452/2033] Recode: Build on OS X

---
 pkgs/tools/text/recode/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 8a15d0b9b56..21b35682e4e 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
     substituteInPlace src/Makefile.am --replace "ansi2knr" ""
 
     autoreconf -fi
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    export LDFLAGS=-lintl
   '';
 
   #doCheck = true; # doesn't work yet

From b1dbafbdbb6caf638e272d57e1a77fdb6db63862 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 17 May 2014 00:02:22 -0300
Subject: [PATCH 1453/2033] Mednafen: add version 0.9.34.1 + server 0.5.1

Mednafen is a portable, CLI-driven, multi-system emulator
---
 pkgs/misc/emulators/mednafen/default.nix | 36 ++++++++++++++++++++++++
 pkgs/misc/emulators/mednafen/server.nix  | 25 ++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/misc/emulators/mednafen/default.nix
 create mode 100644 pkgs/misc/emulators/mednafen/server.nix

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
new file mode 100644
index 00000000000..786ed21decc
--- /dev/null
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig
+, libX11, mesa, freeglut
+, jackaudio, libcdio, libsndfile, libsamplerate
+, SDL, SDL_net, zlib
+}:
+
+stdenv.mkDerivation rec {
+
+  name = "mednafen-${version}";
+  version = "0.9.34.1";
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/mednafen/files/Mednafen/${version}/${name}.tar.bz2";
+    sha256 = "1d783ws5rpx6r8qk1l9nksx3kahbalis606psk4067bvfzy7kjb9";
+  };
+
+  buildInputs = with stdenv.lib;
+  [ libX11 mesa freeglut jackaudio libcdio libsndfile libsamplerate SDL SDL_net zlib ];
+  
+  nativeBuildInputs = [ pkgconfig ];
+
+  # Install docs
+  postInstall = ''
+    mkdir -p $out/share/doc/$name
+    cd Documentation
+    install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt
+  '';
+
+  meta = {
+    description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
+    homepage = http://mednafen.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
new file mode 100644
index 00000000000..316a59ab679
--- /dev/null
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+
+  name = "mednafen-server-${version}";
+  version = "0.5.1";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}-${version}.tar.gz";
+    sha256="0c5wvg938y3h4n5lb0dl8pvmjzphhkbba34r6ikpvdahq166ps4j";
+  };
+
+  postInstall = ''
+    mkdir -p $out/share/$name 
+    install -m 644 -t $out/share/$name standard.conf
+  '';
+
+  meta = {
+    description = "Netplay server for Mednafen";
+    homepage = http://mednafen.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c14b89a2a..7919cf2c2d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1438,6 +1438,10 @@ let
     inherit (gnome) scrollkeeper;
   };
 
+  mednafen = callPackage ../misc/emulators/mednafen { };
+
+  mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
+
   megacli = callPackage ../tools/misc/megacli { };
 
   megatools = callPackage ../tools/networking/megatools { };

From 5445132f73cbc4ce8b3a9847a7ab917a7b1dbf4d Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 17 May 2014 00:45:16 -0400
Subject: [PATCH 1454/2033] fix -G delimiter in call to useradd

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

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index e7afb518157..873b6fb424d 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -480,7 +480,7 @@ in {
           if ! id "${u.name}" &>/dev/null; then
             ${pkgs.shadow}/sbin/useradd \
               -g "${u.group}" \
-              -G "${toString u.extraGroups}" \
+              -G "${concatStringsSep "," u.extraGroups}" \
               -s "${u.shell}" \
               -d "${u.home}" \
               ${optionalString u.isSystemUser "--system"} \

From 137eae0b55949bcfd6a2f4ba12964db8bdfae954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 May 2014 07:27:29 +0200
Subject: [PATCH 1455/2033] Merge #2630: add and use fetchpatch

fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
---
 pkgs/applications/video/gnash/default.nix     |  6 +-
 pkgs/build-support/fetchpatch/default.nix     | 22 +++++
 .../libraries/haskell/HSH/default.nix         |  4 +-
 .../libraries/haskell/gitit/default.nix       | 11 +--
 .../tools/haskell/BNFC/default.nix            |  4 +-
 pkgs/development/tools/parsing/alex/3.0.5.nix |  4 +-
 pkgs/servers/x11/xorg/overrides.nix           |  4 +-
 pkgs/tools/text/patchutils/default.nix        |  7 +-
 .../tools/text/patchutils/drop-comments.patch | 84 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 10 files changed, 131 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/build-support/fetchpatch/default.nix
 create mode 100644 pkgs/tools/text/patchutils/drop-comments.patch

diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index ef40d614a39..2e8b7e63cb8 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , SDL, SDL_mixer, gstreamer, gst_plugins_base, gst_plugins_good
 , gst_ffmpeg, speex
 , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
@@ -11,9 +11,9 @@
 assert stdenv ? glibc;
 
 let version = "0.8.10";
-    patch_CVE = fetchurl {
+    patch_CVE = fetchpatch {
       url = "http://git.savannah.gnu.org/cgit/gnash.git/patch/?id=bb4dc77eecb6ed1b967e3ecbce3dac6c5e6f1527";
-      sha256 = "1g7ymbq9vxi0mwcgs2dpyd2sf30gaam7blza0ywiwj32f5wk62v1";
+      sha256 = "0ghnki5w7xf3qwfl1x6vhijpd6q608niyxrvh0g8dw5xavkvallk";
       name = "CVE-2012-1175.patch";
     };
 in
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
new file mode 100644
index 00000000000..768d173934d
--- /dev/null
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -0,0 +1,22 @@
+# This function downloads and normalizes a patch/diff file.
+# This is primarily useful for dynamically generated patches,
+# such as GitHub's or cgit's, where the non-significant content parts
+# often change with updating of git or cgit.
+# stripLen acts as the -p parameter when applying a patch.
+
+{ fetchurl, patchutils }:
+{ stripLen ? 0, ... }@args:
+
+fetchurl ({
+  postFetch = ''
+    tmpfile="$TMPDIR/${args.sha256}"
+    "${patchutils}/bin/lsdiff" "$out" \
+      | sort -u | sed -e 's/[*?]/\\&/g' \
+      | xargs -I{} \
+        "${patchutils}/bin/filterdiff" \
+        --include={} \
+        --strip=${toString stripLen} \
+        --clean "$out" > "$tmpfile"
+    mv "$tmpfile" "$out"
+  '';
+} // args)
diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix
index 107e3df979b..bcc29781210 100644
--- a/pkgs/development/libraries/haskell/HSH/default.nix
+++ b/pkgs/development/libraries/haskell/HSH/default.nix
@@ -1,5 +1,5 @@
 { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat
-, regexPosix, fetchurl
+, regexPosix, fetchpatch
 }:
 
 cabal.mkDerivation (self: {
@@ -11,7 +11,7 @@ cabal.mkDerivation (self: {
   buildDepends = [
     filepath hslogger MissingH mtl regexBase regexCompat regexPosix
   ];
-  patches = [ (fetchurl { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0fw2ihl4hlncggwf3v4d7aydm3rzgzpcxplfbwq7janysix4q950"; }) ];
+  patches = [ (fetchpatch { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0ddb3vf8ipf37zg4hkqh0frff1a7sv9ils3lw6qd3irpbwna1hdz"; }) ];
   meta = {
     homepage = "http://software.complete.org/hsh";
     description = "Library to mix shell scripting with Haskell programs";
diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix
index 69f611cfe74..6c30ca18b88 100644
--- a/pkgs/development/libraries/haskell/gitit/default.nix
+++ b/pkgs/development/libraries/haskell/gitit/default.nix
@@ -2,7 +2,7 @@
 , filepath, filestore, ghcPaths, happstackServer, highlightingKate
 , hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
 , pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
-, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchurl
+, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchpatch
 }:
 
 cabal.mkDerivation (self: {
@@ -19,10 +19,11 @@ cabal.mkDerivation (self: {
     zlib
   ];
   jailbreak = true;
-  patches = [ (fetchurl { url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch";
-                          sha256 = "0xdg9frr8lany8ry6vj4vpskmhkpww8jswnb05pzl8a4xfqxh9gd";
-                        })
-            ];
+  patches = [ (fetchpatch {
+      url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch";
+      sha256 = "16n372wrikwb3g4pb3zljxnp19in0828wp40diqgkplhlnwww6nw";
+    })
+  ];
   preConfigure = ''
     sed -i -e 's|network .*< 2.5|network|' gitit.cabal
   '';
diff --git a/pkgs/development/tools/haskell/BNFC/default.nix b/pkgs/development/tools/haskell/BNFC/default.nix
index ebe8d2c3e24..f335aebc570 100644
--- a/pkgs/development/tools/haskell/BNFC/default.nix
+++ b/pkgs/development/tools/haskell/BNFC/default.nix
@@ -1,4 +1,4 @@
-{ cabal, mtl, fetchurl, alex, happy }:
+{ cabal, mtl, fetchpatch, alex, happy }:
 
 cabal.mkDerivation (self: {
   pname = "BNFC";
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ mtl ];
   buildTools = [ alex happy ];
-  patches = [ (fetchurl { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "103l04ylzswgxrmpv5zy6dd0jyr96z21mdkpgk1z4prvn8wjl624"; }) ];
+  patches = [ (fetchpatch { url = "https://github.com/BNFC/bnfc/pull/3.patch"; sha256 = "1i87crwva5m3v095lv3zxs38pr6nmly58krlr6sxpwnakpr0pxsp"; }) ];
   patchFlags = "-p2";
   preConfigure = "runhaskell Setup.lhs clean";
   meta = {
diff --git a/pkgs/development/tools/parsing/alex/3.0.5.nix b/pkgs/development/tools/parsing/alex/3.0.5.nix
index f85aa42d165..c4458f7b829 100644
--- a/pkgs/development/tools/parsing/alex/3.0.5.nix
+++ b/pkgs/development/tools/parsing/alex/3.0.5.nix
@@ -1,4 +1,4 @@
-{ cabal, fetchurl, perl, QuickCheck }:
+{ cabal, fetchpatch, perl, QuickCheck }:
 
 cabal.mkDerivation (self: {
   pname = "alex";
@@ -8,7 +8,7 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [ QuickCheck ];
   buildTools = [ perl ];
-  patches = [ (fetchurl { url="https://github.com/simonmar/alex/pull/21.patch"; sha256="0apv3rk00gwkf5rqw3467bg6pnamr07zdksbp9khhzzi73k9aq4f"; }) ];
+  patches = [ (fetchpatch { url="http://github.com/simonmar/alex/pull/21.patch"; sha256="050psfwmjlxhyxiy65jsn3v6b9rnfzy8x5q9mmhzwbirqwi0zkfm"; }) ];
   meta = {
     homepage = "http://www.haskell.org/alex/";
     description = "Alex is a tool for generating lexical analysers in Haskell";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3f591cb7c0e..bb97eadef46 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -178,9 +178,9 @@ in
   };
 
   xf86videonv = attrs: attrs // {
-    patches = [( args.fetchurl {
+    patches = [( args.fetchpatch {
       url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da;
-      sha256 = "0ikbnz6048ygs1qahb6ylnxkyjhfjcqr2gm9bk95ca90v57j7i0f";
+      sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw";
     })];
   };
 
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 50232c5a41d..4df52eef669 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -8,10 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
   };
 
-  meta = {
+  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
+
+  meta = with stdenv.lib; {
     description = "Tools to manipulate patch files";
     homepage = http://cyberelk.net/tim/software/patchutils;
-    license = "GPLv2";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
     executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
       "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
       "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
diff --git a/pkgs/tools/text/patchutils/drop-comments.patch b/pkgs/tools/text/patchutils/drop-comments.patch
new file mode 100644
index 00000000000..e02693a5683
--- /dev/null
+++ b/pkgs/tools/text/patchutils/drop-comments.patch
@@ -0,0 +1,84 @@
+From 58987954647f51dc42fb13b7759923c6170dd905 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@redhat.com>
+Date: Fri, 9 May 2014 16:23:27 +0100
+Subject: Make --clean drop comments after '@@' lines as well (trac #29).
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 99ad2a3..f3c6dbc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -198,6 +198,7 @@ TESTS = tests/newline1/run-test \
+ 	tests/convert1/run-test \
+ 	tests/convert2/run-test \
+ 	tests/clean1/run-test \
++	tests/clean2/run-test \
+ 	tests/stdin/run-test
+ 
+ # These ones don't work yet.
+diff --git a/src/filterdiff.c b/src/filterdiff.c
+index 383e72b..6ca2316 100644
+--- a/src/filterdiff.c
++++ b/src/filterdiff.c
+@@ -2,7 +2,7 @@
+  * filterdiff - extract (or exclude) a diff from a diff file
+  * lsdiff - show which files are modified by a patch
+  * grepdiff - show files modified by a patch containing a regexp
+- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh <twaugh@redhat.com>
++ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013, 2014 Tim Waugh <twaugh@redhat.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -408,7 +408,8 @@ do_unified (FILE *f, char *header[2], int match, char **line,
+ 							 " Hunk #%lu, %s",
+ 							 hunknum, bestname);
+ 
+-					fputs (trailing, output_to);
++					fputs (clean_comments ? "\n" : trailing,
++					       output_to);
+ 					break;
+ 				case Before:
+ 					// Note the initial line number
+diff --git a/tests/clean2/run-test b/tests/clean2/run-test
+new file mode 100755
+index 0000000..42320df
+--- /dev/null
++++ b/tests/clean2/run-test
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# This is a filterdiff(1) testcase.
++# Test: Make sure --clean removes hunk-level comments.
++
++
++. ${top_srcdir-.}/tests/common.sh
++
++cat << EOF > diff
++non-diff line
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@ this is a hunk-level comment
+++a
++EOF
++
++${FILTERDIFF} --clean diff 2>errors >filtered || exit 1
++[ -s errors ] && exit 1
++
++cat << EOF | cmp - filtered || exit 1
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@
+++a
++EOF
++
++${FILTERDIFF} --clean -x file1 diff 2>errors >filtered || exit 1
++[ -s errors ] && exit 1
++cat << EOF | cmp - filtered || exit 1
++--- a/file1
+++++ b/file1
++@@ -0,0 +1 @@
+++a
++EOF
+-- 
+cgit v0.10.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c14b89a2a..b3ee044e9b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -327,6 +327,8 @@ let
 
   fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {});
 
+  fetchpatch = callPackage ../build-support/fetchpatch { };
+
   fetchsvn = import ../build-support/fetchsvn {
     inherit stdenv subversion openssh;
     sshSupport = true;
@@ -6778,7 +6780,7 @@ let
   xinetd = callPackage ../servers/xinetd { };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-    inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
+    inherit fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
       dbus libuuid openssl gperf m4
       autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman;

From b8ca39e2f2f97fec47aaad7c1f5f582f1c347a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 17 May 2014 11:01:57 +0200
Subject: [PATCH 1456/2033] cgit: improve a comment

---
 .../version-management/git-and-tools/cgit/default.nix        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 47fa80cb901..fb7232794c5 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -12,10 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0bci1p9spf79wirc4lk36cndcx2b9wj0fq1l58rlp6r563is77l3";
   };
 
-  # cgit is is tightly coupled with git and needs a git source tree to build.
-  # The cgit-0.10 Makefile has GIT_VER = 1.8.5, so use that version.
+  # cgit is tightly coupled with git and needs a git source tree to build.
   # IMPORTANT: Remember to check which git version cgit needs on every version
-  # bump.
+  # bump (look in the Makefile).
   # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
   # 1.9.2 (see the repository history)
   gitSrc = fetchurl {

From f77e2dcb387637aea3a304c404867d27f91bccb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 May 2014 12:14:52 +0200
Subject: [PATCH 1457/2033] mupdf: fix patch hash by fetchpatch

Thanks to @kirelagin for reporting on IRC.
---
 pkgs/applications/misc/mupdf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index ef7571f5d14..81bd9e1e97e 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
+{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
 stdenv.mkDerivation rec {
   name = "mupdf-1.3";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0y247nka5gkr1ajn47jrlp5rcnf6h4ff7dfsprma3h4wxqdv7a5b";
   };
 
-  patches = [(fetchurl {
+  patches = [(fetchpatch {
     name = "CVE-2014-2013.patch";
     url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;"
       + "h=60dabde18d7fe12b19da8b509bdfee9cc886aafc";
-    sha256 = "1walj3wir9x50i6lph33bx14c8593r9xrn08gkd3v7r6d15lmjps";
+    sha256 = "0p721f3g2djz9fy6rcgj83c20f5k257wg2d0yvvmp02m7sp06l0g";
   })];
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];

From a0ae412a10c5b7bbbcec6523f192b6b52c1222ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 17 May 2014 12:28:33 +0200
Subject: [PATCH 1458/2033] virtualbox: update 4.3.10 -> 4.3.12

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 266ab11a39f..682e7159ac8 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.3.10"; # changes ./guest-additions as well
+  version = "4.3.12"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,13 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "93012";
+  extpackRevision = "93733";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a";
+    sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b";
+    sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5fc75590417..f168c0d5725 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae";
+    sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From c9887ca4894f70116f39489d6a368572c4f33632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 11:47:42 +0200
Subject: [PATCH 1459/2033] cabal-install: use native Cabal version when
 compiling with GHC 7.9.x

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 79d58e91e34..0c93774741a 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -16,9 +16,11 @@
 
   ghcHEADPrefs = self : super : super // {
     mtl = self.mtl_2_1_3_1;
+    cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; };
   };
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
+    cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; };
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {

From 4505378424770db5ea23a22802c581c3af004d74 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 11:57:33 +0200
Subject: [PATCH 1460/2033] haskell-platform-2012.4.0.0: fix incorrect version
 of 'network'

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

diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
index efe33d6a265..b222df29b5a 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix
@@ -50,7 +50,7 @@ let
       GLUT                      = self.GLUT_2_1_2_1;
       haskellSrc                = self.haskellSrc_1_0_1_5;
       html                      = self.html_1_0_1_2;
-      HTTP                      = self.HTTP_4000_2_5;
+      HTTP                      = super.HTTP_4000_2_5.override { network = self.network_2_3_1_0; };
       HUnit                     = self.HUnit_1_2_5_1;
       mtl                       = self.mtl_2_1_2;
       network                   = self.network_2_3_1_0;

From 499f49f392aa19d61253072df383f3d2cc5de24b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 12:17:10 +0200
Subject: [PATCH 1461/2033] binary: fix build with ghc 6.10.4

---
 .../libraries/haskell/binary/0.6.1.0.nix            | 13 +++++++++++++
 pkgs/top-level/haskell-defaults.nix                 |  1 +
 pkgs/top-level/haskell-packages.nix                 |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/binary/0.6.1.0.nix

diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix
new file mode 100644
index 00000000000..f378b8d7c41
--- /dev/null
+++ b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "binary";
+  version = "0.6.1.0";
+  sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js";
+  meta = {
+    homepage = "https://github.com/kolmodin/binary";
+    description = "Binary serialisation for Haskell values using lazy ByteStrings";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 0c93774741a..5ccfeff9372 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -79,6 +79,7 @@
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
     alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
     Cabal = self.Cabal_1_16_0_3;
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3da37133dc6..48b092b783f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -227,6 +227,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   bimap = callPackage ../development/libraries/haskell/bimap {};
 
+  binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {};
   binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {};
   binary = null;                # core package since ghc >= 7.2.x
 

From edeffd7c4938a354d1c9c57347e23b2e190826c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 12:25:23 +0200
Subject: [PATCH 1462/2033] haskell-DrIFT: add version 2.4.2

---
 pkgs/development/tools/haskell/DrIFT/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-defaults.nix              |  1 +
 pkgs/top-level/haskell-packages.nix              |  2 ++
 3 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/DrIFT/default.nix

diff --git a/pkgs/development/tools/haskell/DrIFT/default.nix b/pkgs/development/tools/haskell/DrIFT/default.nix
new file mode 100644
index 00000000000..f0ae57b6287
--- /dev/null
+++ b/pkgs/development/tools/haskell/DrIFT/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filepath, random }:
+
+cabal.mkDerivation (self: {
+  pname = "DrIFT";
+  version = "2.4.2";
+  sha256 = "1w0wfmrjifidl2qz998ig07afd4p6yp890lwl8as57bay490nakl";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ filepath random ];
+  meta = {
+    homepage = "http://repetae.net/computer/haskell/DrIFT/";
+    description = "Program to derive type class instances";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 5ccfeff9372..3c5d50835ea 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -52,6 +52,7 @@
 
   ghc722Prefs = self : super : ghc742Prefs self super // {
     deepseq = self.deepseq_1_3_0_2;
+    DrIFT = null;                       # doesn't compile with old GHC versions
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     haddock = self.haddock_2_9_4;
     syb = self.syb_0_4_0;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 48b092b783f..4b577eddaf2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2523,6 +2523,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cpphs = callPackage ../development/tools/misc/cpphs {};
 
+  DrIFT = callPackage ../development/tools/haskell/DrIFT {};
+
   haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix { Cabal = null; };
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix { alex = self.alex_2_3_5; };
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};

From e2d1b8c60b50c23c8fbddc460481fedd6ae109c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 12:33:13 +0200
Subject: [PATCH 1463/2033] leksah: remove broken package

---
 pkgs/applications/editors/leksah/default.nix  | 28 -------------------
 .../haskell/leksah/leksah-server.nix          | 26 -----------------
 .../haskell/leksah/process-leksah.nix         | 14 ----------
 .../libraries/haskell/ltk/default.nix         | 17 -----------
 pkgs/top-level/haskell-packages.nix           |  8 ------
 5 files changed, 93 deletions(-)
 delete mode 100644 pkgs/applications/editors/leksah/default.nix
 delete mode 100644 pkgs/development/libraries/haskell/leksah/leksah-server.nix
 delete mode 100644 pkgs/development/libraries/haskell/leksah/process-leksah.nix
 delete mode 100644 pkgs/development/libraries/haskell/ltk/default.nix

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
deleted file mode 100644
index 86f0106ed05..00000000000
--- a/pkgs/applications/editors/leksah/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ cabal, binary, binaryShared, Cabal, deepseq, enumerator, filepath
-, gio, glib, gtk, gtksourceview2, hslogger, leksahServer, ltk, mtl
-, network, parsec, QuickCheck, regexBase, regexTdfa, strict, text
-, time, transformers, utf8String
-}:
-
-cabal.mkDerivation (self: {
-  pname = "leksah";
-  version = "0.12.1.3";
-  sha256 = "1w61wnd0nq9iqh0pwn9dz3m4qn3m0zasv0m3ki4k7plcdrmkqb3y";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    binary binaryShared Cabal deepseq enumerator filepath gio glib gtk
-    gtksourceview2 hslogger leksahServer ltk mtl network parsec
-    QuickCheck regexBase regexTdfa strict text time transformers
-    utf8String
-  ];
-  testDepends = [ Cabal QuickCheck ];
-  noHaddock = true;
-  meta = {
-    homepage = "http://www.leksah.org";
-    description = "Haskell IDE written in Haskell";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix
deleted file mode 100644
index a0d3fcc6a5c..00000000000
--- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ cabal, attoparsec, attoparsecConduit, binary, binaryShared, Cabal
-, conduit, deepseq, executablePath, filepath, haddock, hslogger
-, HUnit, ltk, network, parsec, processLeksah, strict, text, time
-, transformers
-}:
-
-cabal.mkDerivation (self: {
-  pname = "leksah-server";
-  version = "0.13.1.0";
-  sha256 = "11dggg9zaf7fhh8s6bc3dwr4b1qk7k5bj429i1vvqhrxc6968yjb";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    attoparsec attoparsecConduit binary binaryShared Cabal conduit
-    deepseq executablePath filepath haddock hslogger ltk network parsec
-    processLeksah strict text time transformers
-  ];
-  testDepends = [ conduit hslogger HUnit transformers ];
-  meta = {
-    homepage = "http://leksah.org";
-    description = "Metadata collection for leksah";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix
deleted file mode 100644
index b8f0ed37d4c..00000000000
--- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal, filepath }:
-
-cabal.mkDerivation (self: {
-  pname = "process-leksah";
-  version = "1.0.1.4";
-  sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv";
-  buildDepends = [ filepath ];
-  meta = {
-    description = "Process libraries";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/ltk/default.nix b/pkgs/development/libraries/haskell/ltk/default.nix
deleted file mode 100644
index df1e4be218f..00000000000
--- a/pkgs/development/libraries/haskell/ltk/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, Cabal, filepath, glib, gtk3, mtl, parsec, transformers }:
-
-cabal.mkDerivation (self: {
-  pname = "ltk";
-  version = "0.13.1.0";
-  sha256 = "09ryyzjd3iazwiw714hsny2b9f4b1cfhyzc11k5xzin5kh5d804a";
-  buildDepends = [
-    Cabal filepath glib gtk3 mtl parsec transformers
-  ];
-  meta = {
-    homepage = "http://www.leksah.org";
-    description = "Leksah tool kit";
-    license = "GPL";
-    platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4b577eddaf2..abc09192bb3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1256,8 +1256,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {};
 
-  leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {};
-
   lens = callPackage ../development/libraries/haskell/lens {};
 
   lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {};
@@ -1318,8 +1316,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   lrucache = callPackage ../development/libraries/haskell/lrucache {};
 
-  ltk = callPackage ../development/libraries/haskell/ltk {};
-
   lockfreeQueue = callPackage ../development/libraries/haskell/lockfree-queue {};
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
@@ -1705,8 +1701,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   processExtras = callPackage ../development/libraries/haskell/process-extras {};
 
-  processLeksah = callPackage ../development/libraries/haskell/leksah/process-leksah.nix {};
-
   prolog = callPackage ../development/libraries/haskell/prolog {};
   prologGraphLib = callPackage ../development/libraries/haskell/prolog-graph-lib {};
   prologGraph = callPackage ../development/libraries/haskell/prolog-graph {};
@@ -2590,8 +2584,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   idris = callPackage ../development/compilers/idris/wrapper.nix {};
 
-  leksah = callPackage ../applications/editors/leksah {};
-
   nc-indicators = callPackage ../applications/misc/nc-indicators {};
 
   sloane = callPackage ../applications/science/math/sloane {};

From 79250d01e9dcb2d807c623beeac9d5cb0129a78b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 May 2014 12:58:37 +0200
Subject: [PATCH 1464/2033] haskell-fclabels: update to version 2.0.1.1

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

diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix
index f9c7663e321..26029ed2c21 100644
--- a/pkgs/development/libraries/haskell/fclabels/default.nix
+++ b/pkgs/development/libraries/haskell/fclabels/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fclabels";
-  version = "2.0.1";
-  sha256 = "0gx0vqdxx797zh69xy2s62kyfsp9m48dfpbjykllg4fsk0x60wav";
+  version = "2.0.1.1";
+  sha256 = "1r798fbdk4xzw649la9disnk1kngy3cmzbi3k8afiy8q6v1fbpwh";
   buildDepends = [ mtl transformers ];
   meta = {
     homepage = "https://github.com/sebastiaanvisser/fclabels";

From d9cf90651633b508ef6c05a40113d53b407f9e01 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 17 May 2014 13:23:20 +0200
Subject: [PATCH 1465/2033] Propagate SDL_mixer's build inputs, because
 otherwise every dependent package must add libvorbis etc. to its buildInputs
 which is inconvenient

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

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 6d29ddf6eea..06e174371c7 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8";
   };
 
-  buildInputs = [SDL2 libogg libvorbis];
+  propagatedBuildInputs = [SDL2 libogg libvorbis];
 
   configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl";
 

From fec634c25aaca599a087933774303251f9a87451 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 May 2014 16:14:07 +0400
Subject: [PATCH 1466/2033] mupdf: build with -fpic

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 81bd9e1e97e..1ea2db812a4 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preBuild = ''
-    export makeFlags="prefix=$out build=release"
+    export makeFlags="prefix=$out build=release XCFLAGS=-fpic"
     export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
   '';
 

From a422c021b66a6dbf21dd3b425ef3d19ea4606671 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 May 2014 16:14:42 +0400
Subject: [PATCH 1467/2033] mupdf: build a shared library instead

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

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 1ea2db812a4..a89735c093f 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -19,12 +19,42 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  my_soname = "libmupdf.so.1.3";
+  my_soname_js_none = "libmupdf-js-none.so.1.3";
   preBuild = ''
     export makeFlags="prefix=$out build=release XCFLAGS=-fpic"
     export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) "
+
+    # Copied from Gentoo ebuild
+    rm -rf thirdparty
+    sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+     -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+     -e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
+     -e "\$a\$(MUPDF_JS_NONE_LIB):" \
+     -e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+     -e "/^MUPDF_JS_NONE_LIB :=/s:=.*:= \$(OUT)/${my_soname_js_none}:" \
+     -i Makefile
+
+    sed -e "s/libopenjpeg1/libopenjp2/" -i Makerules
   '';
 
   postInstall = ''
+    ln -s ${my_soname} $out/lib/libmupdf.so
+
+    mkdir -p "$out/lib/pkgconfig"
+    cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+
+    Name: mupdf
+    Description: Library for rendering PDF documents
+    Requires: freetype2 libopenjp2 libcrypto
+    Version: 1.3
+    Libs: -L$out/lib -lmupdf
+    Cflags: -I$out/include
+    EOF
+
     mkdir -p $out/share/applications
     cat > $out/share/applications/mupdf.desktop <<EOF
     [Desktop Entry]

From cadbca8a6fa50b3eba23ac1f53a1e0d780211f49 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 May 2014 16:15:19 +0400
Subject: [PATCH 1468/2033] openjpeg: provide .pc

---
 pkgs/development/libraries/openjpeg/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index 75999f18d62..97981218478 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -15,7 +15,21 @@ stdenv.mkDerivation rec {
   nativebuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libpng libtiff lcms ]; # in closure anyway
 
-  postInstall = glib.flattenInclude;
+  postInstall = glib.flattenInclude + ''
+    mkdir -p "$out/lib/pkgconfig"
+    cat >"$out/lib/pkgconfig/libopenjp2.pc" <<EOF
+    prefix=$out
+    libdir=$out/lib
+    includedir=$out/include
+
+    Name: openjp2
+    Description: JPEG2000 library (Part 1 and 2)
+    URL: http://www.openjpeg.org/
+    Version: @OPENJPEG_VERSION@
+    Libs: -L$out/lib -lopenjp2
+    Cflags: -I$out/include
+    EOF
+  '';
 
   meta = {
     homepage = http://www.openjpeg.org/;

From d15c34f6778cb7f88975549c65976aacb64b0f56 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 May 2014 16:16:50 +0400
Subject: [PATCH 1469/2033] zathura: mupdf plugin

---
 pkgs/applications/misc/zathura/default.nix    |  8 +++--
 .../misc/zathura/pdf-mupdf/config.patch       | 17 +++++++++++
 .../misc/zathura/pdf-mupdf/default.nix        | 29 +++++++++++++++++++
 .../misc/zathura/pdf-poppler/default.nix      |  8 ++---
 pkgs/top-level/all-packages.nix               |  5 +++-
 5 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/applications/misc/zathura/pdf-mupdf/config.patch
 create mode 100644 pkgs/applications/misc/zathura/pdf-mupdf/default.nix

diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index f943bff7bf0..1a4ab3d772c 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, pkgs, fetchurl }:
+{ callPackage, pkgs, fetchurl, useMupdf }:
 
 rec {
   inherit (pkgs) stdenv;
@@ -12,6 +12,10 @@ rec {
 
   zathura_pdf_poppler = callPackage ./pdf-poppler { };
 
+  zathura_pdf_mupdf = callPackage ./pdf-mupdf {
+    gtk = pkgs.gtk3;
+  };
+
   zathura_djvu = callPackage ./djvu {
     gtk = pkgs.gtk3;
   };
@@ -27,9 +31,9 @@ rec {
     name = "zathura-${zathura_core.version}";
 
     plugins_path = stdenv.lib.makeSearchPath "lib" [
-      zathura_pdf_poppler
       zathura_djvu
       zathura_ps
+      (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)
     ];
 
     builder = ./builder.sh;
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
new file mode 100644
index 00000000000..c7d172c9263
--- /dev/null
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch
@@ -0,0 +1,17 @@
+--- zathura-pdf-mupdf-0.2.6/config.mk
++++ zathura-pdf-mupdf-0.2.6/config.mk
+@@ -32,10 +32,11 @@
+ OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto)
+ OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto)
+ 
+-MUPDF_LIB ?= -lmupdf -lmupdf-js-none
++MUPDF_INC ?= $(shell pkg-config --cflags mupdf)
++MUPDF_LIB ?= $(shell pkg-config --libs mupdf)
+ 
+-INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC}
+-LIBS = ${GTK_LIB} ${GIRARA_LIB} ${MUPDF_LIB} ${OPENSSL_LIB} -ljbig2dec -lopenjp2 -ljpeg
++INCS = ${GTK_INC} ${GIRARA_INC} ${OPENSSL_INC} ${ZATHURA_INC} ${MUPDF_INC}
++LIBS = ${GTK_LIB} ${GIRARA_LIB} ${OPENSSL_LIB} ${MUPDF_LIB} -ljbig2dec -ljpeg
+ 
+ # flags
+ CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
new file mode 100644
index 00000000000..4e585d852a2
--- /dev/null
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.6";
+  name = "zathura-pdf-mupdf-${version}";
+
+  src = fetchurl {
+    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
+    sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20";
+  };
+
+  buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ];
+
+  makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
+
+  preConfigure = "patch -p1 < ${./config.patch}";
+
+  meta = {
+    homepage = http://pwmt.org/projects/zathura/;
+    description = "A zathura PDF plugin (mupdf)";
+    longDescription = ''
+      The zathura-pdf-mupdf plugin adds PDF support to zathura by
+      using the mupdf rendering library.
+    '';
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.linux;
+#    maintainers = [ ];
+  };
+}
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index ce4894e6c0f..6625bf47194 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler, gettext }:
+{ stdenv, fetchurl, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
   version = "0.2.5";
@@ -9,16 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
   };
 
-  buildInputs = [ pkgconfig poppler gettext zathura_core girara ];
+  buildInputs = [ pkgconfig poppler zathura_core girara ];
 
   makeFlags = "PREFIX=$(out) PLUGINDIR=$(out)/lib";
 
   meta = {
     homepage = http://pwmt.org/projects/zathura/;
-    description = "A zathura PDF plugin";
+    description = "A zathura PDF plugin (poppler)";
     longDescription = ''
       The zathura-pdf-poppler plugin adds PDF support to zathura by 
-      using the poppler rendering engine.
+      using the poppler rendering library.
     '';
     license = stdenv.lib.licenses.zlib;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3ee044e9b6..614381ce2dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9739,7 +9739,10 @@ let
 
   zathuraCollection = recurseIntoAttrs
     (let callPackage = newScope pkgs.zathuraCollection; in
-      import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; });
+      import ../applications/misc/zathura {
+        inherit callPackage pkgs fetchurl;
+        useMupdf = config.zathura.useMupdf or false;
+      });
 
   zathura = zathuraCollection.zathuraWrapper;
 

From 224f9b478dfbe1c74f9b0558138df4386eb2322c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 17 May 2014 09:32:56 -0400
Subject: [PATCH 1470/2033] Add cpp-netlib library

---
 .../libraries/cpp-netlib/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/cpp-netlib/default.nix

diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
new file mode 100644
index 00000000000..43849bf8ed8
--- /dev/null
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, boost, openssl }:
+
+let
+  version = "0.11.0";
+in
+
+stdenv.mkDerivation rec {
+  name = "cpp-netlib-${version}";
+
+  src = fetchurl {
+    url = "http://commondatastorage.googleapis.com/cpp-netlib-downloads/${version}/${name}.tar.bz2";
+    md5 = "0765cf203f451394df98e6ddf7bf2541";
+  };
+
+  buildInputs = [ cmake boost openssl ];
+
+  cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A collection of open-source libraries for high level network programming";
+    homepage    = http://cpp-netlib.org;
+    license     = stdenv.lib.licenses.boost;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3ee044e9b6..619832b6a03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4263,6 +4263,8 @@ let
 
   ctl = callPackage ../development/libraries/ctl { };
 
+  cpp-netlib = callPackage ../development/libraries/cpp-netlib { };
+
   cppunit = callPackage ../development/libraries/cppunit { };
 
   cppnetlib = callPackage ../development/libraries/cppnetlib {

From a7b67d93c12a72e1b22734755014adee056e4257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 17 May 2014 21:00:28 +0200
Subject: [PATCH 1471/2033] haskell-xmobar: build with mpd support

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

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index a7aeed339e2..d631b28a67f 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,5 +1,5 @@
 { cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl
-, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11
+, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd
 , X11Xft
 }:
 
@@ -11,10 +11,10 @@ cabal.mkDerivation (self: {
   isExecutable = true;
   buildDepends = [
     alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time
-    utf8String X11 X11Xft
+    utf8String X11 X11Xft libmpd
   ];
   extraLibraries = [ libXrandr wirelesstools ];
-  configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa";
+  configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";

From f7123982c2774c131752b866809768fe0885acb0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 17:36:44 -0500
Subject: [PATCH 1472/2033] apparmor: 2.8.2 -> 2.8.3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/apparmor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 51fe768df83..12173e20f3f 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
 
   name = "apparmor-${version}";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchurl {
     url = "http://launchpad.net/apparmor/2.8/${version}/+download/${name}.tar.gz";
-    sha256 = "1fyjvfkvl0fc7agmz64ck8c965940xvcljrczq1z66sydivkybvl";
+    sha256 = "0zjwhkq9wh76m59zmrzfp68sjy4fnz4h23r7asxyaw6inrzwmhl4";
   };
 
   buildInputs = [
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     homepage = http://apparmor.net/;
     description = "Linux application security system";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom ];
+    maintainers = [ maintainers.phreedom maintainers.thoughtpolice ];
     platforms = platforms.linux;
   };
 }

From 552db25e7f5deccb8f335444102065bec19afd22 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 9 May 2014 21:37:41 -0500
Subject: [PATCH 1473/2033] nixpkgs: add abc version 040509

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/abc/default.nix             | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/science/logic/abc/default.nix

diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
new file mode 100644
index 00000000000..a8076b9e29e
--- /dev/null
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -0,0 +1,27 @@
+{ fetchhg, stdenv, readline }:
+
+stdenv.mkDerivation rec {
+  name = "abc-verifier-${version}";
+  version = "140509"; # YYMMDD
+
+  src = fetchhg {
+    url    = "https://bitbucket.org/alanmi/abc";
+    tag    = "03e221443d71e49e56cbc37f1907ee3b0ff3e7c9";
+    sha256 = "0ahrqg718y7xpv939f6x8w1kqh7wsja4pw8hca7j67j0qjdgb4lm";
+  };
+
+  buildInputs = [ readline ];
+  enableParallelBuilding = true;
+  installPhase = ''
+    mkdir -p $out/bin
+    mv abc $out/bin
+  '';
+
+  meta = {
+    description = "Sequential Logic Synthesis and Formal Verification";
+    homepage    = "www.eecs.berkeley.edu/~alanmi/abc/abc.htm";
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 619832b6a03..4a61d064bf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10394,6 +10394,8 @@ let
 
   ### SCIENCE/LOGIC
 
+  abc-verifier = callPackage ../applications/science/logic/abc {};
+
   alt-ergo = callPackage ../applications/science/logic/alt-ergo {};
 
   coq = callPackage ../applications/science/logic/coq {

From f1dc6815388ad164482b336ca8e37f45de0e9554 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 9 May 2014 22:12:28 -0500
Subject: [PATCH 1474/2033] cryptol: add a convenient clang/lss wrapper

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/cryptol/1.8.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix
index db216d1dad4..42887b22ab0 100644
--- a/pkgs/development/compilers/cryptol/1.8.x.nix
+++ b/pkgs/development/compilers/cryptol/1.8.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, gmp4, ncurses, zlib, makeWrapper }:
+{ stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }:
 
 let
   name    = "cryptol-${version}-${rev}";
@@ -87,6 +87,9 @@ stdenv.mkDerivation rec {
     mv ${lss-ver}/bin/lss $out/bin
     mv ${lss-ver}/sym-api $out/include
 
+    # Create a convenient 'lss-clang' wrapper pointing to a valid Clang verison
+    ln -s ${clang_33}/bin/clang $out/bin/lss-clang
+
     # Hack around lack of libtinfo in NixOS
     ln -s ${ncurses}/lib/libncursesw.so.5.9 $out/lib/libtinfo.so.5
     ln -s ${stdenv.gcc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0

From 3efdeef6a31dca9dc7e76afd575fa43e78d6afea Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 14 May 2014 08:54:43 -0500
Subject: [PATCH 1475/2033] linux-3.{4,10}: update

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index cb20cd8bf69..de8fa4f5413 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.39";
+  version = "3.10.40";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1zl51dhcfyynii808mfvdjfq349wgfj1p4i8qbb786ancxam2ln4";
+    sha256 = "0a56hh47a9x8mg1rxlckfnrjcphwz9hraxj2fgran95vb33hsq5a";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 09d970065c5..68fb2496a13 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.89";
+  version = "3.4.90";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1ldhdbfjvha1z9csnl518qdm3w8w284f59dgn4adg8a0ig6lybk6";
+    sha256 = "0kh4y1sbsjm3awplfsd0i59rz7wc1dj23mcs5rwwhc0p7i8w4r75";
   };
 
   features.iwlwifi = true;

From 92abc4c61088c561a0060219cc95da5eaf79a857 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 17:59:29 -0500
Subject: [PATCH 1476/2033] kernel: enable AppArmor by default

AppArmor only requires a few patches to the 3.2 and 3.4 kernels in order
to work properly (with the minor catch grsecurity -stable includes the
3.2 patches.) This adds them to the kernel builds by default, removes
features.apparmor (since it's always true) and makes it the default MAC
system.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/apparmor.nix           |   7 -
 nixos/modules/security/grsecurity.nix         |   4 +-
 ...bility-patch-for-v5-network-controll.patch | 553 ++++++++++
 ...compatibility-patch-for-v5-interface.patch | 391 +++++++
 ...fa-backward-compatibility-with-broke.patch |  69 ++
 ...Armor-Add-profile-introspection-file.patch | 264 +++++
 ...AUCE-AppArmor-basic-networking-rules.patch | 603 +++++++++++
 ...armor-Add-the-ability-to-mediate-mou.patch | 957 ++++++++++++++++++
 .../linux/kernel/common-config.nix            |   4 +
 pkgs/os-specific/linux/kernel/linux-3.2.nix   |  16 +-
 pkgs/os-specific/linux/kernel/linux-3.4.nix   |  11 +
 pkgs/os-specific/linux/kernel/patches.nix     |  25 -
 pkgs/top-level/all-packages.nix               |  18 -
 13 files changed, 2868 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 create mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index da7c93beee9..f29e7a5ad81 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -23,13 +23,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    assertions =
-      [ { assertion = config.boot.kernelPackages.kernel.features ? apparmor
-                   && config.boot.kernelPackages.kernel.features.apparmor;
-          message = "Your selected kernel does not have AppArmor support";
-        }
-      ];
-
     environment.systemPackages = [ pkgs.apparmor ];
     systemd.services.apparmor = {
       wantedBy = [ "local-fs.target" ];
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index e6db05e11f4..a0f63cdf3a9 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -73,8 +73,6 @@ let
         restrictLinks = optionalString cfg.testing
           "GRKERNSEC_LINK n";
     in ''
-      SECURITY_APPARMOR y
-      DEFAULT_SECURITY_APPARMOR y
       GRKERNSEC y
       ${grsecMainConfig}
 
@@ -434,7 +432,7 @@ in
         chmod -R 0600 /etc/grsec
       '';
 
-    # Enable apparmor support, gradm udev rules, and utilities
+    # Enable AppArmor, gradm udev rules, and utilities
     security.apparmor.enable   = true;
     boot.kernelPackages        = grsecPackage;
     services.udev.packages     = [ pkgs.gradm ];
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
new file mode 100644
index 00000000000..b411f43298c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
@@ -0,0 +1,553 @@
+From 125fccb600288968aa3395883c0a394c47176fcd Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Wed, 10 Aug 2011 22:02:39 -0700
+Subject: [PATCH 1/3] AppArmor: compatibility patch for v5 network controll
+
+Add compatibility for v5 network rules.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+---
+ include/linux/lsm_audit.h          |    4 +
+ security/apparmor/Makefile         |   19 +++-
+ security/apparmor/include/net.h    |   40 +++++++++
+ security/apparmor/include/policy.h |    3 +
+ security/apparmor/lsm.c            |  112 ++++++++++++++++++++++++
+ security/apparmor/net.c            |  170 ++++++++++++++++++++++++++++++++++++
+ security/apparmor/policy.c         |    1 +
+ security/apparmor/policy_unpack.c  |   48 +++++++++-
+ 8 files changed, 394 insertions(+), 3 deletions(-)
+ create mode 100644 security/apparmor/include/net.h
+ create mode 100644 security/apparmor/net.c
+
+diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
+index 88e78de..c63979a 100644
+--- a/include/linux/lsm_audit.h
++++ b/include/linux/lsm_audit.h
+@@ -124,6 +124,10 @@ struct common_audit_data {
+ 					u32 denied;
+ 					uid_t ouid;
+ 				} fs;
++				struct {
++					int type, protocol;
++					struct sock *sk;
++				} net;
+ 			};
+ 		} apparmor_audit_data;
+ #endif
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index 2dafe50..7cefef9 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+ 
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+-              resource.o sid.o file.o
++              resource.o sid.o file.o net.o
+ 
+-clean-files := capability_names.h rlim_names.h
++clean-files := capability_names.h rlim_names.h af_names.h
+ 
+ 
+ # Build a lower case string table of capability names
+@@ -44,9 +44,24 @@ cmd_make-rlim = echo "static const char *rlim_names[] = {" > $@ ;\
+ 	sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
+ 	echo "};" >> $@
+ 
++# Build a lower case string table of address family names.
++# Transform lines from
++# #define AF_INET		2	/* Internet IP Protocol 	*/
++# to
++# [2] = "inet",
++quiet_cmd_make-af = GEN     $@
++cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
++	sed $< >> $@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \
++	  's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+).*/[\2] = "\L\1",/p';\
++	echo "};" >> $@
++
++
+ $(obj)/capability.o : $(obj)/capability_names.h
+ $(obj)/resource.o : $(obj)/rlim_names.h
++$(obj)/net.o : $(obj)/af_names.h
+ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h
+ 	$(call cmd,make-caps)
+ $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h
+ 	$(call cmd,make-rlim)
++$(obj)/af_names.h : $(srctree)/include/linux/socket.h
++	$(call cmd,make-af)
+\ No newline at end of file
+diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
+new file mode 100644
+index 0000000..3c7d599
+--- /dev/null
++++ b/security/apparmor/include/net.h
+@@ -0,0 +1,40 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation definitions.
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#ifndef __AA_NET_H
++#define __AA_NET_H
++
++#include <net/sock.h>
++
++/* struct aa_net - network confinement data
++ * @allowed: basic network families permissions
++ * @audit_network: which network permissions to force audit
++ * @quiet_network: which network permissions to quiet rejects
++ */
++struct aa_net {
++	u16 allow[AF_MAX];
++	u16 audit[AF_MAX];
++	u16 quiet[AF_MAX];
++};
++
++extern int aa_net_perm(int op, struct aa_profile *profile, u16 family,
++		       int type, int protocol, struct sock *sk);
++extern int aa_revalidate_sk(int op, struct sock *sk);
++
++static inline void aa_free_net_rules(struct aa_net *new)
++{
++	/* NOP */
++}
++
++#endif /* __AA_NET_H */
+diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
+index aeda5cf..6776929 100644
+--- a/security/apparmor/include/policy.h
++++ b/security/apparmor/include/policy.h
+@@ -27,6 +27,7 @@
+ #include "capability.h"
+ #include "domain.h"
+ #include "file.h"
++#include "net.h"
+ #include "resource.h"
+ 
+ extern const char *profile_mode_names[];
+@@ -145,6 +146,7 @@ struct aa_namespace {
+  * @size: the memory consumed by this profiles rules
+  * @file: The set of rules governing basic file access and domain transitions
+  * @caps: capabilities for the profile
++ * @net: network controls for the profile
+  * @rlimits: rlimits for the profile
+  *
+  * The AppArmor profile contains the basic confinement data.  Each profile
+@@ -181,6 +183,7 @@ struct aa_profile {
+ 
+ 	struct aa_file_rules file;
+ 	struct aa_caps caps;
++	struct aa_net net;
+ 	struct aa_rlimit rlimits;
+ };
+ 
+diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
+index 3783202..7459547 100644
+--- a/security/apparmor/lsm.c
++++ b/security/apparmor/lsm.c
+@@ -32,6 +32,7 @@
+ #include "include/context.h"
+ #include "include/file.h"
+ #include "include/ipc.h"
++#include "include/net.h"
+ #include "include/path.h"
+ #include "include/policy.h"
+ #include "include/procattr.h"
+@@ -621,6 +622,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+ 	return error;
+ }
+ 
++static int apparmor_socket_create(int family, int type, int protocol, int kern)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	if (kern)
++		return 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_net_perm(OP_CREATE, profile, family, type, protocol,
++				    NULL);
++	return error;
++}
++
++static int apparmor_socket_bind(struct socket *sock,
++				struct sockaddr *address, int addrlen)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_BIND, sk);
++}
++
++static int apparmor_socket_connect(struct socket *sock,
++				   struct sockaddr *address, int addrlen)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_CONNECT, sk);
++}
++
++static int apparmor_socket_listen(struct socket *sock, int backlog)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_LISTEN, sk);
++}
++
++static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_ACCEPT, sk);
++}
++
++static int apparmor_socket_sendmsg(struct socket *sock,
++				   struct msghdr *msg, int size)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SENDMSG, sk);
++}
++
++static int apparmor_socket_recvmsg(struct socket *sock,
++				   struct msghdr *msg, int size, int flags)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_RECVMSG, sk);
++}
++
++static int apparmor_socket_getsockname(struct socket *sock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETSOCKNAME, sk);
++}
++
++static int apparmor_socket_getpeername(struct socket *sock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETPEERNAME, sk);
++}
++
++static int apparmor_socket_getsockopt(struct socket *sock, int level,
++				      int optname)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETSOCKOPT, sk);
++}
++
++static int apparmor_socket_setsockopt(struct socket *sock, int level,
++				      int optname)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SETSOCKOPT, sk);
++}
++
++static int apparmor_socket_shutdown(struct socket *sock, int how)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
++}
++
+ static struct security_operations apparmor_ops = {
+ 	.name =				"apparmor",
+ 
+@@ -652,6 +751,19 @@ static struct security_operations apparmor_ops = {
+ 	.getprocattr =			apparmor_getprocattr,
+ 	.setprocattr =			apparmor_setprocattr,
+ 
++	.socket_create =		apparmor_socket_create,
++	.socket_bind =			apparmor_socket_bind,
++	.socket_connect =		apparmor_socket_connect,
++	.socket_listen =		apparmor_socket_listen,
++	.socket_accept =		apparmor_socket_accept,
++	.socket_sendmsg =		apparmor_socket_sendmsg,
++	.socket_recvmsg =		apparmor_socket_recvmsg,
++	.socket_getsockname =		apparmor_socket_getsockname,
++	.socket_getpeername =		apparmor_socket_getpeername,
++	.socket_getsockopt =		apparmor_socket_getsockopt,
++	.socket_setsockopt =		apparmor_socket_setsockopt,
++	.socket_shutdown =		apparmor_socket_shutdown,
++
+ 	.cred_alloc_blank =		apparmor_cred_alloc_blank,
+ 	.cred_free =			apparmor_cred_free,
+ 	.cred_prepare =			apparmor_cred_prepare,
+diff --git a/security/apparmor/net.c b/security/apparmor/net.c
+new file mode 100644
+index 0000000..1765901
+--- /dev/null
++++ b/security/apparmor/net.c
+@@ -0,0 +1,170 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/net.h"
++#include "include/policy.h"
++
++#include "af_names.h"
++
++static const char *sock_type_names[] = {
++	"unknown(0)",
++	"stream",
++	"dgram",
++	"raw",
++	"rdm",
++	"seqpacket",
++	"dccp",
++	"unknown(7)",
++	"unknown(8)",
++	"unknown(9)",
++	"packet",
++};
++
++/* audit callback for net specific fields */
++static void audit_cb(struct audit_buffer *ab, void *va)
++{
++	struct common_audit_data *sa = va;
++
++	audit_log_format(ab, " family=");
++	if (address_family_names[sa->u.net.family]) {
++		audit_log_string(ab, address_family_names[sa->u.net.family]);
++	} else {
++		audit_log_format(ab, " \"unknown(%d)\"", sa->u.net.family);
++	}
++
++	audit_log_format(ab, " sock_type=");
++	if (sock_type_names[sa->aad.net.type]) {
++		audit_log_string(ab, sock_type_names[sa->aad.net.type]);
++	} else {
++		audit_log_format(ab, "\"unknown(%d)\"", sa->aad.net.type);
++	}
++
++	audit_log_format(ab, " protocol=%d", sa->aad.net.protocol);
++}
++
++/**
++ * audit_net - audit network access
++ * @profile: profile being enforced  (NOT NULL)
++ * @op: operation being checked
++ * @family: network family
++ * @type:   network type
++ * @protocol: network protocol
++ * @sk: socket auditing is being applied to
++ * @error: error code for failure else 0
++ *
++ * Returns: %0 or sa->error else other errorcode on failure
++ */
++static int audit_net(struct aa_profile *profile, int op, u16 family, int type,
++		     int protocol, struct sock *sk, int error)
++{
++	int audit_type = AUDIT_APPARMOR_AUTO;
++	struct common_audit_data sa;
++	if (sk) {
++		COMMON_AUDIT_DATA_INIT(&sa, NET);
++	} else {
++		COMMON_AUDIT_DATA_INIT(&sa, NONE);
++	}
++	/* todo fill in socket addr info */
++
++	sa.aad.op = op,
++	sa.u.net.family = family;
++	sa.u.net.sk = sk;
++	sa.aad.net.type = type;
++	sa.aad.net.protocol = protocol;
++	sa.aad.error = error;
++
++	if (likely(!sa.aad.error)) {
++		u16 audit_mask = profile->net.audit[sa.u.net.family];
++		if (likely((AUDIT_MODE(profile) != AUDIT_ALL) &&
++			   !(1 << sa.aad.net.type & audit_mask)))
++			return 0;
++		audit_type = AUDIT_APPARMOR_AUDIT;
++	} else {
++		u16 quiet_mask = profile->net.quiet[sa.u.net.family];
++		u16 kill_mask = 0;
++		u16 denied = (1 << sa.aad.net.type) & ~quiet_mask;
++
++		if (denied & kill_mask)
++			audit_type = AUDIT_APPARMOR_KILL;
++
++		if ((denied & quiet_mask) &&
++		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
++		    AUDIT_MODE(profile) != AUDIT_ALL)
++			return COMPLAIN_MODE(profile) ? 0 : sa.aad.error;
++	}
++
++	return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb);
++}
++
++/**
++ * aa_net_perm - very course network access check
++ * @op: operation being checked
++ * @profile: profile being enforced  (NOT NULL)
++ * @family: network family
++ * @type:   network type
++ * @protocol: network protocol
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type,
++		int protocol, struct sock *sk)
++{
++	u16 family_mask;
++	int error;
++
++	if ((family < 0) || (family >= AF_MAX))
++		return -EINVAL;
++
++	if ((type < 0) || (type >= SOCK_MAX))
++		return -EINVAL;
++
++	/* unix domain and netlink sockets are handled by ipc */
++	if (family == AF_UNIX || family == AF_NETLINK)
++		return 0;
++
++	family_mask = profile->net.allow[family];
++
++	error = (family_mask & (1 << type)) ? 0 : -EACCES;
++
++	return audit_net(profile, op, family, type, protocol, sk, error);
++}
++
++/**
++ * aa_revalidate_sk - Revalidate access to a sock
++ * @op: operation being checked
++ * @sk: sock being revalidated  (NOT NULL)
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_revalidate_sk(int op, struct sock *sk)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	/* aa_revalidate_sk should not be called from interrupt context
++	 * don't mediate these calls as they are not task related
++	 */
++	if (in_interrupt())
++		return 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type,
++				    sk->sk_protocol, sk);
++
++	return error;
++}
+diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
+index 4f0eade..4d5ce13 100644
+--- a/security/apparmor/policy.c
++++ b/security/apparmor/policy.c
+@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile)
+ 
+ 	aa_free_file_rules(&profile->file);
+ 	aa_free_cap_rules(&profile->caps);
++	aa_free_net_rules(&profile->net);
+ 	aa_free_rlimit_rules(&profile->rlimits);
+ 
+ 	aa_free_sid(profile->sid);
+diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
+index 741dd13..ee8043e 100644
+--- a/security/apparmor/policy_unpack.c
++++ b/security/apparmor/policy_unpack.c
+@@ -190,6 +190,19 @@ fail:
+ 	return 0;
+ }
+ 
++static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
++{
++	if (unpack_nameX(e, AA_U16, name)) {
++		if (!inbounds(e, sizeof(u16)))
++			return 0;
++		if (data)
++			*data = le16_to_cpu(get_unaligned((u16 *) e->pos));
++		e->pos += sizeof(u16);
++		return 1;
++	}
++	return 0;
++}
++
+ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
+ {
+ 	if (unpack_nameX(e, AA_U32, name)) {
+@@ -468,7 +481,8 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ {
+ 	struct aa_profile *profile = NULL;
+ 	const char *name = NULL;
+-	int error = -EPROTO;
++	size_t size = 0;
++	int i, error = -EPROTO;
+ 	kernel_cap_t tmpcap;
+ 	u32 tmp;
+ 
+@@ -559,6 +573,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ 	if (!unpack_rlimits(e, profile))
+ 		goto fail;
+ 
++	size = unpack_array(e, "net_allowed_af");
++	if (size) {
++
++		for (i = 0; i < size; i++) {
++			/* discard extraneous rules that this kernel will
++			 * never request
++			 */
++			if (i >= AF_MAX) {
++				u16 tmp;
++				if (!unpack_u16(e, &tmp, NULL) ||
++				    !unpack_u16(e, &tmp, NULL) ||
++				    !unpack_u16(e, &tmp, NULL))
++					goto fail;
++				continue;
++			}
++			if (!unpack_u16(e, &profile->net.allow[i], NULL))
++				goto fail;
++			if (!unpack_u16(e, &profile->net.audit[i], NULL))
++				goto fail;
++			if (!unpack_u16(e, &profile->net.quiet[i], NULL))
++				goto fail;
++		}
++		if (!unpack_nameX(e, AA_ARRAYEND, NULL))
++			goto fail;
++		/*
++		 * allow unix domain and netlink sockets they are handled
++		 * by IPC
++		 */
++	}
++	profile->net.allow[AF_UNIX] = 0xffff;
++	profile->net.allow[AF_NETLINK] = 0xffff;
++
+ 	/* get file rules */
+ 	profile->file.dfa = unpack_dfa(e);
+ 	if (IS_ERR(profile->file.dfa)) {
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
new file mode 100644
index 00000000000..aa4b6b1109f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
@@ -0,0 +1,391 @@
+From 004192fb5223c7b81a949e36a080a5da56132826 Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Wed, 10 Aug 2011 22:02:40 -0700
+Subject: [PATCH 2/3] AppArmor: compatibility patch for v5 interface
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+---
+ security/apparmor/Kconfig              |    9 +
+ security/apparmor/Makefile             |    1 +
+ security/apparmor/apparmorfs-24.c      |  287 ++++++++++++++++++++++++++++++++
+ security/apparmor/apparmorfs.c         |   18 +-
+ security/apparmor/include/apparmorfs.h |    6 +
+ 5 files changed, 319 insertions(+), 2 deletions(-)
+ create mode 100644 security/apparmor/apparmorfs-24.c
+
+diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
+index 9b9013b..51ebf96 100644
+--- a/security/apparmor/Kconfig
++++ b/security/apparmor/Kconfig
+@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
+ 	  boot.
+ 
+ 	  If you are unsure how to answer this question, answer 1.
++
++config SECURITY_APPARMOR_COMPAT_24
++	bool "Enable AppArmor 2.4 compatability"
++	depends on SECURITY_APPARMOR
++	default y
++	help
++	  This option enables compatability with AppArmor 2.4.  It is
++          recommended if compatability with older versions of AppArmor
++          is desired.
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index 7cefef9..0bb604b 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -5,6 +5,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+               resource.o sid.o file.o net.o
++apparmor-$(CONFIG_SECURITY_APPARMOR_COMPAT_24) += apparmorfs-24.o
+ 
+ clean-files := capability_names.h rlim_names.h af_names.h
+ 
+diff --git a/security/apparmor/apparmorfs-24.c b/security/apparmor/apparmorfs-24.c
+new file mode 100644
+index 0000000..dc8c744
+--- /dev/null
++++ b/security/apparmor/apparmorfs-24.c
+@@ -0,0 +1,287 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor /sys/kernel/secrutiy/apparmor interface functions
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2010 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ *
++ *
++ * This file contain functions providing an interface for <= AppArmor 2.4
++ * compatibility.  It is dependent on CONFIG_SECURITY_APPARMOR_COMPAT_24
++ * being set (see Makefile).
++ */
++
++#include <linux/security.h>
++#include <linux/vmalloc.h>
++#include <linux/module.h>
++#include <linux/seq_file.h>
++#include <linux/uaccess.h>
++#include <linux/namei.h>
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/policy.h"
++
++
++/* apparmor/matching */
++static ssize_t aa_matching_read(struct file *file, char __user *buf,
++				size_t size, loff_t *ppos)
++{
++	const char matching[] = "pattern=aadfa audit perms=crwxamlk/ "
++	    "user::other";
++
++	return simple_read_from_buffer(buf, size, ppos, matching,
++				       sizeof(matching) - 1);
++}
++
++const struct file_operations aa_fs_matching_fops = {
++	.read = aa_matching_read,
++};
++
++/* apparmor/features */
++static ssize_t aa_features_read(struct file *file, char __user *buf,
++				size_t size, loff_t *ppos)
++{
++	const char features[] = "file=3.1 capability=2.0 network=1.0 "
++	    "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1";
++
++	return simple_read_from_buffer(buf, size, ppos, features,
++				       sizeof(features) - 1);
++}
++
++const struct file_operations aa_fs_features_fops = {
++	.read = aa_features_read,
++};
++
++/**
++ * __next_namespace - find the next namespace to list
++ * @root: root namespace to stop search at (NOT NULL)
++ * @ns: current ns position (NOT NULL)
++ *
++ * Find the next namespace from @ns under @root and handle all locking needed
++ * while switching current namespace.
++ *
++ * Returns: next namespace or NULL if at last namespace under @root
++ * NOTE: will not unlock root->lock
++ */
++static struct aa_namespace *__next_namespace(struct aa_namespace *root,
++					     struct aa_namespace *ns)
++{
++	struct aa_namespace *parent;
++
++	/* is next namespace a child */
++	if (!list_empty(&ns->sub_ns)) {
++		struct aa_namespace *next;
++		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
++		read_lock(&next->lock);
++		return next;
++	}
++
++	/* check if the next ns is a sibling, parent, gp, .. */
++	parent = ns->parent;
++	while (parent) {
++		read_unlock(&ns->lock);
++		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
++			read_lock(&ns->lock);
++			return ns;
++		}
++		if (parent == root)
++			return NULL;
++		ns = parent;
++		parent = parent->parent;
++	}
++
++	return NULL;
++}
++
++/**
++ * __first_profile - find the first profile in a namespace
++ * @root: namespace that is root of profiles being displayed (NOT NULL)
++ * @ns: namespace to start in   (NOT NULL)
++ *
++ * Returns: unrefcounted profile or NULL if no profile
++ */
++static struct aa_profile *__first_profile(struct aa_namespace *root,
++					  struct aa_namespace *ns)
++{
++	for ( ; ns; ns = __next_namespace(root, ns)) {
++		if (!list_empty(&ns->base.profiles))
++			return list_first_entry(&ns->base.profiles,
++						struct aa_profile, base.list);
++	}
++	return NULL;
++}
++
++/**
++ * __next_profile - step to the next profile in a profile tree
++ * @profile: current profile in tree (NOT NULL)
++ *
++ * Perform a depth first taversal on the profile tree in a namespace
++ *
++ * Returns: next profile or NULL if done
++ * Requires: profile->ns.lock to be held
++ */
++static struct aa_profile *__next_profile(struct aa_profile *p)
++{
++	struct aa_profile *parent;
++	struct aa_namespace *ns = p->ns;
++
++	/* is next profile a child */
++	if (!list_empty(&p->base.profiles))
++		return list_first_entry(&p->base.profiles, typeof(*p),
++					base.list);
++
++	/* is next profile a sibling, parent sibling, gp, subling, .. */
++	parent = p->parent;
++	while (parent) {
++		list_for_each_entry_continue(p, &parent->base.profiles,
++					     base.list)
++				return p;
++		p = parent;
++		parent = parent->parent;
++	}
++
++	/* is next another profile in the namespace */
++	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
++		return p;
++
++	return NULL;
++}
++
++/**
++ * next_profile - step to the next profile in where ever it may be
++ * @root: root namespace  (NOT NULL)
++ * @profile: current profile  (NOT NULL)
++ *
++ * Returns: next profile or NULL if there isn't one
++ */
++static struct aa_profile *next_profile(struct aa_namespace *root,
++				       struct aa_profile *profile)
++{
++	struct aa_profile *next = __next_profile(profile);
++	if (next)
++		return next;
++
++	/* finished all profiles in namespace move to next namespace */
++	return __first_profile(root, __next_namespace(root, profile->ns));
++}
++
++/**
++ * p_start - start a depth first traversal of profile tree
++ * @f: seq_file to fill
++ * @pos: current position
++ *
++ * Returns: first profile under current namespace or NULL if none found
++ *
++ * acquires first ns->lock
++ */
++static void *p_start(struct seq_file *f, loff_t *pos)
++	__acquires(root->lock)
++{
++	struct aa_profile *profile = NULL;
++	struct aa_namespace *root = aa_current_profile()->ns;
++	loff_t l = *pos;
++	f->private = aa_get_namespace(root);
++
++
++	/* find the first profile */
++	read_lock(&root->lock);
++	profile = __first_profile(root, root);
++
++	/* skip to position */
++	for (; profile && l > 0; l--)
++		profile = next_profile(root, profile);
++
++	return profile;
++}
++
++/**
++ * p_next - read the next profile entry
++ * @f: seq_file to fill
++ * @p: profile previously returned
++ * @pos: current position
++ *
++ * Returns: next profile after @p or NULL if none
++ *
++ * may acquire/release locks in namespace tree as necessary
++ */
++static void *p_next(struct seq_file *f, void *p, loff_t *pos)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private;
++	(*pos)++;
++
++	return next_profile(root, profile);
++}
++
++/**
++ * p_stop - stop depth first traversal
++ * @f: seq_file we are filling
++ * @p: the last profile writen
++ *
++ * Release all locking done by p_start/p_next on namespace tree
++ */
++static void p_stop(struct seq_file *f, void *p)
++	__releases(root->lock)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private, *ns;
++
++	if (profile) {
++		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
++			read_unlock(&ns->lock);
++	}
++	read_unlock(&root->lock);
++	aa_put_namespace(root);
++}
++
++/**
++ * seq_show_profile - show a profile entry
++ * @f: seq_file to file
++ * @p: current position (profile)    (NOT NULL)
++ *
++ * Returns: error on failure
++ */
++static int seq_show_profile(struct seq_file *f, void *p)
++{
++	struct aa_profile *profile = (struct aa_profile *)p;
++	struct aa_namespace *root = f->private;
++
++	if (profile->ns != root)
++		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
++	seq_printf(f, "%s (%s)\n", profile->base.hname,
++		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
++
++	return 0;
++}
++
++static const struct seq_operations aa_fs_profiles_op = {
++	.start = p_start,
++	.next = p_next,
++	.stop = p_stop,
++	.show = seq_show_profile,
++};
++
++static int profiles_open(struct inode *inode, struct file *file)
++{
++	return seq_open(file, &aa_fs_profiles_op);
++}
++
++static int profiles_release(struct inode *inode, struct file *file)
++{
++	return seq_release(inode, file);
++}
++
++const struct file_operations aa_fs_profiles_fops = {
++	.open = profiles_open,
++	.read = seq_read,
++	.llseek = seq_lseek,
++	.release = profiles_release,
++};
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index 69ddb47..867995c 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -187,7 +187,11 @@ void __init aa_destroy_aafs(void)
+ 		aafs_remove(".remove");
+ 		aafs_remove(".replace");
+ 		aafs_remove(".load");
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++		aafs_remove("profiles");
++		aafs_remove("matching");
++		aafs_remove("features");
++#endif
+ 		securityfs_remove(aa_fs_dentry);
+ 		aa_fs_dentry = NULL;
+ 	}
+@@ -218,7 +222,17 @@ static int __init aa_create_aafs(void)
+ 		aa_fs_dentry = NULL;
+ 		goto error;
+ 	}
+-
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++	error = aafs_create("matching", 0444, &aa_fs_matching_fops);
++	if (error)
++		goto error;
++	error = aafs_create("features", 0444, &aa_fs_features_fops);
++	if (error)
++		goto error;
++#endif
++	error = aafs_create("profiles", 0440, &aa_fs_profiles_fops);
++	if (error)
++		goto error;
+ 	error = aafs_create(".load", 0640, &aa_fs_profile_load);
+ 	if (error)
+ 		goto error;
+diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
+index cb1e93a..14f955c 100644
+--- a/security/apparmor/include/apparmorfs.h
++++ b/security/apparmor/include/apparmorfs.h
+@@ -17,4 +17,10 @@
+ 
+ extern void __init aa_destroy_aafs(void);
+ 
++#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
++extern const struct file_operations aa_fs_matching_fops;
++extern const struct file_operations aa_fs_features_fops;
++extern const struct file_operations aa_fs_profiles_fops;
++#endif
++
+ #endif /* __AA_APPARMORFS_H */
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
new file mode 100644
index 00000000000..7dd55781fda
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
@@ -0,0 +1,69 @@
+From e5d90918aa31f948ecec2f3c088567dbab30c90b Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Wed, 10 Aug 2011 22:02:41 -0700
+Subject: [PATCH 3/3] AppArmor: Allow dfa backward compatibility with broken
+ userspace
+
+The apparmor_parser when compiling policy could generate invalid dfas
+that did not have sufficient padding to avoid invalid references, when
+used by the kernel.  The kernels check to verify the next/check table
+size was broken meaning invalid dfas were being created by userspace
+and not caught.
+
+To remain compatible with old tools that are not fixed, pad the loaded
+dfas next/check table.  The dfa's themselves are valid except for the
+high padding for potentially invalid transitions (high bounds error),
+which have a maximimum is 256 entries.  So just allocate an extra null filled
+256 entries for the next/check tables.  This will guarentee all bounds
+are good and invalid transitions go to the null (0) state.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+---
+ security/apparmor/match.c |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/security/apparmor/match.c b/security/apparmor/match.c
+index 94de6b4..081491e 100644
+--- a/security/apparmor/match.c
++++ b/security/apparmor/match.c
+@@ -57,8 +57,17 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
+ 	if (bsize < tsize)
+ 		goto out;
+ 
++	/* Pad table allocation for next/check by 256 entries to remain
++	 * backwards compatible with old (buggy) tools and remain safe without
++	 * run time checks
++	 */
++	if (th.td_id == YYTD_ID_NXT || th.td_id == YYTD_ID_CHK)
++		tsize += 256 * th.td_flags;
++
+ 	table = kvmalloc(tsize);
+ 	if (table) {
++		/* ensure the pad is clear, else there will be errors */
++		memset(table, 0, tsize);
+ 		*table = th;
+ 		if (th.td_flags == YYTD_DATA8)
+ 			UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
+@@ -134,11 +143,19 @@ static int verify_dfa(struct aa_dfa *dfa, int flags)
+ 		goto out;
+ 
+ 	if (flags & DFA_FLAG_VERIFY_STATES) {
++		int warning = 0;
+ 		for (i = 0; i < state_count; i++) {
+ 			if (DEFAULT_TABLE(dfa)[i] >= state_count)
+ 				goto out;
+ 			/* TODO: do check that DEF state recursion terminates */
+ 			if (BASE_TABLE(dfa)[i] + 255 >= trans_count) {
++				if (warning)
++					continue;
++				printk(KERN_WARNING "AppArmor DFA next/check "
++				       "upper bounds error fixed, upgrade "
++				       "user space tools \n");
++				warning = 1;
++			} else if (BASE_TABLE(dfa)[i] >= trans_count) {
+ 				printk(KERN_ERR "AppArmor DFA next/check upper "
+ 				       "bounds error\n");
+ 				goto out;
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
new file mode 100644
index 00000000000..88a50ca780a
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
@@ -0,0 +1,264 @@
+From 8de755e4dfdbc40bfcaca848ae6b5aeaf0ede0e8 Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Thu, 22 Jul 2010 02:32:02 -0700
+Subject: [PATCH 1/3] UBUNTU: SAUCE: AppArmor: Add profile introspection file
+ to interface
+
+Add the dynamic profiles file to the interace, to allow load policy
+introspection.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Kees Cook <kees@ubuntu.com>
+Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
+---
+ security/apparmor/apparmorfs.c |  227 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 227 insertions(+)
+
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index 16c15ec..89bdc62 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -182,6 +182,232 @@ const struct file_operations aa_fs_seq_file_ops = {
+ 	.release	= single_release,
+ };
+ 
++/**
++ * __next_namespace - find the next namespace to list
++ * @root: root namespace to stop search at (NOT NULL)
++ * @ns: current ns position (NOT NULL)
++ *
++ * Find the next namespace from @ns under @root and handle all locking needed
++ * while switching current namespace.
++ *
++ * Returns: next namespace or NULL if at last namespace under @root
++ * NOTE: will not unlock root->lock
++ */
++static struct aa_namespace *__next_namespace(struct aa_namespace *root,
++					     struct aa_namespace *ns)
++{
++	struct aa_namespace *parent;
++
++	/* is next namespace a child */
++	if (!list_empty(&ns->sub_ns)) {
++		struct aa_namespace *next;
++		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
++		read_lock(&next->lock);
++		return next;
++	}
++
++	/* check if the next ns is a sibling, parent, gp, .. */
++	parent = ns->parent;
++	while (parent) {
++		read_unlock(&ns->lock);
++		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
++			read_lock(&ns->lock);
++			return ns;
++		}
++		if (parent == root)
++			return NULL;
++		ns = parent;
++		parent = parent->parent;
++	}
++
++	return NULL;
++}
++
++/**
++ * __first_profile - find the first profile in a namespace
++ * @root: namespace that is root of profiles being displayed (NOT NULL)
++ * @ns: namespace to start in   (NOT NULL)
++ *
++ * Returns: unrefcounted profile or NULL if no profile
++ */
++static struct aa_profile *__first_profile(struct aa_namespace *root,
++					  struct aa_namespace *ns)
++{
++	for ( ; ns; ns = __next_namespace(root, ns)) {
++		if (!list_empty(&ns->base.profiles))
++			return list_first_entry(&ns->base.profiles,
++						struct aa_profile, base.list);
++	}
++	return NULL;
++}
++
++/**
++ * __next_profile - step to the next profile in a profile tree
++ * @profile: current profile in tree (NOT NULL)
++ *
++ * Perform a depth first taversal on the profile tree in a namespace
++ *
++ * Returns: next profile or NULL if done
++ * Requires: profile->ns.lock to be held
++ */
++static struct aa_profile *__next_profile(struct aa_profile *p)
++{
++	struct aa_profile *parent;
++	struct aa_namespace *ns = p->ns;
++
++	/* is next profile a child */
++	if (!list_empty(&p->base.profiles))
++		return list_first_entry(&p->base.profiles, typeof(*p),
++					base.list);
++
++	/* is next profile a sibling, parent sibling, gp, subling, .. */
++	parent = p->parent;
++	while (parent) {
++		list_for_each_entry_continue(p, &parent->base.profiles,
++					     base.list)
++				return p;
++		p = parent;
++		parent = parent->parent;
++	}
++
++	/* is next another profile in the namespace */
++	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
++		return p;
++
++	return NULL;
++}
++
++/**
++ * next_profile - step to the next profile in where ever it may be
++ * @root: root namespace  (NOT NULL)
++ * @profile: current profile  (NOT NULL)
++ *
++ * Returns: next profile or NULL if there isn't one
++ */
++static struct aa_profile *next_profile(struct aa_namespace *root,
++				       struct aa_profile *profile)
++{
++	struct aa_profile *next = __next_profile(profile);
++	if (next)
++		return next;
++
++	/* finished all profiles in namespace move to next namespace */
++	return __first_profile(root, __next_namespace(root, profile->ns));
++}
++
++/**
++ * p_start - start a depth first traversal of profile tree
++ * @f: seq_file to fill
++ * @pos: current position
++ *
++ * Returns: first profile under current namespace or NULL if none found
++ *
++ * acquires first ns->lock
++ */
++static void *p_start(struct seq_file *f, loff_t *pos)
++	__acquires(root->lock)
++{
++	struct aa_profile *profile = NULL;
++	struct aa_namespace *root = aa_current_profile()->ns;
++	loff_t l = *pos;
++	f->private = aa_get_namespace(root);
++
++
++	/* find the first profile */
++	read_lock(&root->lock);
++	profile = __first_profile(root, root);
++
++	/* skip to position */
++	for (; profile && l > 0; l--)
++		profile = next_profile(root, profile);
++
++	return profile;
++}
++
++/**
++ * p_next - read the next profile entry
++ * @f: seq_file to fill
++ * @p: profile previously returned
++ * @pos: current position
++ *
++ * Returns: next profile after @p or NULL if none
++ *
++ * may acquire/release locks in namespace tree as necessary
++ */
++static void *p_next(struct seq_file *f, void *p, loff_t *pos)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private;
++	(*pos)++;
++
++	return next_profile(root, profile);
++}
++
++/**
++ * p_stop - stop depth first traversal
++ * @f: seq_file we are filling
++ * @p: the last profile writen
++ *
++ * Release all locking done by p_start/p_next on namespace tree
++ */
++static void p_stop(struct seq_file *f, void *p)
++	__releases(root->lock)
++{
++	struct aa_profile *profile = p;
++	struct aa_namespace *root = f->private, *ns;
++
++	if (profile) {
++		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
++			read_unlock(&ns->lock);
++	}
++	read_unlock(&root->lock);
++	aa_put_namespace(root);
++}
++
++/**
++ * seq_show_profile - show a profile entry
++ * @f: seq_file to file
++ * @p: current position (profile)    (NOT NULL)
++ *
++ * Returns: error on failure
++ */
++static int seq_show_profile(struct seq_file *f, void *p)
++{
++	struct aa_profile *profile = (struct aa_profile *)p;
++	struct aa_namespace *root = f->private;
++
++	if (profile->ns != root)
++		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
++	seq_printf(f, "%s (%s)\n", profile->base.hname,
++		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
++
++	return 0;
++}
++
++static const struct seq_operations aa_fs_profiles_op = {
++	.start = p_start,
++	.next = p_next,
++	.stop = p_stop,
++	.show = seq_show_profile,
++};
++
++static int profiles_open(struct inode *inode, struct file *file)
++{
++	return seq_open(file, &aa_fs_profiles_op);
++}
++
++static int profiles_release(struct inode *inode, struct file *file)
++{
++	return seq_release(inode, file);
++}
++
++const struct file_operations aa_fs_profiles_fops = {
++	.open = profiles_open,
++	.read = seq_read,
++	.llseek = seq_lseek,
++	.release = profiles_release,
++};
++
+ /** Base file system setup **/
+ 
+ static struct aa_fs_entry aa_fs_entry_file[] = {
+@@ -210,6 +436,7 @@ static struct aa_fs_entry aa_fs_entry_apparmor[] = {
+ 	AA_FS_FILE_FOPS(".load", 0640, &aa_fs_profile_load),
+ 	AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace),
+ 	AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove),
++	AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops),
+ 	AA_FS_DIR("features", aa_fs_entry_features),
+ 	{ }
+ };
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
new file mode 100644
index 00000000000..01316b9db78
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
@@ -0,0 +1,603 @@
+From 423e2cb454d75d6185eecd0c1b5cf6ccc2d8482d Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Mon, 4 Oct 2010 15:03:36 -0700
+Subject: [PATCH 2/3] UBUNTU: SAUCE: AppArmor: basic networking rules
+
+Base support for network mediation.
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+---
+ security/apparmor/.gitignore       |    2 +-
+ security/apparmor/Makefile         |   42 +++++++++-
+ security/apparmor/apparmorfs.c     |    1 +
+ security/apparmor/include/audit.h  |    4 +
+ security/apparmor/include/net.h    |   44 ++++++++++
+ security/apparmor/include/policy.h |    3 +
+ security/apparmor/lsm.c            |  112 +++++++++++++++++++++++++
+ security/apparmor/net.c            |  162 ++++++++++++++++++++++++++++++++++++
+ security/apparmor/policy.c         |    1 +
+ security/apparmor/policy_unpack.c  |   46 ++++++++++
+ 10 files changed, 414 insertions(+), 3 deletions(-)
+ create mode 100644 security/apparmor/include/net.h
+ create mode 100644 security/apparmor/net.c
+
+diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore
+index 4d995ae..d5b291e 100644
+--- a/security/apparmor/.gitignore
++++ b/security/apparmor/.gitignore
+@@ -1,6 +1,6 @@
+ #
+ # Generated include files
+ #
+-af_names.h
++net_names.h
+ capability_names.h
+ rlim_names.h
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index 806bd19..19daa85 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+ 
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+-              resource.o sid.o file.o
++              resource.o sid.o file.o net.o
+ 
+-clean-files := capability_names.h rlim_names.h
++clean-files := capability_names.h rlim_names.h net_names.h
+ 
+ 
+ # Build a lower case string table of capability names
+@@ -20,6 +20,38 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\
+ 	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
+ 	echo "};" >> $@
+ 
++# Build a lower case string table of address family names
++# Transform lines from
++#    define AF_LOCAL	1	/* POSIX name for AF_UNIX	*/
++#    #define AF_INET		2	/* Internet IP Protocol 	*/
++# to
++#    [1] = "local",
++#    [2] = "inet",
++#
++# and build the securityfs entries for the mapping.
++# Transforms lines from
++#    #define AF_INET		2	/* Internet IP Protocol 	*/
++# to
++#    #define AA_FS_AF_MASK "local inet"
++quiet_cmd_make-af = GEN     $@
++cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
++	sed $< >>$@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \
++	 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
++	echo "};" >> $@ ;\
++	echo -n '\#define AA_FS_AF_MASK "' >> $@ ;\
++	sed -r -n 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/\L\1/p'\
++	 $< | tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
++
++# Build a lower case string table of sock type names
++# Transform lines from
++#    SOCK_STREAM	= 1,
++# to
++#    [1] = "stream",
++quiet_cmd_make-sock = GEN     $@
++cmd_make-sock = echo "static const char *sock_type_names[] = {" >> $@ ;\
++	sed $^ >>$@ -r -n \
++	-e 's/^\tSOCK_([A-Z0-9_]+)[\t]+=[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
++	echo "};" >> $@
+ 
+ # Build a lower case string table of rlimit names.
+ # Transforms lines from
+@@ -56,6 +88,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
+ 	    tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
+ 
+ $(obj)/capability.o : $(obj)/capability_names.h
++$(obj)/net.o : $(obj)/net_names.h
+ $(obj)/resource.o : $(obj)/rlim_names.h
+ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
+ 			    $(src)/Makefile
+@@ -63,3 +96,8 @@ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
+ $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h \
+ 		      $(src)/Makefile
+ 	$(call cmd,make-rlim)
++$(obj)/net_names.h : $(srctree)/include/linux/socket.h \
++		     $(srctree)/include/linux/net.h \
++		     $(src)/Makefile
++	$(call cmd,make-af)
++	$(call cmd,make-sock)
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index 89bdc62..c66315d 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -427,6 +427,7 @@ static struct aa_fs_entry aa_fs_entry_domain[] = {
+ static struct aa_fs_entry aa_fs_entry_features[] = {
+ 	AA_FS_DIR("domain",			aa_fs_entry_domain),
+ 	AA_FS_DIR("file",			aa_fs_entry_file),
++	AA_FS_DIR("network",                    aa_fs_entry_network),
+ 	AA_FS_FILE_U64("capability",		VFS_CAP_FLAGS_MASK),
+ 	AA_FS_DIR("rlimit",			aa_fs_entry_rlimit),
+ 	{ }
+diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
+index 3868b1e..c1ff09c 100644
+--- a/security/apparmor/include/audit.h
++++ b/security/apparmor/include/audit.h
+@@ -126,6 +126,10 @@ struct apparmor_audit_data {
+ 			u32 denied;
+ 			uid_t ouid;
+ 		} fs;
++		struct {
++			int type, protocol;
++			struct sock *sk;
++		} net;
+ 	};
+ };
+ 
+diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
+new file mode 100644
+index 0000000..cb8a121
+--- /dev/null
++++ b/security/apparmor/include/net.h
+@@ -0,0 +1,44 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation definitions.
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2012 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#ifndef __AA_NET_H
++#define __AA_NET_H
++
++#include <net/sock.h>
++
++#include "apparmorfs.h"
++
++/* struct aa_net - network confinement data
++ * @allowed: basic network families permissions
++ * @audit_network: which network permissions to force audit
++ * @quiet_network: which network permissions to quiet rejects
++ */
++struct aa_net {
++	u16 allow[AF_MAX];
++	u16 audit[AF_MAX];
++	u16 quiet[AF_MAX];
++};
++
++extern struct aa_fs_entry aa_fs_entry_network[];
++
++extern int aa_net_perm(int op, struct aa_profile *profile, u16 family,
++		       int type, int protocol, struct sock *sk);
++extern int aa_revalidate_sk(int op, struct sock *sk);
++
++static inline void aa_free_net_rules(struct aa_net *new)
++{
++	/* NOP */
++}
++
++#endif /* __AA_NET_H */
+diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
+index bda4569..eb13a73 100644
+--- a/security/apparmor/include/policy.h
++++ b/security/apparmor/include/policy.h
+@@ -27,6 +27,7 @@
+ #include "capability.h"
+ #include "domain.h"
+ #include "file.h"
++#include "net.h"
+ #include "resource.h"
+ 
+ extern const char *const profile_mode_names[];
+@@ -157,6 +158,7 @@ struct aa_policydb {
+  * @policy: general match rules governing policy
+  * @file: The set of rules governing basic file access and domain transitions
+  * @caps: capabilities for the profile
++ * @net: network controls for the profile
+  * @rlimits: rlimits for the profile
+  *
+  * The AppArmor profile contains the basic confinement data.  Each profile
+@@ -194,6 +196,7 @@ struct aa_profile {
+ 	struct aa_policydb policy;
+ 	struct aa_file_rules file;
+ 	struct aa_caps caps;
++	struct aa_net net;
+ 	struct aa_rlimit rlimits;
+ };
+ 
+diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
+index ad05d39..3cde194 100644
+--- a/security/apparmor/lsm.c
++++ b/security/apparmor/lsm.c
+@@ -32,6 +32,7 @@
+ #include "include/context.h"
+ #include "include/file.h"
+ #include "include/ipc.h"
++#include "include/net.h"
+ #include "include/path.h"
+ #include "include/policy.h"
+ #include "include/procattr.h"
+@@ -622,6 +623,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+ 	return error;
+ }
+ 
++static int apparmor_socket_create(int family, int type, int protocol, int kern)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	if (kern)
++		return 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_net_perm(OP_CREATE, profile, family, type, protocol,
++				    NULL);
++	return error;
++}
++
++static int apparmor_socket_bind(struct socket *sock,
++				struct sockaddr *address, int addrlen)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_BIND, sk);
++}
++
++static int apparmor_socket_connect(struct socket *sock,
++				   struct sockaddr *address, int addrlen)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_CONNECT, sk);
++}
++
++static int apparmor_socket_listen(struct socket *sock, int backlog)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_LISTEN, sk);
++}
++
++static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_ACCEPT, sk);
++}
++
++static int apparmor_socket_sendmsg(struct socket *sock,
++				   struct msghdr *msg, int size)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SENDMSG, sk);
++}
++
++static int apparmor_socket_recvmsg(struct socket *sock,
++				   struct msghdr *msg, int size, int flags)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_RECVMSG, sk);
++}
++
++static int apparmor_socket_getsockname(struct socket *sock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETSOCKNAME, sk);
++}
++
++static int apparmor_socket_getpeername(struct socket *sock)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETPEERNAME, sk);
++}
++
++static int apparmor_socket_getsockopt(struct socket *sock, int level,
++				      int optname)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_GETSOCKOPT, sk);
++}
++
++static int apparmor_socket_setsockopt(struct socket *sock, int level,
++				      int optname)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SETSOCKOPT, sk);
++}
++
++static int apparmor_socket_shutdown(struct socket *sock, int how)
++{
++	struct sock *sk = sock->sk;
++
++	return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
++}
++
+ static struct security_operations apparmor_ops = {
+ 	.name =				"apparmor",
+ 
+@@ -653,6 +752,19 @@ static struct security_operations apparmor_ops = {
+ 	.getprocattr =			apparmor_getprocattr,
+ 	.setprocattr =			apparmor_setprocattr,
+ 
++	.socket_create =		apparmor_socket_create,
++	.socket_bind =			apparmor_socket_bind,
++	.socket_connect =		apparmor_socket_connect,
++	.socket_listen =		apparmor_socket_listen,
++	.socket_accept =		apparmor_socket_accept,
++	.socket_sendmsg =		apparmor_socket_sendmsg,
++	.socket_recvmsg =		apparmor_socket_recvmsg,
++	.socket_getsockname =		apparmor_socket_getsockname,
++	.socket_getpeername =		apparmor_socket_getpeername,
++	.socket_getsockopt =		apparmor_socket_getsockopt,
++	.socket_setsockopt =		apparmor_socket_setsockopt,
++	.socket_shutdown =		apparmor_socket_shutdown,
++
+ 	.cred_alloc_blank =		apparmor_cred_alloc_blank,
+ 	.cred_free =			apparmor_cred_free,
+ 	.cred_prepare =			apparmor_cred_prepare,
+diff --git a/security/apparmor/net.c b/security/apparmor/net.c
+new file mode 100644
+index 0000000..084232b
+--- /dev/null
++++ b/security/apparmor/net.c
+@@ -0,0 +1,162 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor network mediation
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2012 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/net.h"
++#include "include/policy.h"
++
++#include "net_names.h"
++
++struct aa_fs_entry aa_fs_entry_network[] = {
++	AA_FS_FILE_STRING("af_mask", AA_FS_AF_MASK),
++	{ }
++};
++
++/* audit callback for net specific fields */
++static void audit_cb(struct audit_buffer *ab, void *va)
++{
++	struct common_audit_data *sa = va;
++
++	audit_log_format(ab, " family=");
++	if (address_family_names[sa->u.net->family]) {
++		audit_log_string(ab, address_family_names[sa->u.net->family]);
++	} else {
++		audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family);
++	}
++	audit_log_format(ab, " sock_type=");
++	if (sock_type_names[sa->aad->net.type]) {
++		audit_log_string(ab, sock_type_names[sa->aad->net.type]);
++	} else {
++		audit_log_format(ab, "\"unknown(%d)\"", sa->aad->net.type);
++	}
++	audit_log_format(ab, " protocol=%d", sa->aad->net.protocol);
++}
++
++/**
++ * audit_net - audit network access
++ * @profile: profile being enforced  (NOT NULL)
++ * @op: operation being checked
++ * @family: network family
++ * @type:   network type
++ * @protocol: network protocol
++ * @sk: socket auditing is being applied to
++ * @error: error code for failure else 0
++ *
++ * Returns: %0 or sa->error else other errorcode on failure
++ */
++static int audit_net(struct aa_profile *profile, int op, u16 family, int type,
++		     int protocol, struct sock *sk, int error)
++{
++	int audit_type = AUDIT_APPARMOR_AUTO;
++	struct common_audit_data sa;
++	struct apparmor_audit_data aad = { };
++	struct lsm_network_audit net = { };
++	if (sk) {
++		COMMON_AUDIT_DATA_INIT(&sa, NET);
++	} else {
++		COMMON_AUDIT_DATA_INIT(&sa, NONE);
++	}
++	/* todo fill in socket addr info */
++	sa.aad = &aad;
++	sa.u.net = &net;
++	sa.aad->op = op,
++	sa.u.net->family = family;
++	sa.u.net->sk = sk;
++	sa.aad->net.type = type;
++	sa.aad->net.protocol = protocol;
++	sa.aad->error = error;
++
++	if (likely(!sa.aad->error)) {
++		u16 audit_mask = profile->net.audit[sa.u.net->family];
++		if (likely((AUDIT_MODE(profile) != AUDIT_ALL) &&
++			   !(1 << sa.aad->net.type & audit_mask)))
++			return 0;
++		audit_type = AUDIT_APPARMOR_AUDIT;
++	} else {
++		u16 quiet_mask = profile->net.quiet[sa.u.net->family];
++		u16 kill_mask = 0;
++		u16 denied = (1 << sa.aad->net.type) & ~quiet_mask;
++
++		if (denied & kill_mask)
++			audit_type = AUDIT_APPARMOR_KILL;
++
++		if ((denied & quiet_mask) &&
++		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
++		    AUDIT_MODE(profile) != AUDIT_ALL)
++			return COMPLAIN_MODE(profile) ? 0 : sa.aad->error;
++	}
++
++	return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb);
++}
++
++/**
++ * aa_net_perm - very course network access check
++ * @op: operation being checked
++ * @profile: profile being enforced  (NOT NULL)
++ * @family: network family
++ * @type:   network type
++ * @protocol: network protocol
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type,
++		int protocol, struct sock *sk)
++{
++	u16 family_mask;
++	int error;
++
++	if ((family < 0) || (family >= AF_MAX))
++		return -EINVAL;
++
++	if ((type < 0) || (type >= SOCK_MAX))
++		return -EINVAL;
++
++	/* unix domain and netlink sockets are handled by ipc */
++	if (family == AF_UNIX || family == AF_NETLINK)
++		return 0;
++
++	family_mask = profile->net.allow[family];
++
++	error = (family_mask & (1 << type)) ? 0 : -EACCES;
++
++	return audit_net(profile, op, family, type, protocol, sk, error);
++}
++
++/**
++ * aa_revalidate_sk - Revalidate access to a sock
++ * @op: operation being checked
++ * @sk: sock being revalidated  (NOT NULL)
++ *
++ * Returns: %0 else error if permission denied
++ */
++int aa_revalidate_sk(int op, struct sock *sk)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	/* aa_revalidate_sk should not be called from interrupt context
++	 * don't mediate these calls as they are not task related
++	 */
++	if (in_interrupt())
++		return 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type,
++				    sk->sk_protocol, sk);
++
++	return error;
++}
+diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
+index f1f7506..b8100a7 100644
+--- a/security/apparmor/policy.c
++++ b/security/apparmor/policy.c
+@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile)
+ 
+ 	aa_free_file_rules(&profile->file);
+ 	aa_free_cap_rules(&profile->caps);
++	aa_free_net_rules(&profile->net);
+ 	aa_free_rlimit_rules(&profile->rlimits);
+ 
+ 	aa_free_sid(profile->sid);
+diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
+index deab7c7..8f8e9c1 100644
+--- a/security/apparmor/policy_unpack.c
++++ b/security/apparmor/policy_unpack.c
+@@ -193,6 +193,19 @@ fail:
+ 	return 0;
+ }
+ 
++static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
++{
++	if (unpack_nameX(e, AA_U16, name)) {
++		if (!inbounds(e, sizeof(u16)))
++			return 0;
++		if (data)
++			*data = le16_to_cpu(get_unaligned((u16 *) e->pos));
++		e->pos += sizeof(u16);
++		return 1;
++	}
++	return 0;
++}
++
+ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
+ {
+ 	if (unpack_nameX(e, AA_U32, name)) {
+@@ -471,6 +484,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ {
+ 	struct aa_profile *profile = NULL;
+ 	const char *name = NULL;
++	size_t size = 0;
+ 	int i, error = -EPROTO;
+ 	kernel_cap_t tmpcap;
+ 	u32 tmp;
+@@ -564,6 +578,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
+ 	if (!unpack_rlimits(e, profile))
+ 		goto fail;
+ 
++	size = unpack_array(e, "net_allowed_af");
++	if (size) {
++
++		for (i = 0; i < size; i++) {
++			/* discard extraneous rules that this kernel will
++			 * never request
++			 */
++			if (i >= AF_MAX) {
++				u16 tmp;
++				if (!unpack_u16(e, &tmp, NULL) ||
++				    !unpack_u16(e, &tmp, NULL) ||
++				    !unpack_u16(e, &tmp, NULL))
++					goto fail;
++				continue;
++			}
++			if (!unpack_u16(e, &profile->net.allow[i], NULL))
++				goto fail;
++			if (!unpack_u16(e, &profile->net.audit[i], NULL))
++				goto fail;
++			if (!unpack_u16(e, &profile->net.quiet[i], NULL))
++				goto fail;
++		}
++		if (!unpack_nameX(e, AA_ARRAYEND, NULL))
++			goto fail;
++	}
++	/*
++	 * allow unix domain and netlink sockets they are handled
++	 * by IPC
++	 */
++	profile->net.allow[AF_UNIX] = 0xffff;
++	profile->net.allow[AF_NETLINK] = 0xffff;
++
+ 	if (unpack_nameX(e, AA_STRUCT, "policydb")) {
+ 		/* generic policy dfa - optional and may be NULL */
+ 		profile->policy.dfa = unpack_dfa(e);
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
new file mode 100644
index 00000000000..48b34343e0b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
@@ -0,0 +1,957 @@
+From a94d5e11c0484af59e5feebf144cc48c186892ad Mon Sep 17 00:00:00 2001
+From: John Johansen <john.johansen@canonical.com>
+Date: Wed, 16 May 2012 10:58:05 -0700
+Subject: [PATCH 3/3] UBUNTU: SAUCE: apparmor: Add the ability to mediate
+ mount
+
+Add the ability for apparmor to do mediation of mount operations. Mount
+rules require an updated apparmor_parser (2.8 series) for policy compilation.
+
+The basic form of the rules are.
+
+  [audit] [deny] mount [conds]* [device] [ -> [conds] path],
+  [audit] [deny] remount [conds]* [path],
+  [audit] [deny] umount [conds]* [path],
+  [audit] [deny] pivotroot [oldroot=<value>] <path>
+
+  remount is just a short cut for mount options=remount
+
+  where [conds] can be
+    fstype=<expr>
+    options=<expr>
+
+Example mount commands
+  mount,		# allow all mounts, but not umount or pivotroot
+
+  mount fstype=procfs,  # allow mounting procfs anywhere
+
+  mount options=(bind, ro) /foo -> /bar,  # readonly bind mount
+
+  mount /dev/sda -> /mnt,
+
+  mount /dev/sd** -> /mnt/**,
+
+  mount fstype=overlayfs options=(rw,upperdir=/tmp/upper/,lowerdir=/) -> /mnt/
+
+  umount,
+
+  umount /m*,
+
+See the apparmor userspace for full documentation
+
+Signed-off-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Kees Cook <kees@ubuntu.com>
+---
+ security/apparmor/Makefile           |    2 +-
+ security/apparmor/apparmorfs.c       |   13 +
+ security/apparmor/audit.c            |    4 +
+ security/apparmor/domain.c           |    2 +-
+ security/apparmor/include/apparmor.h |    3 +-
+ security/apparmor/include/audit.h    |   11 +
+ security/apparmor/include/domain.h   |    2 +
+ security/apparmor/include/mount.h    |   54 +++
+ security/apparmor/lsm.c              |   59 ++++
+ security/apparmor/mount.c            |  620 ++++++++++++++++++++++++++++++++++
+ 10 files changed, 767 insertions(+), 3 deletions(-)
+ create mode 100644 security/apparmor/include/mount.h
+ create mode 100644 security/apparmor/mount.c
+
+diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
+index 19daa85..63e0a4c 100644
+--- a/security/apparmor/Makefile
++++ b/security/apparmor/Makefile
+@@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
+ 
+ apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
+               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
+-              resource.o sid.o file.o net.o
++              resource.o sid.o file.o net.o mount.o
+ 
+ clean-files := capability_names.h rlim_names.h net_names.h
+ 
+diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
+index c66315d..ff19009 100644
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -424,10 +424,23 @@ static struct aa_fs_entry aa_fs_entry_domain[] = {
+ 	{ }
+ };
+ 
++static struct aa_fs_entry aa_fs_entry_mount[] = {
++	AA_FS_FILE_STRING("mask", "mount umount"),
++	{ }
++};
++
++static struct aa_fs_entry aa_fs_entry_namespaces[] = {
++	AA_FS_FILE_BOOLEAN("profile",           1),
++	AA_FS_FILE_BOOLEAN("pivot_root",        1),
++	{ }
++};
++
+ static struct aa_fs_entry aa_fs_entry_features[] = {
+ 	AA_FS_DIR("domain",			aa_fs_entry_domain),
+ 	AA_FS_DIR("file",			aa_fs_entry_file),
+ 	AA_FS_DIR("network",                    aa_fs_entry_network),
++	AA_FS_DIR("mount",                      aa_fs_entry_mount),
++	AA_FS_DIR("namespaces",                 aa_fs_entry_namespaces),
+ 	AA_FS_FILE_U64("capability",		VFS_CAP_FLAGS_MASK),
+ 	AA_FS_DIR("rlimit",			aa_fs_entry_rlimit),
+ 	{ }
+diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
+index cc3520d..b9f5ee9 100644
+--- a/security/apparmor/audit.c
++++ b/security/apparmor/audit.c
+@@ -44,6 +44,10 @@ const char *const op_table[] = {
+ 	"file_mmap",
+ 	"file_mprotect",
+ 
++	"pivotroot",
++	"mount",
++	"umount",
++
+ 	"create",
+ 	"post_create",
+ 	"bind",
+diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
+index 6327685..dfdc47b 100644
+--- a/security/apparmor/domain.c
++++ b/security/apparmor/domain.c
+@@ -242,7 +242,7 @@ static const char *next_name(int xtype, const char *name)
+  *
+  * Returns: refcounted profile, or NULL on failure (MAYBE NULL)
+  */
+-static struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex)
++struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex)
+ {
+ 	struct aa_profile *new_profile = NULL;
+ 	struct aa_namespace *ns = profile->ns;
+diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
+index 40aedd9..e243d96 100644
+--- a/security/apparmor/include/apparmor.h
++++ b/security/apparmor/include/apparmor.h
+@@ -29,8 +29,9 @@
+ #define AA_CLASS_NET		4
+ #define AA_CLASS_RLIMITS	5
+ #define AA_CLASS_DOMAIN		6
++#define AA_CLASS_MOUNT		7
+ 
+-#define AA_CLASS_LAST		AA_CLASS_DOMAIN
++#define AA_CLASS_LAST		AA_CLASS_MOUNT
+ 
+ /* Control parameters settable through module/boot flags */
+ extern enum audit_mode aa_g_audit;
+diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
+index c1ff09c..7b90900c 100644
+--- a/security/apparmor/include/audit.h
++++ b/security/apparmor/include/audit.h
+@@ -73,6 +73,10 @@ enum aa_ops {
+ 	OP_FMMAP,
+ 	OP_FMPROT,
+ 
++	OP_PIVOTROOT,
++	OP_MOUNT,
++	OP_UMOUNT,
++
+ 	OP_CREATE,
+ 	OP_POST_CREATE,
+ 	OP_BIND,
+@@ -121,6 +125,13 @@ struct apparmor_audit_data {
+ 			unsigned long max;
+ 		} rlim;
+ 		struct {
++			const char *src_name;
++			const char *type;
++			const char *trans;
++			const char *data;
++			unsigned long flags;
++		} mnt;
++		struct {
+ 			const char *target;
+ 			u32 request;
+ 			u32 denied;
+diff --git a/security/apparmor/include/domain.h b/security/apparmor/include/domain.h
+index de04464..a3f70c5 100644
+--- a/security/apparmor/include/domain.h
++++ b/security/apparmor/include/domain.h
+@@ -23,6 +23,8 @@ struct aa_domain {
+ 	char **table;
+ };
+ 
++struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex);
++
+ int apparmor_bprm_set_creds(struct linux_binprm *bprm);
+ int apparmor_bprm_secureexec(struct linux_binprm *bprm);
+ void apparmor_bprm_committing_creds(struct linux_binprm *bprm);
+diff --git a/security/apparmor/include/mount.h b/security/apparmor/include/mount.h
+new file mode 100644
+index 0000000..bc17a53
+--- /dev/null
++++ b/security/apparmor/include/mount.h
+@@ -0,0 +1,54 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor file mediation function definitions.
++ *
++ * Copyright 2012 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#ifndef __AA_MOUNT_H
++#define __AA_MOUNT_H
++
++#include <linux/fs.h>
++#include <linux/path.h>
++
++#include "domain.h"
++#include "policy.h"
++
++/* mount perms */
++#define AA_MAY_PIVOTROOT	0x01
++#define AA_MAY_MOUNT		0x02
++#define AA_MAY_UMOUNT		0x04
++#define AA_AUDIT_DATA		0x40
++#define AA_CONT_MATCH		0x40
++
++#define AA_MS_IGNORE_MASK (MS_KERNMOUNT | MS_NOSEC | MS_ACTIVE | MS_BORN)
++
++int aa_remount(struct aa_profile *profile, struct path *path,
++	       unsigned long flags, void *data);
++
++int aa_bind_mount(struct aa_profile *profile, struct path *path,
++		  const char *old_name, unsigned long flags);
++
++
++int aa_mount_change_type(struct aa_profile *profile, struct path *path,
++			 unsigned long flags);
++
++int aa_move_mount(struct aa_profile *profile, struct path *path,
++		  const char *old_name);
++
++int aa_new_mount(struct aa_profile *profile, const char *dev_name,
++		 struct path *path, const char *type, unsigned long flags,
++		 void *data);
++
++int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags);
++
++int aa_pivotroot(struct aa_profile *profile, struct path *old_path,
++		  struct path *new_path);
++
++#endif /* __AA_MOUNT_H */
+diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
+index 3cde194..4512cc6 100644
+--- a/security/apparmor/lsm.c
++++ b/security/apparmor/lsm.c
+@@ -36,6 +36,7 @@
+ #include "include/path.h"
+ #include "include/policy.h"
+ #include "include/procattr.h"
++#include "include/mount.h"
+ 
+ /* Flag indicating whether initialization completed */
+ int apparmor_initialized __initdata;
+@@ -512,6 +513,60 @@ static int apparmor_file_mprotect(struct vm_area_struct *vma,
+ 			   !(vma->vm_flags & VM_SHARED) ? MAP_PRIVATE : 0);
+ }
+ 
++static int apparmor_sb_mount(char *dev_name, struct path *path, char *type,
++			     unsigned long flags, void *data)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	/* Discard magic */
++	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
++		flags &= ~MS_MGC_MSK;
++
++	flags &= ~AA_MS_IGNORE_MASK;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile)) {
++		if (flags & MS_REMOUNT)
++			error = aa_remount(profile, path, flags, data);
++		else if (flags & MS_BIND)
++			error = aa_bind_mount(profile, path, dev_name, flags);
++		else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE |
++				  MS_UNBINDABLE))
++			error = aa_mount_change_type(profile, path, flags);
++		else if (flags & MS_MOVE)
++			error = aa_move_mount(profile, path, dev_name);
++		else
++			error = aa_new_mount(profile, dev_name, path, type,
++					     flags, data);
++	}
++	return error;
++}
++
++static int apparmor_sb_umount(struct vfsmount *mnt, int flags)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_umount(profile, mnt, flags);
++
++	return error;
++}
++
++static int apparmor_sb_pivotroot(struct path *old_path, struct path *new_path)
++{
++	struct aa_profile *profile;
++	int error = 0;
++
++	profile = __aa_current_profile();
++	if (!unconfined(profile))
++		error = aa_pivotroot(profile, old_path, new_path);
++
++	return error;
++}
++
+ static int apparmor_getprocattr(struct task_struct *task, char *name,
+ 				char **value)
+ {
+@@ -729,6 +784,10 @@ static struct security_operations apparmor_ops = {
+ 	.capget =			apparmor_capget,
+ 	.capable =			apparmor_capable,
+ 
++	.sb_mount =			apparmor_sb_mount,
++	.sb_umount =			apparmor_sb_umount,
++	.sb_pivotroot =			apparmor_sb_pivotroot,
++
+ 	.path_link =			apparmor_path_link,
+ 	.path_unlink =			apparmor_path_unlink,
+ 	.path_symlink =			apparmor_path_symlink,
+diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
+new file mode 100644
+index 0000000..63d8493
+--- /dev/null
++++ b/security/apparmor/mount.c
+@@ -0,0 +1,620 @@
++/*
++ * AppArmor security module
++ *
++ * This file contains AppArmor mediation of files
++ *
++ * Copyright (C) 1998-2008 Novell/SUSE
++ * Copyright 2009-2012 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation, version 2 of the
++ * License.
++ */
++
++#include <linux/fs.h>
++#include <linux/mount.h>
++#include <linux/namei.h>
++
++#include "include/apparmor.h"
++#include "include/audit.h"
++#include "include/context.h"
++#include "include/domain.h"
++#include "include/file.h"
++#include "include/match.h"
++#include "include/mount.h"
++#include "include/path.h"
++#include "include/policy.h"
++
++
++static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags)
++{
++	if (flags & MS_RDONLY)
++		audit_log_format(ab, "ro");
++	else
++		audit_log_format(ab, "rw");
++	if (flags & MS_NOSUID)
++		audit_log_format(ab, ", nosuid");
++	if (flags & MS_NODEV)
++		audit_log_format(ab, ", nodev");
++	if (flags & MS_NOEXEC)
++		audit_log_format(ab, ", noexec");
++	if (flags & MS_SYNCHRONOUS)
++		audit_log_format(ab, ", sync");
++	if (flags & MS_REMOUNT)
++		audit_log_format(ab, ", remount");
++	if (flags & MS_MANDLOCK)
++		audit_log_format(ab, ", mand");
++	if (flags & MS_DIRSYNC)
++		audit_log_format(ab, ", dirsync");
++	if (flags & MS_NOATIME)
++		audit_log_format(ab, ", noatime");
++	if (flags & MS_NODIRATIME)
++		audit_log_format(ab, ", nodiratime");
++	if (flags & MS_BIND)
++		audit_log_format(ab, flags & MS_REC ? ", rbind" : ", bind");
++	if (flags & MS_MOVE)
++		audit_log_format(ab, ", move");
++	if (flags & MS_SILENT)
++		audit_log_format(ab, ", silent");
++	if (flags & MS_POSIXACL)
++		audit_log_format(ab, ", acl");
++	if (flags & MS_UNBINDABLE)
++		audit_log_format(ab, flags & MS_REC ? ", runbindable" :
++				 ", unbindable");
++	if (flags & MS_PRIVATE)
++		audit_log_format(ab, flags & MS_REC ? ", rprivate" :
++				 ", private");
++	if (flags & MS_SLAVE)
++		audit_log_format(ab, flags & MS_REC ? ", rslave" :
++				 ", slave");
++	if (flags & MS_SHARED)
++		audit_log_format(ab, flags & MS_REC ? ", rshared" :
++				 ", shared");
++	if (flags & MS_RELATIME)
++		audit_log_format(ab, ", relatime");
++	if (flags & MS_I_VERSION)
++		audit_log_format(ab, ", iversion");
++	if (flags & MS_STRICTATIME)
++		audit_log_format(ab, ", strictatime");
++	if (flags & MS_NOUSER)
++		audit_log_format(ab, ", nouser");
++}
++
++/**
++ * audit_cb - call back for mount specific audit fields
++ * @ab: audit_buffer  (NOT NULL)
++ * @va: audit struct to audit values of  (NOT NULL)
++ */
++static void audit_cb(struct audit_buffer *ab, void *va)
++{
++	struct common_audit_data *sa = va;
++
++	if (sa->aad->mnt.type) {
++		audit_log_format(ab, " fstype=");
++		audit_log_untrustedstring(ab, sa->aad->mnt.type);
++	}
++	if (sa->aad->mnt.src_name) {
++		audit_log_format(ab, " srcname=");
++		audit_log_untrustedstring(ab, sa->aad->mnt.src_name);
++	}
++	if (sa->aad->mnt.trans) {
++		audit_log_format(ab, " trans=");
++		audit_log_untrustedstring(ab, sa->aad->mnt.trans);
++	}
++	if (sa->aad->mnt.flags || sa->aad->op == OP_MOUNT) {
++		audit_log_format(ab, " flags=\"");
++		audit_mnt_flags(ab, sa->aad->mnt.flags);
++		audit_log_format(ab, "\"");
++	}
++	if (sa->aad->mnt.data) {
++		audit_log_format(ab, " options=");
++		audit_log_untrustedstring(ab, sa->aad->mnt.data);
++	}
++}
++
++/**
++ * audit_mount - handle the auditing of mount operations
++ * @profile: the profile being enforced  (NOT NULL)
++ * @gfp: allocation flags
++ * @op: operation being mediated (NOT NULL)
++ * @name: name of object being mediated (MAYBE NULL)
++ * @src_name: src_name of object being mediated (MAYBE_NULL)
++ * @type: type of filesystem (MAYBE_NULL)
++ * @trans: name of trans (MAYBE NULL)
++ * @flags: filesystem idependent mount flags
++ * @data: filesystem mount flags
++ * @request: permissions requested
++ * @perms: the permissions computed for the request (NOT NULL)
++ * @info: extra information message (MAYBE NULL)
++ * @error: 0 if operation allowed else failure error code
++ *
++ * Returns: %0 or error on failure
++ */
++static int audit_mount(struct aa_profile *profile, gfp_t gfp, int op,
++		       const char *name, const char *src_name,
++		       const char *type, const char *trans,
++		       unsigned long flags, const void *data, u32 request,
++		       struct file_perms *perms, const char *info, int error)
++{
++	int audit_type = AUDIT_APPARMOR_AUTO;
++	struct common_audit_data sa;
++	struct apparmor_audit_data aad = { };
++
++	if (likely(!error)) {
++		u32 mask = perms->audit;
++
++		if (unlikely(AUDIT_MODE(profile) == AUDIT_ALL))
++			mask = 0xffff;
++
++		/* mask off perms that are not being force audited */
++		request &= mask;
++
++		if (likely(!request))
++			return 0;
++		audit_type = AUDIT_APPARMOR_AUDIT;
++	} else {
++		/* only report permissions that were denied */
++		request = request & ~perms->allow;
++
++		if (request & perms->kill)
++			audit_type = AUDIT_APPARMOR_KILL;
++
++		/* quiet known rejects, assumes quiet and kill do not overlap */
++		if ((request & perms->quiet) &&
++		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
++		    AUDIT_MODE(profile) != AUDIT_ALL)
++			request &= ~perms->quiet;
++
++		if (!request)
++			return COMPLAIN_MODE(profile) ?
++				complain_error(error) : error;
++	}
++
++	COMMON_AUDIT_DATA_INIT(&sa, NONE);
++	sa.aad = &aad;
++	sa.aad->op = op;
++	sa.aad->name = name;
++	sa.aad->mnt.src_name = src_name;
++	sa.aad->mnt.type = type;
++	sa.aad->mnt.trans = trans;
++	sa.aad->mnt.flags = flags;
++	if (data && (perms->audit & AA_AUDIT_DATA))
++		sa.aad->mnt.data = data;
++	sa.aad->info = info;
++	sa.aad->error = error;
++
++	return aa_audit(audit_type, profile, gfp, &sa, audit_cb);
++}
++
++/**
++ * match_mnt_flags - Do an ordered match on mount flags
++ * @dfa: dfa to match against
++ * @state: state to start in
++ * @flags: mount flags to match against
++ *
++ * Mount flags are encoded as an ordered match. This is done instead of
++ * checking against a simple bitmask, to allow for logical operations
++ * on the flags.
++ *
++ * Returns: next state after flags match
++ */
++static unsigned int match_mnt_flags(struct aa_dfa *dfa, unsigned int state,
++				    unsigned long flags)
++{
++	unsigned int i;
++
++	for (i = 0; i <= 31 ; ++i) {
++		if ((1 << i) & flags)
++			state = aa_dfa_next(dfa, state, i + 1);
++	}
++
++	return state;
++}
++
++/**
++ * compute_mnt_perms - compute mount permission associated with @state
++ * @dfa: dfa to match against (NOT NULL)
++ * @state: state match finished in
++ *
++ * Returns: mount permissions
++ */
++static struct file_perms compute_mnt_perms(struct aa_dfa *dfa,
++					   unsigned int state)
++{
++	struct file_perms perms;
++
++	perms.kill = 0;
++	perms.allow = dfa_user_allow(dfa, state);
++	perms.audit = dfa_user_audit(dfa, state);
++	perms.quiet = dfa_user_quiet(dfa, state);
++	perms.xindex = dfa_user_xindex(dfa, state);
++
++	return perms;
++}
++
++static const char const *mnt_info_table[] = {
++	"match succeeded",
++	"failed mntpnt match",
++	"failed srcname match",
++	"failed type match",
++	"failed flags match",
++	"failed data match"
++};
++
++/*
++ * Returns 0 on success else element that match failed in, this is the
++ * index into the mnt_info_table above
++ */
++static int do_match_mnt(struct aa_dfa *dfa, unsigned int start,
++			const char *mntpnt, const char *devname,
++			const char *type, unsigned long flags,
++			void *data, bool binary, struct file_perms *perms)
++{
++	unsigned int state;
++
++	state = aa_dfa_match(dfa, start, mntpnt);
++	state = aa_dfa_null_transition(dfa, state);
++	if (!state)
++		return 1;
++
++	if (devname)
++		state = aa_dfa_match(dfa, state, devname);
++	state = aa_dfa_null_transition(dfa, state);
++	if (!state)
++		return 2;
++
++	if (type)
++		state = aa_dfa_match(dfa, state, type);
++	state = aa_dfa_null_transition(dfa, state);
++	if (!state)
++		return 3;
++
++	state = match_mnt_flags(dfa, state, flags);
++	if (!state)
++		return 4;
++	*perms = compute_mnt_perms(dfa, state);
++	if (perms->allow & AA_MAY_MOUNT)
++		return 0;
++
++	/* only match data if not binary and the DFA flags data is expected */
++	if (data && !binary && (perms->allow & AA_CONT_MATCH)) {
++		state = aa_dfa_null_transition(dfa, state);
++		if (!state)
++			return 4;
++
++		state = aa_dfa_match(dfa, state, data);
++		if (!state)
++			return 5;
++		*perms = compute_mnt_perms(dfa, state);
++		if (perms->allow & AA_MAY_MOUNT)
++			return 0;
++	}
++
++	/* failed at end of flags match */
++	return 4;
++}
++
++/**
++ * match_mnt - handle path matching for mount
++ * @profile: the confining profile
++ * @mntpnt: string for the mntpnt (NOT NULL)
++ * @devname: string for the devname/src_name (MAYBE NULL)
++ * @type: string for the dev type (MAYBE NULL)
++ * @flags: mount flags to match
++ * @data: fs mount data (MAYBE NULL)
++ * @binary: whether @data is binary
++ * @perms: Returns: permission found by the match
++ * @info: Returns: infomation string about the match for logging
++ *
++ * Returns: 0 on success else error
++ */
++static int match_mnt(struct aa_profile *profile, const char *mntpnt,
++		     const char *devname, const char *type,
++		     unsigned long flags, void *data, bool binary,
++		     struct file_perms *perms, const char **info)
++{
++	int pos;
++
++	if (!profile->policy.dfa)
++		return -EACCES;
++
++	pos = do_match_mnt(profile->policy.dfa,
++			   profile->policy.start[AA_CLASS_MOUNT],
++			   mntpnt, devname, type, flags, data, binary, perms);
++	if (pos) {
++		*info = mnt_info_table[pos];
++		return -EACCES;
++	}
++
++	return 0;
++}
++
++static int path_flags(struct aa_profile *profile, struct path *path)
++{
++	return profile->path_flags |
++		S_ISDIR(path->dentry->d_inode->i_mode) ? PATH_IS_DIR : 0;
++}
++
++int aa_remount(struct aa_profile *profile, struct path *path,
++	       unsigned long flags, void *data)
++{
++	struct file_perms perms = { };
++	const char *name, *info = NULL;
++	char *buffer = NULL;
++	int binary, error;
++
++	binary = path->dentry->d_sb->s_type->fs_flags & FS_BINARY_MOUNTDATA;
++
++	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	error = match_mnt(profile, name, NULL, NULL, flags, data, binary,
++			  &perms, &info);
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL,
++			    NULL, flags, data, AA_MAY_MOUNT, &perms, info,
++			    error);
++	kfree(buffer);
++
++	return error;
++}
++
++int aa_bind_mount(struct aa_profile *profile, struct path *path,
++		  const char *dev_name, unsigned long flags)
++{
++	struct file_perms perms = { };
++	char *buffer = NULL, *old_buffer = NULL;
++	const char *name, *old_name = NULL, *info = NULL;
++	struct path old_path;
++	int error;
++
++	if (!dev_name || !*dev_name)
++		return -EINVAL;
++
++	flags &= MS_REC | MS_BIND;
++
++	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	error = kern_path(dev_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
++	if (error)
++		goto audit;
++
++	error = aa_path_name(&old_path, path_flags(profile, &old_path),
++			     &old_buffer, &old_name, &info);
++	path_put(&old_path);
++	if (error)
++		goto audit;
++
++	error = match_mnt(profile, name, old_name, NULL, flags, NULL, 0,
++			  &perms, &info);
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name,
++			    NULL, NULL, flags, NULL, AA_MAY_MOUNT, &perms,
++			    info, error);
++	kfree(buffer);
++	kfree(old_buffer);
++
++	return error;
++}
++
++int aa_mount_change_type(struct aa_profile *profile, struct path *path,
++			 unsigned long flags)
++{
++	struct file_perms perms = { };
++	char *buffer = NULL;
++	const char *name, *info = NULL;
++	int error;
++
++	/* These are the flags allowed by do_change_type() */
++	flags &= (MS_REC | MS_SILENT | MS_SHARED | MS_PRIVATE | MS_SLAVE |
++		  MS_UNBINDABLE);
++
++	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	error = match_mnt(profile, name, NULL, NULL, flags, NULL, 0, &perms,
++			  &info);
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL,
++			    NULL, flags, NULL, AA_MAY_MOUNT, &perms, info,
++			    error);
++	kfree(buffer);
++
++	return error;
++}
++
++int aa_move_mount(struct aa_profile *profile, struct path *path,
++		  const char *orig_name)
++{
++	struct file_perms perms = { };
++	char *buffer = NULL, *old_buffer = NULL;
++	const char *name, *old_name = NULL, *info = NULL;
++	struct path old_path;
++	int error;
++
++	if (!orig_name || !*orig_name)
++		return -EINVAL;
++
++	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	error = kern_path(orig_name, LOOKUP_FOLLOW, &old_path);
++	if (error)
++		goto audit;
++
++	error = aa_path_name(&old_path, path_flags(profile, &old_path),
++			     &old_buffer, &old_name, &info);
++	path_put(&old_path);
++	if (error)
++		goto audit;
++
++	error = match_mnt(profile, name, old_name, NULL, MS_MOVE, NULL, 0,
++			  &perms, &info);
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name,
++			    NULL, NULL, MS_MOVE, NULL, AA_MAY_MOUNT, &perms,
++			    info, error);
++	kfree(buffer);
++	kfree(old_buffer);
++
++	return error;
++}
++
++int aa_new_mount(struct aa_profile *profile, const char *orig_dev_name,
++		 struct path *path, const char *type, unsigned long flags,
++		 void *data)
++{
++	struct file_perms perms = { };
++	char *buffer = NULL, *dev_buffer = NULL;
++	const char *name = NULL, *dev_name = NULL, *info = NULL;
++	int binary = 1;
++	int error;
++
++	dev_name = orig_dev_name;
++	if (type) {
++		int requires_dev;
++		struct file_system_type *fstype = get_fs_type(type);
++		if (!fstype)
++			return -ENODEV;
++
++		binary = fstype->fs_flags & FS_BINARY_MOUNTDATA;
++		requires_dev = fstype->fs_flags & FS_REQUIRES_DEV;
++		put_filesystem(fstype);
++
++		if (requires_dev) {
++			struct path dev_path;
++
++			if (!dev_name || !*dev_name) {
++				error = -ENOENT;
++				goto out;
++			}
++
++			error = kern_path(dev_name, LOOKUP_FOLLOW, &dev_path);
++			if (error)
++				goto audit;
++
++			error = aa_path_name(&dev_path,
++					     path_flags(profile, &dev_path),
++					     &dev_buffer, &dev_name, &info);
++			path_put(&dev_path);
++			if (error)
++				goto audit;
++		}
++	}
++
++	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	error = match_mnt(profile, name, dev_name, type, flags, data, binary,
++			  &perms, &info);
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name,  dev_name,
++			    type, NULL, flags, data, AA_MAY_MOUNT, &perms, info,
++			    error);
++	kfree(buffer);
++	kfree(dev_buffer);
++
++out:
++	return error;
++
++}
++
++int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags)
++{
++	struct file_perms perms = { };
++	char *buffer = NULL;
++	const char *name, *info = NULL;
++	int error;
++
++	struct path path = { mnt, mnt->mnt_root };
++	error = aa_path_name(&path, path_flags(profile, &path), &buffer, &name,
++			     &info);
++	if (error)
++		goto audit;
++
++	if (!error && profile->policy.dfa) {
++		unsigned int state;
++		state = aa_dfa_match(profile->policy.dfa,
++				     profile->policy.start[AA_CLASS_MOUNT],
++				     name);
++		perms = compute_mnt_perms(profile->policy.dfa, state);
++	}
++
++	if (AA_MAY_UMOUNT & ~perms.allow)
++		error = -EACCES;
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_UMOUNT, name, NULL, NULL,
++			    NULL, 0, NULL, AA_MAY_UMOUNT, &perms, info, error);
++	kfree(buffer);
++
++	return error;
++}
++
++int aa_pivotroot(struct aa_profile *profile, struct path *old_path,
++		  struct path *new_path)
++{
++	struct file_perms perms = { };
++	struct aa_profile *target = NULL;
++	char *old_buffer = NULL, *new_buffer = NULL;
++	const char *old_name, *new_name = NULL, *info = NULL;
++	int error;
++
++	error = aa_path_name(old_path, path_flags(profile, old_path),
++			     &old_buffer, &old_name, &info);
++	if (error)
++		goto audit;
++
++	error = aa_path_name(new_path, path_flags(profile, new_path),
++			     &new_buffer, &new_name, &info);
++	if (error)
++		goto audit;
++
++	if (profile->policy.dfa) {
++		unsigned int state;
++		state = aa_dfa_match(profile->policy.dfa,
++				     profile->policy.start[AA_CLASS_MOUNT],
++				     new_name);
++		state = aa_dfa_null_transition(profile->policy.dfa, state);
++		state = aa_dfa_match(profile->policy.dfa, state, old_name);
++		perms = compute_mnt_perms(profile->policy.dfa, state);
++	}
++
++	if (AA_MAY_PIVOTROOT & perms.allow) {
++		if ((perms.xindex & AA_X_TYPE_MASK) == AA_X_TABLE) {
++			target = x_table_lookup(profile, perms.xindex);
++			if (!target)
++				error = -ENOENT;
++			else
++				error = aa_replace_current_profile(target);
++		}
++	} else
++		error = -EACCES;
++
++audit:
++	error = audit_mount(profile, GFP_KERNEL, OP_PIVOTROOT, new_name,
++			    old_name, NULL, target ? target->base.name : NULL,
++			    0, NULL,  AA_MAY_PIVOTROOT, &perms, info, error);
++	aa_put_profile(target);
++	kfree(old_buffer);
++	kfree(new_buffer);
++
++	return error;
++}
+-- 
+1.7.9.5
+
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index db654fc0505..7f668c96bc5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -177,6 +177,10 @@ with stdenv.lib;
     USER_NS y # Support for user namespaces
   ''}
 
+  # AppArmor support
+  SECURITY_APPARMOR y
+  DEFAULT_SECURITY_APPARMOR y
+
   # Misc. options.
   8139TOO_8129 y
   8139TOO_PIO n # PIO is slower
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index c0c32b051d6..4cb26a78abb 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -9,5 +9,19 @@ import ./generic.nix (args // rec {
     sha256 = "1mszzixiv4k61m241dl2n5s8rca26l6hc40v23lha814nrahjkn1";
   };
 
-  features.iwlwifi = true;
+  # We don't provide these patches if grsecurity is enabled, because
+  # the grsec 3.2 -stable patchset already includes them.
+  kernelPatches = args.kernelPatches ++ (
+    stdenv.lib.optional (!(args.features.grsecurity or false))
+      [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll";
+          patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch;
+        }
+        { name = "0002-AppArmor-compatibility-patch-for-v5-interface";
+          patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch;
+        }
+        { name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke";
+          patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch;
+        }]);
+
+  features.iwlwifi  = true;
 } // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 68fb2496a13..63d0d490402 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -9,6 +9,17 @@ import ./generic.nix (args // rec {
     sha256 = "0kh4y1sbsjm3awplfsd0i59rz7wc1dj23mcs5rwwhc0p7i8w4r75";
   };
 
+  kernelPatches = args.kernelPatches ++
+    [ { name = "0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file";
+        patch = ./apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch;
+      }
+      { name = "0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules";
+        patch = ./apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch;
+      }
+      { name = "0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou";
+        patch = ./apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch;
+      }];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index de1f65e2905..c90f869bf4b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -26,37 +26,12 @@ let
         inherit sha256;
       };
       features.grsecurity = true;
-      # The grsec kernel patchset includes AppArmor patches
-      features.apparmor = true;
-    };
-
-  makeAppArmorPatch = {apparmor, version}:
-    stdenv.mkDerivation {
-      name = "apparmor-${version}.patch";
-      phases = ["installPhase"];
-      installPhase = ''
-        cat ${apparmor}/kernel-patches/${version}/* > $out
-      '';
     };
 
 in
 
 rec {
 
-  apparmor_3_2 = rec {
-    version = "3.2";
-    name = "apparmor-${version}";
-    patch = makeAppArmorPatch { inherit apparmor version; };
-    features.apparmor = true;
-  };
-
-  apparmor_3_4 = rec {
-    version = "3.4";
-    name = "apparmor-${version}";
-    patch = makeAppArmorPatch { inherit apparmor version; };
-    features.apparmor = true;
-  };
-
   no_xsave =
     { name = "no-xsave";
       patch = ./no-xsave.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a61d064bf2..77af3087b3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7064,14 +7064,6 @@ let
     kernelPatches = [];
   };
 
-  linux_3_2_apparmor = lowPrio (linux_3_2.override {
-    kernelPatches = [ kernelPatches.apparmor_3_2 ];
-    extraConfig = ''
-      SECURITY_APPARMOR y
-      DEFAULT_SECURITY_APPARMOR y
-    '';
-  });
-
   linux_3_2_xen = lowPrio (linux_3_2.override {
     extraConfig = ''
       XEN_DOM0 y
@@ -7086,14 +7078,6 @@ let
       ];
   };
 
-  linux_3_4_apparmor = lowPrio (linux_3_4.override {
-    kernelPatches = [ kernelPatches.apparmor_3_4 ];
-    extraConfig = ''
-      SECURITY_APPARMOR y
-      DEFAULT_SECURITY_APPARMOR y
-    '';
-  });
-
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
     inherit fetchurl stdenv perl buildLinux;
   };
@@ -7233,10 +7217,8 @@ let
 
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
-  linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor;
   linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen;
   linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4);
-  linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor;
   linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;

From cb894d4fc3b004cba95043f375ef2665c85df6dd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 17:21:06 -0500
Subject: [PATCH 1477/2033] grsec: updates

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/patches.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c90f869bf4b..a4ebc689b2f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,24 +60,24 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.2.57";
-      revision  = "201404241714";
+    { kversion  = "3.2.58";
+      revision  = "201405112002";
       branch    = "stable";
-      sha256    = "0lrmmqllxas0dnaqswwbznh8cj5w9jw9df5dwzp16j71q8iqnv0c";
+      sha256    = "107jbgl1lz6blrk5rxm10jjhbywav9s56bs7zfs3m1618bff7p7v";
     };
 
   grsecurity_vserver = grsecPatch
-    { kversion  = "3.2.57";
-      revision  = "vs2.3.2.16-201404241715";
+    { kversion  = "3.2.58";
+      revision  = "vs2.3.2.16-201405112004";
       branch    = "vserver";
-      sha256    = "1839hnpxvg2hnkaslb5qbfdq4n5vcsndnkpw9mv0j6snc1wfx76s";
+      sha256    = "0xi7c1q0qsvdvs9vw3iclfz8ykjf56cc9wds6419z1lcgcaykb9w";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.14.2";
-      revision  = "201404270907";
+    { kversion  = "3.14.4";
+      revision  = "201405141623";
       branch    = "test";
-      sha256    = "18hb6k873smhh65cxnmnd3qg9ysw5qlj7yb6m18aam6p77d6krsc";
+      sha256    = "0k9f3n1hxxqa2l10mjk7hy7w9p0mmiqv6s6cbiji2hyvakm5s7p4";
     };
 
   grsec_fix_path =

From 4f27ad14a1ca4fcac1c572c7309cf6b8ef9e3d00 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 14 May 2014 12:04:40 -0500
Subject: [PATCH 1478/2033] grsec: refactor grsecurity packages

This now provides a handful of different grsecurity kernels for slightly
different 'flavors' of packages. This doesn't change the grsecurity
module to use them just yet, however.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/grsecurity.nix         | 125 +-------------
 pkgs/build-support/grsecurity/default.nix     | 153 ++++++++++++++++++
 pkgs/build-support/grsecurity/flavors.nix     |  32 ++++
 .../linux/kernel/common-config.nix            |   2 +-
 pkgs/os-specific/linux/kernel/linux-3.2.nix   |   2 +-
 pkgs/top-level/all-packages.nix               |  66 +++++++-
 6 files changed, 252 insertions(+), 128 deletions(-)
 create mode 100644 pkgs/build-support/grsecurity/default.nix
 create mode 100644 pkgs/build-support/grsecurity/flavors.nix

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index a0f63cdf3a9..78baa0cc5c3 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -3,128 +3,11 @@
 with lib;
 
 let
-  cfg = config.security.grsecurity;
-
-  mkKernel = kernel: patch:
-    assert patch.kversion == kernel.version;
-      { inherit kernel patch;
-        inherit (patch) grversion revision;
+  customGrsecPkg =
+    (import ../../../pkgs/build-support/grsecurity
+      { grsecOptions = config.security.grsecurity;
       };
-
-  stable-patch = with pkgs.kernelPatches;
-    if cfg.vserver then grsecurity_vserver else grsecurity_stable;
-  stableKernel = mkKernel pkgs.linux_3_2  stable-patch;
-  testKernel   = mkKernel pkgs.linux_3_14 pkgs.kernelPatches.grsecurity_unstable;
-
-  ## -- grsecurity configuration -----------------------------------------------
-
-  grsecPrioCfg =
-    if cfg.config.priority == "security" then
-      "GRKERNSEC_CONFIG_PRIORITY_SECURITY y"
-    else
-      "GRKERNSEC_CONFIG_PRIORITY_PERF y";
-
-  grsecSystemCfg =
-    if cfg.config.system == "desktop" then
-      "GRKERNSEC_CONFIG_DESKTOP y"
-    else
-      "GRKERNSEC_CONFIG_SERVER y";
-
-  grsecVirtCfg =
-    if cfg.config.virtualisationConfig == "none" then
-      "GRKERNSEC_CONFIG_VIRT_NONE y"
-    else if cfg.config.virtualisationConfig == "host" then
-      "GRKERNSEC_CONFIG_VIRT_HOST y"
-    else
-      "GRKERNSEC_CONFIG_VIRT_GUEST y";
-
-  grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else
-    if cfg.config.hardwareVirtualisation == true then
-      "GRKERNSEC_CONFIG_VIRT_EPT y"
-    else
-      "GRKERNSEC_CONFIG_VIRT_SOFT y";
-
-  grsecVirtswCfg =
-    let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y";
-    in
-      if cfg.config.virtualisationConfig == "none" then ""
-      else if cfg.config.virtualisationSoftware == "xen"    then virtCfg "XEN"
-      else if cfg.config.virtualisationSoftware == "kvm"    then virtCfg "KVM"
-      else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE"
-      else                                                       virtCfg "VIRTUALBOX";
-
-  grsecMainConfig = if cfg.config.mode == "custom" then "" else ''
-    GRKERNSEC_CONFIG_AUTO y
-    ${grsecPrioCfg}
-    ${grsecSystemCfg}
-    ${grsecVirtCfg}
-    ${grsecHwvirtCfg}
-    ${grsecVirtswCfg}
-  '';
-
-  grsecConfig =
-    let boolToKernOpt = b: if b then "y" else "n";
-        # Disable RANDSTRUCT under virtualbox, as it has some kind of
-        # breakage with the vbox guest drivers
-        randstruct = optionalString config.services.virtualbox.enable
-          "GRKERNSEC_RANDSTRUCT n";
-        # Disable restricting links under the testing kernel, as something
-        # has changed causing it to fail miserably during boot.
-        restrictLinks = optionalString cfg.testing
-          "GRKERNSEC_LINK n";
-    in ''
-      GRKERNSEC y
-      ${grsecMainConfig}
-
-      ${if cfg.config.restrictProc then
-          "GRKERNSEC_PROC_USER y"
-        else
-          optionalString cfg.config.restrictProcWithGroup ''
-            GRKERNSEC_PROC_USERGROUP y
-            GRKERNSEC_PROC_GID ${toString cfg.config.unrestrictProcGid}
-          ''
-      }
-
-      GRKERNSEC_SYSCTL ${boolToKernOpt cfg.config.sysctl}
-      GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod}
-      GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC}
-      ${randstruct}
-      ${restrictLinks}
-
-      ${cfg.config.kernelExtraConfig}
-    '';
-
-  ## -- grsecurity kernel packages ---------------------------------------------
-
-  localver = grkern:
-    "-grsec" + optionalString cfg.config.verboseVersion
-       "-${grkern.grversion}-${grkern.revision}";
-
-  grsecurityOverrider = args: grkern: {
-    # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins)
-    # include libgmp headers, so we need these extra tweaks
-    buildInputs = args.buildInputs ++ [ pkgs.gmp ];
-    preConfigure = ''
-      ${args.preConfigure or ""}
-      sed -i 's|-I|-I${pkgs.gmp}/include -I|' scripts/gcc-plugin.sh
-      sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
-      sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
-      rm localversion-grsec
-      echo ${localver grkern} > localversion-grsec
-    '';
-  };
-
-  mkGrsecPkg = grkern:
-    let kernelPkg = lowPrio (overrideDerivation (grkern.kernel.override (args: {
-          kernelPatches = args.kernelPatches ++ [ grkern.patch pkgs.kernelPatches.grsec_fix_path ];
-          argsOverride = {
-            modDirVersion = "${grkern.kernel.modDirVersion}${localver grkern}";
-          };
-          extraConfig = grsecConfig;
-        })) (args: grsecurityOverrider args grkern));
-    in pkgs.linuxPackagesFor kernelPkg (mkGrsecPkg grkern);
-
-  grsecPackage = mkGrsecPkg (if cfg.stable then stableKernel else testKernel);
+    ).grsecPackage;
 in
 {
   options = {
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
new file mode 100644
index 00000000000..c44fcafe197
--- /dev/null
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -0,0 +1,153 @@
+{ grsecOptions, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = {
+    stable  = grsecOptions.stable  or false;
+    vserver = grsecOptions.vserver or false;
+    testing = grsecOptions.testing or false;
+    config = {
+      mode = "auto";
+      sysctl = false;
+      denyChrootChmod = false;
+      restrictProc = false;
+      restrictProcWithGroup = true;
+      unrestrictProcGid = 121; # Ugh, an awful hack. See grsecurity NixOS gid
+      disableRBAC = false;
+      verboseVersion = false;
+      kernelExtraConfig = "";
+    } // grsecOptions.config;
+  };
+
+  vals = rec {
+
+    mkKernel = kernel: patch:
+      assert patch.kversion == kernel.version;
+        { inherit kernel patch;
+          inherit (patch) grversion revision;
+        };
+
+    test-patch = with pkgs.kernelPatches; grsecurity_unstable;
+    stable-patch = with pkgs.kernelPatches;
+      if (cfg.vserver or false) then grsecurity_vserver else grsecurity_stable;
+
+    stableKernel = mkKernel pkgs.linux_3_2  stable-patch;
+    testKernel   = mkKernel pkgs.linux_3_14 test-patch;
+
+    ## -- grsecurity configuration ---------------------------------------------
+
+    grsecPrioCfg =
+      if cfg.config.priority == "security" then
+        "GRKERNSEC_CONFIG_PRIORITY_SECURITY y"
+      else
+        "GRKERNSEC_CONFIG_PRIORITY_PERF y";
+
+    grsecSystemCfg =
+      if cfg.config.system == "desktop" then
+        "GRKERNSEC_CONFIG_DESKTOP y"
+      else
+        "GRKERNSEC_CONFIG_SERVER y";
+
+    grsecVirtCfg =
+      if cfg.config.virtualisationConfig == "none" then
+        "GRKERNSEC_CONFIG_VIRT_NONE y"
+      else if cfg.config.virtualisationConfig == "host" then
+        "GRKERNSEC_CONFIG_VIRT_HOST y"
+      else
+        "GRKERNSEC_CONFIG_VIRT_GUEST y";
+
+    grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else
+      if cfg.config.hardwareVirtualisation == true then
+        "GRKERNSEC_CONFIG_VIRT_EPT y"
+      else
+        "GRKERNSEC_CONFIG_VIRT_SOFT y";
+
+    grsecVirtswCfg =
+      let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y";
+      in
+        if cfg.config.virtualisationConfig == "none" then ""
+        else if cfg.config.virtualisationSoftware == "xen"    then virtCfg "XEN"
+        else if cfg.config.virtualisationSoftware == "kvm"    then virtCfg "KVM"
+        else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE"
+        else                                                       virtCfg "VIRTUALBOX";
+
+    grsecMainConfig = if cfg.config.mode == "custom" then "" else ''
+      GRKERNSEC_CONFIG_AUTO y
+      ${grsecPrioCfg}
+      ${grsecSystemCfg}
+      ${grsecVirtCfg}
+      ${grsecHwvirtCfg}
+      ${grsecVirtswCfg}
+    '';
+
+    grsecConfig =
+      let boolToKernOpt = b: if b then "y" else "n";
+          # Disable RANDSTRUCT under virtualbox, as it has some kind of
+          # breakage with the vbox guest drivers
+          #randstruct = optionalString config.services.virtualbox.enable
+          #  "GRKERNSEC_RANDSTRUCT n";
+
+          # Disable restricting links under the testing kernel, as something
+          # has changed causing it to fail miserably during boot.
+          restrictLinks = optionalString cfg.testing
+            "GRKERNSEC_LINK n";
+      in ''
+        GRKERNSEC y
+        ${grsecMainConfig}
+
+        ${if cfg.config.restrictProc then
+            "GRKERNSEC_PROC_USER y"
+          else
+            optionalString cfg.config.restrictProcWithGroup ''
+              GRKERNSEC_PROC_USERGROUP y
+              GRKERNSEC_PROC_GID ${toString cfg.config.unrestrictProcGid}
+            ''
+        }
+
+        GRKERNSEC_SYSCTL ${boolToKernOpt cfg.config.sysctl}
+        GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod}
+        GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC}
+        ${restrictLinks}
+
+        ${cfg.config.kernelExtraConfig}
+      '';
+
+    ## -- grsecurity kernel packages -------------------------------------------
+
+    localver = grkern:
+      "-grsec" + optionalString cfg.config.verboseVersion
+         "-${grkern.grversion}-${grkern.revision}";
+
+    grsecurityOverrider = args: grkern: {
+      # Apparently as of gcc 4.6, gcc-plugin headers (which are needed by PaX plugins)
+      # include libgmp headers, so we need these extra tweaks
+      buildInputs = args.buildInputs ++ [ pkgs.gmp ];
+      preConfigure = ''
+        ${args.preConfigure or ""}
+        sed -i 's|-I|-I${pkgs.gmp}/include -I|' scripts/gcc-plugin.sh
+        sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
+        sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
+        rm localversion-grsec
+        echo ${localver grkern} > localversion-grsec
+      '';
+    };
+
+    mkGrsecKern = grkern:
+      lowPrio (overrideDerivation (grkern.kernel.override (args: {
+        kernelPatches = args.kernelPatches ++ [ grkern.patch pkgs.kernelPatches.grsec_fix_path ];
+        argsOverride = {
+          modDirVersion = "${grkern.kernel.modDirVersion}${localver grkern}";
+        };
+        extraConfig = grsecConfig;
+        features.grsecurity = true;
+      })) (args: grsecurityOverrider args grkern));
+
+    mkGrsecPkg = grkern: pkgs.linuxPackagesFor grkern (mkGrsecPkg grkern);
+
+    ## -- Kernel packages ------------------------------------------------------
+
+    grsecKernel  = mkGrsecKern (if cfg.stable then stableKernel else testKernel);
+    grsecPackage = mkGrsecPkg grsecKernel;
+  };
+in vals
diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix
new file mode 100644
index 00000000000..57d52e7cf94
--- /dev/null
+++ b/pkgs/build-support/grsecurity/flavors.nix
@@ -0,0 +1,32 @@
+let
+  mkOpts = ver: prio: sys: virt: swvirt: hwvirt:
+    { config.priority               = prio;
+      config.system                 = sys;
+      config.virtualisationConfig   = virt;
+      config.hardwareVirtualisation = hwvirt;
+      config.virtualisationSoftware = swvirt;
+    } // builtins.listToAttrs [ { name = ver; value = true; } ];
+in
+{
+  # Stable kernels
+  linux_grsec_stable_desktop =
+    mkOpts "stable" "performance" "desktop" "host" "kvm" true;
+  linux_grsec_stable_server  =
+    mkOpts "stable" "security" "server" "host" "kvm" true;
+  linux_grsec_stable_server_xen =
+    mkOpts "stable" "security" "server" "guest" "xen" true;
+
+  # Stable+vserver kernels - server versions only
+  linux_grsec_vserver_server  =
+    mkOpts "vserver" "security" "server" "host" "kvm" true;
+  linux_grsec_vserver_server_xen =
+    mkOpts "vserver" "security" "server" "guest" "xen" true;
+
+  # Testing kernels
+  linux_grsec_testing_desktop =
+    mkOpts "testing" "performance" "desktop" "host" "kvm" true;
+  linux_grsec_testing_server  =
+    mkOpts "testing" "security" "server" "host" "kvm" true;
+  linux_grsec_testing_server_xen =
+    mkOpts "testing" "security" "server" "guest" "xen" true;
+}
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7f668c96bc5..3f623a66a51 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -167,7 +167,7 @@ with stdenv.lib;
   # Security related features.
   STRICT_DEVMEM y # Filter access to /dev/mem
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
-  DEVKMEM n # Disable /dev/kmem
+  DEVKMEM? n # Disable /dev/kmem
   ${if versionOlder version "3.14" then ''
     CC_STACKPROTECTOR y # Detect buffer overflows on the stack
   '' else ''
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 4cb26a78abb..1ff3b48676f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -12,7 +12,7 @@ import ./generic.nix (args // rec {
   # We don't provide these patches if grsecurity is enabled, because
   # the grsec 3.2 -stable patchset already includes them.
   kernelPatches = args.kernelPatches ++ (
-    stdenv.lib.optional (!(args.features.grsecurity or false))
+    stdenv.lib.optionals (!(args.features.grsecurity or false))
       [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll";
           patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch;
         }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77af3087b3d..9252be00344 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7033,6 +7033,8 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
+  # -- Linux kernel expressions ------------------------------------------------
+
   linuxHeaders = linuxHeaders_3_7;
 
   linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix {
@@ -7127,6 +7129,43 @@ let
       ];
   };
 
+  /* grsec configuration
+
+     We build several flavors of 'default' grsec kernels. These are
+     built by default with Hydra. If the user selects a matching
+     'default' flavor, then the pre-canned package set can be
+     chosen. Typically, users will make very basic choices like
+     'security' + 'server' or 'performance' + 'desktop' with
+     virtualisation support. These will then be picked.
+
+     Note: Xen guest kernels are included for e.g. NixOps deployments
+     to EC2, where Xen is the Hypervisor.
+  */
+
+  grFlavors = import ../build-support/grsecurity/flavors.nix;
+
+  mkGrsecurity = opts:
+    (import ../build-support/grsecurity {
+      grsecOptions = opts;
+      inherit pkgs lib;
+    });
+
+  grKernel  = opts: (mkGrsecurity opts).grsecKernel;
+  grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage;
+
+  # Stable kernels
+  linux_grsec_stable_desktop    = grKernel grFlavors.linux_grsec_stable_desktop;
+  linux_grsec_stable_server     = grKernel grFlavors.linux_grsec_stable_server;
+  linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen;
+
+  # Stable+vserver kernels - server versions only
+  linux_grsec_vserver_server     = grKernel grFlavors.linux_grsec_vserver_server;
+  linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen;
+
+  # Testing kernels
+  linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
+  linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
+  linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
@@ -7215,6 +7254,14 @@ let
     zfs_git = callPackage ../os-specific/linux/zfs/git.nix { };
   };
 
+  # The current default kernel / kernel modules.
+  linux = linuxPackages.kernel;
+  linuxPackages = linuxPackages_3_12;
+
+  # Update this when adding the newest kernel major version!
+  linux_latest = pkgs.linux_3_14;
+  linuxPackages_latest = pkgs.linuxPackages_3_14;
+
   # Build the kernel modules for the some of the kernels.
   linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
   linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen;
@@ -7225,12 +7272,21 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
-  # Update this when adding a new version!
-  linuxPackages_latest = pkgs.linuxPackages_3_14;
 
-  # The current default kernel / kernel modules.
-  linux = linuxPackages.kernel;
-  linuxPackages = linuxPackages_3_12;
+  # grsecurity flavors
+  # Stable kernels
+  linuxPackages_grsec_stable_desktop    = grPackage grFlavors.linux_grsec_stable_desktop;
+  linuxPackages_grsec_stable_server     = grPackage grFlavors.linux_grsec_stable_server;
+  linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
+
+  # Stable+vserver kernels - server versions only
+  linuxPackages_grsec_vserver_server     = grPackage grFlavors.linux_grsec_vserver_server;
+  linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen;
+
+  # Testing kernels
+  linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
+  linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
+  linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;

From a257d14925c6e293529c5bb34fc633b32931791d Mon Sep 17 00:00:00 2001
From: Ellis Whitehead <ellis@ellisw.net>
Date: Sat, 17 May 2014 21:35:02 +0200
Subject: [PATCH 1479/2033] R: install lib/libR.so for use by other programs
 such as RStudio

---
 pkgs/applications/science/math/R/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 772d9cdd6ce..edba65146a6 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
       --with-system-pcre
       --with-system-xz
       --with-ICU
+      --enable-R-shlib
       AR=$(type -p ar)
       AWK=$(type -p gawk)
       CC=$(type -p gcc)

From b5b434c98a946fd20cb385ce5c7d346643dd0ff2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 17 May 2014 16:28:56 -0500
Subject: [PATCH 1480/2033] kernel: make some common-config options optional
 for grsec

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 3f623a66a51..1fcb2300ca3 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -280,17 +280,17 @@ with stdenv.lib;
   ''}
 
   # Virtualisation.
-  PARAVIRT y
+  PARAVIRT? y
   ${if versionAtLeast version "3.10" then ''
     HYPERVISOR_GUEST y
   '' else ''
-    PARAVIRT_GUEST y
+    PARAVIRT_GUEST? y
   ''}
-  KVM_GUEST y
+  KVM_GUEST? y
   ${optionalString (versionOlder version "3.7") ''
-    KVM_CLOCK y
+    KVM_CLOCK? y
   ''}
-  XEN y
+  XEN? y
   XEN_DOM0? y
   KSM y
   ${optionalString (!stdenv.is64bit) ''

From 85b5dc39492fab605267b9bf62a26b88fed91d1f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 17 May 2014 16:37:12 -0500
Subject: [PATCH 1481/2033] grsec: Fix vserver/stable packaging

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/build-support/grsecurity/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index c44fcafe197..a9c60a2afbd 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -30,10 +30,11 @@ let
 
     test-patch = with pkgs.kernelPatches; grsecurity_unstable;
     stable-patch = with pkgs.kernelPatches;
-      if (cfg.vserver or false) then grsecurity_vserver else grsecurity_stable;
+      if cfg.vserver then grsecurity_vserver else grsecurity_stable;
 
-    stableKernel = mkKernel pkgs.linux_3_2  stable-patch;
-    testKernel   = mkKernel pkgs.linux_3_14 test-patch;
+    grKernel = if (cfg.stable || cfg.vserver)
+               then mkKernel pkgs.linux_3_2  stable-patch
+               else mkKernel pkgs.linux_3_14 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
@@ -147,7 +148,7 @@ let
 
     ## -- Kernel packages ------------------------------------------------------
 
-    grsecKernel  = mkGrsecKern (if cfg.stable then stableKernel else testKernel);
+    grsecKernel  = mkGrsecKern grKernel;
     grsecPackage = mkGrsecPkg grsecKernel;
   };
 in vals

From aae821493deec98fd93645ddefce9125348a8348 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 17 May 2014 16:45:58 -0500
Subject: [PATCH 1482/2033] Revert "virtualbox: update 4.3.10 -> 4.3.12"

This reverts commit a0ae412a10c5b7bbbcec6523f192b6b52c1222ce.

It snuck by me in #2677. I'll test it more first.
---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 682e7159ac8..266ab11a39f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.3.12"; # changes ./guest-additions as well
+  version = "4.3.10"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,13 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "93733";
+  extpackRevision = "93012";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
+    sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
+    sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index f168c0d5725..5fc75590417 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d";
+    sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From 657998dbcb5e08562b763498b832cd4ee24de938 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 17 May 2014 19:44:03 -0500
Subject: [PATCH 1483/2033] kernel/common-config: Another optional option

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1fcb2300ca3..a403c4d0b71 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -169,9 +169,9 @@ with stdenv.lib;
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   DEVKMEM? n # Disable /dev/kmem
   ${if versionOlder version "3.14" then ''
-    CC_STACKPROTECTOR y # Detect buffer overflows on the stack
+    CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
   '' else ''
-    CC_STACKPROTECTOR_REGULAR y
+    CC_STACKPROTECTOR_REGULAR? y
   ''}
   ${optionalString (versionAtLeast version "3.12") ''
     USER_NS y # Support for user namespaces

From e6f4534ee7175d3b8c6b410f26d106ed74091402 Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sun, 18 May 2014 12:58:49 +0200
Subject: [PATCH 1484/2033] hgal: new package. library for computation
 automorphism group and canonical labelling of a graph

---
 .../development/libraries/haskell/hgal/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/hgal/default.nix

diff --git a/pkgs/development/libraries/haskell/hgal/default.nix b/pkgs/development/libraries/haskell/hgal/default.nix
new file mode 100644
index 00000000000..b8d86d5d303
--- /dev/null
+++ b/pkgs/development/libraries/haskell/hgal/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "hgal";
+  version = "2.0.0.2";
+  sha256 = "17qw8izy54042g56mp3hdbmqcyk95cdarg58xggniwd85q2l5dpi";
+  buildDepends = [ mtl ];
+  meta = {
+    description = "library for computation automorphism group and canonical labelling of a graph";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ianwookim ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index abc09192bb3..886190a34e1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -965,6 +965,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
 
+  hgal = callPackage ../development/libraries/haskell/hgal {};  
+
   hourglass = callPackage ../development/libraries/haskell/hourglass {};
 
   hseCpp = callPackage ../development/libraries/haskell/hse-cpp {};

From 3ce6ce149e8f9c27367c94c3c024ab04be89e7eb Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 18 May 2014 13:00:33 +0200
Subject: [PATCH 1485/2033] Fix dogstatsd, needs procps in path.

(cherry picked from commit ecdb0f7867007b2e5ae0d14a0994d3b502d90fa7)
---
 nixos/modules/services/monitoring/dd-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index 5794ee7fe53..deef64d6998 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -129,7 +129,7 @@ in {
 
     systemd.services.dogstatsd = {
       description = "Datadog statsd";
-      path = [ pkgs."dd-agent" pkgs.python ];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";

From 8e9ead86569772a6572d4565370578910c4bd79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 May 2014 13:25:43 +0200
Subject: [PATCH 1486/2033] berlios.de probably shut down, replace it

The shutdown was announced years ago, only now it stopped working.
---
 nixos/modules/services/x11/display-managers/slim.nix  | 4 ++--
 pkgs/applications/display-managers/slim/default.nix   | 4 ++--
 pkgs/applications/graphics/mirage/default.nix         | 4 ++--
 pkgs/applications/misc/cdrtools/default.nix           | 6 +++---
 pkgs/applications/misc/fetchmail/default.nix          | 2 +-
 pkgs/applications/science/geometry/tetgen/default.nix | 6 +++---
 pkgs/applications/video/lxdvdrip/default.nix          | 6 +++---
 pkgs/development/libraries/dclib/default.nix          | 2 +-
 pkgs/development/libraries/lensfun/default.nix        | 3 ++-
 pkgs/games/crrcsim/default.nix                        | 4 ++--
 pkgs/games/lincity/ng.nix                             | 4 +++-
 pkgs/games/super-tux/default.nix                      | 2 +-
 pkgs/tools/misc/gsmartcontrol/default.nix             | 2 +-
 pkgs/top-level/perl-packages.nix                      | 2 +-
 14 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 114d34557a0..9e645611828 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -58,7 +58,7 @@ in
         default = null;
         example = literalExample ''
           pkgs.fetchurl {
-            url = http://download.berlios.de/slim/slim-wave.tar.gz;
+            url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
             sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
           }
         '';
@@ -66,7 +66,7 @@ in
           The theme for the SLiM login manager.  If not specified, SLiM's
           default theme is used.  See <link
           xlink:href='http://slim.berlios.de/themes01.php'/> for a
-          collection of themes.
+          collection of themes. TODO: berlios shut down.
         '';
       };
 
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index bf2c34b9318..26500939db8 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "slim-1.3.6";
 
   src = fetchurl {
-    url = "http://download.berlios.de/slim/${name}.tar.gz";
+    url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
     sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_LINK = "-lXmu";
 
   meta = {
-    homepage = http://slim.berlios.de;
+    homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index 67b91fd6857..def22804bb6 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -5,7 +5,7 @@ buildPythonPackage rec {
     name = "mirage-0.9.5.2";
 
     src = fetchurl {
-      url = "http://download.berlios.de/mirageiv/${name}.tar.bz2";
+      url = "mirror://sourceforge/mirageiv/${name}.tar.bz2";
       sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
     };
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     meta = {
       description = "Simple image viewer written in PyGTK";
 
-      homepage = http://mirageiv.berlios.de/;
+      homepage = http://mirageiv.sourceforge.net/;
 
       license = "GPLv2";
     };
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index 94af2ee58f5..455ff8d46b8 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "cdrtools-2.01";
   
   configurePhase = "prefix=$out";  
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
   
   src = fetchurl {
-    url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2;
+    url = "mirror://sourceforge/cdrtools/${name}.tar.bz2";
     md5 = "d44a81460e97ae02931c31188fe8d3fd";
   };
   
@@ -24,6 +24,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Highly portable CD/DVD/BluRay command line recording software (deprecated; use cdrkit instead)";
-    homepage = http://cdrecord.berlios.de/old/private/cdrecord.html;
+    homepage = http://sourceforge.net/projects/cdrtools/; # berlios shut down; I found no better link
   };
 }
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index eb01baf44dd..57d677395b4 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   name="fetchmail-${version}";
 
   src = fetchurl {
-    url = "http://download.berlios.de/fetchmail/fetchmail-${version}.tar.bz2";
+    url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
     sha256 = "08rafrs1dlr11myr0p99kg4k80qyy0fa63gg3ac88zn49174lwhw";
   };
 
diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix
index a43ec3b0eb9..d14fa08bbb5 100644
--- a/pkgs/applications/science/geometry/tetgen/default.nix
+++ b/pkgs/applications/science/geometry/tetgen/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   name = "tetgen-1.4.3";
 
   src = fetchurl {
-    url = http://tetgen.berlios.de/files/tetgen1.4.3.tar.gz;
-    sha256 = "159i0vdjz7abb8bycz47ax4fqlzc82kv19sygqnrkr86qm4g43wy";
+    url = "${meta.homepage}/files/tetgen1.4.3.tar.gz";
+    sha256 = "0d70vjqdapmy1ghlsxjlvl5z9yp310zw697bapc4zxmp0sxi29wm";
   };
 
   installPhase = ''
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
-    homepage = "http://tetgen.berlios.de/";
+    homepage = "http://tetgen.org/";
     license = "MIT";
   };
 }
diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix
index 9323a1cbd32..1b3acd2c2ff 100644
--- a/pkgs/applications/video/lxdvdrip/default.nix
+++ b/pkgs/applications/video/lxdvdrip/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, libdvdread }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "lxdvdrip-1.76";
 
   src = fetchurl {
-    url = http://download.berlios.de/lxdvdrip/lxdvdrip-1.76.tgz;
+    url = "mirror://sourceforge/lxdvdrip/${name}.tgz";
     sha256 = "0vgslc7dapfrbgslnaicc8bggdccyrvcgjv1dwi19qswhh7jkzj6";
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = { 
     description = "Command line tool to make a copy from a video DVD for private use";
-    homepage = http://lxdvdrip.berlios.de/;
+    homepage = http://sourceforge.net/projects/lxdvdrip;
     license = "GPLv2";
   };
 }
diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix
index f5077b63adb..a00fbff50b9 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/pkgs/development/libraries/dclib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "dclib-0.3.7";
 
   src = fetchurl {
-    url = http://download.berlios.de/dcgui/dclib-0.3.7.tar.bz2;
+    url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2;
     md5 = "d35833414534bcac8ce2c8a62ce903a4";
   };
 
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 14e22000537..97dda155dc1 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "lensfun-0.2.7";
 
   src = fetchurl {
-    url = "http://download.berlios.de/lensfun/${name}.tar.bz2";
+    url = "mirror://sourceforge/lensfun/${name}.tar.bz2";
     sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx";
   };
 
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.urkud ];
     license = "LGPL3";
     description = "An opensource database of photographic lenses and their characteristics";
+    homepage = http://lensfun.sourceforge.net/;
   };
 }
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 080265e1395..a080436bbe0 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -13,7 +13,7 @@ let
     baseName="crrcsim";
     version="0.9.11";
     name="${baseName}-${version}";
-    url="http://download.berlios.de/${baseName}/${name}.tar.gz";
+    url="mirror://sourceforge/${baseName}.berlios/${name}.tar.gz";
     hash="16z9gixp60920lqckij8kdw90jys0llls4lw5c8vqgk14ck5hhiz";
   };
 in
@@ -41,7 +41,7 @@ rec {
   };
   passthru = {
     updateInfo = {
-      downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad";
+      downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad"; #TODO: berlios shut down
     };
   };
 }) x
diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix
index 4e886466777..8807831ef01 100644
--- a/pkgs/games/lincity/ng.nix
+++ b/pkgs/games/lincity/ng.nix
@@ -8,7 +8,9 @@ let s = # Generated upstream information
     version="2.0";
     name="lincity-2.0";
     hash="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
-    url="http://download.berlios.de/lincity-ng/lincity-ng-2.0.tar.bz2";
+    url="http://pkgs.fedoraproject.org/repo/pkgs/lincity-ng/lincity-ng-2.0.tar.bz2"
+      + "/1bd0f58e0f2b131d70044f4230600ed1/lincity-ng-2.0.tar.bz2";
+      # berlios shut down; I found no better mirror
     sha256="01k6n304qj0z5zmqr49gqirp0jmx2b0cpisgkxk1ga67vyjhdcm6";
   };
   buildInputs = [zlib jam pkgconfig gettext libxml2 libxslt xproto libX11 mesa 
diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix
index 945eaa7fbf8..72a894b63af 100644
--- a/pkgs/games/super-tux/default.nix
+++ b/pkgs/games/super-tux/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "supertux-${version}";
 
   src = fetchurl {
-    url = "http://download.berlios.de/supertux/supertux-${version}.tar.bz2";
+    url = "mirror://sourceforge/supertux.berlios/supertux-${version}.tar.bz2";
     sha256 = "15xdq99jy4hayr96jpqcp15rbr9cs5iamjirafajcrkpa61mi4h0";
   };
 
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index 6cb528cca1d..a937e96eed5 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       It allows you to inspect the drive's SMART data to determine its health,
       as well as run various tests on it.
     '';
-    homepage = http://gsmartcontrol.berlios.de;
+    homepage = http://gsmartcontrol.sourceforge.net/;
     license = "GPLv2+";
     maintainers = with stdenv.lib.maintainers; [qknight];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d654d4fe2c3..b1801298391 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7460,7 +7460,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "8e7dae184444e27ee959e33b3ae161cc83115d11da189ed5003b004450e04b48";
     };
     meta = {
-      homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/;
+      #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement
       description = "Module of basic descriptive statistical functions";
       license = "perl";
     };

From 53ab15b5609d10f33f3b64b69d4e0cfb5cd76961 Mon Sep 17 00:00:00 2001
From: Robert Stark <rst@lob.de>
Date: Sun, 18 May 2014 13:43:21 +0200
Subject: [PATCH 1487/2033] keepnote: update to version 0.7.8

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

diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index 514b8fd3151..419d761b095 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }:
 
 buildPythonPackage {
-  name = "keepnote-0.6.5";
+  name = "keepnote-0.7.8";
   namePrefix = "";
 
   src = fetchurl {
-    url = http://rasm.ods.org/keepnote/download/keepnote-0.6.5.tar.gz;
-    sha256 = "0kipcy90r50z4m9p8pyy9wi4dknsiwdrgy974xgakris2rh4lafw";
+    url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz";
+    sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh";
   };
 
   propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ];

From 9b38460e242b48ab8174150422d6a87d27dd4d7e Mon Sep 17 00:00:00 2001
From: Robert Stark <rst@lob.de>
Date: Sun, 18 May 2014 14:00:02 +0200
Subject: [PATCH 1488/2033] perl-packages: new module: ModernPerl

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d654d4fe2c3..0b454855195 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5214,6 +5214,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ModernPerl = buildPerlPackage {
+    name = "Modern-Perl-1.20140107";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20140107.tar.gz;
+      sha256 = "9cf66b2f93340dfe1cd7162262a47e7c4ba82475a52dc2a036c2fdc8a65298b8";
+    };
+    propagatedBuildInputs = [ perl ];
+    meta = {
+      homepage = https://github.com/chromatic/Modern-Perl;
+      description = "Enable all of the features of Modern Perl with one import";
+      license = "perl";
+    };
+  };
+
   ModuleBuild = buildPerlPackage {
     name = "Module-Build-0.4005";
     src = fetchurl {

From be1a11e64430e2a0c8f3c79ea6cc9479eae1e9c3 Mon Sep 17 00:00:00 2001
From: Robert Stark <rst@lob.de>
Date: Sun, 18 May 2014 14:13:31 +0200
Subject: [PATCH 1489/2033] perl-packages: new module: TieHashIndexed

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d654d4fe2c3..848f35fcd8a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9086,6 +9086,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TieHashIndexed = buildPerlPackage {
+    name = "Tie-Hash-Indexed-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz;
+      sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e";
+    };
+    meta = {
+      description = "Ordered hashes for Perl";
+      license = "perl";
+    };
+  };
+
   TieToObject = buildPerlPackage {
     name = "Tie-ToObject-0.03";
     src = fetchurl {

From bc792bda145736b0106964a8a0801bdeaed82b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 May 2014 14:27:11 +0200
Subject: [PATCH 1490/2033] fix eval after previous commit

---
 nixos/modules/services/x11/display-managers/slim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 9e645611828..48feb12d044 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -58,7 +58,7 @@ in
         default = null;
         example = literalExample ''
           pkgs.fetchurl {
-            url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
+            url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
             sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
           }
         '';

From 67c309fe753964a5832b4e69c581a3006fcf3aed Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 07:38:13 -0500
Subject: [PATCH 1491/2033] Fix fallout from 4f27ad14

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/grsecurity.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 78baa0cc5c3..8fbeeb9ba61 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -3,10 +3,11 @@
 with lib;
 
 let
+  cfg = config.security.grsecurity;
+
   customGrsecPkg =
     (import ../../../pkgs/build-support/grsecurity
-      { grsecOptions = config.security.grsecurity;
-      };
+      { grsecOptions = cfg; }
     ).grsecPackage;
 in
 {
@@ -317,7 +318,7 @@ in
 
     # Enable AppArmor, gradm udev rules, and utilities
     security.apparmor.enable   = true;
-    boot.kernelPackages        = grsecPackage;
+    boot.kernelPackages        = customGrsecPkg;
     services.udev.packages     = [ pkgs.gradm ];
     environment.systemPackages = [ pkgs.gradm pkgs.paxctl pkgs.pax-utils ];
   };

From 8b6300822ba82668f76c9199955760ba9cefcfa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 17 May 2014 12:28:33 +0200
Subject: [PATCH 1492/2033] virtualbox: update 4.3.10 -> 4.3.12

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 266ab11a39f..682e7159ac8 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.3.10"; # changes ./guest-additions as well
+  version = "4.3.12"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,13 +31,13 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "93012";
+  extpackRevision = "93733";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
     # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
-    sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a";
+    sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b";
+    sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5fc75590417..f168c0d5725 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae";
+    sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From 80d0e31a947fd1f07a9fa65c079991980d0fc5bb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 7 May 2014 17:26:33 -0500
Subject: [PATCH 1493/2033] kernel: allow features to be used in common-config

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix |  2 +-
 pkgs/os-specific/linux/kernel/generic.nix       | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a403c4d0b71..3f42787126d 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1,4 +1,4 @@
-{ stdenv, version, kernelPlatform, extraConfig }:
+{ stdenv, version, kernelPlatform, extraConfig, features }:
 
 with stdenv.lib;
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index ff0ca0050fb..8ba677d6dfe 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -109,12 +109,6 @@ let
     crossConfig = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; };
   };
 
-  configWithPlatform = kernelPlatform:
-    import ./common-config.nix { inherit stdenv version kernelPlatform extraConfig; };
-
-  config = configWithPlatform stdenv.platform;
-  configCross = configWithPlatform stdenv.cross.platform;
-
   passthru = {
     # Combine the `features' attribute sets of all the kernel patches.
     features = lib.fold (x: y: (x.features or {}) // y) features kernelPatches;
@@ -124,6 +118,14 @@ let
     passthru = kernel.passthru // (removeAttrs passthru [ "passthru" "meta" ]);
   };
 
+  configWithPlatform = kernelPlatform: import ./common-config.nix
+    { inherit stdenv version kernelPlatform extraConfig;
+      features = passthru.features; # Ensure we know of all extra patches, etc.
+    };
+
+  config = configWithPlatform stdenv.platform;
+  configCross = configWithPlatform stdenv.cross.platform;
+
   nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
 
   crossDrv = lib.addPassthru kernel.crossDrv passthru;

From e64e3ad88ab612379747dff15b62573bda3f8de4 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 08:56:52 -0500
Subject: [PATCH 1494/2033] kernel: only use DEBUG_STACKOVERFLOW if !grsecurity

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 3f42787126d..0bdc2766a69 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -16,7 +16,9 @@ with stdenv.lib;
   DEBUG_DEVRES n
   DEBUG_NX_TEST n
   DEBUG_STACK_USAGE n
-  DEBUG_STACKOVERFLOW n
+  ${optionalString (!(features.grsecurity or true)) ''
+    DEBUG_STACKOVERFLOW n
+  ''}
   RCU_TORTURE_TEST n
   SCHEDSTATS n
   DETECT_HUNG_TASK y

From ac38b32974c9dda02870e79dfb800bad12bb7c02 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 08:57:08 -0500
Subject: [PATCH 1495/2033] kernel/grsec: another optional option

This should fix the testing kernels.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0bdc2766a69..6f927be5259 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -284,7 +284,7 @@ with stdenv.lib;
   # Virtualisation.
   PARAVIRT? y
   ${if versionAtLeast version "3.10" then ''
-    HYPERVISOR_GUEST y
+    HYPERVISOR_GUEST? y
   '' else ''
     PARAVIRT_GUEST? y
   ''}

From 76beda705ed4983c9c6462565e15a7c0f3cc8b28 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 08:58:10 -0500
Subject: [PATCH 1496/2033] kernel/grsec: disable vserver packages for now

Fixing this will require some fiddling due to the odd version number;
see the Hydra build logs for more.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f0fd26f2c0..e120613e205 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7165,8 +7165,8 @@ let
   linux_grsec_stable_server_xen = grKernel grFlavors.linux_grsec_stable_server_xen;
 
   # Stable+vserver kernels - server versions only
-  linux_grsec_vserver_server     = grKernel grFlavors.linux_grsec_vserver_server;
-  linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen;
+  #linux_grsec_vserver_server     = grKernel grFlavors.linux_grsec_vserver_server;
+  #linux_grsec_vserver_server_xen = grKernel grFlavors.linux_grsec_vserver_server_xen;
 
   # Testing kernels
   linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
@@ -7286,8 +7286,8 @@ let
   linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
 
   # Stable+vserver kernels - server versions only
-  linuxPackages_grsec_vserver_server     = grPackage grFlavors.linux_grsec_vserver_server;
-  linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen;
+  #linuxPackages_grsec_vserver_server     = grPackage grFlavors.linux_grsec_vserver_server;
+  #linuxPackages_grsec_vserver_server_xen = grPackage grFlavors.linux_grsec_vserver_server_xen;
 
   # Testing kernels
   linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;

From 1651871250f5071ab13b42468d5612916b2bebf4 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 10:14:03 -0500
Subject: [PATCH 1497/2033] jhc: 0.8.0 -> 0.8.1

Also, bootstrap the compiler with GHC 7.6.3 instead of 6.12.3.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/jhc/default.nix | 33 +++++++++++-----------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index d36c8c2755a..c673d38b76d 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -1,30 +1,31 @@
-{
-  stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
-  regexCompat, HsSyck, random
-}:
+{ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl,
+  regexCompat, HsSyck, random }:
 
 stdenv.mkDerivation rec {
-
   name = "jhc-${version}";
-
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "http://repetae.net/dist/${name}.tar.gz";
-    sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a";
+    sha256 = "11fya5ggk6q4vcm3kwjacfaaqvkammih25saqwlr1g40bcikbnf2";
   };
 
-  buildInputs = [
-    perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random
-  ];
+  patchPhase = ''
+    substituteInPlace ./src/Util/Interact.hs \
+      --replace USE_NOLINE USE_READLINE
+  '';
+
+  buildInputs =
+    [ perl ghc binary zlib utf8String
+      readline fgl regexCompat HsSyck random
+    ];
 
   meta = {
+    description = "Whole-program, globally optimizing Haskell compiler";
     homepage = "http://repetae.net/computer/jhc/";
-    description = "A Haskell compiler which aims to produce the most efficient programs";
-    license = stdenv.lib.licenses.gpl2;
-
+    license = stdenv.lib.licenses.bsd;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.aforemny stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers;
+      [ aforemny simons thoughtpolice ];
   };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e120613e205..0017963dc08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2852,7 +2852,7 @@ let
   };
 
   jhc = callPackage ../development/compilers/jhc {
-    inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl
+    inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl
       regexCompat HsSyck random;
   };
 

From c166bd3e07d1cb4ee7164d6e22b17e03f550a591 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 10:15:06 -0500
Subject: [PATCH 1498/2033] jhc: Fix license

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/jhc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix
index c673d38b76d..7b1054451f9 100644
--- a/pkgs/development/compilers/jhc/default.nix
+++ b/pkgs/development/compilers/jhc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Whole-program, globally optimizing Haskell compiler";
     homepage = "http://repetae.net/computer/jhc/";
-    license = stdenv.lib.licenses.bsd;
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers;
       [ aforemny simons thoughtpolice ];

From 471e5bcf41dacd6d4876b049ed4a62199f015d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 18 May 2014 17:24:03 +0200
Subject: [PATCH 1499/2033] rkflashtool: install more files

rkcrc is quite needed, for example, to prepare files to flash.
---
 pkgs/tools/misc/rkflashtool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
index 895455df61c..c985183c1c0 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     ensureDir $out/bin
-    cp rkflashtool $out/bin
+    cp rkunpack rkcrc rkflashtool $out/bin
   '';
 
   meta = {

From b10fe939eab9169bc0fd942e0ca7ec70ed1d3342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sun, 18 May 2014 18:24:25 +0200
Subject: [PATCH 1500/2033] Fixing binutils cross-building.

Gold is now enabled, and the last time I built this, it was not.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63c2e6a6cd8..c6125e0f35b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3694,7 +3694,7 @@ let
   binutilsCross =
     if crossSystem != null && crossSystem.libc == "libSystem" then darwin.cctools
     else lowPrio (forceNativeDrv (import ../development/tools/misc/binutils {
-      inherit stdenv fetchurl zlib;
+      inherit stdenv fetchurl zlib bison;
       noSysDirs = true;
       cross = assert crossSystem != null; crossSystem;
     }));

From 0781563b4677b43f16a686d40e7e077d4a221e35 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 15:25:47 -0500
Subject: [PATCH 1501/2033] lockdep: 3.14.2 -> 3.14.4

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/lockdep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix
index 82318871e57..9ddcea03475 100644
--- a/pkgs/os-specific/linux/lockdep/default.nix
+++ b/pkgs/os-specific/linux/lockdep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "lockdep-${version}";
-  version = "3.14.2";
+  version = "3.14.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0grf6hksx4gidqim05blsnvk5037y852smr8mn0hcnbwvvp1hxal";
+    sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5";
   };
 
   preConfigure = "cd tools/lib/lockdep";

From 7fbe238a49b7c6d1b228b15fd9a83a0245a6a852 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 15:28:23 -0500
Subject: [PATCH 1502/2033] btsync: 1.3.93 -> 1.3.94

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index 384215cbf9f..c0a07e1e7ce 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "0q91fwzvb5ybl43z9nirnk3bs13z0z5vf0cqdyynqwa93an6wiaq"
-    else if stdenv.system == "i686-linux" then "1y7i9p7fs23ksv8qhcb5gxlrm0wxs090jvdm58war13bg9656fvj"
+  sha256 = if stdenv.system == "x86_64-linux" then "1xba0wv45w4kg84i5sywkfk44vj9wxkr7f1vga2mpz86j8vq25iy";
+    else if stdenv.system == "i686-linux" then "10ml1wclix9236zcb4mh60hdm9vvfaarlb62z7fdrwk6ikqbm7fk";
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "1.3.93";
+  version = "1.3.94";
 
   src  = fetchurl {
     url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";

From d08395713ba6d6118969f63aa9ac238a4992c69e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 15:33:03 -0500
Subject: [PATCH 1503/2033] fmod: 4.44.33 -> 4.44.34

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/fmod/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index 12480bc33ae..1fb71fc4c57 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "fmod-${version}";
-  version = "4.44.33";
+  version = "4.44.34";
 
   src = fetchurl {
-    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44433linux.tar.gz";
-    sha256 = "0s17jb7hbavglw0kiwak74ilppsalx53flc23sh4402ci7jg7qhk";
+    url = "http://www.fmod.org/download/fmodex/api/Linux/fmodapi44434linux.tar.gz";
+    sha256 = "057dvawckw3laavfkzvakyrw5lnvvfabs8myibjc95ap1awacb8x";
   };
 
   dontStrip = true;

From de96d252942d42129d2f177d0917ef870c93ff3d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 15:52:42 -0500
Subject: [PATCH 1504/2033] qemu: 1.7.1 -> 2.0.0

The patch for CVE-2014-0150 is still required.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../virtualization/qemu/cve-2014-2894.patch        | 14 --------------
 pkgs/applications/virtualization/qemu/default.nix  |  6 +++---
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/qemu/cve-2014-2894.patch

diff --git a/pkgs/applications/virtualization/qemu/cve-2014-2894.patch b/pkgs/applications/virtualization/qemu/cve-2014-2894.patch
deleted file mode 100644
index 4f4bcfc06ad..00000000000
--- a/pkgs/applications/virtualization/qemu/cve-2014-2894.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index e1dfe54..c943a4d 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -1602,7 +1602,7 @@ static bool cmd_smart(IDEState *s, uint8_t cmd)
-         case 2: /* extended self test */
-             s->smart_selftest_count++;
-             if (s->smart_selftest_count > 21) {
--                s->smart_selftest_count = 0;
-+                s->smart_selftest_count = 1;
-             }
-             n = 2 + (s->smart_selftest_count - 1) * 24;
-             s->smart_selftest_data[n] = s->sector;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index ac9b3448a14..176d196b064 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -7,17 +7,17 @@
 , x86Only ? false
 }:
 
-let n = "qemu-1.7.1"; in
+let n = "qemu-2.0.0"; in
 
 stdenv.mkDerivation rec {
   name = n + (if x86Only then "-x86-only" else "");
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "1x5y06zhp0gc97g1sb98vf7dkawg63xywv0mbnpfnbi20jh452fn";
+    sha256 = "0frsahiw56jr4cqr9m6s383lyj4ar9hfs2wp3y4yr76krah1mk30";
   };
 
-  patches = [ ./cve-2014-0150.patch ./cve-2014-2894.patch ];
+  patches = [ ./cve-2014-0150.patch ];
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap

From 3d32e49058f4830baa9ddb0b1cba46f02ed048b0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 18 May 2014 16:33:33 -0500
Subject: [PATCH 1505/2033] btsync: fix my stupidity

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix
index c0a07e1e7ce..abb94a32bd7 100644
--- a/pkgs/applications/networking/bittorrentsync/default.nix
+++ b/pkgs/applications/networking/bittorrentsync/default.nix
@@ -5,8 +5,8 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1xba0wv45w4kg84i5sywkfk44vj9wxkr7f1vga2mpz86j8vq25iy";
-    else if stdenv.system == "i686-linux" then "10ml1wclix9236zcb4mh60hdm9vvfaarlb62z7fdrwk6ikqbm7fk";
+  sha256 = if stdenv.system == "x86_64-linux" then "1xba0wv45w4kg84i5sywkfk44vj9wxkr7f1vga2mpz86j8vq25iy"
+    else if stdenv.system == "i686-linux" then "10ml1wclix9236zcb4mh60hdm9vvfaarlb62z7fdrwk6ikqbm7fk"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ];

From dc6c1423cdef7c1b66422f46257f7c43f30fb551 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sat, 17 May 2014 13:21:17 -0700
Subject: [PATCH 1506/2033] build cdecl on darwin

---
 .../tools/cdecl/cdecl-2.5-lex.patch           | 13 +++++++++++++
 pkgs/development/tools/cdecl/default.nix      | 19 +++++++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-lex.patch

diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch b/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch
new file mode 100644
index 00000000000..ecdee5d544f
--- /dev/null
+++ b/pkgs/development/tools/cdecl/cdecl-2.5-lex.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 1643b74..8f1ae11 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@ c++decl: cdgram.c cdlex.c cdecl.c
+ 	rm -f cdecl
+ 
+ cdlex.c: cdlex.l
+-	lex cdlex.l && mv lex.yy.c cdlex.c
++	flex cdlex.l && mv lex.yy.c cdlex.c
+ 
+ cdgram.c: cdgram.y
+ 	yacc cdgram.y && mv y.tab.c cdgram.c
diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index a9eb323f9a8..68fa64a0165 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -1,22 +1,25 @@
-{stdenv, fetchurl, yacc, flex, readline, ncurses}:
+{stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
 
 stdenv.mkDerivation {
   name = "cdecl-2.5";
   src = fetchurl {
-    url = ftp://metalab.unc.edu/pub/linux/devel/lang/c/cdecl-2.5.tar.gz;
-    md5 = "29895dab52e85b2474a59449e07b7996";
+    url = "http://cdecl.org/files/cdecl-blocks-2.5.tar.gz";
+    md5 = "c1927e146975b1c7524cbaf07a7c10f8";
   };
 
-  patches = [ ./cdecl-2.5-implicit-pointer.patch ./cdecl-2.5.patch ./cdecl-2.5-gentoo.patch ];
-  preBuild = "
-    makeFlags=\"PREFIX=$out\"
-  ";
+  patches = [ ./cdecl-2.5-lex.patch ];
+  preBuild = ''
+    ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c;
+    makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline);
+    makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1";
+    mkdir -p $out/bin;
+  '';
   buildInputs = [yacc flex readline ncurses];
 
   meta = {
     description = "Translator English -- C/C++ declarations";
     license = "Public Domain";
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    # platforms = with stdenv.lib.platforms; linux;
   };
 }

From 8be662f659a53c477ab4477d914dfaff29b55827 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 18 May 2014 20:50:40 -0700
Subject: [PATCH 1507/2033] remove patches

---
 .../tools/cdecl/cdecl-2.5-gentoo.patch        | 29 ---------
 .../cdecl/cdecl-2.5-implicit-pointer.patch    | 12 ----
 pkgs/development/tools/cdecl/cdecl-2.5.patch  | 64 -------------------
 3 files changed, 105 deletions(-)
 delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch
 delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch
 delete mode 100644 pkgs/development/tools/cdecl/cdecl-2.5.patch

diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch b/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch
deleted file mode 100644
index b3a67515620..00000000000
--- a/pkgs/development/tools/cdecl/cdecl-2.5-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/cdecl.c	2009-07-07 13:20:37.000000000 +0200
-+++ a/cdecl.c.new	2009-07-07 13:25:00.000000000 +0200
-@@ -91,7 +91,7 @@
- #ifdef USE_READLINE
- # include <readline/readline.h>
-   /* prototypes for functions related to readline() */
--  char * getline();
-+  char * mygetline();
-   char ** attempt_completion(char *, int, int);
-   char * keyword_completion(char *, int);
-   char * command_completion(char *, int);
-@@ -375,7 +375,7 @@
- static char *line_read = NULL;
- 
- /* Read a string, and return a pointer to it.  Returns NULL on EOF. */
--char * getline ()
-+char * mygetline ()
- {
-   /* If the buffer has already been allocated, return the memory
-      to the free pool. */
-@@ -887,7 +887,7 @@
- 
- 	if (!quiet) (void) printf("Type `help' or `?' for help\n");
- 	ret = 0;
--	while ((line = getline())) {
-+	while ((line = mygetline())) {
- 	    if (!strcmp(line, "quit") || !strcmp(line, "exit")) {
- 		free(line);
- 		return ret;
diff --git a/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch b/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch
deleted file mode 100644
index ee4949beb6e..00000000000
--- a/pkgs/development/tools/cdecl/cdecl-2.5-implicit-pointer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cdecl-2.5/cdecl.c
-===================================================================
---- cdecl-2.5.orig/cdecl.c
-+++ cdecl-2.5/cdecl.c
-@@ -204,6 +204,7 @@ int DebugFlag = 0;		/* -d, output debugg
- #define ANSI	4	/* combo not allowed anymore in ANSI compiler */
- #define A	ANSI
- 
-+extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
- /* This is an lower left triangular array. If we needed */
- /* to save 9 bytes, the "long" row can be removed. */
- char crosscheck[9][9] = {
\ No newline at end of file
diff --git a/pkgs/development/tools/cdecl/cdecl-2.5.patch b/pkgs/development/tools/cdecl/cdecl-2.5.patch
deleted file mode 100644
index 4b00849f372..00000000000
--- a/pkgs/development/tools/cdecl/cdecl-2.5.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 9e85686..b8e6e02 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,13 +15,14 @@
- #
- # add -DUSE_READLINE	To compile in support for the GNU readline library.
- 
--CFLAGS= -s -O2 -DUSE_READLINE
-+CFLAGS=-DUSE_READLINE
- CC= gcc
--LIBS= -lreadline -ltermcap
-+LIBS= -lreadline -lncursesw
- ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
--BINDIR= /usr/bin
--MANDIR= /usr/man/man1
--CATDIR= /usr/man/cat1
-+PREFIX?= /usr
-+BINDIR= $(PREFIX)/bin
-+MANDIR= $(PREFIX)/man/man1
-+CATDIR= $(PREFIX)/man/cat1
- INSTALL= install -c
- INSTALL_DATA= install -c -m 644
- 
-@@ -33,7 +34,7 @@ c++decl: cdgram.c cdlex.c cdecl.c
- 	rm -f cdecl
- 
- cdlex.c: cdlex.l
--	lex cdlex.l && mv lex.yy.c cdlex.c
-+	flex cdlex.l && mv lex.yy.c cdlex.c
- 
- cdgram.c: cdgram.y
- 	yacc cdgram.y && mv y.tab.c cdgram.c
-@@ -43,8 +44,10 @@ test:
- 	./c++decl < testset++
- 
- install: cdecl
-+	$(INSTALL) -d $(BINDIR)
- 	$(INSTALL) cdecl $(BINDIR)
- 	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
-+	$(INSTALL) -d $(MANDIR)
- 	$(INSTALL_DATA) cdecl.1 $(MANDIR)
- 	$(INSTALL_DATA) c++decl.1 $(MANDIR)
- 
-diff --git a/cdecl.c b/cdecl.c
-index f03f01e..1fdde9f 100644
---- a/cdecl.c
-+++ b/cdecl.c
-@@ -67,6 +67,7 @@ char cdeclsccsid[] = "@(#)cdecl.c	2.5 1/15/96";
- # include <stddef.h>
- # include <string.h>
- # include <stdarg.h>
-+# include <errno.h>
- #else
- # ifndef NOVARARGS
- #  include <varargs.h>
-@@ -124,7 +125,6 @@ char real_prompt[MAX_NAME+3];
- 
- #if __STDC__
-   char *ds(char *), *cat(char *, ...), *visible(int);
--  int getopt(int,char **,char *);
-   int main(int, char **);
-   int yywrap(void);
-   int dostdin(void);

From 1564af1d991fd9b545be620593a41ac3959d5953 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 18 May 2014 20:51:08 -0700
Subject: [PATCH 1508/2033] update constraints and maintainers

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

diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix
index 68fa64a0165..d923fea8b59 100644
--- a/pkgs/development/tools/cdecl/default.nix
+++ b/pkgs/development/tools/cdecl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Translator English -- C/C++ declarations";
     license = "Public Domain";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    # platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric joelteon];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From d56dcb50f4764c84ec2309ba12978bd71adcd950 Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Sun, 18 May 2014 20:52:18 -0700
Subject: [PATCH 1509/2033] add me to maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 80d0bed23dc..0bd99856463 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  joelteon = "Joel Taylor <me@joelt.io>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";

From b194050ee1cf377f66b55260f48d631ee8b12d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 19 May 2014 10:26:54 +0200
Subject: [PATCH 1510/2033] Fixing the cross gcc building.

gcc 4.8 added libatomic, and it has to be disabled in case of
gccCrossStageStatic, as it requires libc.
---
 pkgs/development/compilers/gcc/4.8/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 4f9e734d41c..01f7ea6e3e6 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -160,6 +160,7 @@ let version = "4.8.2";
           " --disable-libgomp " +
           " --disable-libquadmath" +
           " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
           " --disable-decimal-float" # libdecnumber requires libc
           else
           (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot"

From dcb4eee106060039f35779ded94380646179ad9e Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 19 May 2014 10:41:23 +0100
Subject: [PATCH 1511/2033] haskellPackages.amqp: Don't run tests

The tests require a running AMQP server, and fail if there isn't one running.
---
 pkgs/development/libraries/haskell/amqp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 15079a5ba39..8e9f69f8fc0 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -22,4 +22,5 @@ cabal.mkDerivation (self: {
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
+  doCheck = false;
 })

From be17f7fef205437df3db33f9ade0a6c101e63b18 Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Mon, 19 May 2014 10:46:33 +0100
Subject: [PATCH 1512/2033] haskellPackages.networkMetrics: New expression

---
 .../libraries/haskell/network-metrics/default.nix | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/network-metrics/default.nix

diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix
new file mode 100644
index 00000000000..f9f92170b57
--- /dev/null
+++ b/pkgs/development/libraries/haskell/network-metrics/default.nix
@@ -0,0 +1,15 @@
+{ cabal, binary, dataDefault, network, random, time }:
+
+cabal.mkDerivation (self: {
+  pname = "network-metrics";
+  version = "0.3.2";
+  sha256 = "14yf9di909443gkgaw7n262453d60pp9mw8vncmd6q7pywhdz9hh";
+  buildDepends = [ binary dataDefault network random time ];
+  meta = {
+    homepage = "http://github.com/brendanhay/network-metrics";
+    description = "Send metrics to Ganglia, Graphite, and statsd";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 886190a34e1..205961701ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -965,7 +965,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hexpat = callPackage ../development/libraries/haskell/hexpat {};
 
-  hgal = callPackage ../development/libraries/haskell/hgal {};  
+  hgal = callPackage ../development/libraries/haskell/hgal {};
 
   hourglass = callPackage ../development/libraries/haskell/hourglass {};
 
@@ -1491,6 +1491,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   networkInfo = callPackage ../development/libraries/haskell/network-info {};
 
+  networkMetrics = callPackage ../development/libraries/haskell/network-metrics {};
+
   networkMulticast = callPackage ../development/libraries/haskell/network-multicast {};
 
   networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {};

From a053a0cca726d140d92b6129f40d9d702a01d973 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 May 2014 13:56:30 +0200
Subject: [PATCH 1513/2033] haskell-retry: jailbreak to fix build with recent
 versions of 'exceptions'

---
 pkgs/development/libraries/haskell/retry/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix
index 40fe5dffe87..b78fc66ca06 100644
--- a/pkgs/development/libraries/haskell/retry/default.nix
+++ b/pkgs/development/libraries/haskell/retry/default.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.4";
   sha256 = "16njq924b5n7jyfc059dbypp529gqlc9qnzd7wjk4m7dpm5bww67";
   buildDepends = [ dataDefault exceptions transformers ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/Soostone/retry";
     description = "Retry combinators for monadic actions that may fail";

From f1a80945e4e92a66b809ac4123f70f61dd92be14 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 19 May 2014 15:34:45 +0200
Subject: [PATCH 1514/2033] pass: Bump to 1.6.2.

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

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index eac9de2a306..cf16e3477ed 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -3,12 +3,12 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.1";
+  version = "1.6.2";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "108856223w225xnqmcps6r5dn7sgqc4c3kfa1hd6piskdials59w";
+    sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j";
   };
 
   buildInputs = [ makeWrapper ];

From cd1294cac2aaf38e98cde3109476f27244f6ac97 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 19 May 2014 15:36:12 +0200
Subject: [PATCH 1515/2033] pngcrush: update from 1.7.71 to 1.7.73.

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

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index e5c7fbeb0d7..2a4364164dd 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.71";
+  name = "pngcrush-1.7.73";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd";
+    sha256 = "073y19af0sw36nw7draqw9zfd6n7q7b84kscy26s76fhj5x2gb0l";
   };
 
   configurePhase = ''

From 0e44d8e3e8fff38bb9f9e9c8927caf020caf5a66 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 19 May 2014 15:36:59 +0200
Subject: [PATCH 1516/2033] rebar: update from 2.2.0 to 2.3.0

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

diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix
index a64360c5727..b57c4c263f5 100644
--- a/pkgs/development/tools/build-managers/rebar/default.nix
+++ b/pkgs/development/tools/build-managers/rebar/default.nix
@@ -2,14 +2,14 @@
 
 
 let
-  version = "2.2.0";
+  version = "2.3.0";
 in
 stdenv.mkDerivation {
   name = "rebar-${version}";
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar/archive/${version}.tar.gz";
-    sha256 = "0wprgzin09286v583jmlc385jqpi2lcpdql9srm4c7g39122dg43";
+    sha256 = "0g23ib96lalpmynx39fprlw08ivgyb7i6c6a8jvgqwr9jmd0nj06";
   };
 
   buildInputs = [ erlang ];

From d4dadce5e40343e94275d53f43672de9e382d2d5 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 19 May 2014 15:38:21 +0200
Subject: [PATCH 1517/2033] elixir: update from 0.13.0 to 0.13.2

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 7064d25532a..c558063be3a 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.13.0";
+  version = "0.13.2";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "070jhv38d5f694gn4lgkzx3vcs495jnlgkrp6b3159zbri1mhz5b";
+    sha256 = "13mflf35lj2vbv32s5n982x7k5k55dsn9mx9rf3vkqgfsy7zx4ds";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From 2ee6c0c63e381c2afb3540261a353a7094fcf659 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 16:03:37 +0200
Subject: [PATCH 1518/2033] linux: Update to 3.12.20

---
 .../linux/kernel/cve-2014-0196.patch          | 22 -------------------
 pkgs/os-specific/linux/kernel/linux-3.12.nix  |  6 ++---
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/cve-2014-0196.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2014-0196.patch b/pkgs/os-specific/linux/kernel/cve-2014-0196.patch
deleted file mode 100644
index 5234bab2207..00000000000
--- a/pkgs/os-specific/linux/kernel/cve-2014-0196.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=4291086b1f081b869c6d79e5b7441633dc3ace00
-
-diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 41fe8a0..fe9d129 100644
---- a/drivers/tty/n_tty.c
-+++ b/drivers/tty/n_tty.c
-@@ -2353,8 +2353,12 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
- 			if (tty->ops->flush_chars)
- 				tty->ops->flush_chars(tty);
- 		} else {
-+			struct n_tty_data *ldata = tty->disc_data;
-+
- 			while (nr > 0) {
-+				mutex_lock(&ldata->output_lock);
- 				c = tty->ops->write(tty, b, nr);
-+				mutex_unlock(&ldata->output_lock);
- 				if (c < 0) {
- 					retval = c;
- 					goto break_out;
--- 
-cgit v0.10.1
-
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 9c10d40fd3e..6e94f2432c0 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.19";
+  version = "3.12.20";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1f59lyyyc4anaj50dzb9448gz6n9fdrcy2mvd7f193pp6018gdp6";
+    sha256 = "15pjvlqbbyif8s8mcpb7wf20fvbczhfp65mn6fd609j1p79nvqb9";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2014-0196"; patch = ./cve-2014-0196.patch; } ];
-
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;

From 0a3a90ed01431981b8d3bc593b701a85fe6e6ead Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 16:04:19 +0200
Subject: [PATCH 1519/2033] nspr: Update to 4.10.5

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 08a71a6abc5..f6848ae5860 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.10.4"; in
+let version = "4.10.5"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha1 = "43b2029d990515f952c89d2921397c064fbbe2e7";
+    sha1 = "891de2b62ad42f9b38808a0aa58c95e8cbd5c9a9";
   };
 
   preConfigure = "cd nspr";

From ec332f520ccd1dcaf174e7e6794272d0c3af37ca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 16:04:32 +0200
Subject: [PATCH 1520/2033] nss: Update to 3.16.1

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 920fd75b1b6..a8c12fe4856 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.16";
+  version = "3.16.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_RTM/src/${name}.tar.gz";
-    sha1 = "981dc6ef2f1e69ec7e2b277ce27c7005e9837f95";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_1_RTM/src/${name}.tar.gz";
+    sha1 = "450a88dde8c7e4533507ac8340dbf94be28a759b";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 8b89cba9c6c747ad10afc831dd03ed2af487a794 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 16:04:46 +0200
Subject: [PATCH 1521/2033] firefox: Update to 29.0.1

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 2cb884e2e2d..0c1a974ec69 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,14 +17,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "29.0";
+  firefoxVersion = "29.0.1";
 
-  xulVersion = "29.0"; # this attribute is used by other packages
+  xulVersion = "29.0.1"; # this attribute is used by other packages
 
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "db8fa9a4863bd7427115adec01b7db0e494dffa6";
+    sha1 = "2819ef63403de2bcfff5496bd21a3b8cb5dfce82";
   };
 
   commonConfigureFlags =

From 2cb65a3b99e4a1b26040a2f6e5ff3f810a66c604 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 21:26:47 +0200
Subject: [PATCH 1522/2033] testdisk: Enable NTFS support

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

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index d4866ec11f2..73ac04dd34e 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}:
+{ stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }:
 
 stdenv.mkDerivation {
   name = "testdisk-6.14";
@@ -8,7 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5";
   };
 
-  buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid];
+  buildInputs = [ ncurses libjpeg e2fsprogs zlib openssl libuuid ntfs3g ];
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;

From 48449696895f96b5d6c831d3532fa24a914c6242 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 19 May 2014 21:29:56 +0200
Subject: [PATCH 1523/2033] blender: Make JACK support optional.

---
 pkgs/applications/misc/blender/default.nix | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0435cf66271..930a48a617f 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
-, ilmbase, jackaudio, libXi, libjpeg, libpng, libsamplerate, libsndfile
+, ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib
+, jackaudioSupport ? false, jackaudio
 }:
 
 stdenv.mkDerivation rec {
@@ -12,25 +13,23 @@ stdenv.mkDerivation rec {
     sha256 = "1rgkijn1nirj3jwh058zv6piw8q4j5wwjapgbvh2hh6fpbj84bgb";
   };
 
-  buildInputs = [
-    SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
-    libjpeg libpng libsamplerate libsndfile libtiff mesa openal
-    opencolorio openexr openimageio openjpeg python zlib
-  ];
+  buildInputs =
+    [ SDL boost cmake ffmpeg gettext glew ilmbase jackaudio libXi
+      libjpeg libpng libsamplerate libsndfile libtiff mesa openal
+      opencolorio openexr openimageio openjpeg python zlib
+    ] ++ stdenv.lib.optional jackaudioSupport jackaudio;
 
-
-  cmakeFlags = [
-    "-DOPENEXR_INC=${openexr}/include/OpenEXR"
-    "-DWITH_OPENCOLLADA=OFF"
-    "-DWITH_CODEC_FFMPEG=ON"
-    "-DWITH_CODEC_SNDFILE=ON"
-    "-DWITH_JACK=ON"
-    "-DWITH_INSTALL_PORTABLE=OFF"
-    "-DPYTHON_LIBRARY=python${python.majorVersion}m"    
-    "-DPYTHON_LIBPATH=${python}/lib"
-    "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
-    "-DPYTHON_VERSION=${python.majorVersion}"
-  ];
+  cmakeFlags =
+    [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
+      "-DWITH_OPENCOLLADA=OFF"
+      "-DWITH_CODEC_FFMPEG=ON"
+      "-DWITH_CODEC_SNDFILE=ON"
+      "-DWITH_INSTALL_PORTABLE=OFF"
+      "-DPYTHON_LIBRARY=python${python.majorVersion}m"
+      "-DPYTHON_LIBPATH=${python}/lib"
+      "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
+      "-DPYTHON_VERSION=${python.majorVersion}"
+    ] ++ stdenv.lib.optional jackaudioSupport "-DWITH_JACK=ON";
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
 
@@ -44,6 +43,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];
-
   };
 }

From b34f5503979e10ceec01094eddf757f6e2b98ca4 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Tue, 20 May 2014 11:47:37 +0800
Subject: [PATCH 1524/2033] Update haskell-http-kit to version 0.4.0

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

diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix
index 517fe41e716..6b49c761ae9 100644
--- a/pkgs/development/libraries/haskell/http-kit/default.nix
+++ b/pkgs/development/libraries/haskell/http-kit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-kit";
-  version = "0.3.0";
-  sha256 = "06w19znw6qkf1rcigi83pqx8cpp82q5jd6szlqy0qzrr57336071";
+  version = "0.4.0";
+  sha256 = "0g7gc8faxibj0rhfasa6iaf7ikq4rs0428gca6mhaqp3zf8j7m8h";
   buildDepends = [ caseInsensitive httpTypes ];
   testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ];
   meta = {

From 02a72a7e44afbb0bba05ef6c1b309e72b7aa407e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 May 2014 17:41:52 +0200
Subject: [PATCH 1525/2033] unetbootin: update 585 -> 603

---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 0b97f03a9ad..39b7c809858 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
 
-let version = "585"; in
+let version = "603"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "unetbootin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3";
+    sha256 = "03nhy1w9q0ycpcni6w61ps1mji859nvmvr1bhnlzi04z0s5ldbwx";
   };
 
   sourceRoot = ".";

From 010833c6341998c72407a59763f6f2bfeac40f43 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 19 May 2014 19:37:53 -0300
Subject: [PATCH 1526/2033] mednafen: fix wrong URL (close #2696)

---
 pkgs/misc/emulators/mednafen/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 316a59ab679..d4515b7db03 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.5.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}-${version}.tar.gz";
+    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
     sha256="0c5wvg938y3h4n5lb0dl8pvmjzphhkbba34r6ikpvdahq166ps4j";
   };
 

From e31f212f6b6a46e28b8d0d77d22767432f4a2b44 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 20 May 2014 02:42:31 -0500
Subject: [PATCH 1527/2033] nixos/duosec: Add an option to allow TCP forwarding

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/security/duosec.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index bd961138482..9893e63fb24 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -165,6 +165,17 @@ in
           whitelist.
         '';
       };
+
+      allowTcpForwarding = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          By default, when SSH forwarding, enabling Duo Security will
+          disable TCP forwarding. By enabling this, you potentially
+          undermine some of the SSH based login security. Note this is
+          not needed if you use PAM.
+        '';
+      };
     };
   };
 
@@ -192,7 +203,9 @@ in
        # Duo Security configuration
        ForceCommand ${config.security.wrapperDir}/login_duo
        PermitTunnel no
-       AllowTcpForwarding no
+       ${optionalString (!cfg.allowTcpForwarding) ''
+         AllowTcpForwarding no
+       ''}
      '');
   };
 }

From bddd10d75c333fd09efc89a268067173ec1fc6b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 May 2014 11:10:20 +0200
Subject: [PATCH 1528/2033] switch-to-configuration: Don't restart instances of
 user@.service

Restarting user@ instances is bad because it causes all user services
(such as ssh-agent.service) to be restarted. Maybe one day we can have
switch-to-configuration restart user units in a fine-grained way, but
for now we should just ignore user systemd instances.

Backport: 14.04
---
 nixos/modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 764d7775e98..761600f9e55 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -812,5 +812,7 @@ in
         ${concatStringsSep "\n" cfg.tmpfiles.rules}
       '';
 
+    systemd.services."user@".restartIfChanged = false;
+
   };
 }

From 22f78aa3f47d08050855716467e0b9b53daeee6a Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 20 May 2014 12:37:20 +0200
Subject: [PATCH 1529/2033] Add cutter, TCP/IP Connection cutting

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

diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix
new file mode 100644
index 00000000000..5d383f07210
--- /dev/null
+++ b/pkgs/tools/networking/cutter/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "cutter-1.03";
+
+  src = fetchurl {
+    url = "http://www.digitage.co.uk/digitage/files/cutter/${name}.tgz";
+    md5 = "50093db9b64277643969ee75b83ebbd1";
+  };
+
+  installPhase = ''
+    install -D -m 0755 cutter $out/bin/tcp-cutter
+  '';
+
+  meta = with stdenv.lib; {
+    description = "TCP/IP Connection cutting on Linux Firewalls and Routers";
+    homepage = http://www.digitage.co.uk/digitage/software/linux-security/cutter;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.offline ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6125e0f35b..a241e5a99ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -827,6 +827,8 @@ let
 
   curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
 
+  cutter = callPackage ../tools/networking/cutter { };
+
   dadadodo = builderDefsPackage (import ../tools/text/dadadodo) { };
 
   daq = callPackage ../applications/networking/ids/daq { };

From e4703919881f17b4778692643e4fe84543a889db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 20 May 2014 12:42:39 +0200
Subject: [PATCH 1530/2033] pycairo: fix for python-3.4 by LFS patches

Fixes #2693.
---
 .../python-modules/pycairo/default.nix        | 25 +++++++++++++++----
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 54a50a2b71f..3dc64f68129 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
+{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11 }:
 
 stdenv.mkDerivation rec {
   version = "1.10.0";
@@ -13,12 +13,27 @@ stdenv.mkDerivation rec {
       sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k";
     };
 
+  patches = [(fetchpatch {
+    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch;
+    sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd";
+  })];
+
+  patch_waf = fetchpatch {
+    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch;
+    sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
+  };
+
   buildInputs = [ python pkgconfig cairo x11 ];
-  preConfigure = ''
-    sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf
-    head waf
+
+  configurePhase = ''
+    (
+      cd $(${python.executable} waf unpack)
+      pwd
+      patch -p1 < ${patch_waf}
+    )
+
+    ${python.executable} waf configure --prefix=$out
   '';
-  configurePhase = "${python.executable} waf configure --prefix=$out";
   buildPhase = "${python.executable} waf";
   installPhase = "${python.executable} waf install";
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f2d5f8d823..4f0c07bd82d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -100,7 +100,7 @@ rec {
   };
 
   pycairo = import ../development/python-modules/pycairo {
-    inherit (pkgs) stdenv fetchurl pkgconfig cairo x11;
+    inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11;
     inherit python;
   };
 

From 097f9c7e57a84fd732448eff0ba41a46543a3c1b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 May 2014 13:07:40 +0200
Subject: [PATCH 1531/2033] Fix udev rule required by gpm

Backport: 14.04
---
 nixos/modules/services/hardware/udev.nix | 2 +-
 nixos/modules/services/ttys/gpm.nix      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index f28c00a8e4e..068d14217a2 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -22,7 +22,7 @@ let
     KERNEL=="kqemu",                MODE="0666"
 
     # Needed for gpm.
-    KERNEL=="input/mice", TAG+="systemd"
+    SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd"
   '';
 
   # Perform substitutions in all udev rules files.
diff --git a/nixos/modules/services/ttys/gpm.nix b/nixos/modules/services/ttys/gpm.nix
index 1c0fcf8f16c..308a6d3643a 100644
--- a/nixos/modules/services/ttys/gpm.nix
+++ b/nixos/modules/services/ttys/gpm.nix
@@ -45,6 +45,7 @@ in
 
         wantedBy = [ "multi-user.target" ];
         requires = [ "dev-input-mice.device" ];
+        after = [ "dev-input-mice.device" ];
 
         serviceConfig.ExecStart = "@${pkgs.gpm}/sbin/gpm gpm -m /dev/input/mice -t ${cfg.protocol}";
         serviceConfig.Type = "forking";

From 82ad01e899d4f6e165715633eb6b8ce5e9e9c16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 20 May 2014 13:37:09 +0200
Subject: [PATCH 1532/2033] pygobject3: update 3.10.2 -> 3.12.1

---
 pkgs/development/python-modules/pygobject/3.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 903db3e252c..94de33f0d50 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo }:
- 
+
 stdenv.mkDerivation rec {
-  name = "pygobject-3.10.2";
+  name = "pygobject-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pygobject/3.10/${name}.tar.xz";
-    sha256 = "75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326";
+    url = "mirror://gnome/sources/pygobject/3.12/${name}.tar.xz";
+    sha256 = "0dfsjsa95ix8bx3h8w4bhnz7rymgl2paclvbn93x6qp8b53y0pys";
   };
 
   buildInputs = [ python pkgconfig glib gobjectIntrospection pycairo cairo ];

From 139608dd34414ae63e6679d34436588029d463b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 May 2014 13:38:18 +0200
Subject: [PATCH 1533/2033] Update Ubuntu Packages.bz2 hashes

---
 pkgs/build-support/vm/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 836deaf8b4d..a717561d8da 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1385,7 +1385,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/quantal/universe/binary-i386/Packages.bz2;
-            sha256 = "323036e81c8bf409f71d3bc5cf37cfba72fe1d0fc82e9b5418d4d0cb516646e1";
+            sha256 = "9933ce12e7830b9c68a4aead08b86fcbb8d6ef0ea1fd133f0cf9d7126ad8c9bd";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1402,7 +1402,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/quantal/universe/binary-amd64/Packages.bz2;
-            sha256 = "c762bd4ed063326577a62ff783cf9720e772b03d4a2aa38048918ee6287b96ce";
+            sha256 = "329a98312248c98092f8b91f232fc68fd3e6e2337ea4f348b3785465ae8dae17";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1419,7 +1419,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2;
-            sha256 = "1db19982fc3689b00a918e2cdbb936dfccebbac2ed82f81bb0164a3d51039012";
+            sha256 = "c1a59dd9132654194f4470932fd0f1582496465d8f96909b22accaf9f404024a";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1436,7 +1436,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2;
-            sha256 = "0caf561bad359e8a82a987a076c0f1cb7a43412a5de053c105b160477c192978";
+            sha256 = "8aba137ae18540a12de03a564c11496431a150ab2d4d1e93e2b4b691fa2a4850";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1453,7 +1453,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/saucy/universe/binary-i386/Packages.bz2;
-            sha256 = "84ff81ef23bcece68bfc3dd4b0b1fd38e5b81ac90ad48b4e4210396b425da500";
+            sha256 = "897f64c19a742ac8524c17c1b5ec31b33ec8ab20c85463010d8bf04f5d14aa0f";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1470,7 +1470,7 @@ rec {
           })
           (fetchurl {
             url = mirror://ubuntu/dists/saucy/universe/binary-amd64/Packages.bz2;
-            sha256 = "06ec77f2f5d6ee70ffb805affe3a6b3e8d5b6463fbfe42ba6588295c7e1f65bc";
+            sha256 = "a899ce5513ce8540ce9b8da4c1cd85b16b231900881b3aa559f7ac3182cdbfc8";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1483,11 +1483,11 @@ rec {
       packagesLists =
         [ (fetchurl {
             url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2;
-            sha256 = "1bld2z47cc8adlqgfib1hypj5zwdqalhizzgpmkr3rmmb095lbma";
+            sha256 = "fdfc38663915c5cef3029872deb8c3bf52b98092073058086e2f1db0c71ebeb4";
           })
           (fetchurl {
             url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2;
-            sha256 = "03xqi9vd653hdf31a2l6p3zqfmywwvwlsc54dymxji8ppj7mcgkz";
+            sha256 = "2afcf259332d88c5e02f5446c4926edd567ef1a00ce24ca7cb400cbf44e2a90f";
           })
         ];
       urlPrefix = mirror://ubuntu;
@@ -1500,11 +1500,11 @@ rec {
       packagesList =
         [ (fetchurl {
             url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2;
-            sha256 = "11cw9flmnq3wappmwk87h19jzyrsan15h6p0mmb30ypnrqaz7g9j";
+            sha256 = "7095917eb8e4ac9161bc3b2ceeaf86e9265aae7b855a0e15d72096ecb05f1fc2";
           })
           (fetchurl {
             url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2;
-            sha256 = "06nn3ci8s7zgwharxm76bcbqmnqknpds67zffylyii5hgmbjcnxm";
+            sha256 = "558637eeb8e340b871653e2060effe36e064677eca4eae62d9e4138dd402a610";
           })
         ];
       urlPrefix = mirror://ubuntu;

From d05fa3ccfeafbf81e514a82cf2f04fff2b03659b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 21:08:04 +0200
Subject: [PATCH 1534/2033] Branch gnome 3.12

---
 .../{ => 3.10}/apps/bijiben/default.nix       |   0
 .../{ => 3.10}/apps/evolution/default.nix     |   0
 .../{ => 3.10}/apps/file-roller/default.nix   |   0
 .../gnome-3/{ => 3.10}/apps/gedit/default.nix |   0
 .../gnome-3/{ => 3.10}/apps/glade/default.nix |   0
 .../{ => 3.10}/apps/gnome-clocks/default.nix  |   0
 .../apps/gnome-documents/default.nix          |   0
 .../{ => 3.10}/apps/gnome-music/default.nix   |   0
 .../{ => 3.10}/apps/gnome-photos/default.nix  |   0
 .../{ => 3.10}/apps/seahorse/default.nix      |   0
 .../{ => 3.10}/core/at-spi2-atk/default.nix   |   0
 .../{ => 3.10}/core/at-spi2-core/default.nix  |   0
 .../{ => 3.10}/core/baobab/default.nix        |   0
 .../{ => 3.10}/core/caribou/default.nix       |   0
 .../gnome-3/{ => 3.10}/core/dconf/default.nix |   0
 .../{ => 3.10}/core/empathy/default.nix       |   0
 .../gnome-3/{ => 3.10}/core/eog/default.nix   |   0
 .../{ => 3.10}/core/epiphany/default.nix      |   0
 .../{ => 3.10}/core/evince/default.nix        |   0
 .../core/evolution-data-server/default.nix    |   0
 .../gnome-3/{ => 3.10}/core/folks/default.nix |   0
 .../gnome-3/{ => 3.10}/core/gconf/default.nix |   0
 .../gnome-3/{ => 3.10}/core/gcr/default.nix   |   0
 .../gnome-3/{ => 3.10}/core/gdm/default.nix   |   0
 .../{ => 3.10}/core/geocode-glib/default.nix  |   0
 .../gnome-3/{ => 3.10}/core/gjs/default.nix   |   0
 .../core/gnome-backgrounds/default.nix        |   0
 .../core/gnome-calculator/default.nix         |   0
 .../{ => 3.10}/core/gnome-common/default.nix  |   0
 .../gnome-contacts/configure_dbus_glib.patch  |   0
 .../core/gnome-contacts/default.nix           |   0
 .../gnome-contacts/fix_row_selected.patch     |   0
 .../core/gnome-control-center/default.nix     |   0
 .../search_providers_dir.patch                |   0
 .../{ => 3.10}/core/gnome-desktop/default.nix |   0
 .../core/gnome-dictionary/default.nix         |   0
 .../core/gnome-disk-utility/default.nix       |   0
 .../core/gnome-font-viewer/default.nix        |   0
 .../gnome-icon-theme-symbolic/default.nix     |   0
 .../core/gnome-icon-theme/default.nix         |   0
 .../core/gnome-icon-theme/setup-hook.sh       |   0
 .../{ => 3.10}/core/gnome-keyring/default.nix |   0
 .../{ => 3.10}/core/gnome-menus/default.nix   |   0
 .../core/gnome-online-accounts/default.nix    |   0
 .../core/gnome-online-miners/default.nix      |   0
 .../core/gnome-screenshot/default.nix         |   0
 .../{ => 3.10}/core/gnome-session/default.nix |   0
 .../core/gnome-settings-daemon/default.nix    |   0
 .../core/gnome-shell-extensions/default.nix   |   0
 .../{ => 3.10}/core/gnome-shell/default.nix   |   0
 .../fix_background_corruption.patch           |   0
 .../core/gnome-system-log/default.nix         |   0
 .../core/gnome-system-monitor/default.nix     |   0
 .../core/gnome-terminal/default.nix           |   0
 .../core/gnome-themes-standard/default.nix    |   0
 .../core/gnome-user-docs/default.nix          |   0
 .../core/gnome-user-share/default.nix         |   0
 .../{ => 3.10}/core/grilo-plugins/default.nix |   0
 .../gnome-3/{ => 3.10}/core/grilo/default.nix |   0
 .../gsettings-desktop-schemas/default.nix     |   0
 .../{ => 3.10}/core/gtksourceview/default.nix |   0
 .../{ => 3.10}/core/gucharmap/default.nix     |   0
 .../{ => 3.10}/core/libcroco/default.nix      |   0
 .../{ => 3.10}/core/libgdata/default.nix      |   0
 .../{ => 3.10}/core/libgee/default.nix        |   0
 .../core/libgee/fix_introspection_paths.patch |   0
 .../core/libgnome-keyring/default.nix         |   0
 .../{ => 3.10}/core/libgnomekbd/default.nix   |   0
 .../{ => 3.10}/core/libgweather/default.nix   |   0
 .../{ => 3.10}/core/libgxps/default.nix       |   0
 .../{ => 3.10}/core/libpeas/default.nix       |   0
 .../{ => 3.10}/core/libzapojit/default.nix    |   0
 .../{ => 3.10}/core/mutter/default.nix        |   0
 .../{ => 3.10}/core/nautilus/default.nix      |   0
 .../gnome-3/{ => 3.10}/core/rest/default.nix  |   0
 .../gnome-3/{ => 3.10}/core/sushi/default.nix |   0
 .../core/totem-pl-parser/default.nix          |   0
 .../gnome-3/{ => 3.10}/core/totem/default.nix |   0
 .../{ => 3.10}/core/tracker/default.nix       |   0
 .../gnome-3/{ => 3.10}/core/vino/default.nix  |   0
 .../gnome-3/{ => 3.10}/core/vte/default.nix   |   0
 .../{ => 3.10}/core/yelp-tools/default.nix    |   0
 .../{ => 3.10}/core/yelp-xsl/default.nix      |   0
 .../gnome-3/{ => 3.10}/core/yelp/default.nix  |   0
 .../{ => 3.10}/core/zenity/default.nix        |   0
 pkgs/desktops/gnome-3/{ => 3.10}/default.nix  |   0
 .../{ => 3.10}/desktop/rarian/default.nix     |   0
 .../{ => 3.10}/misc/gexiv2/default.nix        |   0
 .../{ => 3.10}/misc/gfbgraph/default.nix      |   0
 .../gnome-3/{ => 3.10}/misc/gitg/default.nix  |   0
 .../misc/gnome-tweak-tool/default.nix         |   0
 .../gnome-tweak-tool/find_gsettings.patch     |   0
 .../gnome-3/{ => 3.10}/misc/goffice/0.8.nix   |   0
 .../{ => 3.10}/misc/goffice/default.nix       |   0
 .../{ => 3.10}/misc/goffice/pcre_info.patch   |   0
 .../{ => 3.10}/misc/gtkhtml/default.nix       |   0
 .../{ => 3.10}/misc/libgit2-glib/default.nix  |   0
 .../{ => 3.10}/misc/libmediaart/default.nix   |   0
 .../gnome-3/3.12/apps/bijiben/default.nix     |  41 ++++
 .../gnome-3/3.12/apps/evolution/default.nix   |  48 +++++
 .../gnome-3/3.12/apps/file-roller/default.nix |  30 +++
 .../gnome-3/3.12/apps/gedit/default.nix       |  39 ++++
 .../gnome-3/3.12/apps/glade/default.nix       |  37 ++++
 .../3.12/apps/gnome-clocks/default.nix        |  41 ++++
 .../3.12/apps/gnome-documents/default.nix     |  54 +++++
 .../gnome-3/3.12/apps/gnome-music/default.nix |  54 +++++
 .../3.12/apps/gnome-photos/default.nix        |  44 ++++
 .../gnome-3/3.12/apps/seahorse/default.nix    |  41 ++++
 .../gnome-3/3.12/core/at-spi2-atk/default.nix |  21 ++
 .../3.12/core/at-spi2-core/default.nix        |  32 +++
 .../gnome-3/3.12/core/baobab/default.nix      |  42 ++++
 .../gnome-3/3.12/core/caribou/default.nix     |  27 +++
 .../gnome-3/3.12/core/dconf/default.nix       |  28 +++
 .../gnome-3/3.12/core/empathy/default.nix     |  56 +++++
 .../gnome-3/3.12/core/eog/default.nix         |  31 +++
 .../gnome-3/3.12/core/epiphany/default.nix    |  48 +++++
 .../gnome-3/3.12/core/evince/default.nix      |  70 +++++++
 .../core/evolution-data-server/default.nix    |  32 +++
 .../gnome-3/3.12/core/folks/default.nix       |  40 ++++
 .../gnome-3/3.12/core/gconf/default.nix       |  30 +++
 .../gnome-3/3.12/core/gcr/default.nix         |  28 +++
 .../gnome-3/3.12/core/gdm/default.nix         |  18 ++
 .../3.12/core/geocode-glib/default.nix        |  20 ++
 .../gnome-3/3.12/core/gjs/default.nix         |  21 ++
 .../3.12/core/gnome-backgrounds/default.nix   |  16 ++
 .../3.12/core/gnome-calculator/default.nix    |  36 ++++
 .../3.12/core/gnome-common/default.nix        |  17 ++
 .../gnome-contacts/configure_dbus_glib.patch  |  10 +
 .../3.12/core/gnome-contacts/default.nix      |  51 +++++
 .../gnome-contacts/fix_row_selected.patch     |  11 +
 .../core/gnome-control-center/default.nix     |  62 ++++++
 .../search_providers_dir.patch                |  17 ++
 .../3.12/core/gnome-desktop/default.nix       |  27 +++
 .../3.12/core/gnome-dictionary/default.nix    |  38 ++++
 .../3.12/core/gnome-disk-utility/default.nix  |  42 ++++
 .../3.12/core/gnome-font-viewer/default.nix   |  37 ++++
 .../gnome-icon-theme-symbolic/default.nix     |  24 +++
 .../3.12/core/gnome-icon-theme/default.nix    |  18 ++
 .../3.12/core/gnome-icon-theme/setup-hook.sh  |  10 +
 .../3.12/core/gnome-keyring/default.nix       |  38 ++++
 .../gnome-3/3.12/core/gnome-menus/default.nix |  24 +++
 .../core/gnome-online-accounts/default.nix    |  22 ++
 .../3.12/core/gnome-online-miners/default.nix |  35 ++++
 .../3.12/core/gnome-screenshot/default.nix    |  37 ++++
 .../3.12/core/gnome-session/default.nix       |  30 +++
 .../core/gnome-settings-daemon/default.nix    |  34 +++
 .../core/gnome-shell-extensions/default.nix   |  26 +++
 .../gnome-3/3.12/core/gnome-shell/default.nix |  48 +++++
 .../fix_background_corruption.patch           | 147 +++++++++++++
 .../3.12/core/gnome-system-log/default.nix    |  38 ++++
 .../core/gnome-system-monitor/default.nix     |  38 ++++
 .../3.12/core/gnome-terminal/default.nix      |  31 +++
 .../core/gnome-themes-standard/default.nix    |  15 ++
 .../3.12/core/gnome-user-docs/default.nix     |  20 ++
 .../3.12/core/gnome-user-share/default.nix    |  52 +++++
 .../3.12/core/grilo-plugins/default.nix       |  27 +++
 .../gnome-3/3.12/core/grilo/default.nix       |  31 +++
 .../gsettings-desktop-schemas/default.nix     |  30 +++
 .../3.12/core/gtksourceview/default.nix       |  19 ++
 .../gnome-3/3.12/core/gucharmap/default.nix   |  40 ++++
 .../gnome-3/3.12/core/libcroco/default.nix    |  18 ++
 .../gnome-3/3.12/core/libgdata/default.nix    |  25 +++
 .../gnome-3/3.12/core/libgee/default.nix      |  25 +++
 .../core/libgee/fix_introspection_paths.patch |  13 ++
 .../3.12/core/libgnome-keyring/default.nix    |  26 +++
 .../gnome-3/3.12/core/libgnomekbd/default.nix |  24 +++
 .../gnome-3/3.12/core/libgweather/default.nix |  21 ++
 .../gnome-3/3.12/core/libgxps/default.nix     |  20 ++
 .../gnome-3/3.12/core/libpeas/default.nix     |  29 +++
 .../gnome-3/3.12/core/libzapojit/default.nix  |  16 ++
 .../gnome-3/3.12/core/mutter/default.nix      |  33 +++
 .../gnome-3/3.12/core/nautilus/default.nix    |  28 +++
 .../gnome-3/3.12/core/rest/default.nix        |  18 ++
 .../gnome-3/3.12/core/sushi/default.nix       |  38 ++++
 .../3.12/core/totem-pl-parser/default.nix     |  20 ++
 .../gnome-3/3.12/core/totem/default.nix       |  49 +++++
 .../gnome-3/3.12/core/tracker/default.nix     |  49 +++++
 .../gnome-3/3.12/core/vino/default.nix        |  31 +++
 .../gnome-3/3.12/core/vte/default.nix         |  35 ++++
 .../gnome-3/3.12/core/yelp-tools/default.nix  |  22 ++
 .../gnome-3/3.12/core/yelp-xsl/default.nix    |  23 ++
 .../gnome-3/3.12/core/yelp/default.nix        |  36 ++++
 .../gnome-3/3.12/core/zenity/default.nix      |  23 ++
 pkgs/desktops/gnome-3/3.12/default.nix        | 198 ++++++++++++++++++
 .../gnome-3/3.12/desktop/rarian/default.nix   |  16 ++
 .../gnome-3/3.12/misc/gexiv2/default.nix      |  25 +++
 .../gnome-3/3.12/misc/gfbgraph/default.nix    |  23 ++
 .../gnome-3/3.12/misc/gitg/default.nix        |  46 ++++
 .../3.12/misc/gnome-tweak-tool/default.nix    |  46 ++++
 .../gnome-tweak-tool/find_gsettings.patch     |  22 ++
 .../gnome-3/3.12/misc/goffice/0.8.nix         |  37 ++++
 .../gnome-3/3.12/misc/goffice/default.nix     |  36 ++++
 .../gnome-3/3.12/misc/goffice/pcre_info.patch |  13 ++
 .../gnome-3/3.12/misc/gtkhtml/default.nix     |  17 ++
 .../3.12/misc/libgit2-glib/default.nix        |  21 ++
 .../gnome-3/3.12/misc/libmediaart/default.nix |  19 ++
 pkgs/top-level/all-packages.nix               |   6 +-
 197 files changed, 3317 insertions(+), 1 deletion(-)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/bijiben/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/evolution/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/file-roller/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gedit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/glade/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-clocks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-documents/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-music/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/gnome-photos/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/apps/seahorse/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/at-spi2-atk/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/at-spi2-core/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/baobab/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/caribou/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/dconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/empathy/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/eog/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/epiphany/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/evince/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/evolution-data-server/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/folks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gcr/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gdm/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/geocode-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gjs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-backgrounds/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-calculator/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-common/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/configure_dbus_glib.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-contacts/fix_row_selected.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-control-center/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-control-center/search_providers_dir.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-desktop/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-dictionary/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-disk-utility/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-font-viewer/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme-symbolic/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-icon-theme/setup-hook.sh (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-menus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-online-accounts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-online-miners/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-screenshot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-session/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-settings-daemon/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell-extensions/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-shell/fix_background_corruption.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-system-log/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-system-monitor/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-terminal/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-themes-standard/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-user-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gnome-user-share/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/grilo-plugins/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/grilo/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gsettings-desktop-schemas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gtksourceview/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/gucharmap/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libcroco/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgdata/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgee/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgee/fix_introspection_paths.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgnomekbd/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgweather/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libgxps/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libpeas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/libzapojit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/mutter/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/nautilus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/rest/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/sushi/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/totem-pl-parser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/totem/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/tracker/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/vino/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/vte/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp-tools/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp-xsl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/yelp/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/core/zenity/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/desktop/rarian/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gexiv2/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gfbgraph/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gitg/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gnome-tweak-tool/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gnome-tweak-tool/find_gsettings.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/0.8.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/goffice/pcre_info.patch (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/gtkhtml/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/libgit2-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{ => 3.10}/misc/libmediaart/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/eog/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/evince/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/folks/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/rest/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/vino/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/vte/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/bijiben/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/evolution/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/evolution/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/file-roller/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/gedit/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.10/apps/glade/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/glade/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/gnome-music/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/gnome-photos/default.nix
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/apps/seahorse/default.nix
rename to pkgs/desktops/gnome-3/3.10/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/at-spi2-atk/default.nix
diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/at-spi2-core/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/at-spi2-core/default.nix
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.10/core/baobab/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/baobab/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.10/core/caribou/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/caribou/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/caribou/default.nix
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/dconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/dconf/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.10/core/empathy/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/empathy/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/3.10/core/eog/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/eog/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/epiphany/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/epiphany/default.nix
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/3.10/core/evince/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/evince/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/evince/default.nix
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/evolution-data-server/default.nix
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/3.10/core/folks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/folks/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.10/core/gconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gconf/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.10/core/gcr/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gcr/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.10/core/gdm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gdm/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gdm/default.nix
diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/geocode-glib/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gjs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gjs/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gjs/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-calculator/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-common/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-contacts/configure_dbus_glib.patch
rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/configure_dbus_glib.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-contacts/fix_row_selected.patch
rename to pkgs/desktops/gnome-3/3.10/core/gnome-contacts/fix_row_selected.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch
rename to pkgs/desktops/gnome-3/3.10/core/gnome-control-center/search_providers_dir.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-icon-theme-symbolic/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme-symbolic/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-icon-theme/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-icon-theme/setup-hook.sh
rename to pkgs/desktops/gnome-3/3.10/core/gnome-icon-theme/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-menus/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-online-accounts/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-session/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-session/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-shell/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-shell/fix_background_corruption.patch
rename to pkgs/desktops/gnome-3/3.10/core/gnome-shell/fix_background_corruption.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-system-log/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-system-monitor/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-themes-standard/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/grilo-plugins/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.10/core/grilo/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/grilo/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/grilo/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gtksourceview/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/gucharmap/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libcroco/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgdata/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgee/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgee/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgee/fix_introspection_paths.patch
rename to pkgs/desktops/gnome-3/3.10/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgnomekbd/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgweather/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgweather/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libgxps/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libpeas/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/libzapojit/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.10/core/mutter/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/mutter/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/mutter/default.nix
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/nautilus/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/core/rest/default.nix b/pkgs/desktops/gnome-3/3.10/core/rest/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/rest/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.10/core/sushi/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/sushi/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/3.10/core/totem/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/totem/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/totem/default.nix
diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.10/core/tracker/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/tracker/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/tracker/default.nix
diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/3.10/core/vino/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/vino/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/3.10/core/vte/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/vte/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/vte/default.nix
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/yelp-tools/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/yelp/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.10/core/zenity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/core/zenity/default.nix
rename to pkgs/desktops/gnome-3/3.10/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/default.nix
rename to pkgs/desktops/gnome-3/3.10/default.nix
diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/desktop/rarian/default.nix
rename to pkgs/desktops/gnome-3/3.10/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gexiv2/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gfbgraph/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gitg/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gnome-tweak-tool/find_gsettings.patch
rename to pkgs/desktops/gnome-3/3.10/misc/gnome-tweak-tool/find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/goffice/0.8.nix
rename to pkgs/desktops/gnome-3/3.10/misc/goffice/0.8.nix
diff --git a/pkgs/desktops/gnome-3/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/goffice/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/goffice/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/goffice/pcre_info.patch
rename to pkgs/desktops/gnome-3/3.10/misc/goffice/pcre_info.patch
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/misc/libmediaart/default.nix
rename to pkgs/desktops/gnome-3/3.10/misc/libmediaart/default.nix
diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
new file mode 100644
index 00000000000..ef460112d21
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, hicolor_icon_theme, makeWrapper, itstool
+, clutter_gtk, libuuid, webkitgtk, zeitgeist
+, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "bijiben-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz";
+    sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig glib intltool itstool libxml2
+                  clutter_gtk libuuid webkitgtk gnome3.tracker
+                  gnome3.gnome_online_accounts zeitgeist
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/bijiben" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
+    description = "Note editor designed to remain simple to use";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
new file mode 100644
index 00000000000..ee62c951b4c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify
+, makeWrapper, itstool, shared_mime_info, libical, db
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
+, libcanberra_gtk3, bogofilter, gst_all_1, procps }:
+
+stdenv.mkDerivation rec {
+  name = "evolution-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz";
+    sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
+                  gnome3.evolution_data_server libsecret libical
+                  webkitgtk shared_mime_info gnome3.gnome_desktop
+                  libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  nss nspr libnotify procps highlight gnome3.libgweather
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/evolution" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Evolution;
+    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
new file mode 100644
index 00000000000..e13e169ccc5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
+, attr, bzip2, acl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "file-roller-${version}";
+
+  majVersion = "3.10";
+  version = "${majVersion}.2.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
+    sha256 = "14374z1yfbjlgpl4k1ih8b35x8kzvh99y22rwwkc2wfz0d0i1qgx";
+  };
+
+  # TODO: support nautilus
+  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
+
+  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
+                  attr bzip2 acl makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/file-roller" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
new file mode 100644
index 00000000000..84a77e5a024
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, intltool, fetchurl, enchant, isocodes
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libsoup, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gedit-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gedit/3.10/${name}.tar.xz";
+    sha256 = "40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup
+                  gnome3.libpeas gnome3.gtksourceview libxml2
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gedit" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtksourceview}/share:${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gedit;
+    description = "Official text editor of the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
new file mode 100644
index 00000000000..5979d10fa70
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, python
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxml2, docbook_xsl
+, gnome3, librsvg, gdk_pixbuf, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "glade-3.16.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
+    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
+                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/glade" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Glade;
+    description = "User interface designer for GTK+ applications";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
new file mode 100644
index 00000000000..c39f731e028
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, libgweather, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libcanberra_gtk3, libtool
+, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-clocks-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-clocks/3.10/${name}.tar.xz";
+    sha256 = "5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
+                  libgweather libnotify libtool
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-clocks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Clocks;
+    description = "Clock application designed for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
new file mode 100644
index 00000000000..b393bb43931
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, intltool, fetchurl, evince, gjs
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxslt, webkitgtk
+, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, json_glib
+, gmp, desktop_file_utils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-documents-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz";
+    sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+                  docbook_xsl desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg evince
+                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
+                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
+                  gnome3.gnome_desktop gnome3.libzapojit json_glib
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
+    in
+    ''
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
+    wrapProgram "$out/bin/gnome-documents" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH ":" "${libPath}" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Documents;
+    description = "Document manager application designed to work with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
new file mode 100644
index 00000000000..b8d2bbc79ef
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+, python3, libxml2, python3Packages, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-music-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz";
+    sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg python3
+                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
+                  python3Packages.pycairo python3Packages.dbus
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ glib gtk3 libnotify tracker gnome3.grilo cairo
+          gst_all_1.gstreamer gst_all_1.gst-plugins-base
+          gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ];
+    in
+    ''
+    wrapProgram "$out/bin/gnome-music" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${libPath}" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Music;
+    description = "Music player and management application for the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
new file mode 100644
index 00000000000..68d4e3690f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, intltool, fetchurl, exempi, libxml2
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gegl, babl, lcms2
+, desktop_file_utils, gmp
+, gnome3, librsvg, gdk_pixbuf, libexif }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-photos-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz";
+    sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi
+                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
+                  gnome3.gnome_online_accounts gnome3.gnome_desktop
+                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-photos" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Photos;
+    description = "Photos is an application to access, organize and share your photos with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
new file mode 100644
index 00000000000..cecc4a8913d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gnupg, libsoup
+, gnome3, librsvg, gdk_pixbuf, gpgme
+, libsecret, avahi, p11_kit }:
+
+stdenv.mkDerivation rec {
+  name = "seahorse-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/seahorse/3.10/${name}.tar.xz";
+    sha256 = "89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
+                  libsecret avahi libsoup p11_kit
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/seahorse" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Seahorse;
+    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
new file mode 100644
index 00000000000..fc0c4f2a6bc
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi
+, intltool, dbus_glib, at_spi2_core, libSM }:
+
+stdenv.mkDerivation rec {
+  versionMajor = "2.12";
+  versionMinor = "0";
+  moduleName   = "at-spi2-atk";
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
+  };
+
+  buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi
+                  intltool dbus_glib at_spi2_core libSM ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix
new file mode 100644
index 00000000000..d60a0ff7480
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-core/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, python, pkgconfig, popt, intltool, dbus_glib
+, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
+
+stdenv.mkDerivation (rec {
+  versionMajor = "2.12";
+  versionMinor = "0";
+  moduleName   = "at-spi2-core";
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv";
+  };
+
+  buildInputs = [
+    python pkgconfig popt  intltool dbus_glib
+    libX11 xextproto libSM libICE libXtst libXi
+    gobjectIntrospection
+  ];
+
+  # ToDo: on non-NixOS we create a symlink from there?
+  configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
+  // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    NIX_LDFLAGS = "-lintl";
+  }
+)
+
diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
new file mode 100644
index 00000000000..9381f45105d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, vala, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "baobab-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz";
+    sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
+    wrapProgram "$out/bin/baobab" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Baobab;
+    description = "Graphical application to analyse disk usage in any Gnome environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
new file mode 100644
index 00000000000..41a997c1f71
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
+, libxklavier, libXtst, gtk2, intltool, libxslt }:
+
+
+stdenv.mkDerivation rec {
+  name = "caribou-0.4.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
+    sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii";
+  };
+
+  buildInputs = with gnome3;
+    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3
+      libxml2 libXtst gtk2 intltool libxslt ];
+
+  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+
+  preBuild = ''
+    patchShebangs .
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
new file mode 100644
index 00000000000..a6236f16744
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "dconf-${version}";
+  version = "0.18.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz";
+    sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh";
+  };
+
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/dconf-editor" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+
+    rm $out/lib/gio/modules/giomodule.cache
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
new file mode 100644
index 00000000000..051bc9b7fb2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
+, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
+, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
+, telepathy_logger, libnotify, clutter, libsoup, gnutls
+, evolution_data_server
+, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
+
+# TODO: enable more features
+
+stdenv.mkDerivation rec {
+  name = "empathy-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz";
+    sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
+                            gnome3.gnome_icon_theme hicolor_icon_theme
+                            gnome_online_accounts shared_mime_info
+                            gnome3.gnome_icon_theme_symbolic ];
+  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
+                            telepathy_mission_control ];
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper
+                  telepathy_glib clutter_gtk clutter-gst cogl
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
+                  libnotify clutter libsoup gnutls libgee p11_kit
+                  libcanberra_gtk3 telepathy_farstream farstream
+                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+                         "-I${dbus_libs}/include/dbus-1.0"
+                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Empathy;
+    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
+    maintainers = with maintainers; [ lethalman ];
+    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
new file mode 100644
index 00000000000..57f19dcaa32
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
+, shared_mime_info, makeWrapper, librsvg, libexif }:
+
+
+stdenv.mkDerivation rec {
+  name = "eog-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz";
+    sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
+      gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/eog" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
+    platforms = platforms.linux;
+    description = "GNOME image viewer";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
new file mode 100644
index 00000000000..9df3a7ed01e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
+, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
+, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, sqlite, gcr, avahi, nss, isocodes, itstool, file
+, hicolor_icon_theme, gdk_pixbuf, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "epiphany-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz";
+    sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7";
+  };
+
+  # Tests need an X display
+  configureFlags = [ "--disable-static --disable-tests" ];
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  nativeBuildInputs = [ pkgconfig file ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
+                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
+                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
+                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/epiphany" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Epiphany;
+    description = "WebKit based web browser for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
new file mode 100644
index 00000000000..4b50840534c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
@@ -0,0 +1,70 @@
+{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
+, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
+, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
+, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
+, gobjectIntrospection
+}:
+
+stdenv.mkDerivation rec {
+  name = "evince-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz";
+    sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk";
+  };
+
+  buildInputs = [
+    pkgconfig intltool perl perlXMLParser libxml2
+    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
+    itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
+    poppler ghostscriptX djvulibre libspectre
+    makeWrapper libsecret librsvg
+  ];
+
+  configureFlags = [
+    "--disable-nautilus" # Do not use nautilus
+    "--enable-introspection"
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = with stdenv.lib;
+    optionalString doCheck ''
+      for file in test/*.py; do
+        echo "patching $file"
+        sed '1s,/usr,${python},' -i "$file"
+      done
+    '' + optionalString (recentListSize != null) ''
+      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
+      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
+    '';
+
+  preFixup = ''
+    # Tell Glib/GIO about the MIME info directory, which is used
+    # by `g_file_info_get_content_type ()'.
+    wrapProgram "$out/bin/evince" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  doCheck = false; # would need pythonPackages.dogTail, which is missing
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gnome.org/projects/evince/;
+    description = "GNOME's document viewer";
+
+    longDescription = ''
+      Evince is a document viewer for multiple document formats.  It
+      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
+      of Evince is to replace the multiple document viewers that exist
+      on the GNOME Desktop with a single simple application.
+    '';
+
+    license = "GPLv2+";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
new file mode 100644
index 00000000000..685f8c24e7c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
+
+
+stdenv.mkDerivation rec {
+  name = "evolution-data-server-3.10.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
+    sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d";
+  };
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
+      gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper ]
+    ++ stdenv.lib.optional valaSupport vala;
+
+  # uoa irrelevant for now
+  configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
+                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
+  preFixup = ''
+    for f in "$out/libexec/evolution-addressbook-factory" "$out/libexec/evolution-calendar-factory"; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
new file mode 100644
index 00000000000..12518c634c4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
+, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+, telepathy_glib, evolution_data_server, libsecret, db }:
+
+# TODO: enable more folks backends
+
+stdenv.mkDerivation rec {
+  name = "folks-0.9.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
+    sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f";
+  };
+
+  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
+  # dbus_daemon needed for tests
+  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
+                  vala libsecret libxml2 libsoup nspr nss intltool db ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = "--disable-fatal-warnings";
+
+  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
+                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+
+  enableParallelBuilding = true;
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Folks";
+
+    homepage = https://wiki.gnome.org/Projects/Folks;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
new file mode 100644
index 00000000000..47dae0486e9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
+, intltool, polkit, orbit }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.2";
+  versionMinor = "6";
+  moduleName   = "GConf";
+
+  origName = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  name = "gconf-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
+    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
+  };
+
+  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
+  propagatedBuildInputs = [ glib dbus_glib  ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  # ToDo: ldap reported as not found but afterwards reported as supported
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/gconf/;
+    description = "A system for storing application preferences";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
new file mode 100644
index 00000000000..a1fdd471282
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
+, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "gcr-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz";
+    sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0";
+  };
+
+  buildInputs = [
+    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection
+    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper
+  ];
+
+  #doCheck = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gcr-viewer" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
new file mode 100644
index 00000000000..3df5ab40eaf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gdm-3.10.0.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz";
+    sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";
+  };
+
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice
+                  gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
new file mode 100644
index 00000000000..d3b21bef167
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
@@ -0,0 +1,20 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
+
+
+stdenv.mkDerivation rec {
+  name = "geocode-glib-3.10.0";
+
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz";
+    sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig glib libsoup json_glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
new file mode 100644
index 00000000000..429d147e728
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }:
+
+
+stdenv.mkDerivation rec {
+  name = "gjs-1.38.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz";
+    sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b";
+  };
+
+  buildInputs = with gnome3;
+    [ gobjectIntrospection pkgconfig glib pango ];
+
+  propagatedBuildInputs = [ spidermonkey_17 ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
new file mode 100644
index 00000000000..3879b81859a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-backgrounds-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz";
+    sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
new file mode 100644
index 00000000000..205961a9171
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calculator-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz";
+    sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxml2 gnome3.gtksourceview
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-calculator" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
new file mode 100644
index 00000000000..12b2510dc43
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, which, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-common-3.10.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz";
+    sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3";
+  };
+
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
+
+  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
new file mode 100644
index 00000000000..926762defbd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2014-04-08 10:25:49.497620879 +0200
++++ configure.ac	2014-04-08 10:26:36.639440950 +0200
+@@ -43,6 +43,7 @@
+ 	     folks-telepathy
+ 	     folks-eds
+ 	     libnotify
++	     dbus-glib-1
+ 	     telepathy-glib >= 0.17.5
+ 	     libebook-1.2 >= 3.5.3
+ 	     libedataserver-1.2 >= 3.5.3
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
new file mode 100644
index 00000000000..f8059f952e6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, intltool, fetchurl, evolution_data_server, db
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
+, bash, makeWrapper, itstool, folks, libnotify, libxml2
+, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
+, libsoup, vala, dbus_glib, automake114x, autoconf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-contacts-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-contacts/3.10/${name}.tar.xz";
+    sha256 = "e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  # force build from vala
+  preBuild = ''
+   touch src/*.vala
+  '';
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
+                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
+                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
+                  vala automake114x autoconf db ];
+
+  preFixup = ''
+    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  patches = [ ./configure_dbus_glib.patch ./fix_row_selected.patch ];
+
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Contacts;
+    description = "Contacts is GNOME's integrated address book";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch
new file mode 100644
index 00000000000..b379b4b8ee9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch
@@ -0,0 +1,11 @@
+--- src/contacts-view.vala.orig	2014-04-08 11:35:36.302252460 +0200
++++ src/contacts-view.vala	2014-04-08 11:37:37.045343221 +0200
+@@ -265,7 +265,7 @@
+     data.destroy ();
+   }
+ 
+-  public override void row_selected (ListBoxRow row) {
++  public override void row_selected (ListBoxRow? row) {
+     var data = row as ContactDataRow;
+     var contact = data != null ? data.contact : null;
+     selection_changed (contact);
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
new file mode 100644
index 00000000000..1222f03d66e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
@@ -0,0 +1,62 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig
+, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
+, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, libwacom, samba, shared_mime_info, tzdata, icu, libtool
+, docbook_xsl, docbook_xsl_ns, modemmanager }:
+
+# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
+# TODO: bluetooth, wacom, smbclient, printers
+
+stdenv.mkDerivation rec {
+  name = "gnome-control-center-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz";
+    sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
+      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
+      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
+      accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns 
+      networkmanager modemmanager makeWrapper  ];
+
+  preBuild = ''
+    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+
+    # hack to make test-endianess happy
+    mkdir -p $out/share/locale
+    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
+  '';
+
+  preFixup = with gnome3; ''
+    wrapProgram $out/bin/gnome-control-center \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    for i in $out/share/applications/*; do
+      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+    done
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  patches = [ ./search_providers_dir.patch ];
+
+  meta = with stdenv.lib; {
+    description = "Single sign-on framework for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
new file mode 100644
index 00000000000..7f5ad970f34
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
+index d08e230..3bff4ad 100644
+--- a/panels/search/cc-search-panel.c
++++ b/panels/search/cc-search-panel.c
+@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self)
+ {
+   GFile *providers_location;
+ 
+-  providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers");
++  const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR");
++  if (search_providers_dir == NULL) {
++    search_providers_dir = DATADIR "/gnome-shell/search-providers";
++  }
++  providers_location = g_file_new_for_path (search_providers_dir);
+   g_file_enumerate_children_async (providers_location,
+                                    "standard::type,standard::name,standard::content-type",
+                                    G_FILE_QUERY_INFO_NONE,
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
new file mode 100644
index 00000000000..584705d658e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
+, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
+, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+
+  majorVersion = "3.10";
+  minorVersion = "1";
+  name = "gnome-desktop-${majorVersion}.${minorVersion}";
+
+  # this should probably be setuphook for glib
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
+    sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h";
+  };
+
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland
+                  gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
new file mode 100644
index 00000000000..6f68916b781
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-dictionary-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
+    sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-dictionary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Dictionary;
+    description = "Dictionary is the GNOME application to look up definitions";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
new file mode 100644
index 00000000000..334471c2943
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
+, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-disk-utility-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz";
+    sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme
+                            librsvg udisks2 gnome3.gnome_settings_daemon
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxslt libtool libsecret libpwquality cracklib
+                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-disks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+    description = "A udisks graphical front-end";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
new file mode 100644
index 00000000000..cba651ca36a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-font-viewer-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-font-viewer/3.10/${name}.tar.xz";
+    sha256 = "3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-font-viewer" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Program that can preview fonts and create thumbnails for fonts";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
new file mode 100644
index 00000000000..feb3d84b994
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-icon-theme-symbolic-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz";
+    sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412";
+  };
+
+  configureFlags = "--enable-icon-mapping";
+
+  # Avoid postinstall make hooks
+  installPhase = ''
+    make install-exec-am install-data-local install-pkgconfigDATA
+    make -C src install
+  '';
+
+  buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
new file mode 100644
index 00000000000..5b16f827ae0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-icon-theme-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz";
+    sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66";
+  };
+
+  setupHook = ./setup-hook.sh;
+
+  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh
new file mode 100644
index 00000000000..d7156f3d463
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh
@@ -0,0 +1,10 @@
+make_gtk_applications_find_icon_themes() {
+
+    # where to find icon themes
+    if [ -d "$1/share/icons" ]; then
+      addToSearchPath XDG_ICON_DIRS $1/share
+    fi
+	
+}
+
+envHooks+=(make_gtk_applications_find_icon_themes)
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
new file mode 100644
index 00000000000..dbb8da93c6c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-keyring-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz";
+    sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q";
+  };
+
+  buildInputs = with gnome3; [
+    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
+    pango gcr gdk_pixbuf atk p11_kit makeWrapper
+  ];
+
+  propagatedBuildInputs = [ glib libtasn1 libxslt ];
+
+  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+
+  configureFlags = [
+    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
+    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
+    "--with-pkcs11-modules=$$out/lib/pkcs11/"
+  ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-keyring" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    wrapProgram "$out/bin/gnome-keyring-daemon" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
new file mode 100644
index 00000000000..37d2ea1c086
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-menus-${version}";
+  version = "3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
+    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  preBuild = "patchShebangs ./scripts";
+
+  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+
+  meta = {
+    homepage = "http://www.gnome.org";
+    description = "Gnome menu specification";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
new file mode 100644
index 00000000000..8c459435733
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib
+, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnome-online-accounts-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz";
+    sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
new file mode 100644
index 00000000000..4c904bf40f6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
+, libsoup, json_glib, gmp, openssl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-online-miners-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz";
+    sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
+                  gnome3.gnome_online_accounts makeWrapper
+                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    for f in $out/libexec/*; do
+      wrapProgram "$f" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+    description = "A set of crawlers that go through your online content and index them locally in Tracker";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
new file mode 100644
index 00000000000..7b94d0f9027
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-screenshot-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz";
+    sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-screenshot" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+    description = "Utility used in the GNOME desktop environment for taking screenshots";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
new file mode 100644
index 00000000000..f999702af54
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
@@ -0,0 +1,30 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
+, libxslt, intltool, makeWrapper, systemd }:
+
+
+stdenv.mkDerivation rec {
+  name = "gnome-session-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz";
+    sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n";
+  };
+
+  configureFlags = "--enable-systemd";
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
+      gnome3.gnome_settings_daemon
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-session" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
new file mode 100644
index 00000000000..7a50b8db56f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
+, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-settings-daemon-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz";
+    sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop
+      lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
+      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
+      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PATH : "${glib}/bin" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
new file mode 100644
index 00000000000..00974edb1db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extensions-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz";
+    sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+                  makeWrapper file ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+    description = "Modify and extend GNOME Shell functionality and behavior";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
new file mode 100644
index 00000000000..554b09a1e59
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@@ -0,0 +1,48 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
+, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns
+, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
+, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, accountservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-3.10.2.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz";
+    sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j";
+  };
+
+  buildInputs = with gnome3;
+    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountservice
+      libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg
+      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
+      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
+      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
+      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
+
+  preBuild = ''
+    patchShebangs src/data-to-c.pl
+    substituteInPlace data/Makefile --replace " install-keysDATA" ""
+  '';
+
+  preFixup = with gnome3; ''
+    wrapProgram "$out/bin/gnome-shell" \
+      --prefix PATH : "${unzip}/bin" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  patches = [ ./fix_background_corruption.patch ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch
new file mode 100644
index 00000000000..9cb041bcce2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch
@@ -0,0 +1,147 @@
+commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d
+Author: Jasper St. Pierre <jstpierre@mecheye.net>
+Date:   Thu Nov 7 17:14:47 2013 -0500
+
+    layout: Fix several issues with the background management code
+    
+    If monitor-changed fires at startup, it will destroy all of the
+    backgrounds, but since this._isStartup is true, won't recreate any
+    of them. Additionally, since _bgManagers is indexed by monitor index,
+    if the primary index is not 0, it could become a sparse array (e.g.
+    [undefined, undefined, primaryBackground]), and our for loop will
+    crash trying to access properties of undefined.
+    
+    Fix both of these issues by always creating background managers for
+    every monitor, hiding them on startup but only showing them after
+    the startup animation is complete.
+    
+    One thing we need to watch out for is that while LayoutManager is
+    constructing, Main.uiGroup / Main.layoutManager will be undefined,
+    so addBackgroundMenu will fail. Fix this by passing down the uiGroup
+    to the background menu code.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=709313
+
+diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
+index 06e698c..dcbbb39 100644
+--- a/js/ui/backgroundMenu.js
++++ b/js/ui/backgroundMenu.js
+@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({
+     Name: 'BackgroundMenu',
+     Extends: PopupMenu.PopupMenu,
+ 
+-    _init: function(source) {
++    _init: function(source, layoutManager) {
+         this.parent(source, 0, St.Side.TOP);
+ 
+         this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
+@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({
+ 
+         this.actor.add_style_class_name('background-menu');
+ 
+-        Main.uiGroup.add_actor(this.actor);
++        layoutManager.uiGroup.add_actor(this.actor);
+         this.actor.hide();
+     }
+ });
+ 
+-function addBackgroundMenu(actor) {
++function addBackgroundMenu(actor, layoutManager) {
+     let cursor = new St.Bin({ opacity: 0 });
+-    Main.uiGroup.add_actor(cursor);
++    layoutManager.uiGroup.add_actor(cursor);
+ 
+     actor.reactive = true;
+-    actor._backgroundMenu = new BackgroundMenu(cursor);
++    actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
+     actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+     actor._backgroundManager.addMenu(actor._backgroundMenu);
+ 
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 17073a6..80bae9d 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({
+         this.emit('hot-corners-changed');
+     },
+ 
+-    _createBackground: function(monitorIndex) {
++    _addBackgroundMenu: function(bgManager) {
++        BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
++    },
++
++    _createBackgroundManager: function(monitorIndex) {
+         let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
+                                                            layoutManager: this,
+                                                            monitorIndex: monitorIndex });
+-        BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
+-
+-        bgManager.connect('changed', Lang.bind(this, function() {
+-                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
+-                          }));
+ 
+-        this._bgManagers[monitorIndex] = bgManager;
++        bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu));
++        this._addBackgroundMenu(bgManager);
+ 
+-        return bgManager.background;
++        return bgManager;
+     },
+ 
+-    _createSecondaryBackgrounds: function() {
++    _showSecondaryBackgrounds: function() {
+         for (let i = 0; i < this.monitors.length; i++) {
+             if (i != this.primaryIndex) {
+-                let background = this._createBackground(i);
+-
++                let background = this._bgManagers[i].background;
++                background.actor.show();
+                 background.actor.opacity = 0;
+                 Tweener.addTween(background.actor,
+                                  { opacity: 255,
+@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({
+         }
+     },
+ 
+-    _createPrimaryBackground: function() {
+-        this._createBackground(this.primaryIndex);
+-    },
+-
+     _updateBackgrounds: function() {
+         let i;
+         for (i = 0; i < this._bgManagers.length; i++)
+@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({
+         if (Main.sessionMode.isGreeter)
+             return;
+ 
+-        if (this._startingUp)
+-            return;
+-
+         for (let i = 0; i < this.monitors.length; i++) {
+-            this._createBackground(i);
++            let bgManager = this._createBackgroundManager(i);
++            this._bgManagers.push(bgManager);
++
++            if (i != this.primaryIndex && this._startingUp)
++                bgManager.background.actor.hide();
+         }
+     },
+ 
+@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({
+         if (Main.sessionMode.isGreeter) {
+             this.panelBox.translation_y = -this.panelBox.height;
+         } else {
+-            this._createPrimaryBackground();
++            this._updateBackgrounds();
+ 
+             // We need to force an update of the regions now before we scale
+             // the UI group to get the coorect allocation for the struts.
+@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({
+         this.keyboardBox.show();
+ 
+         if (!Main.sessionMode.isGreeter) {
+-            this._createSecondaryBackgrounds();
++            this._showSecondaryBackgrounds();
+             global.window_group.remove_clip();
+         }
+ 
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
new file mode 100644
index 00000000000..cdc4b732b97
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-log-3.9.90";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
+    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-log" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
+    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
new file mode 100644
index 00000000000..91fbe67957f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-monitor-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz";
+    sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+                  gtkmm3 libgtop makeWrapper
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-monitor" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/;
+    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
new file mode 100644
index 00000000000..541db5720db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
+, desktop_file_utils, itstool, ncurses, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.10";
+  versionMinor = "2";
+
+  name = "gnome-terminal-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
+    sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70";
+  };
+
+  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
+                  gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
+
+  preFixup = ''
+    for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
new file mode 100644
index 00000000000..08d82b7ae91
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-themes-standard-3.10.0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz";
+    sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41";
+  };
+  
+  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
new file mode 100644
index 00000000000..d66863a2218
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-docs-3.10.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz";
+    sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905";
+  };
+
+  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-help/3.10;
+    description = "User and system administration help for the Gnome desktop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.cc-by-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
new file mode 100644
index 00000000000..976b0eaca45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
+, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-share-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz";
+    sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = ''
+    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
+  '';
+
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+                     "--disable-bluetooth"
+                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  nautilus libnotify libcanberra_gtk3 ];
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/$name
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
+    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-user-share" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
+    description = "Service that exports the contents of the Public folder in your home directory on the local network";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
new file mode 100644
index 00000000000..a8a1c244767
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
+, gmime, json_glib, avahi, tracker, itstool }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-plugins-0.2.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
+    sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48";
+  };
+
+  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
+
+  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
+                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
+                  avahi gnome3.libmediaart tracker intltool itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "A collection of plugins for the Grilo framework";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
new file mode 100644
index 00000000000..6f1bfbbcfe9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-0.2.10";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
+    sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25";
+  };
+
+  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+
+  preConfigure = ''
+    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
+    done
+  '';
+
+  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+                  gnome3.totem-pl-parser gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
new file mode 100644
index 00000000000..13f357db29a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
+  # just for passthru
+, gtk3, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.10";
+  versionMinor = "1";
+  moduleName   = "gsettings-desktop-schemas";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5";
+  };
+
+  buildInputs = [ glib gobjectIntrospection ];
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  passthru = {
+    doCompileSchemas = ''
+      for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do
+        cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/
+      done
+      ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
+    '';
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
new file mode 100644
index 00000000000..900bb2c922b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+, libxml2Python, perl, intltool, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "gtksourceview-${version}";
+  version = "3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz";
+    sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq";
+  };
+
+  buildInputs = [ pkgconfig atk cairo glib gtk3 pango
+                  libxml2Python perl intltool gettext ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
new file mode 100644
index 00000000000..a6bf72b2fc7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+, glib, desktop_file_utils, bash
+, makeWrapper, gnome3, file, itstool, libxml2 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "gucharmap-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz";
+    sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 intltool itstool glib
+                  gnome3.yelp_tools libxml2 file desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gucharmap" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gucharmap;
+    description = "GNOME Character Map, based on the Unicode Character Database";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
new file mode 100644
index 00000000000..e5f6a0aa9b8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libcroco-0.6.8";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
+    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
+  };
+
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+  buildInputs = [ pkgconfig libxml2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
new file mode 100644
index 00000000000..9a1a45e0d1a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib
+, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "libgdata-0.14.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz";
+    sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
+
+  buildInputs = with gnome3;
+    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
+      liboauth gcr gnome_online_accounts p11_kit openssl ];
+      
+  meta = with stdenv.lib; {
+    description = "GData API library";
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
new file mode 100644
index 00000000000..c7ed541082d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
+let
+  ver_maj = "0.12";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "libgee-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni";
+  };
+
+  doCheck = true;
+
+  patches = [ ./fix_introspection_paths.patch ];
+
+  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 00000000000..67003f45164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
new file mode 100644
index 00000000000..28c7b80c0d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "libgnome-keyring-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz";
+    sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05";
+  };
+
+  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = {
+    description = "Framework for managing passwords and other secrets";
+    homepage = http://live.gnome.org/GnomeKeyring;
+    # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    inherit (glib.meta) platforms maintainers;
+
+    longDescription = ''
+      gnome-keyring is a program that keeps password and other secrets for
+      users. The library libgnome-keyring is used by applications to integrate
+      with the gnome-keyring system.
+    '';
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
new file mode 100644
index 00000000000..1156474e5a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "libgnomekbd-3.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
+    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
+  };
+
+  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+
+  preFixup = ''
+    wrapProgram $out/bin/gkbd-keyboard-display \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Keyboard management library";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
new file mode 100644
index 00000000000..c480a59e453
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
+, pango, gdk_pixbuf, atk, tzdata }:
+
+stdenv.mkDerivation rec {
+  name = "libgweather-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz";
+    sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
+  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
new file mode 100644
index 00000000000..72d307f4f1a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
+, openssl, bzip2, acl, attr
+}:
+
+stdenv.mkDerivation rec {
+  name = "libgxps-0.2.2";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+  };
+
+  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
+
+  configureFlags = "--without-liblcms2";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
new file mode 100644
index 00000000000..9cf8426104b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, glib, gtk3, gobjectIntrospection, python, pygobject3
+}:
+
+stdenv.mkDerivation rec {
+  name = "libpeas-${version}";
+  version = "1.9.0";
+
+  buildInputs =  [
+   intltool pkgconfig
+   glib gtk3 gobjectIntrospection python pygobject3
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz";
+    sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0";
+  };
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = {
+    description = "A GObject-based plugins engine";
+    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
new file mode 100644
index 00000000000..e0e4c02c084
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
+
+stdenv.mkDerivation rec {
+  name = "libzapojit-0.0.3";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
+  };
+
+  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
new file mode 100644
index 00000000000..0acfa9f36ae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
@@ -0,0 +1,33 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
+, libtool, makeWrapper }:
+
+
+stdenv.mkDerivation rec {
+  name = "mutter-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz";
+    sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
+      libcanberra_gtk3 zenity libtool makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/mutter" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
new file mode 100644
index 00000000000..2041a71a82c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
+, gtk, gnome3, libunique, intltool, gobjectIntrospection
+, libnotify, makeWrapper, exempi, librsvg }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz";
+    sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn";
+  };
+
+  configureFlags = [ "--enable-tracker=no" ];
+
+  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
+                  gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/nautilus" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
new file mode 100644
index 00000000000..f543f8e13b8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "rest-0.7.90";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x";
+  };
+
+  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
new file mode 100644
index 00000000000..089b5cd03c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
+, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
+, gdk_pixbuf, librsvg, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "sushi-3.10.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz";
+    sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8";
+  };
+
+  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
+
+  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib
+                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
+                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram $out/libexec/sushi-start \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
+    description = "A quick previewer for Nautilus";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
new file mode 100644
index 00000000000..f1b3bfe53c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "totem-pl-parser-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
+    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+  };
+
+  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Simple GObject-based library to parse and save a host of playlist formats";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
new file mode 100644
index 00000000000..c6b78c827db
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, intltool, fetchurl, gst_all_1
+, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2, dbus_glib
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "totem-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem/3.10/${name}.tar.xz";
+    sha256 = "b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2";
+  };
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/totem" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Movie player for the GNOME desktop based on GStreamer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
new file mode 100644
index 00000000000..dbae108d2e9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, intltool, fetchurl, libxml2, upower
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, vala, sqlite
+, gnome3, librsvg, gdk_pixbuf, file, libnotify
+, evolution_data_server, gst_all_1, poppler
+, icu, taglib, libjpeg, libtiff, giflib, libcue
+, libvorbis, flac, exempi, networkmanager
+, libpng, libexif, libgsf, libuuid, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "tracker-0.16.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz";
+    sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
+                  bzip2 gnome3.totem-pl-parser
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
+                  upower libnotify evolution_data_server gnome3.libgee
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
+                  poppler icu taglib libjpeg libtiff giflib libvorbis
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Tracker;
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
new file mode 100644
index 00000000000..65668dce6a2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
+, libnotify, file }:
+
+stdenv.mkDerivation rec {
+  name = "vino-${versionMajor}.${versionMinor}";
+  versionMajor = "3.10";
+  versionMinor = "1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
+    sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
+
+  preFixup = ''
+    for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
+      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+    description = "GNOME desktop sharing server";
+    maintainers = with maintainers; [ lethalman iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
new file mode 100644
index 00000000000..d98ddc716de
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "0.35";
+  versionMinor = "90";
+  moduleName   = "vte";
+  
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf";
+  };
+
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
+
+  configureFlags = ''--enable-introspection'';
+
+  meta = {
+    homepage = http://www.gnome.org/;
+    description = "A library implementing a terminal emulator widget for GTK+";
+    longDescription = ''
+      VTE is a library (libvte) implementing a terminal emulator widget for
+      GTK+, and a minimal sample application (vte) using that.  Vte is
+      mainly used in gnome-terminal, but can also be used to embed a
+      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
+      character set conversion, as well as emulating any terminal known to
+      the system's terminfo database.
+    '';
+    license = "LGPLv2";
+    maintainers = with stdenv.lib.maintainers; [ astsmtl antono ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
new file mode 100644
index 00000000000..39ff3838f4a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-tools-3.10.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz";
+    sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz";
+  };
+
+  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
+    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
new file mode 100644
index 00000000000..c5060bdba75
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, bash
+, itstool, libxml2, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-xsl-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz";
+    sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp's universal stylesheets for Mallard and DocBook";
+    maintainers = with maintainers; [ lethalman ];
+    # TODO license = [licenses.gpl2 licenses.lgpl2];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
new file mode 100644
index 00000000000..b58aa99721e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz";
+    sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard  ];
+  propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme
+                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/yelp" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp is the help viewer in Gnome.";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
new file mode 100644
index 00000000000..366088c6729
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, itstool }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.8";
+  versionMinor = "0";
+
+  name = "zenity-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz";
+    sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl";
+  };
+
+  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
new file mode 100644
index 00000000000..e5c57903da0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -0,0 +1,198 @@
+{ callPackage, pkgs }:
+
+rec {
+  inherit (pkgs) glib gtk2 gtk3 gnome2;
+  gnome3 = pkgs.gnome3_12;
+  gtk = gtk3; # just to be sure
+  libcanberra = pkgs.libcanberra_gtk3; # just to be sure
+  inherit (pkgs.gnome2) ORBit2;
+  orbit = ORBit2;
+  inherit (pkgs) libsoup;
+
+#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
+
+  at_spi2_atk = callPackage ./core/at-spi2-atk { };
+
+  at_spi2_core = callPackage ./core/at-spi2-core { };
+
+  baobab = callPackage ./core/baobab { };
+
+  caribou = callPackage ./core/caribou { };
+
+  dconf = callPackage ./core/dconf { };
+
+  empathy = callPackage ./core/empathy { };
+
+  epiphany = callPackage ./core/epiphany { };
+
+  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
+
+  evolution_data_server = callPackage ./core/evolution-data-server { };
+
+  gconf = callPackage ./core/gconf { };
+
+  geocode_glib = callPackage ./core/geocode-glib { };
+
+  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
+
+  gdm = callPackage ./core/gdm { };
+
+  gjs = callPackage ./core/gjs { };
+
+  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
+
+  gnome-contacts = callPackage ./core/gnome-contacts { };
+
+  gnome_control_center = callPackage ./core/gnome-control-center { };
+
+  gnome-calculator = callPackage ./core/gnome-calculator { };
+
+  gnome_common = callPackage ./core/gnome-common { };
+
+  gnome_desktop = callPackage ./core/gnome-desktop { };
+
+  gnome-dictionary = callPackage ./core/gnome-dictionary { };
+
+  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
+
+  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
+
+  gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
+
+  gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
+
+  gnome-menus = callPackage ./core/gnome-menus { };
+
+  gnome_keyring = callPackage ./core/gnome-keyring { };
+
+  libgnome_keyring = callPackage ./core/libgnome-keyring { };
+
+  libgnomekbd = callPackage ./core/libgnomekbd { };
+
+  folks = callPackage ./core/folks { };
+
+  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
+
+  gnome-online-miners = callPackage ./core/gnome-online-miners { };
+
+  gnome_session = callPackage ./core/gnome-session { };
+
+  gnome_shell = callPackage ./core/gnome-shell { };
+
+  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
+
+  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
+  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
+
+  gnome-system-log = callPackage ./core/gnome-system-log { };
+
+  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
+
+  gnome_terminal = callPackage ./core/gnome-terminal { };
+
+  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
+
+  gnome-user-docs = callPackage ./core/gnome-user-docs { };
+
+  gnome-user-share = callPackage ./core/gnome-user-share { };
+
+  grilo = callPackage ./core/grilo { };
+
+  grilo-plugins = callPackage ./core/grilo-plugins { };
+
+  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
+
+  gtksourceview = callPackage ./core/gtksourceview { };
+
+  gucharmap = callPackage ./core/gucharmap { };
+
+  gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
+
+  eog = callPackage ./core/eog { };
+
+  libcroco = callPackage ./core/libcroco {};
+
+  libgee = callPackage ./core/libgee { };
+
+  libgdata = callPackage ./core/libgdata { };
+
+  libgxps = callPackage ./core/libgxps { };
+
+  libpeas = callPackage ./core/libpeas {};
+
+  libgweather = callPackage ./core/libgweather { };
+
+  libzapojit = callPackage ./core/libzapojit { };
+
+  mutter = callPackage ./core/mutter { };
+
+  nautilus = callPackage ./core/nautilus { };
+
+  rest = callPackage ./core/rest { };
+
+  sushi = callPackage ./core/sushi { };
+
+  totem = callPackage ./core/totem { };
+
+  totem-pl-parser = callPackage ./core/totem-pl-parser { };
+
+  tracker = callPackage ./core/tracker { };
+
+  vte = callPackage ./core/vte { };
+
+  vino = callPackage ./core/vino { };
+
+  yelp = callPackage ./core/yelp { };
+
+  yelp_xsl = callPackage ./core/yelp-xsl { };
+
+  yelp_tools = callPackage ./core/yelp-tools { };
+
+  zenity = callPackage ./core/zenity { };
+
+
+#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
+
+  bijiben = callPackage ./apps/bijiben { };
+
+  evolution = callPackage ./apps/evolution { };
+
+  file-roller = callPackage ./apps/file-roller { };
+
+  gedit = callPackage ./apps/gedit { };
+
+  glade = callPackage ./apps/glade { };
+
+  gnome-clocks = callPackage ./apps/gnome-clocks { };
+
+  gnome-documents = callPackage ./apps/gnome-documents { };
+
+  gnome-music = callPackage ./apps/gnome-music { };
+
+  gnome-photos = callPackage ./apps/gnome-photos { };
+
+  # scrollkeeper replacement
+  rarian = callPackage ./desktop/rarian { };
+
+  seahorse = callPackage ./apps/seahorse { };
+
+
+#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
+
+  gfbgraph = callPackage ./misc/gfbgraph { };
+
+  goffice = callPackage ./misc/goffice { };
+
+  gitg = callPackage ./misc/gitg { };
+
+  libgit2-glib = callPackage ./misc/libgit2-glib { };
+
+  libmediaart = callPackage ./misc/libmediaart { };
+  
+  gexiv2 = callPackage ./misc/gexiv2 { };
+
+  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+
+  gtkhtml = callPackage ./misc/gtkhtml { };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
new file mode 100644
index 00000000000..a1b38b21869
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+  name = "rarian-0.8.1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+  };
+
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
new file mode 100644
index 00000000000..86942c13f34
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
+
+
+stdenv.mkDerivation rec {
+  name = "gexiv2-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz";
+    sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn";
+  };
+  
+  preConfigure = ''
+    patchShebangs .
+  '';
+  
+  buildInputs = [ pkgconfig glib libtool m4 ];
+  propagatedBuildInputs = [ exiv2 ];
+  
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/gexiv2;
+    description = "GObject wrapper around the Exiv2 photo metadata library";
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
new file mode 100644
index 00000000000..ee8259af8d6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, gnome3, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gfbgraph-0.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
+    sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724";
+  };
+
+  buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts
+                  json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "GLib/GObject wrapper for the Facebook Graph API";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
new file mode 100644
index 00000000000..7ca35a8255f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
+, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
+, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "gitg-0.3.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz";
+    sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp";
+  };
+
+  preCheck = ''
+    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+  doCheck = true;
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  propagatedUserEnvPkgs = [ shared_mime_info
+                            gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
+                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
+                  gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gitg" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/gitg/icons/hicolor/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+    description = "GNOME GUI client to view git repositories";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
new file mode 100644
index 00000000000..2eccb9a32cf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, intltool, fetchurl, python, pygobject3, atk
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, bash, makeWrapper, itstool, libxml2, python3Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tweak-tool-3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz";
+    sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  makeFlags = [ "DESTDIR=/" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+                  python pygobject3 libnotify gnome3.gnome_shell
+                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
+                  gnome3.gnome_desktop ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-tweak-tool" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH ":" "${libsoup}/lib:${gnome3.gnome_desktop}/lib:${libnotify}/lib:${gtk3}/lib:${atk}/lib" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
+  '';
+
+  patches = [ ./find_gsettings.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+    description = "A tool to customize advanced GNOME 3 options";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
new file mode 100644
index 00000000000..3e68c04cb3a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
@@ -0,0 +1,22 @@
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index a00fe19..dce74b2 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
+ 
+ class _GSettingsSchema:
+     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+-        if not schema_dir:
+-            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
+         if not schema_filename:
+             schema_filename = schema_name + ".gschema.xml"
++        if not schema_dir:
++            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++            for xdg_dir in GLib.get_system_data_dirs():
++                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
++                if os.path.exists(os.path.join(dir, schema_filename)):
++                    schema_dir = dir
++                    break
+ 
+         schema_path = os.path.join(schema_dir, schema_filename)
+         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
new file mode 100644
index 00000000000..02520a9f121
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
+, pango, libgsf, libxml2, libart, intltool, gettext
+, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.8.17";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
+  };
+
+  # fix linking error: undefined reference to pcre_info
+  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
+
+  buildInputs = [
+    pkgconfig libglade bzip2 libart intltool gettext
+    gconf libgnomeui pcre
+  ];
+
+  propagatedBuildInputs = [
+    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
+    glib libgsf libxml2 gtk libglade libart cairo pango
+  ];
+
+  postInstall =
+    ''
+      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
+      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+    '';
+
+  doCheck = true;
+
+  meta = gnome3.goffice.meta // {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
new file mode 100644
index 00000000000..0390fc13368
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.10.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
+    glib gtk3 libxml2 cairo pango libgsf
+  ];
+
+  buildInputs = [ libxslt librsvg ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "A Glib/GTK+ set of document centric objects and utilities";
+
+    longDescription = ''
+      There are common operations for document centric applications that are
+      conceptually simple, but complex to implement fully: plugins, load/save
+      documents, undo/redo.
+    '';
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
new file mode 100644
index 00000000000..cd4ef3c9fed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
@@ -0,0 +1,13 @@
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3adb696 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		default: return GO_REG_BADPAT;
+ 		}
+ 	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
++		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
new file mode 100644
index 00000000000..5e27b474cbd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, gnome3, enchant, isocodes }:
+
+stdenv.mkDerivation rec {
+  name = "gtkhtml-4.6.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz";
+    sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd";
+  };
+
+  buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  propagatedBuildInputs = [ enchant isocodes ];
+
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
new file mode 100644
index 00000000000..17c3b4fa0a8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig
+, gtk_doc, gobjectIntrospection, libgit2, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libgit2-glib-${version}";
+  version = "0.0.10";
+
+  src = fetchurl {
+    url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
+    sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs";
+  };
+
+  configureScript = "sh ./autogen.sh";
+
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig
+                  gtk_doc gobjectIntrospection libgit2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
new file mode 100644
index 00000000000..4985bfa902c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "libmediaart-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz";
+    sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c";
+  };
+
+  buildInputs = [ pkgconfig glib gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    description = "Library tasked with managing, extracting and handling media art caches";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a241e5a99ba..16930c82c8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10171,11 +10171,15 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 {
+  gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.10 {
     callPackage = pkgs.newScope pkgs.gnome3;
     self = pkgs.gnome3;
   });
 
+  gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
+    callPackage = pkgs.newScope pkgs.gnome3_12;
+  });
+
   gnome = recurseIntoAttrs gnome2;
 
   hsetroot = callPackage ../tools/X11/hsetroot { };

From b01b15bb0bcb14588cb327f63d09dc3dba29e13a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 21:19:56 +0200
Subject: [PATCH 1535/2033] baobab: add 3.12.1 version and cleanup expr

---
 pkgs/desktops/gnome-3/3.12/core/baobab/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
index 9381f45105d..e4da596ae21 100644
--- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
@@ -4,15 +4,13 @@
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
-  name = "baobab-3.10.1";
+  name = "baobab-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/baobab/3.10/${name}.tar.xz";
-    sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
+    url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz";
+    sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c";
   };
 
-  configureFlags = [ "--disable-static" ];
-
   doCheck = true;
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
@@ -22,14 +20,16 @@ stdenv.mkDerivation rec {
                             hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   preFixup = ''
     rm $out/share/icons/hicolor/icon-theme.cache
     rm $out/share/icons/HighContrast/icon-theme.cache
     wrapProgram "$out/bin/baobab" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 11be39c23827de994b21e2b5c5bf76dc9eb4e5d4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:11:18 +0200
Subject: [PATCH 1536/2033] gnome-icon-theme: add 3.12.0 version

---
 .../desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
index 5b16f827ae0..aa0c9d24dfe 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-3.10.0";
+  name = "gnome-icon-theme-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme/3.10/${name}.tar.xz";
-    sha256 = "1xinbgkkvlhazj887ajcl13i7kdc1wcca02jwxzvjrvchjsp4m66";
+    url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz";
+    sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a";
   };
 
   setupHook = ./setup-hook.sh;

From b0dc8bf703cdf343e98fd9d85e2855b25306a490 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:18:15 +0200
Subject: [PATCH 1537/2033] evince: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/core/evince/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
index 4b50840534c..ca983258d95 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "evince-3.10.3";
+  name = "evince-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evince/3.10/${name}.tar.xz";
-    sha256 = "1bz9ypsvlfw1vgs7i5glba1h1n6c90f0d1g64linhg6xjcxcq3dk";
+    url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz";
+    sha256 = "ef22cc29a7cbe70d2e7ce8c0b5b7ee774187ea69f3ae49a64c6d4a91559ef137";
   };
 
   buildInputs = [

From 7b7a9253eadb38988ae25b5a12a18b9ec239cca6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:19:38 +0200
Subject: [PATCH 1538/2033] eog: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/eog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
index 57f19dcaa32..8c8a49cb7ed 100644
--- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
@@ -3,11 +3,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "eog-3.10.2";
+  name = "eog-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/eog/3.10/${name}.tar.xz";
-    sha256 = "0qs7wmn987vd0cw8w16gmb0bnda3nkcwfg1q343l4rm6kih9ik2w";
+    url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz";
+    sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd";
   };
 
   buildInputs = with gnome3;

From a1dbe6ba4316b3038c81804c69715271ba4ad4fe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:21:45 +0200
Subject: [PATCH 1539/2033] libgnome-keyring: add 3.12.0 version

---
 .../desktops/gnome-3/3.12/core/libgnome-keyring/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
index 28c7b80c0d4..65d1c9d1493 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.10.1";
+  name = "libgnome-keyring-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.10/${name}.tar.xz";
-    sha256 = "0wip88r91kwx4zp6sc9b38mnlv11grgl4k2kzsd3a8x83c9g2b05";
+    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
+    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
   };
 
   propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];

From 2708d9798aa6bd1dd76ba3350414e74ee414ee0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:21:50 +0200
Subject: [PATCH 1540/2033] totem: add 3.12.1 version

---
 .../gnome-3/3.12/core/totem/default.nix       |  8 ++-
 .../3.12/core/totem/fix_files_loss.patch      | 72 +++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
index c6b78c827db..3589299df3e 100644
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@@ -5,11 +5,11 @@
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
-  name = "totem-3.10.1";
+  name = "totem-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/totem/3.10/${name}.tar.xz";
-    sha256 = "b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2";
+    url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
+    sha256 = "dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3";
   };
 
   doCheck = true;
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
+  patches = [ ./fix_files_loss.patch ];
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Videos;
     description = "Movie player for the GNOME desktop based on GStreamer";
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
new file mode 100644
index 00000000000..b85ad1efd00
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/fix_files_loss.patch
@@ -0,0 +1,72 @@
+From 524c9e39a0ca6f2d1699e6e6d9ba3db1ea80d9f9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 15 May 2014 19:28:35 +0200
+Subject: main: Fix potential data loss when removing multiple files
+
+We were using a list of GtkTreePaths and deleting the items one-by-one
+when the user clicked the "Delete" button. But after the first deletion,
+the tree model would have changed, and instead of pointing to the 2nd
+item we wanted to delete, the GtkTreePath would have pointed to another
+item, usually not one that we wanted to delete.
+
+We now use GtkTreeRowReferences, which will always point to the same
+row, as long as it exists.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=729778
+
+diff --git a/src/totem-grilo.c b/src/totem-grilo.c
+index 2133d77..0cff0d6 100644
+--- a/src/totem-grilo.c
++++ b/src/totem-grilo.c
+@@ -2074,7 +2074,8 @@ static void
+ delete_foreach (gpointer data,
+ 		gpointer user_data)
+ {
+-	GtkTreePath *path = data;
++	GtkTreeRowReference *ref = data;
++	GtkTreePath *path;
+ 	GtkTreeModel *view_model = user_data;
+ 	GtkTreeIter iter;
+ 	GrlSource *source;
+@@ -2085,8 +2086,11 @@ delete_foreach (gpointer data,
+ 	GtkTreeModel *model;
+ 	GtkTreeIter real_model_iter;
+ 
+-	if (!gtk_tree_model_get_iter (view_model, &iter, path))
++	path = gtk_tree_row_reference_get_path (ref);
++	if (!path || !gtk_tree_model_get_iter (view_model, &iter, path)) {
++		g_warning ("An item that was scheduled for removal isn't available any more");
+ 		return;
++	}
+ 
+ 	gtk_tree_model_get (view_model, &iter,
+ 			    MODEL_RESULTS_CONTENT, &media,
+@@ -2151,14 +2155,23 @@ delete_cb (TotemSelectionToolbar *bar,
+ 	   TotemGrilo            *self)
+ {
+ 	GtkTreeModel *model;
+-	GList *list;
++	GList *list, *l;
+ 
+ 	g_signal_handlers_block_by_func (self->priv->browser, "view-selection-changed", self);
+ 
+ 	model = gd_main_view_get_model (GD_MAIN_VIEW (self->priv->browser));
+ 	list = gd_main_view_get_selection (GD_MAIN_VIEW (self->priv->browser));
++
++	/* GList of GtkTreePaths to a GList of GtkTreeRowReferences */
++	for (l = list; l != NULL; l = l->next) {
++		GtkTreeRowReference *ref;
++
++		ref = gtk_tree_row_reference_new (model, l->data);
++		gtk_tree_path_free (l->data);
++		l->data = ref;
++	}
+ 	g_list_foreach (list, delete_foreach, model);
+-	g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
++	g_list_free_full (list, (GDestroyNotify) gtk_tree_row_reference_free);
+ 
+ 	g_signal_handlers_unblock_by_func (self->priv->browser, "view-selection-changed", self);
+ 
+-- 
+cgit v0.10.1
+

From ae20e1c5f576f186f011cc3ac1a5d34f1cf96f52 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:22:30 +0200
Subject: [PATCH 1541/2033] yelp: add 3.12 version

---
 pkgs/desktops/gnome-3/3.12/core/yelp/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
index b58aa99721e..d8897e262d5 100644
--- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
@@ -3,27 +3,27 @@
 , bash, makeWrapper, itstool, libxml2, libxslt, icu }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-3.10.1";
+  name = "yelp-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/yelp/3.10/${name}.tar.xz";
-    sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816";
+    url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz";
+    sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard  ];
-  propagatedBuildInputs = [ librsvg gdk_pixbuf gnome3.gnome_icon_theme
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
 
   buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
                   libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  librsvg gdk_pixbuf gnome3.gnome_icon_theme
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas ];
 
   preFixup = ''
     wrapProgram "$out/bin/yelp" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From b6286bf481176e700735e697353a4d10f56cb00d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:23:21 +0200
Subject: [PATCH 1542/2033] gnome-session: add 3.12.1 version

---
 .../gnome-3/3.12/core/gnome-session/default.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
index f999702af54..bebd0b4b77c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
@@ -1,20 +1,20 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd }:
+, libxslt, intltool, makeWrapper, systemd, xorg }:
 
 
 stdenv.mkDerivation rec {
-  name = "gnome-session-3.10.1";
+  name = "gnome-session-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/3.10/${name}.tar.xz";
-    sha256 = "1k59yss7r748nvr0cdjrqmx0zy26b93rfn66lsdg9fz60x77087n";
+    url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz";
+    sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3";
   };
 
   configureFlags = "--enable-systemd";
 
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon
+      gnome3.gnome_settings_daemon xorg.xtrans
       gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
 
   preFixup = ''

From 3bf7226d8c94e2be08da189da1786ddfc3682b5b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:23:59 +0200
Subject: [PATCH 1543/2033] gnome-shell: add 3.12.2 version

---
 .../gnome-3/3.12/core/gnome-shell/default.nix |  12 +-
 .../fix_background_corruption.patch           | 147 ------------------
 2 files changed, 6 insertions(+), 153 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
index 554b09a1e59..49154aa9221 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@@ -7,11 +7,11 @@
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-3.10.2.1";
+  name = "gnome-shell-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/3.10/${name}.tar.xz";
-    sha256 = "0k642y6h878v6mczx4z1zj4pjl7z4bvq02raxxwxkjyvyz2fv36j";
+    url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz";
+    sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71";
   };
 
   buildInputs = with gnome3;
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
       libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
       at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
 
+  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
+
   preBuild = ''
     patchShebangs src/data-to-c.pl
     substituteInPlace data/Makefile --replace " install-keysDATA" ""
@@ -33,14 +35,12 @@ stdenv.mkDerivation rec {
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix LD_LIBRARY_PATH : "${accountservice}/lib:${ibus}/lib:${gdm}/lib" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:${gtk}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  patches = [ ./fix_background_corruption.patch ];
-
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch
deleted file mode 100644
index 9cb041bcce2..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/fix_background_corruption.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-commit 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d
-Author: Jasper St. Pierre <jstpierre@mecheye.net>
-Date:   Thu Nov 7 17:14:47 2013 -0500
-
-    layout: Fix several issues with the background management code
-    
-    If monitor-changed fires at startup, it will destroy all of the
-    backgrounds, but since this._isStartup is true, won't recreate any
-    of them. Additionally, since _bgManagers is indexed by monitor index,
-    if the primary index is not 0, it could become a sparse array (e.g.
-    [undefined, undefined, primaryBackground]), and our for loop will
-    crash trying to access properties of undefined.
-    
-    Fix both of these issues by always creating background managers for
-    every monitor, hiding them on startup but only showing them after
-    the startup animation is complete.
-    
-    One thing we need to watch out for is that while LayoutManager is
-    constructing, Main.uiGroup / Main.layoutManager will be undefined,
-    so addBackgroundMenu will fail. Fix this by passing down the uiGroup
-    to the background menu code.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=709313
-
-diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
-index 06e698c..dcbbb39 100644
---- a/js/ui/backgroundMenu.js
-+++ b/js/ui/backgroundMenu.js
-@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({
-     Name: 'BackgroundMenu',
-     Extends: PopupMenu.PopupMenu,
- 
--    _init: function(source) {
-+    _init: function(source, layoutManager) {
-         this.parent(source, 0, St.Side.TOP);
- 
-         this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
-@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({
- 
-         this.actor.add_style_class_name('background-menu');
- 
--        Main.uiGroup.add_actor(this.actor);
-+        layoutManager.uiGroup.add_actor(this.actor);
-         this.actor.hide();
-     }
- });
- 
--function addBackgroundMenu(actor) {
-+function addBackgroundMenu(actor, layoutManager) {
-     let cursor = new St.Bin({ opacity: 0 });
--    Main.uiGroup.add_actor(cursor);
-+    layoutManager.uiGroup.add_actor(cursor);
- 
-     actor.reactive = true;
--    actor._backgroundMenu = new BackgroundMenu(cursor);
-+    actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
-     actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
-     actor._backgroundManager.addMenu(actor._backgroundMenu);
- 
-diff --git a/js/ui/layout.js b/js/ui/layout.js
-index 17073a6..80bae9d 100644
---- a/js/ui/layout.js
-+++ b/js/ui/layout.js
-@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({
-         this.emit('hot-corners-changed');
-     },
- 
--    _createBackground: function(monitorIndex) {
-+    _addBackgroundMenu: function(bgManager) {
-+        BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
-+    },
-+
-+    _createBackgroundManager: function(monitorIndex) {
-         let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
-                                                            layoutManager: this,
-                                                            monitorIndex: monitorIndex });
--        BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
--
--        bgManager.connect('changed', Lang.bind(this, function() {
--                              BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
--                          }));
- 
--        this._bgManagers[monitorIndex] = bgManager;
-+        bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu));
-+        this._addBackgroundMenu(bgManager);
- 
--        return bgManager.background;
-+        return bgManager;
-     },
- 
--    _createSecondaryBackgrounds: function() {
-+    _showSecondaryBackgrounds: function() {
-         for (let i = 0; i < this.monitors.length; i++) {
-             if (i != this.primaryIndex) {
--                let background = this._createBackground(i);
--
-+                let background = this._bgManagers[i].background;
-+                background.actor.show();
-                 background.actor.opacity = 0;
-                 Tweener.addTween(background.actor,
-                                  { opacity: 255,
-@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({
-         }
-     },
- 
--    _createPrimaryBackground: function() {
--        this._createBackground(this.primaryIndex);
--    },
--
-     _updateBackgrounds: function() {
-         let i;
-         for (i = 0; i < this._bgManagers.length; i++)
-@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({
-         if (Main.sessionMode.isGreeter)
-             return;
- 
--        if (this._startingUp)
--            return;
--
-         for (let i = 0; i < this.monitors.length; i++) {
--            this._createBackground(i);
-+            let bgManager = this._createBackgroundManager(i);
-+            this._bgManagers.push(bgManager);
-+
-+            if (i != this.primaryIndex && this._startingUp)
-+                bgManager.background.actor.hide();
-         }
-     },
- 
-@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({
-         if (Main.sessionMode.isGreeter) {
-             this.panelBox.translation_y = -this.panelBox.height;
-         } else {
--            this._createPrimaryBackground();
-+            this._updateBackgrounds();
- 
-             // We need to force an update of the regions now before we scale
-             // the UI group to get the coorect allocation for the struts.
-@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({
-         this.keyboardBox.show();
- 
-         if (!Main.sessionMode.isGreeter) {
--            this._createSecondaryBackgrounds();
-+            this._showSecondaryBackgrounds();
-             global.window_group.remove_clip();
-         }
- 

From f160950ad24fe76639bc4f9a0befa0037ec3f302 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:25:15 +0200
Subject: [PATCH 1544/2033] gnome-common: add 3.12.0 version

---
 pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
index 12b2510dc43..b534d6922b7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-common-3.10.0";
+  name = "gnome-common-3.12.0";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/gnome-common/3.10/${name}.tar.xz";
-    sha256 = "aed69474a671e046523827f73ba5e936d57235b661db97900db7356e1e03b0a3";
+    url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz";
+    sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8";
   };
 
   patches = [(fetchurl {

From 4ed15531b2b09e5a31b734286bdb58da92940271 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:25:48 +0200
Subject: [PATCH 1545/2033] gnome-desktop: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
index 584705d658e..e8d4efc1c80 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
@@ -4,8 +4,8 @@
 
 stdenv.mkDerivation rec {
 
-  majorVersion = "3.10";
-  minorVersion = "1";
+  majorVersion = "3.12";
+  minorVersion = "2";
   name = "gnome-desktop-${majorVersion}.${minorVersion}";
 
   # this should probably be setuphook for glib
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
-    sha256 = "0hdvm909lbpnixqv11qdx9iaycx4dpxys46fa128bqp8alisgb0h";
+    sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d";
   };
 
   buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland

From 58309f68c1d67258a3a8ec3928db6fecabe04ab2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:26:20 +0200
Subject: [PATCH 1546/2033] gnome-screenshot: add 3.12.0 version

---
 .../desktops/gnome-3/3.12/core/gnome-screenshot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
index 7b94d0f9027..349df0b103c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
@@ -3,11 +3,11 @@
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-screenshot-3.10.0";
+  name = "gnome-screenshot-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/3.10/${name}.tar.xz";
-    sha256 = "1nb56kzcj5z4hmrmxap5r53smi52ki3pc8qmhi4rymkgqswyk7bh";
+    url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
+    sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
   };
 
   doCheck = true;

From 73fe63f13ef25b167d3b2c87f70e4d0400a87d75 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:27:52 +0200
Subject: [PATCH 1547/2033] gnome-system-monitor: add 3.12.2 version and
 cleanup expr

---
 .../3.12/core/gnome-system-monitor/default.nix    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
index 91fbe67957f..622df1c5db2 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
@@ -3,33 +3,34 @@
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-3.10.2";
+  name = "gnome-system-monitor-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/3.10/${name}.tar.xz";
-    sha256 = "bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0";
+    url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz";
+    sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8";
   };
 
   doCheck = true;
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
+  propagatedBuildInputs = [  ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop makeWrapper
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas ];
 
   preFixup = ''
     wrapProgram "$out/bin/gnome-system-monitor" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.10/;
+    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
     description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
     maintainers = with maintainers; [ lethalman ];
     license = licenses.gpl2;

From d558e5c090366f177f0eb59ab58a4353aad8c593 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:29:03 +0200
Subject: [PATCH 1548/2033] gnome-calculator: add 3.12.1 version and cleanup
 expr

---
 .../gnome-3/3.12/core/gnome-calculator/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
index 205961a9171..666032f56a7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
@@ -3,27 +3,27 @@
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-calculator-3.10.2";
+  name = "gnome-calculator-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/3.10/${name}.tar.xz";
-    sha256 = "0gkddnk9x76895xrz0ps4yny36w62fhi459gwmxqqb9kx5934n1f";
+    url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
+    sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740";
   };
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   libxml2 gnome3.gtksourceview
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/bin/gnome-calculator" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 24fdbd0c78cba6101d60624773d144aff29d3dab Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:29:50 +0200
Subject: [PATCH 1549/2033] gnome-icon-theme-symbolic: add 3.12.0 version

---
 .../gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
index feb3d84b994..6a30362f593 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-symbolic-3.10.1";
+  name = "gnome-icon-theme-symbolic-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.10/${name}.tar.xz";
-    sha256 = "344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412";
+    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz";
+    sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b";
   };
 
   configureFlags = "--enable-icon-mapping";

From a7a457e78a7330713e976cd3da8be7cc1c6dff22 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:30:45 +0200
Subject: [PATCH 1550/2033] gnome-backgrounds: add 3.12.2 version

---
 .../gnome-3/3.12/core/gnome-backgrounds/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
index 3879b81859a..46db008787f 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-3.10.1";
+  name = "gnome-backgrounds-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/3.10/${name}.tar.xz";
-    sha256 = "11rv03m4hznpx0brf47hil04199z3jjvl1aq7q0lnill3yrffiyc";
+    url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
+    sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 4b32659c0bb8f6f904a8f350f3f6e2c01dba93d0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:31:59 +0200
Subject: [PATCH 1551/2033] gnome-contacts: add 3.12.0 version and cleanup expr

---
 .../gnome-3/3.12/core/gnome-contacts/default.nix   | 14 +++++++-------
 .../core/gnome-contacts/fix_row_selected.patch     | 11 -----------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
index f8059f952e6..5b4ca5c3418 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
@@ -5,18 +5,16 @@
 , libsoup, vala, dbus_glib, automake114x, autoconf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-contacts-3.10.1";
+  name = "gnome-contacts-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/3.10/${name}.tar.xz";
-    sha256 = "e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b";
+    url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz";
+    sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d";
   };
 
   doCheck = true;
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   # force build from vala
   preBuild = ''
@@ -27,17 +25,19 @@ stdenv.mkDerivation rec {
                   gnome3.gsettings_desktop_schemas makeWrapper file libnotify
                   folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
                   libxml2 libsoup gnome3.gnome_online_accounts nspr nss
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   vala automake114x autoconf db ];
 
   preFixup = ''
     for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
       wrapProgram $f \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 
-  patches = [ ./configure_dbus_glib.patch ./fix_row_selected.patch ];
+  patches = [ ./configure_dbus_glib.patch ];
 
   patchFlags = "-p0";
 
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch
deleted file mode 100644
index b379b4b8ee9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/fix_row_selected.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/contacts-view.vala.orig	2014-04-08 11:35:36.302252460 +0200
-+++ src/contacts-view.vala	2014-04-08 11:37:37.045343221 +0200
-@@ -265,7 +265,7 @@
-     data.destroy ();
-   }
- 
--  public override void row_selected (ListBoxRow row) {
-+  public override void row_selected (ListBoxRow? row) {
-     var data = row as ContactDataRow;
-     var contact = data != null ? data.contact : null;
-     selection_changed (contact);

From 5eb739fb1e6943dffe8950c50a2e0999b7448311 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:32:44 +0200
Subject: [PATCH 1552/2033] gnome-user-docs: add 3.12.1 version

---
 .../gnome-3/3.12/core/gnome-user-docs/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
index d66863a2218..7377c839d1c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-user-docs-3.10.3";
+  name = "gnome-user-docs-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz";
-    sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905";
+    url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
+    sha256 = "bfd084d72c688d6efb0c34bb572a704cc2ce093c97a33390eaffb5e42158d418";
   };
 
   buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
 
   meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-help/3.10;
+    homepage = https://help.gnome.org/users/gnome-help/3.12;
     description = "User and system administration help for the Gnome desktop";
     maintainers = with maintainers; [ lethalman ];
     license = licenses.cc-by-30;

From 18f39ac66077dcae11db26541666bafa8bd1eed5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:33:25 +0200
Subject: [PATCH 1553/2033] gnome-terminal: add 3.12.2 version

---
 .../gnome-3/3.12/core/gnome-terminal/default.nix      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
index 541db5720db..2c4b838ad8b 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
@@ -1,24 +1,27 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
 , gnome_doc_utils, intltool, libX11, which, gconf, libuuid
-, desktop_file_utils, itstool, ncurses, makeWrapper }:
+, desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }:
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "3.10";
+  versionMajor = "3.12";
   versionMinor = "2";
 
   name = "gnome-terminal-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
-    sha256 = "04yrk9531f373nl64jx3pczsnq7a56mj3n436jbhjp74kp12fa70";
+    sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd";
   };
 
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte
+  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
                   gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
+  # FIXME: enable for gnome3
+  configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" ];
+
   preFixup = ''
     for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"

From a1abb9a52599b74bb8158b0c4aec4cb9c3c9f64f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:34:21 +0200
Subject: [PATCH 1554/2033] gnome-disk-utility: add 3.12.1 version and cleanup
 expr

---
 .../3.12/core/gnome-disk-utility/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
index 334471c2943..56bde211105 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
@@ -4,11 +4,11 @@
 , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-3.10.0";
+  name = "gnome-disk-utility-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/3.10/${name}.tar.xz";
-    sha256 = "1amqi2bribxn8r8k8mvxh3710rmdll9963smf0v59v0iwxi3mqil";
+    url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
+    sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e";
   };
 
   doCheck = true;
@@ -16,19 +16,19 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme
-                            librsvg udisks2 gnome3.gnome_settings_daemon
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   libxslt libtool libsecret libpwquality cracklib
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
+                  gdk_pixbuf gnome3.gnome_icon_theme
+                  librsvg udisks2 gnome3.gnome_settings_daemon
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
 
   preFixup = ''
     wrapProgram "$out/bin/gnome-disks" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 

From a321e5bbba576d15606d109862d123da3e715645 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:35:01 +0200
Subject: [PATCH 1555/2033] gnome-shell-extensions: add 3.12.2 version

---
 .../gnome-3/3.12/core/gnome-shell-extensions/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
index 00974edb1db..8503af44613 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
@@ -4,11 +4,11 @@
 , gnome3, file }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-3.10.1";
+  name = "gnome-shell-extensions-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/3.10/${name}.tar.xz";
-    sha256 = "9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43";
+    url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz";
+    sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6";
   };
 
   doCheck = true;

From 8f708a13b18a5f146d968ee957a52038be4d467d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:35:42 +0200
Subject: [PATCH 1556/2033] gnome-themes-standard: add 3.12.0 version

---
 .../gnome-3/3.12/core/gnome-themes-standard/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
index 08d82b7ae91..5128a195141 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-3.10.0";
+  name = "gnome-themes-standard-3.12.0";
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/3.10/${name}.tar.xz";
-    sha256 = "0f2b3ypkfvrdsxcvp14ja9wqj382f1p46yrjvhhxkkjgagy6qb41";
+    url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz";
+    sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217";
   };
   
   buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];

From b5b3c8551593813cf97d106ccb691289873a1776 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:37:03 +0200
Subject: [PATCH 1557/2033] gnome-control-center: add 3.12.1 version and
 cleanup expr

---
 .../3.12/core/gnome-control-center/default.nix   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
index 1222f03d66e..967c19af540 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
@@ -4,22 +4,20 @@
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, krb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool
-, docbook_xsl, docbook_xsl_ns, modemmanager }:
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
 
 # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
 # TODO: bluetooth, wacom, smbclient, printers
 
 stdenv.mkDerivation rec {
-  name = "gnome-control-center-3.10.2";
+  name = "gnome-control-center-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz";
-    sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn";
+    url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz";
+    sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   enableParallelBuilding = true;
 
@@ -28,7 +26,9 @@ stdenv.mkDerivation rec {
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
       accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns 
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+      gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
+      hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
       networkmanager modemmanager makeWrapper  ];
 
   preBuild = ''
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   preFixup = with gnome3; ''
     wrapProgram $out/bin/gnome-control-center \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     for i in $out/share/applications/*; do
       substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
     done

From 9ed0b65528db714203ba146287f073090f292b7a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:37:34 +0200
Subject: [PATCH 1558/2033] gnome-online-accounts: add 3.12.2 version

---
 .../gnome-3/3.12/core/gnome-online-accounts/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
index 8c459435733..e113a854a8b 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-3.10.2";
+  name = "gnome-online-accounts-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/3.10/${name}.tar.xz";
-    sha256 = "15qvw40dmi886491s3abpidsm2lx65fhglhj99bvcdskhk0ih90b";
+    url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz";
+    sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec";
   };
 
   NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";

From 14b4eecc8fac6789fc69ee9406aafce587f41603 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:38:07 +0200
Subject: [PATCH 1559/2033] gnome-online-miners: add 3.12.0 version

---
 .../gnome-3/3.12/core/gnome-online-miners/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
index 4c904bf40f6..394a3ee447c 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
@@ -2,18 +2,18 @@
 , libsoup, json_glib, gmp, openssl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-online-miners-3.10.3";
+  name = "gnome-online-miners-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/3.10/${name}.tar.xz";
-    sha256 = "129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8";
+    url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz";
+    sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23";
   };
 
   doCheck = true;
 
   buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
                   gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper
+                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
                   gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
 
   enableParallelBuilding = true;

From 820da31448c8faa1986772471e11c4a033e5bde1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:38:54 +0200
Subject: [PATCH 1560/2033] gnome-settings-daemon: add 3.12.2 and cleanup expr

---
 .../3.12/core/gnome-settings-daemon/default.nix   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
index 7a50b8db56f..81b49e6bc64 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
@@ -1,22 +1,23 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
 , libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
 , geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus }:
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-settings-daemon-3.10.2";
+  name = "gnome-settings-daemon-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/3.10/${name}.tar.xz";
-    sha256 = "0r42lzlgk0w40ws4d3s7yayn6n8zqlnh5b6k88gvgv1lwk39k240";
+    url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz";
+    sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f";
   };
 
   # fatal error: gio/gunixfdlist.h: No such file or directory
   NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
 
   buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas libnotify gnome_desktop
-      lcms2 libXtst libxkbfile pulseaudio libcanberra_gtk3 upower colord libgweather
+    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas
+      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
+      libcanberra_gtk3 upower colord libgweather xkeyboard_config
       polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
 
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix PATH : "${glib}/bin" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From f7d8afcf2b22af6a65386ae5d3fedf42c832e515 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:39:49 +0200
Subject: [PATCH 1561/2033] gnome-font-viewer: add 3.12.0 version and cleanup
 expr

---
 .../gnome-3/3.12/core/gnome-font-viewer/default.nix  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
index cba651ca36a..a74c5722ba2 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-3.10.0";
+  name = "gnome-font-viewer-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/3.10/${name}.tar.xz";
-    sha256 = "3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652";
+    url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz";
+    sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45";
   };
 
   doCheck = true;
@@ -16,16 +16,16 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/bin/gnome-font-viewer" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 8ca85043156cbef81558453ce1132dfee6a3a0cd Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:40:53 +0200
Subject: [PATCH 1562/2033] caribou: add 0.4.13 version

---
 pkgs/desktops/gnome-3/3.12/core/caribou/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
index 41a997c1f71..4d2f390c042 100644
--- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
@@ -3,11 +3,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "caribou-0.4.12";
+  name = "caribou-0.4.13";
 
   src = fetchurl {
     url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
-    sha256 = "0235sws58rg0kadxbp2nq5ha76zmhd4mr10n9qlbryf8p78qsvii";
+    sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782";
   };
 
   buildInputs = with gnome3;

From 00e2746e9b3de1f24357d0f6b93ab7c4d71be22d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:41:27 +0200
Subject: [PATCH 1563/2033] mutter: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/mutter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
index 0acfa9f36ae..aa1af1ebd55 100644
--- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
@@ -4,11 +4,11 @@
 
 
 stdenv.mkDerivation rec {
-  name = "mutter-3.10.2";
+  name = "mutter-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/mutter/3.10/${name}.tar.xz";
-    sha256 = "000iclb96mgc4rp2q0cy72nfwyfzl6avijl9nmk87f5sgyy670a3";
+    url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz";
+    sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173";
   };
 
   # fatal error: gio/gunixfdlist.h: No such file or directory

From 39478f037ab8c4c8600539ec3f2c5499c285544e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:42:20 +0200
Subject: [PATCH 1564/2033] empathy: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/empathy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
index 051bc9b7fb2..458bd33240e 100644
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@@ -11,11 +11,11 @@
 # TODO: enable more features
 
 stdenv.mkDerivation rec {
-  name = "empathy-3.10.3";
+  name = "empathy-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz";
-    sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196";
+    url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
+    sha256 = "414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram $f \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${hicolor_icon_theme}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
     rm $out/share/icons/hicolor/icon-theme.cache
   '';

From 45a5e8113844ffdaa0e93334e602a6c92b4c3a09 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:43:44 +0200
Subject: [PATCH 1565/2033] rest: add 0.7.91 version and use mirror

---
 pkgs/desktops/gnome-3/3.12/core/rest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
index f543f8e13b8..9e19d4f9005 100644
--- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "rest-0.7.90";
+  name = "rest-0.7.91";
 
   src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "08n0cvz44l4b1gkmjryap3ysd0wcbbbdjbcar73nr52dmk52ls0x";
+    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
+    sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a";
   };
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];

From 155f4b9ebd5e37602c6ae4460f0c400893d0d120 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:44:27 +0200
Subject: [PATCH 1566/2033] tracker: add 1.0.1 version

---
 pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
index dbae108d2e9..79155fe9b56 100644
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@@ -8,11 +8,11 @@
 , libpng, libexif, libgsf, libuuid, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "tracker-0.16.4";
+  name = "tracker-1.0.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/tracker/0.16/${name}.tar.xz";
-    sha256 = "9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580";
+    url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
+    sha256 = "76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram $f \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
 

From 519790975aaae07f7650ef9ab75b41970322f94f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:45:04 +0200
Subject: [PATCH 1567/2033] evolution-data-server: add 3.12.2 version

---
 .../3.12/core/evolution-data-server/default.nix       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
index 685f8c24e7c..d7f65ca6741 100644
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@@ -1,18 +1,19 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
+{ fetchurl, stdenv, pkgconfig, gnome3, python
+, intltool, libsoup, libxml2, libsecret, icu
 , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
 
 
 stdenv.mkDerivation rec {
-  name = "evolution-data-server-3.10.4";
+  name = "evolution-data-server-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/3.10/${name}.tar.xz";
-    sha256 = "5c2d5e19af19ecfa81f31306411ab6155c3c62cf407d5a5aaa675a8ce940fa2d";
+    url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
+    sha256 = "91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6";
   };
 
   buildInputs = with gnome3;
     [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper ]
+      gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu ]
     ++ stdenv.lib.optional valaSupport vala;
 
   # uoa irrelevant for now

From 7b33973ea5d690135f8d121f0abc74338fc15d02 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:45:57 +0200
Subject: [PATCH 1568/2033] gtksourceview: add 3.12.2 version and use mirror

---
 pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
index 900bb2c922b..a0669957af6 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtksourceview-${version}";
-  version = "3.10.1";
+  version = "3.12.2";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/gtksourceview/3.10/gtksourceview-${version}.tar.xz";
-    sha256 = "008bzfr1s6ywpj8c8qx7495lz9g0ziccwbxg88s0l4dl6bw49piq";
+    url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
+    sha256 = "62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad";
   };
 
   buildInputs = [ pkgconfig atk cairo glib gtk3 pango

From 8afd771056345babb51b941d97938421f54acd6b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:47:23 +0200
Subject: [PATCH 1569/2033] gsettings-desktop-schemas: add 3.12.2 version and
 remove unused passthru

---
 .../core/gsettings-desktop-schemas/default.nix    | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
index 13f357db29a..917bcd99c95 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
@@ -4,27 +4,18 @@
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "3.10";
-  versionMinor = "1";
+  versionMajor = "3.12";
+  versionMinor = "2";
   moduleName   = "gsettings-desktop-schemas";
 
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "04b8wy10l6pzs5928gnzaia73dz5fjlcdy39xi3mf50ajv27h8s5";
+    sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1";
   };
 
   buildInputs = [ glib gobjectIntrospection ];
 
   nativeBuildInputs = [ pkgconfig intltool ];
-
-  passthru = {
-    doCompileSchemas = ''
-      for pkg in "${gsettings_desktop_schemas}" "${gtk3}"; do
-        cp -s $pkg/share/glib-2.0/schemas/*.gschema.xml $out/share/glib-2.0/schemas/
-      done
-      ${glib}/bin/glib-compile-schemas $out/share/glib-2.0/schemas/
-    '';
-  };
 }

From 81b375fa5e37ee7c1975e3c8acff6de1d4e9db99 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:47:51 +0200
Subject: [PATCH 1570/2033] gdm: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/gdm/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
index 3df5ab40eaf..070f39199d7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, intltool, accountservice, libX11
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, dconf }:
 
 stdenv.mkDerivation rec {
-  name = "gdm-3.10.0.1";
+  name = "gdm-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gdm/3.10/${name}.tar.xz";
-    sha256 = "1rva3djas48m8w1gyv3nds3jxfkirdfl0bk30x79mizrk80456jl";
+    url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz";
+    sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";
   };
 
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool accountservice dconf
                   gobjectIntrospection libX11 gtk libcanberra_gtk3 pam libtool ];
 
   meta = with stdenv.lib; {

From aa56842577ae3135699ded25437836ffe81e5633 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:48:21 +0200
Subject: [PATCH 1571/2033] gcr: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
index a1fdd471282..74213a4efa0 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
 , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper }:
+, gobjectIntrospection, makeWrapper, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "gcr-3.10.1";
+  name = "gcr-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gcr/3.10/${name}.tar.xz";
-    sha256 = "0nv470a8cvw4rw49hf5aqvll1rpkacmsr3pj8s1l205yaid4yvq0";
+    url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz";
+    sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c";
   };
 
   buildInputs = [
-    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection
+    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
     libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper
   ];
 

From 961a4aace6250cc4f0e5d01ec3cf15f7a77464bb Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:48:59 +0200
Subject: [PATCH 1572/2033] gucharmap: add 3.12.1 version and cleanup expr

---
 pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
index a6bf72b2fc7..590f8706fff 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
@@ -6,15 +6,13 @@
 # use packaged gnome3.gnome_icon_theme_symbolic 
 
 stdenv.mkDerivation rec {
-  name = "gucharmap-3.10.1";
+  name = "gucharmap-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/3.10/${name}.tar.xz";
-    sha256 = "04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78";
+    url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz";
+    sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9";
   };
 
-  configureFlags = [ "--disable-static" ];
-
   doCheck = true;
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From bfae2a646b26209eb19e69522d9a0681dea79b02 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:49:57 +0200
Subject: [PATCH 1573/2033] libpeas: add 1.10.0 version

---
 pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
index 9cf8426104b..547a52ccf9a 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "libpeas-${version}";
-  version = "1.9.0";
+  version = "1.10.0";
 
   buildInputs =  [
    intltool pkgconfig
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/1.9/${name}.tar.xz";
-    sha256 = "13fzyzv6c0cfdj83z1s16lv8k997wpnzyzr0wfwcfkcmvz64g1q0";
+    url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz";
+    sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47";
   };
 
   preFixup = ''

From 790fd907ddac83d615bcc45880e9edf2a030a2a9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:51:11 +0200
Subject: [PATCH 1574/2033] libgee: add 0.14.0 version

---
 pkgs/desktops/gnome-3/3.12/core/libgee/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
index c7ed541082d..b21c274ce51 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
 let
-  ver_maj = "0.12";
+  ver_maj = "0.14";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "libgee-${ver_maj}.${ver_min}";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "19bf94ia1h5z8h0hdhwcd2b2p6ngffirg0dai7pdb98dzriys1ni";
+    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd";
   };
 
   doCheck = true;

From 7a4c6d1fa6c691f351809766d117ceb065fe2525 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:52:13 +0200
Subject: [PATCH 1575/2033] libgweather: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
index c480a59e453..8246a2183b7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
@@ -2,11 +2,11 @@
 , pango, gdk_pixbuf, atk, tzdata }:
 
 stdenv.mkDerivation rec {
-  name = "libgweather-3.10.1";
+  name = "libgweather-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/3.10/${name}.tar.xz";
-    sha256 = "1iyg0l90m14iw0ksjbmrrhb5fqn0y7x5f726y56gxd4qcxgpi3mf";
+    url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz";
+    sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37";
   };
 
   makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";

From d29c41e692c678aefc2cdc80b21718a002ac704c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:53:13 +0200
Subject: [PATCH 1576/2033] geocode-glib: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
index d3b21bef167..6a461e3bde6 100644
--- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
@@ -2,12 +2,12 @@
 
 
 stdenv.mkDerivation rec {
-  name = "geocode-glib-3.10.0";
+  name = "geocode-glib-3.12.2";
 
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/3.10/${name}.tar.xz";
-    sha256 = "0dx6v9n4dsskcy6630s77cyb32xlykdall0d555976warycc3v8a";
+    url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz";
+    sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e";
   };
 
   buildInputs = with gnome3;

From d1720a73dd487402579dbc5d4db7673dd618a804 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 01:03:42 +0200
Subject: [PATCH 1577/2033] Add spidermonkey_24

---
 .../interpreters/spidermonkey/24.2.nix        | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/24.2.nix

diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
new file mode 100644
index 00000000000..44fe4f60d53
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/24.2.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip }:
+
+stdenv.mkDerivation rec {
+  version = "24.2.0";
+  name = "spidermonkey-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-${version}.tar.bz2";
+    sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
+  };
+
+  propagatedBuildInputs = [ nspr ];
+
+  buildInputs = [ pkgconfig perl python zip ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export LIBXUL_DIST=$out
+  '';
+
+  configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ];
+
+  # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
+  preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}";
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
+
+  meta = with stdenv.lib; {
+    description = "Mozilla's JavaScript engine written in C/C++";
+    homepage = https://developer.mozilla.org/en/SpiderMonkey;
+    # TODO: MPL/GPL/LGPL tri-license.
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16930c82c8d..f4e0337c3b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3563,6 +3563,7 @@ let
   spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
   spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.0.nix { };
+  spidermonkey_24 = callPackage ../development/interpreters/spidermonkey/24.2.nix { };
 
   supercollider = callPackage ../development/interpreters/supercollider {
     qt = qt4;

From a343b9e380284b3e7adc3ecb6cf15199da3c1255 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:53:56 +0200
Subject: [PATCH 1578/2033] gjs: add 1.40.1 version

---
 pkgs/desktops/gnome-3/3.12/core/gjs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
index 429d147e728..c1e5486d3a7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_17, pango }:
+{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
 
 
 stdenv.mkDerivation rec {
-  name = "gjs-1.38.1";
+  name = "gjs-1.40.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gjs/1.38/${name}.tar.xz";
-    sha256 = "0xl1zc5ncaxqs5ww5j82rzqrg429l8pdapqclxiba7dxwyh6a83b";
+    url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz";
+    sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793";
   };
 
   buildInputs = with gnome3;
     [ gobjectIntrospection pkgconfig glib pango ];
 
-  propagatedBuildInputs = [ spidermonkey_17 ];
+  propagatedBuildInputs = [ spidermonkey_24 ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

From 9157babb2edc9cc9c28001e40fda7f5424f83f5f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:55:16 +0200
Subject: [PATCH 1579/2033] yelp-tools: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
index 39ff3838f4a..ba83380f86d 100644
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-tools-3.10.0";
+  name = "yelp-tools-3.12.1";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/yelp-tools/3.10/${name}.tar.xz";
-    sha256 = "0496xyx1657db22ks3k92al64fp6236y5bgh7s7b0j8hcc112ppz";
+    url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz";
+    sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172";
   };
 
   buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];

From d38e915e2229051980b831f0be82e24a4a5ad13e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:55:59 +0200
Subject: [PATCH 1580/2033] yelp-xsl: add 3.12.0 version

---
 pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
index c5060bdba75..0a5bc78af47 100644
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
@@ -2,11 +2,11 @@
 , itstool, libxml2, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "yelp-xsl-3.10.1";
+  name = "yelp-xsl-3.12.0";
 
   src = fetchurl {
-    url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz";
-    sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887";
+    url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz";
+    sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656";
   };
 
   doCheck = true;

From e2879bdc636ec55f917d9bce0f067913cf5e2854 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:57:11 +0200
Subject: [PATCH 1581/2033] epiphany: add 3.12.1 version and cleanup expr

---
 .../gnome-3/3.12/core/epiphany/default.nix    | 23 +++++++++++--------
 .../core/epiphany/libxml_missing_dep.patch    | 10 ++++++++
 2 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch

diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
index 9df3a7ed01e..e7c94d8003f 100644
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
@@ -1,43 +1,46 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
 , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
 , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file
-, hicolor_icon_theme, gdk_pixbuf, librsvg }:
+, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
+, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
 
 stdenv.mkDerivation rec {
-  name = "epiphany-3.10.3";
+  name = "epiphany-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz";
-    sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7";
+    url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz";
+    sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93";
   };
 
   # Tests need an X display
   configureFlags = [ "--disable-static --disable-tests" ];
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   nativeBuildInputs = [ pkgconfig file ];
 
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+  configureScript = "./autogen.sh";
 
   buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
                   webkitgtk libsoup libsecret gnome_desktop libnotify libtool
                   sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
+                  gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common
+                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 
   preFixup = ''
     wrapProgram "$out/bin/epiphany" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
+  patches = [ ./libxml_missing_dep.patch ];
+  patchFlags = "-p0";
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Epiphany;
     description = "WebKit based web browser for GNOME";
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
new file mode 100644
index 00000000000..c4dc85cd97e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2014-05-19 13:28:28.493988695 +0200
++++ configure.ac	2014-05-19 13:28:54.837159748 +0200
+@@ -115,6 +115,7 @@
+ 
+ PKG_CHECK_MODULES(WEB_EXTENSION, [
+                   $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED
++		  libxml-2.0 >= $LIBXML_REQUIRED
+                   libsecret-1 >= $LIBSECRET_REQUIRED
+                   ])
+ AC_SUBST(WEB_EXTENSION_CFLAGS)

From 2246827de15138da95f8a287eaa4cf041b5e0b7b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:58:13 +0200
Subject: [PATCH 1582/2033] at-spi2-atk: add 2.12.1 version

---
 pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
index fc0c4f2a6bc..416a33b09a2 100644
--- a/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/at-spi2-atk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   versionMajor = "2.12";
-  versionMinor = "0";
+  versionMinor = "1";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v";
+    sha256 = "5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi

From 3de0ba8a3e6f62dfb9fe628f90810fc01cc52ead Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 18 May 2014 23:59:04 +0200
Subject: [PATCH 1583/2033] vino: add 3.12.0 version

---
 pkgs/desktops/gnome-3/3.12/core/vino/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
index 65668dce6a2..2318e68930e 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "vino-${versionMajor}.${versionMinor}";
-  versionMajor = "3.10";
-  versionMinor = "1";
+  versionMajor = "3.12";
+  versionMinor = "0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
-    sha256 = "0imyvz96b7kikikwxn1r5sfxwmi40523nd66gp9hrl23gik0vwgs";
+    sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b";
   };
 
   doCheck = true;
@@ -16,9 +16,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
 
   preFixup = ''
-    for f in "$out/bin/vino-passwd" "$out/libexec/vino-server"; do
-      wrapProgram $f --prefix XDG_DATA_DIRS : "${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
+    wrapProgram "$out/libexec/vino-server" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From c2d4a3ffc18af7a9a7565fbd202197612302e34c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:00:13 +0200
Subject: [PATCH 1584/2033] nautilus: add 3.12.2 version and add tracker
 support

---
 .../gnome-3/3.12/core/nautilus/default.nix        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
index 2041a71a82c..888f622ef33 100644
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
@@ -1,25 +1,24 @@
 { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
 , gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg }:
+, libnotify, makeWrapper, exempi, librsvg, tracker }:
 
 stdenv.mkDerivation rec {
-  name = "nautilus-3.10.1";
+  name = "nautilus-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/3.10/${name}.tar.xz";
-    sha256 = "09y7dxaw4bjgan3q10azky0h6kndqv2lfn75iip12zchf2hk59gn";
+    url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz";
+    sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1";
   };
 
-  configureFlags = [ "--enable-tracker=no" ];
-
   buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.gsettings_desktop_schemas libnotify makeWrapper ];
+                  gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
+                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
 
   preFixup = ''
     wrapProgram "$out/bin/nautilus" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk}/share:${gnome3.gnome_icon_theme}:${gnome3.gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {

From 824a88d6d86fd090c629a942917eae5100f6518a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:00:51 +0200
Subject: [PATCH 1585/2033] dconf: add 0.20.0 version

---
 pkgs/desktops/gnome-3/3.12/core/dconf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
index a6236f16744..a1d98449bee 100644
--- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "dconf-${version}";
-  version = "0.18.0";
+  version = "0.20.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/dconf/0.18/${name}.tar.xz";
-    sha256 = "0mf921pnkhs8xn1dr2wxfq277vjsbkpl9cccv0gaz4460z31p6qh";
+    url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz";
+    sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9";
   };
 
   buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2

From 18bfa30a30c718271827bbc1aa1c89a2414c676b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:02:13 +0200
Subject: [PATCH 1586/2033] sushi: add 3.12.0 version

---
 pkgs/desktops/gnome-3/3.12/core/sushi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
index 089b5cd03c1..2830d5bac27 100644
--- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
@@ -4,11 +4,11 @@
 , gdk_pixbuf, librsvg, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
-  name = "sushi-3.10.0";
+  name = "sushi-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.10/${name}.tar.xz";
-    sha256 = "cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8";
+    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
+    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
   };
 
   propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];

From 28bc9ddfb07205112ed60051795cac706ad340c2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:02:54 +0200
Subject: [PATCH 1587/2033] zenity: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/core/zenity/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
index 366088c6729..ca20bbc785d 100644
--- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "3.8";
-  versionMinor = "0";
+  versionMajor = "3.12";
+  versionMinor = "1";
 
   name = "zenity-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz";
-    sha256 = "0gsnwvhsqqba5i6d4jh86j29q4q18hmvhj9c1v76vwlj2nvz1ywl";
+    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
+    sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11";
   };
 
   buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];

From 5637f0fbcd8f922f3e7cd99e46b57adadc24cb0f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:04:07 +0200
Subject: [PATCH 1588/2033] gnome-keyring: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
index dbb8da93c6c..59667fe3323 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
@@ -3,11 +3,11 @@
 , docbook_xsl_ns, docbook_xsl, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-keyring-3.10.1";
+  name = "gnome-keyring-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/3.10/${name}.tar.xz";
-    sha256 = "1y6v2p14jx5h6yh14c53pd8r0r5zbmcgw8v4nxvf94kd9jliy00q";
+    url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz";
+    sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c";
   };
 
   buildInputs = with gnome3; [

From 02934df3ee7b7e75fdaf19b2d2874b350165756a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:05:04 +0200
Subject: [PATCH 1589/2033] libzapojit: use gnome mirror

---
 pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
index e0e4c02c084..5e2559899b7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libzapojit-0.0.3";
 
   src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    url = "mirror://gnome/sources//3.10/${name}.tar.xz";
     sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
   };
 

From f07fd89111a0dd3da11ad764064df454399332e6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 19 May 2014 00:17:13 +0200
Subject: [PATCH 1590/2033] Allow specifying the gnome3 packages to use for the
 xserver service

---
 .../services/desktops/gnome3/at-spi2-core.nix        |  7 +++++--
 .../services/desktops/gnome3/gnome-documents.nix     |  7 +++++--
 .../services/desktops/gnome3/gnome-keyring.nix       |  7 +++++--
 .../desktops/gnome3/gnome-online-accounts.nix        |  7 +++++--
 .../services/desktops/gnome3/gnome-online-miners.nix |  7 +++++--
 .../services/desktops/gnome3/gnome-user-share.nix    |  7 +++++--
 nixos/modules/services/desktops/gnome3/seahorse.nix  |  7 +++++--
 nixos/modules/services/desktops/gnome3/sushi.nix     |  7 +++++--
 nixos/modules/services/desktops/gnome3/tracker.nix   |  7 +++++--
 .../modules/services/x11/desktop-managers/gnome3.nix | 12 +++++++++---
 10 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 22a54f511d1..615f272e7b9 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -4,6 +4,9 @@
 
 with lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with lib;
 
   config = mkIf config.services.gnome3.at-spi2-core.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.at_spi2_core ];
+    environment.systemPackages = [ gnome3.at_spi2_core ];
 
-    services.dbus.packages = [ pkgs.gnome3.at_spi2_core ];
+    services.dbus.packages = [ gnome3.at_spi2_core ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index 1f7592c0b41..2279ef48fb9 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.gnome-documents.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
+    environment.systemPackages = [ gnome3.gnome-documents ];
 
-    services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
+    services.dbus.packages = [ gnome3.gnome-documents ];
 
     services.gnome3.gnome-online-accounts.enable = true;
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index 447fd783f14..be14f1fcbc0 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -31,9 +34,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.gnome-keyring.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
+    environment.systemPackages = [ gnome3.gnome_keyring ];
 
-    services.dbus.packages = [ pkgs.gnome3.gnome_keyring ];
+    services.dbus.packages = [ gnome3.gnome_keyring ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 365e19c15bb..a41fb0101f0 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.gnome-online-accounts.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
+    environment.systemPackages = [ gnome3.gnome_online_accounts ];
 
-    services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
+    services.dbus.packages = [ gnome3.gnome_online_accounts ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index c921327a74c..030d4bac6a7 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.gnome-online-miners.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
+    environment.systemPackages = [ gnome3.gnome-online-miners ];
 
-    services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
+    services.dbus.packages = [ gnome3.gnome-online-miners ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index df796ed77ff..3b6c713f7be 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.gnome-user-share.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
+    environment.systemPackages = [ gnome3.gnome-user-share ];
 
-    services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
+    services.xserver.displayManager.sessionCommands = with gnome3; ''
       # Don't let gnome-control-center depend upon gnome-user-share
       export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
     '';
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index cad22a6a598..01e4a24f267 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -29,9 +32,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.seahorse.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.seahorse ];
+    environment.systemPackages = [ gnome3.seahorse ];
 
-    services.dbus.packages = [ pkgs.gnome3.seahorse ];
+    services.dbus.packages = [ gnome3.seahorse ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
index 7a4389038b2..ff7f484602c 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -4,6 +4,9 @@
 
 with lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -29,9 +32,9 @@ with lib;
 
   config = mkIf config.services.gnome3.sushi.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.sushi ];
+    environment.systemPackages = [ gnome3.sushi ];
 
-    services.dbus.packages = [ pkgs.gnome3.sushi ];
+    services.dbus.packages = [ gnome3.sushi ];
 
   };
 
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index 94a22d0c881..670e585c6f5 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -4,6 +4,9 @@
 
 with pkgs.lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with pkgs.lib;
 
   config = mkIf config.services.gnome3.tracker.enable {
 
-    environment.systemPackages = [ pkgs.gnome3.tracker ];
+    environment.systemPackages = [ gnome3.tracker ];
 
-    services.dbus.packages = [ pkgs.gnome3.tracker ];
+    services.dbus.packages = [ gnome3.tracker ];
 
   };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 3f48035f6bb..63f39ec0d3a 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -4,13 +4,13 @@ with lib;
 
 let
   cfg = config.services.xserver.desktopManager.gnome3;
-  gnome3 = pkgs.gnome3;
+  gnome3 = config.environment.gnome3.packageSet;
 
   # Remove packages of ys from xs, based on their names
   removePackagesByName = xs: ys:
     let
       pkgName = drv: (builtins.parseDrvName drv.name).name;
-	  ysNames = map pkgName ys;
+      ysNames = map pkgName ys;
       res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);
     in
       filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
@@ -35,6 +35,12 @@ in {
       description = "Enable Gnome 3 desktop manager.";
     };
 
+    environment.gnome3.packageSet = mkOption {
+      default = pkgs.gnome3;
+      example = literalExample "pkgs.gnome3_12";
+      description = "Which Gnome 3 package set to use.";
+    };
+    
     environment.gnome3.excludePackages = mkOption {
       default = [];
       example = "[ pkgs.gnome3.totem ]";
@@ -80,7 +86,7 @@ in {
 
           # Don't let epiphany depend upon gnome-shell
           # Override default mimeapps
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}:${mimeAppsList}/share
+          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share
 
           # Let gnome-control-center find gnome-shell search providers
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/

From 4334d8be9f9abb5d0ff0ed2a8fa577de93687ba5 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 10:55:16 +0200
Subject: [PATCH 1591/2033] json-glib: 0.16.0 -> 1.0.0

---
 pkgs/development/libraries/json-glib/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 255c5f1ccba..7a45ca0f227 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -5,11 +5,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurlGnome {
     project = "json-glib";
-    major = "0";
-    minor = "16";
-    patchlevel = "2";
+    major = "1";
+    minor = "0";
+    patchlevel = "0";
     extension = "xz";
-    sha256 = "0b22yw0n87mg7a5lkqw1d7xqnm8qj1bwy0wklv9b2yn29qv7am59";
+    sha256 = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde";
   };
 
   configureflags= "--with-introspection" ; 
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ glib gobjectIntrospection ];
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://live.gnome.org/JsonGlib;
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ lethalman ];
   };
 }

From 5de85d27ab74b82ca789056a50fc1627d8ad2263 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 11:04:04 +0200
Subject: [PATCH 1592/2033] vte: 0.35.90 -> 0.36.2

---
 pkgs/desktops/gnome-3/3.12/core/vte/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
index d98ddc716de..53ce47cca54 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
 
-  versionMajor = "0.35";
-  versionMinor = "90";
+  versionMajor = "0.36";
+  versionMinor = "2";
   moduleName   = "vte";
   
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "c47182d1724db479095b918898ce62297ec71988f24cd575506151c59f7b98cf";
+    sha256 = "f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345";
   };
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];

From 819b5841c6586662416df895502040d64377331f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 11:46:42 +0200
Subject: [PATCH 1593/2033] gnome-music: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
index b8d2bbc79ef..c6a98bb3ef0 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@@ -4,11 +4,11 @@
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-music-3.10.4";
+  name = "gnome-music-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/3.10/${name}.tar.xz";
-    sha256 = "64220d4c0f9115a6ed27ec99c7ec7afc065d12e5a32371936f303ef981f5325f";
+    url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
+    sha256 = "ec4807018166aabed0263cb3ffce672e1fc1a3e959f48a5ad48b8eb08ddb451a";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From df95a8cc2f922e41aab51d94e3faacc83ed0e80a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 13:13:32 +0200
Subject: [PATCH 1594/2033] upower: add 0.99 version for gnome 3.12

---
 nixos/modules/services/hardware/upower.nix    | 22 ++++++--
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 pkgs/desktops/gnome-3/3.10/default.nix        |  2 +-
 pkgs/desktops/gnome-3/3.12/default.nix        |  1 +
 pkgs/os-specific/linux/upower/0.99.nix        | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/os-specific/linux/upower/0.99.nix

diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index a202d82f646..0b6a101efa0 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -4,6 +4,9 @@
 
 with lib;
 
+let
+  cfg = config.services.upower;
+in
 {
 
   ###### interface
@@ -21,6 +24,15 @@ with lib;
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.upower;
+        example = lib.literalExample "pkgs.upower";
+        description = ''
+          Which upower package to use.
+        '';
+      };
+
     };
 
   };
@@ -28,13 +40,13 @@ with lib;
 
   ###### implementation
 
-  config = mkIf config.services.upower.enable {
+  config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.upower ];
+    environment.systemPackages = [ cfg.package ];
 
-    services.dbus.packages = [ pkgs.upower ];
+    services.dbus.packages = [ cfg.package ];
 
-    services.udev.packages = [ pkgs.upower ];
+    services.udev.packages = [ cfg.package ];
 
     systemd.services.upower =
       { description = "Power Management Daemon";
@@ -42,7 +54,7 @@ with lib;
         serviceConfig =
           { Type = "dbus";
             BusName = "org.freedesktop.UPower";
-            ExecStart = "@${pkgs.upower}/libexec/upowerd upowerd";
+            ExecStart = "@${cfg.package}/libexec/upowerd upowerd";
           };
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 63f39ec0d3a..4398a97ff47 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -70,6 +70,7 @@ in {
     services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
+    services.upower.package = gnome3.upower;
 
     fonts.fonts = [ pkgs.dejavu_fonts ];
 
diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
index 2cb28e0c307..b58bf7ef1d3 100644
--- a/pkgs/desktops/gnome-3/3.10/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/default.nix
@@ -1,7 +1,7 @@
 { callPackage, self, pkgs }:
 
 rec {
-  inherit (pkgs) glib gtk2 gtk3 gnome2;
+  inherit (pkgs) glib gtk2 gtk3 gnome2 upower;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) ORBit2;
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index e5c57903da0..f1c876d3665 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -3,6 +3,7 @@
 rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12;
+  upower = pkgs.upower_99;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) ORBit2;
diff --git a/pkgs/os-specific/linux/upower/0.99.nix b/pkgs/os-specific/linux/upower/0.99.nix
new file mode 100644
index 00000000000..c42fea16d35
--- /dev/null
+++ b/pkgs/os-specific/linux/upower/0.99.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
+, intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
+, useSystemd ? true, systemd, gobjectIntrospection
+}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "upower-0.99.0";
+
+  src = fetchurl {
+    url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "189rd8j5czy4fs7imxvr38icjh9vlgdz6ki2h08v530h96clndaz";
+  };
+
+  buildInputs =
+    [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
+    ++ stdenv.lib.optional useSystemd systemd;
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  preConfigure =
+    ''
+      substituteInPlace src/linux/up-backend.c \
+        --replace /usr/bin/pm- ${pmutils}/bin/pm- \
+        --replace /usr/sbin/pm- ${pmutils}/sbin/pm-
+      substituteInPlace src/notify-upower.sh \
+        --replace /usr/bin/dbus-send ${dbus_tools}/bin/dbus-send
+    '';
+
+  configureFlags =
+    [ "--with-backend=linux" "--localstatedir=/var"
+      "--enable-deprecated" # needed for Xfce (Nov 2013)
+    ]
+    ++ stdenv.lib.optional useSystemd
+    [ "--enable-systemd"
+      "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+      "--with-systemdutildir=$(out)/lib/systemd/system-sleep"
+      "--with-udevrulesdir=$(out)/lib/udev/rules.d"
+    ];
+
+  NIX_CFLAGS_LINK = "-lgcc_s";
+
+  installFlags = "historydir=$(TMPDIR)/foo";
+
+  meta = {
+    homepage = http://upower.freedesktop.org/;
+    description = "A D-Bus service for power management";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e0337c3b3..9d88f1ff5eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7544,6 +7544,8 @@ let
 
   upower = callPackage ../os-specific/linux/upower { };
 
+  upower_99 = callPackage ../os-specific/linux/upower/0.99.nix { };
+
   upstart = callPackage ../os-specific/linux/upstart { };
 
   usbutils = callPackage ../os-specific/linux/usbutils { };

From 288076154f8fbee7c34c5b6d6fb7105f1b144b0b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 13:26:28 +0200
Subject: [PATCH 1595/2033] appdata-tools: add new package

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

diff --git a/pkgs/tools/misc/appdata-tools/default.nix b/pkgs/tools/misc/appdata-tools/default.nix
new file mode 100644
index 00000000000..acacc4db15f
--- /dev/null
+++ b/pkgs/tools/misc/appdata-tools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4
+, intltool, glib, libsoup, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  version = "0_1_7";
+  name = "appdata_tools-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz";
+    sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8";
+  };
+
+  buildInputs = [ pkgconfig autoconf automake m4 intltool glib
+                  libsoup gdk_pixbuf ];
+
+  configureScript = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = "http://people.freedesktop.org/~hughsient/appdata";
+    description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ lethalman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d88f1ff5eb..809a2a6b6ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -642,6 +642,8 @@ let
 
   apparix = callPackage ../tools/misc/apparix { };
 
+  appdata-tools = callPackage ../tools/misc/appdata-tools { };
+
   asciidoc = callPackage ../tools/typesetting/asciidoc {
     inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader;
     enableStandardFeatures = false;

From 380af2be66a379b87683682713c92dc08c9b0855 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 14:42:38 +0200
Subject: [PATCH 1596/2033] geoclue2: 2.0.0 -> 2.1.8

---
 pkgs/development/libraries/geoclue/2.0.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index d799dfb6027..3932fa945c8 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip
-, dbus, dbus_glib
+, dbus, dbus_glib, networkmanager, modemmanager
 }:
 
 stdenv.mkDerivation rec {
-  name = "geoclue-2.0.0";
+  name = "geoclue-2.1.8";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/geoclue/releases/2.0/${name}.tar.xz";
-    sha256 = "18b7ikdcw2rm04gzw82216shp5m9pghvnsddw233s5jswn2g30ja";
+    url = "http://www.freedesktop.org/software/geoclue/releases/2.1/${name}.tar.xz";
+    sha256 = "05h102110gsxxvmvllssfz7ldjpwrrb5sqg5rbpibys6iy4w1k6m";
   };
 
   buildInputs =
    [ intltool pkgconfig glib json_glib libsoup geoip
-     dbus dbus_glib
+     dbus dbus_glib networkmanager modemmanager
    ];
 
   preConfigure = ''

From 3b39718eba4885499b38e5bbbaf45df3ffe219ce Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 14:53:06 +0200
Subject: [PATCH 1597/2033] Add cogl 1.18

---
 pkgs/desktops/gnome-3/3.12/default.nix   |  1 +
 pkgs/development/libraries/cogl/1.18.nix | 59 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/libraries/cogl/1.18.nix

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index f1c876d3665..39f77a97b2a 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -4,6 +4,7 @@ rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12;
   upower = pkgs.upower_99;
+  cogl = pkgs.cogl_1_18;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) ORBit2;
diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix
new file mode 100644
index 00000000000..7aad8ba1b43
--- /dev/null
+++ b/pkgs/development/libraries/cogl/1.18.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
+, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland
+, gstreamerSupport ? true, gst_all_1 }:
+
+let
+  ver_maj = "1.18";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "cogl-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
+    sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+    "--enable-wayland-egl-platform"
+    "--enable-wayland-egl-server"
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+
+  propagatedBuildInputs = with xorg; [
+      glib gdk_pixbuf gobjectIntrospection
+      mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
+    ]
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+                                               gst_all_1.gst-plugins-base ];
+
+  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+
+  COGL_PANGO_DEP_CFLAGS
+    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+  #doCheck = true; # all tests fail (no idea why)
+
+  meta = with stdenv.lib; {
+    description = "A small open source library for using 3D graphics hardware for rendering";
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      Cogl is a small open source library for using 3D graphics hardware for
+      rendering. The API departs from the flat state machine style of OpenGL
+      and is designed to make it easy to write orthogonal components that can
+      render without stepping on each other's toes.
+    '';
+
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 809a2a6b6ca..09279d2edfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4264,6 +4264,8 @@ let
 
   cogl = callPackage ../development/libraries/cogl { };
 
+  cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
+
   coin3d = callPackage ../development/libraries/coin3d { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };

From 820462559890136883d98a30d80ccdd7d4aa4d7f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:06:55 +0200
Subject: [PATCH 1598/2033] evolution: add 3.12.2 version

---
 .../gnome-3/3.12/apps/evolution/default.nix   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
index ee62c951b4c..982256b15d8 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -1,15 +1,15 @@
 { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify
-, makeWrapper, itstool, shared_mime_info, libical, db
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
+, makeWrapper, itstool, shared_mime_info, libical, db, gcr
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
-, libcanberra_gtk3, bogofilter, gst_all_1, procps }:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
 
 stdenv.mkDerivation rec {
-  name = "evolution-3.10.4";
+  name = "evolution-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution/3.10/${name}.tar.xz";
-    sha256 = "ac60557f264f211e6a7bc0ced919041c154e4c7b9c79600516aee7acc1d03e40";
+    url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
+    sha256 = "60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948";
   };
 
   doCheck = true;
@@ -18,17 +18,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical
-                  webkitgtk shared_mime_info gnome3.gnome_desktop
+                  gnome3.evolution_data_server libsecret libical gcr
+                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
                   libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss";
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 

From c4ccc4afbc745e2ea6f6b22f21463830ef8efc7c Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:07:52 +0200
Subject: [PATCH 1599/2033] bijiben: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
index ef460112d21..c4d609790fa 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
@@ -1,14 +1,14 @@
 { stdenv, intltool, fetchurl, pkgconfig, glib
-, hicolor_icon_theme, makeWrapper, itstool
+, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
 , clutter_gtk, libuuid, webkitgtk, zeitgeist
 , gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "bijiben-3.10.2";
+  name = "bijiben-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/3.10/${name}.tar.xz";
-    sha256 = "81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4";
+    url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz";
+    sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708";
   };
 
   doCheck = true;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig glib intltool itstool libxml2
                   clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist
+                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
                   gnome3.gsettings_desktop_schemas makeWrapper
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];

From 9032bcd1dcb79324d4b916fb12f57c2c5155f5a1 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:09:15 +0200
Subject: [PATCH 1600/2033] gnome-documents: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
index b393bb43931..8e47382954a 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
@@ -6,11 +6,11 @@
 , gmp, desktop_file_utils }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-documents-3.10.2";
+  name = "gnome-documents-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/3.10/${name}.tar.xz";
-    sha256 = "2b7267c9c4e5767039632cb31877ed2e57f994b657e8863dd79af5287db45745";
+    url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz";
+    sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53";
   };
 
   doCheck = true;

From 6c0e43d2498527ee0c49854fb82ece0447ea80ae Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:20:02 +0200
Subject: [PATCH 1601/2033] Add clutter 1.18

---
 pkgs/desktops/gnome-3/3.12/default.nix      |  1 +
 pkgs/development/libraries/clutter/1.18.nix | 52 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++
 3 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/clutter/1.18.nix

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 39f77a97b2a..ec18dbd0b79 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -3,6 +3,7 @@
 rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12;
+  clutter = pkgs.clutter_1_18;
   upower = pkgs.upower_99;
   cogl = pkgs.cogl_1_18;
   gtk = gtk3; # just to be sure
diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix
new file mode 100644
index 00000000000..898c931f354
--- /dev/null
+++ b/pkgs/development/libraries/clutter/1.18.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+gobjectIntrospection 
+}:
+
+let
+  ver_maj = "1.18";
+  ver_min = "2";
+in
+stdenv.mkDerivation rec {
+  name = "clutter-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
+    sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs =
+    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
+      atk json_glib gobjectIntrospection
+    ];
+
+  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
+
+  #doCheck = true; # no tests possible without a display
+
+  meta = {
+    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
+
+    longDescription =
+      '' Clutter is free software library for creating fast, compelling,
+         portable, and dynamic graphical user interfaces.  It is a core part
+         of MeeGo, and is supported by the open source community.  Its
+         development is sponsored by Intel.
+
+         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
+         on mobile and embedded platforms), but wraps an easy to use,
+         efficient, flexible API around GL's complexity.
+
+         Clutter enforces no particular user interface style, but provides a
+         rich, generic foundation for higher-level toolkits tailored to
+         specific needs.
+      '';
+
+    license = "LGPLv2+";
+    homepage = http://www.clutter-project.org/;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09279d2edfa..955fb1f7a52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4255,6 +4255,10 @@ let
 
   clutter = callPackage ../development/libraries/clutter { };
 
+  clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
+    cogl = cogl_1_18;
+  };
+
   clutter-gst = callPackage ../development/libraries/clutter-gst { };
 
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };

From bf280dbbed1a3c5c13d5de95a226df5f4ea712e7 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:45:17 +0200
Subject: [PATCH 1602/2033] gnome 3.12: compile clutter-gtk and clutter-gst
 with clutter 1.18

---
 pkgs/desktops/gnome-3/3.12/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index ec18dbd0b79..87fbfd437cc 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -4,6 +4,8 @@ rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12;
   clutter = pkgs.clutter_1_18;
+  clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
+  clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
   upower = pkgs.upower_99;
   cogl = pkgs.cogl_1_18;
   gtk = gtk3; # just to be sure

From c334a850731f8aee02284c02ef157a5ecc4a8d12 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:20:11 +0200
Subject: [PATCH 1603/2033] gfbgraph: 0.2 -> 0.2.2

---
 pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
index ee8259af8d6..d36534f0d32 100644
--- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
@@ -2,15 +2,15 @@
 , gnome3, libsoup, json_glib }:
 
 stdenv.mkDerivation rec {
-  name = "gfbgraph-0.2";
+  name = "gfbgraph-0.2.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
-    sha256 = "534ca84920445b9d89e2480348eedde3ce950db3628ae0a79703e8f2d52fa724";
+    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
   };
 
-  buildInputs = [ pkgconfig glib libsoup gnome3.gnome_online_accounts
-                  json_glib gnome3.rest ];
+  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
 
   enableParallelBuilding = true;
 

From 6a62b890b3877b7c556b9ffe3a8acca4a5ad4e15 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 18:24:27 +0200
Subject: [PATCH 1604/2033] gnome-photos: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
index 68d4e3690f9..17ed92da870 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
@@ -5,11 +5,11 @@
 , gnome3, librsvg, gdk_pixbuf, libexif }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-photos-3.10.2";
+  name = "gnome-photos-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/3.10/${name}.tar.xz";
-    sha256 = "820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975";
+    url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz";
+    sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f";
   };
 
   doCheck = true;

From af3d1ad06d16fe771655a33ca9d96c3068ca9dea Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 21:40:37 +0200
Subject: [PATCH 1605/2033] Add gnome 3.12 test

---
 nixos/tests/gnome3_12.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 nixos/tests/gnome3_12.nix

diff --git a/nixos/tests/gnome3_12.nix b/nixos/tests/gnome3_12.nix
new file mode 100644
index 00000000000..92a1919b8cb
--- /dev/null
+++ b/nixos/tests/gnome3_12.nix
@@ -0,0 +1,30 @@
+import ./make-test.nix {
+
+  machine =
+    { config, pkgs, ... }:
+
+    { imports = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
+
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.desktopManager.gnome3.enable = true;
+      environment.gnome3.packageSet = pkgs.gnome3_12;
+    };
+
+  testScript =
+    ''
+      $machine->waitForX;
+      $machine->sleep(15);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(10);
+      $machine->screenshot("screen");
+    '';
+
+}

From 23ccdd979aafafc7443dc844d4a15e3392ef3bc9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 19 May 2014 22:06:18 +0200
Subject: [PATCH 1606/2033] gnome-terminal: disable migration from gconf to
 gsettings

---
 .../desktops/gnome-3/3.12/core/gnome-terminal/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
index 2c4b838ad8b..17731444f00 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, gconf, libuuid
+, gnome_doc_utils, intltool, libX11, which, libuuid
 , desktop_file_utils, itstool, ncurses, makeWrapper, appdata-tools }:
 
 stdenv.mkDerivation rec {
@@ -15,15 +15,15 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf gnome3.gconf itstool ncurses makeWrapper ];
+                  gnome3.dconf itstool ncurses makeWrapper ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
   # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" ];
+  configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" "--disable-migration" ];
 
   preFixup = ''
-    for f in "$out/libexec/gnome-terminal-migration" "$out/libexec/gnome-terminal-server"; do
+    for f in "$out/libexec/gnome-terminal-server"; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
   '';

From 84cafa5c5d45570094b0d67cdab04268389cf506 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 16:02:54 +0200
Subject: [PATCH 1607/2033] Fix infinite recursion in gnome3.gnome3...

---
 pkgs/desktops/gnome-3/3.12/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 87fbfd437cc..7fbbd941327 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -2,7 +2,7 @@
 
 rec {
   inherit (pkgs) glib gtk2 gtk3 gnome2;
-  gnome3 = pkgs.gnome3_12;
+  gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_18;
   clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
   clutter-gst = pkgs.clutter-gst.override { inherit clutter; };

From 25c96caa9cff33acb43531a9932c923bc87c6889 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 16:03:11 +0200
Subject: [PATCH 1608/2033] Fix goffice_0_8 after gnome-3 directory renaming

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 955fb1f7a52..806d8c50375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8488,7 +8488,7 @@ let
     goffice = goffice_0_8;
   };
 
-  goffice_0_8 = callPackage ../desktops/gnome-3/misc/goffice/0.8.nix {
+  goffice_0_8 = callPackage ../desktops/gnome-3/3.10/misc/goffice/0.8.nix {
     inherit (gnome2) libglade libgnomeui;
     gconf = gnome2.GConf;
     libart = gnome2.libart_lgpl;

From b3f1412374566cdaaa2e73e9f648e914791b2994 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 17:14:00 +0200
Subject: [PATCH 1609/2033] file-roller: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
index e13e169ccc5..ced915e7f8f 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
@@ -4,12 +4,12 @@
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
 
-  majVersion = "3.10";
-  version = "${majVersion}.2.1";
+  majVersion = "3.12";
+  version = "${majVersion}.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
-    sha256 = "14374z1yfbjlgpl4k1ih8b35x8kzvh99y22rwwkc2wfz0d0i1qgx";
+    sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf";
   };
 
   # TODO: support nautilus

From eb8ab149ac9c851489c78fbe830292c96ad13b9e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 17:14:38 +0200
Subject: [PATCH 1610/2033] gedit: add 3.12.1 version

---
 pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
index 84a77e5a024..0e00b50f47d 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
-  name = "gedit-3.10.4";
+  name = "gedit-3.12.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gedit/3.10/${name}.tar.xz";
-    sha256 = "40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e";
+    url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
+    sha256 = "8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f";
   };
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

From b8de31aa4b8c91607a1b4e45c7f94164718fa17a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 17:15:18 +0200
Subject: [PATCH 1611/2033] gnome-clocks: add 3.12.0 version

---
 pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
index c39f731e028..2226f314eed 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
@@ -4,11 +4,11 @@
 , gnome3, librsvg, gdk_pixbuf, geoclue2 }:
 
 stdenv.mkDerivation rec {
-  name = "gnome-clocks-3.10.1";
+  name = "gnome-clocks-3.12.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/3.10/${name}.tar.xz";
-    sha256 = "5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43";
+    url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz";
+    sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604";
   };
 
   doCheck = true;

From 7985c6036d25098fcbd777ea84a17c88c32ffc6f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 18:11:18 +0200
Subject: [PATCH 1612/2033] gcr: enable vala bindings

---
 pkgs/desktops/gnome-3/3.12/core/gcr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
index 74213a4efa0..6dd69a64fd7 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
 , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt }:
+, gobjectIntrospection, makeWrapper, libxslt, vala }:
 
 stdenv.mkDerivation rec {
   name = "gcr-3.12.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper
+    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
   ];
 
   #doCheck = true;

From fdd56d55047560a8a9b4ab2f4ecac9b3b89273f0 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Tue, 20 May 2014 17:16:02 +0200
Subject: [PATCH 1613/2033] seahorse: add 3.12.2 version

---
 pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
index cecc4a8913d..fb7339dd05f 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, intltool, fetchurl
+{ stdenv, intltool, fetchurl, vala
 , pkgconfig, gtk3, glib, hicolor_icon_theme
 , makeWrapper, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
 , libsecret, avahi, p11_kit }:
 
 stdenv.mkDerivation rec {
-  name = "seahorse-3.10.2";
+  name = "seahorse-3.12.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/3.10/${name}.tar.xz";
-    sha256 = "89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16";
+    url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz";
+    sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839";
   };
 
   doCheck = true;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas makeWrapper gnupg
                   gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
-                  libsecret avahi libsoup p11_kit
+                  libsecret avahi libsoup p11_kit vala gnome3.gcr
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   preFixup = ''

From 3673ba615001b3fe017fe947fad4c20da60faaf6 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 20 May 2014 20:30:44 +0200
Subject: [PATCH 1614/2033] network-manager: Fix all plugins to use gnome3 and
 gtk3, like nm-applet does

I think this makes sense, because now all the plugins will be gnome3 gtk3
based, the same way nm-applet is.

I also removed networkmanager_pptp_gnome variation of networkmanager_pptp
package, because i think no variation is needed and gnome support should
be on by default like in other packages.
---
 pkgs/tools/networking/network-manager/openconnect.nix | 6 +++---
 pkgs/tools/networking/network-manager/openvpn.nix     | 6 +++---
 pkgs/tools/networking/network-manager/pptp.nix        | 6 +++---
 pkgs/tools/networking/network-manager/vpnc.nix        | 6 +++---
 pkgs/top-level/all-packages.nix                       | 4 +---
 pkgs/top-level/release-python.nix                     | 1 -
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index ff4c853512d..cc6532bac71 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager
-, withGnome ? true, gtk2, gconf, libgnome_keyring, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openconnect networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring gconf ];
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
-    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
     "--disable-static"
   ];
 
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index 821e72d4908..bb837dc6b8f 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager
-, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ openvpn networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ];
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
-    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
     "--disable-static"
   ];
 
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index d0a92b78309..6928db809a8 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll
-, withGnome ? false, gtk, libgnome_keyring }:
+, withGnome ? true, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ networkmanager pptp ppp ]
-    ++ stdenv.lib.optionals withGnome [ gtk libgnome_keyring ];
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags =
-    if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome";
+    if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome";
 
   postConfigure = "sed 's/-Werror//g' -i Makefile */Makefile";
 
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 10a497e0238..809970ff0fd 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager
-, withGnome ? true, gtk2, libgnome_keyring, procps, module_init_tools }:
+, withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ vpnc networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk2 libgnome_keyring ];
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
-    "${if withGnome then "--with-gnome --with-gtkver=2" else "--without-gnome"}"
+    "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
     "--disable-static"
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6125e0f35b..f168cd7a172 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1565,11 +1565,9 @@ let
 
   networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };
 
-  networkmanager_pptp_gnome = networkmanager_pptp.override { withGnome = true; };
-
   networkmanager_vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { };
 
-  networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { gconf = gnome.GConf; };
+  networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
 
   networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
 
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index dfdbb1db8bd..074f7ea4f7b 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1190,7 +1190,6 @@ let
   networkmanager = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   networkmanagerapplet = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   networkmanager_pptp = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
-  networkmanager_pptp_gnome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   neverball = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   nfsUtils = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   ngspice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };

From 647b4a579de7a48587d66b4cbde0c75a5b701e3d Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 20 May 2014 12:04:54 +0200
Subject: [PATCH 1615/2033] nm-applet: add support for pptp

---
 pkgs/tools/networking/network-manager-applet/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 85683b16b79..352a908c1d7 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -2,7 +2,7 @@
 , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
 , makeWrapper, networkmanager_openvpn, networkmanager_vpnc
-, networkmanager_openconnect, udev, hicolor_icon_theme }:
+, networkmanager_openconnect, networkmanager_pptp, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
@@ -36,14 +36,17 @@ stdenv.mkDerivation rec {
     ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
     ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name
     ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name
+    ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name
     mkdir -p $out/lib/NetworkManager
     ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/
     ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/
     ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/
+    ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/
     mkdir -p $out/libexec
     ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/
     ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/
     ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
+    ln -s ${networkmanager_pptp}/libexec/* $out/libexec/
   '';
 
   preFixup = ''

From 8ffd6af27e6dfae0a3b4d77db03409f62c5b8d98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 20 May 2014 16:35:30 -0500
Subject: [PATCH 1616/2033] hplip: don't use udev rules to change device owner

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 50106dfb477..fcec3bf2675 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/etc/sane.d/dll.d
     mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf
+
+    rm $out/etc/udev/rules.d/56-hpmud.rules
     ''));
 
   buildInputs = [

From e5eed8f664891e7337c1c70a654930617da4247b Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 16 May 2014 22:07:29 -0400
Subject: [PATCH 1617/2033] fix mkpasswd: use the git repository

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/security/mkpasswd/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index 624fcdbe6c6..1df8c1a62d2 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl
-}:
+{ stdenv, fetchFromGitHub }:
   
 stdenv.mkDerivation rec {
   name = "mkpasswd-${version}";
 
   version = "5.1.1";
 
-  src = fetchurl {
-    url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz";
-    sha256 = "0i06a9mb9qcq272782mg6dffv3k7bqkw4cdr31yrc0s6jqylryv9";
+  src = fetchFromGitHub {
+    owner = "rfc1036";
+    repo = "whois";
+    rev = "v${version}";
+    sha256 = "026x8byx8pcpkdxca64368p0nlspk4phw18jg4p04di6cg6nc1m5";
   };
 
   preConfigure = ''
@@ -19,10 +20,12 @@ stdenv.mkDerivation rec {
 
   installPhase = "make install-mkpasswd";
 
-  meta = {
-    homepage = http://ftp.debian.org/debian/pool/main/w/whois/;
+  meta = with stdenv.lib; {
+    homepage = http://packages.qa.debian.org/w/whois.html;
     description = ''
-      Overfeatured front end to crypt, from the Debian whois package.
+      Overfeatured front end to crypt, from the Debian whois package
     '';
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ cstrahan ];
   };
 }

From bcc36ee23ed5ea448b0efd18d5c872562c78d227 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Wed, 21 May 2014 15:37:34 +1000
Subject: [PATCH 1618/2033] mpd: fix build on darwin

---
 pkgs/development/compilers/nasm/default.nix |  2 +-
 pkgs/development/compilers/yasm/default.nix |  2 +-
 pkgs/development/libraries/ffmpeg/2.x.nix   | 13 +++++++------
 pkgs/servers/mpd/clientlib.nix              |  2 +-
 pkgs/servers/mpd/default.nix                |  1 +
 pkgs/top-level/all-packages.nix             |  7 +------
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 76359de6575..8098b9d278f 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nasm.us/;
     description = "An 80x86 and x86-64 assembler designed for portability and modularity";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix
index 9a803a6d510..ec1fda10d8c 100644
--- a/pkgs/development/compilers/yasm/default.nix
+++ b/pkgs/development/compilers/yasm/default.nix
@@ -12,6 +12,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.tortall.net/projects/yasm/;
     description = "Complete rewrite of the NASM assembler";
     license = "BSD";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 0e94b78c037..847d561fbe4 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     "--enable-avresample"
     "--enable-runtime-cpudetect"
   ]
-    ++ stdenv.lib.optional subtitleSupport "--enable-libass"
+    ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) "--enable-libass"
     ++ stdenv.lib.optional mp3Support "--enable-libmp3lame"
     ++ stdenv.lib.optional speexSupport "--enable-libspeex"
     ++ stdenv.lib.optional theoraSupport "--enable-libtheora"
@@ -55,13 +55,12 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree"
     ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"
     ++ stdenv.lib.optional x11grabSupport "--enable-x11grab"
-    ++ stdenv.lib.optional playSupport "--enable-ffplay"
+    ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) "--enable-ffplay"
     ++ stdenv.lib.optional freetypeSupport "--enable-libfreetype --enable-fontconfig"
     ++ stdenv.lib.optional fdkAACSupport "--enable-libfdk_aac --enable-nonfree"
     ++ stdenv.lib.optional gnutlsSupport "--enable-gnutls";
 
-  buildInputs = [ pkgconfig lame yasm zlib bzip2 alsaLib texinfo perl ]
-    ++ stdenv.lib.optional subtitleSupport libass
+  buildInputs = [ pkgconfig lame yasm zlib bzip2 texinfo perl ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional speexSupport speex
     ++ stdenv.lib.optional theoraSupport libtheora
@@ -75,10 +74,12 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional faacSupport faac
     ++ stdenv.lib.optional dc1394Support libdc1394
     ++ stdenv.lib.optionals x11grabSupport [ libXext libXfixes ]
-    ++ stdenv.lib.optional playSupport SDL
+    ++ stdenv.lib.optional (!stdenv.isDarwin && playSupport) SDL
     ++ stdenv.lib.optionals freetypeSupport [ freetype fontconfig ]
     ++ stdenv.lib.optional fdkAACSupport fdk_aac
-    ++ stdenv.lib.optional gnutlsSupport gnutls;
+    ++ stdenv.lib.optional gnutlsSupport gnutls
+    ++ stdenv.lib.optional (!stdenv.isDarwin && subtitleSupport) libass
+    ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index cd65234855f..40b4ff1f2d7 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Client library for MPD (music player daemon)";
     homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license = "GPLv2";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; unix;
     maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 7a2f3538fb8..792aa49f447 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -80,6 +80,7 @@ in stdenv.mkDerivation rec {
       (mkFlag mmsSupport "mms")
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
+      (mkFlag stdenv.isDarwin "osx")
       "--enable-debugging" ]
     ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cab717c16..b13d0c47d69 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6606,12 +6606,7 @@ let
 
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
-  mpd = callPackage ../servers/mpd {
-    # resolve the "stray '@' in program" errors
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenv;
-  };
+  mpd = callPackage ../servers/mpd { };
 
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 

From 35925d7a768a951809a6bb4aa0004f3fcb0139ed Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 11:04:45 +0200
Subject: [PATCH 1619/2033] Fix installer test

The installer now asks the user to set a root password if stdin is a
tty, which doesn't work for an interactive test.

http://hydra.nixos.org/build/11130072
---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 9149b1bff02..bc3a757ad54 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -161,10 +161,10 @@ let
           "/mnt/etc/nixos/configuration.nix");
 
       # Perform the installation.
-      $machine->succeed("nixos-install >&2");
+      $machine->succeed("nixos-install < /dev/null >&2");
 
       # Do it again to make sure it's idempotent.
-      $machine->succeed("nixos-install >&2");
+      $machine->succeed("nixos-install < /dev/null >&2");
 
       $machine->succeed("umount /mnt/boot || true");
       $machine->succeed("umount /mnt");

From e135e6b35b4ac75cfee7c561b2ea864967568f81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 11:20:33 +0200
Subject: [PATCH 1620/2033] nixos-install: Copy /etc/hosts

http://hydra.nixos.org/build/11130069
---
 nixos/modules/installer/tools/nixos-install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 3311e4c8e9a..ec48394435d 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -80,7 +80,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/run
 mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 rm -rf $mountPoint/var/run
 ln -s /run $mountPoint/var/run
-cp -f /etc/resolv.conf $mountPoint/etc/resolv.conf
+cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/
 
 
 if [ -n "$runChroot" ]; then

From 48768f3129f0c10153a85d57c1a02869ed22d9fc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 12:04:08 +0200
Subject: [PATCH 1621/2033] NixOS ISO: Set empty root password

---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index a120a01041b..eb7c4026857 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -39,6 +39,9 @@ with lib;
   # Add Memtest86+ to the CD.
   boot.loader.grub.memtest86.enable = true;
 
-  # Get a console as soon as the initrd loads fbcon on EFI boot
+  # Get a console as soon as the initrd loads fbcon on EFI boot.
   boot.initrd.kernelModules = [ "fbcon" ];
+
+  # Allow the user to log in as root without a password.
+  security.initialRootPassword = "";
 }

From 265351051eca39dff4dabcb58548c1ec32b5c1f4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 10:54:49 +0200
Subject: [PATCH 1622/2033] Override networkmanager GUI packages with gnome
 3.12 scope

---
 pkgs/desktops/gnome-3/3.12/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 7fbbd941327..1deb9dccb51 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -134,6 +134,16 @@ rec {
 
   nautilus = callPackage ./core/nautilus { };
 
+  networkmanager_openvpn = pkgs.networkmanager_openvpn.override { inherit gnome3; };
+
+  networkmanager_pptp = pkgs.networkmanager_pptp.override { inherit gnome3; };
+
+  networkmanager_vpnc = pkgs.networkmanager_vpnc.override { inherit gnome3; };
+
+  networkmanager_openconnect = pkgs.networkmanager_openconnect.override { inherit gnome3; };
+
+  networkmanagerapplet = pkgs.networkmanagerapplet.override { inherit gnome3; };
+
   rest = callPackage ./core/rest { };
 
   sushi = callPackage ./core/sushi { };

From 7da235a9885b60539413a00d483037eec71f1ae4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 10:55:10 +0200
Subject: [PATCH 1623/2033] evolution-data-server: use the right gnome3 package
 set in the service

---
 .../services/desktops/gnome3/evolution-data-server.nix     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index a49b5b47768..a8f8da0eed5 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -4,6 +4,9 @@
 
 with lib;
 
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
 {
 
   ###### interface
@@ -30,9 +33,9 @@ with lib;
 
   config = mkIf config.services.gnome3.evolution-data-server.enable {
 
-    environment.systemPackages = [ pkgs.evolution_data_server ];
+    environment.systemPackages = [ gnome3.evolution_data_server ];
 
-    services.dbus.packages = [ pkgs.evolution_data_server ];
+    services.dbus.packages = [ gnome3.evolution_data_server ];
 
   };
 

From 90eb94d7e87973e2726aef1c272b679bb4e80cc2 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 10:58:18 +0200
Subject: [PATCH 1624/2033] Override gvfs with gnome 3.12 scope

---
 pkgs/desktops/gnome-3/3.12/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 1deb9dccb51..49bf62160fa 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -112,7 +112,7 @@ rec {
 
   gucharmap = callPackage ./core/gucharmap { };
 
-  gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; };
+  gvfs = pkgs.gvfs.override { gnome = gnome3; };
 
   eog = callPackage ./core/eog { };
 

From e49509a4b14eb5ae64bdf136cd55bedb23246d5b Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 11:00:00 +0200
Subject: [PATCH 1625/2033] glib-networking: 2.38.2 -> 2.40.1

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 618b37bae4c..6b715028e8a 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,15 +2,15 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.38";
-  ver_min = "2";
+  ver_maj = "2.40";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "1iwzjkx6q9gqr7fipc98zi2bi0gccrwq1v7skff1cdijkn8zxqp8";
+    sha256 = "9fb3e54d049a480afdb814ff7452e7ab67e5d5f607ade230d7713f19922b5a28";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";

From 6e13cc82df0df507ba60c74ae28c4f8e91c25bc6 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 11:01:14 +0200
Subject: [PATCH 1626/2033] Override glib_networking with gnome 3.12 scope

---
 .../services/x11/desktop-managers/gnome3.nix  |  6 ++---
 pkgs/desktops/gnome-3/3.12/default.nix        | 26 +++++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4398a97ff47..78ab7aee92b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -101,11 +101,11 @@ in {
       };
 
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
-                                                "${pkgs.glib_networking}/lib/gio/modules" ];
+                                                "${gnome3.glib_networking}/lib/gio/modules" ];
     environment.systemPackages =
       [ pkgs.desktop_file_utils
-        pkgs.glib_networking
-        pkgs.gtk3 # for gtk-update-icon-cache
+        gnome3.glib_networking
+        gnome3.gtk3 # for gtk-update-icon-cache
         pkgs.ibus
         pkgs.shared_mime_info # for update-mime-database
         gnome3.dconf
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 49bf62160fa..0600b4ebbf9 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -44,6 +44,10 @@ rec {
 
   gjs = callPackage ./core/gjs { };
 
+  glib_networking = pkgs.glib_networking.override {
+    inherit gsettings_desktop_schemas;
+  };
+
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
   gnome-contacts = callPackage ./core/gnome-contacts { };
@@ -134,15 +138,27 @@ rec {
 
   nautilus = callPackage ./core/nautilus { };
 
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override { inherit gnome3; };
+  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
+    inherit gnome3;
+  };
 
-  networkmanager_pptp = pkgs.networkmanager_pptp.override { inherit gnome3; };
+  networkmanager_pptp = pkgs.networkmanager_pptp.override {
+    inherit gnome3;
+  };
 
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override { inherit gnome3; };
+  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
+    inherit gnome3;
+  };
 
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override { inherit gnome3; };
+  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
+    inherit gnome3;
+  };
 
-  networkmanagerapplet = pkgs.networkmanagerapplet.override { inherit gnome3; };
+  networkmanagerapplet = pkgs.networkmanagerapplet.override {
+    inherit gnome3 gsettings_desktop_schemas glib_networking
+      networkmanager_openvpn networkmanager_pptp networkmanager_vpnc
+      networkmanager_openconnect;
+  };
 
   rest = callPackage ./core/rest { };
 

From 09ab3bb6f78d59c1c5daa142bbe56bb46e7ed428 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 21 May 2014 12:43:24 +0200
Subject: [PATCH 1627/2033] gnome-photos 3.12: fix wrapping binaries

---
 .../gnome-3/3.12/apps/gnome-photos/default.nix       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
index 17ed92da870..cc92cdd3014 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
@@ -27,10 +27,14 @@ stdenv.mkDerivation rec {
                   hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
 
   preFixup = ''
-    wrapProgram "$out/bin/gnome-photos" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication"
+
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 

From 7d0d2e3166c9d45cfa6693cbb1a1e211dfef0e46 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 21 May 2014 12:47:49 +0200
Subject: [PATCH 1628/2033] gnome-documents 3.12: fix wrapping binaries

---
 .../gnome-3/3.12/apps/gnome-documents/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
index 8e47382954a..5c2206641e5 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
@@ -35,12 +35,15 @@ stdenv.mkDerivation rec {
     in
     ''
     substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-    wrapProgram "$out/bin/gnome-documents" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH ":" "${libPath}" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix LD_LIBRARY_PATH ":" "${libPath}" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+    done
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 

From cecd439827c80fbc2469e0d75adce88f67671251 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 21 May 2014 12:59:59 +0200
Subject: [PATCH 1629/2033] epiphany 3.12: fix wrapping binaries

---
 pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
index e7c94d8003f..d159965c544 100644
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preFixup = ''
-    wrapProgram "$out/bin/epiphany" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
   '';
 
   patches = [ ./libxml_missing_dep.patch ];

From 7a1e2d5a397a9f5fb21c3dddf168a8fe052141c8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 21 May 2014 13:39:55 +0200
Subject: [PATCH 1630/2033] evolution 3.12: fix wrapping binaries

---
 pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
index 982256b15d8..f9fbbbe56c6 100644
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@@ -33,9 +33,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preFixup = ''
-    wrapProgram "$out/bin/evolution" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
   '';
 
   meta = with stdenv.lib; {

From 93a7cf74b938598447343c49d80392c2ca607cba Mon Sep 17 00:00:00 2001
From: Jussi Maki <jussi.maki@gmail.com>
Date: Wed, 21 May 2014 14:58:37 +0200
Subject: [PATCH 1631/2033] typescript: add package. Closes #2712

Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
---
 lib/maintainers.nix                         |  1 +
 pkgs/development/web/typescript/default.nix | 28 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/web/typescript/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 80d0bed23dc..fc94de6d086 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
+  joamaki = "Jussi Maki <joamaki@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
diff --git a/pkgs/development/web/typescript/default.nix b/pkgs/development/web/typescript/default.nix
new file mode 100644
index 00000000000..07b75e1350e
--- /dev/null
+++ b/pkgs/development/web/typescript/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, nodejs }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.1-1";
+  name = "typescript-${version}";
+
+  src = fetchurl {
+    url = "http://registry.npmjs.org/typescript/-/${name}.tgz";
+    sha256 = "0fgfp58hki0g1255lvv17pdk77m1bf7dbwzb0vdb91mhp2masc6q";
+  };
+
+  propagatedBuildInputs = [ nodejs ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+    chmod a+x $out/bin/tsc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "TypeScript is a language for application scale JavaScript development";
+    longDescription = ''
+      TypeScript is a language for application scale JavaScript development'';
+    homepage = http://nodejs.org;
+    license = licenses.asl20;
+    maintainers = [ maintainers.joamaki ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cab717c16..d0e0b341e99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2141,6 +2141,8 @@ let
 
   txt2man = callPackage ../tools/misc/txt2man { };
 
+  typescript = callPackage ../development/web/typescript { };
+
   ucl = callPackage ../development/libraries/ucl { };
 
   udftools = callPackage ../tools/filesystems/udftools {};

From 1e2291f23ae2f51615353610db0482f464a7a77e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 12:44:00 +0200
Subject: [PATCH 1632/2033] nixos-install: Fix running it after again the
 activation script

---
 nixos/modules/installer/tools/nixos-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index ec48394435d..9d62ba131dc 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -80,6 +80,7 @@ mount -t tmpfs -o "mode=0755" none $mountPoint/run
 mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers
 rm -rf $mountPoint/var/run
 ln -s /run $mountPoint/var/run
+rm -f $mountPoint/etc/{resolv.conf,hosts}
 cp -f /etc/resolv.conf /etc/hosts $mountPoint/etc/
 
 

From f43d9f01648fb2362a85b348fdeb96b772cf71b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 12:46:39 +0200
Subject: [PATCH 1633/2033] mkpasswd: Add to channel

---
 pkgs/tools/security/mkpasswd/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index 1df8c1a62d2..8975ca4324d 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub }:
-  
+
 stdenv.mkDerivation rec {
   name = "mkpasswd-${version}";
 
@@ -22,10 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://packages.qa.debian.org/w/whois.html;
-    description = ''
-      Overfeatured front end to crypt, from the Debian whois package
-    '';
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ cstrahan ];
+    description = "Overfeatured front-end to crypt, from the Debian whois package";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.cstrahan ];
+    platforms = platforms.linux;
   };
 }

From d4ccfe3f6b2e6368373bfb81bb3154869271c895 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 14:01:56 +0200
Subject: [PATCH 1634/2033] Don't create /media

It's obsolete - udisks2 uses /run/media/<username>.
---
 nixos/modules/system/activation/activation-script.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index fe5935c2ffa..b1bad956b4b 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -127,11 +127,6 @@ in
         mkdir -m 0555 -p /var/empty
       '';
 
-    system.activationScripts.media =
-      ''
-        mkdir -m 0755 -p /media
-      '';
-
     system.activationScripts.usrbinenv =
       ''
         mkdir -m 0755 -p /usr/bin

From 48601269a94456ae61b187ab48e5ba2d98d2ea0b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 14:05:43 +0200
Subject: [PATCH 1635/2033] test-driver: Set context to include machines
 created by createMachine

---
 nixos/lib/test-driver/test-driver.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index 358c29e515f..8ad0d67f68c 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -52,12 +52,12 @@ sub createMachine {
     my ($args) = @_;
     my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"});
     $vms{$vm->name} = $vm;
+    $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
     return $vm;
 }
 
 foreach my $vmScript (@ARGV) {
     my $vm = createMachine({startCommand => $vmScript});
-    $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; ";
 }
 
 

From 5e364503d5b219e81c54e3616e3bf8e61a2cf1c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 14:06:31 +0200
Subject: [PATCH 1636/2033] NixOS ISO: Don't use a unionfs for /

We don't need a unionfs on /, we only need a tmpfs.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 56 ++++++++++----------
 nixos/modules/system/boot/stage-1.nix        |  3 ++
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 00f5fae8434..28c42d64f6f 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -67,7 +67,7 @@ let
         ${config.boot.kernelPackages.kernel}/bzImage ::boot/bzImage
       mcopy -v -i "$out" \
         ${config.system.build.initialRamdisk}/initrd ::boot/initrd
-    '';
+    ''; # */
 
   targetArch = if pkgs.stdenv.isi686 then
     "ia32"
@@ -177,39 +177,45 @@ in
     # recognise that.
     boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" ];
 
-    # Note that /dev/root is a symlink to the actual root device
-    # specified on the kernel command line, created in the stage 1 init
-    # script.
-    fileSystems."/".device = "/dev/root";
+    fileSystems."/" =
+      { fsType = "tmpfs";
+        device = "none";
+        options = "mode=0755";
+      };
 
-    fileSystems."/nix/store" =
+    # Note that /dev/root is a symlink to the actual root device
+    # specified on the kernel command line, created in the stage 1
+    # init script.
+    fileSystems."/iso" =
+      { device = "/dev/root";
+        neededForBoot = true;
+        noCheck = true;
+      };
+
+    fileSystems."/nix/.ro-store" =
       { fsType = "squashfs";
-        device = "/nix-store.squashfs";
+        device = "/iso/nix-store.squashfs";
         options = "loop";
+        neededForBoot = true;
+      };
+
+    fileSystems."/nix/.rw-store" =
+      { fsType = "tmpfs";
+        device = "none";
+        options = "mode=0755";
+        neededForBoot = true;
       };
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" ];
 
     boot.initrd.kernelModules = [ "loop" ];
 
-    # In stage 1, mount a tmpfs on top of / (the ISO image) and
-    # /nix/store (the squashfs image) to make this a live CD.
+    # In stage 1, mount a tmpfs on top of /nix/store (the squashfs
+    # image) to make this a live CD.
     boot.initrd.postMountCommands =
       ''
-        mkdir -p /unionfs-chroot/ro-root
-        mount --rbind $targetRoot /unionfs-chroot/ro-root
-
-        mkdir /unionfs-chroot/rw-root
-        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-root
-        mkdir /mnt-root-union
-        unionfs -o allow_other,cow,chroot=/unionfs-chroot,max_files=32768 /rw-root=RW:/ro-root=RO /mnt-root-union
-        oldTargetRoot=$targetRoot
-        targetRoot=/mnt-root-union
-
-        mkdir /unionfs-chroot/rw-store
-        mount -t tmpfs -o "mode=755" none /unionfs-chroot/rw-store
-        mkdir -p $oldTargetRoot/nix/store
-        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-store=RW:/ro-root/nix/store=RO /mnt-root-union/nix/store
+        mkdir -p $targetRoot/nix/store
+        unionfs -o allow_other,cow,nonempty,chroot=$targetRoot,max_files=32768 /nix/.rw-store=RW:/nix/.ro-store=RO $targetRoot/nix/store
       '';
 
     # Closures to be copied to the Nix store on the CD, namely the init
@@ -253,10 +259,6 @@ in
         { source = config.system.build.squashfsStore;
           target = "/nix-store.squashfs";
         }
-        { # Quick hack: need a mount point for the store.
-          source = pkgs.runCommand "empty" {} "mkdir -p $out";
-          target = "/nix/store";
-        }
       ] ++ optionals config.isoImage.makeEfiBootable [
         { source = efiImg;
           target = "/boot/efi.img";
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index c38d33c45d6..b6249b6c091 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -344,5 +344,8 @@ in
       (isYes "BLK_DEV_INITRD")
     ];
 
+    # Prevent systemd from waiting for the /dev/root symlink.
+    systemd.units."dev-root.device".text = "";
+
   };
 }

From c54eb790633c85bc22c4328e0f035cfa0be06780 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 15:19:01 +0200
Subject: [PATCH 1637/2033] Don't kill unionfs-fuse during shutdown

Killing the daemon backing /nix/store prevents a clean shutdown.  See
http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
---
 nixos/modules/system/boot/stage-1-init.sh          |  5 +++--
 pkgs/tools/filesystems/unionfs-fuse/default.nix    |  8 ++++++++
 .../unionfs-fuse/prevent-kill-on-shutdown.patch    | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index c4a21b02cac..15586e68e7e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -58,6 +58,7 @@ echo
 mkdir -p /etc
 touch /etc/fstab # to shut up mount
 touch /etc/mtab # to shut up mke2fs
+touch /etc/initrd-release
 mkdir -p /proc
 mount -t proc none /proc
 mkdir -p /sys
@@ -345,8 +346,8 @@ exec 3>&-
 udevadm control --exit || true
 
 # Kill any remaining processes, just to be sure we're not taking any
-# with us into stage 2. unionfs-fuse mounts require the unionfs process.
-pkill -9 -v '(1|unionfs)'
+# with us into stage 2. But keep storage daemons like unionfs-fuse.
+pkill -9 -v -f '@'
 
 
 if test -n "$debug1mounts"; then fail; fi
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 4da1a84e937..bff5aaf242b 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d";
   };
 
+  patches =
+    [ # Prevent the unionfs daemon from being killed during
+      # shutdown. See
+      # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+      # for details.
+      ./prevent-kill-on-shutdown.patch
+    ];
+
   buildInputs = [ cmake fuse ];
 
   # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
diff --git a/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
new file mode 100644
index 00000000000..0a98b83282b
--- /dev/null
+++ b/pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch
@@ -0,0 +1,14 @@
+diff -ru -x '*~' unionfs-fuse-0.26-orig/src/unionfs.c unionfs-fuse-0.26/src/unionfs.c
+--- unionfs-fuse-0.26-orig/src/unionfs.c	2012-09-11 00:06:32.000000000 +0200
++++ unionfs-fuse-0.26/src/unionfs.c	2014-05-21 14:22:03.597861805 +0200
+@@ -831,6 +831,10 @@
+ 	}
+ #endif
+ 
++	/* Prevent systemd's shutdown from killing us. */
++	if (access("/etc/initrd-release", F_OK) >= 0)
++		argv[0][0] = '@';
++
+ 	umask(0);
+ 	int res = fuse_main(args.argc, args.argv, &unionfs_oper, NULL);
+ 	RETURN(uopt.doexit ? uopt.retval : res);

From ca123bc274b23c5bc6de2578c137760d2bb26c5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 15:20:37 +0200
Subject: [PATCH 1638/2033] Installer test: Get rid of a warning

---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index bc3a757ad54..60d5166821f 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -173,7 +173,7 @@ let
       $machine->shutdown;
 
       # Now see if we can boot the installation.
-      my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
 
       # Did /boot get mounted?
       $machine->waitForUnit("local-fs.target");
@@ -205,7 +205,7 @@ let
 
       # And just to be sure, check that the machine still boots after
       # "nixos-rebuild switch".
-      my $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
+      $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" });
       $machine->waitForUnit("network.target");
       $machine->shutdown;
     '';

From 784503864bb1961f523f24fa6d6d745de6b01b0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 15:40:48 +0200
Subject: [PATCH 1639/2033] Enable the xf86-video-modesetting driver

---
 nixos/modules/services/x11/xserver.nix | 2 +-
 pkgs/top-level/release.nix             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index dc3aa9d15cc..5f3e8003b45 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -169,7 +169,7 @@ in
       videoDrivers = mkOption {
         type = types.listOf types.str;
         # !!! We'd like "nv" here, but it segfaults the X server.
-        default = [ "ati" "cirrus" "intel" "vesa" "vmware" ];
+        default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
         example = [ "vesa" ];
         description = ''
           The names of the video drivers the configuration
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index fd990ebf17e..ce01b257741 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -422,6 +422,7 @@ let
         xf86videonv = linux;
         xf86videovesa = linux;
         xf86videovmware = linux;
+        xf86videomodesetting = linux;
         xfs = linux;
         xinput = linux;
         xkbcomp = linux;

From f23231f198f3122ab52982bcd4fbf0e225b24664 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 15:42:02 +0200
Subject: [PATCH 1640/2033] Installer test: Don't wait for dhcpcd if we don't
 have a network

---
 nixos/tests/installer.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 60d5166821f..1c3fb148410 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -129,9 +129,10 @@ let
       #$machine->waitForUnit('getty@tty2');
       $machine->waitForUnit("rogue");
       $machine->waitForUnit("nixos-manual");
-      $machine->waitForUnit("dhcpcd");
 
       ${optionalString testChannel ''
+        $machine->waitForUnit("dhcpcd");
+
         # Allow the machine to talk to the fake nixos.org.
         $machine->succeed(
             "rm /etc/hosts",

From 0f51ae90b93e8b5555e9077aa5e473ac6fa227f8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 15:57:34 +0200
Subject: [PATCH 1641/2033] Revert "typescript: add package. Closes #2712"

This reverts commit 93a7cf74b938598447343c49d80392c2ca607cba.
---
 lib/maintainers.nix                         |  1 -
 pkgs/development/web/typescript/default.nix | 28 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 3 files changed, 31 deletions(-)
 delete mode 100644 pkgs/development/web/typescript/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fc94de6d086..80d0bed23dc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,7 +43,6 @@
   iElectric = "Domen Kozar <domen@dev.si>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
-  joamaki = "Jussi Maki <joamaki@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
diff --git a/pkgs/development/web/typescript/default.nix b/pkgs/development/web/typescript/default.nix
deleted file mode 100644
index 07b75e1350e..00000000000
--- a/pkgs/development/web/typescript/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, nodejs }:
-
-stdenv.mkDerivation rec {
-  version = "0.9.1-1";
-  name = "typescript-${version}";
-
-  src = fetchurl {
-    url = "http://registry.npmjs.org/typescript/-/${name}.tgz";
-    sha256 = "0fgfp58hki0g1255lvv17pdk77m1bf7dbwzb0vdb91mhp2masc6q";
-  };
-
-  propagatedBuildInputs = [ nodejs ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r * $out
-    chmod a+x $out/bin/tsc
-  '';
-
-  meta = with stdenv.lib; {
-    description = "TypeScript is a language for application scale JavaScript development";
-    longDescription = ''
-      TypeScript is a language for application scale JavaScript development'';
-    homepage = http://nodejs.org;
-    license = licenses.asl20;
-    maintainers = [ maintainers.joamaki ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0e0b341e99..70cab717c16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2141,8 +2141,6 @@ let
 
   txt2man = callPackage ../tools/misc/txt2man { };
 
-  typescript = callPackage ../development/web/typescript { };
-
   ucl = callPackage ../development/libraries/ucl { };
 
   udftools = callPackage ../tools/filesystems/udftools {};

From 8882c77d4b51a76751f4a652f9829526e1c7f9c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 14:54:01 +0200
Subject: [PATCH 1642/2033] haskell-vector: update to version 0.10.9.2

---
 .../libraries/haskell/vector/{0.10.9.1.nix => 0.10.9.2.nix}   | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/vector/{0.10.9.1.nix => 0.10.9.2.nix} (81%)

diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.1.nix b/pkgs/development/libraries/haskell/vector/0.10.9.2.nix
similarity index 81%
rename from pkgs/development/libraries/haskell/vector/0.10.9.1.nix
rename to pkgs/development/libraries/haskell/vector/0.10.9.2.nix
index 975d75526a6..57c924aff48 100644
--- a/pkgs/development/libraries/haskell/vector/0.10.9.1.nix
+++ b/pkgs/development/libraries/haskell/vector/0.10.9.2.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vector";
-  version = "0.10.9.1";
-  sha256 = "1rdx0r7bwx6217ip9mg9yfymvgv52szqv63y89p41b8sfklmcmi0";
+  version = "0.10.9.2";
+  sha256 = "046w4w5dr5136smfxzhzkhzcx6jgpnqrc2x5lzy4vrlxhb8za6c1";
   buildDepends = [ deepseq primitive ];
   meta = {
     homepage = "https://github.com/haskell/vector";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 205961701ed..d0479588134 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2299,8 +2299,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   vect = callPackage ../development/libraries/haskell/vect {};
 
   vector_0_10_0_1  = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {};
-  vector_0_10_9_1  = callPackage ../development/libraries/haskell/vector/0.10.9.1.nix {};
-  vector = self.vector_0_10_9_1;
+  vector_0_10_9_2  = callPackage ../development/libraries/haskell/vector/0.10.9.2.nix {};
+  vector = self.vector_0_10_9_2;
 
   vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {};
 

From b1b24494f2f4e6e2addcfbffa37e81ad752a0008 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 14:56:44 +0200
Subject: [PATCH 1643/2033] haskell-binary: update to version 0.7.2.1

---
 .../haskell/binary/{0.7.2.0.nix => 0.7.2.1.nix}      |  4 ++--
 pkgs/top-level/haskell-defaults.nix                  | 12 ++++++------
 pkgs/top-level/haskell-packages.nix                  |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/development/libraries/haskell/binary/{0.7.2.0.nix => 0.7.2.1.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/binary/0.7.2.0.nix
rename to pkgs/development/libraries/haskell/binary/0.7.2.1.nix
index 102206b5947..bf91922835d 100644
--- a/pkgs/development/libraries/haskell/binary/0.7.2.0.nix
+++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "binary";
-  version = "0.7.2.0";
-  sha256 = "149pdhzjg9bhl66azgv0nmj3fy38s4klzk01vhzazngdiagfq6wn";
+  version = "0.7.2.1";
+  sha256 = "0s0idmcmribgajxxnxdvppnz62qyxwrj9iy34pi7nvm41gj6q5nz";
   testDepends = [
     Cabal filepath HUnit QuickCheck random testFramework
     testFrameworkQuickcheck2
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 3c5d50835ea..a39bf2d4be5 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -29,17 +29,17 @@
         haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };
       };
     };
-    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_0; };
-    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_0; }; };
+    binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_1; };
+    bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_1; }; };
     criterion = super.criterion.override {
       statistics = self.statistics.override {
-        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_0; };
+        vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; };
       };
     };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     modularArithmetic = null;           # requires base >= 4.7
-    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_0; };
+    pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
     transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
   };
 
@@ -59,7 +59,7 @@
   };
 
   ghc704Prefs = self : super : ghc722Prefs self super // {
-    binary = self.binary_0_7_2_0;       # core package in ghc >= 7.2.2
+    binary = self.binary_0_7_2_1;       # core package in ghc >= 7.2.2
     haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; };
     HsSyck = self.HsSyck_0_51;
     jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
@@ -80,7 +80,7 @@
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
     alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
     Cabal = self.Cabal_1_16_0_3;
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d0479588134..605195d83b2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -228,7 +228,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   bimap = callPackage ../development/libraries/haskell/bimap {};
 
   binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {};
-  binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {};
+  binary_0_7_2_1 = callPackage ../development/libraries/haskell/binary/0.7.2.1.nix {};
   binary = null;                # core package since ghc >= 7.2.x
 
   binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {};
@@ -270,7 +270,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
   bmp = callPackage ../development/libraries/haskell/bmp {
-    binary = self.binary_0_7_2_0;
+    binary = self.binary_0_7_2_1;
   };
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
@@ -1355,7 +1355,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
   miniutter = callPackage ../development/libraries/haskell/miniutter {
-    binary = self.binary_0_7_2_0;
+    binary = self.binary_0_7_2_1;
   };
 
   mimeMail = callPackage ../development/libraries/haskell/mime-mail {};
@@ -2687,7 +2687,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   LambdaHack = callPackage ../games/LambdaHack {
     vectorBinaryInstances = self.vectorBinaryInstances.override {
-      binary = self.binary_0_7_2_0; # the miniutter build input requires this version
+      binary = self.binary_0_7_2_1; # the miniutter build input requires this version
     };
   };
 

From 18a82b7da12debc1f0c50a2d33399298c8858352 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 14:57:00 +0200
Subject: [PATCH 1644/2033] haskell-amqp: re-generate with cabal2nix

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

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 8e9f69f8fc0..9d08994af4f 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -16,11 +16,11 @@ cabal.mkDerivation (self: {
     binary clock connection dataBinaryIeee754 hspec hspecExpectations
     network split text
   ];
+  doCheck = false;
   meta = {
     homepage = "https://github.com/hreinhardt/amqp";
     description = "Client library for AMQP servers (currently only RabbitMQ)";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
   };
-  doCheck = false;
 })

From 6eeb989a355c7897e4636541916c690f3e23884f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 14:58:35 +0200
Subject: [PATCH 1645/2033] xmobar: re-generate with cabal2nix

---
 pkgs/applications/misc/xmobar/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index d631b28a67f..227fa438a14 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,6 +1,6 @@
-{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl
-, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd
-, X11Xft
+{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr
+, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools
+, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -10,8 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time
-    utf8String X11 X11Xft libmpd
+    alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm
+    time utf8String X11 X11Xft
   ];
   extraLibraries = [ libXrandr wirelesstools ];
   configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd";

From d05e832b145485bb754f3aae6097ad75da54744e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 16:12:03 +0200
Subject: [PATCH 1646/2033] vlock: add meta and take maintainership

---
 pkgs/misc/screensavers/vlock/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix
index f2cea3f257b..012fef1b5b0 100644
--- a/pkgs/misc/screensavers/vlock/default.nix
+++ b/pkgs/misc/screensavers/vlock/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ pam ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Virtual console locking program";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.lethalman ];
+    platforms = platforms.linux;
   };
 }

From 3da94435c07d09c792d56d1a4547668422d7c539 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 21 May 2014 10:55:34 +0200
Subject: [PATCH 1647/2033] Add option ec2.hvm, to set some boot configuration
 specific for EC2 HVM instances.

(cherry picked from commit 35c76d917307b7ac405486855cfe63021810dba5)

Conflicts:
	nixos/modules/virtualisation/amazon-image.nix
---
 nixos/modules/virtualisation/amazon-image.nix | 277 ++++++++++--------
 1 file changed, 148 insertions(+), 129 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 138047a07db..9e64327c3ab 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -1,164 +1,183 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-
+let
+  cfg = config.ec2;
+in
 {
   imports = [ ../profiles/headless.nix ./ec2-data.nix ];
 
-  system.build.amazonImage =
-    pkgs.vmTools.runInLinuxVM (
-      pkgs.runCommand "amazon-image"
-        { preVM =
-            ''
-              mkdir $out
-              diskImage=$out/nixos.img
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G"
-              mv closure xchg/
-            '';
-          buildInputs = [ pkgs.utillinux pkgs.perl ];
-          exportReferencesGraph =
-            [ "closure" config.system.build.toplevel ];
-        }
-        ''
-          # Create an empty filesystem and mount it.
-          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda
-          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda
-          mkdir /mnt
-          mount /dev/vda /mnt
+  options = {
+    ec2 = {
+      hvm = mkOption {
+        default = false;
+        description = ''
+          Whether the EC2 instance is a HVM instance.
+        '';
+      };
+    };
+  };
 
-          # The initrd expects these directories to exist.
-          mkdir /mnt/dev /mnt/proc /mnt/sys
+  config = {
+    system.build.amazonImage =
+      pkgs.vmTools.runInLinuxVM (
+        pkgs.runCommand "amazon-image"
+          { preVM =
+              ''
+                mkdir $out
+                diskImage=$out/nixos.img
+                ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "4G"
+                mv closure xchg/
+              '';
+            buildInputs = [ pkgs.utillinux pkgs.perl ];
+            exportReferencesGraph =
+              [ "closure" config.system.build.toplevel ];
+          }
+          ''
+            # Create an empty filesystem and mount it.
+            ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda
+            ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda
+            mkdir /mnt
+            mount /dev/vda /mnt
 
-          mount -o bind /proc /mnt/proc
+            # The initrd expects these directories to exist.
+            mkdir /mnt/dev /mnt/proc /mnt/sys
 
-          # Copy all paths in the closure to the filesystem.
-          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+            mount -o bind /proc /mnt/proc
 
-          mkdir -p /mnt/nix/store
-          echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
+            # Copy all paths in the closure to the filesystem.
+            storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          # Register the paths in the Nix database.
-          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
-              chroot /mnt ${config.nix.package}/bin/nix-store --load-db
+            mkdir -p /mnt/nix/store
+            echo "copying everything (will take a while)..."
+            cp -prd $storePaths /mnt/nix/store/
 
-          # Create the system profile to allow nixos-rebuild to work.
-          chroot /mnt ${config.nix.package}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+            # Register the paths in the Nix database.
+            printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+                chroot /mnt ${config.nix.package}/bin/nix-store --load-db
 
-          # `nixos-rebuild' requires an /etc/NIXOS.
-          mkdir -p /mnt/etc
-          touch /mnt/etc/NIXOS
+            # Create the system profile to allow nixos-rebuild to work.
+            chroot /mnt ${config.nix.package}/bin/nix-env \
+                -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
 
-          # `switch-to-configuration' requires a /bin/sh
-          mkdir -p /mnt/bin
-          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+            # `nixos-rebuild' requires an /etc/NIXOS.
+            mkdir -p /mnt/etc
+            touch /mnt/etc/NIXOS
 
-          # Install a configuration.nix.
-          mkdir -p /mnt/etc/nixos
-          cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
+            # `switch-to-configuration' requires a /bin/sh
+            mkdir -p /mnt/bin
+            ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
 
-          # Generate the GRUB menu.
-          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+            # Install a configuration.nix.
+            mkdir -p /mnt/etc/nixos
+            cp ${./amazon-config.nix} /mnt/etc/nixos/configuration.nix
 
-          umount /mnt/proc
-          umount /mnt
-        ''
-    );
+            # Generate the GRUB menu.
+            chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
+            umount /mnt/proc
+            umount /mnt
+          ''
+      );
 
-  boot.initrd.kernelModules = [ "xen-blkfront" ];
-  boot.kernelModules = [ "xen-netfront" ];
-  boot.kernelParams = [ "console=ttyS0" ];
+    fileSystems."/".device = "/dev/disk/by-label/nixos";
 
-  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
-  boot.loader.grub.version = 1;
-  boot.loader.grub.device = "nodev";
-  boot.loader.grub.timeout = 0;
-  boot.loader.grub.extraPerEntryConfig = "root (hd0)";
+    boot.initrd.kernelModules = [ "xen-blkfront" ];
+    boot.kernelModules = [ "xen-netfront" ];
 
-  boot.initrd.postDeviceCommands =
-    ''
-      # Force udev to exit to prevent random "Device or resource busy
-      # while trying to open /dev/xvda" errors from fsck.
-      udevadm control --exit || true
-      kill -9 -1
-    '';
+    # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+    boot.loader.grub.version = 1;
+    boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev";
+    boot.loader.grub.timeout = 0;
+    boot.loader.grub.extraPerEntryConfig = "root (hd0${lib.optionalString cfg.hvm ",0"})";
 
-  # Mount all formatted ephemeral disks and activate all swap devices.
-  # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
-  # because the set of devices is dependent on the instance type
-  # (e.g. "m1.large" has one ephemeral filesystem and one swap device,
-  # while "m1.large" has two ephemeral filesystems and no swap
-  # devices).  Also, put /tmp and /var on /disk0, since it has a lot
-  # more space than the root device.  Similarly, "move" /nix to /disk0
-  # by layering a unionfs-fuse mount on top of it so we have a lot more space for
-  # Nix operations.
-  boot.initrd.postMountCommands =
-    ''
-      diskNr=0
-      diskForUnionfs=
-      for device in /dev/xvd[abcde]*; do
-          if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
-          fsType=$(blkid -o value -s TYPE "$device" || true)
-          if [ "$fsType" = swap ]; then
-              echo "activating swap device $device..."
-              swapon "$device" || true
-          elif [ "$fsType" = ext3 ]; then
-              mp="/disk$diskNr"
-              diskNr=$((diskNr + 1))
-              echo "mounting $device on $mp..."
-              if mountFS "$device" "$mp" "" ext3; then
-                  if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
-              fi
-          else
-              echo "skipping unknown device type $device"
-          fi
-      done
+    boot.initrd.postDeviceCommands =
+      ''
+        # Force udev to exit to prevent random "Device or resource busy
+        # while trying to open /dev/xvda" errors from fsck.
+        udevadm control --exit || true
+        kill -9 -1
+      '';
 
-      if [ -n "$diskForUnionfs" ]; then
-          mkdir -m 755 -p $targetRoot/$diskForUnionfs/root
+    # Mount all formatted ephemeral disks and activate all swap devices.
+    # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
+    # because the set of devices is dependent on the instance type
+    # (e.g. "m1.large" has one ephemeral filesystem and one swap device,
+    # while "m1.large" has two ephemeral filesystems and no swap
+    # devices).  Also, put /tmp and /var on /disk0, since it has a lot
+    # more space than the root device.  Similarly, "move" /nix to /disk0
+    # by layering a unionfs-fuse mount on top of it so we have a lot more space for
+    # Nix operations.
+    boot.initrd.postMountCommands =
+      ''
+        diskNr=0
+        diskForUnionfs=
+        for device in /dev/xvd[abcde]*; do
+            if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
+            fsType=$(blkid -o value -s TYPE "$device" || true)
+            if [ "$fsType" = swap ]; then
+                echo "activating swap device $device..."
+                swapon "$device" || true
+            elif [ "$fsType" = ext3 ]; then
+                mp="/disk$diskNr"
+                diskNr=$((diskNr + 1))
+                echo "mounting $device on $mp..."
+                if mountFS "$device" "$mp" "" ext3; then
+                    if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
+                fi
+            else
+                echo "skipping unknown device type $device"
+            fi
+        done
 
-          mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
-          mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
+        if [ -n "$diskForUnionfs" ]; then
+            mkdir -m 755 -p $targetRoot/$diskForUnionfs/root
 
-          if [ ! -e $targetRoot/.ebs ]; then
-              mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var
-              mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var
+            mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
+            mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
 
-              mkdir -p /unionfs-chroot/ro-nix
-              mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
+            if [ ! -e $targetRoot/.ebs ]; then
+                mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var
+                mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var
 
-              mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix
-              mkdir -p /unionfs-chroot/rw-nix
-              mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix
+                mkdir -p /unionfs-chroot/ro-nix
+                mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
 
-              unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
-          fi
-      fi
-    '';
+                mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/nix
+                mkdir -p /unionfs-chroot/rw-nix
+                mount --rbind $targetRoot/$diskForUnionfs/root/nix /unionfs-chroot/rw-nix
 
-  boot.initrd.extraUtilsCommands =
-    ''
-      # We need swapon in the initrd.
-      cp ${pkgs.utillinux}/sbin/swapon $out/bin
-    '';
+                unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
+            fi
+        fi
+      '';
 
-  # Don't put old configurations in the GRUB menu.  The user has no
-  # way to select them anyway.
-  boot.loader.grub.configurationLimit = 0;
+    boot.initrd.extraUtilsCommands =
+      ''
+        # We need swapon in the initrd.
+        cp ${pkgs.utillinux}/sbin/swapon $out/bin
+      '';
 
-  # Allow root logins only using the SSH key that the user specified
-  # at instance creation time.
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "without-password";
+    # Don't put old configurations in the GRUB menu.  The user has no
+    # way to select them anyway.
+    boot.loader.grub.configurationLimit = 0;
 
-  # Force getting the hostname from EC2.
-  networking.hostName = mkDefault "";
+    # Allow root logins only using the SSH key that the user specified
+    # at instance creation time.
+    services.openssh.enable = true;
+    services.openssh.permitRootLogin = "without-password";
 
-  # Always include cryptsetup so that Charon can use it.
-  environment.systemPackages = [ pkgs.cryptsetup ];
+    # Force getting the hostname from EC2.
+    networking.hostName = mkDefault "";
 
-  boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
+    # Always include cryptsetup so that Charon can use it.
+    environment.systemPackages = [ pkgs.cryptsetup ];
+
+    boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
+
+    # Prevent logging in as root without a password.  This doesn't really matter,
+    # since the only PAM services that allow logging in with a null
+    # password are local ones that are inaccessible on EC2 machines.
+    security.initialRootPassword = mkDefault "!";
+  };
 }

From cdfb8738a4f93f1e4146b8f7251632640de8e34a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 21 May 2014 13:40:19 +0200
Subject: [PATCH 1648/2033] Use HVM instance for EBS creator, guarantees
 everything is created in the correct zone.

(cherry picked from commit c9763e20e5e793be5eef155601f59dd7639c7ba3)
---
 nixos/maintainers/scripts/ec2/ebs-creator.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix
index 43dbd86f675..5a5c57c72eb 100644
--- a/nixos/maintainers/scripts/ec2/ebs-creator.nix
+++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix
@@ -4,7 +4,7 @@
   machine =
     { config, pkgs, resources, ... }:
     { deployment.targetEnv = "ec2";
-      deployment.ec2.instanceType = "m1.large";
+      deployment.ec2.instanceType = "c3.large";
       deployment.ec2.securityGroups = [ "admin" ];
       deployment.ec2.ebsBoot = false;
       deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;

From 973fa21b52d0222ea5033ef265b2fbc0d2ab85c2 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 21 May 2014 16:31:52 +0200
Subject: [PATCH 1649/2033] Better support for HVM instances. Now the NixOS
 images can be used on HVM instances without needing nixops. Previously the
 grub setup was incorrect, so a plain 'nixos-rebuild switch' and a reboot
 would result in a broken system.

Also added growing of the partition of the root disk in the initrd,
so you can run resize2fs after initial boot, without needing an
extra reboot. This is useful especially for nixops'
deployment.ec2.ebsInitialRootDiskSize option.

(cherry picked from commit 044a24e58bcf4cf48df02df936c542839fb08d90)
---
 .../scripts/ec2/amazon-hvm-config.nix         |  5 +++
 .../scripts/ec2/amazon-hvm-install-config.nix | 33 +++++++++++++++++++
 .../scripts/ec2/create-ebs-amis.py            | 20 ++++++-----
 nixos/maintainers/scripts/ec2/ebs-creator.nix |  1 +
 4 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 nixos/maintainers/scripts/ec2/amazon-hvm-config.nix
 create mode 100644 nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix

diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix
new file mode 100644
index 00000000000..d0c7f3a6a6c
--- /dev/null
+++ b/nixos/maintainers/scripts/ec2/amazon-hvm-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ...}:
+{
+  imports = [ ./amazon-base-config.nix ];
+  ec2.hvm = true;
+}
diff --git a/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix
new file mode 100644
index 00000000000..d9feba164a7
--- /dev/null
+++ b/nixos/maintainers/scripts/ec2/amazon-hvm-install-config.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ...}:
+let
+  cloudUtils = pkgs.fetchurl {
+    url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz";
+    sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd";
+  };
+  growpart = pkgs.stdenv.mkDerivation {
+    name = "growpart";
+    src = cloudUtils;
+    buildPhase = ''
+      cp bin/growpart $out
+      sed -i 's|awk|gawk|' $out
+      sed -i 's|sed|gnused|' $out
+    '';
+    dontInstall = true;
+    dontPatchShebangs = true;
+  };
+in
+{
+  imports = [ ./amazon-base-config.nix ];
+  ec2.hvm = true;
+  boot.loader.grub.device = lib.mkOverride 0 "nodev";
+
+  boot.initrd.extraUtilsCommands = ''
+    cp -v ${pkgs.gawk}/bin/gawk $out/bin/gawk
+    cp -v ${pkgs.gnused}/bin/sed $out/bin/gnused
+    cp -v ${pkgs.utillinux}/sbin/sfdisk $out/bin/sfdisk
+    cp -v ${growpart} $out/bin/growpart
+  '';
+  boot.initrd.postDeviceCommands = ''
+    [ -e /dev/xvda ] && [ -e /dev/xvda1 ] && TMPDIR=/run sh $(type -P growpart) /dev/xvda 1
+  '';
+}
diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index 4e1aea65980..14607b9a367 100755
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@@ -18,7 +18,7 @@ parser.add_argument('--hvm', dest='hvm', action='store_true', help='Create HVM i
 parser.add_argument('--key', dest='key_name', action='store_true', help='Keypair used for HVM instance creation', default="rob")
 args = parser.parse_args()
 
-instance_type = "m3.xlarge" if args.hvm else "m1.small"
+instance_type = "m3.medium" if args.hvm else "m1.small"
 ebs_size = 8 if args.hvm else 20
 
 
@@ -52,7 +52,6 @@ depl.deploy(allow_reboot=True)
 
 m = depl.machines['machine']
 
-
 # Do the installation.
 device="/dev/xvdg"
 if args.hvm:
@@ -66,24 +65,27 @@ m.run_command("mkdir -p /mnt")
 m.run_command("mount {0} /mnt".format(device))
 m.run_command("touch /mnt/.ebs")
 m.run_command("mkdir -p /mnt/etc/nixos")
+
 m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel))
 m.run_command("nix-channel --update")
-m.run_command("nixos-rebuild switch")
-version = m.run_command("nixos-version", capture_stdout=True).split(' ')[0]
+
+version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion '<nixpkgs>'", capture_stdout=True).split(' ')[0].replace('"','').strip()
 print >> sys.stderr, "NixOS version is {0}".format(version)
-m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix")
-m.run_command("nixos-install")
 if args.hvm:
+    m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/amazon-base-config.nix")
+    m.upload_file("./amazon-hvm-config.nix", "/mnt/etc/nixos/configuration.nix")
+    m.upload_file("./amazon-hvm-install-config.nix", "/mnt/etc/nixos/amazon-hvm-install-config.nix")
+    m.run_command("NIXOS_CONFIG=/etc/nixos/amazon-hvm-install-config.nix nixos-install")
     m.run_command('nix-env -iA nixos.pkgs.grub')
     m.run_command('cp /nix/store/*-grub-0.97*/lib/grub/i386-pc/* /mnt/boot/grub')
-    m.run_command('sed -i "s|hd0|hd0,0|" /mnt/boot/grub/menu.lst')
     m.run_command('echo "(hd1) /dev/xvdg" > device.map')
     m.run_command('echo -e "root (hd1,0)\nsetup (hd1)" | grub --device-map=device.map --batch')
-
+else:
+    m.upload_file("./amazon-base-config.nix", "/mnt/etc/nixos/configuration.nix")
+    m.run_command("nixos-install")
 
 m.run_command("umount /mnt")
 
-
 if args.hvm:
     ami_name = "nixos-{0}-x86_64-ebs-hvm".format(version)
     description = "NixOS {0} (x86_64; EBS root; hvm)".format(version)
diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix
index 5a5c57c72eb..37795d5d5b4 100644
--- a/nixos/maintainers/scripts/ec2/ebs-creator.nix
+++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix
@@ -8,6 +8,7 @@
       deployment.ec2.securityGroups = [ "admin" ];
       deployment.ec2.ebsBoot = false;
       deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
+      deployment.ec2.zone = "us-east-1e";
       environment.systemPackages = [ pkgs.parted ];
     };
 }

From 927b385cc9d7b297c96aef3698ee3b5f0aee2a87 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 21 May 2014 18:07:27 +0200
Subject: [PATCH 1650/2033] Fix mumble test: wait for X windows to appear, not
 only sleep

---
 nixos/tests/mumble.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 8896830b0c2..68ab8b642b0 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -28,7 +28,9 @@ in
     $client1->execute("mumble mumble://client1\@server/test &");
     $client2->execute("mumble mumble://client2\@server/test &");
 
-    $server->sleep(10); # Wait for Mumble UI to pop up
+    $client1->waitForWindow(qr/Mumble/);
+    $client2->waitForWindow(qr/Mumble/);
+    $server->sleep(3); # Wait some more for the Mumble UI
 
     # cancel client audio configuration
     $client1->sendKeys("esc");

From 7fd13ddc66a0dfa07dd0eadf3c5a01ce28cc41f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 May 2014 18:26:13 +0200
Subject: [PATCH 1651/2033] Set TZDIR for all systemd services

This only matters if a service also overrides the $TZ variable.

Issue #2447.
---
 nixos/modules/config/timezone.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 88aa7866c2b..65703d8bb08 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -2,6 +2,12 @@
 
 with lib;
 
+let
+
+  tzdir = "${pkgs.tzdata}/share/zoneinfo";
+
+in
+
 {
   options = {
 
@@ -26,8 +32,10 @@ with lib;
 
     environment.variables.TZDIR = "/etc/zoneinfo";
 
+    systemd.globalEnvironment.TZDIR = tzdir;
+
     environment.etc.localtime =
-      { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
+      { source = "${tzdir}/${config.time.timeZone}";
         mode = "direct-symlink";
       };
 

From 79a0ae902f14fcb960eaa0d01b0c327725f3a14d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 May 2014 15:17:52 -0500
Subject: [PATCH 1652/2033] arcanist: version 20140521

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../tools/misc/arcanist/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/tools/misc/arcanist/default.nix

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
new file mode 100644
index 00000000000..bcc5e039ef5
--- /dev/null
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, php }:
+
+let
+  libphutil = fetchgit {
+    url    = "git://github.com/facebook/libphutil.git";
+    rev    = "1ba1de50e9ee1ca63e472f625282346693eb0a18";
+    sha256 = "d571906b6ecb3700f0d57498426d2ab2a5fbed469d739ee1e03d410215738d2f";
+  };
+  arcanist = fetchgit {
+    url    = "git://github.com/facebook/arcanist.git";
+    rev    = "c999f3e6b5c7edef82761ed1db00d79683e2e37a";
+    sha256 = "d1d9f5ada8ffcb02f03210356c5087019e164f456660469e2825dcbdf5f07d35";
+  };
+in
+stdenv.mkDerivation rec {
+  name    = "arcanist-${version}";
+  version = "20140521";
+
+  src = [ arcanist libphutil ];
+  buildInputs = [ php ];
+
+  unpackPhase = "true";
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+    cp -R ${libphutil} $out/libexec/libphutil
+    cp -R ${arcanist}  $out/libexec/arcanist
+
+    ln -s $out/libexec/arcanist/bin/arc $out/bin
+  '';
+
+  meta = {
+    description = "Command line interface to Phabricator";
+    homepage    = "http://phabricator.org";
+    license     = stdenv.lib.licenses.apache;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cab717c16..67fc1d8ce76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -468,6 +468,8 @@ let
 
   arandr = callPackage ../tools/X11/arandr { };
 
+  arcanist = callPackage ../development/tools/misc/arcanist {};
+
   arduino_core = callPackage ../development/arduino/arduino-core {
     jdk = jdk;
     jre = jdk;

From 7685754f0f5ceb4f9ce062b54809765a88153c81 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 May 2014 15:21:50 -0500
Subject: [PATCH 1653/2033] arcanist: Fix license

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index bcc5e039ef5..5a17ac167f8 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Command line interface to Phabricator";
     homepage    = "http://phabricator.org";
-    license     = stdenv.lib.licenses.apache;
+    license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };

From 548cce8826336dfbb1e128f0d31b49604f4a2f37 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:18:33 +0200
Subject: [PATCH 1654/2033] haskell-language-glsl: add version 0.0.2

---
 .../libraries/haskell/language-glsl/default.nix   | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/language-glsl/default.nix

diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix
new file mode 100644
index 00000000000..bdde61739e3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/language-glsl/default.nix
@@ -0,0 +1,15 @@
+{ cabal, HUnit, parsec, prettyclass }:
+
+cabal.mkDerivation (self: {
+  pname = "language-glsl";
+  version = "0.0.2";
+  sha256 = "1ixgivyc5kqjg83rymrjs1mvypvqrczmj6dhn3dbw2a9lhrvljsz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ HUnit parsec prettyclass ];
+  meta = {
+    description = "GLSL abstract syntax tree, parser, and pretty-printer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 605195d83b2..15049f6f84f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1242,6 +1242,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   languageEcmascript = callPackage ../development/libraries/haskell/language-ecmascript {};
 
+  languageGlsl = callPackage ../development/libraries/haskell/language-glsl {};
+
   languageJava = callPackage ../development/libraries/haskell/language-java {};
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};

From a59b8c143e86b5afc825fd82a7b8f594bae44ccd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:18:47 +0200
Subject: [PATCH 1655/2033] haskell-fmlist: add version 0.8

---
 .../development/libraries/haskell/fmlist/default.nix | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fmlist/default.nix

diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix
new file mode 100644
index 00000000000..8dcbb7fff18
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fmlist/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "fmlist";
+  version = "0.8";
+  sha256 = "1knr9yh58fwjpkm37hvrqghlchf5qibwf9q52app6zh3ys999rrs";
+  meta = {
+    description = "FoldMap lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 15049f6f84f..dcbaed70193 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -712,6 +712,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   fileLocation = callPackage ../development/libraries/haskell/file-location {};
 
+  fmlist = callPackage ../development/libraries/haskell/fmlist {};
+
   ftphs = callPackage ../development/libraries/haskell/ftphs {};
 
   extensibleEffects = callPackage ../development/libraries/haskell/extensible-effects {};

From 2244541cdaa4a33dd3a88a5f16d37d7574d82f4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:18:59 +0200
Subject: [PATCH 1656/2033] haskell-parsers: add version 0.11.0.1

---
 .../libraries/haskell/parsers/{0.11.nix => 0.11.0.1.nix}      | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/libraries/haskell/parsers/{0.11.nix => 0.11.0.1.nix} (84%)

diff --git a/pkgs/development/libraries/haskell/parsers/0.11.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/parsers/0.11.nix
rename to pkgs/development/libraries/haskell/parsers/0.11.0.1.nix
index c5d91f167cc..f24c96b1fad 100644
--- a/pkgs/development/libraries/haskell/parsers/0.11.nix
+++ b/pkgs/development/libraries/haskell/parsers/0.11.0.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "parsers";
-  version = "0.11";
-  sha256 = "0k3xm9ww4q2wkjik4n4ww6ys79kl7xyzbhcb7xi81jz9py0xciqd";
+  version = "0.11.0.1";
+  sha256 = "0jg91zzsq12vxxsxrd1kx8h2c06asccymjbpx0zl7nvj5dhjfkpq";
   buildDepends = [
     attoparsec charset parsec text transformers unorderedContainers
   ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index dcbaed70193..d3d2ae5fea2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1591,8 +1591,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   parsec = self.parsec_3_1_5;
 
   parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {};
-  parsers_0_11 = callPackage ../development/libraries/haskell/parsers/0.11.nix {};
-  parsers = self.parsers_0_11;
+  parsers_0_11_0_1 = callPackage ../development/libraries/haskell/parsers/0.11.0.1.nix {};
+  parsers = self.parsers_0_11_0_1;
 
   parsimony = callPackage ../development/libraries/haskell/parsimony {};
 

From 8de29ff4e1976dbb201913665d930b30f1d57b6b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:23 +0200
Subject: [PATCH 1657/2033] haskell-git-annex: update to version 5.20140517

---
 .../version-management/git-and-tools/git-annex/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index cc000398855..191b24304bf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -16,8 +16,8 @@
 
 cabal.mkDerivation (self: {
   pname = "git-annex";
-  version = "5.20140421";
-  sha256 = "1ahn62gmgszssl2ni7b6rran548wjkb10035hrgvag6dwiiyik9g";
+  version = "5.20140517";
+  sha256 = "150xf6664rfdljswc270m2pqvia4sywph4rrrbky6izy6a0vq680";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 41d7d0ad31ef297aa60eda22a881aa08e9dc4b2b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:26 +0200
Subject: [PATCH 1658/2033] haskell-elm-server: update to version 0.11.0.1

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

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index fce6f4a2699..5f389d48c8e 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.11";
-  sha256 = "1977fa03n2m2apxhbzpcn6b5y5gf7ksnpigibi8djlpp76rliaz2";
+  version = "0.11.0.1";
+  sha256 = "0nnkhmmm4cl6a314xxh5qwxkjsc3k3vcwdfar62578ykarxb53g1";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 4f5fce27106a147cf8af1e765b631e2ff1da7aa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:28 +0200
Subject: [PATCH 1659/2033] haskell-Elm: update to version 0.12.3

---
 pkgs/development/compilers/elm/elm.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 9fe18cdaf30..3daa1b507b7 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -1,27 +1,27 @@
 { cabal, aeson, aesonPretty, binary, blazeHtml, blazeMarkup
 , cmdargs, filemanip, filepath, HUnit, indents, languageEcmascript
-, mtl, pandoc, parsec, QuickCheck, testFramework
-, testFrameworkHunit, testFrameworkQuickcheck2, text, transformers
-, unionFind, unorderedContainers
+, languageGlsl, mtl, pandoc, parsec, QuickCheck, scientific
+, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text
+, transformers, unionFind, unorderedContainers, yaml
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.12.1.3";
-  sha256 = "1p4py4qyxsp25qa8141ywfh0qnvdid4v7xlbqkk8aafxccb7lsm9";
+  version = "0.12.3";
+  sha256 = "1v6h9qbbz27ikh19xwjbyfw0zi5ag9x1gp0khh9v4af1g0j86320";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filepath
-    indents languageEcmascript mtl pandoc parsec text transformers
-    unionFind unorderedContainers
+    indents languageEcmascript languageGlsl mtl pandoc parsec
+    scientific text transformers unionFind unorderedContainers yaml
   ];
   testDepends = [
     aeson aesonPretty binary blazeHtml blazeMarkup cmdargs filemanip
-    filepath HUnit indents languageEcmascript mtl pandoc parsec
-    QuickCheck testFramework testFrameworkHunit
+    filepath HUnit indents languageEcmascript languageGlsl mtl pandoc
+    parsec QuickCheck scientific testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text transformers unionFind
-    unorderedContainers
+    unorderedContainers yaml
   ];
   doCheck = false;
   meta = {

From 8388d60aeb538bc201a59a6c7ea621046eb8d4b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:31 +0200
Subject: [PATCH 1660/2033] haskell-ListLike: update to version 4.1.0

---
 .../development/libraries/haskell/ListLike/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix
index a9723721e1e..03c8853cfd7 100644
--- a/pkgs/development/libraries/haskell/ListLike/default.nix
+++ b/pkgs/development/libraries/haskell/ListLike/default.nix
@@ -1,11 +1,11 @@
-{ cabal, HUnit, QuickCheck, random, text, vector }:
+{ cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }:
 
 cabal.mkDerivation (self: {
   pname = "ListLike";
-  version = "4.0.2";
-  sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah";
-  buildDepends = [ text vector ];
-  testDepends = [ HUnit QuickCheck random text vector ];
+  version = "4.1.0";
+  sha256 = "0j78mm9vsl3scwgqp4h2bhq54hf22bxj9cg9pl26d12zw7038kwj";
+  buildDepends = [ dlist fmlist text vector ];
+  testDepends = [ dlist fmlist HUnit QuickCheck random text vector ];
   jailbreak = true;
   meta = {
     homepage = "http://software.complete.org/listlike";

From 28eb5cf3e25888a999fe4e29ac44fa39dcbb93cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:33 +0200
Subject: [PATCH 1661/2033] haskell-blaze-svg: update to version 0.3.4

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

diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix
index 0502f1eabc2..92a25e5e3b4 100644
--- a/pkgs/development/libraries/haskell/blaze-svg/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-svg";
-  version = "0.3.3.1";
-  sha256 = "00i0apyklvmkr4w30d4r86gcg86h35sc3ncvqax70827126cdmsj";
+  version = "0.3.4";
+  sha256 = "061011qrpqiyag9549hn0hfikvkrin5wb3cf0zfm9n80cgvzmqd3";
   buildDepends = [ blazeMarkup mtl ];
   jailbreak = true;
   meta = {

From 05956e3b3fc11bdcf3b8a511ab9fa3ab00e58ac2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:35 +0200
Subject: [PATCH 1662/2033] haskell-chell-quickcheck: update to version 0.2.4

---
 .../libraries/haskell/chell-quickcheck/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
index 5025fcc403b..bc5b0b4ffba 100644
--- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
+++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "chell-quickcheck";
-  version = "0.2.3";
-  sha256 = "15j1wzhfyr9v8hy9d5lnr6jkrfr1zfb7dwgiy3ni90mvpf8x54yc";
+  version = "0.2.4";
+  sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd";
   buildDepends = [ chell QuickCheck random ];
   meta = {
     homepage = "https://john-millikin.com/software/chell/";

From c7891eb8f3e7dab83839bc62a60427b1954dbf01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:38 +0200
Subject: [PATCH 1663/2033] haskell-chell: update to version 0.4

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

diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix
index c69994e6868..cab43842f73 100644
--- a/pkgs/development/libraries/haskell/chell/default.nix
+++ b/pkgs/development/libraries/haskell/chell/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "chell";
-  version = "0.3.3";
-  sha256 = "1k5vxipf47753d41dgr1gr4zy7y72gz2x8lcn0fgfmxi2v810nsm";
+  version = "0.4";
+  sha256 = "1hynr7n7wxgc3z6zrc3xrfpiqlh4zfb3kagwwfhqmcamv9d4x0ng";
   buildDepends = [
     ansiTerminal options patience random text transformers
   ];

From 938eeff7e3f414b37ed896496b64ed840e996e09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:40 +0200
Subject: [PATCH 1664/2033] haskell-dbus: update to version 0.10.8

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

diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix
index 7f0285dfc7a..d2700195b10 100644
--- a/pkgs/development/libraries/haskell/dbus/default.nix
+++ b/pkgs/development/libraries/haskell/dbus/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "dbus";
-  version = "0.10.7";
-  sha256 = "0xszynw6p07r7z9nlq8alx5lxfjm57gljya835ccj63hqhkr5yxh";
+  version = "0.10.8";
+  sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6";
   buildDepends = [
     cereal libxmlSax network parsec random text transformers vector
     xmlTypes

From ee84b91d18aa27078efe4366a3dd44e37a4d254e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:42 +0200
Subject: [PATCH 1665/2033] haskell-graphviz: update to version 2999.17.0.1

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

diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix
index bd3ccbba7a4..18ef54746a9 100644
--- a/pkgs/development/libraries/haskell/graphviz/default.nix
+++ b/pkgs/development/libraries/haskell/graphviz/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "graphviz";
-  version = "2999.17.0.0";
-  sha256 = "1wi5yzs0b321as10h9awin87501njbd4ii40nak1fr534g1abhf5";
+  version = "2999.17.0.1";
+  sha256 = "0s6l1mlqvllrlx7vc06lgcs68ajhfk98awm63ab1dkqmcnj23ixv";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 27905f4654ec19f7eed1f0242ca5c92ddbdf02bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:44 +0200
Subject: [PATCH 1666/2033] haskell-happstack-server: update to version 7.3.6

---
 .../libraries/haskell/happstack/happstack-server.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
index 723fdb0fdb9..e59bccaf6b5 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-server";
-  version = "7.3.5";
-  sha256 = "1n0pdishsngrri83flipfzmk0gn01n256rg7vrbn7kjl1aff9r1g";
+  version = "7.3.6";
+  sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd";
   buildDepends = [
     base64Bytestring blazeHtml extensibleExceptions filepath hslogger
     html monadControl mtl network parsec sendfile syb systemFilepath

From d689ae91d310656666bf6bf97154a4f63c8481a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:46 +0200
Subject: [PATCH 1667/2033] haskell-http-reverse-proxy: update to version
 0.3.1.7

---
 .../libraries/haskell/http-reverse-proxy/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
index 5c6da92953c..ec34cc98d74 100644
--- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
+++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-reverse-proxy";
-  version = "0.3.1.6";
-  sha256 = "1ckxiabk685a47xy0khj6h05j26hsc5hlxfysbkmk2q70y0ljk7k";
+  version = "0.3.1.7";
+  sha256 = "0fhndk9zjv1kcqgrhj42brfg96p7flrcpy609asba1vc0i9213j4";
   buildDepends = [
     async blazeBuilder caseInsensitive conduit conduitExtra
     dataDefaultClass httpClient httpTypes liftedBase monadControl

From c5793ae6147e200ad53fbb687fe8998721ca53b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:49 +0200
Subject: [PATCH 1668/2033] haskell-iteratee: update to version 0.8.9.6

Drop the jailbreak which seems to have become unnecessary.
---
 .../libraries/haskell/iteratee/default.nix    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 62bc3f7a2a4..f0772ca4db1 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -1,16 +1,21 @@
-{ cabal, ListLike, MonadCatchIOTransformers, monadControl, parallel
-, transformers, transformersBase
+{ cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel
+, QuickCheck, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2, transformers, transformersBase
 }:
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.9.5";
-  sha256 = "0akv7zcyb3c213f8qz1xv1qyq04wa427a4mh8rmz1jlmcwiznk7z";
+  version = "0.8.9.6";
+  sha256 = "1yc5fqqb8warvgld3cymka7d2wmjydvfin5jy7zaazb7alf14q1p";
   buildDepends = [
-    ListLike MonadCatchIOTransformers monadControl parallel
-    transformers transformersBase
+    exceptions ListLike monadControl parallel transformers
+    transformersBase
+  ];
+  testDepends = [
+    exceptions HUnit ListLike monadControl mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 transformers
+    transformersBase
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://www.tiresiaspress.us/haskell/iteratee";
     description = "Iteratee-based I/O";

From 784fb7f43490fa919b05b551bb628e4d7e3c0da2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:51 +0200
Subject: [PATCH 1669/2033] haskell-network-simple: update to version 0.4

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

diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix
index c69ac2a8a63..c50afdb2120 100644
--- a/pkgs/development/libraries/haskell/network-simple/default.nix
+++ b/pkgs/development/libraries/haskell/network-simple/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "network-simple";
-  version = "0.3.1";
-  sha256 = "0bk015d0np07887flah76vgrgrqaqj4x1sdxmghvazj8c78nkan8";
+  version = "0.4";
+  sha256 = "1jw0xd53c0mydh6jm6627c0d8w014r1s46fycdhavnimh7bb77cp";
   buildDepends = [ exceptions network transformers ];
   jailbreak = true;
   meta = {

From 17d0a2831d9839a4f43d938a71a5785cc393812c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:53 +0200
Subject: [PATCH 1670/2033] haskell-options: update to version 1.2

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

diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix
index 3772a142a58..f89cdd5045f 100644
--- a/pkgs/development/libraries/haskell/options/default.nix
+++ b/pkgs/development/libraries/haskell/options/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "options";
-  version = "1.0";
-  sha256 = "0d40d6k1c8v2b0bgchgl54sk9wx28kysp8bjws8bwjcmmd57775f";
+  version = "1.2";
+  sha256 = "14qrkwd8h50wf6972p0ylvhnc8mh11fqk9l8q0h9lapj7ywm74vx";
   buildDepends = [ monadsTf transformers ];
   testDepends = [ chell chellQuickcheck monadsTf transformers ];
   doCheck = false;

From 38ea99475e02e38b45bc1e61810210c9bc3a321a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:56 +0200
Subject: [PATCH 1671/2033] haskell-pipes-network: update to version 0.6.3

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

diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix
index 1b816a704f2..5ec70a010a5 100644
--- a/pkgs/development/libraries/haskell/pipes-network/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-network/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-network";
-  version = "0.6.2";
-  sha256 = "1y64cyi1lq7y5x3b1rv2iixlwqnz4g82nxk2m14x214fmj3np965";
+  version = "0.6.3";
+  sha256 = "09gihca0hinq3sqsx9753gmas6g22pg792ag6ckdw5z3607razrg";
   buildDepends = [
     network networkSimple pipes pipesSafe transformers
   ];

From 1b1d572d702cd8ec904fe1fe4fbfd5cbe8874995 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:19:58 +0200
Subject: [PATCH 1672/2033] haskell-pointed: update to version 4.1

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

diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix
index 65048ca757c..7a02d5850d2 100644
--- a/pkgs/development/libraries/haskell/pointed/default.nix
+++ b/pkgs/development/libraries/haskell/pointed/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pointed";
-  version = "4.0";
-  sha256 = "02y7ba1pcpmwcp762516p4x75y3ma2kml9mbiv1y8gcnn4ylvir4";
+  version = "4.1";
+  sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g";
   buildDepends = [
     comonad dataDefaultClass semigroupoids semigroups stm tagged
     transformers

From 1d402bc6ba9ab70c3d0654b126ae4b00ce00fd0b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:01 +0200
Subject: [PATCH 1673/2033] haskell-reactive-banana: update to version 0.8.0.2

---
 .../development/libraries/haskell/reactive-banana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix
index 535b289a389..e2cda01ee40 100644
--- a/pkgs/development/libraries/haskell/reactive-banana/default.nix
+++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "reactive-banana";
-  version = "0.8.0.0";
-  sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1";
+  version = "0.8.0.2";
+  sha256 = "0hfhq663dvvb3jbgdnarawryw09m8ckqvqp6p5n4d4dms4gfzcdv";
   buildDepends = [
     hashable pqueue transformers unorderedContainers vault
   ];

From 4e2d47c3142ce27472d177abe841fb1bfaa18dc8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:03 +0200
Subject: [PATCH 1674/2033] haskell-snap-loader-dynamic: update to version
 0.10.0.2

---
 pkgs/development/libraries/haskell/snap/loader-dynamic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
index ec054cc8065..f6dbf733265 100644
--- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
+++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "snap-loader-dynamic";
-  version = "0.10.0.1";
-  sha256 = "0iqhspvfp0d6qivis2l3v0rqrnb8qbzvi4n53zgyb9cwvqxx5fix";
+  version = "0.10.0.2";
+  sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7";
   buildDepends = [ directoryTree hint mtl snapCore time ];
   meta = {
     homepage = "http://snapframework.com/";

From c8a72f96abecf8573b59b67151729ce39677c386 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:08 +0200
Subject: [PATCH 1675/2033] haskell-tasty-ant-xml: update to version 1.0.0.7

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

diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
index 695d7edca62..9ad4b2de747 100644
--- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-ant-xml";
-  version = "1.0.0.6";
-  sha256 = "06ll7mj60iiskla2x53yncs0931b7dw4l0shxkhz88558gjzy7cj";
+  version = "1.0.0.7";
+  sha256 = "0jjh2lyr33l5mps123azszwnk0h61ar99zlqbc4h04a8vkd9x813";
   buildDepends = [
     genericDeriving mtl reducers stm tagged tasty transformers xml
   ];

From 271ef11cc14c48c4be43cc5bac7c161af6a77552 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:10 +0200
Subject: [PATCH 1676/2033] haskell-tasty-hspec: update to version 0.1.0.1

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

diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
index 34b13c69bf6..19678805900 100644
--- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix
+++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty-hspec";
-  version = "0.1";
-  sha256 = "1pf4ffaqy0f25a2sjirg5g4gdcfslapwq4mm0pkdsysmh9bv1f64";
+  version = "0.1.0.1";
+  sha256 = "0m8v9kj557vfqzmrindwfcjl7wqmdix2xvmsb94n8hx9qv075s3v";
   buildDepends = [ hspec tasty ];
   meta = {
     homepage = "http://github.com/mitchellwrosen/tasty-hspec";

From 8662d7aefa07d963cdb23ba11409ff8aa1e5dd63 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:12 +0200
Subject: [PATCH 1677/2033] haskell-threepenny-gui: update to version 0.4.2.0

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

diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
index 1855f493812..ea655ab91c1 100644
--- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix
+++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "threepenny-gui";
-  version = "0.4.1.0";
-  sha256 = "0fafwnlbl96z9m5fr3wiyv090fga78cr9hrd4yd3vyiz44gfrpcw";
+  version = "0.4.2.0";
+  sha256 = "1746l90h9xkwnwxvfqsr93nax7ihv8lwc4kz203v13rrwckr7m8h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b20aede17a3b6c301c3096e68a7f308247cc1946 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:15 +0200
Subject: [PATCH 1678/2033] haskell-transformers-compat: update to version
 0.3.2

---
 .../libraries/haskell/transformers-compat/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index bdb101914a4..e160ed5226e 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.3";
-  sha256 = "0dncakmg4wszi20apfzwdlgp69pka8bwwdrg1pl7nrn3sybq97yf";
+  version = "0.3.2";
+  sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";

From 5396bcdad11c6f37eacca386373375ed5a6874eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 May 2014 16:20:22 +0200
Subject: [PATCH 1679/2033] haskell-zlib-enum: update to version 0.2.3.1

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

diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix
index f799194c0f6..7dc700b3532 100644
--- a/pkgs/development/libraries/haskell/zlib-enum/default.nix
+++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-enum";
-  version = "0.2.3";
-  sha256 = "0lr72h4wlclav0p0j5wwaxifq97lw7rh3612lva73fg45akl9di1";
+  version = "0.2.3.1";
+  sha256 = "1nfczminxafzk69ry1sqkj1ha0jlv3l9ak10yk205snfhpmcjgg4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ enumerator transformers zlibBindings ];

From eac9fe354c06ee7306935225e4db145edaa9c7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 22 May 2014 08:58:49 +0200
Subject: [PATCH 1680/2033] python27Packages is now a hiPrioSet to avoid other
 python versions interfering

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67fc1d8ce76..b3e88a61b9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6390,10 +6390,10 @@ let
     python = python32;
   };
 
-  python27Packages = recurseIntoAttrs (import ./python-packages.nix {
+  python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;
     python = python27;
-  });
+  }));
 
   pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
     inherit pkgs;

From 53465c35a0a19d440b1f0b4867ae68ab26997a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 22 May 2014 09:05:38 +0200
Subject: [PATCH 1681/2033] python: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 0b877446324..d5402c5cb03 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -18,7 +18,7 @@ with stdenv.lib;
 
 let
   majorVersion = "3.4";
-  version = "${majorVersion}.0";
+  version = "${majorVersion}.1";
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi";
+    sha256 = "1i7dgbzyvj24i6gfhb5q2zwr9nn1ni6w1ig1rcgh96a321is35f5";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 48e969d776ba3e2e8352826148921f703585df74 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 22 May 2014 11:17:00 +0200
Subject: [PATCH 1682/2033] Fix gnome3 evaluation due to missing
 glib_networking

---
 pkgs/desktops/gnome-3/3.10/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
index b58bf7ef1d3..c601a1501a3 100644
--- a/pkgs/desktops/gnome-3/3.10/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/default.nix
@@ -1,7 +1,7 @@
 { callPackage, self, pkgs }:
 
 rec {
-  inherit (pkgs) glib gtk2 gtk3 gnome2 upower;
+  inherit (pkgs) glib gtk2 gtk3 gnome2 upower glib_networking;
   gtk = gtk3; # just to be sure
   libcanberra = pkgs.libcanberra_gtk3; # just to be sure
   inherit (pkgs.gnome2) ORBit2;

From 0b484a0a1d287a178937241f479b15a0c1563530 Mon Sep 17 00:00:00 2001
From: Jussi Maki <jussi.maki@gmail.com>
Date: Thu, 22 May 2014 11:38:40 +0200
Subject: [PATCH 1683/2033] Add typescript to node-packages

Typescript (http://www.typescriptlang.org/) is a typed language
for JavaScript application development.
---
 pkgs/top-level/node-packages-generated.nix | 20 ++++++++++++++++++++
 pkgs/top-level/node-packages.json          |  1 +
 2 files changed, 21 insertions(+)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 356b736506d..e250085f730 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -18226,6 +18226,26 @@
     ];
     passthru.names = [ "typedarray" ];
   };
+  by-spec."typescript"."*" =
+    self.by-version."typescript"."1.0.1";
+  by-version."typescript"."1.0.1" = lib.makeOverridable self.buildNodePackage {
+    name = "typescript-1.0.1";
+    src = [
+      (fetchurl {
+        url = "http://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz";
+        name = "typescript-1.0.1.tgz";
+        sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a";
+      })
+    ];
+    buildInputs =
+      (self.nativeDeps."typescript" or []);
+    deps = [
+    ];
+    peerDependencies = [
+    ];
+    passthru.names = [ "typescript" ];
+  };
+  "typescript" = self.by-version."typescript"."1.0.1";
   by-spec."uglify-js"."*" =
     self.by-version."uglify-js"."2.4.13";
   by-version."uglify-js"."2.4.13" = lib.makeOverridable self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 57eab330ce2..4d220a00829 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -130,4 +130,5 @@
 , "phantomjs"
 , "sinon"
 , "shelljs"
+, "typescript"
 ]

From 9b6eeecbdee39c563e4388a17edff7cbe5c7e226 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 11:22:20 +0200
Subject: [PATCH 1684/2033] openssh: Fix broken URL

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 6926b9aa82a..ea94560219f 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   name = "openssh-6.6p1";
 
   src = fetchurl {
-    url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
+    url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
     sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8";
   };
 

From 1e6c82825a7f15c6dada3df1d73d6064df31ebef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 11:48:42 +0200
Subject: [PATCH 1685/2033] gimp: Fix download URL

---
 pkgs/applications/graphics/gimp/2.8.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 0f8d6d45f12..aca4d822c82 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "gimp-2.8.10";
 
   src = fetchurl {
-    url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
+    url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
     sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7";
   };
 

From e6c304a5d988b6fcc7c27587e62b449a5841f510 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:01:50 +0200
Subject: [PATCH 1686/2033] Update some Perl packages

---
 pkgs/top-level/perl-packages.nix | 62 ++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9949682d337..2b67e2a89d8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1631,15 +1631,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   CPANMetaYAML = buildPerlPackage {
-    name = "CPAN-Meta-YAML-0.008";
+    name = "CPAN-Meta-YAML-0.012";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.008.tar.gz;
-      sha256 = "1fxc8ybn6mdgzxyq1n69rgihmpfaarfclmbdw2rznya5zg2b0nz0";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-0.012.tar.gz;
+      sha256 = "7c728c573ba74294d3df2f0cbae2cd1b3830ed47040649b49a33a086b8300d28";
     };
+    buildInputs = [ JSONPP ];
+    doCheck = false; # Test::More too old
     meta = {
-      homepage = https://github.com/dagolden/cpan-meta-yaml;
+      homepage = https://github.com/dagolden/CPAN-Meta-YAML;
       description = "Read and write a subset of YAML for CPAN Meta files";
-      license = "perl5";
+      license = "perl";
     };
   };
 
@@ -3318,16 +3320,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ExtUtilsMakeMaker = buildPerlPackage rec{
+  ExtUtilsMakeMaker = buildPerlPackage {
     name = "ExtUtils-MakeMaker-6.98";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz";
-      sha256 = "1vv3v9rc2dnx8amwa7lpdywg3lakx7yv2n38qvfbk9jzkqc27c1f";
+      url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-6.98.tar.gz;
+      sha256 = "2eb023189e5fa6b9dcc66858b1fde953d1f1b86f971ec5ab42dd36c172da63ef";
     };
     propagatedBuildInputs =
-      [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta
-        FileCopyRecursive VersionRequirements ExtUtilsManifest
-      ];
+      [ ParseCPANMeta JSONPP JSONPPCompat5006 CPANMetaYAML FileCopyRecursive ];
+    meta = {
+      homepage = https://metacpan.org/release/ExtUtils-MakeMaker;
+      description = "Create a module Makefile";
+      license = "perl";
+    };
   };
 
   ExtUtilsManifest = buildPerlPackage rec {
@@ -4616,6 +4621,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  JSONPPCompat5006 = buildPerlPackage {
+    name = "JSON-PP-Compat5006-1.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz;
+      sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a";
+    };
+    meta = {
+      description = "Helper module in using JSON::PP in Perl 5.6";
+      license = "perl";
+    };
+  };
+
   JSONXS = buildPerlPackage {
     name = "JSON-XS-2.34";
     src = fetchurl {
@@ -6610,13 +6627,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ParseCPANMeta = buildPerlPackage rec {
-    name = "Parse-CPAN-Meta-1.4409";
+  ParseCPANMeta = buildPerlPackage {
+    name = "Parse-CPAN-Meta-1.4414";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/Parse/${name}.tar.gz";
-      sha256 = "0b7cp78zajmwf4a0968p3b2bb00axkxj3a9nq1rx8cb17hhva819";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Parse-CPAN-Meta-1.4414.tar.gz;
+      sha256 = "cd7608154dfb72c9e110f012befe6b75d78448cb3e761716b60aa7545e16ca1b";
     };
     propagatedBuildInputs = [ CPANMetaYAML JSONPP ];
+    meta = {
+      homepage = https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta;
+      description = "Parse META.yml and META.json CPAN metadata files";
+      license = "perl";
+    };
   };
 
   ParseRecDescent = buildPerlPackage rec {
@@ -9234,10 +9256,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   UNIVERSALrequire = buildPerlPackage {
-    name = "UNIVERSAL-require-0.16";
+    name = "UNIVERSAL-require-0.17";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.16.tar.gz;
-      sha256 = "0fbx3f39lvck3n4ksqwji5m1hfdagx25jk5kg2h0gkb01jwz3za2";
+      url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.17.tar.gz;
+      sha256 = "5dc9f13f2d2bbdf852387e2a63c0753728c2bea9125dd628c313db3ef66ec4c3";
+    };
+    meta = {
+      description = "Require() modules from a variable";
+      license = "perl";
     };
   };
 

From 0bc7ec6e28bef9459b14884b1fb2b54963e8e0dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:05:19 +0200
Subject: [PATCH 1687/2033] Remove obsolete udisks test

Closes #2716.
---
 nixos/release-combined.nix |  1 -
 nixos/release.nix          |  1 -
 nixos/tests/udisks.nix     | 56 --------------------------------------
 3 files changed, 58 deletions(-)
 delete mode 100644 nixos/tests/udisks.nix

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 090d8400f1c..f59f71b0d6f 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -62,7 +62,6 @@ in rec {
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.simple)
-        (all nixos.tests.udisks)
         (all nixos.tests.udisks2)
         (all nixos.tests.xfce)
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 30f87aaa4f2..06749966cbb 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -241,7 +241,6 @@ in rec {
   tests.runInMachine = callTest tests/run-in-machine.nix {};
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
-  tests.udisks = callTest tests/udisks.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.xfce = callTest tests/xfce.nix {};
 
diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix
deleted file mode 100644
index b7f2e2c0031..00000000000
--- a/nixos/tests/udisks.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }:
-
-let
-
-  stick = pkgs.fetchurl {
-    url = http://nixos.org/~eelco/nix/udisks-test.img.xz;
-    sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b";
-  };
-
-in
-
-{
-
-  machine =
-    { config, pkgs, ... }:
-    { services.udisks.enable = true;
-      imports = [ ./common/user-account.nix ];
-
-      security.polkit.extraConfig =
-        ''
-          polkit.addRule(function(action, subject) {
-            if (subject.user == "alice") return "yes";
-          });
-        '';
-    };
-
-  testScript =
-    ''
-      my $stick = $machine->stateDir . "/usbstick.img";
-      system("xz -d < ${stick} > $stick") == 0 or die;
-
-      $machine->succeed("udisks --enumerate | grep /org/freedesktop/UDisks/devices/vda");
-      $machine->fail("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1");
-
-      # Attach a USB stick and wait for it to show up.
-      $machine->sendMonitorCommand("usb_add disk:$stick");
-      $machine->waitUntilSucceeds("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1");
-      $machine->succeed("udisks --show-info /dev/sda1 | grep 'label:.*USBSTICK'");
-
-      # Mount the stick as a non-root user and do some stuff with it.
-      $machine->succeed("su - alice -c 'udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1'");
-      $machine->succeed("su - alice -c 'udisks --mount /dev/sda1'");
-      $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/ or die;
-      $machine->succeed("su - alice -c 'echo foo > /media/USBSTICK/bar.txt'");
-
-      # Unmounting the stick should make the mountpoint disappear.
-      $machine->succeed("su - alice -c 'udisks --unmount /dev/sda1'");
-      $machine->fail("[ -d /media/USBSTICK ]");
-
-      # Remove the USB stick.
-      $machine->sendMonitorCommand("usb_del 0.3"); # FIXME
-      $machine->waitUntilFails("udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1");
-      $machine->fail("[ -e /dev/sda ]");
-    '';
-
-})

From f4b7ac11a3bca0ce85415701753a348c757da6c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:06:29 +0200
Subject: [PATCH 1688/2033] Remove udisks module

It's no longer used in NixOS.
---
 nixos/modules/module-list.nix              |  1 -
 nixos/modules/services/hardware/udisks.nix | 45 ----------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 nixos/modules/services/hardware/udisks.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ab0b263c4b8..b80ecce90ce 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -121,7 +121,6 @@
   ./services/hardware/pommed.nix
   ./services/hardware/sane.nix
   ./services/hardware/udev.nix
-  ./services/hardware/udisks.nix
   ./services/hardware/udisks2.nix
   ./services/hardware/upower.nix
   ./services/hardware/thinkfan.nix
diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
deleted file mode 100644
index c9d11bcfc68..00000000000
--- a/nixos/modules/services/hardware/udisks.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# Udisks daemon.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.udisks = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable Udisks, a DBus service that allows
-          applications to query and manipulate storage devices.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf config.services.udisks.enable {
-
-    environment.systemPackages = [ pkgs.udisks ];
-
-    services.dbus.packages = [ pkgs.udisks ];
-
-    system.activationScripts.udisks =
-      ''
-        mkdir -m 0755 -p /var/lib/udisks
-      '';
-
-    services.udev.packages = [ pkgs.udisks ];
-  };
-
-}

From b6569c84974a0807241c70dfe6e75b0275e62764 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:11:07 +0200
Subject: [PATCH 1689/2033] copy-tarballs.pl: Create base-32 symlinks

---
 maintainers/scripts/copy-tarballs.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
index b7178fb7d71..c6d77529dd4 100755
--- a/maintainers/scripts/copy-tarballs.pl
+++ b/maintainers/scripts/copy-tarballs.pl
@@ -91,4 +91,7 @@ foreach my $file (@{$data->{list}->{attrs}}) {
 
     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");
 }

From 29dc000e60f9d6356b889460003c2d06623777e6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:53:51 +0200
Subject: [PATCH 1690/2033] unrar: update from 5.1.2 to 5.1.5

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

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index bd52a70eaf2..a88c0b345d7 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 let
-  version = "5.1.2";
+  version = "5.1.5";
 in
 stdenv.mkDerivation {
   name = "unrar-${version}";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0344cn4w3lw2111m3g431khiyndx9ibbp952bli1inx2fixps9cq";
+    sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912";
   };
 
   patchPhase = ''

From f430a8810d586cfd75857403c18ff8e4356dc7be Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:54:06 +0200
Subject: [PATCH 1691/2033] syslogng: update from 3.5.3 to 3.5.4.1

---
 pkgs/tools/system/syslog-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 184701ceb59..cbffd8648d4 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, eventlog, pkgconfig, glib, python }:
 
 stdenv.mkDerivation {
-  name = "syslog-ng-3.5.3";
+  name = "syslog-ng-3.5.4.1";
 
   src = fetchurl {
-    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.3/source/syslog-ng_3.5.3.tar.gz";
-    sha256 = "1l3424qn9bf9z742pqba8x3dj7g729asimmhlizv1rvjlaxa2jd3";
+    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz";
+    sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj";
   };
 
   buildInputs = [ eventlog pkgconfig glib python ];

From 1cb2f20511d405715fa04e745d35572add413fa1 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:55:03 +0200
Subject: [PATCH 1692/2033] swiProlog: update from 6.6.3 to 6.6.5

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

diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 2070da0bee4..220d3f87fba 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "6.6.3";
+  version = "6.6.5";
 in
 stdenv.mkDerivation {
   name = "swi-prolog-${version}";
 
   src = fetchurl {
     url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz";
-    sha256 = "01dr66d7rm2xvxwm6wy71bbjvfrmzxgvmaz3sl1fb63cn8d78nz3";
+    sha256 = "0lsa90sdnkd286xgm1amwkdhvnrpsz7imfzczrfdaw4arqk4bvkr";
   };
 
   buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama

From c32e17b31983da86119c8486dc71154346856a82 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:55:15 +0200
Subject: [PATCH 1693/2033] speedtest_cli: update from 0.2.5 to 0.2.7

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

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 4f54404b713..7162e29e1ea 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "speedtest-cli-${version}";
-  version = "0.2.5";
+  version = "0.2.7";
   
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "0a19kyn6064jbxda4yq1rfrlqlh8ha40fgwkj4rckdzk9bnxkhdn";
+    sha256 = "00r3mjr8852glwryfj9f86pikqg1v0f0xivy25cj86n526wdpy95";
   };
 
   meta = with stdenv.lib; {

From 1cc7ebe3cc0632829c416e37477b0575aba8edb2 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:56:14 +0200
Subject: [PATCH 1694/2033] pv: update from 1.5.2 to 1.5.3

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

diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index 480e00c850d..d99fc1960dd 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "pv-1.5.2";
+  name = "pv-1.5.3";
 
   src = fetchurl {
     url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
-    sha256 = "1sz5ishd66xliwnhv0x3vr48fbp7id4xd8fsrbm66y7f5mfd7qp2";
+    sha256 = "03prg025kzivl1a5xqlf45szpnpqrmkzcvnf7lb2fc1v3jdrkwvn";
   };
 
   meta = {

From 5abc5dea27e4f264f60a84dcff9a8d943c84e3dc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:57:17 +0200
Subject: [PATCH 1695/2033] lynx: update from 2.8.7 to 2.8.8

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

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index b0f9b69012c..74c9574c7d6 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -5,11 +5,11 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
-  name = "lynx-2.8.7";
+  name = "lynx-2.8.8";
   
   src = fetchurl {
-    url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.bz2;
-    sha256 = "1baxwpdvak6nalr943g22z67r1d3fbibbkqvkvvar9xlvrs9gv20";
+    url = http://lynx.isc.org/lynx2.8.8/lynx2.8.8.tar.bz2;
+    sha256 = "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039";
   };
   
   configureFlags = if sslSupport then "--with-ssl=${openssl}" else "";

From 06f2afa77be2a2bbbdbce85bc5885fed037181f6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:57:34 +0200
Subject: [PATCH 1696/2033] libmicrohttpd: update from 0.9.34 to 0.9.35

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index d2237e22fce..be1f3f2b4b9 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, curl, libgcrypt}:
 
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.34";
+  name = "libmicrohttpd-0.9.35";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "122snbhhn10s8az46f0lrkirhj0k38lq7hmqav3n1prdzpabz8i9";
+    sha256 = "1z0h6llx7pra78358ryi3bdh8p0ns0bn97n6bl0fj6cib9cz2pdw";
   };
 
   buildInputs = [ curl libgcrypt ];

From 3ec28512640d119ba593f3a7d2627b4679921a36 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 22 May 2014 12:58:08 +0200
Subject: [PATCH 1697/2033] dcraw: update from 9.19 to 9.20

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

diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 5df814530a1..ed9ac2da2d2 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libjpeg, lcms, gettext, jasper }:
 
 stdenv.mkDerivation rec {
-  name = "dcraw-9.19";
+  name = "dcraw-9.20";
 
   src = fetchurl {
     url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
-    sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv";
+    sha256 = "151xpfmfd1ksjcnpmsnxry1mf2xpx9iaiy9sg1vxgm9i80lkkp5f";
   };
 
   buildInputs = [ libjpeg lcms gettext jasper ];

From 5ec3a63fcbbe8daabe6da595e250b1fba507e51f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:51:55 +0200
Subject: [PATCH 1698/2033] nvidia-x11: Update to 331.79

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 10 +++++++---
 pkgs/os-specific/linux/nvidia-x11/default.nix |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 51144bc1051..06ab334e307 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -74,9 +74,9 @@ installPhase() {
         mkdir -p $out/bin
 
         for i in nvidia-settings nvidia-smi nvidia-xconfig; do
-	    cp $i $out/bin/$i
-	    patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-	        --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
+            cp $i $out/bin/$i
+            patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
         done
 
         # Header files etc.
@@ -96,6 +96,10 @@ installPhase() {
         substituteInPlace $out/share/applications/nvidia-settings.desktop \
             --replace '__UTILS_PATH__' $out/bin \
             --replace '__PIXMAP_PATH__' $out/share/pixmaps
+
+        # Test a bit.
+        $out/bin/nvidia-settings --version
+        $out/bin/nvidia-smi --help > /dev/null
     fi
 }
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 2afbf12097c..0c0f6ecc71e 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "331.67";
+  versionNumber = "331.79";
 
 in
 
@@ -25,12 +25,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1imc66yxnm01i58xwqrwqc612h0rhdz8x170hqr2pjyk99bllsv9";
+        sha256 = "0dl6gj1k6rz7bzyflfgi8y4489bxv03gfcni7zjzy440xjm3sk9l";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "0qxd4jd25ymcr6w97f71kfn549x6wgg4g3vixd3sqlczknn85f47";
+        sha256 = "14mwxz12kd5znnrmwia4qk35sd7xpr6cgpxs1xzjwmjgvz6gc71v";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From fc70d6f7123c9387853c42cb1391711b3989bd81 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 12:55:28 +0200
Subject: [PATCH 1699/2033] nvidia-x11: Don't install nvidia-xconfig

Rewriting the X11 config doesn't work on NixOS.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 06ab334e307..fef97002eaa 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -73,7 +73,7 @@ installPhase() {
         # Install the programs.
         mkdir -p $out/bin
 
-        for i in nvidia-settings nvidia-smi nvidia-xconfig; do
+        for i in nvidia-settings nvidia-smi; do
             cp $i $out/bin/$i
             patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
                 --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
@@ -85,6 +85,7 @@ installPhase() {
 
         mkdir -p $out/share/man/man1
         cp -p *.1.gz $out/share/man/man1
+        rm $out/share/man/man1/nvidia-xconfig.1.gz
 
         mkdir -p $out/share/applications
         cp -p *.desktop $out/share/applications

From 58226a7b0600fbb74984f983e4adff42ddb57b68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 May 2014 14:20:03 +0200
Subject: [PATCH 1700/2033] Add type for fonts.fonts option

---
 nixos/modules/config/fonts/fonts.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index ac804bef7fe..49b1e1d42a3 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -10,6 +10,7 @@ with lib;
 
       # TODO: find another name for it.
       fonts = mkOption {
+        type = types.listOf types.path;
         example = [ pkgs.dejavu_fonts ];
         description = "List of primary font paths.";
         apply = list: list ++

From 4d634e2baea60a02b63d17f27af37e64ee3e30f2 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Thu, 22 May 2014 15:29:36 +0200
Subject: [PATCH 1701/2033] Add apktool, tool for reverse engineering Android
 apk files

---
 pkgs/development/tools/apktool/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/tools/apktool/default.nix

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
new file mode 100644
index 00000000000..a415ffd152d
--- /dev/null
+++ b/pkgs/development/tools/apktool/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, makeWrapper, jre, buildTools }:
+
+stdenv.mkDerivation rec {
+  name = "apktool-${version}";
+  version = "1.5.2";
+
+  src = fetchurl {
+    url = "https://android-apktool.googlecode.com/files/apktool${version}.tar.bz2";
+    sha1 = "2dd828cf79467730c7406aa918f1da1bd21aaec8";
+  };
+
+  unpackCmd = ''
+    tar -xvf $src || true
+    cd apktool*
+  '';
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D apktool.jar "$out/libexec/apktool/apktool.jar"
+    ensureDir "$out/bin"
+    makeWrapper "${jre}/bin/java" "$out/bin/apktool" \
+        --add-flags "-jar $out/libexec/apktool/apktool.jar" \
+        --prefix PATH : "${buildTools}/build-tools/android-4.3/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for reverse engineering Android apk files";
+    homepage    = https://code.google.com/p/android-apktool/;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ offline ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3e88a61b9d..7fc5bd53244 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -462,6 +462,10 @@ let
 
   analog = callPackage ../tools/admin/analog {};
 
+  apktool = callPackage ../development/tools/apktool {
+    buildTools = androidenv.buildTools;
+  };
+
   apt-offline = callPackage ../tools/misc/apt-offline { };
 
   archivemount = callPackage ../tools/filesystems/archivemount { };

From f211c32e6d998f68d253c0fdf9db41630801a7bd Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Thu, 22 May 2014 14:07:25 +0000
Subject: [PATCH 1702/2033] IMM RSS reader and dependencies

---
 .../libraries/haskell/imm/default.nix         | 27 +++++++
 .../imm/latest-feed-http-conduit-tls.patch    | 73 +++++++++++++++++++
 .../libraries/haskell/opml/default.nix        | 13 ++++
 .../libraries/haskell/timerep/default.nix     | 12 +++
 pkgs/top-level/haskell-packages.nix           |  6 ++
 5 files changed, 131 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/imm/default.nix
 create mode 100644 pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch
 create mode 100644 pkgs/development/libraries/haskell/opml/default.nix
 create mode 100644 pkgs/development/libraries/haskell/timerep/default.nix

diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix
new file mode 100644
index 00000000000..38bc9bbfde7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/imm/default.nix
@@ -0,0 +1,27 @@
+{ cabal, async, caseInsensitive, cond, dataDefault, dyre, feed
+, filepath, hslogger, httpConduit, httpTypes, lens, mimeMail
+, monadControl, mtl, network, opml, random, resourcet, text
+, textIcu, time, timerep, tls, transformers, transformersBase
+, utf8String, xdgBasedir, xml
+}:
+
+cabal.mkDerivation (self: {
+  pname = "imm";
+  version = "0.6.0.1";
+  sha256 = "11m6937wafl6nic69mbibrjnxib503907y21n9zmsxc8vnjl3pps";
+  patches = [ ./latest-feed-http-conduit-tls.patch ];
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    async caseInsensitive cond dataDefault dyre feed filepath hslogger
+    httpConduit httpTypes lens mimeMail monadControl mtl network opml
+    random resourcet text textIcu time timerep tls transformers
+    transformersBase utf8String xdgBasedir xml
+  ];
+  meta = {
+    description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
+  };
+})
\ No newline at end of file
diff --git a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch
new file mode 100644
index 00000000000..afe72bc83e7
--- /dev/null
+++ b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch
@@ -0,0 +1,73 @@
+# HG changeset patch
+# User Daniel Bergey <bergey@alum.mit.edu>
+# Date 1398284724 0
+#      Wed Apr 23 20:25:24 2014 +0000
+# Node ID 4cc692e7acc4f21ffab9e5572d286495791d22d1
+# Parent  31e3ba1aaaf9efdce66e8ef5c192d0f4214150f4
+Update for feed-0.3.9.2, http-conduit-2.0, tls-1.2
+
+diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/Error.hs
+--- a/Imm/Error.hs	Sun Jun 16 12:23:40 2013 +0200
++++ b/Imm/Error.hs	Wed Apr 23 20:25:24 2014 +0000
+@@ -41,7 +41,7 @@
+ data ImmError =
+     OtherError         String
+   | HTTPError          HttpException
+-  | TLSError           HandshakeFailed
++  | TLSError           TLSException
+   | UnicodeError       UnicodeException
+   | ParseUriError      String
+   | ParseTimeError     String
+@@ -63,7 +63,7 @@
+         "/!\\ Cannot parse date from item: ",
+         "    title: "       ++ (show $ getItemTitle item),
+         "    link:"         ++ (show $ getItemLink item),
+-        "    publish date:" ++ (show $ getItemPublishDate item),
++        "    publish date:" ++ (show (getItemPublishDate item :: Maybe (Maybe UTCTime))),
+         "    date:"         ++ (show $ getItemDate item)]
+     show (ParseTimeError raw)      = "/!\\ Cannot parse time: " ++ raw
+     show (ParseFeedError raw)      = "/!\\ Cannot parse feed: " ++ raw
+diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/HTTP.hs
+--- a/Imm/HTTP.hs	Sun Jun 16 12:23:40 2013 +0200
++++ b/Imm/HTTP.hs	Wed Apr 23 20:25:24 2014 +0000
+@@ -50,13 +50,13 @@
+     either throwError return res
+ 
+ -- | Monad-agnostic version of 'parseUrl'
+-parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request m')
++parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m Request
+ parseURL uri = do
+     result <- io $ (Right <$> parseUrl uri) `catch` (return . Left . HTTPError)
+     either throwError return result
+ 
+ -- | Build an HTTP request for given URI
+-request :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request a)
++request :: (MonadBase IO m, MonadError ImmError m) => String -> m Request
+ request uri = do
+     req <- parseURL uri
+     return $ req { requestHeaders = [
+diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 imm.cabal
+--- a/imm.cabal	Sun Jun 16 12:23:40 2013 +0200
++++ b/imm.cabal	Wed Apr 23 20:25:24 2014 +0000
+@@ -46,10 +46,10 @@
+         data-default,
+         directory,
+         dyre,
+-        feed,
++        feed == 0.3.9.2,
+         filepath,
+         hslogger,
+-        http-conduit >= 1.9.0,
++        http-conduit >= 2.0 && < 2.2,
+         http-types,
+         lens,
+         mime-mail,
+@@ -66,7 +66,7 @@
+         transformers,
+         time,
+         timerep >= 1.0.3,
+-        tls,
++        tls >= 1.2 && < 1.3,
+         utf8-string,
+         xdg-basedir,
+         xml
diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix
new file mode 100644
index 00000000000..be7cb0606ee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/opml/default.nix
@@ -0,0 +1,13 @@
+{ cabal, xml }:
+
+cabal.mkDerivation (self: {
+  pname = "opml";
+  version = "0.4";
+  sha256 = "1bnr6lkcf2qs7pvrmd8a5xmklcg67l64b776hzclfvxqy1qil29x";
+  buildDepends = [ xml ];
+  meta = {
+    description = "Representing and handling OPML subscription information";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix
new file mode 100644
index 00000000000..6ebc44cb894
--- /dev/null
+++ b/pkgs/development/libraries/haskell/timerep/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "timerep";
+  version = "1.0.3";
+  sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p";
+  meta = {
+    description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index d3d2ae5fea2..1560b7d4557 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1172,6 +1172,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ieee754 = callPackage ../development/libraries/haskell/ieee754 {};
 
+  imm = callPackage ../development/libraries/haskell/imm {};
+
   indents = callPackage ../development/libraries/haskell/indents {};
 
   indexed = callPackage ../development/libraries/haskell/indexed {};
@@ -1552,6 +1554,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   operational = callPackage ../development/libraries/haskell/operational {};
 
+  opml = callPackage ../development/libraries/haskell/opml {};
+
   options = callPackage ../development/libraries/haskell/options {};
 
   optparseApplicative = callPackage ../development/libraries/haskell/optparse-applicative {};
@@ -2173,6 +2177,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   time_1_4_2 = callPackage ../development/libraries/haskell/time/1.4.2.nix {};
   time = null;                  # core package since ghc >= 6.12.x
 
+  timerep = callPackage ../development/libraries/haskell/timerep {};
+
   timeparsers = callPackage ../development/libraries/haskell/timeparsers {
     convertible = self.convertible_1_0_11_1;
   };

From 1ab0cd12423bbfc6c396f29fed7d2101f9fce430 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 21 May 2014 21:45:23 +0200
Subject: [PATCH 1703/2033] transmission: Update from 2.82 -> 2.83

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 29fb558c83d..0f1ce2b2efa 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.82";
+  version = "2.83";
 in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.transmissionbt.com/files/transmission-${version}.tar.xz";
-    sha256 = "08imy28hpjxwdzgvhm66hkfyzp8qnnqr4jhv3rgshryzhw86b5ir";
+    sha256 = "0cqlgl6jmjw1caybz6nzh3l8z0jak1dxba01isv72zvy2r8b1qdh";
   };
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]

From f9daf5021464e8443ab21312f15a66b04774d8fc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 22 May 2014 11:34:47 +0200
Subject: [PATCH 1704/2033] transmission: Fix compilation due to missing
 systemd dependency

---
 pkgs/applications/networking/p2p/transmission/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index 0f1ce2b2efa..f260e3eb30a 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
-, openssl, curl, libevent, inotifyTools
+, openssl, curl, libevent, inotifyTools, systemd
 , enableGTK3 ? false, gtk3
 }:
 
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ]
-    ++ optionals enableGTK3 [ gtk3 makeWrapper ];
+    ++ optionals enableGTK3 [ gtk3 makeWrapper ]
+    ++ optional stdenv.isLinux systemd;
 
   preConfigure = ''
     sed -i -e 's|/usr/bin/file|${file}/bin/file|g' configure

From a131baf502512b891d4efde73d458da325f69c2b Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 22 May 2014 19:10:46 +0200
Subject: [PATCH 1705/2033] transmission: Fix apparmor rules to allow loading
 more libraries

---
 .../modules/services/torrent/transmission.nix  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 5cdecd1eb57..02db4a7a5b2 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -125,13 +125,17 @@ 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.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,
 
           @{PROC}/sys/kernel/random/uuid   r,
           @{PROC}/sys/vm/overcommit_memory r,

From 68d93de10c2574b9a867b5052f7941f258515950 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 21 May 2014 21:45:21 +0200
Subject: [PATCH 1706/2033] chromium: Update stable channel from 34.0.1847.132
 -> 35.0.1916.114

---
 .../networking/browsers/chromium/source/sources.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 715b1e95825..bd5ded3f4c6 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -13,9 +13,9 @@
     sha256bin64 = "1sqavz6lh0ryf8jlw8jcfwk265spxs70bhigcgcqsd6647fbdqsr";
   };
   stable = {
-    version = "34.0.1847.132";
-    sha256 = "0f30i0jxqx059imfiyvsaslkydkva9x6nbvpsjccvwygs91hm4z8";
-    sha256bin32 = "1czbydkyazhc63ndyiarbwmmi7p3wh2rb4x7avs41yx7sx9vdqjl";
-    sha256bin64 = "01k301629m4m8a4mpg0m5kblygfs72kpa4qi3mlkl8cbb0rlq6mv";
+    version = "35.0.1916.114";
+    sha256 = "1bvpkwjchkzx1qfc93hd8md6sz5sd7pl55xc8b8m3iakbp0csvsn";
+    sha256bin32 = "0zm5770cv9dld37xall9lpl9faa0bgjcp8hjx6l1ivfhs6lxbxxa";
+    sha256bin64 = "18p302aj2d7xdza9kf438vbz3wqh8db7v2dq5d9b4b3ak6w9ld03";
   };
 }

From 5255e5692e81cee11a08cf87cc731b28765fba6f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 13 May 2014 16:01:01 +0200
Subject: [PATCH 1707/2033] flashplayer: Update from 11.2.202.356 ->
 11.2.202.359

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

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index a7002dec2f6..378e32c0afb 100644
--- 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.356";
+  version = "11.2.202.359";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1g09a9fvm3wm2zi885q2kc2rwq0a7ywc637i31pzfic6kij10ps5";
+        sha256 = "13myq6f999qy1jbgm73gxnadrxdvasi2jiffdyxmwpbwglhhrpka";
       }
     else if stdenv.system == "i686-linux" then
       if debug then {
@@ -58,7 +58,7 @@ let
       } else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1r7sbwfbgq7c5jhginsc95rihdcjsfzrbx0kxgwv7sk2jc7x8hhb";
+        sha256 = "04wh18jbscp7m3drvsxxhp2vjnhww69vw0pgr23hx81ry0ccvb8m";
       }
     else throw "Flash Player is not supported on this platform";
 

From f0cf8f4140bffbe1016ae11e25e8a7ad6ca7e9c9 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 21 May 2014 23:49:32 +0200
Subject: [PATCH 1708/2033] grsecurity: Fix module evaluation

---
 nixos/modules/security/grsecurity.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 8fbeeb9ba61..f4af04247fe 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -7,7 +7,10 @@ let
 
   customGrsecPkg =
     (import ../../../pkgs/build-support/grsecurity
-      { grsecOptions = cfg; }
+      {
+        inherit lib pkgs;
+        grsecOptions = cfg;
+      }
     ).grsecPackage;
 in
 {

From ecee297a18fa985ed7cc103b28bac69cae5162e9 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 22 May 2014 22:01:00 +0200
Subject: [PATCH 1709/2033] fhs-chrootenv (steam): support directly using users
 other than root, fix sound support, fix /run/user

---
 pkgs/build-support/build-fhs-chrootenv/default.nix | 4 ++--
 pkgs/build-support/build-fhs-chrootenv/load.sh.in  | 2 +-
 pkgs/build-support/build-fhs-chrootenv/mount.sh.in | 2 +-
 pkgs/top-level/all-packages.nix                    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix
index 2f3aa14c6a0..e807a04628a 100644
--- a/pkgs/build-support/build-fhs-chrootenv/default.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/default.nix
@@ -1,11 +1,11 @@
 {stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2, 
-bashInteractive, xz, shadow, gawk, less, su, buildEnv}:
+bashInteractive, xz, shadow, gawk, less, buildEnv}:
 {name, pkgs ? [], profile ? ""}:
 
 let
   basePkgs = [
     glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
-    gzip bzip2 bashInteractive xz shadow gawk less su
+    gzip bzip2 bashInteractive xz shadow gawk less
   ];
 
   # Compose a global profile for the chroot environment
diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in
index 8d3f464186b..6089fa27585 100644
--- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in
@@ -3,4 +3,4 @@
 chrootenvDest=/run/chrootenv/@name@
 
 # Enter the LFS chroot environment
-chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login
+sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login
diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
index 68459cca256..225d9dbc4f7 100644
--- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in
@@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home
 
 # Bind mount state directories
 mount --bind /var $chrootenvDest/var
-mount --bind /run $chrootenvDest/run
+mount --rbind /run $chrootenvDest/run
 
 # Bind mount the host system's /etc
 mount --bind /etc $chrootenvDest/host-etc
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fc5bd53244..af6bdb1b198 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -270,7 +270,7 @@ let
   buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
     inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
     inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
-    inherit less su buildEnv;
+    inherit less buildEnv;
   };
 
   dotnetenv = import ../build-support/dotnetenv {

From eb928c5d4654d09bd0615a71a9f52e6e9409ffe5 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 22 May 2014 22:18:30 +0200
Subject: [PATCH 1710/2033] fhs-chrootenv: use -l to umount for the rbind mount

---
 pkgs/build-support/build-fhs-chrootenv/umount.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
index 29d631fbd90..5089141c0aa 100644
--- a/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/umount.sh.in
@@ -2,5 +2,5 @@
 
 chrootenvDest=/run/chrootenv/@name@
 
-# Unmount all bind mounts
-umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
+# Unmount all (r)bind mounts
+umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}

From 0bc17d9fa93ef966f17f589f471ffc0bc5a16ad1 Mon Sep 17 00:00:00 2001
From: Jordan Patterson <jordan@evolarium.ca>
Date: Thu, 22 May 2014 15:13:25 -0600
Subject: [PATCH 1711/2033] Add unicode3 option to rxvt_unicode

Needed to user fonts patched for powerline.
---
 pkgs/applications/misc/rxvt_unicode/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 7ba01167c7f..52f0ef9cde3 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
-  fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf }:
+  fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf,
+  unicode3Support }:
 
 let
   name = "rxvt-unicode";
@@ -9,7 +10,7 @@ in
 
 stdenv.mkDerivation (rec {
 
-  name = "${n}${if perlSupport then "-with-perl" else ""}";
+  name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}";
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
@@ -29,7 +30,7 @@ stdenv.mkDerivation (rec {
   preConfigure =
     ''
       mkdir -p $terminfo/share/terminfo
-      configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"}";
+      configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}";
       export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic
       NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2"
       NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fc5bd53244..8be68fe36b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9237,6 +9237,7 @@ let
   rxvt_unicode = callPackage ../applications/misc/rxvt_unicode {
     perlSupport = true;
     gdkPixbufSupport = true;
+    unicode3Support = true;
   };
 
   sakura = callPackage ../applications/misc/sakura {

From f8ae62a8d033a77cbf9996c3c44cf3b2e35af5ae Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 22 May 2014 23:45:46 +0200
Subject: [PATCH 1712/2033] setlocale: 0.0.3

---
 .../libraries/haskell/setlocale/default.nix          | 12 ++++++++++++
 pkgs/top-level/haskell-packages.nix                  |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/setlocale/default.nix

diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix
new file mode 100644
index 00000000000..09ffc7159a4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/setlocale/default.nix
@@ -0,0 +1,12 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "setlocale";
+  version = "0.0.3";
+  sha256 = "08pd20ibmslr94p52rn6x9w3swn9jy7vjlvxzw29h8dlqgmvcrjl";
+  meta = {
+    description = "A Haskell interface to setlocale()";
+    license = self.stdenv.lib.licenses.publicDomain;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9c33cb8ff47..58a161e8760 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1876,6 +1876,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   setenv = callPackage ../development/libraries/haskell/setenv {};
 
+  setlocale = callPackage ../development/libraries/haskell/setlocale {};
+
   shelly = callPackage ../development/libraries/haskell/shelly {};
 
   simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};

From cb2cf60a14d2cfdaf120434e35ca7d91f5bd2dd6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 22 May 2014 23:46:12 +0200
Subject: [PATCH 1713/2033] wcwidth: 0.0.2

---
 .../libraries/haskell/wcwidth/default.nix        | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/wcwidth/default.nix

diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix
new file mode 100644
index 00000000000..0307642f62b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/wcwidth/default.nix
@@ -0,0 +1,16 @@
+{ cabal, attoparsec, setlocale, utf8String }:
+
+cabal.mkDerivation (self: {
+  pname = "wcwidth";
+  version = "0.0.2";
+  sha256 = "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ attoparsec setlocale utf8String ];
+  meta = {
+    homepage = "http://github.com/solidsnack/wcwidth/";
+    description = "Native wcwidth";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 58a161e8760..ea50057569c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2353,6 +2353,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   warpTls = callPackage ../development/libraries/haskell/warp-tls {};
 
+  wcwidth = callPackage ../development/libraries/haskell/wcwidth {};
+
   webRoutes = callPackage ../development/libraries/haskell/web-routes {};
 
   webRoutesBoomerang = callPackage ../development/libraries/haskell/web-routes-boomerang {};

From 1ab31c05e7cecec140d8d53879546d960bd0de81 Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Fri, 23 May 2014 08:39:28 +1000
Subject: [PATCH 1714/2033] mpdcron: add expression

---
 pkgs/tools/audio/mpdcron/default.nix | 31 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  7 ++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/audio/mpdcron/default.nix

diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
new file mode 100644
index 00000000000..61553566d6c
--- /dev/null
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
+, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }:
+
+stdenv.mkDerivation rec {
+  version = "20130809";
+  name    = "mpdcron-${version}";
+
+  src = fetchgit {
+    url    = https://github.com/alip/mpdcron.git;
+    rev    = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd";
+    sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3";
+  };
+
+  meta = {
+    description = "A cron like daemon for mpd.";
+    homepage    = http://alip.github.io/mpdcron/;
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = with stdenv.lib.platforms; unix;
+    maintainers = [ stdenv.lib.maintainers.lovek323 ];
+  };
+
+  buildInputs =
+    [ autoconf automake libtool pkgconfig glib libdaemon
+      mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b13d0c47d69..681b369a43d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -632,6 +632,8 @@ let
 
   mcrl2 = callPackage ../tools/misc/mcrl2 { };
 
+  mpdcron = callPackage ../tools/audio/mpdcron { };
+
   syslogng = callPackage ../tools/system/syslog-ng { };
 
   rsyslog = callPackage ../tools/system/rsyslog { };
@@ -6606,7 +6608,10 @@ let
 
   mod_wsgi = callPackage ../servers/http/apache-modules/mod_wsgi { };
 
-  mpd = callPackage ../servers/mpd { };
+  mpd = callPackage ../servers/mpd {
+    aacSupport    = config.mpd.aacSupport or true;
+    ffmpegSupport = config.mpd.ffmpegSupport or true;
+  };
 
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
 

From 128636ff242a7eee77cf0b6c640f184e0a2b0a1a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 23 May 2014 10:18:03 +0200
Subject: [PATCH 1715/2033] Added an option to configure sensitivity and speed
 of trackpoints.

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/tasks/trackpoint.nix | 66 ++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 nixos/modules/tasks/trackpoint.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f98b621111f..a7f121bc7c2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -317,6 +317,7 @@
   ./tasks/network-interfaces.nix
   ./tasks/scsi-link-power-management.nix
   ./tasks/swraid.nix
+  ./tasks/trackpoint.nix
   ./testing/service-runner.nix
   ./virtualisation/container-config.nix
   ./virtualisation/containers.nix
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
new file mode 100644
index 00000000000..4be2c3eb4c4
--- /dev/null
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+
+  options = {
+
+    hardware.trackpoint = {
+
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enable sensitivity and speed configuration for trackpoints.
+        '';
+      };
+  
+      sensitivity = mkOption {
+        default = 128;
+        example = 255;
+        type = types.int;
+        description = ''
+          Configure the trackpoint sensitivity. By default, the kernel
+          configures 128.
+        '';
+      };
+
+      speed = mkOption {
+        default = 97;
+        example = 255;
+        type = types.int;
+        description = ''
+          Configure the trackpoint sensitivity. By default, the kernel
+          configures 97.
+        '';
+      };
+      
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.hardware.trackpoint.enable {
+
+    jobs.trackpoint =
+      { description = "Initialize trackpoint";
+
+        startOn = "started udev";
+
+        task = true;
+
+        script = ''
+          echo -n ${toString config.hardware.trackpoint.sensitivity} \
+            > /sys/devices/platform/i8042/serio1/sensitivity
+          echo -n ${toString config.hardware.trackpoint.speed} \
+            > /sys/devices/platform/i8042/serio1/speed
+        '';
+      };
+         
+  };
+
+}

From c84d81541ec6356305bc2175d90ee647bb1a5920 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 23 May 2014 14:53:24 +0400
Subject: [PATCH 1716/2033] alsa: add option to change system wide
 configuration

---
 nixos/modules/services/audio/alsa.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 9a70d9edfa7..7699b3bff3e 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -9,6 +9,8 @@ let
 
   soundState = "/var/lib/alsa/asound.state";
 
+  configPaht = "asound.conf";
+
 in
 
 {
@@ -35,6 +37,17 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = '''';
+        example = ''
+          defaults.pcm.!card 3
+        '';
+        description = ''
+          Set addition configuration for system-wide alsa.
+        '';
+      };
+
     };
 
   };
@@ -46,6 +59,11 @@ in
 
     environment.systemPackages = [ alsaUtils ];
 
+    environment.etc = [ { source = config.sound.extraConfig;
+                          target = configPath;
+                        }
+                      ];
+
     # ALSA provides a udev rule for restoring volume settings.
     services.udev.packages = [ alsaUtils ];
 

From dc8625305a503af5af9a486415efee14a7d502fe Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 23 May 2014 14:58:07 +0400
Subject: [PATCH 1717/2033] fix mistake

---
 nixos/modules/services/audio/alsa.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 7699b3bff3e..d49c2676f7d 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -9,7 +9,7 @@ let
 
   soundState = "/var/lib/alsa/asound.state";
 
-  configPaht = "asound.conf";
+  configPath = "asound.conf";
 
 in
 

From 3514ad8b98a9155353d489fa6696bf52ee7b56fe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 23 May 2014 15:22:57 +0200
Subject: [PATCH 1718/2033] geary: new package

Mail client for GNOME 3

https://wiki.gnome.org/Apps/Geary
---
 pkgs/desktops/gnome-3/3.12/default.nix        |  2 +
 .../gnome-3/3.12/misc/geary/default.nix       | 49 +++++++++++++++++++
 .../3.12/misc/geary/disable_valadoc.patch     | 24 +++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
 create mode 100644 pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch

diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index 0600b4ebbf9..baa7113ce90 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -211,6 +211,8 @@ rec {
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
+  geary = callPackage ./misc/geary { };
+
   gfbgraph = callPackage ./misc/gfbgraph { };
 
   goffice = callPackage ./misc/goffice { };
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
new file mode 100644
index 00000000000..1eb6c0e3ed2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
+, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
+, libnotify, libcanberra, libsecret, gmime
+, libpthreadstubs, hicolor_icon_theme
+, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
+
+stdenv.mkDerivation rec {
+  name = "geary-0.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
+    sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
+                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime
+                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
+                  gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
+
+  preConfigure = ''
+    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/${name}/
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/geary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable_valadoc.patch ];
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Geary;
+    description = "Mail client for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
new file mode 100644
index 00000000000..e65c0dea747
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
@@ -0,0 +1,24 @@
+--- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
++++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
+@@ -696,21 +696,6 @@
+         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
+ )
+ 
+-# Valadoc
+-#################################################
+-foreach(pkg ${ENGINE_PACKAGES})
+-    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
+-endforeach(pkg ${ENGINE_PACKAGES})
+-
+-include(FindValadoc)
+-add_custom_target(
+-    valadoc
+-    WORKING_DIRECTORY
+-        ${CMAKE_SOURCE_DIR}/src
+-    COMMAND
+-        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+-)
+-
+ ## Make clean: remove copied files
+ ##################################################
+ set_property(

From a815933a5d482d8aef068994fa1be9e5e20e2ec3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 15:57:20 +0200
Subject: [PATCH 1719/2033] haskell-pretty-show: update to version 1.6.7

... and drop obsolete 1.2 version.
---
 .../libraries/haskell/pretty-show/1.2.nix        | 16 ----------------
 .../pretty-show/{1.6.7.nix => default.nix}       |  4 ++--
 pkgs/top-level/haskell-packages.nix              |  4 +---
 3 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/pretty-show/1.2.nix
 rename pkgs/development/libraries/haskell/pretty-show/{1.6.7.nix => default.nix} (86%)

diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix
deleted file mode 100644
index 545816a57a0..00000000000
--- a/pkgs/development/libraries/haskell/pretty-show/1.2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, haskellLexer }:
-
-cabal.mkDerivation (self: {
-  pname = "pretty-show";
-  version = "1.2";
-  sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l";
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [ haskellLexer ];
-  meta = {
-    homepage = "http://wiki.github.com/yav/pretty-show";
-    description = "Tools for working with derived Show instances";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix
similarity index 86%
rename from pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
rename to pkgs/development/libraries/haskell/pretty-show/default.nix
index 7e3e3e25e8a..56126a42cb3 100644
--- a/pkgs/development/libraries/haskell/pretty-show/1.6.7.nix
+++ b/pkgs/development/libraries/haskell/pretty-show/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pretty-show";
-  version = "1.6.7";
-  sha256 = "16qjp6cl3hyir5bchnncq95bp7nw5cpp5kd5mszkjjhzw1jj9srz";
+  version = "1.6.8";
+  sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ filepath haskellLexer ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9c33cb8ff47..0a745ead70d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1691,9 +1691,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   prettyclass = callPackage ../development/libraries/haskell/prettyclass {};
 
-  prettyShow_1_2 = callPackage ../development/libraries/haskell/pretty-show/1.2.nix {};
-  prettyShow_1_6_7 = callPackage ../development/libraries/haskell/pretty-show/1.6.7.nix {};
-  prettyShow = self.prettyShow_1_6_7;
+  prettyShow = callPackage ../development/libraries/haskell/pretty-show {};
 
   punycode = callPackage ../development/libraries/haskell/punycode {};
 

From eb1a7e83cde0a8dc1e09fd6404e6fd76885c9d34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 15:59:40 +0200
Subject: [PATCH 1720/2033] haskell-amqp: update to version 0.8.3

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

diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix
index 9d08994af4f..8256ff54e19 100644
--- a/pkgs/development/libraries/haskell/amqp/default.nix
+++ b/pkgs/development/libraries/haskell/amqp/default.nix
@@ -1,20 +1,21 @@
 { cabal, binary, clock, connection, dataBinaryIeee754, hspec
-, hspecExpectations, monadControl, network, split, text, xml
+, hspecExpectations, monadControl, network, split, text, vector
+, xml
 }:
 
 cabal.mkDerivation (self: {
   pname = "amqp";
-  version = "0.8.2";
-  sha256 = "0hl9x6kbxdv32014k1w34d84wl4ivpiyg1ikpjr0nr9bsg3wr0gf";
+  version = "0.8.3";
+  sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
     binary clock connection dataBinaryIeee754 monadControl network
-    split text xml
+    split text vector xml
   ];
   testDepends = [
     binary clock connection dataBinaryIeee754 hspec hspecExpectations
-    network split text
+    network split text vector
   ];
   doCheck = false;
   meta = {

From b8c26e757e7b9128b4a536de1253fed491d063d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:02 +0200
Subject: [PATCH 1721/2033] haskell-conduit: update to version 1.1.3

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

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 99308d43272..94423cc41ef 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "1.1.2.1";
-  sha256 = "1jzc3vnc0dr4nm79yx2kk5rsm06jfbf3h89y28bgv05r1pw6r7ai";
+  version = "1.1.3";
+  sha256 = "14fc7v00zmrcwba2rdnh7c6sx0rv5mmbwlgq5p8p7nlald1dcr6z";
   buildDepends = [
     exceptions liftedBase mmorph monadControl mtl resourcet
     transformers transformersBase void

From f125c54f1ea719cf9b4dcebabf2487dabb02ae58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:04 +0200
Subject: [PATCH 1722/2033] haskell-directory-tree: update to version 0.12.0

---
 .../development/libraries/haskell/directory-tree/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix
index 5c8b357593e..343aeb014ad 100644
--- a/pkgs/development/libraries/haskell/directory-tree/default.nix
+++ b/pkgs/development/libraries/haskell/directory-tree/default.nix
@@ -2,9 +2,10 @@
 
 cabal.mkDerivation (self: {
   pname = "directory-tree";
-  version = "0.11.0";
-  sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9";
+  version = "0.12.0";
+  sha256 = "1idknm7fwci91fkwvzl35g0qd0jk1vb00ds2x82zjf2hdbkcc2gz";
   buildDepends = [ filepath ];
+  testDepends = [ filepath ];
   meta = {
     homepage = "http://brandon.si/code/directory-tree-module-released/";
     description = "A simple directory-like tree datatype, with useful IO functions";

From c3b34eafc45659a7f37bc0c7d9947c09f8244687 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:05 +0200
Subject: [PATCH 1723/2033] haskell-esqueleto: update to version 1.4.1.2

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

diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix
index 0a92db399e5..0538e2f1899 100644
--- a/pkgs/development/libraries/haskell/esqueleto/default.nix
+++ b/pkgs/development/libraries/haskell/esqueleto/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "esqueleto";
-  version = "1.4.1";
-  sha256 = "0b2gwsd6014fhmq8lipc299n6ndak7fv6dmrvi9vgasw0a665ryj";
+  version = "1.4.1.2";
+  sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2";
   buildDepends = [
     conduit monadLogger persistent resourcet tagged text transformers
     unorderedContainers
@@ -18,7 +18,7 @@ cabal.mkDerivation (self: {
   ];
   meta = {
     homepage = "https://github.com/meteficha/esqueleto";
-    description = "Bare bones, type-safe EDSL for SQL queries on persistent backends";
+    description = "Type-safe EDSL for SQL queries on persistent backends";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [ self.stdenv.lib.maintainers.ocharles ];

From d07260e6851e76169b39005e299355e9de3f1073 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:07 +0200
Subject: [PATCH 1724/2033] haskell-fay: update to version 0.20.0.4

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

diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix
index d67cc988a2d..d32a5759780 100644
--- a/pkgs/development/libraries/haskell/fay/default.nix
+++ b/pkgs/development/libraries/haskell/fay/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "fay";
-  version = "0.20.0.3";
-  sha256 = "1vs4brndk091mp7lm057my4ghlpv3563qg5blrs5zqcmnwnm75x5";
+  version = "0.20.0.4";
+  sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From b247f72680c33d00c735c55df11212c7d5d245af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:09 +0200
Subject: [PATCH 1725/2033] haskell-file-embed: update to version 0.0.7

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

diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix
index 7aa1b78a03e..a42e963d558 100644
--- a/pkgs/development/libraries/haskell/file-embed/default.nix
+++ b/pkgs/development/libraries/haskell/file-embed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "file-embed";
-  version = "0.0.6";
-  sha256 = "0ag3g8mv8cw8km785kskz8kv38zs8gimrc3lr9dvkc1qnp2fdmgz";
+  version = "0.0.7";
+  sha256 = "0mj8f70f9k78wjzcx59w68szajafmm119rcrsspmxsygglh8ji2g";
   buildDepends = [ filepath ];
   testDepends = [ filepath HUnit ];
   meta = {

From 85aef68466d2785c873550658948ba39d9b2bfd9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:11 +0200
Subject: [PATCH 1726/2033] haskell-http-client: update to version 0.3.3

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

diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix
index cc8341e2ac4..b447d9a1f11 100644
--- a/pkgs/development/libraries/haskell/http-client/default.nix
+++ b/pkgs/development/libraries/haskell/http-client/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-client";
-  version = "0.3.2.2";
-  sha256 = "1znfcn549zxz4wdlv9rvyqz0x52ygx9jba9r1fzxk08mbi8xz6ff";
+  version = "0.3.3";
+  sha256 = "001nmy6f57l2f7gc4mchz1gwam28qldkwmcxzs8jnqwczcirgk38";
   buildDepends = [
     base64Bytestring blazeBuilder caseInsensitive cookie
     dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes

From bb3d7b8a8507ae6cb7f6e1ae9530797e93774ed1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:12 +0200
Subject: [PATCH 1727/2033] haskell-httpd-shed: update to version 0.4.0.2

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

diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix
index 90f11940a46..2ebb8902617 100644
--- a/pkgs/development/libraries/haskell/httpd-shed/default.nix
+++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "httpd-shed";
-  version = "0.4.0.1";
-  sha256 = "04m07wqhaggkgksha7x528y890j30ay5axipfy6b1ma9cf0a9jwq";
+  version = "0.4.0.2";
+  sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ network ];

From 163ae08d4667d521e46dd75fadc5e63db287cdf7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:14 +0200
Subject: [PATCH 1728/2033] haskell-io-streams: update to version 1.1.4.4

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

diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix
index 4e361724681..4813771cb53 100644
--- a/pkgs/development/libraries/haskell/io-streams/default.nix
+++ b/pkgs/development/libraries/haskell/io-streams/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "io-streams";
-  version = "1.1.4.3";
-  sha256 = "0qp63xfbfz5ymfn8l9fiy27z30fi4sq201zgsh9x2mkhp6z2yzld";
+  version = "1.1.4.4";
+  sha256 = "07kmmjn1bsjzfi27fk6fx56pchks866qwrxkyvwihfvd96wgqggd";
   buildDepends = [
     attoparsec blazeBuilder network primitive text time transformers
     vector zlibBindings

From b1da717d8a7cde4cede9302964672a68e9d2e694 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:16 +0200
Subject: [PATCH 1729/2033] haskell-openssl-streams: update to version 1.1.0.1

---
 .../development/libraries/haskell/openssl-streams/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
index 14d256a471e..2813b88e95a 100644
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "openssl-streams";
-  version = "1.1.0.0";
-  sha256 = "0xww3n1mhw0sp9nkx4847gqbq4wnfcnc2m782kn5n8jxnjnm1fqn";
+  version = "1.1.0.1";
+  sha256 = "1y3vj17951gz3wlf75j3ph3hlkjbrplrmnbd9rcyiipzv51vy8ym";
   buildDepends = [ HsOpenSSL ioStreams network ];
   testDepends = [
     HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit

From ae772427596d83bf3a83063c987149413cf28298 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:17 +0200
Subject: [PATCH 1730/2033] haskell-optparse-applicative: update to version
 0.9.0

---
 .../libraries/haskell/optparse-applicative/default.nix    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
index 94d4b5746e2..bad23a102ee 100644
--- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix
+++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix
@@ -1,13 +1,13 @@
 { cabal, ansiWlPprint, HUnit, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2
-, testFrameworkThPrime, transformers
+, testFrameworkThPrime, transformers, transformersCompat
 }:
 
 cabal.mkDerivation (self: {
   pname = "optparse-applicative";
-  version = "0.8.1";
-  sha256 = "0zy295r2idrwz030i1slpgysyw08782cjc4vgpkxby8i6piixwlh";
-  buildDepends = [ ansiWlPprint transformers ];
+  version = "0.9.0";
+  sha256 = "1nmwrg74wz8k3zwgw5aaf7padkawi0dlrclq6nsr17xz5yx524ay";
+  buildDepends = [ ansiWlPprint transformers transformersCompat ];
   testDepends = [
     HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 testFrameworkThPrime

From 3fc2c64ba9eabf5cb19a664b792ebd4c5e9ec4da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:19 +0200
Subject: [PATCH 1731/2033] haskell-pipes-aeson: update to version 0.4

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

diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
index 899810c1539..85fd3a0a548 100644
--- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-aeson";
-  version = "0.3.0";
-  sha256 = "1kckdllw5xnh8z92gjw5swyxp9km879wqfly7af3iirwhickk4vn";
+  version = "0.4";
+  sha256 = "0cz9av3w8h2gh3cz7gs3ikplf60a111wcsr3z6vi8gqlmmgmck07";
   buildDepends = [
     aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse
     transformers

From 649536da192897d09c9b56b5e521839904857806 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:21 +0200
Subject: [PATCH 1732/2033] haskell-pipes-parse: update to version 3.0.2

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

diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix
index ef615ebb808..5f5dec485b6 100644
--- a/pkgs/development/libraries/haskell/pipes-parse/default.nix
+++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "pipes-parse";
-  version = "3.0.1";
-  sha256 = "0f262p8mfcpvs3f3myy6bll9v61rfgrfdy2scdzf7vvx0h0lrpj7";
+  version = "3.0.2";
+  sha256 = "1d5lhh8knk0hmvd9wv2ihs5z9ybyvhd1n7qaazqkazqkyl14pd08";
   buildDepends = [ pipes transformers ];
   meta = {
     description = "Parsing infrastructure for the pipes ecosystem";

From 52b290805ab46d9da93898dd8a53f9f9fb794233 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:23 +0200
Subject: [PATCH 1733/2033] haskell-shelly: update to version 1.5.3.2

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

diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix
index 01f07ae6a08..4549adaf43e 100644
--- a/pkgs/development/libraries/haskell/shelly/default.nix
+++ b/pkgs/development/libraries/haskell/shelly/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shelly";
-  version = "1.5.3.1";
-  sha256 = "0lhan549nkxihd94byaknswczlr757smha2fwq7y82rr0k16im4y";
+  version = "1.5.3.2";
+  sha256 = "0ilqg7mffw8cnl3w175if74xwfij7460qqqsp6hzml7gzjdb0rky";
   buildDepends = [
     async enclosedExceptions exceptions liftedAsync liftedBase
     monadControl mtl systemFileio systemFilepath text time transformers

From 84373ee34d49aa4bcb09a50e9d0c24be308e0c69 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:24 +0200
Subject: [PATCH 1734/2033] haskell-streaming-commons: update to version 0.1.3

---
 .../libraries/haskell/streaming-commons/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix
index f98e6a7b4a2..1a17cd5f14f 100644
--- a/pkgs/development/libraries/haskell/streaming-commons/default.nix
+++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "streaming-commons";
-  version = "0.1.2.4";
-  sha256 = "1wy1cdmx3fhxg9xb7v5r3nyyjhr7irvcwy3l4g6br671zh8j8kcg";
+  version = "0.1.3";
+  sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3";
   buildDepends = [
     blazeBuilder network random text transformers zlib
   ];

From d874bb14d2d8d1b787efc6fe078fa731b399888d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:28 +0200
Subject: [PATCH 1735/2033] haskell-transformers-compat: update to version
 0.3.3

---
 .../libraries/haskell/transformers-compat/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/transformers-compat/default.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix
index e160ed5226e..dfe9e2ef0d6 100644
--- a/pkgs/development/libraries/haskell/transformers-compat/default.nix
+++ b/pkgs/development/libraries/haskell/transformers-compat/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "transformers-compat";
-  version = "0.3.2";
-  sha256 = "1rbwmbb04f6lnag1d11skznmxxygf9x7jjnjfkvyza4mnaxnrbpy";
+  version = "0.3.3";
+  sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://github.com/ekmett/transformers-compat/";

From a2d8dd06885b517f94c648d274407059fb5802b4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:29 +0200
Subject: [PATCH 1736/2033] haskell-vty-ui: update to version 1.7

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

diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix
index ad3ab7823c0..913451de213 100644
--- a/pkgs/development/libraries/haskell/vty-ui/default.nix
+++ b/pkgs/development/libraries/haskell/vty-ui/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "vty-ui";
-  version = "1.6.1";
-  sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d";
+  version = "1.7";
+  sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a8cfe984c3dc6ff06d4e5d64ca175e870acb6c4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:31 +0200
Subject: [PATCH 1737/2033] haskell-wai-extra: update to version 2.1.1.2

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

diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index ef91a872687..66d45f05912 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "2.1.1.1";
-  sha256 = "1mqpy1klr4b5dvgk89hqyd8c2vg7rl0vypy3m9hxr2r4bzifkqc1";
+  version = "2.1.1.2";
+  sha256 = "000ksma1jmi7rfg2ib94baj31mcwqj2xfhkyv7lai89di0m0v6s4";
   buildDepends = [
     ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
     caseInsensitive conduit conduitExtra dataDefault fastLogger

From 48810471c1e90224e664cb7df1564f9322d6efa1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:33 +0200
Subject: [PATCH 1738/2033] haskell-wai-handler-launch: update to version
 2.0.1.3

---
 .../libraries/haskell/wai-handler-launch/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
index 9be53472582..9d59fd68ed6 100644
--- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
+++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-handler-launch";
-  version = "2.0.1.2";
-  sha256 = "1mcjxv4dkcc5rx1bj8zc5m2q2ifcdwhsl4x4fnrv1ir9kclzsm7q";
+  version = "2.0.1.3";
+  sha256 = "06im28x26jbzbdk9xz33kqvzblglk3b3b60qwal836hima69alsd";
   buildDepends = [
     blazeBuilder blazeBuilderConduit conduit conduitExtra httpTypes
     transformers wai warp zlibConduit

From 6de944958c11ea595445d5d8b3df46b276d4d1db Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:34 +0200
Subject: [PATCH 1739/2033] haskell-wai-test: update to version 2.0.1.3

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

diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix
index 6f976005466..b15aa1070ba 100644
--- a/pkgs/development/libraries/haskell/wai-test/default.nix
+++ b/pkgs/development/libraries/haskell/wai-test/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-test";
-  version = "2.0.1.2";
-  sha256 = "11mkzh5wlfhdrwzqhsbcl3qnbawmks4vxr1vv0s2ny50q5na41ln";
+  version = "2.0.1.3";
+  sha256 = "18j77l2n41941f95awj6fj0w712628v5lsc3bif00cqnaixjmz48";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra cookie deepseq httpTypes network text transformers wai

From 08b81cfa08e12dc76251e3468535c082516de440 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:36 +0200
Subject: [PATCH 1740/2033] haskell-wai-websockets: update to version 2.1.0.2

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

diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix
index 5558f2e32ce..5d909c7d773 100644
--- a/pkgs/development/libraries/haskell/wai-websockets/default.nix
+++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-websockets";
-  version = "2.1.0.1";
-  sha256 = "1ic1wgfp16j6lhypn1psmicafjavbhq5rvm32xqwkb65abhpg571";
+  version = "2.1.0.2";
+  sha256 = "16hff38x6fpmp4r1wkjd922s02v5na8zwy6mq5f5gsj7b70n2ww2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 0c0bbfb8833907e131b157ab9822d1c06545d9c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:38 +0200
Subject: [PATCH 1741/2033] haskell-wai: update to version 2.1.0.3

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

diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix
index 18c6e08c0b3..540df207241 100644
--- a/pkgs/development/libraries/haskell/wai/default.nix
+++ b/pkgs/development/libraries/haskell/wai/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai";
-  version = "2.1.0.2";
-  sha256 = "02hj07s3vlhbd2hds5pyksghildadjqhr8mmiyabwb7ap8iybidg";
+  version = "2.1.0.3";
+  sha256 = "0qprvk63fvb4rddg9h385xbd5sr5bcgkpx6fqlw01pjzmmrig1m3";
   buildDepends = [
     blazeBuilder conduit conduitExtra httpTypes network text
     transformers vault

From d2b7d998910b2adaee340b4e836bfc97e8dd12ca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:39 +0200
Subject: [PATCH 1742/2033] haskell-warp: update to version 2.1.5.2

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

diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix
index 6a41f6e5bdf..be5dd392d16 100644
--- a/pkgs/development/libraries/haskell/warp/default.nix
+++ b/pkgs/development/libraries/haskell/warp/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "warp";
-  version = "2.1.5.1";
-  sha256 = "1dx911y3nr2ixsn3zdp1rd97rydnvixr9chs3nmmkswzdg3qihvl";
+  version = "2.1.5.2";
+  sha256 = "0rv5fxw1d5dh6jzvs3bg2vjjr702xw59fx7mflygpqh8zivfh4ds";
   buildDepends = [
     blazeBuilder blazeBuilderConduit caseInsensitive conduit
     conduitExtra hashable httpDate httpTypes liftedBase network

From c9cd254f5ca94ab3a4e578a24407f02a8bffccaf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:41 +0200
Subject: [PATCH 1743/2033] haskell-websockets: update to version 0.8.2.3

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

diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix
index 774b17140e1..9e22d0cab18 100644
--- a/pkgs/development/libraries/haskell/websockets/default.nix
+++ b/pkgs/development/libraries/haskell/websockets/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "websockets";
-  version = "0.8.2.2";
-  sha256 = "16q4znki5f4133cgwcs8wqgx6ljl8x59khrsdsi646nclb3lyl0a";
+  version = "0.8.2.3";
+  sha256 = "0j4lm5hkipd4q6kizrjy1cjdw2b0588m4k6fh50ss5qnqw9rkjkd";
   buildDepends = [
     attoparsec base64Bytestring binary blazeBuilder caseInsensitive
     entropy ioStreams mtl network random SHA text

From 3fdef94fd142d6fcc2843d2d7ae054510b4d23ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:43 +0200
Subject: [PATCH 1744/2033] haskell-xml-conduit: update to version 1.2.0.2

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

diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index d31f1d0e70d..4f3e7fcebb7 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "1.2.0.1";
-  sha256 = "0ry3h1csblssv2x8b63hvl2gqc0wyzyqbvp6iyisrk77wkz72jw9";
+  version = "1.2.0.2";
+  sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq

From 0259eaf66c8739d1471ec9d573b41837865d8116 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:00:44 +0200
Subject: [PATCH 1745/2033] haskell-yaml: update to version 0.8.8.3

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

diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix
index edbd5afe20b..502a11e8125 100644
--- a/pkgs/development/libraries/haskell/yaml/default.nix
+++ b/pkgs/development/libraries/haskell/yaml/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yaml";
-  version = "0.8.8.2";
-  sha256 = "0dqn5pzk3bh9pprnlp9ggmjdwbb1j9yyd6ihq7vwky5g4yrqbl8m";
+  version = "0.8.8.3";
+  sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From 363b35ac2c43ebf0cc5583904ca9bdac21057518 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:01:17 +0200
Subject: [PATCH 1746/2033] haskell-tls: update to version 1.2.8.nix

---
 .../haskell/tls/{1.2.7.nix => 1.2.8.nix}      | 20 +++++++++----------
 pkgs/top-level/haskell-packages.nix           |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/development/libraries/haskell/tls/{1.2.7.nix => 1.2.8.nix} (52%)

diff --git a/pkgs/development/libraries/haskell/tls/1.2.7.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix
similarity index 52%
rename from pkgs/development/libraries/haskell/tls/1.2.7.nix
rename to pkgs/development/libraries/haskell/tls/1.2.8.nix
index fbd9b048f06..8bba66b6c92 100644
--- a/pkgs/development/libraries/haskell/tls/1.2.7.nix
+++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix
@@ -1,19 +1,19 @@
 { cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes
-, cipherRc4, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey
-, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network
-, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509
-, x509Store, x509Validation
+, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash
+, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom
+, dataDefaultClass, mtl, network, QuickCheck, testFramework
+, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation
 }:
 
 cabal.mkDerivation (self: {
   pname = "tls";
-  version = "1.2.7";
-  sha256 = "0f0zlyiw6bgqkhg0czlpqyz8jgb1zbgbpzpk73v5p7hsjffsblgs";
+  version = "1.2.8";
+  sha256 = "0fm36jn2yri3fn6wadl5v4k0cpnansqlid4fhavgnp6mazf0q5ha";
   buildDepends = [
-    asn1Encoding asn1Types byteable cereal cipherAes cipherRc4
-    cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes
-    cryptoRandom dataDefaultClass mtl network x509 x509Store
-    x509Validation
+    asn1Encoding asn1Types byteable cereal cipherAes cipherDes
+    cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey
+    cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509
+    x509Store x509Validation
   ];
   testDepends = [
     cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 0a745ead70d..deea8d8081b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2187,8 +2187,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   timeCompat = callPackage ../development/libraries/haskell/time-compat {};
 
   tls_1_1_5 = callPackage ../development/libraries/haskell/tls/1.1.5.nix {};
-  tls_1_2_7 = callPackage ../development/libraries/haskell/tls/1.2.7.nix {};
-  tls = self.tls_1_2_7;
+  tls_1_2_8 = callPackage ../development/libraries/haskell/tls/1.2.8.nix {};
+  tls = self.tls_1_2_8;
 
   tlsExtra = callPackage ../development/libraries/haskell/tls-extra {
     tls = self.tls_1_1_5;

From ba5473676f867e32e9be5c2225ab4e8c8ded2be2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 16:06:40 +0200
Subject: [PATCH 1747/2033] Update Haskell OpenGL and GLUT packages.

 1) GLURaw 1.4.0.0 --> 1.4.0.1
 2) GLUT 2.5.1.0 -> 2.5.1.1
 3) OpenGL 2.9.1.0 -> 2.9.2.0
 4) OpenGLRaw 1.5.0.0 added
---
 .../GLURaw/{1.4.0.0.nix => 1.4.0.1.nix}       |  4 ++--
 .../haskell/GLUT/{2.5.1.0.nix => 2.5.1.1.nix} |  4 ++--
 .../OpenGL/{2.9.1.0.nix => 2.9.2.0.nix}       |  4 ++--
 .../libraries/haskell/OpenGLRaw/1.5.0.0.nix   | 15 +++++++++++++
 pkgs/top-level/haskell-packages.nix           | 21 +++++++++----------
 5 files changed, 31 insertions(+), 17 deletions(-)
 rename pkgs/development/libraries/haskell/GLURaw/{1.4.0.0.nix => 1.4.0.1.nix} (83%)
 rename pkgs/development/libraries/haskell/GLUT/{2.5.1.0.nix => 2.5.1.1.nix} (85%)
 rename pkgs/development/libraries/haskell/OpenGL/{2.9.1.0.nix => 2.9.2.0.nix} (84%)
 create mode 100644 pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix

diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix
similarity index 83%
rename from pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix
rename to pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix
index a6f0e61d273..1da2b743687 100644
--- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.0.nix
+++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLURaw";
-  version = "1.4.0.0";
-  sha256 = "0q86rpd5cx0vrb9d3y1fljc3mg0p8wy6xdn37ngv2s0f4kslq63g";
+  version = "1.4.0.1";
+  sha256 = "1k0f1vbbrsfc7jb4qbif4w4q87lsis5gvq7jd2n8zzslxd5n8mcn";
   buildDepends = [ OpenGLRaw ];
   extraLibraries = [ freeglut mesa ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix
rename to pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix
index 1cfd9a37eb0..79112138b4a 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.5.1.0.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "GLUT";
-  version = "2.5.1.0";
-  sha256 = "0zxj5i8rw402gpns5ivb1g5fkk502jwzrkviqhwhrxn7yxrybi1s";
+  version = "2.5.1.1";
+  sha256 = "0n9dkdjmpnbcjg0ll0ny7mw21xwwix0gxy0hq6yagmgaakhpg0aa";
   buildDepends = [ OpenGL OpenGLRaw ];
   extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
similarity index 84%
rename from pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix
rename to pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
index 6f79b5c7a06..c012c65d522 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.9.1.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "OpenGL";
-  version = "2.9.1.0";
-  sha256 = "09xzjaa9qyh7bfsnq226v9zi6lhnalhmlqlca3808hgax8ijwhp3";
+  version = "2.9.2.0";
+  sha256 = "1sa5jmhj0az6sik6swv2vgzhv9gj34dbq2px23ag1a4yrk5gcn0p";
   buildDepends = [ GLURaw OpenGLRaw text ];
   extraLibraries = [ libX11 mesa ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
new file mode 100644
index 00000000000..f0e6c7ac7ad
--- /dev/null
+++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix
@@ -0,0 +1,15 @@
+{ cabal, mesa }:
+
+cabal.mkDerivation (self: {
+  pname = "OpenGLRaw";
+  version = "1.5.0.0";
+  sha256 = "04lsidv82fl7yb2fnqpx7q0vgiwxbswh8g7dv9q9s9i2jwiaaal5";
+  extraLibraries = [ mesa ];
+  meta = {
+    homepage = "http://www.haskell.org/haskellwiki/Opengl";
+    description = "A raw binding for the OpenGL graphics system";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index deea8d8081b..239d1c413b0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -852,8 +852,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   glpkHs = callPackage ../development/libraries/haskell/glpk-hs {};
 
   GLURaw_1_3_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.3.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_3_0_0; };
-  GLURaw_1_4_0_0 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.0.nix { OpenGLRaw = self.OpenGLRaw_1_4_0_0; };
-  GLURaw = self.GLURaw_1_4_0_0;
+  GLURaw_1_4_0_1 = callPackage ../development/libraries/haskell/GLURaw/1.4.0.1.nix {};
+  GLURaw = self.GLURaw_1_4_0_1;
 
   GLUT_2_1_1_2 = callPackage ../development/libraries/haskell/GLUT/2.1.1.2.nix {};
   GLUT_2_1_2_1 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {};
@@ -869,10 +869,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
     OpenGLRaw = self.OpenGLRaw_1_3_0_0;
     OpenGL = self.OpenGL_2_8_0_0.override { OpenGLRaw = self.OpenGLRaw_1_3_0_0; GLURaw = self.GLURaw_1_3_0_0; };
   };
-  GLUT_2_5_1_0 = callPackage ../development/libraries/haskell/GLUT/2.5.1.0.nix {
-    OpenGL = self.OpenGL_2_9_1_0;
+  GLUT_2_5_1_1 = callPackage ../development/libraries/haskell/GLUT/2.5.1.1.nix {
+    OpenGL = self.OpenGL_2_9_2_0;
   };
-  GLUT = self.GLUT_2_5_1_0;
+  GLUT = self.GLUT_2_5_1_1;
 
   gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
 
@@ -1534,9 +1534,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   oeis = callPackage ../development/libraries/haskell/oeis {};
 
-  OpenAL = callPackage ../development/libraries/haskell/OpenAL {
-    OpenGL = self.OpenGL_2_9_1_0;
-  };
+  OpenAL = callPackage ../development/libraries/haskell/OpenAL {};
 
   OpenGL_2_2_1_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.1.1.nix {};
   OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {};
@@ -1544,12 +1542,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {};
   OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {};
   OpenGL_2_8_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.8.0.0.nix {};
-  OpenGL_2_9_1_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.1.0.nix {};
-  OpenGL = self.OpenGL_2_9_1_0;
+  OpenGL_2_9_2_0 = callPackage ../development/libraries/haskell/OpenGL/2.9.2.0.nix {};
+  OpenGL = self.OpenGL_2_9_2_0;
 
   OpenGLRaw_1_3_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.3.0.0.nix {};
   OpenGLRaw_1_4_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.4.0.0.nix {};
-  OpenGLRaw = self.OpenGLRaw_1_4_0_0;
+  OpenGLRaw_1_5_0_0 = callPackage ../development/libraries/haskell/OpenGLRaw/1.5.0.0.nix {};
+  OpenGLRaw = self.OpenGLRaw_1_5_0_0;
 
   opensslStreams = callPackage ../development/libraries/haskell/openssl-streams {};
 

From d7bc0de8c851cfd2a228813060d2780ce3e63b2c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 23 May 2014 16:54:35 +0200
Subject: [PATCH 1748/2033] haskell-categories: add version 1.0.6

---
 .../libraries/haskell/categories/default.nix       | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/categories/default.nix

diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix
new file mode 100644
index 00000000000..54483f17701
--- /dev/null
+++ b/pkgs/development/libraries/haskell/categories/default.nix
@@ -0,0 +1,14 @@
+{ cabal, void }:
+
+cabal.mkDerivation (self: {
+  pname = "categories";
+  version = "1.0.6";
+  sha256 = "0i5mrxbhqj5g46lvwbw2m07prjvfwja6q8648qm6bq54z6zrl5cy";
+  buildDepends = [ void ];
+  meta = {
+    homepage = "http://github.com/ekmett/categories";
+    description = "Categories";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 239d1c413b0..4ecb6da5516 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -326,6 +326,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   carray = callPackage ../development/libraries/haskell/carray {};
 
+  categories = callPackage ../development/libraries/haskell/categories {};
+
   cassava = callPackage ../development/libraries/haskell/cassava {};
 
   caseInsensitive_1_0_0_1 = callPackage ../development/libraries/haskell/case-insensitive/1.0.0.1.nix {};

From 34c6a26f5dda453b5a332a0b13564dd4c13069c5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 23 May 2014 16:54:46 +0200
Subject: [PATCH 1749/2033] haskell-compdata: add version 0.7.0.1

---
 .../libraries/haskell/compdata/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/compdata/default.nix

diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix
new file mode 100644
index 00000000000..564f1179d87
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compdata/default.nix
@@ -0,0 +1,23 @@
+{ cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "compdata";
+  version = "0.7.0.1";
+  sha256 = "0d511yjfydv43sr74ggz6pnqm0wqz2m9fgrxpl6avvj8p10va7h7";
+  buildDepends = [
+    deepseq derive mtl QuickCheck thExpandSyns transformers
+  ];
+  testDepends = [
+    deepseq derive HUnit mtl QuickCheck testFramework
+    testFrameworkHunit testFrameworkQuickcheck2 thExpandSyns
+    transformers
+  ];
+  meta = {
+    description = "Compositional Data Types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4ecb6da5516..497e1dde6a6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -416,6 +416,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  compdata = callPackage ../development/libraries/haskell/compdata {};
+
   composition = callPackage ../development/libraries/haskell/composition {};
 
   concatenative = callPackage ../development/libraries/haskell/concatenative {};

From 04f3c8e718f12b04703e9b11db81381bc4b78eab Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 23 May 2014 16:54:57 +0200
Subject: [PATCH 1750/2033] haskell-recursion-schemes: add version 4.0

---
 .../haskell/recursion-schemes/default.nix          | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/recursion-schemes/default.nix

diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix
new file mode 100644
index 00000000000..78e7da44061
--- /dev/null
+++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix
@@ -0,0 +1,14 @@
+{ cabal, comonad, free, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "recursion-schemes";
+  version = "4.0";
+  sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06";
+  buildDepends = [ comonad free transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/recursion-schemes/";
+    description = "Generalized bananas, lenses and barbed wire";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 497e1dde6a6..abb58bd7bcc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1781,6 +1781,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   recaptcha = callPackage ../development/libraries/haskell/recaptcha {};
 
+  recursionSchemes = callPackage ../development/libraries/haskell/recursion-schemes {};
+
   reducers = callPackage ../development/libraries/haskell/reducers {};
 
   reflection = callPackage ../development/libraries/haskell/reflection {};

From 47a8cd70086167cf6ccbe21fd29d7e2f7ccfbca8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 23 May 2014 16:55:12 +0200
Subject: [PATCH 1751/2033] haskell-codex: add version 0.0.1.6

---
 .../tools/haskell/codex/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/codex/default.nix

diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
new file mode 100644
index 00000000000..b8c9e297ce8
--- /dev/null
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -0,0 +1,21 @@
+{ cabal, Cabal_1_20_0_0, downloadCurl, either, filepath, hackageDb, MissingH
+, monadLoops, tar, text, transformers, yaml, zlib
+}:
+
+cabal.mkDerivation (self: {
+  pname = "codex";
+  version = "0.0.1.6";
+  sha256 = "0yr3qygxxj4k8ld7jh1h87jjawvixbz5wjssdxd5ix7askmm1dx2";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    Cabal_1_20_0_0 downloadCurl either filepath hackageDb MissingH 
+    monadLoops tar text transformers yaml zlib
+  ];
+  meta = {
+    homepage = "http://github.com/aloiscochard/codex";
+    description = "A ctags file generator for cabal project dependencies";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index abb58bd7bcc..f6fb03478e4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2671,6 +2671,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; };
   cabalInstall = self.cabalInstall_1_20_0_1;
 
+  codex = callPackage ../development/tools/haskell/codex {};
+
   gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};

From a1df473db7fc6e40446cb0e7b0d32603f0c1f13f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 23 May 2014 16:55:23 +0200
Subject: [PATCH 1752/2033] haskell-hobbes: add version 0.2.2

---
 .../development/tools/haskell/hobbes/default.nix | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/tools/haskell/hobbes/default.nix

diff --git a/pkgs/development/tools/haskell/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix
new file mode 100644
index 00000000000..0c9b2d45ae1
--- /dev/null
+++ b/pkgs/development/tools/haskell/hobbes/default.nix
@@ -0,0 +1,16 @@
+{ cabal, filemanip, filepath, fsnotify, systemFilepath, text }:
+
+cabal.mkDerivation (self: {
+  pname = "hobbes";
+  version = "0.2.2";
+  sha256 = "1pri63d59q918jv1hdp2ib06m6lzw9a2b6bjyn86b2qrrx2512xd";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [ filemanip filepath fsnotify systemFilepath text ];
+  meta = {
+    homepage = "http://github.com/jhickner/hobbes";
+    description = "A small file watcher for OSX";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f6fb03478e4..c78b34a05a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2677,6 +2677,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   githubBackup = callPackage ../applications/version-management/git-and-tools/github-backup {};
 
+  hobbes = callPackage ../development/tools/haskell/hobbes {};
+
   jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
   keter = callPackage ../development/tools/haskell/keter {};

From 4d7d3d6aabd9b47842f885548f18acc62c8fe62b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:02:31 +0200
Subject: [PATCH 1753/2033] haskell-heist: jailbreak to fix build with current
 versions of 'directory-tree'

---
 pkgs/development/libraries/haskell/heist/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix
index 77ebf3fd9af..faf5212a794 100644
--- a/pkgs/development/libraries/haskell/heist/default.nix
+++ b/pkgs/development/libraries/haskell/heist/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     filepath hashable MonadCatchIOTransformers mtl random text time
     transformers unorderedContainers vector xmlhtml
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://snapframework.com/";
     description = "An Haskell template system supporting both HTML5 and XML";

From a71a8e85deaf4d6eb10d8ecd83ce345c2da52b80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:37:35 +0200
Subject: [PATCH 1754/2033] arbtt: jailbreak to fix build with tasty > 0.7

---
 pkgs/applications/misc/arbtt/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index b8c56baf956..9cd192fc14a 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -18,6 +18,7 @@ cabal.mkDerivation (self: {
     binary deepseq HUnit parsec pcreLight processExtras tasty
     tastyGolden tastyHunit time transformers utf8String
   ];
+  jailbreak = true;
   extraLibraries = [ libXScrnSaver ];
   meta = {
     homepage = "http://arbtt.nomeata.de/";

From 6421a74f67f5c0f0883595146aad83782591f009 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:42:51 +0200
Subject: [PATCH 1755/2033] haskell-packages.nix: rename GLFWb to GLFWB for
 consistency

https://github.com/NixOS/cabal2nix/issues/65
---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c78b34a05a0..1f993dd4b67 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -834,7 +834,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   GLFW = callPackage ../development/libraries/haskell/GLFW {};
 
-  GLFWb = callPackage ../development/libraries/haskell/GLFW-b {};
+  GLFWB = callPackage ../development/libraries/haskell/GLFW-b {};
 
   glib = callPackage ../development/libraries/haskell/glib {
     glib = pkgs.glib;

From 3d59f42ce50038e5299d5a589734afc210a6c2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Fri, 23 May 2014 23:51:05 +0800
Subject: [PATCH 1756/2033] renpy: update to 6.17.6

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

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index d3630888f64..ccaa45c6c33 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "renpy-6.17.4";
+  name = "renpy-6.17.6";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.4/renpy-6.17.4-source.tar.bz2";
-    sha256 = "1n0ki944vawl1i3z9g5h65spdjvb8p0gj6rckv36fb2yq2adxclp";
+    url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2";
+    sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic";
   };
 
   buildInputs = [

From 5b85e4825c59d3623f20fc310d92fe8babef9ccf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:58:05 +0200
Subject: [PATCH 1757/2033] arbtt: re-generate with cabal2nix

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

diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix
index 9cd192fc14a..b5ecf8fa1d1 100644
--- a/pkgs/applications/misc/arbtt/default.nix
+++ b/pkgs/applications/misc/arbtt/default.nix
@@ -18,8 +18,8 @@ cabal.mkDerivation (self: {
     binary deepseq HUnit parsec pcreLight processExtras tasty
     tastyGolden tastyHunit time transformers utf8String
   ];
-  jailbreak = true;
   extraLibraries = [ libXScrnSaver ];
+  jailbreak = true;
   meta = {
     homepage = "http://arbtt.nomeata.de/";
     description = "Automatic Rule-Based Time Tracker";

From 3f0a45e88fb3b7e1cdf452f23b4bdb3658501d59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:58:48 +0200
Subject: [PATCH 1758/2033] haskell-codex: update to version 0.0.2

---
 pkgs/development/tools/haskell/codex/default.nix | 12 ++++++------
 pkgs/top-level/haskell-defaults.nix              |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix
index b8c9e297ce8..eeba452f5c8 100644
--- a/pkgs/development/tools/haskell/codex/default.nix
+++ b/pkgs/development/tools/haskell/codex/default.nix
@@ -1,21 +1,21 @@
-{ cabal, Cabal_1_20_0_0, downloadCurl, either, filepath, hackageDb, MissingH
+{ cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH
 , monadLoops, tar, text, transformers, yaml, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "codex";
-  version = "0.0.1.6";
-  sha256 = "0yr3qygxxj4k8ld7jh1h87jjawvixbz5wjssdxd5ix7askmm1dx2";
+  version = "0.0.2";
+  sha256 = "156830krsn1qczrx27bn3ihqlis698sjf563sa2njvc7v85plx55";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    Cabal_1_20_0_0 downloadCurl either filepath hackageDb MissingH 
-    monadLoops tar text transformers yaml zlib
+    Cabal downloadCurl either filepath hackageDb MissingH monadLoops
+    tar text transformers yaml zlib
   ];
   meta = {
     homepage = "http://github.com/aloiscochard/codex";
     description = "A ctags file generator for cabal project dependencies";
-    license = "unknown";
+    license = self.stdenv.lib.licenses.asl20;
     platforms = self.ghc.meta.platforms;
   };
 })
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a39bf2d4be5..9943a1d9f9d 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -21,6 +21,7 @@
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
     cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; };
+    codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; };
   };
 
   ghc763Prefs = self : super : ghc782Prefs self super // {

From 466678afdab84162c5be6c5df30567028af20f31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 17:59:24 +0200
Subject: [PATCH 1759/2033] haskell-compdata: update to version 0.8.1.0

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

diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix
index 564f1179d87..13e6fd8a2b2 100644
--- a/pkgs/development/libraries/haskell/compdata/default.nix
+++ b/pkgs/development/libraries/haskell/compdata/default.nix
@@ -1,14 +1,14 @@
 { cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework
 , testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns
-, transformers
+, transformers, treeView
 }:
 
 cabal.mkDerivation (self: {
   pname = "compdata";
-  version = "0.7.0.1";
-  sha256 = "0d511yjfydv43sr74ggz6pnqm0wqz2m9fgrxpl6avvj8p10va7h7";
+  version = "0.8.1.0";
+  sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc";
   buildDepends = [
-    deepseq derive mtl QuickCheck thExpandSyns transformers
+    deepseq derive mtl QuickCheck thExpandSyns transformers treeView
   ];
   testDepends = [
     deepseq derive HUnit mtl QuickCheck testFramework

From 10f96a30ffa44d7d27bcef63202100767ed5d1ec Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 23 May 2014 18:00:36 +0200
Subject: [PATCH 1760/2033] Update dwb. This fixes some bugs in dwb.

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

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 010dbd168a8..b426019efca 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,12 +2,12 @@
   m4, glib_networking, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
-  name = "dwb-2014-04-20";
+  name = "dwb-2014-05-23";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "117a6a8cdb84b30b0c084dee531b650664d09ba2";
-    sha256 = "1k1nax3ij64b2hbn9paqj128yyzy41b61xd2m1ayq9y17k9als0b";
+    rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa";
+    sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr";
   };
 
   buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];

From 555d1fbfdf06a2ae8970849457f1a5661afda89d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 05:51:16 +0200
Subject: [PATCH 1761/2033] colors: 0.1.1

---
 .../libraries/haskell/colors/default.nix           | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/colors/default.nix

diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix
new file mode 100644
index 00000000000..245ea3ef30e
--- /dev/null
+++ b/pkgs/development/libraries/haskell/colors/default.nix
@@ -0,0 +1,14 @@
+{ cabal, profunctors }:
+
+cabal.mkDerivation (self: {
+  pname = "colors";
+  version = "0.1.1";
+  sha256 = "1i1n05prbp0l3xgx0w2lxzc5r81pcmbzclsamdr7fmjvhvh8blqm";
+  buildDepends = [ profunctors ];
+  meta = {
+    homepage = "https://github.com/fumieval/colors";
+    description = "A type for colors";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2a4dc66b82d..e140d6075ea 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -406,6 +406,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   colorizeHaskell = callPackage ../development/libraries/haskell/colorize-haskell {};
 
+  colors = callPackage ../development/libraries/haskell/colors {};
+
   colour = callPackage ../development/libraries/haskell/colour {};
 
   comonad = callPackage ../development/libraries/haskell/comonad {};

From 9e8f9b55284a955045d4f179ca6298ed59ecb70b Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 05:51:33 +0200
Subject: [PATCH 1762/2033] boundingboxes: 0.1.1, 0.2

---
 .../libraries/haskell/boundingboxes/0.1.1.nix | 24 +++++++++++++++++++
 .../libraries/haskell/boundingboxes/0.2.nix   | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  4 ++++
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
 create mode 100644 pkgs/development/libraries/haskell/boundingboxes/0.2.nix

diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
new file mode 100644
index 00000000000..babec91cd90
--- /dev/null
+++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
@@ -0,0 +1,24 @@
+{ cabal, lens, linear, QuickCheck, random, testFramework
+, testFrameworkQuickcheck2, testFrameworkTh
+}:
+
+cabal.mkDerivation (self: {
+  pname = "boundingboxes";
+  version = "0.1.1";
+  sha256 = "1nl0lqgfwd98jzhhw7i4vvd88lpnn8770x2pcbyfzqcyr27079f0";
+  buildDepends = [ lens linear ];
+  testDepends = [
+    lens linear QuickCheck random testFramework
+    testFrameworkQuickcheck2 testFrameworkTh
+  ];
+
+  # https://github.com/fumieval/boundingboxes/issues/1
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/fumieval/boundingboxes";
+    description = "The type for 2D bounding box";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
new file mode 100644
index 00000000000..1e534c0edf8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
@@ -0,0 +1,24 @@
+{ cabal, lens, linear, QuickCheck, random, testFramework
+, testFrameworkQuickcheck2, testFrameworkTh
+}:
+
+cabal.mkDerivation (self: {
+  pname = "boundingboxes";
+  version = "0.2";
+  sha256 = "0xvh1h4papfrf6dg553rx6q8fqi06ff1ivgn4rdx3haqg1zf40hp";
+  buildDepends = [ lens ];
+  testDepends = [
+    lens linear QuickCheck random testFramework
+    testFrameworkQuickcheck2 testFrameworkTh
+  ];
+
+  # https://github.com/fumieval/boundingboxes/issues/1
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/fumieval/boundingboxes";
+    description = "The type for 2D bounding box";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e140d6075ea..4c420695f9e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -275,6 +275,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {};
+  boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {};
+  boundingboxes = self.boundingboxes_0_2;
+
   brainfuck = callPackage ../development/libraries/haskell/brainfuck {};
 
   bson = callPackage ../development/libraries/haskell/bson {};

From 7bd546b816f7de19fcded12d700a49d3165d8ab2 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 05:51:48 +0200
Subject: [PATCH 1763/2033] control-bool: 0.2.1

---
 .../libraries/haskell/control-bool/default.nix      | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/control-bool/default.nix

diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix
new file mode 100644
index 00000000000..4fe9a975f41
--- /dev/null
+++ b/pkgs/development/libraries/haskell/control-bool/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "control-bool";
+  version = "0.2.1";
+  sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
+  meta = {
+    homepage = "https://github.com/fumieval/control-bool";
+    description = "Useful combinators for boolean expressions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4c420695f9e..4432d2f5317 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -446,6 +446,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   constraints = callPackage ../development/libraries/haskell/constraints {};
 
+  controlBool = callPackage ../development/libraries/haskell/control-bool {};
+
   controlMonadFree = callPackage ../development/libraries/haskell/control-monad-free {};
 
   controlMonadLoop = callPackage ../development/libraries/haskell/control-monad-loop {};

From ab59d64a59781958157d741cf43c0cebb376db7f Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 06:16:52 +0200
Subject: [PATCH 1764/2033] freetype2: 0.1.1

---
 .../libraries/haskell/freetype2/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/freetype2/default.nix

diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix
new file mode 100644
index 00000000000..145ae4a2d79
--- /dev/null
+++ b/pkgs/development/libraries/haskell/freetype2/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "freetype2";
+  version = "0.1.1";
+  sha256 = "16ayyqvbl278z68ssfbv2nvbyxs7585zmnk2w53vlxvj0k9zj66s";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    description = "Haskell binding for FreeType 2 library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4432d2f5317..4d5bdd3d3d8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -784,6 +784,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   gamma = callPackage ../development/libraries/haskell/gamma {};
 
+  freetype2 = callPackage ../development/libraries/haskell/freetype2 {};
+
   geniplate = callPackage ../development/libraries/haskell/geniplate {};
 
   gd = callPackage ../development/libraries/haskell/gd {

From f4f0dab825354a3faec1b245d1b08e6b3d8cf53d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 06:29:50 +0200
Subject: [PATCH 1765/2033] JuicyPixels-util: 0.1

---
 .../libraries/haskell/JuicyPixels-util/default.nix | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/JuicyPixels-util/default.nix

diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
new file mode 100644
index 00000000000..844d512c62f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix
@@ -0,0 +1,14 @@
+{ cabal, JuicyPixels, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "JuicyPixels-util";
+  version = "0.1";
+  sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc";
+  buildDepends = [ JuicyPixels vector ];
+  meta = {
+    homepage = "https://github.com/fumieval/JuicyPixels-util";
+    description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4d5bdd3d3d8..9f58cbf08ee 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1245,6 +1245,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
+  JuicyPixelsUtil = callPackage ../development/libraries/haskell/JuicyPixels-util {};
+
   kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {};
 
   kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};

From 099f7d5620eeea80bdfced5429761c80e3f72d6a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 06:32:50 +0200
Subject: [PATCH 1766/2033] minioperational: 0.4.3

---
 .../libraries/haskell/minioperational/default.nix  | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/minioperational/default.nix

diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix
new file mode 100644
index 00000000000..99cae442c3b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/minioperational/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "minioperational";
+  version = "0.4.3";
+  sha256 = "09z8536q0cc09iack6s8fghgrc5f3syq3sxf2cnai3rcfaqix86p";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "https://github.com/fumieval/minioperational";
+    description = "fast and simple operational monad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9f58cbf08ee..e772160255b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1377,6 +1377,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   minimorph = callPackage ../development/libraries/haskell/minimorph {};
 
+  minioperational = callPackage ../development/libraries/haskell/minioperational {};
+
   miniutter = callPackage ../development/libraries/haskell/miniutter {
     binary = self.binary_0_7_2_1;
   };

From 7943355954f9a9f874356f7f51f3114989894337 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 06:36:03 +0200
Subject: [PATCH 1767/2033] free-game: 1.0.5, 1.1

---
 .../libraries/haskell/free-game/1.0.5.nix     | 22 +++++++++++++++++++
 .../libraries/haskell/free-game/1.1.nix       | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           | 10 +++++++--
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/free-game/1.0.5.nix
 create mode 100644 pkgs/development/libraries/haskell/free-game/1.1.nix

diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
new file mode 100644
index 00000000000..2ebec4c7153
--- /dev/null
+++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
@@ -0,0 +1,22 @@
+{ cabal, boundingboxes, colors, controlBool, filepath, free
+, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens
+, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
+, vector, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "free-game";
+  version = "1.0.5";
+  sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf";
+  buildDepends = [
+    boundingboxes colors controlBool filepath free freetype2 GLFWb
+    hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
+    OpenGLRaw random reflection transformers vector void
+  ];
+  meta = {
+    homepage = "https://github.com/fumieval/free-game";
+    description = "Create games for free";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix
new file mode 100644
index 00000000000..132e06bd96b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/free-game/1.1.nix
@@ -0,0 +1,22 @@
+{ cabal, boundingboxes, colors, controlBool, filepath, free
+, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens
+, linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
+, vector, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "free-game";
+  version = "1.1";
+  sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz";
+  buildDepends = [
+    boundingboxes colors controlBool filepath free freetype2 GLFWb
+    hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
+    OpenGLRaw random reflection transformers vector void
+  ];
+  meta = {
+    homepage = "https://github.com/fumieval/free-game";
+    description = "Create games for free";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e772160255b..2f3d5e49738 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -780,12 +780,18 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   free = callPackage ../development/libraries/haskell/free {};
 
+  freeGame_1_0_5 = callPackage ../development/libraries/haskell/free-game/1.0.5.nix {
+    boundingboxes = self.boundingboxes_0_1_1;
+  };
+  freeGame_1_1 = callPackage ../development/libraries/haskell/free-game/1.1.nix {};
+  freeGame = self.freeGame_1_1;
+
   fsnotify = callPackage ../development/libraries/haskell/fsnotify {};
 
-  gamma = callPackage ../development/libraries/haskell/gamma {};
-
   freetype2 = callPackage ../development/libraries/haskell/freetype2 {};
 
+  gamma = callPackage ../development/libraries/haskell/gamma {};
+
   geniplate = callPackage ../development/libraries/haskell/geniplate {};
 
   gd = callPackage ../development/libraries/haskell/gd {

From 807482ca18585e50fb3fb779f42f32d896505aab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 18:13:30 +0200
Subject: [PATCH 1768/2033] xmobar: enable all extensions by default

https://github.com/NixOS/nixpkgs/pull/2728
---
 pkgs/applications/misc/xmobar/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 227fa438a14..acd0568772a 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,6 +1,7 @@
-{ cabal, alsaCore, alsaMixer, filepath, HTTP, libmpd, libXrandr
-, mtl, parsec, regexCompat, stm, time, utf8String, wirelesstools
-, X11, X11Xft
+{ cabal, alsaCore, alsaMixer, dbus, filepath, hinotify, HTTP
+, libmpd, libXrandr, mtl, parsec, regexCompat, stm, time
+, timezoneOlson, timezoneSeries, utf8String, wirelesstools, X11
+, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -10,11 +11,12 @@ cabal.mkDerivation (self: {
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    alsaCore alsaMixer filepath HTTP libmpd mtl parsec regexCompat stm
-    time utf8String X11 X11Xft
+    alsaCore alsaMixer dbus filepath hinotify HTTP libmpd mtl parsec
+    regexCompat stm time timezoneOlson timezoneSeries utf8String X11
+    X11Xft
   ];
   extraLibraries = [ libXrandr wirelesstools ];
-  configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd";
+  configureFlags = "-fall_extensions";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";
     description = "A Minimalistic Text Based Status Bar";

From 020b1bf00aeefbf50ca66f9841a83d08bc289305 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 18:17:53 +0200
Subject: [PATCH 1769/2033] Re-generate expressions with cabal2nix.

---
 pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix | 3 ---
 pkgs/development/libraries/haskell/boundingboxes/0.2.nix   | 3 ---
 pkgs/development/libraries/haskell/free-game/1.0.5.nix     | 4 ++--
 pkgs/development/libraries/haskell/free-game/1.1.nix       | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
index babec91cd90..3dfd986ee62 100644
--- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
+++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix
@@ -11,10 +11,7 @@ cabal.mkDerivation (self: {
     lens linear QuickCheck random testFramework
     testFrameworkQuickcheck2 testFrameworkTh
   ];
-
-  # https://github.com/fumieval/boundingboxes/issues/1
   doCheck = false;
-
   meta = {
     homepage = "https://github.com/fumieval/boundingboxes";
     description = "The type for 2D bounding box";
diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
index 1e534c0edf8..44c8b3fee6f 100644
--- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
+++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix
@@ -11,10 +11,7 @@ cabal.mkDerivation (self: {
     lens linear QuickCheck random testFramework
     testFrameworkQuickcheck2 testFrameworkTh
   ];
-
-  # https://github.com/fumieval/boundingboxes/issues/1
   doCheck = false;
-
   meta = {
     homepage = "https://github.com/fumieval/boundingboxes";
     description = "The type for 2D bounding box";
diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
index 2ebec4c7153..f6f057852c2 100644
--- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix
+++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
@@ -1,5 +1,5 @@
 { cabal, boundingboxes, colors, controlBool, filepath, free
-, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens
+, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
 , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
 , vector, void
 }:
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   version = "1.0.5";
   sha256 = "048hmb4zbn67ycdwy7alhfakdyv405ck79bzrxv2ra6w1v5b3yvf";
   buildDepends = [
-    boundingboxes colors controlBool filepath free freetype2 GLFWb
+    boundingboxes colors controlBool filepath free freetype2 GLFWB
     hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
     OpenGLRaw random reflection transformers vector void
   ];
diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix
index 132e06bd96b..4d9f57799db 100644
--- a/pkgs/development/libraries/haskell/free-game/1.1.nix
+++ b/pkgs/development/libraries/haskell/free-game/1.1.nix
@@ -1,5 +1,5 @@
 { cabal, boundingboxes, colors, controlBool, filepath, free
-, freetype2, GLFWb, hashable, JuicyPixels, JuicyPixelsUtil, lens
+, freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens
 , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers
 , vector, void
 }:
@@ -9,7 +9,7 @@ cabal.mkDerivation (self: {
   version = "1.1";
   sha256 = "0id3vn2j44gd8krl5icacwxgx00h6r89yncjg10nyyb90rymvxzz";
   buildDepends = [
-    boundingboxes colors controlBool filepath free freetype2 GLFWb
+    boundingboxes colors controlBool filepath free freetype2 GLFWB
     hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
     OpenGLRaw random reflection transformers vector void
   ];

From de014b4b86affea363b3b1759870ff1436ca51b6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 18:56:10 +0200
Subject: [PATCH 1770/2033] haskell-split: add version 0.1.4.3 for the benefit
 of GHC 6.x

---
 .../development/libraries/haskell/split/0.1.4.3.nix | 13 +++++++++++++
 pkgs/top-level/haskell-defaults.nix                 |  1 +
 pkgs/top-level/haskell-packages.nix                 |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/split/0.1.4.3.nix

diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix
new file mode 100644
index 00000000000..ad0df5c2cb0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "split";
+  version = "0.1.4.3";
+  sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
+  meta = {
+    homepage = "http://code.haskell.org/~byorgey/code/split";
+    description = "Combinator library for splitting lists";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 9943a1d9f9d..664ef8074de 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -75,6 +75,7 @@
     haddock = self.haddock_2_7_2;
     parallel = self.parallel_3_2_0_3;
     primitive = self.primitive_0_5_0_1;
+    split = self.split_0_1_4_3;
     stm = self.stm_2_4_2;
     syb = null;                         # core package in ghc < 7
   };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2f3d5e49738..4c2ecda87ba 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2039,6 +2039,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   sourcemap = callPackage ../development/libraries/haskell/sourcemap {};
 
+  split_0_1_4_3 = callPackage ../development/libraries/haskell/split/0.1.4.3.nix {};
   split_0_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {};
   split_0_2_2 = callPackage ../development/libraries/haskell/split/0.2.2.nix {};
   split = self.split_0_2_2;

From 70d61f85175457898f37987ee7136e51e56e58d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 18:57:03 +0200
Subject: [PATCH 1771/2033] haskell-defaults.nix: don't override 'Cabal' in GHC
 6.10.4; it's a core library

---
 pkgs/top-level/haskell-defaults.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 664ef8074de..12413783b89 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -81,24 +81,23 @@
   };
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
-    alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    Cabal = self.Cabal_1_16_0_3;
+    alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;
-    happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     hashable = self.hashable_1_1_2_5;
-    HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     OpenGLRaw = self.OpenGLRaw_1_3_0_0;
     OpenGL = self.OpenGL_2_6_0_1;
-    QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
-    zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal; }; };
+    QuickCheck = super.QuickCheck.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    stm = self.stm_2_4_2.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    tar = super.tar.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    text = self.text_0_11_2_3.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    time = self.time_1_1_2_4.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    zlib = super.zlib.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
  };
 
   # Abstraction for Haskell packages collections

From 78618e12d39d1088f0eb6ae647e731d3cd23ab33 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 18:59:09 +0200
Subject: [PATCH 1772/2033] haskell-async: fix build with GHC 6.12.x

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 12413783b89..f079e4ac403 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -69,6 +69,7 @@
 
   ghc6123Prefs = self : super : ghc704Prefs self super // {
     alex = self.alex_3_1_3;
+    async = self.async_2_0_1_4;
     cabalInstall = self.cabalInstall_1_16_0_2;
     cgi = self.cgi_3001_1_7_5;
     deepseq = self.deepseq_1_2_0_1;
@@ -82,6 +83,7 @@
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
     alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    async = null;                       # none of our versions compile
     binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;

From c18775837cf7122e2448539b738beea62c96af1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:20:16 +0200
Subject: [PATCH 1773/2033] nixos/modules/services/audio/alsa.nix: fix
 evaluation

https://github.com/NixOS/nixpkgs/issues/2732
---
 nixos/modules/services/audio/alsa.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index d49c2676f7d..653c0ed5d70 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -7,10 +7,6 @@ let
 
   inherit (pkgs) alsaUtils;
 
-  soundState = "/var/lib/alsa/asound.state";
-
-  configPath = "asound.conf";
-
 in
 
 {
@@ -39,7 +35,7 @@ in
 
       extraConfig = mkOption {
         type = types.lines;
-        default = '''';
+        default = "";
         example = ''
           defaults.pcm.!card 3
         '';
@@ -59,10 +55,12 @@ in
 
     environment.systemPackages = [ alsaUtils ];
 
-    environment.etc = [ { source = config.sound.extraConfig;
-                          target = configPath;
-                        }
-                      ];
+    environment.etc = mkIf (config.sound.extraConfig != "")
+      [
+        { source = pkgs.writeText "asound.conf" config.sound.extraConfig;
+          target = "asound.conf";
+        }
+      ];
 
     # ALSA provides a udev rule for restoring volume settings.
     services.udev.packages = [ alsaUtils ];

From 8806abe97e768d37906b93af5cf9d4a32ca8f707 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 23 May 2014 20:06:02 +0200
Subject: [PATCH 1774/2033] Update org-mode to latest stable version

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index ad2bd2f0ba6..9af7c24e800 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, texinfo, which, texLive }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.2.1";
+  name = "org-8.2.6";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "625e2b6786158bcf6c43194075f7638ab8048c68a60025289a051c407e467823";
+    sha256 = "0f196r0n9m2np123sjabsqdw68h9qp6qr7l5v257am8qs7rj0jm1";
   };
 
   buildInputs = [ emacs ];

From db0b1b76d3aa2394504b64c61d79b630cc1b8811 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:04:06 +0200
Subject: [PATCH 1775/2033] haskell-scientific: add versions 0.1.0.1 and
 0.3.2.1

---
 .../libraries/haskell/scientific/0.1.0.1.nix  | 17 ++++++++++++++
 .../scientific/{default.nix => 0.2.0.2.nix}   |  0
 .../libraries/haskell/scientific/0.3.2.1.nix  | 22 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  5 ++++-
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/scientific/0.1.0.1.nix
 rename pkgs/development/libraries/haskell/scientific/{default.nix => 0.2.0.2.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/scientific/0.3.2.1.nix

diff --git a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix
new file mode 100644
index 00000000000..178476ad3cf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix
@@ -0,0 +1,17 @@
+{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck
+, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scientific";
+  version = "0.1.0.1";
+  sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140";
+  buildDepends = [ deepseq hashable text ];
+  testDepends = [ smallcheck tasty tastySmallcheck text ];
+  meta = {
+    homepage = "https://github.com/basvandijk/scientific";
+    description = "Arbitrary-precision floating-point numbers represented using scientific notation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/scientific/default.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/scientific/default.nix
rename to pkgs/development/libraries/haskell/scientific/0.2.0.2.nix
diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix
new file mode 100644
index 00000000000..467f2f1d160
--- /dev/null
+++ b/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix
@@ -0,0 +1,22 @@
+{ cabal, deepseq, hashable, QuickCheck, smallcheck, tasty
+, tastyAntXml, tastyQuickcheck, tastySmallcheck, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "scientific";
+  version = "0.3.2.1";
+  sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s";
+  buildDepends = [ deepseq hashable text ];
+  testDepends = [
+    QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck
+    tastySmallcheck text
+  ];
+  jailbreak = true;
+  meta = {
+    homepage = "https://github.com/basvandijk/scientific";
+    description = "Numbers represented using scientific notation";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.ocharles ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4c2ecda87ba..ed03835de1a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1879,7 +1879,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   sbv = callPackage ../development/libraries/haskell/sbv {};
 
-  scientific = callPackage ../development/libraries/haskell/scientific {};
+  scientific_0_1_0_1 = callPackage ../development/libraries/haskell/scientific/0.1.0.1.nix {};
+  scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
+  scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {};
+  scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 

From 45799eeabaadf81f4bd5d7e7b70a38bd22a5c301 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:26:11 +0200
Subject: [PATCH 1776/2033] haskell-scientific: there's no point in using
 0.1.0.1, because it doesn't build with GHC 6.12.x either :-(

---
 .../libraries/haskell/scientific/0.1.0.1.nix    | 17 -----------------
 pkgs/top-level/haskell-defaults.nix             |  1 +
 pkgs/top-level/haskell-packages.nix             |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/scientific/0.1.0.1.nix

diff --git a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix
deleted file mode 100644
index 178476ad3cf..00000000000
--- a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck
-, text
-}:
-
-cabal.mkDerivation (self: {
-  pname = "scientific";
-  version = "0.1.0.1";
-  sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140";
-  buildDepends = [ deepseq hashable text ];
-  testDepends = [ smallcheck tasty tastySmallcheck text ];
-  meta = {
-    homepage = "https://github.com/basvandijk/scientific";
-    description = "Arbitrary-precision floating-point numbers represented using scientific notation";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index f079e4ac403..e85d7a57327 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -76,6 +76,7 @@
     haddock = self.haddock_2_7_2;
     parallel = self.parallel_3_2_0_3;
     primitive = self.primitive_0_5_0_1;
+    scientific = null;                  # none of our versions compile
     split = self.split_0_1_4_3;
     stm = self.stm_2_4_2;
     syb = null;                         # core package in ghc < 7
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ed03835de1a..9819a4cb5ed 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1879,7 +1879,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   sbv = callPackage ../development/libraries/haskell/sbv {};
 
-  scientific_0_1_0_1 = callPackage ../development/libraries/haskell/scientific/0.1.0.1.nix {};
   scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
   scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {};
   scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff

From d364ba0fba7bbbe108f97d3d0721df6f9025a82e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:27:47 +0200
Subject: [PATCH 1777/2033] haskell-wreq: remove unnecessary overrides

---
 pkgs/top-level/haskell-packages.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9819a4cb5ed..36b22b935ce 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2405,13 +2405,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   word8 = callPackage ../development/libraries/haskell/word8 {};
 
-  wreq = callPackage ../development/libraries/haskell/wreq {
-    aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; };
-    attoparsec = self.attoparsec_0_11_3_1;
-    lens = self.lens.override {
-      aeson = self.aeson.override { attoparsec = self.attoparsec_0_11_3_1; };
-    };
-  };
+  wreq = callPackage ../development/libraries/haskell/wreq {};
 
   wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
 

From da38198b4ff662d41d573c0e71adad690332b676 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:30:01 +0200
Subject: [PATCH 1778/2033] Use attoparsec 0.10.x when building with GHC 6.x.

Newer versions depend on 'scientific', which this compiler cannot build.
---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index e85d7a57327..a30b91be52e 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -70,6 +70,7 @@
   ghc6123Prefs = self : super : ghc704Prefs self super // {
     alex = self.alex_3_1_3;
     async = self.async_2_0_1_4;
+    attoparsec = self.attoparsec_0_10_4_0;
     cabalInstall = self.cabalInstall_1_16_0_2;
     cgi = self.cgi_3001_1_7_5;
     deepseq = self.deepseq_1_2_0_1;

From 6962c86135db83d3f78c2b20e5161d99f7ba25a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 19:57:35 +0200
Subject: [PATCH 1779/2033] haskell-defaults.nix: improve configuration for GHC
 6.x

---
 pkgs/top-level/haskell-defaults.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a30b91be52e..296c85b4d07 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -74,18 +74,28 @@
     cabalInstall = self.cabalInstall_1_16_0_2;
     cgi = self.cgi_3001_1_7_5;
     deepseq = self.deepseq_1_2_0_1;
+    dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    exceptions = null;                  # none of our versions compile
     haddock = self.haddock_2_7_2;
+    logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    monadPar = self.monadPar_0_1_0_3;
+    nats = null;                        # none of our versions compile
     parallel = self.parallel_3_2_0_3;
     primitive = self.primitive_0_5_0_1;
+    reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     scientific = null;                  # none of our versions compile
     split = self.split_0_1_4_3;
     stm = self.stm_2_4_2;
     syb = null;                         # core package in ghc < 7
+    tagged = super.tagged.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    temporary = null;                   # none of our versions compile
+    vectorAlgorithms = super.vectorAlgorithms.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
   };
 
   ghc6104Prefs = self : super : ghc6123Prefs self super // {
     alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     async = null;                       # none of our versions compile
+    attoparsec = null;                  # none of our versions compile
     binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;

From 5538d68acaa4326fcd9480b19f5b38dec681bea8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 20:16:53 +0200
Subject: [PATCH 1780/2033] haskell-defaults.nix: move extensible-exceptions
 override into the right place

---
 pkgs/top-level/haskell-defaults.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 296c85b4d07..5c45a663d55 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -46,6 +46,7 @@
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
     aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; };
+    extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haddock = self.haddock_2_11_0;
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
@@ -54,7 +55,6 @@
   ghc722Prefs = self : super : ghc742Prefs self super // {
     deepseq = self.deepseq_1_3_0_2;
     DrIFT = null;                       # doesn't compile with old GHC versions
-    extensibleExceptions = null;        # core package in ghc <= 7.4.x
     haddock = self.haddock_2_9_4;
     syb = self.syb_0_4_0;
   };

From ca02d3734b719b3da7464f31acc16f8aea25480a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 20:51:31 +0200
Subject: [PATCH 1781/2033] haskell-defaults.nix: override case-sensitive on
 GHC 7.2.2 to avoid build error

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 5c45a663d55..02357c7eca9 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -53,6 +53,7 @@
   };
 
   ghc722Prefs = self : super : ghc742Prefs self super // {
+    caseInsensitive = self.caseInsensitive_1_0_0_1;
     deepseq = self.deepseq_1_3_0_2;
     DrIFT = null;                       # doesn't compile with old GHC versions
     haddock = self.haddock_2_9_4;
@@ -61,6 +62,7 @@
 
   ghc704Prefs = self : super : ghc722Prefs self super // {
     binary = self.binary_0_7_2_1;       # core package in ghc >= 7.2.2
+    caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2
     haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; };
     HsSyck = self.HsSyck_0_51;
     jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };

From e081cc3b44d071e8c56d8b819c0336788d5fd126 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 20:59:50 +0200
Subject: [PATCH 1782/2033] haskell-defaults.nix: fix hashable and
 case-insensitive builds with GHC 6.x

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

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 02357c7eca9..a8f4110fdb3 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -99,10 +99,11 @@
     async = null;                       # none of our versions compile
     attoparsec = null;                  # none of our versions compile
     binary = super.binary_0_7_2_1.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     GLUT = self.GLUT_2_2_2_1;
     haddock = self.haddock_2_4_2;
     happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
-    hashable = self.hashable_1_1_2_5;
+    hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From a1e3aef5d8cf8198d40bbaf928ca6ce90bac4cff Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 21:32:19 +0200
Subject: [PATCH 1783/2033] haskell-split: don't run the test suite with GHC
 7.9.x to avoid infinite loop

---
 pkgs/development/libraries/haskell/split/0.2.2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix
index ab60774cca4..2d768e2e71d 100644
--- a/pkgs/development/libraries/haskell/split/0.2.2.nix
+++ b/pkgs/development/libraries/haskell/split/0.2.2.nix
@@ -5,6 +5,7 @@ cabal.mkDerivation (self: {
   version = "0.2.2";
   sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr";
   testDepends = [ QuickCheck ];
+  doCheck = self.stdenv.lib.versionOlder self.ghc.version "7.9";
   meta = {
     description = "Combinator library for splitting lists";
     license = self.stdenv.lib.licenses.bsd3;

From 00594510e8043c8c30df3d66b1a4484676ff2a6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 21:34:16 +0200
Subject: [PATCH 1784/2033] haskell-defaults.nix: fix hashtables build with GHC
 6.10.x

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index a8f4110fdb3..708fe3271a6 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -104,6 +104,7 @@
     haddock = self.haddock_2_4_2;
     happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     network = super.network.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };

From 95aa6a9afa40ed71f0d7e5cfc08c68a2e0d7c4f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 23 May 2014 21:56:03 +0200
Subject: [PATCH 1785/2033] esniper: update to version 2.30.0

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

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 0a9703d5e34..766ec0c17fc 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
 
 stdenv.mkDerivation {
-  name = "esniper-2.29.0";
+  name = "esniper-2.30.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/esniper/esniper-2-29-0.tgz";
-    sha256 = "052jfbzm0a88h3hss2vg1vfdrhibjwhbcdnwsbkk5i1z0jj16xxc";
+    url    = "mirror://sourceforge/esniper/esniper-2-30-0.tgz";
+    sha256 = "1p85d5qfr3f35xfj5555ck4wwk5hqkh65ivam1527p8dwcz00wpl";
   };
 
   buildInputs = [ openssl curl ];

From 116ab5f0c122532ba7834ad1a4f511ba6f820be2 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 24 May 2014 03:32:02 +0200
Subject: [PATCH 1786/2033] seafile: update client, ccnet, libsearpc and shared

---
 .../networking/seafile-client/default.nix     |   4 +-
 .../libraries/libsearpc/default.nix           |   8 +-
 ...Add-autoconfiguration-for-libjansson.patch | 121 ------------------
 pkgs/misc/seafile-shared/default.nix          |   6 +-
 ...Add-autoconfiguration-for-libjansson.patch |  72 -----------
 pkgs/tools/networking/ccnet/default.nix       |   8 +-
 pkgs/tools/networking/ccnet/libccnet.pc.patch |  10 --
 7 files changed, 11 insertions(+), 218 deletions(-)
 delete mode 100644 pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch
 delete mode 100644 pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
 delete mode 100644 pkgs/tools/networking/ccnet/libccnet.pc.patch

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index d24437aabb6..e9036ba9261 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "2.1.1";
+  version = "3.0.4";
   name = "seafile-client-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
-    sha256 = "d98515ea229df702cbe973d85ec0bd5cf3f5282ef1022ba0157d5301b521c8e0";
+    sha256 = "10iz45y8j5f9smi0srxw62frb97vhr0w938v8w3rsjcw9qq366a2";
   };
 
   buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index 863a42b741b..32cb7b860c4 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec
 {
-  version = "1.2.1";
-  seafileVersion = "2.1.1";
+  version = "1.2.2";
+  seafileVersion = "3.0.4";
   name = "libsearpc-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/libsearpc/archive/v${seafileVersion}.tar.gz";
-    sha256 = "c0e7cc812c642ebb1339c3701570e78ff5b8c8aa2a521e5a505e28d9666e89ec";
+    sha256 = "0s5bqqajxfzyw4km6nhhx39nyq20gv0fxlf2v6ifipvnyk14850k";
   };
 
   patches = [ ./libsearpc.pc.patch ];
@@ -29,4 +29,4 @@ stdenv.mkDerivation rec
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.calrama ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch b/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch
deleted file mode 100644
index 7966d1e683b..00000000000
--- a/pkgs/misc/seafile-shared/0003-Add-autoconfiguration-for-libjansson.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -r -u a/app/Makefile.am b/app/Makefile.am
---- a/app/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/app/Makefile.am	2014-01-16 14:22:24.584094619 +0100
-@@ -21,7 +21,7 @@
- seafile_LDADD =  @CCNET_LIBS@ \
- 	$(top_builddir)/lib/libseafile.la \
- 	$(top_builddir)/lib/libseafile_common.la \
--	@SEARPC_LIBS@ \
-+	@SEARPC_LIBS@ @JANSSON_LIBS@ \
- 	@GLIB2_LIBS@  @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3
- 
- seafile_LDFALGS = @STATIC_COMPILE@ @CONSOLE@
-@@ -29,7 +29,7 @@
- if COMPILE_SERVER
- seafserv_tool_SOURCES = seafserv-tool.c
- seafserv_tool_LDADD =  @CCNET_LIBS@ \
--	$(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ \
-+	$(top_builddir)/lib/libseafile.la @SEARPC_LIBS@ @JANSSON_LIBS@ \
- 	@GLIB2_LIBS@  @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3
- 
- seafserv_tool_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@
-diff -r -u a/configure.ac b/configure.ac
---- a/configure.ac	2014-01-10 11:38:46.000000000 +0100
-+++ b/configure.ac	2014-01-16 14:22:24.584094619 +0100
-@@ -233,6 +233,7 @@
- GLIB_REQUIRED=2.16.0
- CCNET_REQUIRED=0.9.3
- SEARPC_REQUIRED=1.0
-+JANSSON_REQUIRED=2.2.1
- ZDB_REQUIRED=2.10
- #LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- CURL_REQUIRED=7.17
-@@ -254,6 +255,11 @@
- AC_SUBST(SEARPC_CFLAGS)
- AC_SUBST(SEARPC_LIBS)
- 
-+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
-+AC_SUBST(JANSSON_CFLAGS)
-+AC_SUBST(JANSSON_LIBS)
-+
-+
- PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_REQUIRED])
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
-diff -r -u a/daemon/Makefile.am b/daemon/Makefile.am
---- a/daemon/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/daemon/Makefile.am	2014-01-16 14:22:24.587427993 +0100
-@@ -139,7 +139,7 @@
- 	@GLIB2_LIBS@  @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
- 	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/common/index/libindex.la ${LIB_WS32} \
--	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@
-+	@SEARPC_LIBS@ @CCNET_LIBS@ @GNOME_KEYRING_LIBS@ @JANSSON_LIBS@
- 
- seaf_daemon_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@
- 
-diff -r -u a/server/gc/Makefile.am b/server/gc/Makefile.am
---- a/server/gc/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/server/gc/Makefile.am	2014-01-16 14:23:20.991449822 +0100
-@@ -50,7 +50,7 @@
- 	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/lib/libseafile_common.la \
- 	@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
--	@SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
-+	@SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
- 
- seafserv_gc_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
- 
-@@ -63,6 +63,6 @@
- 	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/lib/libseafile_common.la \
- 	@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
--	@SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
-+	@SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
- 
- seaf_fsck_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
-diff -r -u a/server/Makefile.am b/server/Makefile.am
---- a/server/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/server/Makefile.am	2014-01-16 14:23:40.498354610 +0100
-@@ -99,6 +99,6 @@
- 	$(top_builddir)/common/index/libindex.la \
- 	@GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 -levent \
- 	$(top_builddir)/common/cdc/libcdc.la \
--	@SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
-+	@SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ ${LIB_WS32}
- 
- seaf_server_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
-diff -r -u a/httpserver/Makefile.am b/httpserver/Makefile.am
---- a/httpserver/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/httpserver/Makefile.am	2014-01-16 14:26:48.673985279 +0100
-@@ -50,7 +50,7 @@
- 	@CCNET_LIBS@ \
- 	$(top_builddir)/lib/libseafile.la \
- 	$(top_builddir)/common/cdc/libcdc.la \
--	@SEARPC_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \
-+	@SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @CURL_LIBS@ \
- 	@LIBARCHIVE_LIBS@ ${LIB_WS32}
- 
- httpserver_LDFLAGS = @STATIC_COMPILE@
-diff -r -u a/controller/Makefile.am b/controller/Makefile.am
---- a/controller/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/controller/Makefile.am	2014-01-16 14:29:42.076102675 +0100
-@@ -18,6 +18,6 @@
- seafile_controller_LDADD = @CCNET_LIBS@ \
- 	$(top_builddir)/lib/libseafile_common.la \
- 	@GLIB2_LIBS@  @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -levent \
--	@SEARPC_LIBS@
-+	@SEARPC_LIBS@ @JANSSON_LIBS@
- 
- seafile_controller_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
-diff -r -u a/fuse/Makefile.am b/fuse/Makefile.am
---- a/fuse/Makefile.am	2014-01-10 11:38:46.000000000 +0100
-+++ b/fuse/Makefile.am	2014-01-16 14:31:44.764267711 +0100
-@@ -43,6 +43,6 @@
- 				  @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ \
-                   -lsqlite3 -levent \
- 				  $(top_builddir)/common/cdc/libcdc.la \
--				  @SEARPC_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@
-+				  @SEARPC_LIBS@ @JANSSON_LIBS@ @ZDB_LIBS@ @FUSE_LIBS@
- 
- seaf_fuse_LDFLAGS = @STATIC_COMPILE@ @SERVER_PKG_RPATH@
diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 53092e3a8b7..d6c08e99a51 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,17 +2,15 @@
 
 stdenv.mkDerivation rec
 {
-  version = "2.1.1";
+  version = "3.0.4";
   name = "seafile-shared-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile/archive/v${version}.tar.gz";
-    sha256 = "f07b09ab1eb1cb33f92cee74e499d0350941624396910a4c1a7d79abb45acaa6";
+    sha256 = "0a0yj9k2rr3q42swwzn1js3r8bld9wcysw6p9415rw5jabcm1af0";
   };
 
-  patches = [ ./0003-Add-autoconfiguration-for-libjansson.patch ];
-
   buildInputs = [ which automake autoconf pkgconfig libtool vala python intltool fuse ];
   propagatedBuildInputs = [ ccnet ];
 
diff --git a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch b/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
deleted file mode 100644
index 83cdbad7bba..00000000000
--- a/pkgs/tools/networking/ccnet/0001-Add-autoconfiguration-for-libjansson.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From f730ba82d641029dd262d05e8533fc7643f4c4b9 Mon Sep 17 00:00:00 2001
-From: Aaron Lindsay <aaron@aclindsay.com>
-Date: Wed, 15 Jan 2014 13:49:40 -0500
-Subject: [PATCH] Add autoconfiguration for libjansson
-
----
- configure.ac           | 5 +++++
- net/daemon/Makefile.am | 4 ++--
- net/server/Makefile.am | 2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64e74b5..0911671 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -248,6 +248,7 @@ SEARPC_REQUIRED=1.0
- ZDB_REQUIRED=2.10
- LIBNAUTILUS_EXTENSION_REQUIRED=2.30.1
- SEARPC_REQUIRED=1.0
-+JANSSON_REQUIRED=2.2.1
- CURL_REQUIRED=7.17
- 
- PKG_CHECK_MODULES(GLIB2, [glib-2.0 >= $GLIB_REQUIRED])
-@@ -262,6 +263,10 @@ PKG_CHECK_MODULES(SEARPC, [libsearpc >= $SEARPC_REQUIRED])
- AC_SUBST(SEARPC_CFLAGS)
- AC_SUBST(SEARPC_LIBS)
- 
-+PKG_CHECK_MODULES(JANSSON, [jansson >= $JANSSON_REQUIRED])
-+AC_SUBST(JANSSON_CFLAGS)
-+AC_SUBST(JANSSON_LIBS)
-+
- if test x${compile_python} = xyes; then
-    AM_PATH_PYTHON([2.6])
- 
-diff --git a/net/daemon/Makefile.am b/net/daemon/Makefile.am
-index 35d1a3c..0e28c6a 100644
---- a/net/daemon/Makefile.am
-+++ b/net/daemon/Makefile.am
-@@ -95,7 +95,7 @@ ccnet_SOURCES = ccnet-daemon.c \
- 
- ccnet_LDADD = -levent $(top_builddir)/lib/libccnetd.la \
-            @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \
--           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
-+           @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
- 
- 
- ccnet_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
-@@ -106,7 +106,7 @@ ccnet_test_SOURCES = ccnet-test.c daemon-session.c $(common_srcs)
- 
- ccnet_test_LDADD = -levent $(top_builddir)/lib/libccnetd.la \
- 	@GLIB2_LIBS@ @GOBJECT_LIBS@  -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \
--	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@
-+	@LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @JANSSON_LIBS@
- 
- ccnet_test_LDFLAGS = @STATIC_COMPILE@ -no-undefined @CONSOLE@
- 
-diff --git a/net/server/Makefile.am b/net/server/Makefile.am
-index d587f48..b048936 100644
---- a/net/server/Makefile.am
-+++ b/net/server/Makefile.am
-@@ -103,7 +103,7 @@ ccnet_server_LDADD = -levent $(top_builddir)/lib/libccnetd.la \
-            @GLIB2_LIBS@ @GOBJECT_LIBS@ -lssl @LIB_RT@ @LIB_UUID@ -lsqlite3 \
- 	       -lpthread \
-            @LIB_WS32@ @LIB_INTL@ @LIB_IPHLPAPI@ @SEARPC_LIBS@ @ZDB_LIBS@ \
--	  	   @LDAP_LIBS@
-+	  	   @LDAP_LIBS@ @JANSSON_LIBS@
- 
- 
- ccnet_server_LDFLAGS = @STATIC_COMPILE@ @CONSOLE@ @SERVER_PKG_RPATH@ -no-undefined
--- 
-1.8.5.2
-
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 14b88ddafe8..8896156bd1c 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec
 {
-  version = "1.4.0";
-  seafileVersion = "2.1.1";
+  version = "1.4.2";
+  seafileVersion = "3.0.4";
   name = "ccnet-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/ccnet/archive/v${seafileVersion}.tar.gz";
-    sha256 = "6882eb1a3066897e4f91fb60a3405b3f58b4b794334deaca73617003f77a7eb0";
+    sha256 = "1y9x6k9ql8bj83016a1mi1m5ixxh8fm7p4qbd5mslnamvjln171q";
   };
 
-  patches = [ ./libccnet.pc.patch ./0001-Add-autoconfiguration-for-libjansson.patch ];
-
   buildInputs = [ which automake autoconf pkgconfig libtool vala  python ];
   propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ];
 
diff --git a/pkgs/tools/networking/ccnet/libccnet.pc.patch b/pkgs/tools/networking/ccnet/libccnet.pc.patch
deleted file mode 100644
index 0d9fea552bc..00000000000
--- a/pkgs/tools/networking/ccnet/libccnet.pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-From: Aaron Lindsay <aaron@aclindsay.com>
-
---- a/libccnet.pc.in	2013-01-10 01:35:24.000000000 -0500
-+++ b/libccnet.pc.in	2013-01-19 11:31:50.479301798 -0500
-@@ -1,4 +1,4 @@
--prefix=(DESTDIR)@prefix@
-+prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@

From 6da85d3cf6690747592346492a091e761ec543fd Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 24 May 2014 01:54:55 +0200
Subject: [PATCH 1787/2033] free-game: jailbreak due to new OpenGLRaw version

This allows it to keep building after
ba5473676f867e32e9be5c2225ab4e8c8ded2be2 was pushed. Perhaps we should
add the extra OpenGL versions (2.9.1.0) and specify strict versions so
that it doesn't fail to build in 2 weeks.
---
 pkgs/development/libraries/haskell/free-game/1.0.5.nix | 1 +
 pkgs/development/libraries/haskell/free-game/1.1.nix   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
index f6f057852c2..efe269db26c 100644
--- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix
+++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
     OpenGLRaw random reflection transformers vector void
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/fumieval/free-game";
     description = "Create games for free";
diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix
index 4d9f57799db..b19e3202741 100644
--- a/pkgs/development/libraries/haskell/free-game/1.1.nix
+++ b/pkgs/development/libraries/haskell/free-game/1.1.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL
     OpenGLRaw random reflection transformers vector void
   ];
+  jailbreak = true;
   meta = {
     homepage = "https://github.com/fumieval/free-game";
     description = "Create games for free";

From 19c4909124625e86c3780640a839fdbb207d3cc8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:42:07 +0200
Subject: [PATCH 1788/2033] cabal-install: update to version 1.20.0.2

---
 .../cabal-install/{1.20.0.1.nix => 1.20.0.2.nix}              | 4 ++--
 pkgs/top-level/haskell-defaults.nix                           | 4 ++--
 pkgs/top-level/haskell-packages.nix                           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/tools/package-management/cabal-install/{1.20.0.1.nix => 1.20.0.2.nix} (90%)

diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix
similarity index 90%
rename from pkgs/tools/package-management/cabal-install/1.20.0.1.nix
rename to pkgs/tools/package-management/cabal-install/1.20.0.2.nix
index d0db9354ae0..dba92ab9321 100644
--- a/pkgs/tools/package-management/cabal-install/1.20.0.1.nix
+++ b/pkgs/tools/package-management/cabal-install/1.20.0.2.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-install";
-  version = "1.20.0.1";
-  sha256 = "14zrsbjr7kgrnjd5hxczll4j39vwj95drlw73gad2div2954dqxi";
+  version = "1.20.0.2";
+  sha256 = "1nsc8qklhlg2xpaj7k158gg45rlrp7mn15zyfsgjpaqf3rjm9dl4";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 708fe3271a6..ad0da226542 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -16,11 +16,11 @@
 
   ghcHEADPrefs = self : super : super // {
     mtl = self.mtl_2_1_3_1;
-    cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = null; };
+    cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = null; };
   };
 
   ghc782Prefs = self : super : ghcHEADPrefs self super // {
-    cabalInstall_1_20_0_1 = super.cabalInstall_1_20_0_1.override { Cabal = self.Cabal_1_20_0_0; };
+    cabalInstall_1_20_0_2 = super.cabalInstall_1_20_0_2.override { Cabal = self.Cabal_1_20_0_0; };
     codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_0; }; };
   };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 36b22b935ce..2f24f206dfb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2689,8 +2689,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
   cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
-  cabalInstall_1_20_0_1 = callPackage ../tools/package-management/cabal-install/1.20.0.1.nix { Cabal = self.Cabal_1_20_0_0; };
-  cabalInstall = self.cabalInstall_1_20_0_1;
+  cabalInstall_1_20_0_2 = callPackage ../tools/package-management/cabal-install/1.20.0.2.nix { Cabal = self.Cabal_1_20_0_0; };
+  cabalInstall = self.cabalInstall_1_20_0_2;
 
   codex = callPackage ../development/tools/haskell/codex {};
 

From 9b86fb4ea490a17167802c4df70f8fc0c110a711 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 11:08:23 +0200
Subject: [PATCH 1789/2033] haskell-scientific: update default to the latest
 version

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2f24f206dfb..c929665fe48 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1881,7 +1881,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {};
   scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {};
-  scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff
+  scientific = self.scientific_0_3_2_1;
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 

From ecaf15c324987c96014a44c85fd19e5d817ff042 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:54:33 +0200
Subject: [PATCH 1790/2033] haskell-attoparsec: add version 0.11.3.4

---
 .../libraries/haskell/attoparsec/0.11.3.4.nix | 20 +++++++++++++++++++
 pkgs/top-level/haskell-defaults.nix           |  2 ++
 pkgs/top-level/haskell-packages.nix           |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix

diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
new file mode 100644
index 00000000000..4af501e7dca
--- /dev/null
+++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix
@@ -0,0 +1,20 @@
+{ cabal, deepseq, QuickCheck, scientific, testFramework
+, testFrameworkQuickcheck2, text
+}:
+
+cabal.mkDerivation (self: {
+  pname = "attoparsec";
+  version = "0.11.3.4";
+  sha256 = "1zahmkb0n7jz0di35x3r8s0xnfg1awqybh2x2zicxbwazl4f53hi";
+  buildDepends = [ deepseq scientific text ];
+  testDepends = [
+    QuickCheck testFramework testFrameworkQuickcheck2 text
+  ];
+  meta = {
+    homepage = "https://github.com/bos/attoparsec";
+    description = "Fast combinator parsing for bytestrings and text";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index ad0da226542..ed7e33868ea 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -46,10 +46,12 @@
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
     aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; };
+    attoparsec = self.attoparsec_0_11_3_1;
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haddock = self.haddock_2_11_0;
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
+    scientific = self.scientific_0_2_0_2;
   };
 
   ghc722Prefs = self : super : ghc742Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c929665fe48..21cc618fc90 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -191,7 +191,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   attoparsec_0_10_4_0 = callPackage ../development/libraries/haskell/attoparsec/0.10.4.0.nix {};
   attoparsec_0_11_3_1 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.1.nix {};
-  attoparsec = self.attoparsec_0_11_3_1;
+  attoparsec_0_11_3_4 = callPackage ../development/libraries/haskell/attoparsec/0.11.3.4.nix {};
+  attoparsec = self.attoparsec_0_11_3_4;
 
   attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {};
 

From 82df69a1de1aeb92350a61cd5b9c1183ceb04852 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:20 +0200
Subject: [PATCH 1791/2033] haskell-zip-archive: add version 0.2.3.2

Use latest zip archive only with GHC 7.8.2 so that we don't have to
override 'binary' everywhere else.
---
 .../zip-archive/{default.nix => 0.2.2.1.nix}  |  0
 .../libraries/haskell/zip-archive/0.2.3.2.nix | 19 +++++++++++++++++++
 pkgs/top-level/haskell-defaults.nix           |  1 +
 pkgs/top-level/haskell-packages.nix           |  4 +++-
 4 files changed, 23 insertions(+), 1 deletion(-)
 rename pkgs/development/libraries/haskell/zip-archive/{default.nix => 0.2.2.1.nix} (100%)
 create mode 100644 pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix

diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/zip-archive/default.nix
rename to pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix
diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix
new file mode 100644
index 00000000000..f1a36feda90
--- /dev/null
+++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix
@@ -0,0 +1,19 @@
+{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "zip-archive";
+  version = "0.2.3.2";
+  sha256 = "1y69sk6jyw1klgpl6bcamq1i9wy1536hz9x4s9b8n375sbhj10f1";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ binary digest filepath mtl text time zlib ];
+  testDepends = [ HUnit time ];
+  doCheck = false;
+  meta = {
+    homepage = "http://github.com/jgm/zip-archive";
+    description = "Library for creating and modifying zip archives";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index ed7e33868ea..cc8c6812985 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -42,6 +42,7 @@
     modularArithmetic = null;           # requires base >= 4.7
     pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; };
     transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x
+    zipArchive = super.zipArchive_0_2_2_1;    # works without binary 0.7.x
   };
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 21cc618fc90..7f34e01461c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -2502,7 +2502,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; };
 
-  zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
+  zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {};
+  zipArchive_0_2_3_2 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.2.nix {};
+  zipArchive = self.zipArchive_0_2_3_2;
 
   zipper = callPackage ../development/libraries/haskell/zipper {};
 

From ff6db963fc2edcb912faed74a19a1ac36d458cb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:27 +0200
Subject: [PATCH 1792/2033] haskell-aeson: update to version 0.7.0.6

Keep version 0.7.0.4 for builds with ghc <= 7.4.2.
---
 .../aeson/{default.nix => 0.7.0.4.nix}        |  4 ---
 .../libraries/haskell/aeson/0.7.0.6.nix       | 26 +++++++++++++++++++
 pkgs/top-level/haskell-defaults.nix           |  2 +-
 pkgs/top-level/haskell-packages.nix           |  6 ++---
 4 files changed, 30 insertions(+), 8 deletions(-)
 rename pkgs/development/libraries/haskell/aeson/{default.nix => 0.7.0.4.nix} (85%)
 create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix

diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/aeson/default.nix
rename to pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
index 7c8dd42c005..b5c959bb617 100644
--- a/pkgs/development/libraries/haskell/aeson/default.nix
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix
@@ -16,14 +16,10 @@ cabal.mkDerivation (self: {
     attoparsec HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2 text time unorderedContainers vector
   ];
-  patchPhase = ''
-    sed -i -e 's|scientific >=.*,|scientific,|' aeson.cabal
-  '';
   meta = {
     homepage = "https://github.com/bos/aeson";
     description = "Fast JSON parsing and encoding";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
new file mode 100644
index 00000000000..96a93b40195
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix
@@ -0,0 +1,26 @@
+{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit
+, mtl, QuickCheck, scientific, syb, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2, text, time
+, unorderedContainers, vector
+}:
+
+cabal.mkDerivation (self: {
+  pname = "aeson";
+  version = "0.7.0.6";
+  sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4";
+  buildDepends = [
+    attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb
+    text time unorderedContainers vector
+  ];
+  testDepends = [
+    attoparsec HUnit QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2 text time unorderedContainers vector
+  ];
+  meta = {
+    homepage = "https://github.com/bos/aeson";
+    description = "Fast JSON parsing and encoding";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index cc8c6812985..3618c0f10ed 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -46,7 +46,7 @@
   };
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
-    aeson = super.aeson.override { blazeBuilder = self.blazeBuilder; };
+    aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; };
     attoparsec = self.attoparsec_0_11_3_1;
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7f34e01461c..216037e74cd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -138,9 +138,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   aes = callPackage ../development/libraries/haskell/aes {};
 
-  aeson = callPackage ../development/libraries/haskell/aeson {
-    blazeBuilder = null;
-  };
+  aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; };
+  aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; };
+  aeson = self.aeson_0_7_0_6;
 
   aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
 

From e08c94e8044d2f31a6459649db0c3e16fc54eb8a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:28 +0200
Subject: [PATCH 1793/2033] haskell-ghc-vis: update to version 0.7.2.2

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

diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index be0b72aa963..40700b52f61 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -4,17 +4,17 @@
 
 cabal.mkDerivation (self: {
   pname = "ghc-vis";
-  version = "0.7.2.1";
-  sha256 = "160b45bgiz2ckva70dnmkf6i9bvffaavm5wzia2lk8c65pnvc9ih";
+  version = "0.7.2.2";
+  sha256 = "0abk76cy9qiblyways1r7jfsj996sj4laawzaz1j9p546plfkbnj";
   buildDepends = [
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
   ];
+  jailbreak = true;
   postInstall = ''
     ensureDir "$out/share/ghci"
     ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
   '';
-  jailbreak = true;
   meta = {
     homepage = "http://felsin9.de/nnis/ghc-vis";
     description = "Live visualization of data structures in GHCi";

From 5e9b258bd8b7760971885adfcd0a92fa6153e785 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:30 +0200
Subject: [PATCH 1794/2033] haskell-http-types: update to version 0.8.5

---
 .../libraries/haskell/http-types/default.nix         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix
index a3fa1c8c9ee..4b1a7b956f6 100644
--- a/pkgs/development/libraries/haskell/http-types/default.nix
+++ b/pkgs/development/libraries/haskell/http-types/default.nix
@@ -1,11 +1,15 @@
-{ cabal, blazeBuilder, caseInsensitive, hspec, QuickCheck, text }:
+{ cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck
+, quickcheckInstances, text
+}:
 
 cabal.mkDerivation (self: {
   pname = "http-types";
-  version = "0.8.4";
-  sha256 = "0bz7g537if863vk29z72hndf1x019dj7shj1aa77pssrxma3a685";
+  version = "0.8.5";
+  sha256 = "0d282sf3xyk5makhnwfm2k9mgw1fkh07kasmy85fiwjkc1447ciw";
   buildDepends = [ blazeBuilder caseInsensitive text ];
-  testDepends = [ blazeBuilder hspec QuickCheck text ];
+  testDepends = [
+    blazeBuilder doctest hspec QuickCheck quickcheckInstances text
+  ];
   jailbreak = true;
   meta = {
     homepage = "https://github.com/aristidb/http-types";

From 9f6469a1a1040a5af816f16b715cf711750f7a1d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:31 +0200
Subject: [PATCH 1795/2033] haskell-openssl-streams: update to version 1.1.0.2

---
 .../development/libraries/haskell/openssl-streams/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix
index 2813b88e95a..33b48d1f121 100644
--- a/pkgs/development/libraries/haskell/openssl-streams/default.nix
+++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "openssl-streams";
-  version = "1.1.0.1";
-  sha256 = "1y3vj17951gz3wlf75j3ph3hlkjbrplrmnbd9rcyiipzv51vy8ym";
+  version = "1.1.0.2";
+  sha256 = "0h3jxxdls0p1xxr02rfag7j9y13ll3xgzx2ldv1nsfcv3rzw2pfy";
   buildDepends = [ HsOpenSSL ioStreams network ];
   testDepends = [
     HsOpenSSL HUnit ioStreams network testFramework testFrameworkHunit

From 26f0953158655a79de8faa94867cc333638440b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:33 +0200
Subject: [PATCH 1796/2033] haskell-usb: update to version 1.2.0.1

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

diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix
index 05f151bfd2c..a023a682a92 100644
--- a/pkgs/development/libraries/haskell/usb/default.nix
+++ b/pkgs/development/libraries/haskell/usb/default.nix
@@ -1,10 +1,10 @@
-{ cabal, baseUnicodeSymbols, bindingsLibusb, text, vector }:
+{ cabal, bindingsLibusb, text, vector }:
 
 cabal.mkDerivation (self: {
   pname = "usb";
-  version = "1.2";
-  sha256 = "1k73avkmpbmg6iq2kmwhg2ifibni5c1yp202afdb6v7w5akvmc0b";
-  buildDepends = [ baseUnicodeSymbols bindingsLibusb text vector ];
+  version = "1.2.0.1";
+  sha256 = "10bpkrsnin9f3g1p5a84nhxx5xlfjdxisc0q60iain30rn99g2mk";
+  buildDepends = [ bindingsLibusb text vector ];
   jailbreak = true;
   meta = {
     homepage = "http://basvandijk.github.com/usb";

From 283e4f19215cf5c7e54330c916c6d173c4197c88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:55:34 +0200
Subject: [PATCH 1797/2033] haskell-xdot: update to version 0.2.4.3

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

diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix
index 9c1a938234d..78a9d921ff6 100644
--- a/pkgs/development/libraries/haskell/xdot/default.nix
+++ b/pkgs/development/libraries/haskell/xdot/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xdot";
-  version = "0.2.4.2";
-  sha256 = "0a5wmwcl3akw1n9xgdhvlrbvphvy9s528daax28137ixaphvrl0f";
+  version = "0.2.4.3";
+  sha256 = "0p6y3ng8nwi8sksy0881bs331asi73x816zd5v7qlg4v719s8jxg";
   buildDepends = [ cairo graphviz gtk mtl polyparse text ];
   jailbreak = true;
   meta = {

From acaf4a6253ddd6fbd1dba59756ea006024a34575 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 May 2014 10:58:26 +0200
Subject: [PATCH 1798/2033] haskell-tasty: update to version 0.8.1.1

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

diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix
index 13e4e37e4b0..bb8e20e98e4 100644
--- a/pkgs/development/libraries/haskell/tasty/default.nix
+++ b/pkgs/development/libraries/haskell/tasty/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "tasty";
-  version = "0.8.0.4";
-  sha256 = "016niwympxbxpg3yq7samgh92l20wxm2h6cwhqal4zdj8n9262j0";
+  version = "0.8.1.1";
+  sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr";
   buildDepends = [
     ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm
     tagged unboundedDelays

From 1cfea9bd1a61c7f30f0eee2c476e987dcacb882e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 24 May 2014 12:34:00 +0200
Subject: [PATCH 1799/2033] qt-5: Don't build tests

Building the tests (which as far as I can tell we don't even run)
makes the build take > 19 GiB of disk space, which is a bit
excessive. Without the tests, it takes 2.6 GiB.
---
 pkgs/development/libraries/qt-5/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix
index e94aecc41e4..3a89f20beab 100644
--- a/pkgs/development/libraries/qt-5/default.nix
+++ b/pkgs/development/libraries/qt-5/default.nix
@@ -10,7 +10,7 @@
 , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
 , buildDocs ? false
 , buildExamples ? false
-, buildTests ? true
+, buildTests ? false
 , developerBuild ? false
 }:
 
@@ -84,8 +84,6 @@ stdenv.mkDerivation rec {
     -optimized-qmake
     -strip
     -reduce-relocations
-    -force-debug-info
-    -no-separate-debug-info
     -system-proxies
 
     -gui

From 39f994cd604fc3dc7f7cd1e6077dc144b070e5d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 24 May 2014 12:35:05 +0200
Subject: [PATCH 1800/2033] qt-5: Prevent some unnecessary runtime dependencies

The file $out/mkspecs/qconfig.pri contains a list of all include /
library paths used during the build, including build-time-only
packages like GDB and Ruby. So get rid of those.
---
 pkgs/development/libraries/qt-5/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix
index 3a89f20beab..be028e89ce8 100644
--- a/pkgs/development/libraries/qt-5/default.nix
+++ b/pkgs/development/libraries/qt-5/default.nix
@@ -141,7 +141,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
-  postInstall = if buildDocs then "make docs&&make install_docs" else "";
+  postInstall =
+    ''
+      ${optionalString buildDocs ''
+        make docs && make install_docs
+      ''}
+
+      # Don't retain build-time dependencies like gdb and ruby.
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+    '';
 
   #enableParallelBuilding = true; # often fails on Hydra, as well as qt4
 

From 18df371fe39b1b637e0b08975bf32c584bdb1230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 24 May 2014 15:41:45 +0200
Subject: [PATCH 1801/2033] drumkv1: update from 0.4.1 to 0.4.2

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 39f6ae0ded4..ab8027e2371 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0wxbn5qm3dn9spwbm618flgrwvls7bipg0nhgn0lv4za2g823g56";
+    sha256 = "18rvfgblynlmklk25azmppibn1bdjid97hipa323gnzmxgq0rfjq";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];

From 2dc6eb3941e39435d03c501e5fbc83ff9b53f763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 24 May 2014 15:42:32 +0200
Subject: [PATCH 1802/2033] samplv1: update from 0.4.1 to 0.4.2

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

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index f1d3be317d1..c201536ed34 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "1cx3qs9vrdwmym2qsghqq53bshnjqgpqypsilr1m2i1cpfnfrr6x";
+    sha256 = "1vr6jbqnsgdq3v2h1ndp4pirnil3119dqwlq0k0kdscmcskvb9j4";
   };
 
   buildInputs = [ jackaudio libsndfile lv2 qt4 ];

From 056bd4fdba4a879fbcc58c4b17a5e32352b0fdee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 24 May 2014 15:43:07 +0200
Subject: [PATCH 1803/2033] synthv1: update from 0.4.1 to 0.4.2

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

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 4037b88ecb7..d1c2230cf16 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "1j1x8n3rlwrh373wqmm6mj3cgyk3apvnpqygx1700fl4cf249agl";
+    sha256 = "1r4fszbzwd0yfcch0mcsmh7781zw1317hiljn85w79721fs2m8hc";
   };
 
   buildInputs = [ qt4 jackaudio lv2 ];

From 956a01298828079012249c549773c19a89393260 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 24 May 2014 13:19:47 -0300
Subject: [PATCH 1804/2033] Galculator: add version 2.3.1 Galculator is a GTK
 full-fledged calculator.

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

diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
new file mode 100644
index 00000000000..010f75a575e
--- /dev/null
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl
+, intltool, pkgconfig, gtk
+ }:
+
+stdenv.mkDerivation rec {
+  
+  name = "galculator-${version}";
+  version = "2.1.3";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/galculator/${name}.tar.gz";
+    sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk ];
+
+  meta = {
+    description = "A GTK 2/3 algebraic and RPN calculator";
+    longDescription = ''
+      galculator is a GTK 2 / GTK 3 based calculator. Its main features include:
+
+      - Algebraic, RPN (Reverse Polish Notation), Formula Entry and Paper modes;
+      - Basic and Scientific Modes
+      - Decimal, hexadecimal, octal and binary number base
+      - Radiant, degree and grad support
+      - User defined constants and functions
+      - A bunch of common functions
+      - Binary arithmetic of configurable bit length and signedness
+      - Quad-precision floating point arithmetic, and 112-bit binary arithmetic
+    '';
+    homepage = http://galculator.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadabfdceb0..43712d497a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1070,6 +1070,10 @@ let
 
   g500-control = callPackage ../tools/misc/g500-control { };
 
+  galculator = callPackage ../applications/misc/galculator {
+    gtk = gtk3;
+  };
+
   gawk = callPackage ../tools/text/gawk { };
 
   gawkInteractive = appendToName "interactive"

From 4c459974235f5230cdb3a39ff4ee4a0530a7888a Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 24 May 2014 22:34:27 +0400
Subject: [PATCH 1805/2033] update moc

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

diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 5356d4ce298..c5a33796ca5 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:
 
 stdenv.mkDerivation rec {
   name = "moc-${version}";
-  version = "2.5.0-beta1";
+  version = "2.5.0-beta2";
 
   src = fetchurl {
     url = "http://ftp.daper.net/pub/soft/moc/unstable/moc-${version}.tar.bz2";
-    sha256 = "076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6";
+    sha256 = "486d50584c3fb0067b8c03af54e44351633a7740b18dc3b7358322051467034c";
   };
 
   configurePhase = "./configure prefix=$out";
 
-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];
 
   meta = {
     description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";

From 94fd1a83bd980cc04c12dd2d9fdc3a17e05ddf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 24 May 2014 20:42:47 +0200
Subject: [PATCH 1806/2033] ardour3: 3.5.357 -> 3.5.380 Critical bug fix
 release

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 4315a5a7547..88bc7399c65 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -6,7 +6,7 @@
 , perl, pkgconfig, python, serd, sord, sratom, suil }:
 
 let
-  tag = "3.5.357";
+  tag = "3.5.380";
 in
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
     rev = "refs/tags/${tag}";
-    sha256 = "1e026fb9a6ad4179d52c4b578cc3861bdfd3629b9e7b7a7341d431c7d3692c42";
+    sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b";
   };
 
   buildInputs = 
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     # The funny revision number is from `git describe rev`
-    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-gce4d125\"; }\n' > libs/ardour/revision.cc
+    printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-g2f6065b\"; }\n' > libs/ardour/revision.cc
     # Note the different version number
-    sed -i '33i rev = \"3.5-357-gce4d125\"' wscript
+    sed -i '33i rev = \"3.5-380-g2f6065b\"' wscript
     sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
     sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
     sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl

From b9249596488e465daffd29446314d37efeb0fb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sat, 24 May 2014 21:11:59 +0200
Subject: [PATCH 1807/2033] qtractor: update from 0.6.0 to 0.6.1

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

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index c70842c399a..a15cf255040 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -3,12 +3,12 @@
 , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.0";
+  version = "0.6.1";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "0aw6g0biqzysnsk5vd6wx3q1khyav6krhjz7bzk0v7d2160bn40r";
+    sha256 = "09lyz1pn2dadr1ii2msyv3n13kq3mbgpcwcyfm0brm01c2fnh6wc";
   };
 
   buildInputs =

From 0a794b79ca0eb751d2a16c1d6ac93fc0ce3fd17f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 24 May 2014 18:25:04 -0500
Subject: [PATCH 1808/2033] clementine: disable unfree dependencies by default

Clementine has an optional dependency on libspotify, which is unfree.
Enabling libspotify unconditionally prevented Hydra from distributing
Clementine. Now, we optionally enable it based on
config.clementine.spotify.
---
 pkgs/applications/audio/clementine/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 5d4a3614e40..512ca89031d 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,8 +1,10 @@
 { stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
 , usbmuxd, libmtp, gvfs, libcdio, protobuf, libspotify, qca2, pkgconfig
-, sparsehash }:
+, sparsehash, config }:
 
+let withSpotify = config.clementine.spotify or false;
+in
 stdenv.mkDerivation {
   name = "clementine-1.2.1";
 
@@ -27,7 +29,6 @@ stdenv.mkDerivation {
     liblastfm
     libmtp
     libplist
-    libspotify
     pkgconfig
     protobuf
     qca2
@@ -37,7 +38,7 @@ stdenv.mkDerivation {
     sqlite
     taglib
     usbmuxd
-  ];
+  ] ++ stdenv.lib.optional withSpotify libspotify;
 
   meta = with stdenv.lib; {
     homepage = "http://www.clementine-player.org";
@@ -45,6 +46,7 @@ stdenv.mkDerivation {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
-    hydraPlatforms = []; # libspotify is unfree
+    # libspotify is unfree
+    hydraPlatforms = optional (not withSpotify) platforms.linux;
   };
 }

From 2bfd36fa14ef23b39dd6c401781afa2571e7c330 Mon Sep 17 00:00:00 2001
From: Daniel Bergey <bergey@alum.mit.edu>
Date: Thu, 22 May 2014 17:21:28 +0000
Subject: [PATCH 1809/2033] Nafees font family (5 fonts)

---
 pkgs/data/fonts/nafees/default.nix | 59 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/data/fonts/nafees/default.nix

diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix
new file mode 100644
index 00000000000..aa0c1dbd77b
--- /dev/null
+++ b/pkgs/data/fonts/nafees/default.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "nafees";
+
+  srcs = [(fetchurl {
+    url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip";
+    sha256 = "1h1k5d74pg2gs782910v7i9rz2633wdacy34ds7ybxbpjiz6pqix";
+  })
+
+  (fetchurl {
+    url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip";
+    sha256 = "1liismsyaj69y40vs9a9db4l95n25n8vnjnx7sbk70nxppwngd8i";
+  })
+
+  (fetchurl {
+    url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesNaskh/Nafees_Naskh_v2.01.zip";
+    sha256 = "1qbbj6w6bvrlymv7z6ld609yhp0l2f27z14180w5n8kzzl720vly";
+  })
+
+  (fetchurl {
+    url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesTahreerNaskh/Nafees_Tahreer_Naskh_v1.0.zip";
+    sha256 = "006l87drbi4zh52kpvn8wl9wbwm9srfn406rzsnf4gv0spzhqrxl";
+  })
+  (fetchurl {
+    url = "http://www.cle.org.pk/Downloads/localization/fonts/NafeesPakistaniNaskh/Nafees_Pakistani_Naskh_v2.01.zip";
+    sha256 = "1i5ip60gq1cgc9fc96kvlahdpia8dxdgcisglvbm2d212bz0s5nb";
+  })
+];
+
+  buildInputs = [unzip];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+    # cp $riqa/*.ttf $out/share/fonts/truetype
+  '';
+
+  meta = {
+    description = "OpenType Urdu font from the Center for Research in Urdu Language Processing";
+
+    longDescription = '' The Nafees font family is developed according
+    to calligraphic rules, following the style of Syed Nafees
+    Al-Hussaini (Nafees Raqam) one of the finest calligraphers of
+    Pakistan '';
+
+    homepage = "http://www.cle.org.pk/software/localization.htm";
+
+    # Used to be GPLv2.  The license distributed with the fonts looks
+    # more like a modified BSD, but still contains the GPLv2 embedded
+    # font exception, and some not-for-resale language.
+    license = "unknown";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadabfdceb0..f731f46f5ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7760,6 +7760,8 @@ let
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
 
+  nafees = callPackage ../data/fonts/nafees { };
+
   oldstandard = callPackage ../data/fonts/oldstandard { };
 
   poly = callPackage ../data/fonts/poly { };

From cceea413bc36fae559a6f86dd70e3d63c82ae7c7 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 25 May 2014 03:21:21 -0500
Subject: [PATCH 1810/2033] Add expression to build the eboard chess client

---
 pkgs/games/eboard/default.nix   | 19 +++++++++++++++++++
 pkgs/games/eboard/eboard.patch  | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/games/eboard/default.nix
 create mode 100644 pkgs/games/eboard/eboard.patch

diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix
new file mode 100644
index 00000000000..1decee4264a
--- /dev/null
+++ b/pkgs/games/eboard/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, gtk }:
+
+stdenv.mkDerivation {
+  name = "eboard-1.1.1";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2;
+    sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd";
+  };
+
+  patches = [ ./eboard.patch ];
+
+  buildInputs = [ pkgconfig gtk ];
+
+  meta = {
+    homepage = http://www.bergo.eng.br/eboard/;
+    description = "eboard is a chess interface for Unix-like systems";
+  };
+}
diff --git a/pkgs/games/eboard/eboard.patch b/pkgs/games/eboard/eboard.patch
new file mode 100644
index 00000000000..f80c1b2f78d
--- /dev/null
+++ b/pkgs/games/eboard/eboard.patch
@@ -0,0 +1,16 @@
+--- a/cimg.cc	2014-05-25 02:41:58.000000000 -0500
++++ b/cimg.cc	2014-05-25 02:42:31.000000000 -0500
+@@ -94,11 +94,11 @@
+       ct == PNG_COLOR_TYPE_GRAY_ALPHA)
+     png_set_gray_to_rgb(pngp);
+
+-  alloc(pngp->width,pngp->height);
++  alloc(png_get_image_width(pngp, infp),png_get_image_height(pngp, infp));
+   if (!ok) { fclose(f); return; }
+   ok = 0;
+
+-  for(i=0;i<pngp->height;i++) {
++  for(i=0;i<png_get_image_height(pngp, infp);i++) {
+     png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
+   }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadabfdceb0..f399ccd2c60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9889,6 +9889,8 @@ let
 
   d2x_rebirth = callPackage ../games/d2x-rebirth { };
 
+  eboard = callPackage ../games/eboard { };
+
   eduke32 = callPackage ../games/eduke32 { };
 
   egoboo = callPackage ../games/egoboo { };

From b09a788e13712f694f12ea1d0fdbf630395effd2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 25 May 2014 03:29:24 -0500
Subject: [PATCH 1811/2033] Correct patch the rpath for GHC-built executables
 on Darwin

@peti This addresses #2488.
---
 pkgs/build-support/cabal/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 70fb72f99fb..7605d863c21 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -197,6 +197,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) ''
                 configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}";
               ''}
+              ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
+                configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names";
+              ''}
 
               echo "configure flags: $extraConfigureFlags $configureFlags"
               ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
@@ -256,6 +259,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
                 ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages
               fi
 
+              ${optionalString (self.enableSharedExecutables && self.isExecutable && self.stdenv.isDarwin) ''
+                for exe in $out/bin/* ; do
+                  install_name_tool -add_rpath \
+                    $out/lib/${ghc.ghc.name}/${self.pname}-${self.version} $exe
+                done
+              ''}
+
               eval "$postInstall"
             '';
 

From 1d79330e1d019789536ae01073a77db6ac076eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 12:58:10 +0200
Subject: [PATCH 1812/2033] basex: update 7.7.2 -> 7.8.2

---
 pkgs/tools/text/xml/basex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index 2484aac8b0d..c67444838b2 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  name = "basex-7.7.2";
+  name = "basex-7.8.2";
 
   src = fetchurl {
-    url = "http://files.basex.org/releases/7.7.2/BaseX772.zip";
-    sha256 = "1rh91rzgca1waq8jnd3ard1r04qlalc2qqrawmrahwxgf3f16f4a";
+    url = "http://files.basex.org/releases/7.8.2/BaseX782.zip";
+    sha256 = "0i9h7fsvn8cy1g44f23iyqndwamvx4kvyc4y3i00j15qm6qd2kbm";
   };
 
   buildInputs = [ unzip jre ];

From ef66088ae1dc759ba5c65962ed027efd82c64e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 13:15:25 +0200
Subject: [PATCH 1813/2033] bcache-tools: update 1.0.5 -> 1.0.7

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

diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index 183b889da9b..161383cb9de 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bcache-tools-${version}";
-  version = "1.0.5";
+  version = "1.0.7";
 
   src = fetchurl {
     url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
-    sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l";
+    sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
 
   buildInputs = [ pkgconfig utillinux ];

From e1d2e0d3804eb6c6a19b27cc9590f221bd41b52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 13:44:31 +0200
Subject: [PATCH 1814/2033] srecord: update 1.62 -> 1.63

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

diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix
index 25140093f51..e316b4a628e 100644
--- a/pkgs/development/tools/misc/srecord/default.nix
+++ b/pkgs/development/tools/misc/srecord/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, boost, libtool, groff, ghostscript }:
 
 stdenv.mkDerivation rec {
-  name = "srecord-1.62";
+  name = "srecord-1.63";
 
   src = fetchurl {
     url = "mirror://sourceforge/srecord/${name}.tar.gz";
-    sha256 = "0bfbmhsm9mbwiik3yrhm95q8bgx1k4mh2ai412k8zjyi8f5f3904";
+    sha256 = "06mzj9lrk8lzfzhnfyh8xm4p92j242jik6zm37ihcia20inwgzkq";
   };
 
   buildInputs = [ boost libtool groff ghostscript ];

From 5e460b2dee5fb531f5c43a895e9f879dfc14ab00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 13:55:20 +0200
Subject: [PATCH 1815/2033] munin: update 2.0.20 -> 2.0.21 (bug fix)

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 8d1b03ddf34..be890ff5900 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.20";
+  version = "2.0.21";
   name = "munin-${version}";
 
   src = fetchurl {
     url = "https://github.com/munin-monitoring/munin/archive/${version}.tar.gz";
-    sha256 = "17b24fsr8abipq09hipnh6cd4h2aiwyzyjhg0wpplngwals54qmc";
+    sha256 = "18ipk8n78iik07190h9r8mj5209ha6yhbiw7da0l4khw0y00cvf8";
   };
 
   buildInputs = [ 

From 15beb4054d113c917703bc84cb5b096c6aea733a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 14:13:05 +0200
Subject: [PATCH 1816/2033] nixos: add 'gvfs' when using GNOME3 desktop

One reason for adding this is to make Chromium able to open files it has
downloaded.

Currently this happens:
  /run/current-system/sw/bin/xdg-open: line 364: gnome-open: command not found

(And nothing happens in the GUI when clicking a downloaded file.)

Looking into xdg-open, one can see that it first tries to run gvfs-open
and then falls back to gnome-open. Adding 'gvfs' makes the first command
succeed.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 78ab7aee92b..74d9fee2357 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -108,6 +108,7 @@ in {
         gnome3.gtk3 # for gtk-update-icon-cache
         pkgs.ibus
         pkgs.shared_mime_info # for update-mime-database
+        gnome3.gvfs
         gnome3.dconf
         gnome3.gnome-backgrounds
         gnome3.gnome_control_center

From 115b7313c5787c81a82ed43935cc819256da68cd Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 20 May 2014 22:57:03 +0200
Subject: [PATCH 1817/2033] xca: fix package

For some reason library paths are not set at all for some libraries during
the build. Wrapper with LD_LIBRARY_PATH set for relevant libraries is currently
solution.
---
 pkgs/applications/misc/xca/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index fb6b011f30a..0bc2170340c 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool }:
+{ stdenv, fetchurl, pkgconfig, which, openssl, qt4, libtool, gcc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "xca-${version}";
@@ -15,7 +15,12 @@ stdenv.mkDerivation rec {
     prefix=$out ./configure ${openssl} ${libtool}
   '';
 
-  buildInputs = [ openssl qt4 libtool ];
+  postInstall = ''
+    wrapProgram "$out/bin/xca" \
+      --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib"
+  '';
+
+  buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {

From 7ce1ffbfa594a51fc7c27d899624cc4c64da0a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 25 May 2014 15:27:25 +0200
Subject: [PATCH 1818/2033] weechatDev: 0.4.4dev -> 0.1dev

---
 pkgs/applications/networking/irc/weechat/devel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
index cf52838b78c..f8558ef052e 100644
--- a/pkgs/applications/networking/irc/weechat/devel.nix
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -3,14 +3,14 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  rev = "6f64ee699ba46c90b55d3b99c60e4807819e2b7b";
-  version = "0.4.4-rev${rev}";
+  rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509";
+  version = "1.0-rev${rev}";
   name = "weechat-${version}";
 
   src = fetchgit {
     inherit rev;
     url = "git://github.com/weechat/weechat.git";
-    sha256 = "1w58gir48kxvscf6njy3kmfxbjlnsf2byw3g3w6r47zjkgyxcf1z";
+    sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2";
   };
 
   buildInputs = 

From 6d173e2a81266f48e909f02edc4113478396cbd5 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 19 May 2014 18:50:38 -0400
Subject: [PATCH 1819/2033] spawn-fcgi: Add package

---
 pkgs/servers/http/spawn-fcgi/default.nix      | 26 +++++++++++++++++++
 .../http/spawn-fcgi/show_version.patch        | 14 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/servers/http/spawn-fcgi/default.nix
 create mode 100644 pkgs/servers/http/spawn-fcgi/show_version.patch

diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix
new file mode 100644
index 00000000000..7c11aa8e837
--- /dev/null
+++ b/pkgs/servers/http/spawn-fcgi/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchsvn, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "spawn-fcgi-${version}";
+  version = "1.6.3";
+
+  src = fetchsvn {
+    url = "svn://svn.lighttpd.net/spawn-fcgi/tags/spawn-fcgi-${version}";
+    sha256 = "06f0zw3rja42d9vg8j68nqkm3mn5pfzzhwfadpvs4aidh6kz9p42";
+  };
+
+  buildInputs = [ automake autoconf ];
+
+  patches = [ ./show_version.patch ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = "http://redmine.lighttpd.net/projects/spawn-fcgi";
+    description = "Provides an interface to external programs that support the FastCGI interface";
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/servers/http/spawn-fcgi/show_version.patch b/pkgs/servers/http/spawn-fcgi/show_version.patch
new file mode 100644
index 00000000000..90c64ed6620
--- /dev/null
+++ b/pkgs/servers/http/spawn-fcgi/show_version.patch
@@ -0,0 +1,14 @@
+diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c
+index 7f3f594..2f1046f 100644
+--- a/src/spawn-fcgi.c
++++ b/src/spawn-fcgi.c
+@@ -405,8 +405,7 @@ static int find_user_group(const char *user, const char *group, uid_t *uid, gid_
+ 
+ static void show_version () {
+ 	write(1, CONST_STR_LEN(
+-		PACKAGE_DESC \
+-		"Build-Date: " __DATE__ " " __TIME__ "\n"
++		PACKAGE_DESC "\n"
+ 	));
+ }
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadabfdceb0..4b0bdb32fb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6769,6 +6769,8 @@ let
 
   sipwitch = callPackage ../servers/sip/sipwitch { };
 
+  spawn_fcgi = callPackage ../servers/http/spawn-fcgi { };
+
   squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
     inherit fetchurl stdenv perl lib composableDerivation
       openldap pam db cyrus_sasl kerberos libcap expat libxml2 libtool

From 7fafc6ff857e61a34894eb54b4e4e8afe968198c Mon Sep 17 00:00:00 2001
From: wmertens <Wout.Mertens@gmail.com>
Date: Tue, 20 May 2014 02:21:25 +0200
Subject: [PATCH 1820/2033] monit: bump 5.8 -> 5.8.1 (bug fixes)

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

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 28d58abe5aa..8e4848f2db6 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
-  name = "monit-5.8";
+  name = "monit-5.8.1";
   
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c";
+    sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2";
   };
 
   nativeBuildInputs = [ bison flex ];

From 1815ac2dfc78ba9b66ea635166ad8333766d4511 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 20 May 2014 15:41:11 +0200
Subject: [PATCH 1821/2033] tibia: update 10.39 -> 10.40

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index a7ded109526..a980aa53f5f 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.39";
+  name = "tibia-10.40";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1039.tgz;
-    sha256 = "0401sdg2b4jb6350z841f9xjipi37z4z82bc72rs0chgdp363n79";
+    url = http://static.tibia.com/download/tibia1040.tgz;
+    sha256 = "1d6wibwr84cnglnc0c9d6m3nynbg2zwgnxpyy9ykqiiwsz8qgzyg";
   };
 
   shell = stdenv.shell;

From 97af2620c7db6603f0c5d8b49638f46345cf1352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 25 May 2014 20:30:18 +0200
Subject: [PATCH 1822/2033] clementine: fix evaluation

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `clementine-1.2.1':
while evaluating `optional' at .../lib/lists.nix:113:20, called from .../pkgs/applications/audio/clementine/default.nix:50:22:
undefined variable `not' at .../pkgs/applications/audio/clementine/default.nix:50:32
---
 pkgs/applications/audio/clementine/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 512ca89031d..82f24b05f72 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = [ maintainers.ttuegel ];
     # libspotify is unfree
-    hydraPlatforms = optional (not withSpotify) platforms.linux;
+    hydraPlatforms = optional (!withSpotify) platforms.linux;
   };
 }

From dfd96f77a7bacdbf3f2a274dd7c175234b129fb4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 25 May 2014 14:17:23 -0500
Subject: [PATCH 1823/2033] add lohit-fonts-20140220

---
 pkgs/data/fonts/lohit-fonts/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/data/fonts/lohit-fonts/default.nix

diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix
new file mode 100644
index 00000000000..707d52c8baa
--- /dev/null
+++ b/pkgs/data/fonts/lohit-fonts/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "lohit-fonts-20140220";
+  src = fetchurl {
+    url = https://fedorahosted.org/releases/l/o/lohit/lohit-ttf-20140220.tar.gz;
+    sha256 = "1rmgr445hw1n851ywy28csfvswz1i6hnc8mzp88qw2xk9j4dn32d";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://fedorahosted.org/lohit/;
+    description = "Fonts for 21 Indian languages";
+    license = licenses.ofl;
+    maintainers = [ maintainers.ttuegel ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aadabfdceb0..83223a66ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7752,6 +7752,8 @@ let
 
   lmodern = callPackage ../data/fonts/lmodern { };
 
+  lohit-fonts = callPackage ../data/fonts/lohit-fonts { };
+
   manpages = callPackage ../data/documentation/man-pages { };
 
   miscfiles = callPackage ../data/misc/miscfiles { };

From b0234f216ccf71013daf8e4e8b8bcfc4044d36cf Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 25 May 2014 21:37:02 +0200
Subject: [PATCH 1824/2033] Fix passing extra qemu opts when using boot loader

---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 323f1bfc57e..bccf6583e47 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -65,7 +65,7 @@ let
           ${if cfg.useBootLoader then ''
             -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -drive index=1,id=drive2,file=${bootDisk}/disk.img,if=virtio,readonly \
-            -boot menu=on
+            -boot menu=on \
           '' else ''
             -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \

From 71522f1ec2c94bef24bf02abeb04b017b56f4e41 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 24 May 2014 21:04:18 -0500
Subject: [PATCH 1825/2033] ark: wrap for zipinfo

---
 pkgs/desktops/kde-4.12/kdeutils/ark.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.12/kdeutils/ark.nix b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
index eb3e12281d6..99844b909fd 100644
--- a/pkgs/desktops/kde-4.12/kdeutils/ark.nix
+++ b/pkgs/desktops/kde-4.12/kdeutils/ark.nix
@@ -1,7 +1,15 @@
-{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }:
+{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
+, unzip }:
 
 kde {
-  buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ];
+  buildInputs = [
+    makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/ark \
+      --prefix PATH ":" "${unzip}/bin"
+  '';
 
   meta = {
     description = "KDE Archiving Tool";

From 4e6ee200cd9fc247bd662e246c241bb10fe346a8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 26 May 2014 02:03:39 -0500
Subject: [PATCH 1826/2033] Add three more Haskell expressions

---
 .../haskell/BlogLiterately/default.nix        | 24 +++++++++++++++++++
 .../libraries/haskell/bool-extras/default.nix | 13 ++++++++++
 .../libraries/haskell/units/default.nix       | 14 +++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 +++++
 4 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/BlogLiterately/default.nix
 create mode 100644 pkgs/development/libraries/haskell/bool-extras/default.nix
 create mode 100644 pkgs/development/libraries/haskell/units/default.nix

diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
new file mode 100644
index 00000000000..e4005ed4ec0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix
@@ -0,0 +1,24 @@
+{ cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath
+, HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc
+, pandocCiteproc, pandocTypes, parsec, split, strict, temporary
+, transformers, utf8String
+}:
+
+cabal.mkDerivation (self: {
+  pname = "BlogLiterately";
+  version = "0.7.1.6";
+  sha256 = "0mzq0br9jsymml57kcxqyr401lckzm43fy74l3wy25n6grv64hd4";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    blazeHtml boolExtras cmdargs dataDefault filepath HaXml haxr
+    highlightingKate hscolour lens mtl pandoc pandocCiteproc
+    pandocTypes parsec split strict temporary transformers utf8String
+  ];
+  meta = {
+    homepage = "http://byorgey.wordpress.com/blogliterately/";
+    description = "A tool for posting Haskelly articles to blogs";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix
new file mode 100644
index 00000000000..20185638b59
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bool-extras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bool-extras";
+  version = "0.4.0";
+  sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
+  meta = {
+    homepage = "http://tom.lokhorst.eu/bool-extras";
+    description = "A fold function for Bool";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix
new file mode 100644
index 00000000000..a386257eaee
--- /dev/null
+++ b/pkgs/development/libraries/haskell/units/default.nix
@@ -0,0 +1,14 @@
+{ cabal, singletons }:
+
+cabal.mkDerivation (self: {
+  pname = "units";
+  version = "2.0";
+  sha256 = "1iv0pirhyp7crbkb008k14z57jl8c91r1sl8kqmb778xawb1hx52";
+  buildDepends = [ singletons ];
+  meta = {
+    homepage = "http://www.cis.upenn.edu/~eir/packages/units";
+    description = "A domain-specific type system for dimensional analysis";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 216037e74cd..e8bcbf97b29 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -268,6 +268,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   blazeTextual = callPackage ../development/libraries/haskell/blaze-textual {};
 
+  BlogLiterately = callPackage ../development/libraries/haskell/BlogLiterately {};
+
   bloomfilter = callPackage ../development/libraries/haskell/bloomfilter {};
 
   bmp = callPackage ../development/libraries/haskell/bmp {
@@ -276,6 +278,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  boolExtras = callPackage ../development/libraries/haskell/bool-extras {};
+
   boundingboxes_0_1_1 = callPackage ../development/libraries/haskell/boundingboxes/0.1.1.nix {};
   boundingboxes_0_2 = callPackage ../development/libraries/haskell/boundingboxes/0.2.nix {};
   boundingboxes = self.boundingboxes_0_2;
@@ -2270,6 +2274,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   uniplate = callPackage ../development/libraries/haskell/uniplate {};
 
+  units = callPackage ../development/libraries/haskell/units {};
+
   uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
 
   unixBytestring = callPackage ../development/libraries/haskell/unix-bytestring {};

From aea8bff8955e8fc7951507da9bd5ca4c8af7d8bc Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 26 May 2014 02:45:59 -0500
Subject: [PATCH 1827/2033] Add expression for ChessDB

---
 pkgs/games/chessdb/default.nix  | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/games/chessdb/default.nix

diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix
new file mode 100644
index 00000000000..381e35632a6
--- /dev/null
+++ b/pkgs/games/chessdb/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, tcl, tk, libX11, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "chessdb-3.6.19-beta-1";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz;
+    sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62";
+  };
+
+  buildInputs = [ tcl tk libX11 makeWrapper ];
+
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "SHAREDIR=$(out)/share/chessdb"
+    "SOUNDSDIR=$(out)/share/chessdb/sounds"
+    "TBDIR=$(out)/share/chessdb/tablebases"
+    "MANDIR=$(out)/man"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/chessdb --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
+  '';
+
+  meta = {
+    homepage = http://chessdb.sourceforge.net/;
+    description = "ChessDB is a free chess database";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0b35e55d47..3b6a3ddc76e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9858,6 +9858,8 @@ let
 
   castle_combat = callPackage ../games/castle-combat { };
 
+  chessdb = callPackage ../games/chessdb { };
+
   construoBase = lowPrio (callPackage ../games/construo {
     mesa = null;
     freeglut = null;

From bf1bde8215ebbc04aa872b2804b2415364cc81ca Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 26 May 2014 02:48:28 -0500
Subject: [PATCH 1828/2033] Wrap yesod-bin so that yesod devel works with Nix

---
 .../libraries/haskell/yesod-bin/default.nix          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix
index 23eaa047f8e..d722d5cd608 100644
--- a/pkgs/development/libraries/haskell/yesod-bin/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix
@@ -23,6 +23,18 @@ cabal.mkDerivation (self: {
     systemFileio systemFilepath tar text time transformers unixCompat
     unorderedContainers wai waiExtra warp yaml zlib
   ];
+
+  postInstall = ''
+    mv $out/bin/yesod $out/bin/.yesod-wrapped
+    cat - > $out/bin/yesod <<EOF
+    #! ${self.stdenv.shell}
+    export HSENV=1
+    export PACKAGE_DB_FOR_GHC='$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ")'
+    eval exec $out/bin/.yesod-wrapped "\$@"
+    EOF
+    chmod +x $out/bin/yesod
+  '';
+
   meta = {
     homepage = "http://www.yesodweb.com/";
     description = "The yesod helper executable";

From 9d4ca3fa50aea65defaea50d99cd4f5e3e0d4143 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 26 May 2014 02:50:14 -0500
Subject: [PATCH 1829/2033] Add Haskell expression for machines

---
 .../libraries/haskell/machines/default.nix    | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/machines/default.nix

diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix
new file mode 100644
index 00000000000..cd69d9133a6
--- /dev/null
+++ b/pkgs/development/libraries/haskell/machines/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, doctest, filepath, free, mtl, pointed
+, profunctors, semigroups, transformers, void
+}:
+
+cabal.mkDerivation (self: {
+  pname = "machines";
+  version = "0.2.5";
+  sha256 = "0745lhmfwq27nna517q7b82q59pda587wgh6840nw65syaj2qfhp";
+  buildDepends = [
+    comonad free mtl pointed profunctors semigroups transformers void
+  ];
+  testDepends = [ doctest filepath ];
+  meta = {
+    homepage = "http://github.com/ekmett/machines/";
+    description = "Networked stream transducers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 216037e74cd..180f575ccd1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1362,6 +1362,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   maccatcher = callPackage ../development/libraries/haskell/maccatcher {};
 
+  machines = callPackage ../development/libraries/haskell/machines {};
+
   markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {};
 
   mathFunctions = callPackage ../development/libraries/haskell/math-functions {};

From b9737cb4ab4ed7de6fc74ac8a399fbe0fc96cd72 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 26 May 2014 11:12:38 +0200
Subject: [PATCH 1830/2033] Add influxdb, scalable datastore for metrics,
 events, and real-time analytics

---
 pkgs/servers/nosql/influxdb/default.nix | 35 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/nosql/influxdb/default.nix

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
new file mode 100644
index 00000000000..fa9c48c6ea9
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "influxdb-${version}";
+  version = "0.7.0";
+  arch = if stdenv.system == "x86_64-linux" then "amd64" else "386";
+
+  src = fetchurl {
+    url = "http://s3.amazonaws.com/influxdb/${name}.${arch}.tar.gz";
+    sha256 = if arch == "amd64" then
+        "1mvi21z83abnprzj0n8r64ly9s48i5l7ndcrci7nk96z8xab7w3q" else
+        "1zgxbfnam4r31g9yfwznhb7l4hf7s5sylhll92zr8q0qjhr4cj2b";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D influxdb $out/bin/influxdb
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb
+    wrapProgram "$out/bin/influxdb" \
+        --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64"
+
+    ensureDir $out/share/influxdb
+    cp -R admin scripts config.toml $out/share/influxdb
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scalable datastore for metrics, events, and real-time analytics";
+    homepage = http://influxdb.com/;
+    license = licenses.mit;
+
+    maintainers = [ maintainers.offline ];
+    platforms = ["i686-linux" "x86_64-linux"];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cab717c16..b2dad91bdbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6663,6 +6663,8 @@ let
 
   riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
 
+  influxdb = callPackage ../servers/nosql/influxdb { };
+
   mysql51 = import ../servers/sql/mysql/5.1.x.nix {
     inherit fetchurl ncurses zlib perl openssl stdenv;
     ps = procps; /* !!! Linux only */

From 2131313fa61276c8d246f780890ea81bc5c889d8 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 26 May 2014 00:37:36 +0200
Subject: [PATCH 1831/2033] Add gvfs dbus service and gvfs gio modules to gnome
 3

Closes #2746
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/desktops/gnome3/gvfs.nix | 42 +++++++++++++++++++
 .../services/x11/desktop-managers/gnome3.nix  |  4 +-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/desktops/gnome3/gvfs.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b80ecce90ce..bc70770005c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -107,6 +107,7 @@
   ./services/desktops/gnome3/gnome-online-accounts.nix
   ./services/desktops/gnome3/gnome-online-miners.nix
   ./services/desktops/gnome3/gnome-user-share.nix
+  ./services/desktops/gnome3/gvfs.nix
   ./services/desktops/gnome3/seahorse.nix
   ./services/desktops/gnome3/sushi.nix
   ./services/desktops/gnome3/tracker.nix
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
new file mode 100644
index 00000000000..1a003ddd1ef
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -0,0 +1,42 @@
+# gvfs backends
+
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  gnome3 = config.environment.gnome3.packageSet;
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.gnome3.gvfs = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable gvfs backends, userspace virtual filesystem used
+          by GNOME components via D-Bus.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.gnome3.gvfs.enable {
+
+    environment.systemPackages = [ gnome3.gvfs ];
+
+    services.dbus.packages = [ gnome3.gvfs ];
+
+  };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 74d9fee2357..3d1c8608883 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -63,6 +63,7 @@ in {
     services.gnome3.gnome-keyring.enable = true;
     services.gnome3.gnome-online-accounts.enable = mkDefault true;
     services.gnome3.gnome-user-share.enable = mkDefault true;
+    services.gnome3.gvfs.enable = true;
     services.gnome3.seahorse.enable = mkDefault true;
     services.gnome3.sushi.enable = mkDefault true;
     services.gnome3.tracker.enable = mkDefault true;
@@ -101,7 +102,8 @@ in {
       };
 
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
-                                                "${gnome3.glib_networking}/lib/gio/modules" ];
+                                                "${gnome3.glib_networking}/lib/gio/modules"
+                                                "${gnome3.gvfs}/lib/gio/modules" ];
     environment.systemPackages =
       [ pkgs.desktop_file_utils
         gnome3.glib_networking

From fcb4e7128ce87ee045e7645d88c5e25909196c47 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 26 May 2014 16:22:49 +0200
Subject: [PATCH 1832/2033] dovecot 2.2.x: Update from 2.2.12 to 2.2.13

---
 pkgs/servers/mail/dovecot/2.2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 64ef3c44895..0c12b6ba3db 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -2,14 +2,14 @@
 , inotifyTools, clucene_core_2, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.12";
+  name = "dovecot-2.2.13";
 
   buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite]
     ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "0mlcwgrxfwy1fqfk3wwbh1h9f0jddg4rnj612ckj1zv5asp1rppk";
+    sha256 = "1klxbnlgqvq4v2inp18yv3x04xp0vf8nr67ci1k3yww1mb9g6g0k";
   };
 
   preConfigure = ''

From c4086f9185dc3c40780c991c22062f8ac4884ecc Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 26 May 2014 16:23:20 +0200
Subject: [PATCH 1833/2033] dovecot-pigeonhole: Update from 0.4.2 to 0.4.3

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

diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
index 5c0f39ca135..bf56d7b9bfd 100644
--- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchurl {
     url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
-    sha256 = "04rybb7ipsrhqapcqfr787n60lwd56gb33ylq7yqjr5q6xqg1684";
+    sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn";
   };  
 
   buildInputs = [ dovecot22 openssl ];

From 6b21186742722732ab99c4c99dc17c9685be19b4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 26 May 2014 17:17:25 +0200
Subject: [PATCH 1834/2033] gnome 3.12: make remote desktop sharing work

---
 nixos/modules/services/x11/desktop-managers/gnome3.nix       | 3 ++-
 .../gnome-3/3.12/core/gnome-control-center/default.nix       | 2 +-
 pkgs/desktops/gnome-3/3.12/core/vino/default.nix             | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 3d1c8608883..0b81a3f2d9b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -87,8 +87,9 @@ in {
           export XDG_MENU_PREFIX=gnome
 
           # Don't let epiphany depend upon gnome-shell
+          # Don't let gnome-session depend upon vino (for .desktop autostart condition)
           # Override default mimeapps
-          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share
+          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${gnome3.vino}/share/gsettings-schemas/${gnome3.vino.name}:${mimeAppsList}/share
 
           # Let gnome-control-center find gnome-shell search providers
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
index 967c19af540..eb2324c9c0f 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
-      hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
+      hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino
       networkmanager modemmanager makeWrapper  ];
 
   preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
index 2318e68930e..8580af9b884 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, libnotify, file }:
+, libnotify, file, telepathy_glib, dbus_glib }:
 
 stdenv.mkDerivation rec {
   name = "vino-${versionMajor}.${versionMinor}";
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify file makeWrapper ];
+  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
+                  dbus_glib telepathy_glib file makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \

From 1cbcdd515929d242b6934b65798d4c22b041bbb6 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 23 May 2014 04:09:27 +0200
Subject: [PATCH 1835/2033] cantata: fix build failure (close #2723)

We were one directory too high for configure.
---
 pkgs/applications/audio/cantata/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index f3cba4ca819..31d5240529f 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
 
   unpackPhase = "tar -xvf $src";
+  sourceRoot = "cantata-1.3.4";
 
   # Qt4 is implicit when KDE is switched off.
   cmakeFlags = stdenv.lib.flatten [

From 25ea04f2c98c1ecc538d0aa52815cf68b8a00bb5 Mon Sep 17 00:00:00 2001
From: _1126 <mail@elfsechsundzwanzig.de>
Date: Mon, 26 May 2014 18:20:47 +0200
Subject: [PATCH 1836/2033] ncmpc: propable fix for x86_64-darwin build error

@vcunat fixed syntax a bit. Close #2761.
---
 pkgs/applications/audio/ncmpc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 6db80f39e2c..f690b914abe 100755
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib }:
+{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   version = "0.21";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07";
   };
 
-  buildInputs = [ pkgconfig glib ncurses mpd_clientlib ];
+  buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]
+    ++ libintlOrEmpty;
 
   meta = with stdenv.lib; {
     description = "Curses-based interface for MPD (music player daemon)";

From 8ad1a0ceaf1b924f9893c45b3e13bcb63d6702af Mon Sep 17 00:00:00 2001
From: wmertens <Wout.Mertens@gmail.com>
Date: Sun, 20 Apr 2014 07:47:22 +0200
Subject: [PATCH 1837/2033] swig: enable on Darwin (close #2326)

Verified on OS X 10.9.2 to build and check, dependents build fine too.

@vcunat enabled doCheck as it works for him on x86_64-linux;
also did style nitpick modification, and changed platforms to .all
according to the homepage http://www.swig.org/compat.html
---
 pkgs/development/tools/misc/swig/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index d489feba4dc..80c6b20e69d 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost }:
+{ stdenv, fetchurl, boost, tcl }:
 
 stdenv.mkDerivation rec {
   name = "swig-1.3.40";
@@ -8,18 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r";
   };
 
-  #buildInputs = [ boost ]; # needed for `make check'
-
-  /* The test suite fails this way:
-
-      building python_cpp
-      python: tpp.c:63: __pthread_tpp_change_priority: Assertion `new_prio == -1 || (new_prio >= __sched_fifo_min_prio && new_prio <= __sched_fifo_max_prio)' failed.
-      /bin/sh: line 1: 32101 Aborted                 env LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH PYTHONPATH=.:$PYTHONPATH python ./li_boost_shared_ptr_runme.py
-      make[1]: *** [li_boost_shared_ptr.cpptest] Error 134
-
-     This may be an uninitialized mutex or mutexattr or something.
-   */
-  doCheck = false;
+  doCheck = true;
+  # 'make check' uses boost and tcl
+  buildInputs = stdenv.lib.optionals doCheck [ boost tcl ];
 
   meta = {
     description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
     # Licensing is a mess: http://www.swig.org/Release/LICENSE .
     license = "BSD-style";
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.all;
 
     maintainers = [ ];
   };

From ae6b1ce66dcef7f8571cbde6572358fcb08499ae Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <PascalWittmann@gmx.net>
Date: Mon, 26 May 2014 22:19:22 +0200
Subject: [PATCH 1838/2033] Fixed link to installation instructions in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8ded8807ede..e59b15425e9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package
 manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code.
 
-* [NixOS installation instructions](http://nixos.org/nixos/manual/#installing-nixos)
+* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation)
 * [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/)
 * [Manual (NixOS)](http://nixos.org/nixos/manual/)
 * [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined)

From 12d8c020e8494eb8328c38f831df513a88325c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 14 May 2014 18:11:05 +0800
Subject: [PATCH 1839/2033] webkitgtk: update to 2.4.3 (close #2640)

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

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 8497ea9ae94..3b6ef1acd98 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -8,7 +8,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "webkitgtk-2.4.0";
+  name = "webkitgtk-2.4.3";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1fyz6ysw7npy5wa7m1zg05zrj0gi0wdlpjbqix03iq4ym36pflnw";
+    sha256 = "1b6fm1c5kk6vl0llalsd605raqs152hn14635kjwcb6iq7mc6qlq";
   };
 
   patches = [ ./webcore-svg-libxml-cflags.patch ];

From bd96a4bb43351067f47ac6a150ce7fcdd966463f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 May 2014 21:27:37 +0200
Subject: [PATCH 1840/2033] xorg: maintenance updates of a few modules

---
 pkgs/servers/x11/xorg/default.nix       | 24 ++++++++++++------------
 pkgs/servers/x11/xorg/old.list          |  4 ++--
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 795fa8a60af..7fca58f5446 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -480,11 +480,11 @@ let
   })) // {inherit mkfontdir mkfontscale ;};
 
   gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) {
-    name = "gccmakedep-1.0.2";
+    name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2;
-      sha256 = "04dfamx3fvkvqfgs6xy2a6yqbxjrj4777ylxp38g60hhbdl4jg86";
+      url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2;
+      sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -520,11 +520,11 @@ let
   })) // {inherit libICE xproto ;};
 
   imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
-    name = "imake-1.0.6";
+    name = "imake-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/imake-1.0.6.tar.bz2;
-      sha256 = "1786k6jsazpr37v2b6qlsznjjp5lgyb869hx5m4ahax7n3yq72gs";
+      url = mirror://xorg/individual/util/imake-1.0.7.tar.bz2;
+      sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
@@ -1370,11 +1370,11 @@ let
   })) // {inherit ;};
 
   xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
-    name = "xf86-input-evdev-2.8.3";
+    name = "xf86-input-evdev-2.8.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2;
-      sha256 = "1c067h0452728s39rb1csw4r26ihdhzs4nr722z6gg9mhvb7zv02";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2;
+      sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
   })) // {inherit inputproto udev xorgserver xproto ;};
@@ -1410,11 +1410,11 @@ let
   })) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.7.5";
+    name = "xf86-input-synaptics-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2;
-      sha256 = "1iwiihwbqiq2lxd12ca7j3ajggjbmlk33wsfv2lyyizp3x92710z";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2;
+      sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 7019273dd11..19cf79ca796 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -9,7 +9,7 @@ mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2
 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
-mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2
-mirror://xorg/individual/util/imake-1.0.6.tar.bz2
+mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
+mirror://xorg/individual/util/imake-1.0.7.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5edff19c431..512bbbb9eff 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -115,11 +115,11 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.8.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.7.5.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.7.6.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2

From 4a85312295e97725e19323d65ad3dcc0f988ebdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 22 May 2014 21:28:08 +0200
Subject: [PATCH 1841/2033] mesa: maintenance update 10.1.3 -> .4

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a25079c5617..f77dc4a3711 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -23,7 +23,7 @@ else
 */
 
 let
-  version = "10.1.3";
+  version = "10.1.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1hzcmpa7ykqm0qrvkm52bkfvf855wb9bs8449fwhypgjdqimwqdj";
+    sha256 = "0g2j2zz7yq3i8k8dkji8h7iqfbcm8afb5lrb4dxrcyjl1bh6gibg";
   };
 
   prePatch = "patchShebangs .";

From 8bb7c4e766e82ac834244d2a202ae58181592821 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 26 May 2014 23:59:13 +0200
Subject: [PATCH 1842/2033] haskell-glutil: add version 0.7.4

---
 .../libraries/haskell/GLUtil/default.nix         | 16 ++++++++++++++++
 pkgs/top-level/haskell-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/GLUtil/default.nix

diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix
new file mode 100644
index 00000000000..507beef0663
--- /dev/null
+++ b/pkgs/development/libraries/haskell/GLUtil/default.nix
@@ -0,0 +1,16 @@
+{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "GLUtil";
+  version = "0.7.4";
+  sha256 = "0l1w0k3q5g22y90w5frljqh1v4jb7gjzb3scg79zp42pc9v3h4l5";
+  buildDepends = [
+    cpphs JuicyPixels linear OpenGL OpenGLRaw vector
+  ];
+  buildTools = [ cpphs ];
+  meta = {
+    description = "Miscellaneous OpenGL utilities";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 216037e74cd..129b96be526 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -895,6 +895,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
   };
   GLUT = self.GLUT_2_5_1_1;
 
+  GLUtil = callPackage ../development/libraries/haskell/GLUtil {};
+
   gnuidn = callPackage ../development/libraries/haskell/gnuidn {};
 
   gnuplot = callPackage ../development/libraries/haskell/gnuplot {};

From 481f4286048ae8b38edad39441df36ec42322f4d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 May 2014 00:48:30 +0200
Subject: [PATCH 1843/2033] hipchat: Update to 2.2.1107

---
 .../instant-messengers/hipchat/default.nix    | 108 ++++++++++++------
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 72 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index c0f76602b2b..857f162d7e4 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,59 +1,93 @@
-{ stdenv
-, fetchurl
-, libtool
-, libXext
-, libSM
-, libICE
-, libX11
-, libXft
-, libXau
-, libXdmcp
-, libXrender
-, freetype
-, fontconfig
-, openssl
-}:
+{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib
+, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
+, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra, makeWrapper }:
 
 let
-  version = "1.94.407";
+
+  version = "2.2.1107";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
-    stdenv.gcc.gcc
     libtool
-    libXext
-    libSM
-    libICE
-    libX11
-    libXft
-    libXau
-    libXdmcp
-    libXrender
+    xlibs.libXext
+    xlibs.libSM
+    xlibs.libICE
+    xlibs.libX11
+    xlibs.libXft
+    xlibs.libXau
+    xlibs.libXdmcp
+    xlibs.libXrender
+    xlibs.libXfixes
+    xlibs.libXcomposite
+    xlibs.libxcb
+    xlibs.libXi
     freetype
     fontconfig
     openssl
-  ];
+    glib
+    mesa
+    gstreamer
+    gst_plugins_base
+    dbus
+    alsaLib
+    zlib
+    libuuid
+    libxml2
+    libxslt
+    sqlite
+    libogg
+    libvorbis
+    xz
+    libcanberra
+  ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";
 
-  src = fetchurl {
-    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
-    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
-  };
-in stdenv.mkDerivation {
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
+        sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
+        sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv";
+      }
+    else
+      throw "HipChat is not supported on ${stdenv.system}";
+
+in
+
+stdenv.mkDerivation {
   name = "hipchat-${version}";
 
+  inherit src;
+
+  buildInputs = [ makeWrapper ];
+
   buildCommand = ''
     tar xf ${src}
-    mkdir -p $out
-    mv opt/HipChat/lib $out
-    mv opt/HipChat/bin $out
+
+    d=$out/libexec/hipchat
+    mkdir -p $out/libexec
+    rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*}
+    mv opt/HipChat/lib/ $d
     mv usr/share $out
+
     patchShebangs $out/bin
-    for file in $(find $out/lib -type f); do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
-        patchelf --set-rpath ${rpath}:$out/lib $file || true
+
+    for file in $(find $d -type f); do
+        patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true
+        patchelf --set-rpath ${rpath}:\$ORIGIN $file || true
     done
+
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin
+
+    makeWrapper $d/hipchat.bin $out/bin/hipchat \
+      --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \
+      --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"'
+
+    mv opt/HipChat/bin/linuxbrowserlaunch $out/bin
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0b35e55d47..fd4161190b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8620,7 +8620,7 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
+  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };
 

From a0072b4d2d4233d29ba6456d20f1d87070fcfad2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 27 May 2014 01:00:04 +0200
Subject: [PATCH 1844/2033] hipchat: Fix access to /usr/share/X11/xkb

HipChat (or rather its copy of Qt) expects to find keyboard data in
/usr/share/X11/xkb. So use a LD_PRELOAD library to intercept and
rewrite the Glibc calls that access those paths. We've been doing the
same thing with packages like Spotify, but now this functionality has
been abstracted into a reusable library, libredirect.so. It uses an
environment variable $NIX_REDIRECTS containing a colon-separated list
of path prefixes to be rewritten, e.g. "/foo=bar:/xyzzy=/fnord".
---
 .../instant-messengers/hipchat/default.nix    |  13 ++-
 pkgs/build-support/libredirect/default.nix    |  14 +++
 pkgs/build-support/libredirect/libredirect.c  | 104 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 128 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/build-support/libredirect/default.nix
 create mode 100644 pkgs/build-support/libredirect/libredirect.c

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 857f162d7e4..6da12905f56 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib
 , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
-, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra, makeWrapper }:
+, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra
+, makeWrapper, libredirect, xkeyboard_config }:
 
 let
 
@@ -67,8 +68,8 @@ stdenv.mkDerivation {
   buildCommand = ''
     tar xf ${src}
 
-    d=$out/libexec/hipchat
-    mkdir -p $out/libexec
+    mkdir -p $out/libexec/hipchat/bin
+    d=$out/libexec/hipchat/lib
     rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*}
     mv opt/HipChat/lib/ $d
     mv usr/share $out
@@ -85,9 +86,11 @@ stdenv.mkDerivation {
 
     makeWrapper $d/hipchat.bin $out/bin/hipchat \
       --set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \
-      --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"'
+      --set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"' \
+      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
 
-    mv opt/HipChat/bin/linuxbrowserlaunch $out/bin
+    mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/
   '';
 
   meta = {
diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix
new file mode 100644
index 00000000000..a8a497d46d7
--- /dev/null
+++ b/pkgs/build-support/libredirect/default.nix
@@ -0,0 +1,14 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "libredirect-0";
+
+  unpackPhase = "cp ${./libredirect.c} libredirect.c";
+
+  buildPhase =
+    ''
+      gcc -Wall -std=c99 -O3 -shared libredirect.c -o libredirect.so -fPIC -ldl
+    '';
+
+  installPhase = "mkdir -p $out/lib; cp libredirect.so $out/lib";
+}
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
new file mode 100644
index 00000000000..4afed3add75
--- /dev/null
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -0,0 +1,104 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <string.h>
+
+#define MAX_REDIRECTS 128
+
+static int nrRedirects = 0;
+static char * from[MAX_REDIRECTS];
+static char * to[MAX_REDIRECTS];
+
+// FIXME: might run too late.
+static void init() __attribute__((constructor));
+
+static void init()
+{
+    char * spec = getenv("NIX_REDIRECTS");
+    if (!spec) return;
+
+    unsetenv("NIX_REDIRECTS");
+
+    char * spec2 = malloc(strlen(spec) + 1);
+    strcpy(spec2, spec);
+
+    char * pos = spec2, * eq;
+    while ((eq = strchr(pos, '='))) {
+        *eq = 0;
+        from[nrRedirects] = pos;
+        pos = eq + 1;
+        to[nrRedirects] = pos;
+        nrRedirects++;
+        if (nrRedirects == MAX_REDIRECTS) break;
+        char * end = strchr(pos, ':');
+        if (!end) break;
+        *end = 0;
+        pos = end + 1;
+    }
+
+}
+
+static const char * rewrite(const char * path, char * buf)
+{
+    for (int n = 0; n < nrRedirects; ++n) {
+        int len = strlen(from[n]);
+        if (strncmp(path, from[n], len) != 0) continue;
+        if (snprintf(buf, PATH_MAX, "%s%s", to[n], path + len) >= PATH_MAX)
+            abort();
+        return buf;
+    }
+
+    return path;
+}
+
+/* The following set of Glibc library functions is very incomplete -
+   it contains only what we needed for programs in Nixpkgs. Just add
+   more functions as needed. */
+
+int open(const char * path, int flags, ...)
+{
+    int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    char buf[PATH_MAX];
+    return open_real(rewrite(path, buf), flags, mode);
+}
+
+int open64(const char * path, int flags, ...)
+{
+    int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
+    mode_t mode = 0;
+    if (flags & O_CREAT) {
+        va_list ap;
+        va_start(ap, flags);
+        mode = va_arg(ap, mode_t);
+        va_end(ap);
+    }
+    char buf[PATH_MAX];
+    return open64_real(rewrite(path, buf), flags, mode);
+}
+
+FILE * fopen(const char * path, const char * mode)
+{
+    FILE * (*fopen_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen");
+    char buf[PATH_MAX];
+    return fopen_real(rewrite(path, buf), mode);
+}
+
+int __xstat(int ver, const char * path, struct stat * st)
+{
+    int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat");
+    char buf[PATH_MAX];
+    return __xstat_real(ver, rewrite(path, buf), st);
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd4161190b6..f27efd104df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -373,6 +373,8 @@ let
     inherit url;
   };
 
+  libredirect = callPackage ../build-support/libredirect { };
+
   makeDesktopItem = import ../build-support/make-desktopitem {
     inherit stdenv;
   };

From 400333b9f8e695719704ad2075137d45a6b37cda Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 27 May 2014 02:24:12 -0400
Subject: [PATCH 1845/2033] Add haskell/monad-unify

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 .../libraries/haskell/monad-unify/default.nix       | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/monad-unify/default.nix

diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix
new file mode 100644
index 00000000000..7ee1f8c8704
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-unify/default.nix
@@ -0,0 +1,13 @@
+{ cabal, mtl, unorderedContainers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-unify";
+  version = "0.2.2";
+  sha256 = "1icl4jaa4vc4lb75m6wv4vjvf8b2xx7aziqhsg2pshizdkfxmgwp";
+  buildDepends = [ mtl unorderedContainers ];
+  meta = {
+    description = "Generic first-order unification";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 216037e74cd..11f0278c20f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1442,6 +1442,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
 
+  monadUnify = callPackage ../development/libraries/haskell/monad-unify {};
+
   monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
 
   monoidTransformer = callPackage ../development/libraries/haskell/monoid-transformer {};

From 8228ca04799ab9a6757d29faca45c16d208e125d Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 27 May 2014 02:27:25 -0400
Subject: [PATCH 1846/2033] Add haskell/pattern-arrows

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 .../libraries/haskell/pattern-arrows/default.nix   | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/pattern-arrows/default.nix

diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix
new file mode 100644
index 00000000000..a73432fe62b
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pattern-arrows/default.nix
@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "pattern-arrows";
+  version = "0.0.2";
+  sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
+    description = "Arrows for Pretty Printing";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 11f0278c20f..ff22b7a9f25 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1627,6 +1627,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pathtype = callPackage ../development/libraries/haskell/pathtype {};
 
+  patternArrows = callPackage ../development/libraries/haskell/pattern-arrows {};
+
   pbkdf = callPackage ../development/libraries/haskell/pbkdf {};
 
   pcap = callPackage ../development/libraries/haskell/pcap {};

From 03b54bcd5575237f86e92a58c5fd970fcda6ff39 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 27 May 2014 03:07:05 -0400
Subject: [PATCH 1847/2033] Add haskell/purescript :D

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 .../libraries/haskell/purescript/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/purescript/default.nix

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
new file mode 100644
index 00000000000..bbf380f3e73
--- /dev/null
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -0,0 +1,24 @@
+{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec
+, patternArrows, time, transformers, unorderedContainers
+, utf8String, xdgBasedir
+}:
+
+cabal.mkDerivation (self: {
+  pname = "purescript";
+  version = "0.5.2.1";
+  sha256 = "1dr34capgjlyjsaghsv11zz6ph5l0y8dz0q398f0f3hplcal3f58";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [
+    cmdtheline filepath haskeline monadUnify mtl parsec patternArrows
+    time transformers unorderedContainers utf8String xdgBasedir
+  ];
+  # The example don't seem to get packaged in the release.
+  doCheck = false;
+  meta = {
+    homepage = "http://www.purescript.org/";
+    description = "PureScript Programming Language Compiler";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index ff22b7a9f25..a5a94e5a101 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1752,6 +1752,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   pureMD5 = callPackage ../development/libraries/haskell/pureMD5 {};
 
+  purescript = callPackage ../development/libraries/haskell/purescript {};
+
   pwstoreFast = callPackage ../development/libraries/haskell/pwstore-fast {};
 
   QuickCheck_1_2_0_0 = callPackage ../development/libraries/haskell/QuickCheck/1.2.0.0.nix {};

From c05f252dac1a8f6635a9d96074fba018694ed179 Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Tue, 27 May 2014 14:28:09 +1200
Subject: [PATCH 1848/2033] Definitions for Open Dylan 2013.2 (Dylan Language
 Implementation)

---
 pkgs/development/compilers/opendylan/bin.nix  | 41 +++++++++++++++++++
 .../compilers/opendylan/default.nix           | 37 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/development/compilers/opendylan/bin.nix
 create mode 100644 pkgs/development/compilers/opendylan/default.nix

diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
new file mode 100644
index 00000000000..bab8e66799b
--- /dev/null
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -0,0 +1,41 @@
+# Binaries provided by Open Dylan to be used to bootstrap from source.
+# The binaries can also be used as is.
+{stdenv, fetchurl, patchelf, boehmgc, gnused, gcc, makeWrapper}:
+
+stdenv.mkDerivation {
+  name = "opendylan-2013.2";
+
+  src = if stdenv.system == "x86_64-linux" then fetchurl {
+      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2;
+      sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h";
+    }
+    else if stdenv.system == "i686-linux" then fetchurl {
+      url = http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2;
+      sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5";
+    }
+    else throw "platform ${stdenv.system} not supported.";
+
+  buildInputs = [ patchelf boehmgc gnused makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p "$out"
+    tar --strip-components=1 -xjf "$src" -C "$out"
+
+    interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)"
+    for a in "$out"/bin/*; do 
+      patchelf --set-interpreter "$interpreter" "$a"
+      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+    done
+    for a in "$out"/lib/*.so; do 
+      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+    done
+    sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
+    wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin
+  '';
+
+  meta = {
+    homepage = http://opendylan.org;
+    description = "Dylan is a multi-paradigm functional and object-oriented programming language.";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix
new file mode 100644
index 00000000000..b1ee1d000c4
--- /dev/null
+++ b/pkgs/development/compilers/opendylan/default.nix
@@ -0,0 +1,37 @@
+# Build Open Dylan from source using the binary builds to bootstrap.
+{stdenv, fetchgit, patchelf, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }:
+
+stdenv.mkDerivation {
+  name = "opendylan-2013.2";
+
+  src = fetchgit {
+    url = https://github.com/dylan-lang/opendylan;
+    rev = "ce9b14dab6cb9ffedc69fae8c6df524c0c79abd3";
+    sha256 = "cec80980b838ac2581dfb6282e25d208e720d475256b75e24b23dbd30b09d21f";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = (if stdenv.system == "i686-linux" then [ mps ] else [ boehmgc ]) ++ [
+    opendylan-bootstrap boehmgc gnused autoconf automake perl makeWrapper
+  ] ;
+
+  preConfigure = if stdenv.system == "i686-linux" then ''
+    mkdir -p $TMPDIR/mps
+    tar --strip-components=1 -xf ${mps.src} -C $TMPDIR/mps
+    ./autogen.sh
+  ''
+  else ''
+    ./autogen.sh
+  '';
+
+  configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}";
+  buildPhase = "make 3-stage-bootstrap";
+
+  postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";
+
+  meta = {
+    homepage = http://opendylan.org;
+    description = "Dylan is a multi-paradigm functional and object-oriented programming language.";
+    license = "MIT";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f27efd104df..33e5987a683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1661,6 +1661,12 @@ let
 
   opendkim = callPackage ../development/libraries/opendkim { };
 
+  opendylan = callPackage ../development/compilers/opendylan {
+    opendylan-bootstrap = opendylan_bin;
+  };
+
+  opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
+
   openjade = callPackage ../tools/text/sgml/openjade {
     perl = perl510;
   };

From cfb788471927676e102ed8188e4f03d92274d2d3 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 27 May 2014 09:13:07 +0000
Subject: [PATCH 1849/2033] Add expression for the YUI compressor

---
 .../tools/yuicompressor/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/yuicompressor/default.nix

diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
new file mode 100644
index 00000000000..5dcc30811e2
--- /dev/null
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "yuicompressor";
+  version = "2.4.8";
+  src = fetchurl {
+    url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar";
+    sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
+  };
+
+  meta = {
+    description = "A JavaScript and CSS minifier";
+    maintainers = [ stdenv.lib.maintainers.jwiegley ];
+    platforms = stdenv.lib.platforms.all;
+    homepage = http://yui.github.io/yuicompressor/;
+    license = stdenv.lib.licenses.bsd3;
+  };
+
+  buildCommand = ''
+    ensureDir $out/lib
+    ln -s $src $out/lib/yuicompressor.jar
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6e33a39646..2b917893d1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6315,6 +6315,7 @@ let
 
   jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { };
 
+  yuicompressor = callPackage ../development/tools/yuicompressor { };
 
   ### DEVELOPMENT / LISP MODULES
 

From d32593a222c4bd589067840d87eaac1da3e610b1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 27 May 2014 11:18:02 +0200
Subject: [PATCH 1850/2033] tibia: 10.41

Also I'm personally done with this game so I will no longer maintain the
package.
---
 pkgs/games/tibia/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index a980aa53f5f..698653784a7 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.40";
+  name = "tibia-10.41";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1040.tgz;
-    sha256 = "1d6wibwr84cnglnc0c9d6m3nynbg2zwgnxpyy9ykqiiwsz8qgzyg";
+    url = http://static.tibia.com/download/tibia1041.tgz;
+    sha256 = "1hmqn9c6qaa79ldcnl4ws9dm6rd3ymy48fw254pl6g601amn7b8v";
   };
 
   shell = stdenv.shell;
@@ -52,7 +52,6 @@ stdenv.mkDerivation {
     description = "Top-down MMORPG set in a fantasy world";
     homepage = "http://tibia.com";
     license = "unfree";
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
     platforms = ["i686-linux"];
   };
 }

From e13d6d36aead1e820d780be4b7732fa0e7e4a3d8 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Tue, 27 May 2014 11:13:47 +0200
Subject: [PATCH 1851/2033] pythonPackages.pyramid_tm: set doCheck to false

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f0c07bd82d..234a0b396a0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2189,11 +2189,15 @@ rec {
       md5 = "6dc917d262c69366630c542bd21859a3";
     };
 
+    # tests are failing in version 0.7 but are fixed in trunk
+    doCheck = false;
+
     propagatedBuildInputs = [ transaction pyramid ];
     meta = {
       maintainers = [
         stdenv.lib.maintainers.garbas
         stdenv.lib.maintainers.iElectric
+        stdenv.lib.maintainers.matejc
       ];
       platforms = stdenv.lib.platforms.all;
     };

From 057213902078ccaaf93480a50ab5e1b8bb22b31f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 27 May 2014 10:53:51 +0000
Subject: [PATCH 1852/2033] Correct the source URL for dovecot-pigeonhole

---
 pkgs/servers/mail/dovecot-pigeonhole/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
index bf56d7b9bfd..3ee73520d7a 100644
--- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot-pigeonhole/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.4.3";
 
   src = fetchurl {
-    url = "http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
+    url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
     sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn";
   };  
 

From 155de0279e78d04ae6dc6885ae85879bf4aa85da Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Tue, 27 May 2014 11:50:30 +0100
Subject: [PATCH 1853/2033] Added goaccess package

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

diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
new file mode 100644
index 00000000000..56e18227d66
--- /dev/null
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }:
+
+let
+  version = "0.8";
+  mainSrc = fetchurl {
+    url = "http://tar.goaccess.prosoftcorp.com/goaccess-${version}.tar.gz";
+    sha256 = "a61215b1f3e82bdb50c892e843f1a85d6d85f882915d694a5672911fab955eea";
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "goaccess-${version}";
+  src = mainSrc;
+
+  configureFlags = [
+    "--enable-geoip"
+    "--enable-utf8"
+  ];
+
+  buildInputs = [ 
+    pkgconfig
+    geoip 
+    ncurses
+    glib
+  ];
+
+  meta = {
+    description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems.";
+    homepage    = http://goaccess.prosoftcorp.com;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5484005f4d..47f4353cf91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1150,6 +1150,8 @@ let
 
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
+  goaccess = callPackage ../tools/misc/goaccess { };
+  
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
   gource = callPackage ../applications/version-management/gource {};

From c1bbfbc13e3f6746c726ce2fe24fe2c3c2b426d4 Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Tue, 27 May 2014 07:11:34 -0400
Subject: [PATCH 1854/2033] add screenfetch

Signed-off-by: Ricky Elrod <ricky@elrod.me>
---
 pkgs/tools/misc/screenfetch/default.nix | 38 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/screenfetch/default.nix

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
new file mode 100644
index 00000000000..0ebc712fcf0
--- /dev/null
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, xdpyinfo, xprop }:
+
+let
+  version = "2014-05-27";
+in
+stdenv.mkDerivation {
+  name = "screenFetch-${version}";
+  pname = "screenfetch";
+
+  src = fetchgit {
+    url = git://github.com/KittyKatt/screenFetch.git;
+    rev = "69c46cb94b5765dbcb36905c5a35c42eb8e6e470";
+    sha256 = "0479na831120bpyrg5nb3nb1jr8p8ahkixk1znwg730q3vdcjd6j";
+  };
+
+  installPhase = ''
+    install -Dm 0755 $pname-dev $out/bin/$pname
+    install -Dm 0644 $pname.1 $out/man/man1/$pname.1
+  '';
+
+  meta = {
+    description = "Fetches system/theme information in terminal for Linux desktop screenshots.";
+    longDescription = ''
+    screenFetch is a "Bash Screenshot Information Tool". This handy Bash
+    script can be used to generate one of those nifty terminal theme
+    information + ASCII distribution logos you see in everyone's screenshots
+    nowadays. It will auto-detect your distribution and display an ASCII
+    version of that distribution's logo and some valuable information to the
+    right. There are options to specify no ascii art, colors, taking a
+    screenshot upon displaying info, and even customizing the screenshot
+    command! This script is very easy to add to and can easily be extended.
+    '';
+    license = stdenv.lib.licenses.gpl3;
+    homepage = http://git.silverirc.com/cgit.cgi/screenfetch-dev.git/;
+    maintainers = with stdenv.lib.maintainers; [relrod];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f27efd104df..67b86165bd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1976,6 +1976,8 @@ let
 
   seqdiag = pythonPackages.seqdiag;
 
+  screenfetch = callPackage ../tools/misc/screenfetch { };
+
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
   sharutils = callPackage ../tools/archivers/sharutils { };

From 31bc96eee7a74ba80fac670372af9a30ed73d5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 27 May 2014 16:54:26 +0200
Subject: [PATCH 1855/2033] Updating syncthing to 0.8.11.

---
 .../networking/syncthing/default.nix          | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 72a4a55069a..12aa98758ad 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "syncthing-${version}";
-  version = "0.8.5";
+  version = "0.8.11";
 
   src = fetchgit {
     url = "git://github.com/calmh/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0525fvar5c22sxg7737ajny80srds1adhi73a8yr12wsjnsqfi6x";
+    sha256 = "16dl9sqwhv0n1602pmi10d5j7z2196ijhvz4rfx7732210qbkpnn";
   };
 
   buildInputs = [ go ];
@@ -15,17 +15,10 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mkdir -p "./dependencies/src/github.com/calmh/syncthing"
 
-    cp -r "./auto" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./buffers" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./cid" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./discover" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./files" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./lamport" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./protocol" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./scanner" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./mc" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./xdr" "./dependencies/src/github.com/calmh/syncthing"
-    cp -r "./upnp" "./dependencies/src/github.com/calmh/syncthing"
+    for a in auto buffers cid discover files lamport protocol scanner \
+            logger beacon config xdr upnp model osutil versioner; do
+        cp -r "./$a" "./dependencies/src/github.com/calmh/syncthing"
+    done
 
     export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies"
 

From 4c792e58aafc39ca2c419ab2fcbb3d42223e5928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 27 May 2014 16:54:58 +0200
Subject: [PATCH 1856/2033] ncmpc: another attempt to fix linkage on darwin

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

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index f690b914abe..3b1b3154eda 100755
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]
     ++ libintlOrEmpty;
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = with stdenv.lib; {
     description = "Curses-based interface for MPD (music player daemon)";
     homepage    = http://www.musicpd.org/clients/ncmpc/;

From 4fa451887550588674025822c7d94787fad8da20 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Sat, 29 Mar 2014 11:40:30 +1100
Subject: [PATCH 1857/2033] Add TeamSpeak 3 server & service module (close
 #2056)

Conflicts (trivial):
	lib/maintainers.nix
	nixos/modules/misc/ids.nix
---
 lib/maintainers.nix                           |   1 +
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/teamspeak3.nix        | 142 ++++++++++++++++++
 .../instant-messengers/teamspeak/server.nix   |  99 ++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 6 files changed, 246 insertions(+)
 create mode 100644 nixos/modules/services/networking/teamspeak3.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/teamspeak/server.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 80d0bed23dc..109e7956a58 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -14,6 +14,7 @@
   AndersonTorres = "Anderson Torres <torres.anderson.85@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   antono = "Antono Vasiljev <self@antono.info>";
+  arobyn = "Alexei Robyn <shados@shados.net>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 207da2a39bf..13ec502047d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -131,6 +131,7 @@
       starbound = 120;
       hydra = 122;
       spiped = 123;
+      teamspeak = 124;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -236,6 +237,7 @@
       grsecurity = 121;
       hydra = 122;
       spiped = 123;
+      teamspeak = 124;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index def4d10f366..0737da71923 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -222,6 +222,7 @@
   ./services/networking/syncthing.nix
   ./services/networking/ssh/lshd.nix
   ./services/networking/ssh/sshd.nix
+  ./services/networking/teamspeak3.nix
   ./services/networking/tftpd.nix
   ./services/networking/unbound.nix
   ./services/networking/vsftpd.nix
diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix
new file mode 100644
index 00000000000..2d3478d52f8
--- /dev/null
+++ b/nixos/modules/services/networking/teamspeak3.nix
@@ -0,0 +1,142 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+  ts3 = pkgs.teamspeak_server;
+  cfg = config.services.teamspeak3;
+  user = "teamspeak";
+  group = "teamspeak";
+in
+
+{
+  
+  ###### interface
+
+  options = {
+
+    services.teamspeak3 = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to run the Teamspeak3 voice communication server daemon.
+        '';
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/teamspeak3-server";
+        description = ''
+          Directory to store TS3 database and other state/data files.
+        '';
+      };
+
+      logPath = mkOption {
+        type = types.path;
+        default = "/var/log/teamspeak3-server/";
+        description = ''
+          Directory to store log files in.
+        '';
+      };
+
+      voiceIP = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          IP on which the server instance will listen for incoming voice connections. Defaults to any IP.
+        '';
+      };
+
+      defaultVoicePort = mkOption {
+        type = types.int;
+        default = 9987;
+        description = ''
+          Default UDP port for clients to connect to virtual servers - used for first virtual server, subsequent ones will open on incrementing port numbers by default.
+        '';
+      };
+
+      fileTransferIP = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          IP on which the server instance will listen for incoming file transfer connections. Defaults to any IP.
+        '';
+      };
+
+      fileTransferPort = mkOption {
+        type = types.int;
+        default = 30033;
+        description = ''
+          TCP port opened for file transfers.
+        '';
+      };
+
+      queryIP = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          IP on which the server instance will listen for incoming ServerQuery connections. Defaults to any IP.
+        '';
+      };
+
+      queryPort = mkOption {
+        type = types.int;
+        default = 10011;
+        description = ''
+          TCP port opened for ServerQuery connections.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.teamspeak =
+      { name = "teamspeak";
+        description = "Teamspeak3 voice communication server daemon";
+        group = group;
+        uid = config.ids.uids.teamspeak;
+      };
+
+    users.extraGroups.teamspeak =
+      { name = "teamspeak";
+        gid = config.ids.gids.teamspeak;
+      };
+
+    systemd.services.teamspeak3-server = { 
+      description = "Teamspeak3 voice communication server daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        mkdir -p ${cfg.dataDir}
+        mkdir -p ${cfg.logPath}
+        chown ${user}:${group} ${cfg.dataDir}
+        chown ${user}:${group} ${cfg.logPath}
+      '';
+
+      serviceConfig =
+        { ExecStart = ''
+            ${ts3}/bin/ts3server \
+              dbsqlpath=${ts3}/lib/teamspeak/sql/ logpath=${cfg.logPath} \
+              voice_ip=${cfg.voiceIP} default_voice_port=${toString cfg.defaultVoicePort} \
+              filetransfer_ip=${cfg.fileTransferIP} filetransfer_port=${toString cfg.fileTransferPort} \
+              query_ip=${cfg.queryIP} query_port=${toString cfg.queryPort}
+          '';
+          WorkingDirectory = cfg.dataDir;
+          User = user;
+          Group = group;
+          PermissionsStartOnly = true; # preStart needs to run with root permissions
+        };
+      };
+
+  };
+
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
new file mode 100644
index 00000000000..7a57cb8ad62
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -0,0 +1,99 @@
+{ stdenv, fetchurl, makeWrapper }:
+
+let
+
+  version = "3.0.10.3";
+
+  arch = if stdenv.is64bit then "amd64" else "x86";
+ 
+  libDir = if stdenv.is64bit then "lib64" else "lib";
+in
+
+stdenv.mkDerivation {
+  name = "teamspeak-server-${version}";
+
+  src = fetchurl {
+    urls = [
+       "http://dl.4players.de/ts/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz"
+      "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux-${arch}-${version}.tar.gz"
+    ];
+    sha256 = if stdenv.is64bit 
+      then "9606dd5c0c3677881b1aab833cb99f4f12ba08cc77ef4a97e9e282d9e10b0702"
+      else "8b8921e0df04bf74068a51ae06d744f25d759a8c267864ceaf7633eb3f81dbe5";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      mv ts3server_linux_${arch} ts3server
+      echo "patching ts3server"
+      patchelf \
+        --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        --set-rpath $(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \
+        --force-rpath \
+        ts3server
+    '';
+
+  installPhase =
+    ''
+      # Delete unecessary libraries - these are provided by nixos.
+      #rm *.so*
+
+      # Install files.
+      mkdir -p $out/lib/teamspeak
+      mv * $out/lib/teamspeak/
+
+      # Make a symlink to the binary from bin.
+      mkdir -p $out/bin/
+      ln -s $out/lib/teamspeak/ts3server $out/bin/ts3server
+
+      wrapProgram $out/lib/teamspeak/ts3server --prefix LD_LIBRARY_PATH : $out/lib/teamspeak
+    '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+  
+  meta = { 
+    description = "TeamSpeak voice communication server";
+    homepage = http://teamspeak.com/;
+    license = stdenv.lib.licenses.unfreeRedistributable;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.arobyn ];
+  };
+}
+
+/*
+License issues:
+Date: Mon, 10 Dec 2007 19:55:16 -0500
+From: TeamSpeak Sales <sales@tritoncia.com>
+To: 'Marc Weber' <marco-oweber@gmx.de>
+Subject: RE: teamspeak on nix?
+
+Yes, that would be fine.  As long as you are not renting servers or selling
+TeamSpeak then you are more than welcome to distribute it.
+
+Thank you,
+
+TeamSpeak Sales Team
+________________________________
+e-Mail: sales@tritoncia.com
+TeamSpeak: http://www.TeamSpeak.com
+Account Login: https://sales.TritonCIA.com/users
+
+
+
+-----Original Message-----
+From: Marc Weber [mailto:marco-oweber@gmx.de]
+Sent: Monday, December 10, 2007 5:03 PM
+To: sales@tritoncia.com
+Subject: teamspeak on nix?
+
+Hello,
+
+nix is very young software distribution system (http://nix.cs.uu.nl/)
+I'd like to ask wether you permit us to add teamspeak (server/ client?)
+
+Sincerly
+Marc Weber (small nix contributor)
+*/
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45afaec8e34..d1c66f42a87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9421,6 +9421,7 @@ let
   };
 
   teamspeak_client = callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   taskjuggler = callPackage ../applications/misc/taskjuggler { };
 

From 23fb83b37ddc6a3cdfe3af50ad358cf040fea266 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 27 May 2014 12:53:26 -0500
Subject: [PATCH 1858/2033] Correctly locate Haddocks in hoogle-local
 expression

On some versions of GHC, documentation is at, for example:

    LIB/share/doc/

In others, it is at:

    LIB/share/doc/x86_64-darwin-ghc7.6.3/

This change will pick up documentation first from the second location, then
from the first.
---
 pkgs/development/libraries/haskell/hoogle/local.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
index 20816d3b2f9..337cd4c8154 100644
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -73,7 +73,8 @@ cabal.mkDerivation (self: rec {
 
     for i in $docPackages; do
         import_dbs $i/share/doc
-        ln -sf $i/share/doc/* $out/share/hoogle/doc
+        ln -sf $i/share/doc/*-ghc-*/* $out/share/hoogle/doc 2> /dev/null \
+            || ln -sf $i/share/doc/* $out/share/hoogle/doc
     done
 
     import_dbs ${self.ghc}/share/doc/ghc*/html/libraries

From 93936fdf8af22e243b367ce616e1efd8ccc76d3a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 27 May 2014 12:57:50 -0500
Subject: [PATCH 1859/2033] Add expression for building crafty and craftyFull

---
 pkgs/games/crafty/default.nix   | 665 ++++++++++++++++++++++++++++++++
 pkgs/games/crafty/malloc.patch  |  11 +
 pkgs/games/crafty/strcpy.patch  |  21 +
 pkgs/top-level/all-packages.nix |   3 +
 4 files changed, 700 insertions(+)
 create mode 100644 pkgs/games/crafty/default.nix
 create mode 100644 pkgs/games/crafty/malloc.patch
 create mode 100644 pkgs/games/crafty/strcpy.patch

diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
new file mode 100644
index 00000000000..65cdd14539b
--- /dev/null
+++ b/pkgs/games/crafty/default.nix
@@ -0,0 +1,665 @@
+{ stdenv, fetchurl, unzip, fullVariant }:
+
+stdenv.mkDerivation rec {
+  name = "crafty-23.4";
+  
+  src = fetchurl {
+    url = http://www.craftychess.com/crafty-23.4.zip;
+    sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl";
+  };
+
+  bookBin = fetchurl {
+    url = http://www.craftychess.com/book.bin;
+    sha256 = "1j8f33iks4xf19bpv2mpvxrnlm5w1f5fbnxcrxasg9p7w600wyb8";
+  };
+
+  startPgn = fetchurl {
+    url = http://www.cis.uab.edu/hyatt/crafty/pgn/start.pgn;
+    sha256 = "08c066acqwgr19jkaizdbzdpcm3ld5nsixv5wp9pnc37b8w9f0vm";
+  };
+
+  enormousPgn = stdenv.lib.optionalString fullVariant (fetchurl {
+    url = http://www.cis.uab.edu/hyatt/crafty/pgn/enormous.zip;
+    sha256 = "001574gz3881xfvhlc2wy6pg66c4sh0q2ms42swwvq0l80syz6y2";
+  });
+
+  tableBases345 =
+    let root = http://www.cis.uab.edu/hyatt/crafty/TB/3-4-5/;
+    in stdenv.lib.optionals fullVariant (map fetchurl [
+      { url = root + "kbbbk.nbb.emd";
+        sha256 = "1yssskq32x22ki67ja7azvlglz0vgq6d6awdz4avj1k72nbcs90g"; }
+      { url = root + "kbbbk.nbw.emd";
+        sha256 = "0n0hy09pnp0ldxkrvs1gz1ch7px0hzj1ni7iicfy7y9zhsqaky2r"; }
+      { url = root + "kbbk.nbb.emd";
+        sha256 = "1gyd2p546rapisbzjpqm1kbdlsj77yw46lr5wx28sng11wkz8xnk"; }
+      { url = root + "kbbk.nbw.emd";
+        sha256 = "1gvl0vw9k22wkas8mzdik2ynnykgiisp8smyf97i0v7h1y7bxsx5"; }
+      { url = root + "kbbkb.nbb.emd";
+        sha256 = "0zk12q2d3xfbj7zv9jkk0p1gzj7n640jynx7nkcfhmpz9qvjz5d1"; }
+      { url = root + "kbbkb.nbw.emd";
+        sha256 = "1kw68pbs12cjf0gg40j5b694zdyffprjblf56czgyj8xpfz219x9"; }
+      { url = root + "kbbkn.nbb.emd";
+        sha256 = "0gibrw89zlz93sdi8bkhy0pkfcgl4sswbm3vg6fgp752cwsvksiv"; }
+      { url = root + "kbbkn.nbw.emd";
+        sha256 = "0v781yid5g57y3raw5pqhr2cb8zm0rscim0zszypp4piz22pb60h"; }
+      { url = root + "kbbkp.nbb.emd";
+        sha256 = "1y2nxqqd7fhk7x2fc3dxidqlcrgcbwd9gkk4bggay3xds9m5nhrg"; }
+      { url = root + "kbbkp.nbw.emd";
+        sha256 = "0py5adrciqbs0cdwh1lz5q8ldkyvqbc7rx4995k6kvlq4nh95qam"; }
+      { url = root + "kbbkq.nbb.emd";
+        sha256 = "141jkx0ifb91b5nwps4xssvvcm1fny8ng1zxqsjb1n9dgsigsna7"; }
+      { url = root + "kbbkq.nbw.emd";
+        sha256 = "0iknfd1rjm4ar4gycg0yzw5dbf7hs3y1fnb3s9abypk8pkn8ga9d"; }
+      { url = root + "kbbkr.nbb.emd";
+        sha256 = "0jpp1f0rgglrn7gc36v7y38rivwl68s6gr2p15lqdvngismmyp13"; }
+      { url = root + "kbbkr.nbw.emd";
+        sha256 = "0gqs5bxg6kv4nw0sl0drfs9p043q10ic6d9il0rlvs6qds6d9bv0"; }
+      { url = root + "kbbnk.nbb.emd";
+        sha256 = "0x7q6clkhfv3scqyyj42b8r7jkd99v396pmih2f10a4scca3glxc"; }
+      { url = root + "kbbnk.nbw.emd";
+        sha256 = "1qry3mpl1rjsjasayfxhh6abnm7arfdljnz9q2n5v769kaqx1bx3"; }
+      { url = root + "kbbpk.nbb.emd";
+        sha256 = "1y2vx6i351nbfrbg5qkjyp9ys8vkb45i5101gz8fx1w3pkxq9312"; }
+      { url = root + "kbbpk.nbw.emd";
+        sha256 = "16jkjb1ljyck5k4mr3pwxasxb1l08h7mcc0iigjlgzrnvsc38nrb"; }
+      { url = root + "kbk.nbb.emd";
+        sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; }
+      { url = root + "kbk.nbw.emd";
+        sha256 = "1lks1fccaikrc455cadkw1h1012jk6nqfmqzi40ilmlckc3i7pnj"; }
+      { url = root + "kbkb.nbb.emd";
+        sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; }
+      { url = root + "kbkb.nbw.emd";
+        sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; }
+      { url = root + "kbkn.nbb.emd";
+        sha256 = "1cwzqb64q7br94pc1wbp86k4fpcii14wcsj3f7l5n9mmgrzk3y9k"; }
+      { url = root + "kbkn.nbw.emd";
+        sha256 = "17wnagdkc25d6daqa3cmr0923k4d98jjzpw1h4g70r19zrnczjn5"; }
+      { url = root + "kbkp.nbb.emd";
+        sha256 = "05mcmbwwrp4iljlw0ba7d6vgh0w1pl5a1vsmvsg56k4npx6npc95"; }
+      { url = root + "kbkp.nbw.emd";
+        sha256 = "1jsh96mrhshj07x9sv3prl4zzhpl2xmdr6znxshyr461481b6g7m"; }
+      { url = root + "kbnk.nbb.emd";
+        sha256 = "0k6bn47hdj36szqcbh66wcbv3ygxv6cm0zj36rl9n1c7rc9j7p4g"; }
+      { url = root + "kbnk.nbw.emd";
+        sha256 = "0rhkzsw9zw36zckjic6dd95psx90fr4d8rzbhkqskh8l945cyxky"; }
+      { url = root + "kbnkb.nbb.emd";
+        sha256 = "10mblq1n0m0ipfs4zdnnay6dmwafshb8l5mynfrn5wiaf26jysvz"; }
+      { url = root + "kbnkb.nbw.emd";
+        sha256 = "0h90b4a6m7pp0qfc1anm30ffqwmaj3h1zslsbivw4k8i0jnpfqax"; }
+      { url = root + "kbnkn.nbb.emd";
+        sha256 = "009rw6czd9zagly7nz43rd9vq60h57mfrlzx02cchn1ydsr6cnj2"; }
+      { url = root + "kbnkn.nbw.emd";
+        sha256 = "03harm479g91s2lb5ixk27n50kj15qjz8784nn1rmmcicisj4z7c"; }
+      { url = root + "kbnkp.nbb.emd";
+        sha256 = "0y737si4zrf8ac9jmn9sbwylcd1yvcxn5ihn128p2kan3956fpdv"; }
+      { url = root + "kbnkp.nbw.emd";
+        sha256 = "1902fn3pwrslxi4rv8lrahwq3hakz9kfq70b8c0hqshf44h06ggi"; }
+      { url = root + "kbnkq.nbb.emd";
+        sha256 = "112chi9pw5fqrpv4q4a9p8jc5zld8wkiwd9y71rky09z7zng4vy5"; }
+      { url = root + "kbnkq.nbw.emd";
+        sha256 = "1m1pdsq9zl9g2fs2gjp76za3qmdrv0k1ngxvz3cjyh3p08lixca0"; }
+      { url = root + "kbnkr.nbb.emd";
+        sha256 = "13nkcvcn70g3q5fgrhbc8qs0i0fl7k78m5pxdgmijbkax52kpfgl"; }
+      { url = root + "kbnkr.nbw.emd";
+        sha256 = "0kjplgzbza4wp8aqf7b4k9nqg0vzdj0q6nj90sg7ssiw2w95z1jz"; }
+      { url = root + "kbnnk.nbb.emd";
+        sha256 = "1v3a5fi2fnh9mr9j59dv8jw2inx55jsfg9ypn92dgdmmlwg688yr"; }
+      { url = root + "kbnnk.nbw.emd";
+        sha256 = "096l2zpi7ywrqsapkz47pcivkh2igsdmxb8szd9gq8ylylrsma37"; }
+      { url = root + "kbnpk.nbb.emd";
+        sha256 = "1011x2w59fjn89nd8yqhvjcxdwla4chifwvx3hml2g82rfqgmw5r"; }
+      { url = root + "kbnpk.nbw.emd";
+        sha256 = "1nvqwv6akdr5acs9cdcf1zircw351fmf433niyc7blzqa0nng7n1"; }
+      { url = root + "kbpk.nbb.emd";
+        sha256 = "1bbyr59kapp6f2r4mn1b79668b6gf1j0pwh6f3fcym7xms7gg28k"; }
+      { url = root + "kbpk.nbw.emd";
+        sha256 = "0bn70m7g225mpbs1s7vpw5swd12wwziryp25sv2z5xpg03y7zm10"; }
+      { url = root + "kbpkb.nbb.emd";
+        sha256 = "0clwycpzqklasqw5igk74sm9w6wqwx6h8dbqajpccq3l6ipf2ylx"; }
+      { url = root + "kbpkb.nbw.emd";
+        sha256 = "0w7sf6q3m2hn9ix7lyg1c8casz3qxnzqvfvsbsda46xx5chrp7wh"; }
+      { url = root + "kbpkn.nbb.emd";
+        sha256 = "052fi7b56qq46pc4hvr5wpxkr0gv7wq0cnp5550qbr7an446nbri"; }
+      { url = root + "kbpkn.nbw.emd";
+        sha256 = "1lbwj845qff7y51iw4fybqvpcbh9r5jlfphmhidzdkjhd2gflb0j"; }
+      { url = root + "kbpkp.nbb.emd";
+        sha256 = "1ybzqw8fjqal6n6isy2m9rhhykd8g81slvc5m55ccald63zalk43"; }
+      { url = root + "kbpkp.nbw.emd";
+        sha256 = "139dm4709pvzxn6aixfsbv88ly0cjn6dk7khr1sjf2x17c21mj69"; }
+      { url = root + "kbpkq.nbb.emd";
+        sha256 = "0640xw9hasgif9cxyskpp397dzvhwnpkcfyn33d4vbi4r0cbdv81"; }
+      { url = root + "kbpkq.nbw.emd";
+        sha256 = "13yhn55y65pl6bh67hlfjlwj3mm4w6gy1y34qypgc7kck0rrygn6"; }
+      { url = root + "kbpkr.nbb.emd";
+        sha256 = "03avk4igjdyh6ayh3xm0ds8agmqhagyxmv3s8g8830qk3a6frkz3"; }
+      { url = root + "kbpkr.nbw.emd";
+        sha256 = "0vqkywgxkys0dxnx0sv35kzx9fxhqzbnk4qskjzd1fw9ck21pnad"; }
+      { url = root + "kbppk.nbb.emd";
+        sha256 = "0i4zgsp7izp789chl1vlp93dy567schz96my19vgki1y3ifx4wkz"; }
+      { url = root + "kbppk.nbw.emd";
+        sha256 = "0ki9a0f5cp7ma9zrabjrz5alk6d3xihl388j1h9ii4g52g1zci3v"; }
+      { url = root + "knk.nbb.emd";
+        sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; }
+      { url = root + "knk.nbw.emd";
+        sha256 = "0irmycxkah9j5qf9inmrz6cvjv8i894vzg5378qmazkpgpmzvix8"; }
+      { url = root + "knkn.nbb.emd";
+        sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; }
+      { url = root + "knkn.nbw.emd";
+        sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; }
+      { url = root + "knkp.nbb.emd";
+        sha256 = "1cfav9xgsmvs44j4irw1mx04phszlasz96i26ik8lw8wjdl8x6vx"; }
+      { url = root + "knkp.nbw.emd";
+        sha256 = "0p560zfmixmcizy60f13lz5a3yd83w7bz06cac0nj0myv4m4s6yp"; }
+      { url = root + "knnk.nbb.emd";
+        sha256 = "1w1dh6lmmrxjfi6srmznqvc7frzxhrs48f5g0jijb410y2c26y0l"; }
+      { url = root + "knnk.nbw.emd";
+        sha256 = "1a9nvqk0w2xhwx5d2ia35z8g2xcsg2kh59ca1jwbvx9sh438b2xh"; }
+      { url = root + "knnkb.nbb.emd";
+        sha256 = "1r8g6ml0hi6fxmff396wjnff76csrq47si1s0qsy1cdfkvax7yyn"; }
+      { url = root + "knnkb.nbw.emd";
+        sha256 = "1v74lhr44s0plxab7qhn4crf55hhp4j7w2mr090sfxz0bzk7cb78"; }
+      { url = root + "knnkn.nbb.emd";
+        sha256 = "1fy4ksqncjv0iqf0papy8hb353di0k39aq0jqh5jvshl9vmspz15"; }
+      { url = root + "knnkn.nbw.emd";
+        sha256 = "1qgprlkaqfwfjkmc048faz2j8y1n46mqp3dfpdnn9ps1x3iqvs0f"; }
+      { url = root + "knnkp.nbb.emd";
+        sha256 = "1xhsjq79nb7zgqgyjp0v6n0g8r37x2csa5svyz8ndsax9hrxc1r7"; }
+      { url = root + "knnkp.nbw.emd";
+        sha256 = "08pxmb0sdppims2lfl0zi42rsh3dlrdbl7vq2rs8v0b470q4j5jx"; }
+      { url = root + "knnkq.nbb.emd";
+        sha256 = "00y7vv6ajzr9kgwx8gk7wap7ncb9dg086iv3lwki6qcwvy14bxql"; }
+      { url = root + "knnkq.nbw.emd";
+        sha256 = "09brsqvzwx4fmf7a6ljqcabx2isqfv1mmvsjb453wmhx98fkglj3"; }
+      { url = root + "knnkr.nbb.emd";
+        sha256 = "01df21j4zdwb4dfngjrr4797b1ipdajs1730i4gajcbm4hqigi69"; }
+      { url = root + "knnkr.nbw.emd";
+        sha256 = "0q0jxmqc57s22vlbk98dbb7c2zmzs6g6chlg42sw156j9414jdfb"; }
+      { url = root + "knnnk.nbb.emd";
+        sha256 = "0jxlaqkbdxhw45p8y4g5ggryzc6l7s159fdlw0bi5ipcp40afpvg"; }
+      { url = root + "knnnk.nbw.emd";
+        sha256 = "0782r7r4b4qmy3afrdmj5l0vlp5sgr33v0h0cigxghfmf19xhgdl"; }
+      { url = root + "knnpk.nbb.emd";
+        sha256 = "0cxj1mxdz8hmjlzhnc7j4cdi5jkcj1l0xfrz4l4z4az7f4ad91ci"; }
+      { url = root + "knnpk.nbw.emd";
+        sha256 = "13y2picx7c814hfsq3bb95js9s3bng85mblhhb7i12yqhddrzyx0"; }
+      { url = root + "knpk.nbb.emd";
+        sha256 = "03xah0j9n427nvqwym0ay84zg831v26x3gnp1zkpg1072r78d2p2"; }
+      { url = root + "knpk.nbw.emd";
+        sha256 = "10lv54gs3pgqqmndlihvjfbrfiqzgzfl7a127nchfyb12f9y91zz"; }
+      { url = root + "knpkb.nbb.emd";
+        sha256 = "1jiihs0cd5jx2hwv99vb3n3iahqwz6ja60zk5nbr17cxzhw0g2ng"; }
+      { url = root + "knpkb.nbw.emd";
+        sha256 = "19jxzp7v90hd1j6i109z03vdq81cndmlvmbb65fm2mc4ffrwms83"; }
+      { url = root + "knpkn.nbb.emd";
+        sha256 = "1yqjxxhc0fq2jvsqifw8my8lzfs2fgn6z8c2lgvak8ag2mi57ka8"; }
+      { url = root + "knpkn.nbw.emd";
+        sha256 = "1kh8sh9vscig0kkwvz79i3gk582xrgll8f4jlqw219f80ckh2ry6"; }
+      { url = root + "knpkp.nbb.emd";
+        sha256 = "1sd46as18ciml1nyzwh8v5qm5slhchbv15yv4qhcaga7cmljy9w5"; }
+      { url = root + "knpkp.nbw.emd";
+        sha256 = "0p8cwryphz16j2yihg7c1szx20s9mxzbgc7y6ddigvhafa19fc1d"; }
+      { url = root + "knpkq.nbb.emd";
+        sha256 = "03vaswq917maa1wxfkilcxjxvm9srnwzmzq1sq36q3h3dlcv23mp"; }
+      { url = root + "knpkq.nbw.emd";
+        sha256 = "1wmnipmacrbwggr1n63zdivvy9haqs96rkn458xswpmvks5fbyqj"; }
+      { url = root + "knpkr.nbb.emd";
+        sha256 = "1ngpj8iaz6si5i3vxri8k8ajpaim71caldxal28djkpmw91yqil6"; }
+      { url = root + "knpkr.nbw.emd";
+        sha256 = "1hqm6xp361iqdn7ayw6zvdk068iz2mwdz6sr087cr7gc0mim2ndw"; }
+      { url = root + "knppk.nbb.emd";
+        sha256 = "1mphpswq01v7d0pxij12nd1lpiz683gp0zgwnz0nyninwsmpq08v"; }
+      { url = root + "knppk.nbw.emd";
+        sha256 = "1m8l9jy96nxvqk48y73yj8b996q2gza1h448rrl00hjn1apbmjf3"; }
+      { url = root + "kpk.nbb.emd";
+        sha256 = "1xgbahdym0nbj63rc6rwgiwzss8xw3ra4lg03z46666hwykx8gxp"; }
+      { url = root + "kpk.nbw.emd";
+        sha256 = "1clkwzf3nb8lzrrs3gg4m9j5wh7z66ihra8gyz8majpjbhcz86an"; }
+      { url = root + "kpkp.nbb.emd";
+        sha256 = "06jsna3795gjlymnrxmscgxnz9ic1i648hr6v5vfagf8lmqi9nq4"; }
+      { url = root + "kpkp.nbw.emd";
+        sha256 = "1gplq6ksq4kvwramx137ncl6giwcm8rg3q8xmyqk1mq10dwcjfbp"; }
+      { url = root + "kppk.nbb.emd";
+        sha256 = "11xlmyw2hx26mkca4bid4qg62yxd0pspgmb40l9kf6h0yjzq4q07"; }
+      { url = root + "kppk.nbw.emd";
+        sha256 = "0j4dmlsm5i7rwrw7kkiq8j7zmcwvb6w38g41kfslm4sv6nm5mvjs"; }
+      { url = root + "kppkb.nbb.emd";
+        sha256 = "0w2yzi0l3jdnr88my8gcsqy72crkm9ppyiy8wl629lpcbrwj75x6"; }
+      { url = root + "kppkb.nbw.emd";
+        sha256 = "06f1h0x6rcsq9kag1fcz9z47hpffr4w9q171rkspd8ffpfzqq7za"; }
+      { url = root + "kppkn.nbb.emd";
+        sha256 = "0wmkn2i8z7m4j93hid2z2ns31kg4yhn939lfkvglfdvrgqjn1kh9"; }
+      { url = root + "kppkn.nbw.emd";
+        sha256 = "1ky4zcwyv5rn4g0h490s6l8vin6rwdv156ial7iczaq8hf70yhkm"; }
+      { url = root + "kppkp.nbb.emd";
+        sha256 = "1ivfxjphcld71cg4rvvq9rvnkpidh6apd52jf2cv42fvx313d9mq"; }
+      { url = root + "kppkp.nbw.emd";
+        sha256 = "1ymvp0z6jhrqi2hz87c81r54m9sdjpm91pvxwbx061yfbdpv230z"; }
+      { url = root + "kppkq.nbb.emd";
+        sha256 = "018cy2q2dvhxjh80prjxg6fx1lal50qc5mzzbfy0xlkk1l1y4sk5"; }
+      { url = root + "kppkq.nbw.emd";
+        sha256 = "0k4jlzcn213h8303jl3hkdapd9z8dhazsa22zac0bg52488r07gj"; }
+      { url = root + "kppkr.nbb.emd";
+        sha256 = "187pjqvp7kzyxkncp51c3vi26khimabkw5b3nyaj498jqjjlfa23"; }
+      { url = root + "kppkr.nbw.emd";
+        sha256 = "0mkrap8dizwxhhiij2xzlvbn8q9hrlsfvkcfcxajn8azaxnhx3ck"; }
+      { url = root + "kpppk.nbb.emd";
+        sha256 = "10spzc39zks7pwa2qy8aps5hk0z4xsxq1lpfwd61qwm5hazci391"; }
+      { url = root + "kpppk.nbw.emd";
+        sha256 = "1wx48xyb1xl5v7gjrahby8psig1gs9dipsj6iq44d052qr56513j"; }
+      { url = root + "kqbbk.nbb.emd";
+        sha256 = "1zvacin043njqws2nwiylch5dan28yis3ybcjb3zvmkdxyy8qzrh"; }
+      { url = root + "kqbbk.nbw.emd";
+        sha256 = "1s5likpps43bxplsv5yrqqnh2xzakibcknn6jh67xwdvl2v4jfz5"; }
+      { url = root + "kqbk.nbb.emd";
+        sha256 = "1814l1cgfphzl4v7k3hnwi21ydzfzyr7xzbh05dw3mnm0dsg9gzk"; }
+      { url = root + "kqbk.nbw.emd";
+        sha256 = "0xpmqr99qscrqjk5rzb7cgkjpcz4cmp6gngfsy8hq7530a4nknxk"; }
+      { url = root + "kqbkb.nbb.emd";
+        sha256 = "1jpl4nx4ddwnz455433508ibxywsrccb098infn992gs7wqqjsi2"; }
+      { url = root + "kqbkb.nbw.emd";
+        sha256 = "0krx6irqv0gvdy7hknhwa6gj2zwiv9rnjk2qlf2cy6xsldzn6af7"; }
+      { url = root + "kqbkn.nbb.emd";
+        sha256 = "09xsg79xajh1g2d9nvms61pjgb13x6fc0nhw58nnfg28nbvjzz1n"; }
+      { url = root + "kqbkn.nbw.emd";
+        sha256 = "0gb8pdsd77fmjd09h7ri1z8rrparqn5xa56dwi4yd4hhwsb8c4fq"; }
+      { url = root + "kqbkp.nbb.emd";
+        sha256 = "07h1zzaic2qh2140wvcq0hvhmkv0j9h7rchm3avsk7m6ma98d7zi"; }
+      { url = root + "kqbkp.nbw.emd";
+        sha256 = "13lffpplxis2a5949wnq998262idiydg2b2pz5np3mxyppc48r61"; }
+      { url = root + "kqbkq.nbb.emd";
+        sha256 = "09l20wcjcvmncz97j4107q3ch81dgzmx7i86m6pzifhy8mrn2cll"; }
+      { url = root + "kqbkq.nbw.emd";
+        sha256 = "0vra23shpwlsiyzd8wd2m2ayrs4ig2943l90ps9xh1p6igjv1n9d"; }
+      { url = root + "kqbkr.nbb.emd";
+        sha256 = "0gmzhzr1m751djfp6b71yrah04r89lq41nshvw02qp531aqp1xyq"; }
+      { url = root + "kqbkr.nbw.emd";
+        sha256 = "1zz0fdfn463xa76xd8hg2hz8a1kaljka9l01z64vsqvn73nkd5fm"; }
+      { url = root + "kqbnk.nbb.emd";
+        sha256 = "1m7krpj5sd6mvrsks39jyxkg8mvz7g15rwnn55kql2flpsw481q4"; }
+      { url = root + "kqbnk.nbw.emd";
+        sha256 = "1q6jvhxjzcani3ls402n3ylhhmf8kd482in19d2ny0q7pqcimvy7"; }
+      { url = root + "kqbpk.nbb.emd";
+        sha256 = "1pdc8kd3q9f8vgfqxymar3vkg1h9qbsfr614lhgbmpmpmn4zxqdj"; }
+      { url = root + "kqbpk.nbw.emd";
+        sha256 = "0dcyxa92200g0dgq7lk018grhvwxzrhh6wrwqdk6g3v02g63h38d"; }
+      { url = root + "kqk.nbb.emd";
+        sha256 = "1f0cdqyakzck0ng11smhk9kdkch9hbm3azniqv2wjg2wp9aj9s1n"; }
+      { url = root + "kqk.nbw.emd";
+        sha256 = "0gzxgkxzfnlri5ypvx67k2mwq4xnwkm4hn4n9mqpl7fjwdj733w2"; }
+      { url = root + "kqkb.nbb.emd";
+        sha256 = "0j3w39l4mnwm5nrrw0zcd4icdj8hgds792nhick2mfn40injwna6"; }
+      { url = root + "kqkb.nbw.emd";
+        sha256 = "0q30gjvlfmx1ld4i0x2xj97i4i3w6q1vhl2q91w8dd84bw1cy1k8"; }
+      { url = root + "kqkn.nbb.emd";
+        sha256 = "15aivg3vpc6y1g3gcnmssjnww9l7npy3g5xxq3wq99ai1mbgik7p"; }
+      { url = root + "kqkn.nbw.emd";
+        sha256 = "1qqi3r6a5d74108xgdxx9qx4cxv7fkr9jpkrcizirzv30dp3cb4z"; }
+      { url = root + "kqkp.nbb.emd";
+        sha256 = "0hlsmjn9baa1bplnwygxvgnkfn15fm9fhc6k39bfiacy7ai0zkka"; }
+      { url = root + "kqkp.nbw.emd";
+        sha256 = "0ibx6xp2v980626xffb7khz8lfnxb9577w5zc6mlc892kinaf4gf"; }
+      { url = root + "kqkq.nbb.emd";
+        sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; }
+      { url = root + "kqkq.nbw.emd";
+        sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; }
+      { url = root + "kqkr.nbb.emd";
+        sha256 = "13fabjhiq5psyvg2a1cbx16471g35il0lm3fsfdy4dpl9zr2pw58"; }
+      { url = root + "kqkr.nbw.emd";
+        sha256 = "0hwy21k0a3qa6b1093904krdqrqrz5iwqsb0qxqqnwljpz8kr1zl"; }
+      { url = root + "kqnk.nbb.emd";
+        sha256 = "0dy9d9fwaqvmr3x796a7vq5ynqnpw8b4l0zsm7nkvvd5sak1blxj"; }
+      { url = root + "kqnk.nbw.emd";
+        sha256 = "0zdzqhg0ww4b79w3w3hjpwfar0r8fhk2yc8jknwzcc9q9rv9a78n"; }
+      { url = root + "kqnkb.nbb.emd";
+        sha256 = "04zvc8s2rwcgr9chx3rmvr3shs47i75pwh1wph9wiy33jx5gw846"; }
+      { url = root + "kqnkb.nbw.emd";
+        sha256 = "1v22rln9plikvchdxqii4m9kh9s0mahrxnsqs6i2kzcfphiqp3ns"; }
+      { url = root + "kqnkn.nbb.emd";
+        sha256 = "0kwz1390brs60ri0mrvf3f64ax0yncnp6kpaf7nrw5v29s5cxpyz"; }
+      { url = root + "kqnkn.nbw.emd";
+        sha256 = "0gvsx71nf0bhggk338rsmvbpajwa6j1ja09gchny6i9gvg9l0frs"; }
+      { url = root + "kqnkp.nbb.emd";
+        sha256 = "169llq4dv4fsh8hvvwwrbc2b1iwklnqwqmhzv77q862cxs8rbcsa"; }
+      { url = root + "kqnkp.nbw.emd";
+        sha256 = "1b1mgfh7hgiqv9a0dv1f7vr180g1mjxcg3nlx4zmpj0mzgwka39g"; }
+      { url = root + "kqnkq.nbb.emd";
+        sha256 = "02za7wp2z1h1sd55mmkaa6i0bh3piwiz5ybpdrxk2amm54kvjmsj"; }
+      { url = root + "kqnkq.nbw.emd";
+        sha256 = "0s9c4zfw4slp7lv373nkhlyafn3hpw9pv4543mm69c6cdnl04xhk"; }
+      { url = root + "kqnkr.nbb.emd";
+        sha256 = "0nffvkdfs17b6n2hmy9i7ha793dn8an7ff9nd97z62zxxm63gmyp"; }
+      { url = root + "kqnkr.nbw.emd";
+        sha256 = "1jqmbna1i5wqahqz2lalviv61y6ak379fhjcc9xg651dxfnjnmwh"; }
+      { url = root + "kqnnk.nbb.emd";
+        sha256 = "1dlhfqmv5g3f9lvfgvy4h7x0xfkbn9pcsplb9kjlqg7qhkimcvbg"; }
+      { url = root + "kqnnk.nbw.emd";
+        sha256 = "0zlg34ff2bp88q8bws2isswwa8ls0qncpzyzc3d1j6avkprwkq2i"; }
+      { url = root + "kqnpk.nbb.emd";
+        sha256 = "0i436sxh5093zy03v6rjf6r0ydjmkmfj5fkxqk2qjjps2gc6jwsn"; }
+      { url = root + "kqnpk.nbw.emd";
+        sha256 = "0yf7il0maiw8c9gam9cvnjgvywjk5k3pjvmgcy377yf31hgi209g"; }
+      { url = root + "kqpk.nbb.emd";
+        sha256 = "11vl1p9qwqsdbxdppqg3n73868kd69kqhl6h6q1p47a4dq9lqldy"; }
+      { url = root + "kqpk.nbw.emd";
+        sha256 = "02ik15sm3mdhyn76rnx8jvg7fma1m7njm55h6mqqqgqgbji0zzvi"; }
+      { url = root + "kqpkb.nbb.emd";
+        sha256 = "0s7k9dh87s6msmqpv43csax632i5w5gzc2s4ijiy38kg0d3cgz31"; }
+      { url = root + "kqpkb.nbw.emd";
+        sha256 = "115y0gshq2g6p6mfclxag1lvba3pz2rlyw8b6d5rykkapm299yvb"; }
+      { url = root + "kqpkn.nbb.emd";
+        sha256 = "1i3wx9c7dk1sdig6kv4h3pa2m9ir1gd6qz7jyan9q18wvrpag12l"; }
+      { url = root + "kqpkn.nbw.emd";
+        sha256 = "0iqxrgr1x2k3mfvhgckz9dya92wj8vddpv746gz86yi6n05wp373"; }
+      { url = root + "kqpkp.nbb.emd";
+        sha256 = "0ifxixayrfhdp3yq04h55kjcgbly4390ghrhpvllc3mf6yrcg3sh"; }
+      { url = root + "kqpkp.nbw.emd";
+        sha256 = "1hf8b4lvci0lm4skvxsw83c521q2x1i7yij8ih9j8ijyg64fivp8"; }
+      { url = root + "kqpkq.nbb.emd";
+        sha256 = "0vy9ihcl80q2ml7lilgi007d7zx4r9knsyn8f63fqfa8x3m5rs6b"; }
+      { url = root + "kqpkq.nbw.emd";
+        sha256 = "0xqngdyq8anfz1xqyg24nvwds7k7027j1l5pjwl22x0ipi7hda98"; }
+      { url = root + "kqpkr.nbb.emd";
+        sha256 = "1c3xbrvsmyjz0ydc3xpw5hcxky20742d2jqwf7rrx5q223y11mlv"; }
+      { url = root + "kqpkr.nbw.emd";
+        sha256 = "0fsi0d0czwvi2az56v2a4r0k78drybyqdda264gqjs53j65h02bp"; }
+      { url = root + "kqppk.nbb.emd";
+        sha256 = "0995h6li6ixljxfs4xxy1bvmzj589h675bg8pkhbrmvimhja2nrf"; }
+      { url = root + "kqppk.nbw.emd";
+        sha256 = "18hh8080s90qdacy6svhymfs4nw27x0p0s8km8p090rwk5si860a"; }
+      { url = root + "kqqbk.nbb.emd";
+        sha256 = "15n425kcfjypwbxj1ck9v4rzd24lmd36kczhsi1cp2y6955vz9vp"; }
+      { url = root + "kqqbk.nbw.emd";
+        sha256 = "1mjkgcblgsga7vib0410mdcjqh3dkc3xq8nx17p1hapinj987w8s"; }
+      { url = root + "kqqk.nbb.emd";
+        sha256 = "0ihmqjiqycybci4zczrdv4c3a1bdz7l2qln0g43rbzwbkjsplykx"; }
+      { url = root + "kqqk.nbw.emd";
+        sha256 = "0m0359yb17azb8s482i63fvqqy1b9idgklrj82rpbidasz41gj0m"; }
+      { url = root + "kqqkb.nbb.emd";
+        sha256 = "0b9hm4pw01dal7lazb1qakjbgg5wg3nrn2bdjmkabfjgbrnh4hbm"; }
+      { url = root + "kqqkb.nbw.emd";
+        sha256 = "1msk54xzbn41rhlyx9qkragihmg7yw2r5jc97lkvb7d8lwg6s59r"; }
+      { url = root + "kqqkn.nbb.emd";
+        sha256 = "18d8nc25h33gd1qr6jmsbka3qmd8xjb2q1545959x6b4ch93cbsy"; }
+      { url = root + "kqqkn.nbw.emd";
+        sha256 = "0i2mzllfklvv8bw0g6rjjrjkw71mvn8hsvqg6m7hhdq8lg5ajhyp"; }
+      { url = root + "kqqkp.nbb.emd";
+        sha256 = "14y51vjw0r605pbjz0gvhc0x2w14ijxn3nilvpd5sdcnfh79kaax"; }
+      { url = root + "kqqkp.nbw.emd";
+        sha256 = "11m1034gb608czhzrrj3fgpixq4rlvr92bzv7ga5r8wypwwycbdp"; }
+      { url = root + "kqqkq.nbb.emd";
+        sha256 = "1cxyavw61qqpy15vrq51a0sjsd2lhya60cf33nnh9vb370amwqj9"; }
+      { url = root + "kqqkq.nbw.emd";
+        sha256 = "1lrv2757bivjs9bsyh7ghj53halg3jz29xhnx7xhjrf48rpv6nxw"; }
+      { url = root + "kqqkr.nbb.emd";
+        sha256 = "1m2r0myc2piqn4pcd3b9ngivrjg1j5viwsi9740dlb730dbvkzna"; }
+      { url = root + "kqqkr.nbw.emd";
+        sha256 = "1767n2993dw5akbd3h6w570nbs5bncd8qid1dhgzfs9yxxzjplns"; }
+      { url = root + "kqqnk.nbb.emd";
+        sha256 = "047950dbkh0mzpfb1klm51lmqzx1d90w6j7r4z8mc1nw4knh5cpp"; }
+      { url = root + "kqqnk.nbw.emd";
+        sha256 = "0yd35ra0s0qckqymzi634bxp127arbrqzyj3s3xww82qsn6lbm07"; }
+      { url = root + "kqqpk.nbb.emd";
+        sha256 = "08wbdhpa8vna39i226hg71r8a7ydp2vd2gh5prskr39vqj0k5pa3"; }
+      { url = root + "kqqpk.nbw.emd";
+        sha256 = "1vyd4pvb8mhbdkm85njnqxg755biw0y68ylxfbnar8wna4dl27ds"; }
+      { url = root + "kqqqk.nbb.emd";
+        sha256 = "0l0ichgik395z90h37zj6x4kcxpf0121zw57s8s0y51iwz61ikg9"; }
+      { url = root + "kqqqk.nbw.emd";
+        sha256 = "0jmkd9n96al6sggva1kmdax8vxqprai9hhkxxvsk35wivcp8akk8"; }
+      { url = root + "kqqrk.nbb.emd";
+        sha256 = "02wahvwixy5l3q9h57ayr2mxqs79zg8m2qh8cv3mms39csa9axzh"; }
+      { url = root + "kqqrk.nbw.emd";
+        sha256 = "05rypafy4lgb53x8zx2qlvdrjm91aqr61hc7iwlpfikqqcbiksiw"; }
+      { url = root + "kqrbk.nbb.emd";
+        sha256 = "0bk77dvdg5qx86rss0q9v8zl079g85p7snfgjpr30jpfv2z0a6p6"; }
+      { url = root + "kqrbk.nbw.emd";
+        sha256 = "0mgamh4fqr6g063ic5qapdjng6jw35f82f0wjq8j9gv5w83s0vqs"; }
+      { url = root + "kqrk.nbb.emd";
+        sha256 = "0vsadlphh4b6cgs4pizw44nfw4lhpq65dws44fc9z74sf32q0ibr"; }
+      { url = root + "kqrk.nbw.emd";
+        sha256 = "1qq8jqzqzkcarhnc7ad6xp3s2f8r4crrxgj0ajciz2pkyc98xdh6"; }
+      { url = root + "kqrkb.nbb.emd";
+        sha256 = "0bxmkjmqx7gjdaz78d31sbk7v67crx24dpbhswfg6b3xkhi8cy3f"; }
+      { url = root + "kqrkb.nbw.emd";
+        sha256 = "0hhz4yxrcwvvc4b36ixlh3g8gdm4krhvip80xazcy538dwl26b29"; }
+      { url = root + "kqrkn.nbb.emd";
+        sha256 = "13h7qa2zy9akdrvrwl7wmlpncgljjamc7asa9vpd76bi5mp0wrap"; }
+      { url = root + "kqrkn.nbw.emd";
+        sha256 = "0ihcp5wh61cgq439nh5rn3qqhpyjl5h4xz9ayyma298fm2xw7w89"; }
+      { url = root + "kqrkp.nbb.emd";
+        sha256 = "1wjrcrjgq1gj0jqbw0mi8ah79qv80zp921bzjxsx9vjm35hdbbhl"; }
+      { url = root + "kqrkp.nbw.emd";
+        sha256 = "0qwc76wyy60vicxyxx80gm6f40fw3izs6xndhhkfh86cj7sjl3l5"; }
+      { url = root + "kqrkq.nbb.emd";
+        sha256 = "0drzfjrm6mh8q1vb36ycvfsipp6z4ij4a200zxypaxaimnxssq3x"; }
+      { url = root + "kqrkq.nbw.emd";
+        sha256 = "0n12rixcd2k3bgm00k2z9cnlzx1av5y62r8adnx6h2grlgcyd26j"; }
+      { url = root + "kqrkr.nbb.emd";
+        sha256 = "0zvzx89gp4saggjb062nafy3xncv01fmbymsmnlswmq80xdkcn4d"; }
+      { url = root + "kqrkr.nbw.emd";
+        sha256 = "0by6f36850d4fdraqj8rqv7ryaplqxlmkm00prm0pcmlb3y5czc7"; }
+      { url = root + "kqrnk.nbb.emd";
+        sha256 = "0z5599ci1n7qgpn3inch8zc3ciyy1b5gjbix78k3b5ig4ra2idv6"; }
+      { url = root + "kqrnk.nbw.emd";
+        sha256 = "18a5bm0rlh4wf5im54acq0w0l6lnjjk4dxaxcph67q4smfbfacv3"; }
+      { url = root + "kqrpk.nbb.emd";
+        sha256 = "10rbm2j3rz04jv0s70aink3y7h303zvnf29b9pim8b8pv23pwvy3"; }
+      { url = root + "kqrpk.nbw.emd";
+        sha256 = "1jqvxfj3fnm456livvfbp3v750mm86js2qb7va5nq9wilif13chb"; }
+      { url = root + "kqrrk.nbb.emd";
+        sha256 = "0h2g8v9i6ic2fmjgzwh1hcwaka2m8n8l28nvbbkq3447hrwl8sba"; }
+      { url = root + "kqrrk.nbw.emd";
+        sha256 = "137iicxbws20rv93b5qas6dpk5a7qj18rcbj632117hkiw3ddjly"; }
+      { url = root + "krbbk.nbb.emd";
+        sha256 = "1i0yjbvkrqz4m61qk6flz88zsb3nwskj6rrn3bz4fzv63m0yhcpk"; }
+      { url = root + "krbbk.nbw.emd";
+        sha256 = "00rna709hpxw06sg5cnzn9xzgn2pib4n5yyffjz638sgivgh62k4"; }
+      { url = root + "krbk.nbb.emd";
+        sha256 = "1xq45jiwg96084jm0qkacjmxl86v0mp1nrr6k85dpn99bmyzx5xw"; }
+      { url = root + "krbk.nbw.emd";
+        sha256 = "0jnxrpwad8cpl6yp31bs5g0h89jjr8061lj69n8wdmmwhvjafvk0"; }
+      { url = root + "krbkb.nbb.emd";
+        sha256 = "0gdwy9q7xf35fpb78g02jn07d969p7zzhnn4asbk5y3fmix209l2"; }
+      { url = root + "krbkb.nbw.emd";
+        sha256 = "0kryfbjli1l05nqarz96q6fnviwzgjvmbljbmapirw40ma68nx4r"; }
+      { url = root + "krbkn.nbb.emd";
+        sha256 = "01fll6vvqiyxpmn6qmwhrzd7f3j3irpbdvc2jn2hqzjdmsr0kz59"; }
+      { url = root + "krbkn.nbw.emd";
+        sha256 = "13yipfw7v5w2hcgmnml3ka1rq1g5djcf81nkanrlmrkqaksxbc0m"; }
+      { url = root + "krbkp.nbb.emd";
+        sha256 = "1bpa5x4zm9nap62hf3iiyzzwcp0fsh5bww0sdnvlzaclw9mbc1g8"; }
+      { url = root + "krbkp.nbw.emd";
+        sha256 = "0y157ai66amm5lryigc7nizj79mfbcny925qqcsgbi8l2yhl7hk1"; }
+      { url = root + "krbkq.nbb.emd";
+        sha256 = "199gckvazpsv1f3jkfxw9p3hyfshpvqm2i9wqjgzlm69dckbbj4x"; }
+      { url = root + "krbkq.nbw.emd";
+        sha256 = "1m72pzaxlrppwpaqgdcxcjr9n5cnyxs8p0kxybgkl17vfvpc5jmw"; }
+      { url = root + "krbkr.nbb.emd";
+        sha256 = "04wpcfq3y4nx1q57vina4z75lv3mrzljfzw5s73s5m0fhfq54i9v"; }
+      { url = root + "krbkr.nbw.emd";
+        sha256 = "1wii5h5cyxxxgjp53ap43v0wnpj7amxyd8kg9bxsamcfz3wj1v70"; }
+      { url = root + "krbnk.nbb.emd";
+        sha256 = "0s2jrbyjn4d2kik7ic4i1d4w6yx2841cdwb7lalpw3jf74ag2cv4"; }
+      { url = root + "krbnk.nbw.emd";
+        sha256 = "1py0lnsahky21dvk5kdcfgbrca1cks7ihjslpvins91l58yzldh9"; }
+      { url = root + "krbpk.nbb.emd";
+        sha256 = "1v3j61j125i9hbmqm11ay2ng65djq55mwxfr5v8173whqjk9cjc5"; }
+      { url = root + "krbpk.nbw.emd";
+        sha256 = "1zvinpcr9mzm6jgicq6y6jfl6dsd7pyn648bfayszfgndyr2b125"; }
+      { url = root + "krk.nbb.emd";
+        sha256 = "042qliismf63y6vims4bg31lj1w9r2y45p32frqxgk79hvb567yv"; }
+      { url = root + "krk.nbw.emd";
+        sha256 = "1fam4n038dg4g1nc1zn55lyjagv4j4lkbq28rhiaz7mhj3z4r3zz"; }
+      { url = root + "krkb.nbb.emd";
+        sha256 = "0y44rbly8ggzjg2i5vhxibia551ii28dnpyzls3b74a6078zy0wy"; }
+      { url = root + "krkb.nbw.emd";
+        sha256 = "12bqs411yhv6k0b2jhil1l7hpk4cj3i8x0bcj168jnmikzhprvgq"; }
+      { url = root + "krkn.nbb.emd";
+        sha256 = "1wcghsgr9g09pbyhak1hyxw3rvfis6zplc3zgzx3qphp69rivk3k"; }
+      { url = root + "krkn.nbw.emd";
+        sha256 = "1jkwz4kjl91kxxascg21zj6c6qgx9s0k91jjbic6ybsmpv4wj4qc"; }
+      { url = root + "krkp.nbb.emd";
+        sha256 = "1jmaansnxspb7x2ka8y44vssgk78wfcrmdczj60zyzg1bj3n5fl8"; }
+      { url = root + "krkp.nbw.emd";
+        sha256 = "14yi4fsax0w9sd5bv463ajs6r4q0wxj3n19np9anc1zfvb3yk846"; }
+      { url = root + "krkr.nbb.emd";
+        sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; }
+      { url = root + "krkr.nbw.emd";
+        sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; }
+      { url = root + "krnk.nbb.emd";
+        sha256 = "0gvm4y8p5a9769nqhgnx6xj6nlldgrh75k3z8c8hj2xd9cyj01pp"; }
+      { url = root + "krnk.nbw.emd";
+        sha256 = "0p7j4x0xdq5krsvmj44qkcaqmww7rplrjdr08ix3jyjf31kk2x13"; }
+      { url = root + "krnkb.nbb.emd";
+        sha256 = "0w9gybr4i7d8zjpbbyg1m4263bx2gpmnh91vd0xmpwi0ykrxrl57"; }
+      { url = root + "krnkb.nbw.emd";
+        sha256 = "19wp8swng0q2wzxwx89km5fqlqfb4vcamky9h7pvas2sgh8frfmq"; }
+      { url = root + "krnkn.nbb.emd";
+        sha256 = "0g3b48symag31lcgbimpmmqsqdmihsr6g9k5a15l0mfkisfwadlf"; }
+      { url = root + "krnkn.nbw.emd";
+        sha256 = "1vryhaw1aj4bhv2ghb10zxyx930s2f4xqg7v9cxfnr9q5w2qv7xh"; }
+      { url = root + "krnkp.nbb.emd";
+        sha256 = "13b8vahj7hj4f12kiaigx1nphdrf8z30j68zav9n617kpf5s35i0"; }
+      { url = root + "krnkp.nbw.emd";
+        sha256 = "1qcnjwkg0pxp1hq4xws9dgq4bx6pxn0am3mcj1n837qcmv46mf7c"; }
+      { url = root + "krnkq.nbb.emd";
+        sha256 = "150d9z4v6fk16sdxq1w96gl2pl9nsf0jimy8kdgc8a19i1ab1rjc"; }
+      { url = root + "krnkq.nbw.emd";
+        sha256 = "13dn9hgk4i26axwymv0gvdkl0zr5shggvm5lpwa15gigmrva73bh"; }
+      { url = root + "krnkr.nbb.emd";
+        sha256 = "14ja7chmg7aklg6swlc3lpik4akj8zv3x2qppsip0vi3j05lnqyv"; }
+      { url = root + "krnkr.nbw.emd";
+        sha256 = "04qxh0kzk2p7m5zdrzg0faqva91qals4njnwf4vgfr65lmd4hyfn"; }
+      { url = root + "krnnk.nbb.emd";
+        sha256 = "1f35pqprkf1clx0mzzkgx9mn8ncqdiyc2cbxcp5a4x1kzli7zp34"; }
+      { url = root + "krnnk.nbw.emd";
+        sha256 = "16y28mqjl7fbl8rlwv51bn17sx0fpvfi0izyq1f5043l7fmpshfr"; }
+      { url = root + "krnpk.nbb.emd";
+        sha256 = "097rmr9zb550qn41kn11c15qp8l5582wqncg5li46iq9mfxcskiw"; }
+      { url = root + "krnpk.nbw.emd";
+        sha256 = "0hj3bhqvgdd64qa47irwx08nz4fqxhm0ddmpjq0jb757wlqw5f05"; }
+      { url = root + "krpk.nbb.emd";
+        sha256 = "1qz218amn2ii66g2fr2ifq6csr0n5n9ip9jcjxkxgpmawiwjhcm1"; }
+      { url = root + "krpk.nbw.emd";
+        sha256 = "19vh7k73gjyjwqzdpf0pv2i7zrqb2ns6a6r3n4jgwwd2n35inr1i"; }
+      { url = root + "krpkb.nbb.emd";
+        sha256 = "1y6kknnkb0ikk7az6syc3drhp4v3avpffa5pghpr2pm6i8xzx3nm"; }
+      { url = root + "krpkb.nbw.emd";
+        sha256 = "0fnbyhgjlnrnddkpbbyabyg31nmi61w9ra8ylicv6ysgyn4bcps4"; }
+      { url = root + "krpkn.nbb.emd";
+        sha256 = "08cn0pa6y1hxq7clgj70hdxm13a6zi9c8z2mmf3qgsjjkrj2wgc5"; }
+      { url = root + "krpkn.nbw.emd";
+        sha256 = "16ybnwl7sf832z546igrwclahhymp734dcg6rhrakxabrv0y144z"; }
+      { url = root + "krpkp.nbb.emd";
+        sha256 = "125qzj83kc5y5rx6jn078pjj6lph1gslmglx24n5n399382kllkn"; }
+      { url = root + "krpkp.nbw.emd";
+        sha256 = "1kbahpn99r37syb1yypabw55g4diwbp6q99nr6f6rn19wp0b44mk"; }
+      { url = root + "krpkq.nbb.emd";
+        sha256 = "1wsxy8ycz8l6wn6c58w4n0gdsdb8lik6b046q132qjw8mnn07gv1"; }
+      { url = root + "krpkq.nbw.emd";
+        sha256 = "0l8sg8sv6yy2wsrg7p9j2w5s61sd3jak09z1i347k0g0190m77m8"; }
+      { url = root + "krpkr.nbb.emd";
+        sha256 = "1mv4jcgkilsw3d4m879r2cwslz71v0rg5hwk9r6lhpg22qam3kz1"; }
+      { url = root + "krpkr.nbw.emd";
+        sha256 = "1nj906wq21h9xfzihc3wcp9s2bwgy7c68j4a6vlxq3zy1c8k53yx"; }
+      { url = root + "krppk.nbb.emd";
+        sha256 = "0x63qm3zwp70y3a33s29bv7lhg1vjnvi4gkxxgh6s0590y7s8pj4"; }
+      { url = root + "krppk.nbw.emd";
+        sha256 = "1z4nhf2gygbdgk6j3bdxhllx154ajkrrz3j0y715r20m0fxfl6x8"; }
+      { url = root + "krrbk.nbb.emd";
+        sha256 = "0gxam25i89sqmmmd781yyk2k2zyj76l9w9hngqkzagiz0fhh9ycz"; }
+      { url = root + "krrbk.nbw.emd";
+        sha256 = "1v7rfv5b4wjsgfy21fi3xyxbfj76mvkxhfz52612p4rnzp78bb56"; }
+      { url = root + "krrk.nbb.emd";
+        sha256 = "0ms9cjndxiflssymcx7aakf6bjwb5043nz5i4jvix89wvp6lgfa1"; }
+      { url = root + "krrk.nbw.emd";
+        sha256 = "18bh2y3v2ak6j1q1rlnkp02vijbbqr69i4cg1pvj943c83xz18l3"; }
+      { url = root + "krrkb.nbb.emd";
+        sha256 = "0hdr8v5bgybma3sdl8mk0v3msjvdva89zs1wd52m6jbdgwb5hzca"; }
+      { url = root + "krrkb.nbw.emd";
+        sha256 = "1g8bkyzq585az5rrglxd71ydj2fhhgqzdfmkgihbi7ncjym9kpw7"; }
+      { url = root + "krrkn.nbb.emd";
+        sha256 = "0bz8np2sqj8viwszx4jj9wxj774kv548pjzrmc6xh11p0sfjx3rj"; }
+      { url = root + "krrkn.nbw.emd";
+        sha256 = "1qf4d6zlvwlgrq0f732wafpznkqd3qnf7na4bgd4p1pb105ickg4"; }
+      { url = root + "krrkp.nbb.emd";
+        sha256 = "1kw434r77f61b5agly6lqkvn4b1rwssd511lcv16mvvf56xlqnb4"; }
+      { url = root + "krrkp.nbw.emd";
+        sha256 = "1yzqpp01gckk25zjy8j820y37m4vj6rgc6zpphwll45rn1ahwk0p"; }
+      { url = root + "krrkq.nbb.emd";
+        sha256 = "1ynhjzzmjpd6yw0d2w5xhlms3sqjc8gksfqgq3wmx7ym23wya2qq"; }
+      { url = root + "krrkq.nbw.emd";
+        sha256 = "01wil4pbcnrqynj1xpkglk2r36b36cz9gjr2g76rrz5xhdy5q8vj"; }
+      { url = root + "krrkr.nbb.emd";
+        sha256 = "0iyqadmpddy9i330nv1qrsjfkk2vlkxfxjphx3q349lplq6a9s16"; }
+      { url = root + "krrkr.nbw.emd";
+        sha256 = "1fg4byzzmjlzz8hs2vhpysmf8py9ylkf5pdw3rv88dxr4cp1wciq"; }
+      { url = root + "krrnk.nbb.emd";
+        sha256 = "1jb8rq7sy28c9wr7yih8w5bi8jbcf4xzf8sccanz32qxp0159f0h"; }
+      { url = root + "krrnk.nbw.emd";
+        sha256 = "17g7l0szgqczykjgxdhpihs5hh2snc35cy3hggnvah3j8bv6ksb4"; }
+      { url = root + "krrpk.nbb.emd";
+        sha256 = "1q7vk3pawab9nbpdn3cw2kf205yx6lznr6gkd9qbjj3754s9zswh"; }
+      { url = root + "krrpk.nbw.emd";
+        sha256 = "0wl23j0a67mm01655p4ivjrlsacvm7lxglhrg6cni61qkdqr6vqz"; }
+      { url = root + "krrrk.nbb.emd";
+        sha256 = "1ggm5q38wc65rkp87n5d2l71kcl7nqjkvwa31hmlagq2735vd0gd"; }
+      { url = root + "krrrk.nbw.emd";
+        sha256 = "1h7psv25a4wajg6ggk2q0cllf5mng4qjas3yi9nvi7kc766p85ax"; }
+    ]);
+
+  patches = [ ./strcpy.patch ./malloc.patch ];
+
+  buildInputs = [ unzip ];
+
+  buildPhase =
+    if stdenv.isDarwin
+    then "make darwin"
+    else if stdenv.isLinux
+           then "make linux-amd64"
+           else "make";
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp -p ./crafty $out/bin
+
+    ensureDir $out/share/crafty
+    cd $out/share/crafty
+
+    $out/bin/crafty "books create ${startPgn} 60"
+    rm -f *.001
+
+    ${if fullVariant then ''
+        unzip ${enormousPgn}
+        $out/bin/crafty "book create enormous.pgn 60"
+        rm -f *.001 enormous.pgn
+        
+        ensureDir $out/share/crafty/TB
+        ${stdenv.lib.fold
+          (tb: acc: acc + "\nln -s "
+                        + toString tb
+                        + " $out/share/crafty/TB/`echo "
+                        + toString tb
+                        + " | sed 's/.*-//'`")
+          ""
+          tableBases345}
+      ''
+      else ''
+        cp -p ${bookBin} $out/share/crafty/book.bin
+      ''}
+
+    mv $out/bin/crafty $out/bin/.crafty-wrapped
+    cat - > $out/bin/crafty <<EOF
+    #! ${stdenv.shell}
+    exec $out/bin/.crafty-wrapped bookpath=$out/share/crafty ${stdenv.lib.optionalString fullVariant "egtb=on tbpath=$out/share/crafty/TB"} "\$@"
+    EOF
+    chmod +x $out/bin/crafty
+  '';
+
+  meta = {
+    homepage = http://www.craftychess.com/;
+    description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.jwiegley ];
+  };
+}
diff --git a/pkgs/games/crafty/malloc.patch b/pkgs/games/crafty/malloc.patch
new file mode 100644
index 00000000000..39b5afe8dda
--- /dev/null
+++ b/pkgs/games/crafty/malloc.patch
@@ -0,0 +1,11 @@
+--- a/chess.h
++++ b/chess.h
+@@ -25,7 +25,7 @@
+ #include <assert.h>
+ #include <stdlib.h>
+ #if !defined(IPHONE)
+-#  include <malloc.h>
++#  include <sys/malloc.h>
+ #endif
+ #include <string.h>
+ #if !defined(TYPES_INCLUDED)
diff --git a/pkgs/games/crafty/strcpy.patch b/pkgs/games/crafty/strcpy.patch
new file mode 100644
index 00000000000..d4d424d23da
--- /dev/null
+++ b/pkgs/games/crafty/strcpy.patch
@@ -0,0 +1,21 @@
+--- a/utility.c
++++ b/utility.c
+@@ -2144,7 +2144,7 @@ int ReadPGN(FILE * input, int option) {
+         char *skip;
+ 
+         strcpy(temp, input_buffer);
+-        skip = strstr(input_buffer, buffer) + strlen(buffer);
++        skip = strstr(temp, buffer) + strlen(buffer);
+         if (skip)
+           strcpy(input_buffer, skip);
+       }
+@@ -2241,7 +2241,7 @@ int ReadPGN(FILE * input, int option) {
+             }
+           }
+           strcpy(temp, input_buffer);
+-          skip = strstr(input_buffer, buffer) + strlen(buffer);
++          skip = strstr(temp, buffer) + strlen(buffer);
+           strcpy(input_buffer, skip);
+       } else {
+         int skip;
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c66f42a87..3dd6e54f80f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9887,6 +9887,9 @@ let
 
   crack_attack = callPackage ../games/crack-attack { };
 
+  crafty = callPackage ../games/crafty { fullVariant = false; };
+  craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
+
   crrcsim = callPackage ../games/crrcsim {};
 
   dhewm3 = callPackage ../games/dhewm3 {};

From 0f65f11d6ec5dfeaa9bf8cdc70e3b41e83812f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Wed, 26 Mar 2014 20:41:11 +0800
Subject: [PATCH 1860/2033] mono: fix libgdiplus finding

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

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 4ff2dacff18..1b9e9118d56 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     find . -name 'config' -type f | while read i; do
         sed -i "s@libMonoPosixHelper.so@$out/lib/libMonoPosixHelper.so@g" $i
         sed -i "s@libX11.so.6@${libX11}/lib/libX11.so.6@g" $i
-        sed -i '2 i\<dllmap dll="gdiplus.dll" target="${libgdiplus}/lib/libgdiplus.so" os="!windows"/>' $i
+        sed -i "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" $i
     done
   '';
 

From ddfd374c40fdb4e15ae208062fe72e505d139d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Sun, 6 Apr 2014 17:01:34 +0200
Subject: [PATCH 1861/2033] Merge #2030: add openra game (C&C RTS engine)

Modifications from @vcunat, who tried Dune,
but it typically segfaults in mono after a few minutes
(IMHO unlikely to be a problem with packaging it).
---
 pkgs/games/openra/default.nix   | 44 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/games/openra/default.nix

diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
new file mode 100644
index 00000000000..ec9d4ad3980
--- /dev/null
+++ b/pkgs/games/openra/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, mono, makeWrapper
+, SDL2, freetype, openal
+}:
+
+let
+  version = "20131223";
+in stdenv.mkDerivation rec {
+  name = "openra-${version}";
+
+  meta = with stdenv.lib; {
+    description = "Real Time Strategy game engine recreates the C&C titles";
+    homepage    = "http://www.open-ra.org/";
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/OpenRA/OpenRA/archive/release-${version}.tar.gz";
+    sha256 = "1gfz6iiccajp86qc7xw5w843bng69k9zplvmipxxbspvr7byhw0c";
+  };
+
+  dontStrip = true;
+
+  nativeBuildInputs = [ mono makeWrapper ];
+
+  patchPhase = ''
+    sed -i 's/^VERSION.*/VERSION = release-${version}/g' Makefile
+  '';
+
+  preConfigure = ''
+    makeFlags="prefix=$out"
+    make version
+  '';
+
+  postInstall = with stdenv.lib; let
+    runtime = makeLibraryPath [ SDL2 freetype openal ];
+  in ''
+    wrapProgram $out/bin/openra \
+      --prefix PATH : "${mono}/bin" \
+      --prefix LD_LIBRARY_PATH : "${runtime}"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f138d8c88a2..7e4d2214479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9993,6 +9993,8 @@ let
 
   oilrush = callPackage ../games/oilrush { };
 
+  openra = callPackage ../games/openra { };
+
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;
   };

From a8a9c78af825ba92aa181e66cfbb3d8fa867d077 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Mon, 26 May 2014 16:47:06 +0200
Subject: [PATCH 1862/2033] Add grafana, A Graphite & InfluxDB Dashboard and
 Graph Editor

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

diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix
new file mode 100644
index 00000000000..346c7fb6ad2
--- /dev/null
+++ b/pkgs/development/tools/misc/grafana/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, unzip, conf ? null }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "grafana-${version}";
+  version = "1.5.4";
+
+  src = fetchurl {
+    url = "http://grafanarel.s3.amazonaws.com/${name}.zip";
+    sha256 = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d";
+  };
+
+  buildInputs = [ unzip ];
+
+  phases = ["unpackPhase" "installPhase"];
+  installPhase = ''
+    ensureDir $out && cp -R * $out
+    ${optionalString (conf!=null) ''cp ${conf} $out/config.js''}
+  '';
+
+  meta = {
+    description = "A Graphite & InfluxDB Dashboard and Graph Editor";
+    homepage = http://grafana.org/;
+    license = licenses.asl20;
+
+    maintainers = [ maintainers.offline ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 70cab717c16..430d3b789da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1146,6 +1146,8 @@ let
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
+  grafana = callPackage ../development/tools/misc/grafana { };
+
   grafx2 = callPackage ../applications/graphics/grafx2 {};
 
   graphviz = callPackage ../tools/graphics/graphviz { };

From 48458b1c9654509f5bd889f9ec8b395d506140e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 27 May 2014 21:07:59 +0200
Subject: [PATCH 1863/2033] handbrake: disable unfree faac, as it doesn't build
 with it

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

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 34aa8ff65de..297da6738ee 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
   version = "0.9.9";
   name = "handbrake-${version}";
 
-  allowUnfree = config.allowUnfree or false;
+  # ToDo: doesn't work (yet)
+  allowUnfree = false; # config.allowUnfree or false;
 
   buildInputsX = stdenv.lib.optionals useGtk [
     glib gtk intltool libnotify
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals useWebKitGtk [ webkitgtk ];
 
   # Did not test compiling with it
-  unfreeInputs = stdenv.lib.optionals allowUnfree [ faac ];
+  unfreeInputs = stdenv.lib.optional allowUnfree faac;
 
   nativeBuildInputs = [ python pkgconfig yasm autoconf automake libtool m4 ];
   buildInputs = [
@@ -49,14 +50,14 @@ stdenv.mkDerivation rec {
     lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264
   ] ++ buildInputsX ++ unfreeInputs;
 
-  
+
   src = fetchurl {
     name = "HandBrake-${version}.tar.bz2";
     url = "http://handbrake.fr/rotation.php?file=HandBrake-${version}.tar.bz2";
     sha256 = "1crmm1c32vx60jfl2bqzg59q4qqx6m83b08snp7h1njc21sdf7d7";
   };
 
-  patches = stdenv.lib.optionals (! allowUnfree) [ ./disable-unfree.patch ];
+  patches = stdenv.lib.optional (! allowUnfree) ./disable-unfree.patch;
 
   preConfigure = ''
     # Fake wget to prevent downloads

From a33cb3769582758b6df4a4eb404f51552669e5bc Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Mon, 5 May 2014 10:46:50 +1000
Subject: [PATCH 1864/2033] perl-file-mimeinfo: update to 0.23 and fix build on
 darwin

Close #2508. The test also fails on x86_64-linux, disabling.
---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2b67e2a89d8..4239d6dd746 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3539,12 +3539,13 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ HTTPDate ];
   };
 
-  FileMimeInfo = buildPerlPackage {
-    name = "File-MimeInfo-0.20";
+  FileMimeInfo = buildPerlPackage rec {
+    name = "File-MimeInfo-0.23";
     src = fetchurl {
-      url = "http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/File-MimeInfo-0.20.tar.gz";
-      sha256 = "1738yi3a0xcbvffqymjb6cyh999q4pryalfwbkmdbjdks2y0bxz0";
+      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
+      sha256 = "006i9idnxv9hsz1gykc5bqs05ma5wz9dsjrpmah9293bgdy1ccxj";
     };
+    doCheck = false; # Failed test 'desktop file is the right one'
     propagatedBuildInputs = [ FileBaseDir FileDesktopEntry ];
   };
 

From 4d6f2e41d79cb19b68fdd89e668498159d0a52b8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 27 May 2014 21:16:42 +0200
Subject: [PATCH 1865/2033] ethtool: update from 3.13 to 3.14

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index fe5985b9698..1b6205db7ce 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ethtool-3.13";
+  name = "ethtool-3.14";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "07z7janzj8fbs04sw6nlzr039yh7b5gmzvik7ymg807i2gi5fmjs";
+    sha256 = "01v7a757757bk68vvap2x0v6jbqicchnjxvh52w8dccixxq2nkj3";
   };
 
   meta = with stdenv.lib; {

From 400e85ae1edd539ec6ebe441bdad1584aa6f9bc7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 27 May 2014 21:17:56 +0200
Subject: [PATCH 1866/2033] debootstrap: update from 1.0.42 to 1.0.60

---
 pkgs/tools/misc/debootstrap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 388cfa14e41..aac7855827c 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation {
 
-  name = "debootstrap-1.0.42";
+  name = "debootstrap-1.0.60";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz;
-    sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0";
+    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.60.tar.xz;
+    sha256 = "0jyxfmx466fsqak00m4n6b04zsdqym81ybah7yx2l081d0518sw8";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From 6bfb25b9e870ef080120108e2b1a94ace725a015 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 27 May 2014 21:18:33 +0200
Subject: [PATCH 1867/2033] dos2unix: update from 6.0.4 to 6.0.5

---
 pkgs/tools/text/dos2unix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index a7d5bed6642..dc61723e597 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation {
-  name = "dos2unix-6.0.4";
+  name = "dos2unix-6.0.5";
   
   src = fetchurl {
-    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.4.tar.gz;
-    sha256 = "0ymkp55shilzcrn60w1ni92gck7pbqxhi9qsnsii7gkz996j5gb6";
+    url = http://waterlan.home.xs4all.nl/dos2unix/dos2unix-6.0.5.tar.gz;
+    sha256 = "13w5blhv0i473y9lyrxh4axz4niyrxcpj4v2qiq3w5kamyp20czx";
   };
 
   configurePhase = ''

From 4dd050b4255f51661d8b7b96ad90201993841475 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 27 May 2014 15:27:17 -0500
Subject: [PATCH 1868/2033] update znc 1.2 -> 1.4

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

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index dbf886de978..fdd02aac0b5 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -7,11 +7,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "znc-1.2";
+  name = "znc-1.4";
 
   src = fetchurl {
     url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr";
+    sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6";
   };
 
   buildInputs = [ openssl pkgconfig ]

From 66456c07989282f63a8425cc3a4554a79f1b6709 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Tue, 27 May 2014 22:54:43 +0200
Subject: [PATCH 1869/2033] nixos: add influxdb module

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/databases/influxdb.nix | 241 ++++++++++++++++++
 nixos/release.nix                             |   1 +
 nixos/tests/influxdb.nix                      |  34 +++
 5 files changed, 279 insertions(+)
 create mode 100644 nixos/modules/services/databases/influxdb.nix
 create mode 100644 nixos/tests/influxdb.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 13ec502047d..db50a010e7d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -132,6 +132,7 @@
       hydra = 122;
       spiped = 123;
       teamspeak = 124;
+      influxdb = 125;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -238,6 +239,7 @@
       hydra = 122;
       spiped = 123;
       teamspeak = 124;
+      influxdb = 125;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0737da71923..c1b55cb5550 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -98,6 +98,7 @@
   ./services/databases/postgresql.nix
   ./services/databases/virtuoso.nix
   ./services/databases/monetdb.nix
+  ./services/databases/influxdb.nix
   ./services/desktops/accountservice.nix
   ./services/desktops/geoclue2.nix
   ./services/desktops/gnome3/at-spi2-core.nix
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
new file mode 100644
index 00000000000..61fe96d5d64
--- /dev/null
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -0,0 +1,241 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.influxdb;
+
+  influxdbConfig = pkgs.writeText "config.toml" ''
+    bind-address = "${cfg.bindAddress}"
+
+    [logging]
+    level  = "info"
+    file   = "stdout"
+
+    [admin]
+    port   = ${toString cfg.adminPort}
+    assets = "${pkgs.influxdb}/share/influxdb/admin"
+
+    [api]
+    port   = ${toString cfg.apiPort}
+    ${cfg.apiExtraConfig}
+
+    [input_plugins]
+      ${cfg.inputPluginsConfig}
+
+    [raft]
+    dir = "${cfg.dataDir}/raft"
+    ${cfg.raftConfig}
+
+    [storage]
+    dir = "${cfg.dataDir}/db"
+    ${cfg.storageConfig}
+
+    [cluster]
+    ${cfg.clusterConfig}
+
+    [sharding]
+      ${cfg.shardingConfig}
+
+    [wal]
+    dir = "${cfg.dataDir}/wal"
+    ${cfg.walConfig}
+
+    ${cfg.extraConfig}
+  '';
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.influxdb = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the influxdb server";
+        type = types.uniq types.bool;
+      };
+
+      package = mkOption {
+        default = pkgs.influxdb;
+        description = "Which influxdb derivation to use";
+        type = types.package;
+      };
+
+      user = mkOption {
+        default = "influxdb";
+        description = "User account under which influxdb runs";
+        type = types.string;
+      };
+
+      group = mkOption {
+        default = "influxdb";
+        description = "Group under which influxdb runs";
+        type = types.string;
+      };
+
+      dataDir = mkOption {
+        default = "/var/db/influxdb";
+        description = "Data directory for influxd data files.";
+        type = types.path;
+      };
+
+      bindAddress = mkOption {
+        default = "127.0.0.1";
+        description = "Address where influxdb listens";
+        type = types.str;
+      };
+
+      adminPort = mkOption {
+        default = 8083;
+        description = "The port where influxdb admin listens";
+        type = types.int;
+      };
+
+      apiPort = mkOption {
+        default = 8086;
+        description = "The port where influxdb api listens";
+        type = types.int;
+      };
+
+      apiExtraConfig = mkOption {
+        default = ''
+          read-timeout = "5s"
+        '';
+        description = "Extra influxdb api configuration";
+        example = ''
+          ssl-port = 8084
+          ssl-cert = /path/to/cert.pem
+          read-timeout = "5s"
+        '';
+        type = types.lines;
+      };
+
+      inputPluginsConfig = mkOption {
+        default = "";
+        description = "Configuration of influxdb extra plugins";
+        example = ''
+          [input_plugins.graphite]
+          enabled = true
+          port = 2003
+          database = "graphite"
+        '';
+      };
+
+      raftConfig = mkOption {
+        default = ''
+          port = 8090
+        '';
+        description = "Influxdb raft configuration";
+        type = types.lines;
+      };
+
+      storageConfig = mkOption {
+        default = ''
+          write-buffer-size = 10000
+        '';
+        description = "Influxdb raft configuration";
+        type = types.lines;
+      };
+
+      clusterConfig = mkOption {
+        default = ''
+          protobuf_port = 8099
+          protobuf_timeout = "2s"
+          protobuf_heartbeat = "200ms"
+          protobuf_min_backoff = "1s"
+          protobuf_max_backoff = "10s"
+
+          write-buffer-size = 10000
+          max-response-buffer-size = 100
+
+          concurrent-shard-query-limit = 10
+        '';
+        description = "Influxdb cluster configuration";
+        type = types.lines;
+      };
+
+      leveldbConfig = mkOption {
+        default = ''
+          max-open-files = 40
+          lru-cache-size = "200m"
+          max-open-shards = 0
+          point-batch-size = 100
+          write-batch-size = 5000000
+        '';
+        description = "Influxdb leveldb configuration";
+        type = types.lines;
+      };
+
+      shardingConfig = mkOption {
+        default = ''
+          replication-factor = 1
+
+          [sharding.short-term]
+          duration = "7d"
+          split = 1
+
+          [sharding.long-term]
+          duration = "30d"
+          split = 1
+        '';
+        description = "Influxdb sharding configuration";
+        type = types.lines;
+      };
+
+      walConfig = mkOption {
+        default = ''
+          flush-after = 1000
+          bookmark-after = 1000
+          index-after = 1000
+          requests-per-logfile = 10000
+        '';
+        description = "Influxdb write-ahead log configuration";
+        type = types.lines;
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        description = "Extra configuration options for influxdb";
+        type = types.string;
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.influxdb.enable {
+
+    systemd.services.influxdb = {
+      description = "InfluxDB Server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      serviceConfig = {
+        ExecStart = ''${cfg.package}/bin/influxdb -config "${influxdbConfig}"'';
+        User = "${cfg.user}";
+        Group = "${cfg.group}";
+        PermissionsStartOnly = true;
+      };
+      preStart = ''
+        mkdir -m 0770 -p ${cfg.dataDir}
+        if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
+      '';
+    };
+
+    users.extraUsers = optional (cfg.user == "influxdb") {
+      name = "influxdb";
+      uid = config.ids.uids.influxdb;
+      description = "Influxdb daemon user";
+    };
+
+    users.extraGroups = optional (cfg.group == "influxdb") {
+      name = "influxdb";
+      gid = config.ids.gids.influxdb;
+    };
+  };
+
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 06749966cbb..e5eadb57fe6 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -221,6 +221,7 @@ in rec {
   tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test);
   tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test);
   tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test);
+  tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
   tests.kde4 = callTest tests/kde4.nix {};
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
new file mode 100644
index 00000000000..278b264170f
--- /dev/null
+++ b/nixos/tests/influxdb.nix
@@ -0,0 +1,34 @@
+# This test runs influxdb and checks if influxdb is up and running
+
+import ./make-test.nix {
+  nodes = {
+    one = { config, pkgs, ... }: {
+      services.influxdb.enable = true;
+    };
+  };
+
+  testScript = ''
+    startAll;
+  
+    $one->waitForUnit("influxdb.service");
+
+    # Check if admin interface is avalible
+    $one->waitUntilSucceeds("curl -f 127.0.0.1:8083");
+
+    # create database
+    $one->succeed(q~
+      curl -X POST 'http://localhost:8086/db?u=root&p=root' \
+        -d '{"name": "test"}'
+    ~);
+
+    # write some points and run simple query
+    $one->succeed(q~
+      curl -X POST 'http://localhost:8086/db/test/series?u=root&p=root' \
+        -d '[{"name":"foo","columns":["val"],"points":[[6666]]}]'
+    ~);
+    $one->succeed(q~
+      curl -G 'http://localhost:8086/db/test/series?u=root&p=root' \
+        --data-urlencode 'q=select * from foo limit 1' | grep 6666
+    ~);
+  '';
+}

From 57ed344917d909ca6ef76f24b3bb78f75b7ec407 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 May 2014 17:22:25 -0400
Subject: [PATCH 1870/2033] Fix /run/keys permissions

---
 nixos/modules/system/boot/stage-2-init.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index a64c6cdfa19..ab414e29eb2 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -121,9 +121,10 @@ fi
 # written to disk (generally used for NixOps, harmless elsewhere).
 if ! mountpoint -q /run/keys; then
     rm -rf /run/keys
-    mkdir -m 0750 /run/keys
-    chown 0:96 /run/keys
+    mkdir /run/keys
     mount -t ramfs none /run/keys
+    chown 0:96 /run/keys
+    chmod 0750 /run/keys
 fi
 
 mkdir -m 0755 -p /run/lock

From 66925a57ba3fc393c0ed9cd9bea02e22c4f73edb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:15:59 +0400
Subject: [PATCH 1871/2033] Updating SBCL to 1.2.0

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 36ea8981786..e1de4c53de5 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -4,11 +4,11 @@ let
   s= # Generated upstream information
   rec {
     baseName="sbcl";
-    version="1.1.16";
+    version="1.2.0";
     name="${baseName}-${version}";
-    hash="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw";
-    url="mirror://sourceforge/project/sbcl/sbcl/1.1.16/sbcl-1.1.16-source.tar.bz2";
-    sha256="04631klj02crs82b1i21rpddcgh9x6nnarj5avavy9c7zgvr8cnw";
+    hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
+    url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2";
+    sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2";
   };
   buildInputs = with a; [
     clisp makeWrapper

From f36db74cc4034d478a74ae26efbaf07f95e88eb4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:19:22 +0400
Subject: [PATCH 1872/2033] Updating libgphoto2

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

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

From 736dff5328e738bae153bfa6a1f6f40906202317 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:19:51 +0400
Subject: [PATCH 1873/2033] Updating libsodium to 0.5.0

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

diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix
index 027f9e2f2fc..93f2ff0de6b 100644
--- a/pkgs/development/libraries/sodium/default.nix
+++ b/pkgs/development/libraries/sodium/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="sodium";
-    version="0.4.5";
+    version="0.5.0";
     name="${baseName}-${version}";
-    hash="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs";
-    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.4.5.tar.gz";
-    sha256="0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs";
+    hash="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
+    url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.5.0.tar.gz";
+    sha256="1w7rrnsvhhzhywrr3nhlhppv4kqzdszz3dwy8jrsv8lrj5hs181w";
   };
   buildInputs = [
   ];

From 5c5bae95871113b9954318257a188854a197951c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:20:13 +0400
Subject: [PATCH 1874/2033] Updatign ASDF to 3.1.2

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

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index c0602e2c028..97e1661544b 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.0.3";
+    version="3.1.2";
     name="${baseName}-${version}";
-    hash="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.0.3.tar.gz";
-    sha256="0iszin6j0qxw48gkn30rqgwm240177hx06khhgv8041zsf1ivw85";
+    hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz";
+    sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki";
   };
   buildInputs = [
     texinfo texLive

From 700d332e7d7affe09fd6742bf02eac5e387740c6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:20:40 +0400
Subject: [PATCH 1875/2033] Updating CL-Launch

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

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 5d7da48cced..14a36470bba 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.0.2.2";
+    version="4.0.4";
     name="${baseName}-${version}";
-    hash="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.2.2.tar.gz";
-    sha256="1a7nwm1gkvpypfbhl29gj4gba50r5b069g3c87cfvrk2n4plm65b";
+    hash="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.4.tar.gz";
+    sha256="152m834myhcgi4iacfqn81fznlbqxn7pvdlxvk2lbba09h0slm56";
   };
   buildInputs = [
   ];

From 97c61e9a44eaa2453f5433a38c673ff949fb18e3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:21:02 +0400
Subject: [PATCH 1876/2033] Updating LuaRocks

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

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 953035342fd..c8579ef3831 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.1.2";
+    version="2.2";
     name="${baseName}-${version}";
-    hash="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2";
-    url="http://luarocks.org/releases/luarocks-2.1.2.tar.gz";
-    sha256="1wwz71ymzjcyw8pz36yiw2x87c6v8nx5vdcd7zibm1n815v5qqk2";
+    hash="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs";
+    url="http://luarocks.org/releases/luarocks-2.2.0beta1.tar.gz";
+    sha256="03i46ayimp087288f0bi6g30fi3aixp2bha2jmsbbhwmsxm1yshs";
   };
   buildInputs = [
     lua curl

From bc292a5882140338375a7b4a7b2f1c44e2cc230c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:21:47 +0400
Subject: [PATCH 1877/2033] Updating Wine unstable to 1.7.19

---
 pkgs/misc/emulators/wine/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index bf55f93db5b..b3c68429d6d 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 let
-    version = "1.7.14";
+    version = "1.7.19";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "029y4vsjz2jxy31g5nylpl7wm5qhw37dsbx4f0za6swk51z97w9d";
+      sha256 = "1wigncw7xl6ni6kjmhmbzffhf0pav22b50aql93wz7h2r409psn5";
     };
 
     gecko = fetchurl {

From f769585c95ec284a932b07667b0a440c20d8d07e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:22:44 +0400
Subject: [PATCH 1878/2033] Updating SlimerJS to 0.9.1

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

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index 86c8b923cca..9741b0930d2 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.9.0";
+    version="0.9.1";
     name="${baseName}-${version}";
-    hash="1b4c299gk20mqb91929jan9ldhwy3jska75wvil9vdmgjrr8496m";
-    url="http://download.slimerjs.org/v0.9/0.9.0/slimerjs-0.9.0.zip";
-    sha256="1b4c299gk20mqb91929jan9ldhwy3jska75wvil9vdmgjrr8496m";
+    hash="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
+    url="http://download.slimerjs.org/v0.9/0.9.1/slimerjs-0.9.1.zip";
+    sha256="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k";
   };
   buildInputs = [
     unzip zip

From 515a7e78fa77530800b42ca440c981bf0d677ead Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:23:03 +0400
Subject: [PATCH 1879/2033] Updating conspy

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

diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index 44689cd5d62..d252d9ce162 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="conspy";
-    version="1.8";
+    version="1.9";
     name="${baseName}-${version}";
-    hash=sha256;
-    url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.8.tar.gz";
-    sha256="1jc2maqp4w4mzlr3s8yni03w1p9sir5hb7gha3ffxj4n32nx42dq";
+    hash="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
+    url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.9.tar.gz";
+    sha256="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv";
   };
   buildInputs = [
     autoconf automake ncurses

From 783fb585bfb1f6a050747e852808cf2187f6b0ed Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:23:28 +0400
Subject: [PATCH 1880/2033] Updating ZPAQ to 651

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

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c77517fa177..2f44a8dd4db 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="649";
+    version="651";
     name="${baseName}-${version}";
-    hash="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
-    url="http://mattmahoney.net/dc/zpaq649.zip";
-    sha256="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
+    hash="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5";
+    url="http://mattmahoney.net/dc/zpaq651.zip";
+    sha256="1n0qq4lia25n62jpa0gg29388xf8r75nv4h1vpc3s5rpymkq2qw5";
   };
   buildInputs = [
     unzip

From 5c5cef35cb58af1065b2e762dd9ea51386c4976a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 May 2014 01:33:15 +0400
Subject: [PATCH 1881/2033] Updating Asymptote to 2.32

---
 pkgs/tools/graphics/asymptote/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index b4bb49758a4..5109bb45e30 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -11,11 +11,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.24";
-    name="asymptote-2.24";
-    hash="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
-    url="mirror://sourceforge/project/asymptote/2.24/asymptote-2.24.src.tgz";
-    sha256="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
+    version="2.32";
+    name="${baseName}-${version}";
+    hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
+    url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz";
+    sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
   };
   buildInputs = with a; [
     freeglut ghostscriptX imagemagick fftw boehmgc

From 4cb43d2a756449c43e6ce4713b0eb8169591597f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 28 May 2014 01:35:31 -0500
Subject: [PATCH 1882/2033] Build ppl and gmp correctly for building gcc48 on
 darwin

---
 pkgs/development/libraries/gmp/5.1.x.nix   | 3 ++-
 pkgs/development/libraries/ppl/default.nix | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index a25eabbee86..53d7f458565 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <http://hydra.nixos.org/build/2760931>, for instance.
     (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat")
-    ++ (if cxx then [ "--enable-cxx" ] else [ "--disable-cxx" ])
+    ++ (if cxx then [ "--enable-cxx" "CPPFLAGS=-fexceptions" ]
+               else [ "--disable-cxx" ])
     ++ (if stdenv.is64bit then [ "--with-pic" ] else []);
 
   doCheck = true;
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index cbdb7b128b4..2c22317a6ca 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl gnum4 ];
   propagatedBuildInputs = [ gmpxx ];
 
-  configureFlags = "--disable-watchdog";
+  configureFlags = [ "--disable-watchdog" "CPPFLAGS=-fexceptions" ] ++
+    stdenv.lib.optionals stdenv.isDarwin [
+      "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
+    ];
 
   patches = [ ./upstream-based.patch ];
 

From ea23ea00e4fd2b834b06313db2e4604379ab002e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 28 May 2014 10:40:21 +0200
Subject: [PATCH 1883/2033] Make fetchhg do the same as nix-prefetch-hg, use hg
 archive. Fixes #2781.

---
 pkgs/build-support/fetchhg/builder.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh
index 73ec7ec0b36..6e9fbab791f 100644
--- a/pkgs/build-support/fetchhg/builder.sh
+++ b/pkgs/build-support/fetchhg/builder.sh
@@ -2,8 +2,9 @@ source $stdenv/setup
 
 header "getting $url${tag:+ ($tag)} into $out"
 
-hg clone --insecure ${tag:+-r "$tag"} "$url" "$out"
+hg clone --insecure ${tag:+-r "$tag"} "$url" hg-clone
 
-rm -rf "$out/.hg"
+hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out
+rm -f $out/.hg_archival.txt
 
 stopNest

From 3ee69912b29c9cb165ec6126edc3dd4087b3adb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 May 2014 12:12:26 +0200
Subject: [PATCH 1884/2033] Adding ocropus, based on an expression from
 iElectric.

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

diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
new file mode 100644
index 00000000000..60fd3b2ccb3
--- /dev/null
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchhg, fetchurl, pythonPackages, curl }:
+
+let
+  getmodel = name: sha256: {
+    src = fetchurl {
+      url = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/${name}";
+      inherit sha256;
+    };
+    inherit name;
+  };
+
+  models = [
+    (getmodel "en-default.pyrnn.gz"
+      "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp")
+    (getmodel "en-uw3-linerel-2.cmodel.gz"
+      "0zdw0db2znxxd4h7aa09506nkbxd1cfqacxzyzlx42bjn951wcpw")
+    (getmodel "en-mixed-3.ngraphs.gz"
+      "1fqw7pxmjwapirp9xv3b0gn9pk53q4740qn5dw4wxfxk9dpp9lr4")
+    (getmodel "en-space.model.gz"
+      "0w5hnjm6rz5iiw1p2yixj147ifq11s9jfzrxk4v4xxmcyn365096")
+    (getmodel "en-mixed.lineest.gz"
+      "0skrziksn3zb3g8588y7jd10pnl2pzrby0119ac0awapzzg9vkvw")
+    (getmodel "uw3unlv.pyrnn.gz"
+      "0g08q9cjxxx3mg1jn4654nalxr56y2jq1h33pwxrj5lrckr7grb9")
+    (getmodel "en-uw3unlv-perchar.cmodel.gz"
+      "1izvm0wkb2vh58hjp59fw97drv17zdzrw6mz3aanrg5ax6fnfadk")
+    (getmodel "gradient.lineest.gz"
+      "1bw9hj9byjxi31rjh2xiysnx8c72jz0npxa54xgjwsqg7ihl8jzw")
+    (getmodel "en-mixed-round1.lineest.gz"
+      "1fjkygyrg4ng7kx4iqa4yhgvmw1zq72p3q5p0hcb2xxhqc04vx7c")
+    (getmodel "frakant.pyrnn.gz"
+      "0i1k95f2a8qlc6m7qq11pmjfcimyrjsfjvv20nrs2ygp9pwskmxp")
+    (getmodel "fraktur.pyrnn.gz"
+      "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
+  ];
+in
+pythonPackages.buildPythonPackage rec {
+  name = "ocropus-${version}";
+  version = "20130905";
+
+  src = fetchhg {
+    url = "https://code.google.com/p/ocropus.ocropy";
+    tag = "a6e0fbd820ce";
+    sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
+  };
+
+  buildInputs = with pythonPackages; [ curl numpy scipy pillow matplotlib ];
+
+  enableParallelBuilding = true;
+  
+  preConfigure = with stdenv.lib; ''
+    ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)}
+    ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open source document analysis and OCR system";
+    license = licenses.asl20;
+    homepage = https://code.google.com/p/ocropus/;
+    maintainers = with maintainers; [ iElectric viric ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3214c110dfc..04116d38883 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3462,6 +3462,8 @@ let
 
   # mercurial (hg) bleeding edge version
   octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
+  
+  ocropus = callPackage ../applications/misc/ocropus { };
 
   perl58 = callPackage ../development/interpreters/perl/5.8 {
     impureLibcPath = if stdenv.isLinux then null else "/usr";

From 6a359589364c12df7b5745e0d7d8a81467979fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 May 2014 12:39:54 +0200
Subject: [PATCH 1885/2033] Adding missing dependencies. There is still a
 matplotlib problem running ocropus-hocr.

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

diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 60fd3b2ccb3..aaf0039305b 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -44,7 +44,8 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
   };
 
-  buildInputs = with pythonPackages; [ curl numpy scipy pillow matplotlib ];
+  propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
+    matplotlib beautifulsoup4 pygtk ];
 
   enableParallelBuilding = true;
   

From 5c3c688f7bc16cdcf57f7c0a4ebb61b369088ef1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 Apr 2014 13:17:40 +0200
Subject: [PATCH 1886/2033] Elm: fix build by ignoring the build instructions
 provided by upstream

Re-apply the build fix from <https://github.com/NixOS/nixpkgs/issues/2089>,
because apparently the underlying issue has not been fixed.

According to <https://github.com/elm-lang/Elm/issues/384>, Elm's release
archive comes with a Setup.hs that cannot compile an Elm release. Duh!
Replacing the custom Setup.hs file with a dummy version fixes this issue.
---
 pkgs/development/compilers/elm/elm.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 3daa1b507b7..622f182e8c5 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -24,6 +24,10 @@ cabal.mkDerivation (self: {
     unorderedContainers yaml
   ];
   doCheck = false;
+  preConfigure = ''
+    rm -f Setup.hs
+    echo -e "import Distribution.Simple\nmain=defaultMain\n" > Setup.hs
+  '';
   meta = {
     homepage = "http://elm-lang.org";
     description = "The Elm language module";

From 1d70298e2e203021bafac8708120607e63aa3590 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 May 2014 12:39:09 +0200
Subject: [PATCH 1887/2033] Elm: require binary 0.7.x on ghc <= 7.6.3

---
 pkgs/top-level/haskell-defaults.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 3618c0f10ed..d803883413d 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -37,6 +37,7 @@
         vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_1; };
       };
     };
+    Elm = super.Elm.override { pandoc = self.pandoc.override { zipArchive = self.zipArchive.override { binary = self.binary_0_7_2_1; }; }; };
     gloss = null;                       # requires base >= 4.7
     haddock = self.haddock_2_13_2;
     modularArithmetic = null;           # requires base >= 4.7

From c4349c3b17f95ab2c3897dc22d2f852dbc7e27da Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 28 May 2014 13:04:16 +0200
Subject: [PATCH 1888/2033] crrcsim: Update to 0.9.12 & simplify.

---
 pkgs/games/crrcsim/default.nix | 54 ++++++++++------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index a080436bbe0..944b67041c2 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -1,48 +1,24 @@
-x@{builderDefsPackage
-  , mesa, SDL, SDL_mixer, plib, libjpeg
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="crrcsim";
-    version="0.9.11";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${baseName}.berlios/${name}.tar.gz";
-    hash="16z9gixp60920lqckij8kdw90jys0llls4lw5c8vqgk14ck5hhiz";
-  };
+{ stdenv, fetchurl, mesa, SDL, SDL_mixer, plib, libjpeg }:
+let
+  version = "0.9.12";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "crrcsim-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
+    sha256 = "1yx3cn7ilwj92v6rk3zm565ap92vmky4r39na814lfglkzn6l5id";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [
+    mesa SDL SDL_mixer plib libjpeg
+  ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "A model-airplane flight simulator";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
     license = "GPLv2";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://crrcsim.berlios.de/wiki/index.php?n=CRRCsim.DownLoad"; #TODO: berlios shut down
-    };
-  };
-}) x
+}
 

From d6f793b4530f7e41c445df02485512bdbedaca82 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 May 2014 14:01:14 +0300
Subject: [PATCH 1889/2033] pythonPackages.gflags: update to 2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 234a0b396a0..0dc14e5a714 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3216,11 +3216,11 @@ rec {
 
 
   gflags = buildPythonPackage rec {
-    name = "gflags-1.5.1";
+    name = "gflags-2.0";
 
     src = fetchurl {
       url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz";
-      sha256 = "1p8blsc3z1wasi9dhbjij7m2czps17dll3cpj37v97fv5ww7al9v";
+      sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i";
     };
 
     meta = {

From 350c96cce998d7f25b27678193af233ebbbeedbe Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 May 2014 14:11:37 +0300
Subject: [PATCH 1890/2033] pythonPackages.iso8601_0_1_4: add package version
 0.1.4 for gcutil

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0dc14e5a714..07d63a0472c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3562,6 +3562,19 @@ rec {
     propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipythonLight ];
   };
 
+  iso8601_0_1_4 = buildPythonPackage {
+    name = "iso8601-0.1.4";
+    src = fetchurl {
+      url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.4.tar.gz;
+      sha256 = "03gnjxpfq0wwimqnsvz32xcngq0hrdqryn3zm8qh95hnnggwqa3s";
+    };
+
+    meta = {
+      homepage = https://bitbucket.org/micktwomey/pyiso8601/;
+      description = "Simple module to parse ISO 8601 dates";
+      maintainers = [ stdenv.lib.maintainers.phreedom ];
+    };
+  };
 
   jedi = buildPythonPackage (rec {
     name = "jedi-0.7.0";

From 7be252bd4f5bf847a53aa63c5a4afc40d1fb7977 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 May 2014 14:16:55 +0300
Subject: [PATCH 1891/2033] pythonPackages.ipaddr: update to 2.1.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d63a0472c..62f62012deb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3528,15 +3528,12 @@ rec {
 
 
   ipaddr = buildPythonPackage {
-    name = "ipaddr-2.1.7";
+    name = "ipaddr-2.1.10";
     src = fetchurl {
-      url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.7.tar.gz";
-      md5 = "71a2be9f1d528d9a945ef555de312685";
+      url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz";
+      sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       description = "Google's IP address manipulation library";
       homepage = http://code.google.com/p/ipaddr-py/;

From 4437a90a6f052c9bf87440a3a8095ab735989a87 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 May 2014 14:27:51 +0300
Subject: [PATCH 1892/2033] pythonPackages.google-apputils: add package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62f62012deb..b4bce4884cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3319,6 +3319,22 @@ rec {
     };
   };
 
+   google_apputils = buildPythonPackage rec {
+    name = "google-apputils-0.4.0";
+
+    src = fetchurl {
+      url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz;
+      sha256 = "18wlivnqxvx1wsw177lckpl32nmr6cq7f5nhk8r72fvjy8wynq5j";
+    };
+
+    propagatedBuildInputs = [ pytz gflags dateutil_1_5 mox ];
+
+    meta = with stdenv.lib; {
+      description = "Google Application Utilities for Python";
+      homepage = http://code.google.com/p/google-apputils-python;
+    };
+  };
+
   greenlet = buildPythonPackage rec {
     name = "greenlet-0.3.1";
 

From cf32243de50032c400d213ede5b16bb424182b25 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Wed, 28 May 2014 14:32:21 +0300
Subject: [PATCH 1893/2033] pythonPackages.gcutil: add package

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4bce4884cf..933a073a5aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1849,6 +1849,18 @@ rec {
     };
   };
 
+  gcutil = buildPythonPackage rec {
+    name = "gcutil-1.15.0";
+    meta.maintainers = [ stdenv.lib.maintainers.phreedom ];
+
+    src = fetchurl {
+      url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.15.0.tar.gz;
+      sha256 = "12c98ivhjr01iz6lkga574xm8p0bsil6arydvpblyw8sjkgim5sq";
+    };
+
+    propagatedBuildInputs = [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ];
+  };
+
   gitdb = buildPythonPackage rec {
     name = "gitdb-0.5.4";
     meta.maintainers = [ stdenv.lib.maintainers.mornfall ];

From 089b2930196a95e5111a1d21b06d6c8e76cfd011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6nke=20Hahn?= <soenkehahn@gmail.com>
Date: Wed, 28 May 2014 20:12:53 +0800
Subject: [PATCH 1894/2033] better error message in case of missing uids

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

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 873b6fb424d..5de81a77342 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -509,7 +509,7 @@ in {
         message = "uids and gids must be unique!";
       }
       { assertion = cfg.mutableUsers || (nonUidUsers == {});
-        message = "When mutableUsers is false, no uid can be null";
+        message = "When mutableUsers is false, no uid can be null: ${toString (attrNames nonUidUsers)}";
       }
       { assertion = cfg.mutableUsers || (nonGidGroups == {});
         message = "When mutableUsers is false, no gid can be null";

From a8c9c11f9ec5b0d0d5eec279b66da84a89008f61 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 May 2014 14:38:07 +0200
Subject: [PATCH 1895/2033] Manual: Note about using a local branch

---
 nixos/doc/manual/development.xml | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml
index 6873710205d..2f0c2a7aa8d 100644
--- a/nixos/doc/manual/development.xml
+++ b/nixos/doc/manual/development.xml
@@ -39,7 +39,37 @@ This will check out the latest NixOS sources to
 and the Nixpkgs sources to
 <filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.
 (The NixOS source tree lives in a subdirectory of the Nixpkgs
-repository.)  If you want to rebuild your system using your (modified)
+repository.)</para>
+
+<para>It’s often inconvenient to develop directly on the master
+branch, since if somebody has just committed (say) a change to GCC,
+then the binary cache may not have caught up yet and you’ll have to
+rebuild everything from source. So you may want to create a local
+branch based on your current NixOS version:
+
+<screen>
+$ nixos-version
+14.04.273.ea1952b (Baboon)
+
+$ git checkout -b local ea1952b
+</screen>
+
+Or, to base your local branch on the latest version available in the
+NixOS channel:
+
+<screen>
+$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location
+Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/
+
+$ git checkout -b local acaf4a6
+</screen>
+
+You can then use <command>git rebase</command> to sync your local
+branch with the upstream branch, and use <command>git
+cherry-pick</command> to copy commits from your local branch to the
+upstream branch.</para>
+
+<para>If you want to rebuild your system using your (modified)
 sources, you need to tell <command>nixos-rebuild</command> about them
 using the <option>-I</option> flag:
 

From 338969701c0cbfd868d39278fd36c73cfaa491eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 28 May 2014 15:22:51 +0200
Subject: [PATCH 1896/2033] Fixing upnp in syncthing

---
 .../networking/syncthing/default.nix          |  2 ++
 .../networking/syncthing/upnp.patch           | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/networking/syncthing/upnp.patch

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 12aa98758ad..28603daa9c6 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ go ];
 
+  patches = [ ./upnp.patch ];
+
   buildPhase = ''
     mkdir -p "./dependencies/src/github.com/calmh/syncthing"
 
diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch
new file mode 100644
index 00000000000..f4164b4f6bc
--- /dev/null
+++ b/pkgs/applications/networking/syncthing/upnp.patch
@@ -0,0 +1,28 @@
+Trying to fix upnp for miniupnpd:
+https://github.com/calmh/syncthing/issues/211
+
+diff --git a/upnp/upnp.go b/upnp/upnp.go
+index 9de719a..9c85b23 100644
+--- a/upnp/upnp.go
++++ b/upnp/upnp.go
+@@ -60,14 +60,12 @@ func Discover() (*IGD, error) {
+ 		return nil, err
+ 	}
+ 
+-	search := []byte(`
+-M-SEARCH * HTTP/1.1
+-Host: 239.255.255.250:1900
+-St: urn:schemas-upnp-org:device:InternetGatewayDevice:1
+-Man: "ssdp:discover"
+-Mx: 3
+-
+-`)
++	search := []byte("M-SEARCH * HTTP/1.1\r\n" +
++"Host: 239.255.255.250:1900\r\n" +
++"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" +
++"Man: \"ssdp:discover\"\r\n" +
++"Mx: 3\r\n" +
++"\r\n")
+ 
+ 	_, err = socket.WriteTo(search, ssdp)
+ 	if err != nil {

From bf6ddc62851f159a04e3d37ae484fb413a1c8220 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 28 May 2014 17:07:40 +0200
Subject: [PATCH 1897/2033] nautilus 3.12: find extensions

---
 .../services/x11/desktop-managers/gnome3.nix  |  3 +++
 .../gnome-3/3.12/core/nautilus/default.nix    |  2 ++
 .../3.12/core/nautilus/extension_dir.patch    | 24 +++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 0b81a3f2d9b..40787968e03 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -94,6 +94,9 @@ in {
           # Let gnome-control-center find gnome-shell search providers
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
 
+          # Let nautilus find extensions
+          export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
+
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
index 888f622ef33..dceb7c817bd 100644
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
+  patches = [ ./extension_dir.patch ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
new file mode 100644
index 00000000000..317b8257992
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
@@ -0,0 +1,24 @@
+diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
+index 6273a76..4adcc8a 100644
+--- a/libnautilus-private/nautilus-module.c
++++ b/libnautilus-private/nautilus-module.c
+@@ -242,11 +242,17 @@ void
+ nautilus_module_setup (void)
+ {
+ 	static gboolean initialized = FALSE;
++	const gchar* extensiondir = NULL;
+ 
+ 	if (!initialized) {
+ 		initialized = TRUE;
+-		
+-		load_module_dir (NAUTILUS_EXTENSIONDIR);
++	
++		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
++		if (extensiondir == NULL) {
++			extensiondir = NAUTILUS_EXTENSIONDIR;
++		}
++	
++		load_module_dir (extensiondir);
+ 
+ 		eel_debug_call_at_shutdown (free_module_objects);
+ 	}

From a013d00448d70970f26cc36bb37872b9cd7eff1a Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 28 May 2014 17:26:37 +0200
Subject: [PATCH 1898/2033] nautilus-sendto: new package

Integrates Evolution and Pidgin into the Nautilus file manager
---
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../3.12/apps/nautilus-sendto/default.nix     | 22 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.12/default.nix        |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 40787968e03..df50ca8c905 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -152,6 +152,7 @@ in {
         gnome3.gnome-music
         gnome3.gnome-tweak-tool
         gnome3.gnome-photos
+        gnome3.nautilus-sendto
       ] config.environment.gnome3.excludePackages);
 
     # Needed for themes and backgrounds
diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
new file mode 100644
index 00000000000..5a85e00e4e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-sendto-${version}";
+
+  version = "3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+  };
+
+  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index baa7113ce90..b33fad0e41e 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -203,6 +203,8 @@ rec {
 
   gnome-photos = callPackage ./apps/gnome-photos { };
 
+  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From a7d6947343af62282b1048a7cb74f7c0021ecddc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 28 May 2014 18:16:54 +0200
Subject: [PATCH 1899/2033] gnome-terminal 3.12: enable nautilus extension

---
 pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
index 17731444f00..a5b3fb73943 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool ncurses makeWrapper ];
+                  gnome3.dconf itstool ncurses makeWrapper gnome3.nautilus ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
   # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--without-nautilus-extension" "--disable-migration" ];
+  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
 
   preFixup = ''
     for f in "$out/libexec/gnome-terminal-server"; do

From 3e7f8bce62397d387187a9dcad353856574fec6f Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Wed, 28 May 2014 13:18:50 +0100
Subject: [PATCH 1900/2033] maintainers.nix: add missing edeoryd46, fixing
 channel

Close #2783.
---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 109e7956a58..228c4494fb8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -30,6 +30,7 @@
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
+  ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
   emery = "Emery Hemingawy <emery@vfemail.net>";

From 57e0371f125ca83537f69946386b7cc4fc7ba65f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 28 May 2014 22:36:54 +0200
Subject: [PATCH 1901/2033] flightgear & simgear: Bump to 3.0.0.

---
 pkgs/development/libraries/simgear/default.nix |  4 ++--
 pkgs/games/flightgear/default.nix              | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 0525043b6cf..f5394fffdaa 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -13,11 +13,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="simgear";
-    version="2.12.1";
+    version="3.0.0";
     name="${baseName}-${version}";
     extension="tar.bz2";
     url="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${name}.${extension}";
-    hash="0w8drzglgp01019frx96062qcigzfflsyq59f8shpwmzjb2hzli4";
+    hash="05l0wvi0s4a98ihmjbpcc66rj6qy3hrsqkjs388bddf2ws3qyi09";
   };
 in
 rec {
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index b785908cad9..31ae3aa3aa4 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -6,17 +6,17 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.1";
+  version = "3.0.0";
   name = "flightgear-${version}";
 
   src = fetchurl {
     url = "http://ftp.linux.kiev.ua/pub/fgfs/Source/${name}.tar.bz2";
-    sha256 = "1wj0a9k9pq404lylmv7v5f05vmrqd8fwj61kr78vldf44n44gixw";
+    sha256 = "1sd6ic9rrcgrqvc6ywkasj2pnmmmdv1i2rlyac2a882rh8i1kgz4";
   };
 
   datasrc = fetchurl {
-    url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-${version}-data.tar.bz2";
-    sha256 = "0hlsvzz12pyzw3mb4xsv4iwblrbf7d27mdprll64kr7p1h9qlmkl";
+    url = "http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/FlightGear-data-${version}.tar.bz2";
+    sha256 = "0mq5hkh8zgm129mg1ij3rrk7h2xs9ijxa7d7hipjlp6mcyhlk0q4";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
@@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    mkdir -p "$out/share/FlightGear"
-    tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
-
     mkdir -p "$out/share/applications/"
     cp "${desktopItem}"/share/applications/* "$out/share/applications/"
+
+    mkdir -p "$out/share/FlightGear"
+    tar xvf "${datasrc}" -C "$out/share/FlightGear/" --strip-components=1
   '';
 
   meta = with stdenv.lib; {

From 59f98d0d8c33a54997e38a0ca1ba4df942de2514 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 27 May 2014 05:22:24 +0200
Subject: [PATCH 1902/2033] PPSSPP: 0.9.8

---
 .../ppsspp/bump-version-to-0.9.8.patch        | 22 +++++++++++++
 pkgs/misc/emulators/ppsspp/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++--
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch
 create mode 100644 pkgs/misc/emulators/ppsspp/default.nix

diff --git a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch
new file mode 100644
index 00000000000..5e474d6f747
--- /dev/null
+++ b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch
@@ -0,0 +1,22 @@
+From 48f6bf352154511d5acddfe44dd241c6a9ed92d7 Mon Sep 17 00:00:00 2001
+From: Bhavin <bhavin192@users.noreply.github.com>
+Date: Tue, 6 May 2014 22:44:58 +0530
+Subject: [PATCH] Update vaersion to 0.9.8
+
+It was 0.9.6 :(
+---
+ Qt/Settings.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Qt/Settings.pri b/Qt/Settings.pri
+index 8b4c1d7..67949f2 100644
+--- a/Qt/Settings.pri
++++ b/Qt/Settings.pri
+@@ -1,4 +1,4 @@
+-VERSION = 0.9.6
++VERSION = 0.9.8
+ DEFINES += USING_QT_UI USE_FFMPEG
+ unix:!qnx:!symbian:!mac: CONFIG += linux
+ maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo
+--
+1.9.3
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
new file mode 100644
index 00000000000..db5e42e37ea
--- /dev/null
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig
+, withGamepads ? true, SDL # SDL is used for gamepad functionality
+}:
+
+let
+  version = "0.9.8";
+  fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF");
+in stdenv.mkDerivation {
+  name = "PPSSPP-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/hrydgard/ppsspp.git";
+    sha256 = "11sqhb2m3502dzbizahh1w2dl7jv3fipwxyrmryj8fyaqqw0i36q";
+    rev = "cbc46be3f91cb8558fbb4b175b14e8e16cbf0243";
+    fetchSubmodules = true;
+  };
+
+  # Upstream forgot to bump a version in one file.
+  patches = [ ./bump-version-to-0.9.8.patch ];
+
+  buildInputs = [ zlib libpng pkgconfig qt4 ]
+                ++ (if withGamepads then [ SDL ] else [ ]);
+
+  configurePhase = "cd Qt && qmake PPSSPPQt.pro";
+  installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin";
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.ppsspp.org/";
+    description = "A PSP emulator, the Qt4 version.";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.fuuzetsu ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04116d38883..e1f957bc195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1155,7 +1155,7 @@ let
   gnuvd = callPackage ../tools/misc/gnuvd { };
 
   goaccess = callPackage ../tools/misc/goaccess { };
-  
+
   googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { };
 
   gource = callPackage ../applications/version-management/gource {};
@@ -3462,7 +3462,7 @@ let
 
   # mercurial (hg) bleeding edge version
   octaveHG = callPackage ../development/interpreters/octave/hg.nix { };
-  
+
   ocropus = callPackage ../applications/misc/ocropus { };
 
   perl58 = callPackage ../development/interpreters/perl/5.8 {
@@ -10867,6 +10867,8 @@ let
 
   polytable = callPackage ../tools/typesetting/tex/polytable { };
 
+  PPSSPP = callPackage ../misc/emulators/ppsspp { };
+
   uae = callPackage ../misc/emulators/uae { };
 
   putty = callPackage ../applications/networking/remote/putty { };

From b793f92233a3f5de29e16b5e3eedba02dfbfeb9a Mon Sep 17 00:00:00 2001
From: Chris Double <chris.double@double.co.nz>
Date: Thu, 29 May 2014 13:05:30 +1200
Subject: [PATCH 1903/2033] Alice ML 1.4 programming language

---
 pkgs/development/compilers/aliceml/builder.sh | 71 +++++++++++++++++++
 .../development/compilers/aliceml/default.nix | 70 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 143 insertions(+)
 create mode 100644 pkgs/development/compilers/aliceml/builder.sh
 create mode 100644 pkgs/development/compilers/aliceml/default.nix

diff --git a/pkgs/development/compilers/aliceml/builder.sh b/pkgs/development/compilers/aliceml/builder.sh
new file mode 100644
index 00000000000..e1f5d1b2bed
--- /dev/null
+++ b/pkgs/development/compilers/aliceml/builder.sh
@@ -0,0 +1,71 @@
+source $stdenv/setup
+
+export CXXFLAGS="-m32"
+
+tar zxvf "$gecodeSrc"
+cd gecode-1.3.1
+./configure --prefix="$out" --disable-minimodel --disable-examples
+make
+make install
+cd ..
+
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$out"/lib/pkgconfig
+
+tar zxvf "$seamSrc"
+cd seam-1.4
+./configure --prefix="$out" --with-zlib=$zlib
+make
+make install
+cd ..
+
+PATH=$PATH:"$out"/bin
+
+tar zxvf "$aliceSrc"
+cd alice-1.4
+sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/alicerun.in
+sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/aliceremote
+./configure --prefix="$out" --with-gmp=$gmp
+make
+make install
+cd ..
+
+tar zxvf "$aliceGecodeSrc"
+cd alice-gecode-1.4
+make compiledll MUST_GENERATE=no
+make installdll MUST_GENERATE=no
+cd ..
+
+tar zxvf "$aliceRegexSrc"
+cd alice-regex-1.4
+make compiledll MUST_GENERATE=no
+make installdll MUST_GENERATE=no
+cd ..
+
+tar zxvf "$aliceSqliteSrc"
+cd alice-sqlite-1.4
+make compiledll MUST_GENERATE=no
+make installdll MUST_GENERATE=no
+cd ..
+
+tar zxvf "$aliceXmlSrc"
+cd alice-xml-1.4
+make compiledll MUST_GENERATE=no
+make installdll MUST_GENERATE=no
+cd ..
+
+tar zxvf "$aliceGtkSrc"
+cd alice-gtk-1.4
+sed -i -e 's/PRIVATE_GTK_LEAVE_PENDING/PRIVATE_GTK_HAS_POINTER/g' NativeGtk.cc
+sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' myinstall
+make compiledll MUST_GENERATE=no
+make installdll MUST_GENERATE=no
+cd ..
+
+tar zxvf "$aliceRuntimeSrc"
+cd alice-runtime-1.4
+./configure --prefix="$out"
+make
+make install
+cd ..
+
+
diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix
new file mode 100644
index 00000000000..5ea470bfc87
--- /dev/null
+++ b/pkgs/development/compilers/aliceml/default.nix
@@ -0,0 +1,70 @@
+{stdenv, fetchurl, pkgsi686Linux, libtool, gnumake381, autoconf, automake111x, file, which, zsh, m4, pkgconfig, perl}:
+
+stdenv.mkDerivation {
+  name = "aliceml-1.4";
+
+  aliceSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-1.4.tar.gz;
+    sha256 = "1ay8r26g7xm9zlrlpigp6y1zmrl93hzkndb5phx7651wx8j2183r";
+  };
+
+  aliceGecodeSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gecode-1.4.tar.gz;
+    sha256 = "0yklpsqnm3wwzfz4vvv69dmm7q7pzpl3z7iw7wg33klng85cidl6";
+  };
+
+  aliceGtkSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gtk-1.4.tar.gz;
+    sha256 = "0zx4ks0pk5wgbcsflcmn0kbpa9j7pjbsc19d1s3jgp4rwb24m1an";
+  };
+
+  aliceRegexSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-regex-1.4.tar.gz;
+    sha256 = "0myjzh3295awamghs4c88ypaa41m8sxh5jys876yq6flslw41s02";
+  };
+
+  aliceRuntimeSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-runtime-1.4.tar.gz;
+    sha256 = "1cbca71vh16l2h0zjvhgzzs0rzq99nc8nx9a97yzw595355nq57f";
+  };
+
+  aliceSqliteSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-sqlite-1.4.tar.gz;
+    sha256 = "0554xbx8zgqmpb7x06d7xvhlbk7bxmc237khgjs6yjcy53yf366b";
+  };
+
+  aliceXmlSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/alice-xml-1.4.tar.gz;
+    sha256 = "058a815a0vajjvjlsmd4ryx2bc71q6zwvyjg2c0v1gba2v3pddm0";
+  };
+
+  seamSrc = fetchurl {
+    url = http://www.ps.uni-saarland.de/alice/download/sources/seam-1.4.tar.gz;
+    sha256 = "1iz98jdv914whaw426d5406shlqgxqwpy3fbyb472x7d3lfra2dz";
+  };
+
+  gecodeSrc = fetchurl {
+    url = http://www.gecode.org/download/gecode-1.3.1.tar.gz;
+    sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355";
+  };
+
+  zlib = pkgsi686Linux.zlib;
+  gmp = pkgsi686Linux.gmp;
+
+
+  buildInputs = [
+    stdenv pkgsi686Linux.gcc34 pkgsi686Linux.glibc 
+    libtool gnumake381 autoconf automake111x pkgsi686Linux.zlib
+    file which zsh pkgsi686Linux.gmp m4 pkgsi686Linux.gnome.gtk
+    pkgsi686Linux.gnome.libgnomecanvas pkgsi686Linux.pango pkgsi686Linux.sqlite
+    pkgsi686Linux.libxml2 pkgsi686Linux.lightning pkgconfig perl
+  ];
+ 
+  builder = ./builder.sh;
+
+  meta = {
+    homepage = http://www.ps.uni-saarland.de/alice/;
+    description = "Alice ML is a functional programming language based on Standard ML, extended with rich support for concurrent, distributed, and constraint programming.";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04116d38883..45beb0efcc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2487,6 +2487,8 @@ let
 
   aldor = callPackage ../development/compilers/aldor { };
 
+  aliceml = callPackage ../development/compilers/aliceml { };
+
   aspectj = callPackage ../development/compilers/aspectj { };
 
   ats = callPackage ../development/compilers/ats { };

From 82a30be74acf592b374e21cebba51fd99270f880 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Thu, 29 May 2014 04:22:34 +0200
Subject: [PATCH 1904/2033] xboxdrv: 0.8.5

---
 pkgs/misc/drivers/xboxdrv/default.nix | 28 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/misc/drivers/xboxdrv/default.nix

diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
new file mode 100644
index 00000000000..7164f7d6f15
--- /dev/null
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, scons, libX11, pkgconfig
+, libusb1, boost, glib, dbus_glib }:
+
+let
+  version = "0.8.5";
+in stdenv.mkDerivation {
+  name = "xboxdrv-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Grumbel/xboxdrv/archive/v${version}.tar.gz";
+    sha256 = "0xg2dhfsk3i693rgwr1pr532b3hk3zmjxlx55g6bplslr94bibi2";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile --replace /usr/local "$out"
+  '';
+
+  buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib];
+
+  meta = with stdenv.lib; {
+    homepage = "http://pingus.seul.org/~grumbel/xboxdrv/";
+    description =
+      "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace.";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.fuuzetsu ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04116d38883..7abbae66732 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11041,6 +11041,8 @@ let
 
   x2x = callPackage ../tools/X11/x2x { };
 
+  xboxdrv = callPackage ../misc/drivers/xboxdrv { };
+
   xosd = callPackage ../misc/xosd { };
 
   xsane = callPackage ../applications/graphics/sane/xsane.nix {

From a089dbfe8abdbd293652520ff002aff0bdaf85b8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 29 May 2014 09:06:13 +0200
Subject: [PATCH 1905/2033] Fix regression in fetchhg.

---
 pkgs/build-support/fetchhg/builder.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchhg/builder.sh b/pkgs/build-support/fetchhg/builder.sh
index 6e9fbab791f..9699fb69b7f 100644
--- a/pkgs/build-support/fetchhg/builder.sh
+++ b/pkgs/build-support/fetchhg/builder.sh
@@ -1,8 +1,7 @@
 source $stdenv/setup
-
 header "getting $url${tag:+ ($tag)} into $out"
 
-hg clone --insecure ${tag:+-r "$tag"} "$url" hg-clone
+hg clone --insecure "$url" hg-clone
 
 hg archive -q -y ${tag:+-r "$tag"} --cwd hg-clone $out
 rm -f $out/.hg_archival.txt

From f4fbda241dc9d956dde3d16da97441e344115722 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 May 2014 07:26:40 +0000
Subject: [PATCH 1906/2033] haskell-compressed: added 3.10

---
 .../libraries/haskell/compressed/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/compressed/default.nix

diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix
new file mode 100644
index 00000000000..40e82f62f69
--- /dev/null
+++ b/pkgs/development/libraries/haskell/compressed/default.nix
@@ -0,0 +1,19 @@
+{ cabal, comonad, fingertree, hashable, keys, pointed, reducers
+, semigroupoids, semigroups, unorderedContainers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "compressed";
+  version = "3.10";
+  sha256 = "1y290n421knfh8k8zbcabhw24hb13xj9pkxx4h4v15yji97p5mcw";
+  buildDepends = [
+    comonad fingertree hashable keys pointed reducers semigroupoids
+    semigroups unorderedContainers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/compressed/";
+    description = "Compressed containers and reducers";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4210cee9adf..614a989bb74 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -431,6 +431,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   composition = callPackage ../development/libraries/haskell/composition {};
 
+  compressed = callPackage ../development/libraries/haskell/compressed {};
+
   concatenative = callPackage ../development/libraries/haskell/concatenative {};
 
   concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {};

From c0d39ba93aa066dc4c57f05d47751077df50984d Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 May 2014 07:28:13 +0000
Subject: [PATCH 1907/2033] haskell-singletons: fix tests for darwin

---
 .../libraries/haskell/singletons/default.nix         |  1 +
 .../libraries/haskell/singletons/test.patch          | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/singletons/test.patch

diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix
index 77087279edf..aeace4d3fce 100644
--- a/pkgs/development/libraries/haskell/singletons/default.nix
+++ b/pkgs/development/libraries/haskell/singletons/default.nix
@@ -9,6 +9,7 @@ cabal.mkDerivation (self: {
   buildDepends = [ mtl thDesugar ];
   testDepends = [ Cabal constraints filepath tasty tastyGolden ];
   noHaddock = true;
+  patches = self.stdenv.lib.optional self.stdenv.isDarwin ./test.patch;
   meta = {
     homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
     description = "A framework for generating singleton types";
diff --git a/pkgs/development/libraries/haskell/singletons/test.patch b/pkgs/development/libraries/haskell/singletons/test.patch
new file mode 100644
index 00000000000..6979c2c6cb0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/singletons/test.patch
@@ -0,0 +1,12 @@
+--- a/tests/SingletonsTestSuiteUtils.hs
++++ b/tests/SingletonsTestSuiteUtils.hs
+@@ -201,7 +201,7 @@ testCompileAndDumpGroup testDir tests =
+ filterWithSed :: FilePath -> IO ()
+ filterWithSed file = runProcessWithOpts CreatePipe "sed"
+ #ifdef darwin_HOST_OS
+-  [ "-i", "''"
++  [ "-i"
+ #else
+   [ "-i"
+ #endif
+

From d58370db24611bc58cad4fd7ca418075d49431b0 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 May 2014 07:29:20 +0000
Subject: [PATCH 1908/2033] haskell-process-conduit: temporarily disable tests

The tests have not been ported to use conduit-1.1 yet (there is a pull
request pending on GitHub).
---
 pkgs/development/libraries/haskell/process-conduit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix
index 3ecd88515b2..8ed966cd05b 100644
--- a/pkgs/development/libraries/haskell/process-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/process-conduit/default.nix
@@ -11,6 +11,9 @@ cabal.mkDerivation (self: {
     text
   ];
   testDepends = [ conduit hspec ];
+  # This check is being disabled until process-conduit is updated to properly
+  # support conduit 1.1.x
+  doCheck = false;
   meta = {
     homepage = "http://github.com/tanakh/process-conduit";
     description = "Conduits for processes";

From 27ecc1c9e92a925c3b6f270595724339adf64e09 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 May 2014 02:43:10 -0500
Subject: [PATCH 1909/2033] Change stdenv on darwin to not set
 NIX_ENFORCE_PURITY

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

diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index b16c51f7580..78e5b84a841 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -9,6 +9,7 @@ import ../generic rec {
       export NIX_IGNORE_LD_THROUGH_GCC=1
 
       if [ "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" = "x86_64-darwin" ]; then
+        export NIX_ENFORCE_PURITY=
         export NIX_DONT_SET_RPATH=1
         export NIX_NO_SELF_RPATH=1
         dontFixLibtool=1

From caa9007e847102d013203b547d1ce67bcd77e89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 29 May 2014 09:45:12 +0200
Subject: [PATCH 1910/2033] Making ocropus-hocr run (matplotlib + gdk backend)

I added the gtk backend to matplotlib; if these added dependencies are
too much, we can make this optional.
---
 pkgs/applications/misc/ocropus/default.nix   |  5 +++++
 pkgs/applications/misc/ocropus/display.patch | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix           |  3 ++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/ocropus/display.patch

diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index aaf0039305b..66c0b883c72 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -44,6 +44,8 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
   };
 
+  patches = [ ./display.patch ];
+
   propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
     matplotlib beautifulsoup4 pygtk ];
 
@@ -51,6 +53,9 @@ pythonPackages.buildPythonPackage rec {
   
   preConfigure = with stdenv.lib; ''
     ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)}
+
+    sed -i 's|/usr/local|'$out'|' ocrolib/common.py
+    sed -i 's|/usr/local|'$out'|' ocrolib/default.py
     ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models
   '';
 
diff --git a/pkgs/applications/misc/ocropus/display.patch b/pkgs/applications/misc/ocropus/display.patch
new file mode 100644
index 00000000000..2b4e63652b7
--- /dev/null
+++ b/pkgs/applications/misc/ocropus/display.patch
@@ -0,0 +1,17 @@
+http://code.google.com/p/ocropus/issues/detail?id=365
+
+diff --git a/setup.py b/setup.py
+index c6ade25..a2ad6bf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -8,7 +8,10 @@ assert sys.version_info[0]==2 and sys.version_info[1]>=7,\
+ from distutils.core import setup, Extension, Command
+ from distutils.command.install_data import install_data
+ 
++import matplotlib
++matplotlib.use('Agg')
+ from ocrolib import default
++
+ modeldir = "models/"
+ modelfiles = default.installable
+ modelprefix = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 933a073a5aa..3e7e38f40ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3963,7 +3963,8 @@ rec {
         (if stdenv.isDarwin then [ pkgs.clangStdenv ] else [ pkgs.stdenv ]);
 
     propagatedBuildInputs =
-      [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig ];
+      [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig
+        pygtk ];
 
     meta = with stdenv.lib; {
       description = "python plotting library, making publication quality plots";

From 9df4bb9d67dd61d56195e3f43e96ade67339fb32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 29 May 2014 10:13:31 +0200
Subject: [PATCH 1911/2033] ocropus: it was still missing a package: lxml

Now "./run-tests" passes. But it can't be run without DISPLAY, so
I don't run it in the builder.
---
 pkgs/applications/misc/ocropus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 66c0b883c72..fef3209d11a 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -47,7 +47,7 @@ pythonPackages.buildPythonPackage rec {
   patches = [ ./display.patch ];
 
   propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
-    matplotlib beautifulsoup4 pygtk ];
+    matplotlib beautifulsoup4 pygtk lxml ];
 
   enableParallelBuilding = true;
   

From fabdb680550e7b1204776ec6c058f7ead8421adc Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Thu, 29 May 2014 12:20:24 +0200
Subject: [PATCH 1912/2033] almir: add psycopg2 dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e7e38f40ca..672033cfa71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -298,6 +298,7 @@ rec {
       pythonPackages.waitress
       pythonPackages.webhelpers
       pythonPackages.zope_sqlalchemy
+      pythonPackages.psycopg2
     ];
 
     postInstall = ''

From 4a2936e74d1841d6cd353a0d05e9b860b2bc0842 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 29 May 2014 12:38:43 +0200
Subject: [PATCH 1913/2033] nautilus-sendto: add to gnome 3.10

---
 .../3.10/apps/nautilus-sendto/default.nix     | 22 +++++++++++++++++++
 pkgs/desktops/gnome-3/3.10/default.nix        |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix

diff --git a/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix
new file mode 100644
index 00000000000..5a85e00e4e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.10/apps/nautilus-sendto/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-sendto-${version}";
+
+  version = "3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+  };
+
+  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix
index c601a1501a3..e2b8f414206 100644
--- a/pkgs/desktops/gnome-3/3.10/default.nix
+++ b/pkgs/desktops/gnome-3/3.10/default.nix
@@ -171,6 +171,8 @@ rec {
 
   gnome-photos = callPackage ./apps/gnome-photos { };
 
+  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
+
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 

From 29da3bce272c7651cf1ebc838da7cbca1f93bc4e Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 29 May 2014 13:38:13 +0200
Subject: [PATCH 1914/2033] usermount: New Package.

A simple tool to automatically mount removable drives using UDisks2 and
D-Bus.

https://github.com/tom5760/usermount
---
 pkgs/os-specific/linux/usermount/default.nix | 28 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/usermount/default.nix

diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix
new file mode 100644
index 00000000000..d2b3632d69a
--- /dev/null
+++ b/pkgs/os-specific/linux/usermount/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk_pixbuf }:
+
+stdenv.mkDerivation {
+  name = "usermount-0.1";
+
+  src = fetchgit {
+    url = "https://github.com/tom5760/usermount.git";
+    rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4";
+    sha256 = "1bzxwq83ikljnv0f55siyd6rd0gs9v7jl9947lw6s1npa63x3b55";
+  };
+
+  buildInputs = [ pkgconfig dbus libnotify udisks2 gdk_pixbuf ];
+
+  NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv usermount $out/bin/
+  '';
+
+  meta = {
+    homepage = https://github.com/tom5760/usermount;
+    description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus.";
+    license = "MIT";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04116d38883..3e37f9d4afc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7589,6 +7589,8 @@ let
 
   usbutils = callPackage ../os-specific/linux/usbutils { };
 
+  usermount = callPackage ../os-specific/linux/usermount { };
+
   utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
     ncurses = null;
     perl = null;

From a1d350287b1e50b209981636f7b706838e13de3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Mon, 26 May 2014 19:29:53 +0200
Subject: [PATCH 1915/2033] Plymouth: update to 0.9.0, fix build, sanitize,
 enable systemd-integration

NOTE: I can start the daemon and ping it, but I haven't been able to
get it to do more than that.
---
 pkgs/os-specific/linux/plymouth/default.nix | 50 +++++++++------------
 pkgs/top-level/all-packages.nix             |  4 +-
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix
index 4c51c4fea6c..a04407ba5c2 100644
--- a/pkgs/os-specific/linux/plymouth/default.nix
+++ b/pkgs/os-specific/linux/plymouth/default.nix
@@ -1,51 +1,45 @@
-{ stdenv, fetchurl, cairo, gtk, libdrm, libpng, makeWrapper, pango, pkgconfig }:
+{ stdenv, fetchurl, autoconf, automake, cairo, docbook_xsl, gtk
+, libdrm, libpng , libtool, libxslt, makeWrapper, pango, pkgconfig
+, udev
+}:
 
 stdenv.mkDerivation rec {
   name = "plymouth-${version}";
-  version = "0.8.8";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/plymouth/releases/${name}.tar.bz2";
-    sha256 = "16vm3llgci7h63jaclfskj1ii61d8psq7ny2mncml6m3sghs9b8v";
+    sha256 = "0kfdwv179brg390ma003pmdqfvqlbybqiyp9fxrxx0wa19sjxqnk";
   };
 
-  buildInputs = [ cairo gtk libdrm libpng makeWrapper pango pkgconfig ];
+  buildInputs = [
+    autoconf automake cairo docbook_xsl gtk libdrm libpng libtool
+    libxslt makeWrapper pango pkgconfig udev
+  ];
+
+  prePatch = ''
+    sed -e "s#\$(\$PKG_CONFIG --variable=systemdsystemunitdir systemd)#$out/etc/systemd/system#g" \
+      -i configure.ac
+  '';
 
   configurePhase = ''
-    export DESTDIR=$out
     ./configure \
+      --prefix=$out \
       -bindir=$out/bin \
       -sbindir=$out/sbin \
-      --prefix=$out \
       --exec-prefix=$out \
       --libdir=$out/lib \
       --libexecdir=$out/lib \
-      --enable-tracing \
-      --sysconfdir=/etc \
+      --sysconfdir=$out/etc \
       --localstatedir=/var \
+      --with-log-viewer \
       --without-system-root-install \
+      --without-rhgb-compat-link \
+      --enable-tracing \
+      --enable-systemd-integration \
+      --enable-pango \
       --enable-gtk
   '';
-#      --enable-systemd-integration
-#      -datadir=/share \
-#      --with-rhgb-compat-link \
-
-  preInstall = "mkdir -p $out/bin $out/sbin";
-
-  postInstall = ''
-    cd $out/$out
-    mv bin/* $out/bin
-    mv sbin/* $out/sbin
-
-    rmdir bin
-    rmdir sbin
-    mv * $out/
-    sed -e "s#> $output##" \
-      -e "s#> /dev/stderr##" \
-      -i $out/lib/plymouth/plymouth-populate-initrd
-    wrapProgram $out/lib/plymouth/plymouth-populate-initrd \
-      --set PATH $PATH:$out/bin:$out/sbin
-  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/Plymouth;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e37f9d4afc..d64a4de9ed2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7446,7 +7446,9 @@ let
     config = config.pcmciaUtils.config or null;
   };
 
-  plymouth = callPackage ../os-specific/linux/plymouth { };
+  plymouth = callPackage ../os-specific/linux/plymouth {
+    automake = automake113x;
+  };
 
   pmount = callPackage ../os-specific/linux/pmount { };
 

From 0ddce8db12ad89d0c9a437128ad325322fd519e2 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Sun, 20 Apr 2014 11:16:36 -0400
Subject: [PATCH 1916/2033] unbound: update from 1.4.21 to 1.4.22, service from
 Upstart to systemd

---
 lib/maintainers.nix                           |   2 +-
 nixos/modules/services/networking/unbound.nix | 119 ++++++++----------
 pkgs/tools/networking/unbound/default.nix     |  13 +-
 3 files changed, 61 insertions(+), 73 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 80d0bed23dc..14f2f86ec5b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,7 +31,7 @@
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
-  emery = "Emery Hemingawy <emery@vfemail.net>";
+  emery = "Emery Hemingway <emery@vfemail.net>";
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 30ce4b49fa8..415ff13bdda 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -18,25 +18,25 @@ let
     "forward-zone:\n  name: .\n" +
     concatMapStrings (x: "  forward-addr: ${x}\n") cfg.forwardAddresses;
 
-  confFile = pkgs.writeText "unbound.conf"
-    ''
-      server:
-        directory: "${stateDir}"
-        username: ${username}
-        # make sure unbound can access entropy from inside the chroot.
-        # e.g. on linux the use these commands (on BSD, devfs(8) is used):
-        #      mount --bind -n /dev/random /etc/unbound/dev/random
-        # and  mount --bind -n /dev/log /etc/unbound/dev/log
-        chroot: "${stateDir}"
-        # logfile: "${stateDir}/unbound.log"  #uncomment to use logfile.
-        pidfile: "${stateDir}/unbound.pid"
-        verbosity: 1      # uncomment and increase to get more logging.
-        # listen on all interfaces, answer queries from the local subnet.
+  confFile = pkgs.writeText "unbound.conf" ''
+    server:
+      directory: "${stateDir}"
+      username: ${username}
+      # make sure unbound can access entropy from inside the chroot.
+      # e.g. on linux the use these commands (on BSD, devfs(8) is used):
+      #      mount --bind -n /dev/random /etc/unbound/dev/random
+      # and  mount --bind -n /dev/log /etc/unbound/dev/log
+      chroot: "${stateDir}"
+      # logfile: "${stateDir}/unbound.log"  #uncomment to use logfile.
+      pidfile: "${stateDir}/unbound.pid"
+      verbosity: 1      # uncomment and increase to get more logging.
       ${interfaces}
       ${access}
-      ${forward}
-      ${cfg.extraConfig}
-    '';
+
+    ${forward}
+
+    ${cfg.extraConfig}
+  '';
 
 in
 
@@ -45,74 +45,61 @@ in
   ###### interface
 
   options = {
-
     services.unbound = {
 
       enable = mkOption {
-        default = false;
-        description = "
-          Whether to enable the Unbound domain name server.
-        ";
+	default = false;
+	description = "Whether to enable the Unbound domain name server.";
       };
 
       allowedAccess = mkOption {
-        default = ["127.0.0.0/24"];
-        description = "
-          What networks are allowed to use us as a resolver.
-        ";
+	default = ["127.0.0.0/24"];
+	description = "What networks are allowed to use unbound as a resolver.";
       };
 
       interfaces = mkOption {
-        default = [ "127.0.0.0" "::1" ];
-        description = "
-          What addresses the server should listen to.
-        ";
+	default = [ "127.0.0.1" "::1" ];
+	description = "What addresses the server should listen on.";
       };
 
       forwardAddresses = mkOption {
-        default = [ ];
-        description = "
-          What servers to forward the queries to.
-        ";
+	default = [ ];
+	description = "What servers to forward queries to.";
       };
 
       extraConfig = mkOption {
-        default = "";
-        description = "
-          Extra unbound config
-        ";
+	default = "";
+	description = "Extra lines of unbound config.";
       };
 
     };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.unbound ];
+
+    users.extraUsers = singleton {
+      name = username;
+      uid = config.ids.uids.unbound;
+      description = "unbound daemon user";
+      home = stateDir;
+      createHome = true;
+    };
+
+    systemd.services.unbound = {
+      description="Unbound recursive Domain Name Server";
+      after = [ "network.target" ];
+      before = [ "nss-lookup.target" ];
+      wants = [" nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ pkgs.unbound ];
+      serviceConfig.ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${confFile}";
+    };
 
   };
 
-
-  ###### implementation
-
-  config = mkIf config.services.unbound.enable {
-    environment.systemPackages = [ pkgs.unbound ];
-
-    users.extraUsers = singleton
-      { name = username;
-        uid = config.ids.uids.unbound;
-        description = "unbound daemon user";
-        home = "/tmp";
-      };
-
-    jobs.unbound =
-      { description = "Unbound name server job";
-
-        preStart =
-          ''
-            ${pkgs.coreutils}/bin/mkdir -p ${stateDir}
-          '';
-
-        daemonType = "fork";
-
-        exec = "${pkgs.unbound}/sbin/unbound -c ${confFile}";
-      };
-
-  };
-
 }
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index d95c5b5f6bb..376717bbf7a 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchurl, openssl, expat, libevent, ldns }:
+{ stdenv, fetchurl, openssl, expat, libevent }:
 
 stdenv.mkDerivation rec {
-  name = "unbound-1.4.21";
+  name = "unbound-1.4.22";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "0w09m2rbn688rsk37k5xm3vkk5h2hxhivsr374j7h7vjf9x82bsh";
+    sha256 = "17yjly9c00zfgbzvllqzjh668a4yk6vrinf47yrcs3hrna0m1bqw";
   };
  
-  buildInputs = [openssl expat libevent ldns];
+  buildInputs = [openssl expat libevent];
 
   configureFlags = [ "--with-ssl=${openssl}" "--with-libexpat=${expat}"
     "--localstatedir=/var" ];
 
   meta = {
     description = "Validating, recursive, and caching DNS resolver";
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     homepage = http://www.unbound.net;
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.emery ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From fdebea003e43e8df8ffc4c889331f5d28c36880e Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Thu, 29 May 2014 09:46:53 -0700
Subject: [PATCH 1917/2033] fix getopt path on darwin

---
 pkgs/tools/security/pass/darwin-getopt.patch | 11 +++++++++++
 pkgs/tools/security/pass/default.nix         |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/tools/security/pass/darwin-getopt.patch

diff --git a/pkgs/tools/security/pass/darwin-getopt.patch b/pkgs/tools/security/pass/darwin-getopt.patch
new file mode 100644
index 00000000000..8cdcd67bc65
--- /dev/null
+++ b/pkgs/tools/security/pass/darwin-getopt.patch
@@ -0,0 +1,11 @@
+diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
+index 1b76c33..fa40104 100644
+--- a/src/platform/darwin.sh
++++ b/src/platform/darwin.sh
+@@ -31,5 +31,5 @@ tmpdir() {
+ 	mount -t hfs -o noatime -o nobrowse "$ramdisk_dev" "$SECURE_TMPDIR" || exit 1
+ }
+ 
+-GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt"
++GETOPT="getopt"
+ SHRED="srm -f -z"
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index cf16e3477ed..505bdd2efc8 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1d32y6k625pv704icmhg46zg02kw5zcyxscgljxgy8bb5wv4lv2j";
   };
 
+  patches = [ ./darwin-getopt.patch ];
+
   buildInputs = [ makeWrapper ];
 
   meta = with stdenv.lib; {

From 176797576ccbc924323598cc1886b4f8c0ad330f Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 29 May 2014 20:00:04 -0500
Subject: [PATCH 1918/2033] Build Haddocks with source hyperlinks unless
 doHscolour is false

---
 pkgs/build-support/cabal/default.nix                  | 11 +++++++++--
 .../libraries/haskell/unlambda/default.nix            |  1 +
 .../{libraries => tools}/haskell/hscolour/default.nix |  3 ++-
 pkgs/top-level/haskell-packages.nix                   |  6 ++++--
 4 files changed, 16 insertions(+), 5 deletions(-)
 rename pkgs/development/{libraries => tools}/haskell/hscolour/default.nix (85%)

diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix
index 70fb72f99fb..c5fdfe71e3b 100644
--- a/pkgs/build-support/cabal/default.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -1,12 +1,13 @@
 # generic builder for Cabal packages
 
 { stdenv, fetchurl, lib, pkgconfig, ghc, Cabal, jailbreakCabal, glibcLocales
-, gnugrep, coreutils
+, gnugrep, coreutils, hscolour
 , enableLibraryProfiling ? false
 , enableSharedLibraries ? false
 , enableSharedExecutables ? false
 , enableStaticLibraries ? true
 , enableCheckPhase ? stdenv.lib.versionOlder "7.4" ghc.version
+, enableHyperlinkSource ? true
 , extension ? (self : super : {})
 }:
 
@@ -50,6 +51,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
                 propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs;
                 propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs;
                 doCheck               = enableCheckPhase && x.doCheck;
+                hyperlinkSource       = enableHyperlinkSource && x.hyperlinkSource;
               };
 
         defaults =
@@ -92,6 +94,7 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             buildInputs = [ghc Cabal] ++ self.extraBuildInputs;
             extraBuildInputs = self.buildTools ++
                                (optionals self.doCheck self.testDepends) ++
+                               (optional self.hyperlinkSource hscolour) ++
                                (if self.pkgconfigDepends == [] then [] else [pkgconfig]) ++
                                (if self.isLibrary then [] else self.buildDepends ++ self.extraLibraries ++ self.pkgconfigDepends);
 
@@ -140,6 +143,9 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
             # and run any regression test suites the package might have
             doCheck = enableCheckPhase;
 
+            # pass the '--hyperlink-source' flag to ./Setup haddock
+            hyperlinkSource = enableHyperlinkSource;
+
             # abort the build if the configure phase detects that the package
             # depends on multiple versions of the same build input
             strictConfigurePhase = true;
@@ -219,7 +225,8 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
               ./Setup build ${self.buildTarget}
 
               export GHC_PACKAGE_PATH=$(${ghc.GHCPackages})
-              test -n "$noHaddock" || ./Setup haddock --html --hoogle
+              test -n "$noHaddock" || ./Setup haddock --html --hoogle \
+                  ${optionalString self.hyperlinkSource "--hyperlink-source"}
 
               eval "$postBuild"
             '';
diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix
index 474bb1a8b09..a9e0def2bc7 100644
--- a/pkgs/development/libraries/haskell/unlambda/default.nix
+++ b/pkgs/development/libraries/haskell/unlambda/default.nix
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];
+  hyperlinkSource = false;
   meta = {
     description = "Unlambda interpreter";
     license = "GPL";
diff --git a/pkgs/development/libraries/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix
similarity index 85%
rename from pkgs/development/libraries/haskell/hscolour/default.nix
rename to pkgs/development/tools/haskell/hscolour/default.nix
index d8bc08b4b33..88c4545ff6d 100644
--- a/pkgs/development/libraries/haskell/hscolour/default.nix
+++ b/pkgs/development/tools/haskell/hscolour/default.nix
@@ -1,4 +1,4 @@
-{ cabal }:
+{ cabal, hyperlinkSource ? true }:
 
 cabal.mkDerivation (self: {
   pname = "hscolour";
@@ -6,6 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "15ix93sw4p7g5ln2halcgqppdc0i0vmkzcjzxvqzkk9yp9pq3nrs";
   isLibrary = true;
   isExecutable = true;
+  hyperlinkSource = hyperlinkSource;
   meta = {
     homepage = "http://code.haskell.org/~malcolm/hscolour/";
     description = "Colourise Haskell code";
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 614a989bb74..41eca6be8fd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -96,6 +96,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cabal = callPackage ../build-support/cabal {
     Cabal = null;               # prefer the Cabal version shipped with the compiler
+    hscolour = self.hscolourBootstrap;
     inherit enableLibraryProfiling enableCheckPhase
       enableStaticLibraries enableSharedLibraries enableSharedExecutables;
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
@@ -1117,8 +1118,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hsBibutils = callPackage ../development/libraries/haskell/hs-bibutils {};
 
-  hscolour = callPackage ../development/libraries/haskell/hscolour {};
-
   hsdns = callPackage ../development/libraries/haskell/hsdns {};
 
   hsemail = if (pkgs.stdenv.lib.versionOlder ghc.version "7") then null else
@@ -2605,6 +2604,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   hlint = callPackage ../development/tools/haskell/hlint {};
 
+  hscolour = callPackage ../development/tools/haskell/hscolour {};
+  hscolourBootstrap = self.hscolour.override { hyperlinkSource = false; };
+
   hslogger = callPackage ../development/tools/haskell/hslogger {};
 
   tar = callPackage ../development/libraries/haskell/tar {};

From 5bf076d99be930a0960e889fc672e31c70a7e4a7 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 30 May 2014 10:17:08 +0200
Subject: [PATCH 1919/2033] sane: Make SANE_CONFIG_DIR overrideable

---
 nixos/modules/services/hardware/sane.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 56e28b50350..f7b25c18787 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -43,7 +43,7 @@ in
 
     environment.systemPackages = backends;
     environment.variables = {
-      SANE_CONFIG_DIR = "${saneConfig}/etc/sane.d";
+      SANE_CONFIG_DIR = mkDefault "${saneConfig}/etc/sane.d";
       LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
     };
     services.udev.packages = backends;

From 11ac14f31b24b85c97e5ee3a5c386c7e244c57cf Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 30 May 2014 10:18:30 +0200
Subject: [PATCH 1920/2033] spotify: Update from 0.9.4.183.g644e24e.428 to
 0.9.10.17.g4129e1c.78 (only for x86_64)

---
 pkgs/applications/audio/spotify/default.nix | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index a76e7148846..59bea8fc194 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,9 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 let
-  version = "0.9.4.183";
+  version = if stdenv.system == "i686-linux"
+    then "0.9.4.183.g644e24e.428"
+    else "0.9.10.17.g4129e1c.78";
 
   qt4webkit =
     if stdenv.system == "i686-linux" then
@@ -65,13 +67,13 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_i386.deb";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_i386.deb";
         sha256 = "1wl6v5x8vm74h5lxp8fhvmih8l122aadsf1qxvpk0k3y6mbx0ifa";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}.g644e24e.428-1_amd64.deb";
-        sha256 = "1yniln6iswrrrny01qr2w5zcvam0vnrvy9mwbnk9i14i2ch0f3fx";
+        url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
+        sha256 = "1a4vn2ij3nghnc0fq3nsyb95gwhaw4zabdq6jd52hxz8iv31pn1z";
       }
     else throw "Spotify not supported on this platform.";
 
@@ -89,13 +91,22 @@ stdenv.mkDerivation {
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
       mkdir $out/lib
-      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
-      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
+
       ln -s ${nss}/lib/libnss3.so $out/lib/libnss3.so.1d
       ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d
       ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d
+
+      ${if stdenv.system == "x86_64-linux" then ''
+      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.1.0.0
+      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
+      ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so
+      ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so
+      '' else ''
+      ln -s ${openssl}/lib/libssl.so $out/lib/libssl.so.0.9.8
+      ln -s ${openssl}/lib/libcrypto.so $out/lib/libcrypto.so.0.9.8
       ln -s ${nspr}/lib/libnspr4.so $out/lib/libnspr4.so.0d
       ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
+      ''}
 
       # Work around Spotify trying to open libudev.so.0 (which we don't have)
       ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0

From 2436bb705ceb8bc2b11114dd8edc0fa91c542255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 30 May 2014 11:18:25 +0200
Subject: [PATCH 1921/2033] libvpx on darwin: attempt to fix build

CC @lovek323.
---
 pkgs/development/libraries/libvpx/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index aa869b4b19d..45fc442a713 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, bash, yasm, which, perl}:
+{stdenv, fetchurl, bash, yasm, which, perl, binutils}:
 
 let version = "1.3.0";
 in
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
     sed -e '/enable linux/d' -i configure
   '';
 
-  buildInputs = [ yasm which perl ];
+  buildInputs = [ yasm which perl ]
+    ++ stdenv.lib.optional stdenv.isDarwin binutils; # new asm opcode support
 
   preConfigure = ''
     mkdir -p build

From 90f01d6a682322e4911d78180b73cedacaa730e6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 30 May 2014 04:38:36 -0500
Subject: [PATCH 1922/2033] arcanist: 20140521 -> 20140530

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

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 5a17ac167f8..add2f8621b0 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/facebook/libphutil.git";
-    rev    = "1ba1de50e9ee1ca63e472f625282346693eb0a18";
-    sha256 = "d571906b6ecb3700f0d57498426d2ab2a5fbed469d739ee1e03d410215738d2f";
+    rev    = "c4cb6d99c4a5903079350f85fcc71895c0a0ea14";
+    sha256 = "a7293aac4fdcfbaead09ee3e6ffb54c5d100b07905b4006194067411061ff994";
   };
   arcanist = fetchgit {
     url    = "git://github.com/facebook/arcanist.git";
-    rev    = "c999f3e6b5c7edef82761ed1db00d79683e2e37a";
-    sha256 = "d1d9f5ada8ffcb02f03210356c5087019e164f456660469e2825dcbdf5f07d35";
+    rev    = "50caec620a8ed45c54323cb71fee72fd0d935115";
+    sha256 = "dd18ed22375ad1ba058703952be0d339d9c93704e9d75dd7e4e6625236dfe9b0";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20140521";
+  version = "20140530";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php ];

From a44fbeeaa4a154a62c1eb1cd1990a0c7ea3b91a5 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 30 May 2014 13:15:15 +0400
Subject: [PATCH 1923/2033] samba: install pkg-config files

Close #2794, fixes #1341.
---
 pkgs/servers/samba/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix
index cacc614e08c..ade79e2c99c 100644
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -64,6 +64,9 @@ stdenv.mkDerivation rec {
       mkdir -p $out
       mv $TMPDIR/inst/$out/* $out/
 
+      mkdir -p "$out/lib/pkgconfig"
+      cp pkgconfig/*.pc "$out/lib/pkgconfig"
+
       mkdir -pv $out/lib/cups/backend
       ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
       mkdir -pv $out/etc/openldap/schema

From ca092d7b01997d9c61b3fbde17680c2a5b292fc0 Mon Sep 17 00:00:00 2001
From: Pavel Chuprikov <pschuprikov@gmail.com>
Date: Fri, 30 May 2014 16:55:28 +0400
Subject: [PATCH 1924/2033] udiskie: add version 0.8.0.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 672033cfa71..6bc99986c9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9187,6 +9187,26 @@ rec {
     };
   };
 
+  udiskie = buildPythonPackage rec {
+    name = "udiskie-0.8.0";
+
+    src = fetchurl {
+      url = "https://github.com/coldfix/udiskie/archive/0.8.0.tar.gz";
+      sha256 = "0yzrnl7bq0dkcd3wh55kbf41c4dbh7dky0mqx0drvnpxlrvzhvp2";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ pygtk pyyaml dbus notify pkgs.udisks2 ];
+
+    # tests require dbusmock
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Removable disk automounter for udisks.";
+      license = licenses.mit;
+      homepage = https://github.com/coldfix/udiskie;
+    };
+  };
+
 # python2.7 specific packages
 } // optionalAttrs isPy27 (
   with pythonPackages;

From 2030328fea2d477d32db569e544ad1cde733c949 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 30 May 2014 17:56:05 +0200
Subject: [PATCH 1925/2033] disk-indicator: Add package

A program that will turn a LED into a hard disk indicator.
---
 .../linux/disk-indicator/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/os-specific/linux/disk-indicator/default.nix

diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix
new file mode 100644
index 00000000000..57fc9390f61
--- /dev/null
+++ b/pkgs/os-specific/linux/disk-indicator/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchgit, libX11 }:
+
+stdenv.mkDerivation {
+  name = "disk-indicator";
+
+  src = fetchgit {
+    url = git://github.com/MeanEYE/Disk-Indicator.git;
+    rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
+    sha256 = "0f8mxl3wqlap8zajdk6r9liliayp8w4xs4jy8jbwanmmppwz0nb9";
+  };
+
+  buildInputs = [ libX11 ];
+
+  patchPhase = ''
+    substituteInPlace ./makefile --replace "COMPILER=c99" "COMPILER=gcc -std=c99"
+    substituteInPlace ./makefile --replace "COMPILE_FLAGS=" "COMPILE_FLAGS=-O2 "
+  '';
+
+  buildPhase = "make -f makefile";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp ./disk_indicator "$out/bin/"
+  '';
+
+  meta = {
+    homepage = https://github.com/MeanEYE/Disk-Indicator;
+    description = "A program that will turn a LED into a hard disk indicator";
+    longDescription = ''
+      Small program for Linux that will turn your Scroll, Caps or Num Lock LED
+      or LED on your ThinkPad laptop into a hard disk activity indicator.
+    '';
+    license = "GPLv3";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d64a4de9ed2..7fa0f77f80a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6962,6 +6962,8 @@ let
 
   devicemapper = lvm2;
 
+  disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
+
   dmidecode = callPackage ../os-specific/linux/dmidecode { };
 
   dmtcp = callPackage ../os-specific/linux/dmtcp { };

From b7e99da4a1162750b6bff22b6bd88fe50a26eb0f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 30 May 2014 18:51:21 +0200
Subject: [PATCH 1926/2033] perlPackages.DevelTrace: New module

Print out each line before it is executed (like sh -x).
---
 pkgs/top-level/perl-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4239d6dd746..593203be6d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2272,6 +2272,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DevelTrace = buildPerlPackage {
+    name = "Devel-Trace-0.12";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz;
+      sha256 = "0s1q1a05gk3xvwqkya3k05vqjk13rvb489g0frprhzpzfvvwl0gm";
+    };
+    meta = {
+      description = "Print out each line before it is executed (like sh -x)";
+      license = "Public Domain";
+    };
+  };
+
   DBDSQLite = import ../development/perl-modules/DBD-SQLite {
     inherit stdenv fetchurl buildPerlPackage DBI;
     inherit (pkgs) sqlite;

From abd0b3f411839ac83896a3a0c9150e3265031c06 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 30 May 2014 21:22:25 +0200
Subject: [PATCH 1927/2033] nixos.tests.installer: Attempt to fix race
 condition

Attempt to fix race condition in installer tests, especially the
grub1 test.

The latter was failing when running "parted /dev/sda ..." because
/dev/sda didn't exist yet.
---
 nixos/tests/installer.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 1c3fb148410..98e8142a0df 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -147,6 +147,9 @@ let
             or die "bad `hello' output";
       ''}
 
+      # Wait for hard disks to appear in /dev
+      $machine->succeed("udevadm settle");
+
       # Partition the disk.
       ${createPartitions}
 

From a3d747da151711006f3a6c04046d903b2c05762f Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 30 May 2014 21:08:56 +0100
Subject: [PATCH 1928/2033] Plone: update to 4.3.3

---
 pkgs/top-level/python-packages-generated.nix | 3017 +++++++++---------
 pkgs/top-level/python-packages.json          |    6 +-
 2 files changed, 1472 insertions(+), 1551 deletions(-)

diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix
index 193928513cb..ca980e38637 100644
--- a/pkgs/top-level/python-packages-generated.nix
+++ b/pkgs/top-level/python-packages-generated.nix
@@ -55,7 +55,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -67,15 +67,15 @@ in
   };
 
 
-  "Products.Archetypes-1.9.4" = self.buildPythonPackage {
-    name = "Products.Archetypes-1.9.4";
+  "Products.Archetypes-1.9.7" = self.buildPythonPackage {
+    name = "Products.Archetypes-1.9.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.4.zip";
-        md5 = "fc5679b10df703a542b58da044f7d9c6";
+        url = "https://pypi.python.org/packages/source/P/Products.Archetypes/Products.Archetypes-1.9.7.zip";
+        md5 = "35060c0ed8faf76c3c488fa642bb9715";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.folder-1.0.4" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.folder-1.0.5" self."plone.uuid-1.0.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.Marshall-2.1.2" self."Products.MimetypesRegistry-2.0.5" self."Products.PlacelessTranslationService-2.0.4" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self."Products.validation-2.0" self."Products.ZSQLMethods-2.13.4" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contenttype-3.5.5" self."zope.datetime-3.4.1" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.tal-3.5.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -87,22 +87,22 @@ in
   };
 
 
-  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
-    name = "plone.app.contentlisting-1.0.5";
+  "cssselect-0.9.1" = self.buildPythonPackage {
+    name = "cssselect-0.9.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
-        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
+        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.1.tar.gz";
+        md5 = "c74f45966277dc7a0f768b9b0f3522ac";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Listing of content for the Plone CMS
+        cssselect parses CSS3 Selectors and translates them to XPath 1.0
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
-      license = "GPL version 2";
+      homepage = "http://packages.python.org/cssselect/";
+      license = "BSD";
     };
   };
 
@@ -115,7 +115,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -127,11 +127,11 @@ in
   };
 
 
-  "plone.folder-1.0.4" = self.buildPythonPackage {
-    name = "plone.folder-1.0.4";
+  "plone.folder-1.0.5" = self.buildPythonPackage {
+    name = "plone.folder-1.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.4.zip";
-        md5 = "1674ff18b7a9452d0c2063cf11c679b7";
+        url = "https://pypi.python.org/packages/source/p/plone.folder/plone.folder-1.0.5.zip";
+        md5 = "2722124a411e2d267b08d6f4d81e262c";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -147,55 +147,15 @@ in
   };
 
 
-  "plone.z3cform-0.8.0" = self.buildPythonPackage {
-    name = "plone.z3cform-0.8.0";
+  "Products.CMFPlone-4.3.3" = self.buildPythonPackage {
+    name = "Products.CMFPlone-4.3.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
-        md5 = "bdb23dd162544964d2f8f8f5f002e874";
+        url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.3.zip";
+        md5 = "e6638766d7bf59d27517174e9d67ea6b";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.batching-1.0" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.z3cform";
-      license = "ZPL 2.1";
-    };
-  };
-
-
-  "six-1.4.1" = self.buildPythonPackage {
-    name = "six-1.4.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/six/six-1.4.1.tar.gz";
-        md5 = "bdbb9e12d3336c198695aa4cf3a61d62";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python 2 and 3 compatibility utilities
-        '';
-      homepage = "http://pypi.python.org/pypi/six/";
-      license = "UNKNOWN";
-    };
-  };
-
-
-  "Products.CMFPlone-4.3.2" = self.buildPythonPackage {
-    name = "Products.CMFPlone-4.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlone/Products.CMFPlone-4.3.2.zip";
-        md5 = "b9948583429d7d90475148d276fa5cf4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.9" self."archetypes.referencebrowserwidget-2.4.19" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-1.7.8" self."plone.app.blob-1.5.8" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.3" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.8" self."plone.app.contentrules-3.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.8" self."plone.app.folder-1.0.5" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.6" self."plone.app.layout-2.3.7" self."plone.app.linkintegrity-1.5.3" self."plone.app.locales-4.3.2" self."plone.app.portlets-2.4.5" self."plone.app.redirector-1.2" self."plone.app.search-1.1.5" self."plone.app.upgrade-1.3.4" self."plone.app.users-1.2a2" self."plone.app.uuid-1.0" self."plone.app.viewletmanager-2.0.4" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.batching-1.0" self."plone.browserlayer-2.1.2" self."plone.contentrules-2.0.3" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1" self."plonetheme.classic-1.3.2" self."plonetheme.sunburst-1.4.5" self."Products.Archetypes-1.9.4" self."Products.ATContentTypes-2.1.13" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.15" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.5" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.4" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.querywidget-1.0.10" self."archetypes.referencebrowserwidget-2.4.20" self."borg.localrole-3.0.2" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."five.customerize-1.1" self."five.localsitemanager-2.0.5" self."Pillow-2.3.0" self."plone.app.blob-1.5.9" self."plone.app.collection-1.0.11" self."plone.app.content-2.1.4" self."plone.app.contentlisting-1.0.5" self."plone.app.contentmenu-2.0.10" self."plone.app.contentrules-3.0.6" self."plone.app.controlpanel-2.3.8" self."plone.app.customerize-1.2.2" self."plone.app.discussion-2.2.12" self."plone.app.folder-1.0.6" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.jquery-1.7.2" self."plone.app.jquerytools-1.5.7" self."plone.app.layout-2.3.11" self."plone.app.linkintegrity-1.5.4" self."plone.app.locales-4.3.3" self."plone.app.portlets-2.4.8" self."plone.app.redirector-1.2" self."plone.app.search-1.1.7" self."plone.app.upgrade-1.3.6" self."plone.app.users-1.2" self."plone.app.uuid-1.1" self."plone.app.viewletmanager-2.0.5" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.batching-1.0.1" self."plone.browserlayer-2.1.3" self."plone.contentrules-2.0.4" self."plone.fieldsets-2.0.2" self."plone.i18n-2.0.9" self."plone.indexer-1.0.2" self."plone.intelligenttext-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlet.collection-2.1.5" self."plone.portlet.static-2.0.2" self."plone.portlets-2.2" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."plone.session-3.5.3" self."plone.theme-2.1.1" self."plonetheme.classic-1.3.3" self."plonetheme.sunburst-1.4.6" self."Products.Archetypes-1.9.7" self."Products.ATContentTypes-2.1.14" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.DCWorkflow-2.2.4" self."Products.ExtendedPathIndex-3.1" self."Products.ExternalEditor-1.1.0" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PasswordResetTool-2.0.16" self."Products.PlacelessTranslationService-2.0.4" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PluginRegistry-1.3" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.statusmessages-4.0" self."Products.TinyMCE-1.3.6" self.setuptools self."transaction-1.1.1" self."z3c.autoinclude-0.3.5" self."ZODB3-3.10.5" self."zope.app.locales-3.6.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.site-3.9.2" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -207,6 +167,26 @@ in
   };
 
 
+  "waitress-0.8.9" = self.buildPythonPackage {
+    name = "waitress-0.8.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.9.tar.gz";
+        md5 = "da3f2e62b3676be5dd630703a68e2a04";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Waitress WSGI server
+        '';
+      homepage = "https://github.com/Pylons/waitress";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "zope.deferredimport-3.5.3" = self.buildPythonPackage {
     name = "zope.deferredimport-3.5.3";
     src = fetchurl {
@@ -227,62 +207,42 @@ in
   };
 
 
-  "Mako-0.9.0" = self.buildPythonPackage {
-    name = "Mako-0.9.0";
+  "six-1.6.1" = self.buildPythonPackage {
+    name = "six-1.6.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Mako/Mako-0.9.0.tar.gz";
-        md5 = "e2627ba5c65f83dfe39d9a0892ae517d";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.0" ];
-    propagatedBuildInputs = [ self."MarkupSafe-0.18" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        A super-fast templating language that borrows the  best ideas from the existing templating languages.
-        '';
-      homepage = "http://www.makotemplates.org/";
-      license = "MIT";
-    };
-  };
-
-
-  "waitress-0.8.7" = self.buildPythonPackage {
-    name = "waitress-0.8.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/w/waitress/waitress-0.8.7.tar.gz";
-        md5 = "714f3d458d82a47f12fb168460de8366";
+        url = "https://pypi.python.org/packages/source/s/six/six-1.6.1.tar.gz";
+        md5 = "07d606ac08595d795bf926cc9985674f";
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Waitress WSGI server
-        '';
-      homepage = "https://github.com/Pylons/waitress";
-      license = "ZPL 2.1";
-    };
-  };
-
-
-  "coverage-3.7" = self.buildPythonPackage {
-    name = "coverage-3.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.tar.gz";
-        md5 = "055d82e6849d882ec6cf2ae1faca8e56";
-    };
-    doCheck = true;
-    buildInputs = [  ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Code coverage measurement for Python
+        Python 2 and 3 compatibility utilities
         '';
-      homepage = "http://nedbatchelder.com/code/coverage";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/six/";
+      license = "MIT";
+    };
+  };
+
+
+  "zope.deprecation-4.1.1" = self.buildPythonPackage {
+    name = "zope.deprecation-4.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.1.1.tar.gz";
+        md5 = "ce261b9384066f7e13b63525778430cb";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Zope Deprecation Infrastructure
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.deprecation";
+      license = "ZPL 2.1";
     };
   };
 
@@ -295,7 +255,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -307,15 +267,15 @@ in
   };
 
 
-  "plone.autoform-1.5" = self.buildPythonPackage {
-    name = "plone.autoform-1.5";
+  "plone.autoform-1.6" = self.buildPythonPackage {
+    name = "plone.autoform-1.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.5.zip";
-        md5 = "a62216fb76017077643f5af8b1e17949";
+        url = "https://pypi.python.org/packages/source/p/plone.autoform/plone.autoform-1.6.zip";
+        md5 = "27412ab43f728064a60e2aeb564726b5";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
+    propagatedBuildInputs = [ self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -327,11 +287,11 @@ in
   };
 
 
-  "Unidecode-0.04.1" = self.buildPythonPackage {
-    name = "Unidecode-0.04.1";
+  "roman-1.4.0" = self.buildPythonPackage {
+    name = "roman-1.4.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
-        md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
+        url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
+        md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
     };
     doCheck = false;
     buildInputs = [  ];
@@ -339,10 +299,30 @@ in
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        US-ASCII transliterations of Unicode text
+        Integer to Roman numerals converter
         '';
-      homepage = "http://code.zemanta.com/tsolc/unidecode/";
-      license = "UNKNOWN";
+      homepage = "http://pypi.python.org/pypi/roman";
+      license = "Python 2.1.1";
+    };
+  };
+
+
+  "archetypes.referencebrowserwidget-2.4.20" = self.buildPythonPackage {
+    name = "archetypes.referencebrowserwidget-2.4.20";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.20.zip";
+        md5 = "352ea75e5dbdcdca8897f88fd77ecd3e";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.jquerytools-1.5.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        A referencebrowser implementation for Archetypes
+        '';
+      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
+      license = "ZPL 2.1";
     };
   };
 
@@ -387,15 +367,35 @@ in
   };
 
 
-  "plone.app.blob-1.5.8" = self.buildPythonPackage {
-    name = "plone.app.blob-1.5.8";
+  "nose-1.3.3" = self.buildPythonPackage {
+    name = "nose-1.3.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.8.zip";
-        md5 = "7e575d8df137cd19067cc95845aae604";
+        url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.3.tar.gz";
+        md5 = "42776061bf5206670cb819176dc78654";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        nose extends unittest to make testing easier
+        '';
+      homepage = "http://readthedocs.org/docs/nose/";
+      license = "GNU LGPL";
+    };
+  };
+
+
+  "plone.app.blob-1.5.9" = self.buildPythonPackage {
+    name = "plone.app.blob-1.5.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.blob/plone.app.blob-1.5.9.zip";
+        md5 = "3ac753daa2758e3e8290e1e3a1887183";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.2" self."plone.app.imaging-1.0.9" self."plone.scale__storage-1.3.2" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
+    propagatedBuildInputs = [ self."archetypes.schemaextender-2.1.3" self."plone.app.imaging-1.0.10" self."plone.scale__storage-1.3.3" self.setuptools self."ZODB3-3.10.5" self."zope.proxy-3.6.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -407,22 +407,24 @@ in
   };
 
 
-  "WebOb-1.2.3" = self.buildPythonPackage {
-    name = "WebOb-1.2.3";
+  "suds" = self."suds-0.4";
+
+  "suds-0.4" = self.buildPythonPackage {
+    name = "suds-0.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.2.3.tar.gz";
-        md5 = "11825b7074ba7043e157805e4e6e0f55";
+        url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
+        md5 = "b7502de662341ed7275b673e6bd73191";
     };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.0" ];
+    doCheck = false;
+    buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        WSGI request and response object
+        Lightweight SOAP client
         '';
-      homepage = "http://webob.org/";
-      license = "MIT";
+      homepage = "https://fedorahosted.org/suds";
+      license = "UNKNOWN";
     };
   };
 
@@ -447,22 +449,42 @@ in
   };
 
 
-  "plone.theme-2.1" = self.buildPythonPackage {
-    name = "plone.theme-2.1";
+  "Products.ZCTextIndex-2.13.5" = self.buildPythonPackage {
+    name = "Products.ZCTextIndex-2.13.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.zip";
-        md5 = "c592d0d095e9fc76cc81597cdf6d0c37";
+        url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.5.zip";
+        md5 = "9a3717674b33d1d7c11b2c3728663d5b";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Tools for managing themes in CMF and Plone sites
+        Full text indexing for ZCatalog / Zope 2.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.theme";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.outputfilters-1.12" = self.buildPythonPackage {
+    name = "plone.outputfilters-1.12";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.12.zip";
+        md5 = "ed76b9cf028cf7e04f3aa408e22b61ca";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Transformations applied to HTML in Plone text fields as they are rendered
+        '';
+      homepage = "http://github.com/plone/plone.outputfilters";
+      license = "GPL";
     };
   };
 
@@ -487,22 +509,42 @@ in
   };
 
 
-  "plone.batching-1.0" = self.buildPythonPackage {
-    name = "plone.batching-1.0";
+  "plone.app.contentmenu-2.0.10" = self.buildPythonPackage {
+    name = "plone.app.contentmenu-2.0.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.zip";
-        md5 = "cabd58ccfec67cd384602343ce40dc7b";
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.10.zip";
+        md5 = "d28bc995bbe5a6f4aeabad07438ffb85";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.4" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Batching facilities used in Plone.
+        Plone's content menu implementation
         '';
-      homepage = "http://pypi.python.org/pypi/plone.batching";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/plone.app.contentmenu";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "mechanize-0.2.5" = self.buildPythonPackage {
+    name = "mechanize-0.2.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
+        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Stateful programmatic web browsing.
+        '';
+      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
+      license = "BSD";
     };
   };
 
@@ -515,7 +557,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."python-gettext-1.2" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -527,34 +569,6 @@ in
   };
 
 
-  "Pillow-1.7.8" = self.buildPythonPackage {
-    name = "Pillow-1.7.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-1.7.8.zip";
-        md5 = "41d8688d4db72673069a6dc63b5289d6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    configurePhase = ''
-      sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
-              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
-              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
-    '';
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Python Imaging Library (fork)
-        '';
-      homepage = "http://github.com/python-imaging/Pillow";
-      license = "UNKNOWN";
-    };
-  };
-
-
   "ZConfig-2.9.1" = self.buildPythonPackage {
     name = "ZConfig-2.9.1";
     src = fetchurl {
@@ -603,7 +617,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."transaction-1.1.1" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."zope.tales-3.5.3" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -623,7 +637,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self.setuptools self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -635,11 +649,11 @@ in
   };
 
 
-  "zope.event-4.0.2" = self.buildPythonPackage {
-    name = "zope.event-4.0.2";
+  "zope.event-4.0.3" = self.buildPythonPackage {
+    name = "zope.event-4.0.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.2.tar.gz";
-        md5 = "e08dd299d428d77a1cfcbfe841b81872";
+        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-4.0.3.tar.gz";
+        md5 = "9a3780916332b18b8b85f522bcc3e249";
     };
     doCheck = true;
     buildInputs = [  ];
@@ -663,7 +677,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self."plone.transformchain-1.0.3" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -723,7 +737,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self."Products.GenericSetup-1.7.4" self."Products.ZSQLMethods-2.13.4" self.setuptools self."zope.app.publication-3.12.0" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -735,15 +749,15 @@ in
   };
 
 
-  "Products.PlonePAS-4.1.1" = self.buildPythonPackage {
-    name = "Products.PlonePAS-4.1.1";
+  "Products.PlonePAS-4.1.3" = self.buildPythonPackage {
+    name = "Products.PlonePAS-4.1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.1.zip";
-        md5 = "32db1808c3ad42e82542b65eb95c3c71";
+        url = "https://pypi.python.org/packages/source/P/Products.PlonePAS/Products.PlonePAS-4.1.3.zip";
+        md5 = "785c10242b77bfb0612c76b0262e361e";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.session-3.5.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -783,7 +797,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.19" self.setuptools self."zope.deprecation-3.4.1" ];
+    propagatedBuildInputs = [ self."archetypes.referencebrowserwidget-2.4.20" self.setuptools self."zope.deprecation-3.4.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -823,7 +837,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Record-2.13.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -855,28 +869,6 @@ in
   };
 
 
-  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.13";
-
-  "plone.recipe.zope2instance-4.2.13" = self.buildPythonPackage {
-    name = "plone.recipe.zope2instance-4.2.13";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.13.zip";
-        md5 = "1ff990a15e77a92a7339b5092bfb9cc3";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Buildout recipe for creating a Zope 2 instance
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "Products.CMFQuickInstallerTool-3.0.6" = self.buildPythonPackage {
     name = "Products.CMFQuickInstallerTool-3.0.6";
     src = fetchurl {
@@ -885,7 +877,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" self."eggtestinfo-0.3" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -897,35 +889,57 @@ in
   };
 
 
-  "zope.deprecation-4.0.2" = self.buildPythonPackage {
-    name = "zope.deprecation-4.0.2";
+  "plone.recipe.zope2instance" = self."plone.recipe.zope2instance-4.2.14";
+
+  "plone.recipe.zope2instance-4.2.14" = self.buildPythonPackage {
+    name = "plone.recipe.zope2instance-4.2.14";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.deprecation/zope.deprecation-4.0.2.tar.gz";
-        md5 = "5f8cecce85f2783f9e020f1288e908fd";
+        url = "https://pypi.python.org/packages/source/p/plone.recipe.zope2instance/plone.recipe.zope2instance-4.2.14.zip";
+        md5 = "e5e76023d357592ee7b0236bb9764b9d";
     };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."mailinglogger-3.7.0" self.setuptools self."zc.buildout-1.7.1" self."zc.recipe.egg-1.3.2" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Zope Deprecation Infrastructure
+        Buildout recipe for creating a Zope 2 instance
         '';
-      homepage = "http://pypi.python.org/pypi/zope.deprecation";
+      homepage = "http://pypi.python.org/pypi/plone.recipe.zope2instance";
       license = "ZPL 2.1";
     };
   };
 
 
-  "Products.CMFEditions-2.2.8" = self.buildPythonPackage {
-    name = "Products.CMFEditions-2.2.8";
+  "zope.event-3.5.2" = self.buildPythonPackage {
+    name = "zope.event-3.5.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.8.zip";
-        md5 = "1806f2e17e2527fad9364670b343bd11";
+        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
+        md5 = "6e8af2a16157a74885d4f0d88137cefb";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Very basic event publishing system
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.event";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.CMFEditions-2.2.9" = self.buildPythonPackage {
+    name = "Products.CMFEditions-2.2.9";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.CMFEditions/Products.CMFEditions-2.2.9.zip";
+        md5 = "4cd9db460f4056b14d425ff2fdc34952";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDiffTool-2.1" self."Products.CMFUid-2.2.1" self."Products.GenericSetup-1.7.4" self."Products.ZopeVersionControl-1.1.3" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.copy-3.5.0" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -937,46 +951,6 @@ in
   };
 
 
-  "plone.app.form-2.2.3" = self.buildPythonPackage {
-    name = "plone.app.form-2.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.3.zip";
-        md5 = "4b7dcabcda1407a40185782a4d1f9a01";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.11" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        zope.formlib integration for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.form";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "Products.CMFDefault-2.2.3" = self.buildPythonPackage {
-    name = "Products.CMFDefault-2.2.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.3.tar.gz";
-        md5 = "fe7d2d3906ee0e3b484e4a02401576ab";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFDefault";
-      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
-    };
-  };
-
-
   "zope.processlifetime-1.0" = self.buildPythonPackage {
     name = "zope.processlifetime-1.0";
     src = fetchurl {
@@ -997,22 +971,62 @@ in
   };
 
 
-  "zope.component-4.1.0" = self.buildPythonPackage {
-    name = "zope.component-4.1.0";
+  "Products.CMFDefault-2.2.4" = self.buildPythonPackage {
+    name = "Products.CMFDefault-2.2.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.1.0.zip";
-        md5 = "8e185893699f9fa577bd9ada0a5302fa";
+        url = "https://pypi.python.org/packages/source/P/Products.CMFDefault/Products.CMFDefault-2.2.4.tar.gz";
+        md5 = "3d4444a8c4b486a2d769060e35a3ee01";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Default product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.CMFDefault";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
+    };
+  };
+
+
+  "plone.app.form-2.2.4" = self.buildPythonPackage {
+    name = "plone.app.form-2.2.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.form/plone.app.form-2.2.4.zip";
+        md5 = "1784f608dcb3a1701d91d4985ca31e63";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."five.formlib-1.0.4" self."plone.app.vocabularies-2.1.14" self."plone.locking-2.0.4" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Zope Component Architecture
+        zope.formlib integration for Plone
         '';
-      homepage = "http://pypi.python.org/pypi/zope.component";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.form";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Products.PasswordResetTool-2.0.16" = self.buildPythonPackage {
+    name = "Products.PasswordResetTool-2.0.16";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.16.zip";
+        md5 = "c9069dff718878a32b1ef91875acf240";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Password reset tool for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool";
+      license = "GPL";
     };
   };
 
@@ -1057,31 +1071,51 @@ in
   };
 
 
-  "plone.stringinterp-1.0.10" = self.buildPythonPackage {
-    name = "plone.stringinterp-1.0.10";
+  "lxml-3.3.5" = self.buildPythonPackage {
+    name = "lxml-3.3.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.10.zip";
-        md5 = "595074e94944ad6860e2105a020a3b9a";
+        url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.3.5.tar.gz";
+        md5 = "88c75f4c73fc8f59c9ebb17495044f2f";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Adaptable string interpolation
+        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
-      license = "GPL version 2";
+      homepage = "http://lxml.de/";
+      license = "UNKNOWN";
     };
   };
 
 
-  "plonetheme.sunburst-1.4.5" = self.buildPythonPackage {
-    name = "plonetheme.sunburst-1.4.5";
+  "PasteDeploy-1.5.2" = self.buildPythonPackage {
+    name = "PasteDeploy-1.5.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.5.zip";
-        md5 = "a8438d6f4a27ad6c10dc3554a9145705";
+        url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.2.tar.gz";
+        md5 = "352b7205c78c8de4987578d19431af3b";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.3" ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Load, configure, and compose WSGI applications and servers
+        '';
+      homepage = "http://pythonpaste.org/deploy/";
+      license = "MIT";
+    };
+  };
+
+
+  "plonetheme.sunburst-1.4.6" = self.buildPythonPackage {
+    name = "plonetheme.sunburst-1.4.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plonetheme.sunburst/plonetheme.sunburst-1.4.6.zip";
+        md5 = "6e236f7d2ab944b708fb26de6f343ceb";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -1097,22 +1131,22 @@ in
   };
 
 
-  "PasteDeploy-1.5.0" = self.buildPythonPackage {
-    name = "PasteDeploy-1.5.0";
+  "plone.openid-2.0.2" = self.buildPythonPackage {
+    name = "plone.openid-2.0.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-1.5.0.tar.gz";
-        md5 = "f1a068a0b680493b6eaff3dd7690690f";
+        url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.2.zip";
+        md5 = "046133795cf232ab6d19db940f02197a";
     };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.0" ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Load, configure, and compose WSGI applications and servers
+        OpenID authentication support for PAS
         '';
-      homepage = "http://pythonpaste.org/deploy/";
-      license = "MIT";
+      homepage = "http://svn.plone.org/svn/plone/plone.openid";
+      license = "BSD";
     };
   };
 
@@ -1137,42 +1171,42 @@ in
   };
 
 
-  "plone.openid-2.0.1" = self.buildPythonPackage {
-    name = "plone.openid-2.0.1";
+  "Products.PortalTransforms-2.1.3" = self.buildPythonPackage {
+    name = "Products.PortalTransforms-2.1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.openid/plone.openid-2.0.1.zip";
-        md5 = "d4c36926a6dbefed035ed92c29329ce1";
+        url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.3.zip";
+        md5 = "a2f1f9e0388ed081028bb4c93fd24317";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.PluggableAuthService-1.10.0" self."python-openid-2.2.5" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        OpenID authentication support for PAS
+        MIME based content transformations
         '';
-      homepage = "http://svn.plone.org/svn/plone/plone.openid";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/Products.PortalTransforms";
+      license = "UNKNOWN";
     };
   };
 
 
-  "plone.resourceeditor-1.0" = self.buildPythonPackage {
-    name = "plone.resourceeditor-1.0";
+  "zope.interface-4.1.1" = self.buildPythonPackage {
+    name = "zope.interface-4.1.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
-        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
+        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz";
+        md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
     };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    doCheck = true;
+    buildInputs = [ self."zope.event-4.0.3" ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        UNKNOWN
+        Interfaces for Python
         '';
-      homepage = "https://github.com/plone/plone.resourceeditor";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/zope.interface";
+      license = "ZPL 2.1";
     };
   };
 
@@ -1197,35 +1231,35 @@ in
   };
 
 
-  "zope.schema-4.2.2" = self.buildPythonPackage {
-    name = "zope.schema-4.2.2";
+  "zope.component-4.2.1" = self.buildPythonPackage {
+    name = "zope.component-4.2.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
-        md5 = "e7e581af8193551831560a736a53cf58";
+        url = "https://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz";
+        md5 = "cf55d496428d976f9329a4a2330a8b54";
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        zope.interface extension for defining data schemas
+        Zope Component Architecture
         '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
+      homepage = "http://pypi.python.org/pypi/zope.component";
       license = "ZPL 2.1";
     };
   };
 
 
-  "plone.app.content-2.1.3" = self.buildPythonPackage {
-    name = "plone.app.content-2.1.3";
+  "plone.app.content-2.1.4" = self.buildPythonPackage {
+    name = "plone.app.content-2.1.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.3.zip";
-        md5 = "3463a245414518f058fa6d658a6b9caf";
+        url = "https://pypi.python.org/packages/source/p/plone.app.content/plone.app.content-2.1.4.zip";
+        md5 = "6930a2376e2d856e4f24e17f789568e5";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.batching-1.0.1" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -1237,6 +1271,46 @@ in
   };
 
 
+  "plone.alterego-1.0" = self.buildPythonPackage {
+    name = "plone.alterego-1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
+        md5 = "b7b6dbcbba00505d98d5aba83e016408";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Low level support for dynamic modules
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "LGPL";
+    };
+  };
+
+
+  "Products.ExternalEditor-1.1.0" = self.buildPythonPackage {
+    name = "Products.ExternalEditor-1.1.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
+        md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Zope External Editor
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.ExternalEditor";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "Products.CMFDiffTool-2.1" = self.buildPythonPackage {
     name = "Products.CMFDiffTool-2.1";
     src = fetchurl {
@@ -1245,7 +1319,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -1264,7 +1338,7 @@ in
         md5 = "2c3b64b17a8e18b405f55d46173e14dd";
     };
     doCheck = true;
-    buildInputs = [ self."nose-1.3.0" ];
+    buildInputs = [ self."nose-1.3.3" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
@@ -1297,22 +1371,42 @@ in
   };
 
 
-  "plone.dexterity-2.1.3" = self.buildPythonPackage {
-    name = "plone.dexterity-2.1.3";
+  "z3c.formwidget.query-0.10" = self.buildPythonPackage {
+    name = "z3c.formwidget.query-0.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.1.3.zip";
-        md5 = "7f6444a2c26488e4068217266fd243b7";
+        url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.10.zip";
+        md5 = "912773ecfa4409bc8911e9e8dd981e58";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.folder-1.0.4" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.3" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Flexible CMF content
+        A source query widget for z3c.form.
         '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/z3c.formwidget.query";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Products.DCWorkflow-2.2.4" = self.buildPythonPackage {
+    name = "Products.DCWorkflow-2.2.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
+        md5 = "c90a16c4f3611015592ba8173a5f1863";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        DCWorkflow product for the Zope Content Management Framework
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.DCWorkflow";
+      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
     };
   };
 
@@ -1337,11 +1431,11 @@ in
   };
 
 
-  "diazo-1.0.4" = self.buildPythonPackage {
-    name = "diazo-1.0.4";
+  "diazo-1.0.5" = self.buildPythonPackage {
+    name = "diazo-1.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.4.zip";
-        md5 = "b5f07cfd928e06bcb964b3f830767bab";
+        url = "https://pypi.python.org/packages/source/d/diazo/diazo-1.0.5.zip";
+        md5 = "9b304d079eab7c9dd6d10487f2fc94a4";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -1353,7 +1447,7 @@ in
         XSLT engine. With Diazo, you "compile" your theme and ruleset in one
         step, then use a superfast/simple transform on each request thereafter.
         Alternatively, compile your theme during development, check it into
-        Subversion, and not touch Diazo during deployment.
+        version control, and not touch Diazo during deployment.
         '';
       homepage = "http://diazo.org";
       license = "New BSD";
@@ -1361,26 +1455,6 @@ in
   };
 
 
-  "zc.lockfile-1.0.2" = self.buildPythonPackage {
-    name = "zc.lockfile-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
-        md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Basic inter-process locks
-        '';
-      homepage = "http://www.python.org/pypi/zc.lockfile";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.tales-3.5.3" = self.buildPythonPackage {
     name = "zope.tales-3.5.3";
     src = fetchurl {
@@ -1401,6 +1475,26 @@ in
   };
 
 
+  "feedparser-5.0.1" = self.buildPythonPackage {
+    name = "feedparser-5.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2";
+        md5 = "702835de74bd4a578524f311e62c2877";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        
+        '';
+      homepage = "https://code.google.com/p/feedparser/";
+      license = "";
+    };
+  };
+
+
   "DateTime-3.0.3" = self.buildPythonPackage {
     name = "DateTime-3.0.3";
     src = fetchurl {
@@ -1421,11 +1515,31 @@ in
   };
 
 
-  "z3c.autoinclude-0.3.4" = self.buildPythonPackage {
-    name = "z3c.autoinclude-0.3.4";
+  "Missing-2.13.1" = self.buildPythonPackage {
+    name = "Missing-2.13.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.4.zip";
-        md5 = "6a615ae18c12b459bceb3ae28e8e7709";
+        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
+        md5 = "9823cff54444cbbcaef8fc45d8e42572";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Special Missing objects used in Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/Missing";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "z3c.autoinclude-0.3.5" = self.buildPythonPackage {
+    name = "z3c.autoinclude-0.3.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/z3c.autoinclude/z3c.autoinclude-0.3.5.zip";
+        md5 = "44f113a1c280dd238ab9b8490ae88857";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -1435,7 +1549,7 @@ in
       description = ''
         Automatically include ZCML
         '';
-      homepage = "UNKNOWN";
+      homepage = "http://pypi.python.org/pypi/z3c.autoinclude";
       license = "ZPL";
     };
   };
@@ -1481,15 +1595,15 @@ in
   };
 
 
-  "plone.app.iterate-2.1.10" = self.buildPythonPackage {
-    name = "plone.app.iterate-2.1.10";
+  "plone.app.iterate-2.1.12" = self.buildPythonPackage {
+    name = "plone.app.iterate-2.1.12";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.10.zip";
-        md5 = "8bd270d8a3c9509e524a06e092a9b4c4";
+        url = "https://pypi.python.org/packages/source/p/plone.app.iterate/plone.app.iterate-2.1.12.zip";
+        md5 = "1d05316d4e9a68ed738e890aafa3c9e2";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.8" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFEditions-2.2.9" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.DCWorkflow-2.2.4" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -1501,6 +1615,26 @@ in
   };
 
 
+  "plone.app.theming-1.1.1" = self.buildPythonPackage {
+    name = "plone.app.theming-1.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
+        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."diazo-1.0.5" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.8" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.3" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Integrates the Diazo theming engine with Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.theming";
+      license = "GPL";
+    };
+  };
+
+
   "python-openid-2.2.5" = self.buildPythonPackage {
     name = "python-openid-2.2.5";
     src = fetchurl {
@@ -1561,22 +1695,22 @@ in
   };
 
 
-  "lxml-3.2.3" = self.buildPythonPackage {
-    name = "lxml-3.2.3";
+  "DocumentTemplate-2.13.2" = self.buildPythonPackage {
+    name = "DocumentTemplate-2.13.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.2.3.tar.gz";
-        md5 = "fef47bb4ac72ac38ce778518dac42236";
+        url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
+        md5 = "07bb086c77c1dfe94125ad2efbba94b7";
     };
     doCheck = false;
-    buildInputs = [ pkgs.libxml2 pkgs.libxslt ];
-    propagatedBuildInputs = [  ];
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.
+        Document Templating Markup Language (DTML)
         '';
-      homepage = "http://lxml.de/";
-      license = "UNKNOWN";
+      homepage = "http://pypi.python.org/pypi/DocumentTemplate";
+      license = "ZPL 2.1";
     };
   };
 
@@ -1601,26 +1735,6 @@ in
   };
 
 
-  "plone.app.controlpanel-2.3.7" = self.buildPythonPackage {
-    name = "plone.app.controlpanel-2.3.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.7.zip";
-        md5 = "537072fe22237a2148310b8714755356";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.app.workflow-2.1.6" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.PlonePAS-4.1.1" self."Products.PortalTransforms-2.1.2" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Formlib-based controlpanels for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.controlpanel";
-      license = "GPL version 2";
-    };
-  };
-
-
   "zope.ptresource-3.9.0" = self.buildPythonPackage {
     name = "zope.ptresource-3.9.0";
     src = fetchurl {
@@ -1641,6 +1755,26 @@ in
   };
 
 
+  "plone.namedfile__scales-2.0.5" = self.buildPythonPackage {
+    name = "plone.namedfile__scales-2.0.5";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.5.zip";
+        md5 = "54f73c5961cbdf5020cf59ae780601ea";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.3" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        File types and fields for images, files and blob files with filenames
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.namedfile";
+      license = "BSD";
+    };
+  };
+
+
   "docutils-0.9.1" = self.buildPythonPackage {
     name = "docutils-0.9.1";
     src = fetchurl {
@@ -1661,6 +1795,26 @@ in
   };
 
 
+  "plone.app.controlpanel-2.3.8" = self.buildPythonPackage {
+    name = "plone.app.controlpanel-2.3.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.controlpanel/plone.app.controlpanel-2.3.8.zip";
+        md5 = "230fa6df467f5bcc0b987d1cd66ccd9f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.app.workflow-2.1.7" self."plone.fieldsets-2.0.2" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.PlonePAS-4.1.3" self."Products.PortalTransforms-2.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.cachedescriptors-3.5.1" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.ramcache-1.0" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Formlib-based controlpanels for Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.controlpanel";
+      license = "GPL version 2";
+    };
+  };
+
+
   "beautifulsoup4-4.3.2" = self.buildPythonPackage {
     name = "beautifulsoup4-4.3.2";
     src = fetchurl {
@@ -1681,42 +1835,22 @@ in
   };
 
 
-  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
-    name = "Products.PloneLanguageTool-3.2.7";
+  "WebOb-1.4" = self.buildPythonPackage {
+    name = "WebOb-1.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
-        md5 = "bd9eb6278bf76e8cbce99437ca362164";
+        url = "https://pypi.python.org/packages/source/W/WebOb/WebOb-1.4.tar.gz";
+        md5 = "8437607c0cc00c35f658f972516ffb55";
     };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.3" ];
+    propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
+        WSGI request and response object
         '';
-      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
-      license = "GPL";
-    };
-  };
-
-
-  "nose-1.3.0" = self.buildPythonPackage {
-    name = "nose-1.3.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/n/nose/nose-1.3.0.tar.gz";
-        md5 = "95d6d32b9d6b029c3c65674bd9e7eabe";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        nose extends unittest to make testing easier
-        '';
-      homepage = "http://readthedocs.org/docs/nose/";
-      license = "GNU LGPL";
+      homepage = "http://webob.org/";
+      license = "MIT";
     };
   };
 
@@ -1749,7 +1883,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."plone.app.portlets-2.4.5" self."plone.openid-2.0.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.app.portlets-2.4.8" self."plone.openid-2.0.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -1761,42 +1895,42 @@ in
   };
 
 
-  "Products.PortalTransforms-2.1.2" = self.buildPythonPackage {
-    name = "Products.PortalTransforms-2.1.2";
+  "plone.indexer-1.0.2" = self.buildPythonPackage {
+    name = "plone.indexer-1.0.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PortalTransforms/Products.PortalTransforms-2.1.2.zip";
-        md5 = "9f429f3c3b9e0019d0f6c9b7a8a9376e";
+        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
+        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Markdown-2.0.3" self."plone.intelligenttext-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.MimetypesRegistry-2.0.5" self.setuptools self."ZODB3-3.10.5" self."zope.interface-3.6.7" self."zope.structuredtext-3.5.1" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        MIME based content transformations
+        Hooks to facilitate managing custom index values in Zope 2/CMF applications
         '';
-      homepage = "http://pypi.python.org/pypi/Products.PortalTransforms";
-      license = "UNKNOWN";
+      homepage = "http://pypi.python.org/pypi/plone.indexer";
+      license = "BSD";
     };
   };
 
 
-  "zope.schema-4.3.2" = self.buildPythonPackage {
-    name = "zope.schema-4.3.2";
+  "plone.app.portlets-2.4.8" = self.buildPythonPackage {
+    name = "plone.app.portlets-2.4.8";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.3.2.zip";
-        md5 = "b63df4a3035f29113f8130c8ae28bb13";
+        url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.8.zip";
+        md5 = "7d25027d89d871a50aba91c95b798bb2";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.2" self."zope.interface-4.0.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.14" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        zope.interface extension for defining data schemas
+        Plone integration for the basic plone.portlets package
         '';
-      homepage = "http://pypi.python.org/pypi/zope.schema";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.portlets";
+      license = "GPL version 2";
     };
   };
 
@@ -1821,44 +1955,22 @@ in
   };
 
 
-  "plone.app.portlets-2.4.5" = self.buildPythonPackage {
-    name = "plone.app.portlets-2.4.5";
+  "plone.formwidget.namedfile-1.0.9" = self.buildPythonPackage {
+    name = "plone.formwidget.namedfile-1.0.9";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.portlets/plone.app.portlets-2.4.5.zip";
-        md5 = "409aeeed42d87af8338197514363ec76";
+        url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.9.zip";
+        md5 = "96f2634a8c4c1d98c2f39646a77c87fc";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."feedparser-5.0.1" self."five.customerize-1.1" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.i18n-2.0.2" self."plone.app.vocabularies-2.1.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.PluggableAuthService-1.10.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Plone integration for the basic plone.portlets package
+        Image widget for z3c.form and Plone
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.portlets";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "Plone" = self."Plone-4.3.2";
-
-  "Plone-4.3.2" = self.buildPythonPackage {
-    name = "Plone-4.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.2.zip";
-        md5 = "809f9fe8b8d23b49778e8ce304ea34f6";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.caching-1.1.6" self."plone.app.dexterity-2.0.9" self."plone.app.iterate-2.1.10" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.9" self."Products.CMFPlone-4.3.2" self.setuptools self."wicked-1.1.10" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Plone Content Management System
-        '';
-      homepage = "http://plone.org/";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile";
+      license = "GPL";
     };
   };
 
@@ -1883,22 +1995,42 @@ in
   };
 
 
-  "feedparser-5.0.1" = self.buildPythonPackage {
-    name = "feedparser-5.0.1";
+  "Products.CMFPlacefulWorkflow-1.5.10" = self.buildPythonPackage {
+    name = "Products.CMFPlacefulWorkflow-1.5.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/f/feedparser/feedparser-5.0.1.tar.bz2";
-        md5 = "702835de74bd4a578524f311e62c2877";
+        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.10.zip";
+        md5 = "997648c5bed6d5a54ac922c6ba9351a9";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        
+        Workflow policies for CMF and Plone
         '';
-      homepage = "https://code.google.com/p/feedparser/";
-      license = "";
+      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
+      license = "GPL";
+    };
+  };
+
+
+  "plone.dexterity-2.2.1" = self.buildPythonPackage {
+    name = "plone.dexterity-2.2.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.dexterity/plone.dexterity-2.2.1.zip";
+        md5 = "c62d427e3f6c24da1cca58d7cb152e1f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.alterego-1.0" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.folder-1.0.5" self."plone.memoize-1.1.1" self."plone.rfc822-1.1" self."plone.supermodel-1.2.4" self."plone.synchronize-1.0.1" self."plone.uuid-1.0.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.dottedname-3.4.6" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.size-3.4.1" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Flexible CMF content
+        '';
+      homepage = "http://code.google.com/p/dexterity";
+      license = "GPL version 2";
     };
   };
 
@@ -1923,6 +2055,26 @@ in
   };
 
 
+  "plone.app.dexterity-2.0.11" = self.buildPythonPackage {
+    name = "plone.app.dexterity-2.0.11";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.11.zip";
+        md5 = "649f08fd008908121f5f70dfd33e513a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."lxml-2.3.6" self."plone.app.content-2.1.4" self."plone.app.layout-2.3.11" self."plone.app.textfield-1.2.3" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.4" self."plone.dexterity-2.2.1" self."plone.formwidget.namedfile-1.0.9" self."plone.namedfile__scales-2.0.5" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.7" self."plone.supermodel-1.2.4" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
+        '';
+      homepage = "http://plone.org/products/dexterity";
+      license = "GPL";
+    };
+  };
+
+
   "mailinglogger-3.7.0" = self.buildPythonPackage {
     name = "mailinglogger-3.7.0";
     src = fetchurl {
@@ -1943,26 +2095,6 @@ in
   };
 
 
-  "plone.app.jquerytools-1.5.6" = self.buildPythonPackage {
-    name = "plone.app.jquerytools-1.5.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.6.zip";
-        md5 = "4ae9a72baa8e9899c1706b4fedbb516b";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
-      license = "GPL version 2";
-    };
-  };
-
-
   "Products.BTreeFolder2-2.13.3" = self.buildPythonPackage {
     name = "Products.BTreeFolder2-2.13.3";
     src = fetchurl {
@@ -1991,7 +2123,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2003,22 +2135,22 @@ in
   };
 
 
-  "plone.formwidget.namedfile-1.0.7" = self.buildPythonPackage {
-    name = "plone.formwidget.namedfile-1.0.7";
+  "plone.app.viewletmanager-2.0.5" = self.buildPythonPackage {
+    name = "plone.app.viewletmanager-2.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.formwidget.namedfile/plone.formwidget.namedfile-1.0.7.zip";
-        md5 = "6fa3cd99bf9b30971034b0f6dc31cfb3";
+        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.5.zip";
+        md5 = "e923d0a9a087ef79a6f0303f64a0f853";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.namedfile__scales-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.14" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Image widget for z3c.form and Plone
+        configurable viewlet manager
         '';
-      homepage = "http://pypi.python.org/pypi/plone.formwidget.namedfile";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
+      license = "GPL version 2";
     };
   };
 
@@ -2063,35 +2195,35 @@ in
   };
 
 
-  "ExtensionClass-2.13.2" = self.buildPythonPackage {
-    name = "ExtensionClass-2.13.2";
+  "plone.app.imaging-1.0.10" = self.buildPythonPackage {
+    name = "plone.app.imaging-1.0.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
-        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
+        url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.10.zip";
+        md5 = "511ed465cef112bac3d074f09810ca80";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."plone.scale__storage-1.3.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Metaclass for subclassable extension types
+        User-configurable, blob-aware image scaling for Plone.
         '';
-      homepage = "http://pypi.python.org/pypi/ExtensionClass";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.app.imaging";
+      license = "GPL version 2";
     };
   };
 
 
-  "plone.app.contentrules-3.0.4" = self.buildPythonPackage {
-    name = "plone.app.contentrules-3.0.4";
+  "plone.app.contentrules-3.0.6" = self.buildPythonPackage {
+    name = "plone.app.contentrules-3.0.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.4.zip";
-        md5 = "15e86e2739096bff5bf0745590d5ebb0";
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentrules/plone.app.contentrules-3.0.6.zip";
+        md5 = "95eeb55a9489c85c93eb11a87467d867";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.3" self."plone.app.vocabularies-2.1.11" self."plone.contentrules-2.0.3" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.10" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.formlib-1.0.4" self."plone.app.form-2.2.4" self."plone.app.vocabularies-2.1.14" self."plone.contentrules-2.0.4" self."plone.memoize-1.1.1" self."plone.stringinterp-1.0.11" self."plone.uuid-1.0.3" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2110,7 +2242,7 @@ in
         md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
     };
     doCheck = true;
-    buildInputs = [ self."nose-1.3.0" ];
+    buildInputs = [ self."nose-1.3.3" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
@@ -2123,26 +2255,6 @@ in
   };
 
 
-  "MarkupSafe-0.18" = self.buildPythonPackage {
-    name = "MarkupSafe-0.18";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz";
-        md5 = "f8d252fd05371e51dec2fe9a36890687";
-    };
-    doCheck = true;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Implements a XML/HTML/XHTML Markup safe string for Python
-        '';
-      homepage = "http://github.com/mitsuhiko/markupsafe";
-      license = "BSD";
-    };
-  };
-
-
   "zope.pagetemplate-3.6.3" = self.buildPythonPackage {
     name = "zope.pagetemplate-3.6.3";
     src = fetchurl {
@@ -2163,22 +2275,22 @@ in
   };
 
 
-  "python-gettext-1.2" = self.buildPythonPackage {
-    name = "python-gettext-1.2";
+  "plone.app.users-1.2" = self.buildPythonPackage {
+    name = "plone.app.users-1.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
-        md5 = "cd4201d440126d1296d1d2bc2b4795f3";
+        url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2.zip";
+        md5 = "c94682960a960da6d75c8bfba587a836";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."unittest2-0.5.1" ];
+    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.8" self."plone.app.layout-2.3.11" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.PlonePAS-4.1.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Python Gettext po to mo file compiler.
+        A package for all things users and groups related (specific to plone)
         '';
-      homepage = "http://pypi.python.org/pypi/python-gettext";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/plone.app.users";
+      license = "GPL version 2";
     };
   };
 
@@ -2203,11 +2315,11 @@ in
   };
 
 
-  "archetypes.schemaextender-2.1.2" = self.buildPythonPackage {
-    name = "archetypes.schemaextender-2.1.2";
+  "archetypes.schemaextender-2.1.3" = self.buildPythonPackage {
+    name = "archetypes.schemaextender-2.1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.2.zip";
-        md5 = "865aa5b4b6b26e3bb650d89ddfe77c87";
+        url = "https://pypi.python.org/packages/source/a/archetypes.schemaextender/archetypes.schemaextender-2.1.3.zip";
+        md5 = "105f2f8e9c18f34bd09d1a90a10c91d2";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -2223,6 +2335,26 @@ in
   };
 
 
+  "ZopeUndo-2.12.0" = self.buildPythonPackage {
+    name = "ZopeUndo-2.12.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
+        md5 = "2b8da09d1b98d5558f62e12f6e52c401";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        ZODB undo support for Zope2.
+        '';
+      homepage = "http://pypi.python.org/pypi/ZopeUndo";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "zope.tal-3.5.2" = self.buildPythonPackage {
     name = "zope.tal-3.5.2";
     src = fetchurl {
@@ -2263,31 +2395,33 @@ in
   };
 
 
-  "cssselect-0.9" = self.buildPythonPackage {
-    name = "cssselect-0.9";
+  "pyramid" = self."pyramid-1.5";
+
+  "pyramid-1.5" = self.buildPythonPackage {
+    name = "pyramid-1.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/cssselect/cssselect-0.9.tar.gz";
-        md5 = "3aba1e431787da957a9cd1e2c2e0bf1c";
+        url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.5.tar.gz";
+        md5 = "8747658dcbab709a9c491e43d3b0d58b";
     };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.3" self."WebTest-2.0.15" self."zope.component-4.2.1" self."zope.interface-4.1.1" ];
+    propagatedBuildInputs = [ self."PasteDeploy-1.5.2" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.4" self."zope.deprecation-4.1.1" self."zope.interface-4.1.1" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        cssselect parses CSS3 Selectors and translates them to XPath 1.0
+        The Pyramid Web Framework, a Pylons project
         '';
-      homepage = "http://packages.python.org/cssselect/";
-      license = "BSD";
+      homepage = "http://pylonsproject.org";
+      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
     };
   };
 
 
-  "plone.app.search-1.1.5" = self.buildPythonPackage {
-    name = "plone.app.search-1.1.5";
+  "plone.app.search-1.1.7" = self.buildPythonPackage {
+    name = "plone.app.search-1.1.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.5.zip";
-        md5 = "eeb42889464d35e9d8169e062bc9c827";
+        url = "https://pypi.python.org/packages/source/p/plone.app.search/plone.app.search-1.1.7.zip";
+        md5 = "fc3c8d3f64300f6a02770027d7d14136";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -2323,26 +2457,6 @@ in
   };
 
 
-  "Products.PloneTestCase-0.9.17" = self.buildPythonPackage {
-    name = "Products.PloneTestCase-0.9.17";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PloneTestCase/Products.PloneTestCase-0.9.17.zip";
-        md5 = "2a5bfb94220a520961d710abc92280f2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.ATContentTypes-2.1.13" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Integration testing framework for Plone.
-        '';
-      homepage = "http://plone.org/products/plonetestcase";
-      license = "GPL";
-    };
-  };
-
-
   "unittest2-0.5.1" = self.buildPythonPackage {
     name = "unittest2-0.5.1";
     src = fetchurl {
@@ -2363,6 +2477,46 @@ in
   };
 
 
+  "zope.schema-4.2.2" = self.buildPythonPackage {
+    name = "zope.schema-4.2.2";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
+        md5 = "e7e581af8193551831560a736a53cf58";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        zope.interface extension for defining data schemas
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "zope.schema-4.4.1" = self.buildPythonPackage {
+    name = "zope.schema-4.4.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.4.1.tar.gz";
+        md5 = "afb9281217b79840e1679abeb302467a";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.event-4.0.3" self."zope.interface-4.1.1" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        zope.interface extension for defining data schemas
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.schema";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "zExceptions-2.13.0" = self.buildPythonPackage {
     name = "zExceptions-2.13.0";
     src = fetchurl {
@@ -2391,7 +2545,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2423,21 +2577,21 @@ in
   };
 
 
-  "Products.ExternalEditor-1.1.0" = self.buildPythonPackage {
-    name = "Products.ExternalEditor-1.1.0";
+  "zope.browserpage-3.12.2" = self.buildPythonPackage {
+    name = "zope.browserpage-3.12.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ExternalEditor/Products.ExternalEditor-1.1.0.zip";
-        md5 = "475fea6e0b958c0c51cfdbfef2f4e623";
+        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
+        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Zope External Editor
+        ZCML directives for configuring browser views for Zope.
         '';
-      homepage = "http://pypi.python.org/pypi/Products.ExternalEditor";
+      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
       license = "ZPL 2.1";
     };
   };
@@ -2483,15 +2637,15 @@ in
   };
 
 
-  "plone.cachepurging-1.0.4" = self.buildPythonPackage {
-    name = "plone.cachepurging-1.0.4";
+  "plone.cachepurging-1.0.5" = self.buildPythonPackage {
+    name = "plone.cachepurging-1.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.4.zip";
-        md5 = "886814ac4deef0f1ed99a2eb60864264";
+        url = "https://pypi.python.org/packages/source/p/plone.cachepurging/plone.cachepurging-1.0.5.zip";
+        md5 = "ae893d47c424cb8a4cd688f6d9b46dc0";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self."plone.registry-1.0.1" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2503,22 +2657,24 @@ in
   };
 
 
-  "roman-1.4.0" = self.buildPythonPackage {
-    name = "roman-1.4.0";
+  "psycopg2" = self."psycopg2-2.5.3";
+
+  "psycopg2-2.5.3" = self.buildPythonPackage {
+    name = "psycopg2-2.5.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/r/roman/roman-1.4.0.tar.gz";
-        md5 = "4f8832ed4108174b159c2afb4bd1d1dd";
+        url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.3.tar.gz";
+        md5 = "09dcec70f623a9ef774f1aef75690995";
     };
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Integer to Roman numerals converter
+        Python-PostgreSQL Database Adapter
         '';
-      homepage = "http://pypi.python.org/pypi/roman";
-      license = "Python 2.1.1";
+      homepage = "http://initd.org/psycopg/";
+      license = "GPL with exceptions or ZPL";
     };
   };
 
@@ -2543,24 +2699,42 @@ in
   };
 
 
-  "psycopg2" = self."psycopg2-2.5.1";
-
-  "psycopg2-2.5.1" = self.buildPythonPackage {
-    name = "psycopg2-2.5.1";
+  "Acquisition-2.13.8" = self.buildPythonPackage {
+    name = "Acquisition-2.13.8";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/psycopg2/psycopg2-2.5.1.tar.gz";
-        md5 = "1b433f83d50d1bc61e09026e906d84c7";
+        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
+        md5 = "8c33160c157b50649e2b2b3224622579";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
+        '';
+      homepage = "http://pypi.python.org/pypi/Acquisition";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "Unidecode-0.04.1" = self.buildPythonPackage {
+    name = "Unidecode-0.04.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-0.04.1.tar.gz";
+        md5 = "c4c9ed8d40cff25c390ff5d5112b9308";
     };
     doCheck = false;
     buildInputs = [  ];
     propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Python-PostgreSQL Database Adapter
+        US-ASCII transliterations of Unicode text
         '';
-      homepage = "http://initd.org/psycopg/";
-      license = "GPL with exceptions or ZPL";
+      homepage = "http://code.zemanta.com/tsolc/unidecode/";
+      license = "UNKNOWN";
     };
   };
 
@@ -2605,6 +2779,46 @@ in
   };
 
 
+  "Products.ATContentTypes-2.1.14" = self.buildPythonPackage {
+    name = "Products.ATContentTypes-2.1.14";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.14.zip";
+        md5 = "7e777ed4034ffc23688f2a8072a6c109";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.20" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.6" self."plone.app.layout-2.3.11" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.7" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.3" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Default Content Types for Plone
+        '';
+      homepage = "http://plone.org/";
+      license = "GPL";
+    };
+  };
+
+
+  "coverage-3.7.1" = self.buildPythonPackage {
+    name = "coverage-3.7.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/c/coverage/coverage-3.7.1.tar.gz";
+        md5 = "c47b36ceb17eaff3ecfab3bcd347d0df";
+    };
+    doCheck = true;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Code coverage measurement for Python
+        '';
+      homepage = "http://nedbatchelder.com/code/coverage";
+      license = "BSD";
+    };
+  };
+
+
   "zope.i18n__zcml-3.7.4" = self.buildPythonPackage {
     name = "zope.i18n__zcml-3.7.4";
     src = fetchurl {
@@ -2625,46 +2839,6 @@ in
   };
 
 
-  "Products.ATContentTypes-2.1.13" = self.buildPythonPackage {
-    name = "Products.ATContentTypes-2.1.13";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ATContentTypes/Products.ATContentTypes-2.1.13.zip";
-        md5 = "093899fc74f5e2a83db464c96d0f5293";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."archetypes.referencebrowserwidget-2.4.19" self."DateTime-3.0.3" self."ExtensionClass-2.13.2" self."plone.app.folder-1.0.5" self."plone.app.layout-2.3.7" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."Products.Archetypes-1.9.4" self."Products.ATReferenceBrowserWidget-3.0" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."ZConfig-2.9.1" self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.tal-3.5.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Default Content Types for Plone
-        '';
-      homepage = "http://plone.org/";
-      license = "GPL";
-    };
-  };
-
-
-  "WSGIProxy2-0.3" = self.buildPythonPackage {
-    name = "WSGIProxy2-0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.3.zip";
-        md5 = "8b2cb207932eb8c341c3fa41f0cbe994";
-    };
-    doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."six-1.4.1" self."WebOb-1.2.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "https://github.com/gawel/WSGIProxy2/";
-      license = "MIT";
-    };
-  };
-
-
   "zope.browserresource-3.10.3" = self.buildPythonPackage {
     name = "zope.browserresource-3.10.3";
     src = fetchurl {
@@ -2707,26 +2881,6 @@ in
   };
 
 
-  "Products.ResourceRegistries-2.2.9" = self.buildPythonPackage {
-    name = "Products.ResourceRegistries-2.2.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.9.zip";
-        md5 = "8dd4f36eb894d868366b51941f6f0966";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Registry for managing CSS and JS
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries";
-      license = "GPL version 2";
-    };
-  };
-
-
   "five.formlib-1.0.4" = self.buildPythonPackage {
     name = "five.formlib-1.0.4";
     src = fetchurl {
@@ -2735,7 +2889,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self.setuptools self."transaction-1.1.1" self."zope.app.form-4.0.2" self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2747,6 +2901,28 @@ in
   };
 
 
+  "xlrd" = self."xlrd-0.9.3";
+
+  "xlrd-0.9.3" = self.buildPythonPackage {
+    name = "xlrd-0.9.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.3.tar.gz";
+        md5 = "6f3325132f246594988171bc72e1a385";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
+        '';
+      homepage = "http://www.python-excel.org/";
+      license = "BSD";
+    };
+  };
+
+
   "Products.statusmessages-4.0" = self.buildPythonPackage {
     name = "Products.statusmessages-4.0";
     src = fetchurl {
@@ -2767,48 +2943,6 @@ in
   };
 
 
-  "pyramid" = self."pyramid-1.4.5";
-
-  "pyramid-1.4.5" = self.buildPythonPackage {
-    name = "pyramid-1.4.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyramid/pyramid-1.4.5.tar.gz";
-        md5 = "321731aad69e9788b7819e257a50be1a";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.0" self."WebTest-2.0.9" self."zope.component-4.1.0" self."zope.interface-4.0.5" ];
-    propagatedBuildInputs = [ self."Chameleon-2.12" self."Mako-0.9.0" self."PasteDeploy-1.5.0" self."repoze.lru-0.6" self.setuptools self."translationstring-1.1" self."venusian-1.0a8" self."WebOb-1.2.3" self."zope.deprecation-4.0.2" self."zope.interface-4.0.5" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        The Pyramid web application development framework, a Pylons project
-        '';
-      homepage = "http://pylonsproject.org";
-      license = "BSD-derived (http://www.repoze.org/LICENSE.txt)";
-    };
-  };
-
-
-  "Products.contentmigration-2.1.5" = self.buildPythonPackage {
-    name = "Products.contentmigration-2.1.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.5.zip";
-        md5 = "f08e5f2572fc6f4c61b930a17f99418f";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A generic content migration framework for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
-      license = "LGPL";
-    };
-  };
-
-
   "Products.MimetypesRegistry-2.0.5" = self.buildPythonPackage {
     name = "Products.MimetypesRegistry-2.0.5";
     src = fetchurl {
@@ -2817,7 +2951,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."ZODB3-3.10.5" self."zope.contenttype-3.5.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2829,35 +2963,15 @@ in
   };
 
 
-  "python-dateutil-1.5" = self.buildPythonPackage {
-    name = "python-dateutil-1.5";
+  "plone.app.upgrade-1.3.6" = self.buildPythonPackage {
+    name = "plone.app.upgrade-1.3.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
-        md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Extensions to the standard python 2.3+ datetime module
-        '';
-      homepage = "http://labix.org/python-dateutil";
-      license = "PSF License";
-    };
-  };
-
-
-  "plone.app.upgrade-1.3.4" = self.buildPythonPackage {
-    name = "plone.app.upgrade-1.3.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.4.zip";
-        md5 = "10c192ee4a2422f901e020fd5b39879a";
+        url = "https://pypi.python.org/packages/source/p/plone.app.upgrade/plone.app.upgrade-1.3.6.zip";
+        md5 = "36703e1085f0d5d1d0f6e635e72fd5c1";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.5" self."plone.app.portlets-2.4.5" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.4" self."Products.CMFActionIcons-2.1.3" self."Products.CMFCalendar-2.2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.8" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.5" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.2" self."Products.ResourceRegistries-2.2.9" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.23" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."borg.localrole-3.0.2" self."five.localsitemanager-2.0.5" self."plone.app.folder-1.0.6" self."plone.app.portlets-2.4.8" self."plone.portlets-2.2" self."plone.session-3.5.3" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDiffTool-2.1" self."Products.CMFEditions-2.2.9" self."Products.CMFFormController-3.0.3" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.CMFUid-2.2.1" self."Products.contentmigration-2.1.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PloneLanguageTool-3.2.7" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self."Products.PortalTransforms-2.1.3" self."Products.ResourceRegistries-2.2.10" self."Products.SecureMailHost-1.1.2" self."Products.ZCatalog-2.13.27" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.location-3.9.1" self."zope.ramcache-1.0" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -2869,6 +2983,26 @@ in
   };
 
 
+  "Products.PloneLanguageTool-3.2.7" = self.buildPythonPackage {
+    name = "Products.PloneLanguageTool-3.2.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Products.PloneLanguageTool/Products.PloneLanguageTool-3.2.7.zip";
+        md5 = "bd9eb6278bf76e8cbce99437ca362164";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        PloneLanguageTool allows you to set the available languages in your Plone site, select various fallback mechanisms, and control the use of flags for language selection and translations.
+        '';
+      homepage = "http://pypi.python.org/pypi/Products.PloneLanguageTool";
+      license = "GPL";
+    };
+  };
+
+
   "plone.intelligenttext-2.0.2" = self.buildPythonPackage {
     name = "plone.intelligenttext-2.0.2";
     src = fetchurl {
@@ -2889,26 +3023,6 @@ in
   };
 
 
-  "plone.namedfile__scales-2.0.2" = self.buildPythonPackage {
-    name = "plone.namedfile__scales-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.namedfile/plone.namedfile-2.0.2.zip";
-        md5 = "f6168ab9e38f3a171dc35483527b3e01";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.rfc822-1.1" self.setuptools self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" self."plone.scale__storage-1.3.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        File types and fields for images, files and blob files with filenames
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.namedfile";
-      license = "BSD";
-    };
-  };
-
-
   "zope.contenttype-3.5.5" = self.buildPythonPackage {
     name = "zope.contenttype-3.5.5";
     src = fetchurl {
@@ -2929,15 +3043,15 @@ in
   };
 
 
-  "zope.proxy-4.1.3" = self.buildPythonPackage {
-    name = "zope.proxy-4.1.3";
+  "zope.proxy-4.1.4" = self.buildPythonPackage {
+    name = "zope.proxy-4.1.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.3.zip";
-        md5 = "8dbca0d33996511b9a9026da84a47109";
+        url = "https://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.4.tar.gz";
+        md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
     };
     doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
@@ -2989,26 +3103,6 @@ in
   };
 
 
-  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
-    name = "Products.MIMETools-2.13.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
-        md5 = "ad5372fc1190599a19493db0864448ec";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.annotation-3.5.0" = self.buildPythonPackage {
     name = "zope.annotation-3.5.0";
     src = fetchurl {
@@ -3037,7 +3131,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.2" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."five.customerize-1.1" self."plone.browserlayer-2.1.3" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3057,7 +3151,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.registry-1.0.1" self."plone.supermodel-1.2.3" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."lxml-2.3.6" self."plone.app.z3cform-0.7.6" self."plone.autoform-1.6" self."plone.registry-1.0.1" self."plone.supermodel-1.2.4" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.3" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3077,7 +3171,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self."plone.protect-2.0.2" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3109,26 +3203,6 @@ in
   };
 
 
-  "Products.ZCTextIndex-2.13.4" = self.buildPythonPackage {
-    name = "Products.ZCTextIndex-2.13.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCTextIndex/Products.ZCTextIndex-2.13.4.zip";
-        md5 = "8bbfa5fcd3609246990a9314d6f826b4";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."Persistence-2.13.2" self.setuptools self."transaction-1.1.1" self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Full text indexing for ZCatalog / Zope 2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.ZCTextIndex";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.filerepresentation-3.6.1" = self.buildPythonPackage {
     name = "zope.filerepresentation-3.6.1";
     src = fetchurl {
@@ -3209,26 +3283,6 @@ in
   };
 
 
-  "ZODB3-3.10.5" = self.buildPythonPackage {
-    name = "ZODB3-3.10.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
-        md5 = "6f180c6897a1820948fee2a6290503cd";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Zope Object Database: object database and persistence
-        '';
-      homepage = "UNKNOWN";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "five.customerize-1.1" = self.buildPythonPackage {
     name = "five.customerize-1.1";
     src = fetchurl {
@@ -3237,7 +3291,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.portlets-2.2" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.componentvocabulary-1.0.1" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3277,7 +3331,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.caching-1.0" self."python-dateutil-1.5" self.setuptools self."z3c.caching__zcml-2.0a1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.filerepresentation-3.6.1" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3289,31 +3343,11 @@ in
   };
 
 
-  "Products.DCWorkflow-2.2.4" = self.buildPythonPackage {
-    name = "Products.DCWorkflow-2.2.4";
+  "plone.app.locales-4.3.3" = self.buildPythonPackage {
+    name = "plone.app.locales-4.3.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.DCWorkflow/Products.DCWorkflow-2.2.4.tar.gz";
-        md5 = "c90a16c4f3611015592ba8173a5f1863";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        DCWorkflow product for the Zope Content Management Framework
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.DCWorkflow";
-      license = "ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)";
-    };
-  };
-
-
-  "plone.app.locales-4.3.2" = self.buildPythonPackage {
-    name = "plone.app.locales-4.3.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.2.zip";
-        md5 = "c06d6574c1e1df4e253b80751a468ad5";
+        url = "https://pypi.python.org/packages/source/p/plone.app.locales/plone.app.locales-4.3.3.zip";
+        md5 = "d774b4de1d16bed639c22c306ad0ada7";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -3329,15 +3363,15 @@ in
   };
 
 
-  "collective.z3cform.datetimewidget-1.2.5" = self.buildPythonPackage {
-    name = "collective.z3cform.datetimewidget-1.2.5";
+  "collective.z3cform.datetimewidget-1.2.6" = self.buildPythonPackage {
+    name = "collective.z3cform.datetimewidget-1.2.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.5.zip";
-        md5 = "38fa463ea9b0b3cf5f61540250968214";
+        url = "https://pypi.python.org/packages/source/c/collective.z3cform.datetimewidget/collective.z3cform.datetimewidget-1.2.6.zip";
+        md5 = "b8101e810c552a5afb8b57144ab6338a";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
+    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.1.1" self."zope.deprecation-3.4.1" self."zope.i18n__zcml-3.7.4" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3349,15 +3383,35 @@ in
   };
 
 
-  "Zope2-2.13.21" = self.buildPythonPackage {
-    name = "Zope2-2.13.21";
+  "plone.app.contentlisting-1.0.5" = self.buildPythonPackage {
+    name = "plone.app.contentlisting-1.0.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.21.zip";
-        md5 = "7d6e1661e365ee562fea9d3593f03f0e";
+        url = "https://pypi.python.org/packages/source/p/plone.app.contentlisting/plone.app.contentlisting-1.0.5.zip";
+        md5 = "9fc15b8ecad1c918778c3ea9a75bf533";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.23" self."Products.ZCTextIndex-2.13.4" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
+    propagatedBuildInputs = [ self."plone.uuid-1.0.3" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Listing of content for the Plone CMS
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.contentlisting";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Zope2-2.13.22" = self.buildPythonPackage {
+    name = "Zope2-2.13.22";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/Z/Zope2/Zope2-2.13.22.zip";
+        md5 = "4322d37b5ca63b2e4fe43cfc67960819";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."docutils-0.9.1" self."ExtensionClass-2.13.2" self."initgroups-2.13.0" self."Missing-2.13.1" self."MultiMapping-2.13.0" self."Persistence-2.13.2" self."Products.BTreeFolder2-2.13.3" self."Products.ExternalMethod-2.13.0" self."Products.MailHost-2.13.1" self."Products.MIMETools-2.13.0" self."Products.OFSP-2.13.2" self."Products.PythonScripts-2.13.2" self."Products.StandardCacheManagers-2.13.0" self."Products.ZCatalog-2.13.27" self."Products.ZCTextIndex-2.13.5" self."pytz-2013b" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."tempstorage-2.12.2" self."transaction-1.1.1" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zExceptions-2.13.0" self."zLOG-2.11.1" self."ZODB3-3.10.5" self."zope.browser-1.3" self."zope.browsermenu-3.9.1" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.container-3.11.2" self."zope.contentprovider-3.7.2" self."zope.contenttype-3.5.5" self."zope.deferredimport-3.5.3" self."zope.event-3.5.2" self."zope.exceptions-3.6.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.processlifetime-1.0" self."zope.proxy-3.6.1" self."zope.ptresource-3.9.0" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.sendmail-3.7.5" self."zope.sequencesort-3.4.0" self."zope.site-3.9.2" self."zope.size-3.4.1" self."zope.structuredtext-3.5.1" self."zope.tal-3.5.2" self."zope.tales-3.5.3" self."zope.testbrowser-3.11.1" self."zope.testing-3.9.7" self."zope.traversing-3.13.2" self."zope.viewlet-3.7.2" self."ZopeUndo-2.12.0" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
@@ -3369,6 +3423,26 @@ in
   };
 
 
+  "plone.app.textfield-1.2.3" = self.buildPythonPackage {
+    name = "plone.app.textfield-1.2.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.3.zip";
+        md5 = "1a018fa11ea21de5894f85b67161bcf1";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Text field with MIME type support
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
+      license = "GPL";
+    };
+  };
+
+
   "Products.ExternalMethod-2.13.0" = self.buildPythonPackage {
     name = "Products.ExternalMethod-2.13.0";
     src = fetchurl {
@@ -3389,35 +3463,15 @@ in
   };
 
 
-  "plone.app.workflow-2.1.6" = self.buildPythonPackage {
-    name = "plone.app.workflow-2.1.6";
+  "plone.browserlayer-2.1.3" = self.buildPythonPackage {
+    name = "plone.browserlayer-2.1.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.6.zip";
-        md5 = "68a76865382b9db82aaa60c16efb1d14";
+        url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.3.zip";
+        md5 = "41df50201e912fa10286c63687aaec3d";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        workflow and security settings for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.workflow";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "plone.browserlayer-2.1.2" = self.buildPythonPackage {
-    name = "plone.browserlayer-2.1.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.browserlayer/plone.browserlayer-2.1.2.zip";
-        md5 = "bce02f4907a4f29314090c525e5fc28e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3429,15 +3483,35 @@ in
   };
 
 
-  "plone.app.folder-1.0.5" = self.buildPythonPackage {
-    name = "plone.app.folder-1.0.5";
+  "plone.app.workflow-2.1.7" = self.buildPythonPackage {
+    name = "plone.app.workflow-2.1.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.5.zip";
-        md5 = "8ea860daddb4c93c0b7f2b5f7106fef0";
+        url = "https://pypi.python.org/packages/source/p/plone.app.workflow/plone.app.workflow-2.1.7.zip";
+        md5 = "269dc3dfdb8dae195ca6e1dff26a51da";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.folder-1.0.4" self.setuptools ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.DCWorkflow-2.2.4" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        workflow and security settings for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.workflow";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "plone.app.folder-1.0.6" = self.buildPythonPackage {
+    name = "plone.app.folder-1.0.6";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.folder/plone.app.folder-1.0.6.zip";
+        md5 = "78e76f9d20e0c0e6e8edef7cb7e5d8f1";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.folder-1.0.5" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3449,22 +3523,22 @@ in
   };
 
 
-  "Chameleon-2.12" = self.buildPythonPackage {
-    name = "Chameleon-2.12";
+  "zc.lockfile-1.0.2" = self.buildPythonPackage {
+    name = "zc.lockfile-1.0.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/C/Chameleon/Chameleon-2.12.tar.gz";
-        md5 = "c2947c7b615bf758fa4a710e759c658b";
+        url = "https://pypi.python.org/packages/source/z/zc.lockfile/zc.lockfile-1.0.2.tar.gz";
+        md5 = "f099d4cf2583a0c7bea0146a44dc4d59";
     };
     doCheck = false;
-    buildInputs = [ self."zope.event-4.0.2" ];
-    propagatedBuildInputs = [  ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        Fast HTML/XML Template Compiler.
+        Basic inter-process locks
         '';
-      homepage = "http://www.pagetemplates.org/";
-      license = "BSD-like (http://repoze.org/license.html)";
+      homepage = "http://www.python.org/pypi/zc.lockfile";
+      license = "ZPL 2.1";
     };
   };
 
@@ -3509,6 +3583,26 @@ in
   };
 
 
+  "plone.stringinterp-1.0.11" = self.buildPythonPackage {
+    name = "plone.stringinterp-1.0.11";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.stringinterp/plone.stringinterp-1.0.11.zip";
+        md5 = "e54dfa87b20a72f9b1465fcee1fd7ecd";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.i18n__zcml-3.7.4" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Adaptable string interpolation
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.stringinterp";
+      license = "GPL version 2";
+    };
+  };
+
+
   "tempstorage-2.12.2" = self.buildPythonPackage {
     name = "tempstorage-2.12.2";
     src = fetchurl {
@@ -3529,11 +3623,11 @@ in
   };
 
 
-  "plone.app.uuid-1.0" = self.buildPythonPackage {
-    name = "plone.app.uuid-1.0";
+  "plone.app.uuid-1.1" = self.buildPythonPackage {
+    name = "plone.app.uuid-1.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.0.zip";
-        md5 = "9ca8dcfb09a8a0d6bbee0f28073c3d3f";
+        url = "https://pypi.python.org/packages/source/p/plone.app.uuid/plone.app.uuid-1.1.zip";
+        md5 = "12ab2dee1a23d1c731b563686cf7b59f";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -3549,26 +3643,6 @@ in
   };
 
 
-  "Acquisition-2.13.8" = self.buildPythonPackage {
-    name = "Acquisition-2.13.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/A/Acquisition/Acquisition-2.13.8.zip";
-        md5 = "8c33160c157b50649e2b2b3224622579";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Acquisition is a mechanism that allows objects to obtain attributes from the containment hierarchy they're in.
-        '';
-      homepage = "http://pypi.python.org/pypi/Acquisition";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.datetime-3.4.1" = self.buildPythonPackage {
     name = "zope.datetime-3.4.1";
     src = fetchurl {
@@ -3609,35 +3683,15 @@ in
   };
 
 
-  "plone.app.dexterity-2.0.9" = self.buildPythonPackage {
-    name = "plone.app.dexterity-2.0.9";
+  "zope.location-4.0.3" = self.buildPythonPackage {
+    name = "zope.location-4.0.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.dexterity/plone.app.dexterity-2.0.9.zip";
-        md5 = "aa9d6ee719a6918f99f0aa0066ebf024";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."lxml-2.3.6" self."plone.app.content-2.1.3" self."plone.app.layout-2.3.7" self."plone.app.textfield-1.2.2" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.autoform-1.5" self."plone.behavior-1.0.2" self."plone.contentrules-2.0.3" self."plone.dexterity-2.1.3" self."plone.formwidget.namedfile-1.0.7" self."plone.namedfile__scales-2.0.2" self."plone.portlets-2.2" self."plone.rfc822-1.1" self."plone.schemaeditor-1.3.3" self."plone.supermodel-1.2.3" self."plone.z3cform-0.8.0" self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self.setuptools self."z3c.form-3.0.2" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Dexterity is a content type framework for CMF applications, with particular emphasis on Plone. It can be viewed as an alternative to Archetypes that is more light-weight and modular.
-        '';
-      homepage = "http://plone.org/products/dexterity";
-      license = "GPL";
-    };
-  };
-
-
-  "zope.location-4.0.2" = self.buildPythonPackage {
-    name = "zope.location-4.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.2.zip";
-        md5 = "44d865b2c0b1e1cc93898c7df938d353";
+        url = "https://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz";
+        md5 = "201416f4eb72a9cf61c7d6d37bb87f24";
     };
     doCheck = true;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.0.5" self."zope.proxy-4.1.3" self."zope.schema-4.3.2" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools self."zope.interface-4.1.1" self."zope.proxy-4.1.4" self."zope.schema-4.4.1" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
@@ -3649,6 +3703,26 @@ in
   };
 
 
+  "WSGIProxy2-0.4.1" = self.buildPythonPackage {
+    name = "WSGIProxy2-0.4.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/W/WSGIProxy2/WSGIProxy2-0.4.1.zip";
+        md5 = "fb8937620dc24270916678f6f07e337b";
+    };
+    doCheck = true;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."six-1.6.1" self."WebOb-1.4" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        UNKNOWN
+        '';
+      homepage = "https://github.com/gawel/WSGIProxy2/";
+      license = "MIT";
+    };
+  };
+
+
   "zope.app.locales-3.6.2" = self.buildPythonPackage {
     name = "zope.app.locales-3.6.2";
     src = fetchurl {
@@ -3677,7 +3751,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self.setuptools self."zope.globalrequest-1.0" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3689,46 +3763,6 @@ in
   };
 
 
-  "plone.indexer-1.0.2" = self.buildPythonPackage {
-    name = "plone.indexer-1.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.indexer/plone.indexer-1.0.2.zip";
-        md5 = "538aeee1f9db78bc8c85ae1bcb0153ed";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Hooks to facilitate managing custom index values in Zope 2/CMF applications
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.indexer";
-      license = "BSD";
-    };
-  };
-
-
-  "plone.app.layout-2.3.7" = self.buildPythonPackage {
-    name = "plone.app.layout-2.3.7";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.7.zip";
-        md5 = "c68be1efeef54124211a676d0dbaa655";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.portlets-2.4.5" self."plone.app.viewletmanager-2.0.4" self."plone.i18n-2.0.9" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.8" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Layout mechanisms for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.layout";
-      license = "GPL version 2";
-    };
-  };
-
-
   "zope.app.content-3.5.1" = self.buildPythonPackage {
     name = "zope.app.content-3.5.1";
     src = fetchurl {
@@ -3749,55 +3783,55 @@ in
   };
 
 
-  "mechanize-0.2.5" = self.buildPythonPackage {
-    name = "mechanize-0.2.5";
+  "plone.app.discussion-2.2.12" = self.buildPythonPackage {
+    name = "plone.app.discussion-2.2.12";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz";
-        md5 = "32657f139fc2fb75bcf193b63b8c60b2";
+        url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.12.zip";
+        md5 = "410d25455ff13100aa7ef2eca9f28ac4";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.11" self."plone.app.uuid-1.1" self."plone.app.z3cform-0.7.6" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Stateful programmatic web browsing.
+        Enhanced discussion support for Plone
         '';
-      homepage = "http://wwwsearch.sourceforge.net/mechanize/";
-      license = "BSD";
+      homepage = "http://pypi.python.org/pypi/plone.app.discussion";
+      license = "GPL";
     };
   };
 
 
-  "z3c.formwidget.query-0.9" = self.buildPythonPackage {
-    name = "z3c.formwidget.query-0.9";
+  "Products.MIMETools-2.13.0" = self.buildPythonPackage {
+    name = "Products.MIMETools-2.13.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.formwidget.query/z3c.formwidget.query-0.9.zip";
-        md5 = "d9f7960b1a5a81d8ba5241530f496522";
+        url = "https://pypi.python.org/packages/source/P/Products.MIMETools/Products.MIMETools-2.13.0.zip";
+        md5 = "ad5372fc1190599a19493db0864448ec";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [ self."DocumentTemplate-2.13.2" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        A source query widget for z3c.form.
+        MIMETools provides the &lt;!--#mime--&gt; tag for DocumentTemplate.
         '';
-      homepage = "http://pypi.python.org/pypi/z3c.formwidget.query";
+      homepage = "http://pypi.python.org/pypi/Products.MIMETools";
       license = "ZPL 2.1";
     };
   };
 
 
-  "plone.app.z3cform-0.7.4" = self.buildPythonPackage {
-    name = "plone.app.z3cform-0.7.4";
+  "plone.app.z3cform-0.7.6" = self.buildPythonPackage {
+    name = "plone.app.z3cform-0.7.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.4.zip";
-        md5 = "6350db39b32c3bf6edbb820b91b70b0f";
+        url = "https://pypi.python.org/packages/source/p/plone.app.z3cform/plone.app.z3cform-0.7.6.zip";
+        md5 = "292367803fafba716f04fa7a546e7064";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.5" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.formwidget.query-0.9" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."collective.z3cform.datetimewidget-1.2.6" self."plone.protect-2.0.2" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."z3c.formwidget.query-0.10" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -3809,82 +3843,22 @@ in
   };
 
 
-  "plone.app.querystring-1.0.8" = self.buildPythonPackage {
-    name = "plone.app.querystring-1.0.8";
+  "python-dateutil-1.5" = self.buildPythonPackage {
+    name = "python-dateutil-1.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.0.8.zip";
-        md5 = "3ad2155da0dd5c6b99643551ad494607";
+        url = "https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-1.5.tar.gz";
+        md5 = "0dcb1de5e5cad69490a3b6ab63f0cfa5";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.7" self."plone.app.vocabularies-2.1.11" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
+    buildInputs = [  ];
+    propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        UNKNOWN
+        Extensions to the standard python 2.3+ datetime module
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.querystring";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "zope.interface-4.0.5" = self.buildPythonPackage {
-    name = "zope.interface-4.0.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.0.5.zip";
-        md5 = "caf26025ae1b02da124a58340e423dfe";
-    };
-    doCheck = true;
-    buildInputs = [ self."zope.event-4.0.2" pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Interfaces for Python
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.interface";
-      license = "ZPL 2.1";
-    };
-  };
-
-
-  "Products.PasswordResetTool-2.0.15" = self.buildPythonPackage {
-    name = "Products.PasswordResetTool-2.0.15";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.PasswordResetTool/Products.PasswordResetTool-2.0.15.zip";
-        md5 = "74b46348d023052285124683bf122272";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Password reset tool for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/Products.PasswordResetTool";
-      license = "GPL";
-    };
-  };
-
-
-  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
-    name = "plone.portlet.static-2.0.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
-        md5 = "ec0dc691b4191a41ff97779b117f9985";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        A simple static HTML portlet for Plone.
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
-      license = "GPL version 2";
+      homepage = "http://labix.org/python-dateutil";
+      license = "PSF License";
     };
   };
 
@@ -3909,31 +3883,11 @@ in
   };
 
 
-  "Missing-2.13.1" = self.buildPythonPackage {
-    name = "Missing-2.13.1";
+  "Products.contentmigration-2.1.7" = self.buildPythonPackage {
+    name = "Products.contentmigration-2.1.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/M/Missing/Missing-2.13.1.zip";
-        md5 = "9823cff54444cbbcaef8fc45d8e42572";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."ExtensionClass-2.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Special Missing objects used in Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/Missing";
-      license = "ZPL 2.1";
-    };
-  };
-
-
-  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
-    name = "zope.cachedescriptors-3.5.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
-        md5 = "263459a95238fd61d17e815d97ca49ce";
+        url = "https://pypi.python.org/packages/source/P/Products.contentmigration/Products.contentmigration-2.1.7.zip";
+        md5 = "50cefdb73c88e15d331dff50086c109e";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -3941,10 +3895,10 @@ in
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Method and property caching decorators
+        A generic content migration framework for Plone.
         '';
-      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/Products.contentmigration";
+      license = "LGPL";
     };
   };
 
@@ -3969,21 +3923,21 @@ in
   };
 
 
-  "archetypes.referencebrowserwidget-2.4.19" = self.buildPythonPackage {
-    name = "archetypes.referencebrowserwidget-2.4.19";
+  "ZODB3-3.10.5" = self.buildPythonPackage {
+    name = "ZODB3-3.10.5";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.referencebrowserwidget/archetypes.referencebrowserwidget-2.4.19.zip";
-        md5 = "b70af6b2da6d8c57c1138a52e94e588c";
+        url = "https://pypi.python.org/packages/source/Z/ZODB3/ZODB3-3.10.5.tar.gz";
+        md5 = "6f180c6897a1820948fee2a6290503cd";
     };
     doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.jquerytools-1.5.6" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.interface-3.6.7" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self."transaction-1.1.1" self."zc.lockfile-1.0.2" self."ZConfig-2.9.1" self."zdaemon-2.0.7" self."zope.event-3.5.2" self."zope.interface-3.6.7" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        A referencebrowser implementation for Archetypes
+        Zope Object Database: object database and persistence
         '';
-      homepage = "http://pypi.python.org/pypi/archetypes.referencebrowserwidget";
+      homepage = "UNKNOWN";
       license = "ZPL 2.1";
     };
   };
@@ -4016,7 +3970,7 @@ in
         md5 = "a1a72166fd7cccf0f30e3305e09ce5cf";
     };
     doCheck = false;
-    buildInputs = [ self."nose-1.3.0" ];
+    buildInputs = [ self."nose-1.3.3" ];
     propagatedBuildInputs = [  ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
@@ -4029,51 +3983,11 @@ in
   };
 
 
-  "WebTest-2.0.9" = self.buildPythonPackage {
-    name = "WebTest-2.0.9";
+  "plone.contentrules-2.0.4" = self.buildPythonPackage {
+    name = "plone.contentrules-2.0.4";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.9.zip";
-        md5 = "bf0a04fcf8b2cdcaa13b04324cefb53d";
-    };
-    doCheck = true;
-    buildInputs = [ self."nose-1.3.0" self."unittest2-0.5.1" self."pyquery-1.2.6" self."WSGIProxy2-0.3" self."PasteDeploy-1.5.0" self."mock-1.0.1" self."coverage-3.7" pkgs.unzip ];
-    propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.4.1" self."waitress-0.8.7" self."WebOb-1.2.3" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Helper to test WSGI applications
-        '';
-      homepage = "http://webtest.pythonpaste.org/";
-      license = "MIT";
-    };
-  };
-
-
-  "plone.app.contentmenu-2.0.8" = self.buildPythonPackage {
-    name = "plone.app.contentmenu-2.0.8";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.contentmenu/plone.app.contentmenu-2.0.8.zip";
-        md5 = "8ba463f1a164c454c70d26507e5bd22a";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.content-2.1.3" self."plone.locking-2.0.4" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self.setuptools self."zope.browsermenu-3.9.1" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone's content menu implementation
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.contentmenu";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "plone.contentrules-2.0.3" = self.buildPythonPackage {
-    name = "plone.contentrules-2.0.3";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.3.zip";
-        md5 = "e743dca41b07b7ac1c2a65b652679201";
+        url = "https://pypi.python.org/packages/source/p/plone.contentrules/plone.contentrules-2.0.4.zip";
+        md5 = "21b189c2139ec7baea63a1e7ee187c55";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -4097,7 +4011,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.keyring-2.0.1" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4109,6 +4023,26 @@ in
   };
 
 
+  "zope.i18nmessageid-3.5.3" = self.buildPythonPackage {
+    name = "zope.i18nmessageid-3.5.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
+        md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+    };
+    doCheck = false;
+    buildInputs = [  ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Message Identifiers for internationalization
+        '';
+      homepage = "http://pypi.python.org/pypi/zope.i18nmessageid";
+      license = "ZPL 2.1";
+    };
+  };
+
+
   "transaction-1.1.1" = self.buildPythonPackage {
     name = "transaction-1.1.1";
     src = fetchurl {
@@ -4129,22 +4063,42 @@ in
   };
 
 
-  "plone.app.theming-1.1.1" = self.buildPythonPackage {
-    name = "plone.app.theming-1.1.1";
+  "zope.cachedescriptors-3.5.1" = self.buildPythonPackage {
+    name = "zope.cachedescriptors-3.5.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.theming/plone.app.theming-1.1.1.zip";
-        md5 = "a694b7a050b6e7c25d720d1e99bb73fa";
+        url = "https://pypi.python.org/packages/source/z/zope.cachedescriptors/zope.cachedescriptors-3.5.1.zip";
+        md5 = "263459a95238fd61d17e815d97ca49ce";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."diazo-1.0.4" self."docutils-0.9.1" self."five.globalrequest-1.0" self."lxml-2.3.6" self."plone.app.registry-1.2.3" self."plone.resource-1.0.2" self."plone.resourceeditor-1.0" self."plone.subrequest-1.6.7" self."plone.transformchain-1.0.3" self."Products.CMFPlone-4.3.2" self."repoze.xmliter-0.5" self."roman-1.4.0" self.setuptools self."zope.traversing-3.13.2" ];
+    propagatedBuildInputs = [ self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Integrates the Diazo theming engine with Plone
+        Method and property caching decorators
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.theming";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/zope.cachedescriptors";
+      license = "ZPL 2.1";
+    };
+  };
+
+
+  "plone.theme-2.1.1" = self.buildPythonPackage {
+    name = "plone.theme-2.1.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.theme/plone.theme-2.1.1.zip";
+        md5 = "28f06c6486059221648e38b5da1d304d";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.traversing-3.13.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Tools for managing themes in CMF and Plone sites
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.theme";
+      license = "GPL version 2";
     };
   };
 
@@ -4157,7 +4111,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.1" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.memoize-1.1.1" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.PlonePAS-4.1.3" self."Products.PluggableAuthService-1.10.0" self.setuptools self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.deferredimport-3.5.3" self."zope.interface-3.6.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4169,15 +4123,15 @@ in
   };
 
 
-  "Products.ZCatalog-2.13.23" = self.buildPythonPackage {
-    name = "Products.ZCatalog-2.13.23";
+  "Products.ZCatalog-2.13.27" = self.buildPythonPackage {
+    name = "Products.ZCatalog-2.13.27";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.23.zip";
-        md5 = "d425171516dfc70e543a4e2b852301cb";
+        url = "https://pypi.python.org/packages/source/P/Products.ZCatalog/Products.ZCatalog-2.13.27.zip";
+        md5 = "49cad3f1c408973cc9a1430acc9e1432";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.4" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."DateTime-3.0.3" self."DocumentTemplate-2.13.2" self."ExtensionClass-2.13.2" self."Missing-2.13.1" self."Persistence-2.13.2" self."Products.ZCTextIndex-2.13.5" self."Record-2.13.0" self."RestrictedPython-3.6.0" self.setuptools self."zExceptions-2.13.0" self."ZODB3-3.10.5" self."zope.dottedname-3.4.6" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.testing-3.9.7" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4189,35 +4143,15 @@ in
   };
 
 
-  "plone.app.discussion-2.2.8" = self.buildPythonPackage {
-    name = "plone.app.discussion-2.2.8";
+  "Products.TinyMCE-1.3.6" = self.buildPythonPackage {
+    name = "Products.TinyMCE-1.3.6";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.discussion/plone.app.discussion-2.2.8.zip";
-        md5 = "97cc5b204076f8803fcdaccbf0565bb6";
+        url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.6.zip";
+        md5 = "c9e7aa751768f88f3647c5881cc84603";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."collective.monkeypatcher-1.0.1" self."plone.app.layout-2.3.7" self."plone.app.uuid-1.0" self."plone.app.z3cform-0.7.4" self."plone.indexer-1.0.2" self."plone.registry-1.0.1" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."ZODB3-3.10.5" self."zope.annotation-3.5.0" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.site-3.9.2" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Enhanced discussion support for Plone
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.discussion";
-      license = "GPL";
-    };
-  };
-
-
-  "Products.TinyMCE-1.3.5" = self.buildPythonPackage {
-    name = "Products.TinyMCE-1.3.5";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.TinyMCE/Products.TinyMCE-1.3.5.zip";
-        md5 = "b972ff26c90d99c13ded0aeb33af2a2e";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.imaging-1.0.9" self."plone.app.layout-2.3.7" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.2" self."plone.outputfilters-1.11.1" self."Products.ResourceRegistries-2.2.9" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
+    propagatedBuildInputs = [ self."plone.app.imaging-1.0.10" self."plone.app.layout-2.3.11" self."plone.caching-1.0" self."plone.namedfile__scales-2.0.5" self."plone.outputfilters-1.12" self."Products.ResourceRegistries-2.2.10" self.setuptools self."zope.app.content-3.5.1" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4229,11 +4163,59 @@ in
   };
 
 
-  "plone.supermodel-1.2.3" = self.buildPythonPackage {
-    name = "plone.supermodel-1.2.3";
+  "plone.app.layout-2.3.11" = self.buildPythonPackage {
+    name = "plone.app.layout-2.3.11";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.3.zip";
-        md5 = "34610edccd7f93409b95a6b9ecd3da9e";
+        url = "https://pypi.python.org/packages/source/p/plone.app.layout/plone.app.layout-2.3.11.zip";
+        md5 = "641297ae21cba8fc6cbf03bbbb81c11f";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."plone.app.content-2.1.4" self."plone.app.portlets-2.4.8" self."plone.app.viewletmanager-2.0.5" self."plone.i18n-2.0.9" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.CMFEditions-2.2.9" self.setuptools self."zope.component__zcml-3.9.5" self."zope.deprecation-3.4.1" self."zope.dottedname-3.4.6" self."zope.i18n__zcml-3.7.4" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Layout mechanisms for Plone
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.layout";
+      license = "GPL version 2";
+    };
+  };
+
+
+  "Pillow-2.3.0" = self.buildPythonPackage {
+    name = "Pillow-2.3.0";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Pillow/Pillow-2.3.0.zip";
+        md5 = "56b6614499aacb7d6b5983c4914daea7";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.unzip ];
+    propagatedBuildInputs = [  ];
+    configurePhase = ''
+      sed -i "setup.py" \
+          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
+              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
+              s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
+              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;'
+    '';
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Python Imaging Library (Fork)
+        '';
+      homepage = "http://python-imaging.github.io/";
+      license = "Standard PIL License";
+    };
+  };
+
+
+  "plone.supermodel-1.2.4" = self.buildPythonPackage {
+    name = "plone.supermodel-1.2.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.supermodel/plone.supermodel-1.2.4.zip";
+        md5 = "f07134bc7ff1ab30735a61bc6f7d4c47";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -4249,6 +4231,26 @@ in
   };
 
 
+  "plone.app.caching-1.1.8" = self.buildPythonPackage {
+    name = "plone.app.caching-1.1.8";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.8.zip";
+        md5 = "f74d9f293ba3a89b9dd91589ab6672b5";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.6" self."plone.cachepurging-1.0.5" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.1.1" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Plone UI and default rules for plone.caching/z3c.caching
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.caching";
+      license = "GPL version 2";
+    };
+  };
+
+
   "zope.exceptions-3.6.2" = self.buildPythonPackage {
     name = "zope.exceptions-3.6.2";
     src = fetchurl {
@@ -4269,42 +4271,22 @@ in
   };
 
 
-  "plone.app.users-1.2a2" = self.buildPythonPackage {
-    name = "plone.app.users-1.2a2";
+  "plone.z3cform-0.8.0" = self.buildPythonPackage {
+    name = "plone.z3cform-0.8.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.users/plone.app.users-1.2a2.zip";
-        md5 = "a96e42e34d97162363cb3bbc8483d2ba";
+        url = "https://pypi.python.org/packages/source/p/plone.z3cform/plone.z3cform-0.8.0.zip";
+        md5 = "bdb23dd162544964d2f8f8f5f002e874";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.formlib-1.0.4" self."plone.app.controlpanel-2.3.7" self."plone.app.layout-2.3.7" self."plone.protect-2.0.2" self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.statusmessages-4.0" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.batching-1.0.1" self.setuptools self."z3c.form-3.1.1" self."zope.browserpage-3.12.2" self."zope.component__zcml-3.9.5" self."zope.i18n__zcml-3.7.4" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        A package for all things users and groups related (specific to plone)
+        plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.users";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "plone.app.caching-1.1.6" = self.buildPythonPackage {
-    name = "plone.app.caching-1.1.6";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.caching/plone.app.caching-1.1.6.zip";
-        md5 = "52f817d67e6da1508bf6f1486e5466d2";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.registry-1.2.3" self."plone.app.z3cform-0.7.4" self."plone.cachepurging-1.0.4" self."plone.caching-1.0" self."plone.memoize-1.1.1" self."plone.protect-2.0.2" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self."Products.CMFDynamicViewFTI-4.0.5" self."Products.GenericSetup-1.7.4" self."Products.statusmessages-4.0" self."python-dateutil-1.5" self.setuptools self."z3c.form-3.0.2" self."z3c.zcmlhook-1.0b1" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Plone UI and default rules for plone.caching/z3c.caching
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.app.caching";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/plone.z3cform";
+      license = "ZPL 2.1";
     };
   };
 
@@ -4349,75 +4331,75 @@ in
   };
 
 
-  "z3c.form-3.0.2" = self.buildPythonPackage {
-    name = "z3c.form-3.0.2";
+  "python-gettext-1.2" = self.buildPythonPackage {
+    name = "python-gettext-1.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.0.2.zip";
-        md5 = "8eab166766c6ae2e44e40f54136b3f79";
+        url = "https://pypi.python.org/packages/source/p/python-gettext/python-gettext-1.2.zip";
+        md5 = "cd4201d440126d1296d1d2bc2b4795f3";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
+    propagatedBuildInputs = [ self."unittest2-0.5.1" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        An advanced form and widget framework for Zope 3
+        Python Gettext po to mo file compiler.
         '';
-      homepage = "https://launchpad.net/z3c.form";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/python-gettext";
+      license = "BSD";
     };
   };
 
 
-  "Products.CMFPlacefulWorkflow-1.5.9" = self.buildPythonPackage {
-    name = "Products.CMFPlacefulWorkflow-1.5.9";
+  "plone.resourceeditor-1.0" = self.buildPythonPackage {
+    name = "plone.resourceeditor-1.0";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFPlacefulWorkflow/Products.CMFPlacefulWorkflow-1.5.9.zip";
-        md5 = "9041e1f52eab5b348c0dfa85be438722";
+        url = "https://pypi.python.org/packages/source/p/plone.resourceeditor/plone.resourceeditor-1.0.zip";
+        md5 = "443ff0a0ad83b94fc08cac46ee3b2ad4";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFPlone-4.3.2" self."Products.GenericSetup-1.7.4" self."Products.PloneTestCase-0.9.17" self.setuptools self."zope.component__zcml-3.9.5" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.testing-3.9.7" ];
+    propagatedBuildInputs = [ self."plone.resource-1.0.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Workflow policies for CMF and Plone
+        UNKNOWN
         '';
-      homepage = "http://pypi.python.org/pypi/Products.CMFPlacefulWorkflow";
+      homepage = "https://github.com/plone/plone.resourceeditor";
       license = "GPL";
     };
   };
 
 
-  "plone.app.textfield-1.2.2" = self.buildPythonPackage {
-    name = "plone.app.textfield-1.2.2";
+  "Products.ResourceRegistries-2.2.10" = self.buildPythonPackage {
+    name = "Products.ResourceRegistries-2.2.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.textfield/plone.app.textfield-1.2.2.zip";
-        md5 = "f832887a40826d6f68c48b48f071fb9c";
+        url = "https://pypi.python.org/packages/source/P/Products.ResourceRegistries/Products.ResourceRegistries-2.2.10.zip";
+        md5 = "207878a7c4b1583fe3cd609116e40bee";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.schema-4.2.2" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."DateTime-3.0.3" self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.interface-3.6.7" self."zope.viewlet-3.7.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Text field with MIME type support
+        Registry for managing CSS and JS
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.textfield";
-      license = "GPL";
+      homepage = "http://pypi.python.org/pypi/Products.ResourceRegistries";
+      license = "GPL version 2";
     };
   };
 
 
-  "pyquery-1.2.6" = self.buildPythonPackage {
-    name = "pyquery-1.2.6";
+  "pyquery-1.2.8" = self.buildPythonPackage {
+    name = "pyquery-1.2.8";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.6.zip";
-        md5 = "af51aa835f24eef06175c48dc1218029";
+        url = "https://pypi.python.org/packages/source/p/pyquery/pyquery-1.2.8.zip";
+        md5 = "a2a9c23a88f7b2615b41722a3ddebeb7";
     };
     doCheck = true;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."cssselect-0.9" self."lxml-3.2.3" ];
+    propagatedBuildInputs = [ self."cssselect-0.9.1" self."lxml-3.3.5" ];
     installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
@@ -4429,26 +4411,6 @@ in
   };
 
 
-  "zope.event-3.5.2" = self.buildPythonPackage {
-    name = "zope.event-3.5.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.event/zope.event-3.5.2.tar.gz";
-        md5 = "6e8af2a16157a74885d4f0d88137cefb";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Very basic event publishing system
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.event";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "initgroups-2.13.0" = self.buildPythonPackage {
     name = "initgroups-2.13.0";
     src = fetchurl {
@@ -4489,22 +4451,22 @@ in
   };
 
 
-  "plone.alterego-1.0" = self.buildPythonPackage {
-    name = "plone.alterego-1.0";
+  "plone.app.querystring-1.1.1" = self.buildPythonPackage {
+    name = "plone.app.querystring-1.1.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.alterego/plone.alterego-1.0.zip";
-        md5 = "b7b6dbcbba00505d98d5aba83e016408";
+        url = "https://pypi.python.org/packages/source/p/plone.app.querystring/plone.app.querystring-1.1.1.zip";
+        md5 = "845c1a4fc37f615022b536667281b80e";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    propagatedBuildInputs = [ self."DateTime-3.0.3" self."plone.app.contentlisting-1.0.5" self."plone.app.layout-2.3.11" self."plone.app.vocabularies-2.1.14" self."plone.batching-1.0.1" self."plone.registry-1.0.1" self."Products.CMFCore-2.2.7" self.setuptools self."zope.component__zcml-3.9.5" self."zope.dottedname-3.4.6" self."zope.globalrequest-1.0" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Low level support for dynamic modules
+        UNKNOWN
         '';
-      homepage = "http://code.google.com/p/dexterity";
-      license = "LGPL";
+      homepage = "http://pypi.python.org/pypi/plone.app.querystring";
+      license = "GPL version 2";
     };
   };
 
@@ -4569,6 +4531,26 @@ in
   };
 
 
+  "plone.batching-1.0.1" = self.buildPythonPackage {
+    name = "plone.batching-1.0.1";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.batching/plone.batching-1.0.1.zip";
+        md5 = "4b57b660082683ad66910b3c6725c141";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Batching facilities used in Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.batching";
+      license = "GPL";
+    };
+  };
+
+
   "plone.portlet.collection-2.1.5" = self.buildPythonPackage {
     name = "plone.portlet.collection-2.1.5";
     src = fetchurl {
@@ -4577,7 +4559,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.memoize-1.1.1" self."plone.portlets-2.2" self.setuptools ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4617,7 +4599,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."archetypes.querywidget-1.0.9" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.3" self."plone.app.portlets-2.4.5" self."plone.app.vocabularies-2.1.11" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.4" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."archetypes.querywidget-1.0.10" self."plone.app.contentlisting-1.0.5" self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.app.vocabularies-2.1.14" self."plone.portlet.collection-2.1.5" self."plone.portlets-2.2" self."Products.Archetypes-1.9.7" self."Products.CMFCore-2.2.7" self."Products.CMFQuickInstallerTool-3.0.6" self."Products.validation-2.0" self.setuptools self."transaction-1.1.1" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4629,15 +4611,15 @@ in
   };
 
 
-  "Products.CMFCalendar-2.2.2" = self.buildPythonPackage {
-    name = "Products.CMFCalendar-2.2.2";
+  "Products.CMFCalendar-2.2.3" = self.buildPythonPackage {
+    name = "Products.CMFCalendar-2.2.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.2.tar.gz";
-        md5 = "49458e68dc3b6826ea9a3576ac014419";
+        url = "https://pypi.python.org/packages/source/P/Products.CMFCalendar/Products.CMFCalendar-2.2.3.tar.gz";
+        md5 = "75659630aa12cfe86cc740db64ef294f";
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.3" self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" self."eggtestinfo-0.3" ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.CMFDefault-2.2.4" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.app.form-4.0.2" self."Zope2-2.13.22" self."eggtestinfo-0.3" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4649,6 +4631,28 @@ in
   };
 
 
+  "Plone" = self."Plone-4.3.3";
+
+  "Plone-4.3.3" = self.buildPythonPackage {
+    name = "Plone-4.3.3";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/P/Plone/Plone-4.3.3.zip";
+        md5 = "ce8ab3b3033e05b9544a8127dc67e09a";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."plone.app.caching-1.1.8" self."plone.app.dexterity-2.0.11" self."plone.app.iterate-2.1.12" self."plone.app.openid-2.0.2" self."plone.app.theming-1.1.1" self."Products.CMFPlacefulWorkflow-1.5.10" self."Products.CMFPlone-4.3.3" self.setuptools self."wicked-1.1.10" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        The Plone Content Management System
+        '';
+      homepage = "http://plone.org/";
+      license = "GPL version 2";
+    };
+  };
+
+
   "Products.PluggableAuthService-1.10.0" = self.buildPythonPackage {
     name = "Products.PluggableAuthService-1.10.0";
     src = fetchurl {
@@ -4657,7 +4661,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self."Products.PluginRegistry-1.3" self.setuptools self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4689,6 +4693,26 @@ in
   };
 
 
+  "plone.app.jquerytools-1.5.7" = self.buildPythonPackage {
+    name = "plone.app.jquerytools-1.5.7";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.jquerytools/plone.app.jquerytools-1.5.7.zip";
+        md5 = "f87fe3088f5258a8dae1490d7d989988";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self.setuptools self."zope.component__zcml-3.9.5" self."Zope2-2.13.22" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        jQuery Tools integration for Plone plus overlay and AJAX form helpers.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.jquerytools";
+      license = "GPL version 2";
+    };
+  };
+
+
   "Products.GenericSetup-1.7.4" = self.buildPythonPackage {
     name = "Products.GenericSetup-1.7.4";
     src = fetchurl {
@@ -4697,7 +4721,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."five.localsitemanager-2.0.5" self.setuptools self."zope.formlib-4.0.6" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4709,35 +4733,35 @@ in
   };
 
 
-  "plone.app.viewletmanager-2.0.4" = self.buildPythonPackage {
-    name = "plone.app.viewletmanager-2.0.4";
+  "ExtensionClass-2.13.2" = self.buildPythonPackage {
+    name = "ExtensionClass-2.13.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.viewletmanager/plone.app.viewletmanager-2.0.4.zip";
-        md5 = "565a12ac71d20b2823b9e44daebe432f";
+        url = "https://pypi.python.org/packages/source/E/ExtensionClass/ExtensionClass-2.13.2.zip";
+        md5 = "0236e6d7da9e8b87b9ba45f1b8f930b8";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."plone.app.vocabularies-2.1.11" self."Products.GenericSetup-1.7.4" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.contentprovider-3.7.2" self."zope.interface-3.6.7" self."zope.site-3.9.2" self."zope.viewlet-3.7.2" self."Zope2-2.13.21" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    propagatedBuildInputs = [  ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
     meta = {
       description = ''
-        configurable viewlet manager
+        Metaclass for subclassable extension types
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.viewletmanager";
-      license = "GPL version 2";
+      homepage = "http://pypi.python.org/pypi/ExtensionClass";
+      license = "ZPL 2.1";
     };
   };
 
 
-  "plone.schemaeditor-1.3.3" = self.buildPythonPackage {
-    name = "plone.schemaeditor-1.3.3";
+  "plone.schemaeditor-1.3.7" = self.buildPythonPackage {
+    name = "plone.schemaeditor-1.3.7";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.3.zip";
-        md5 = "25a04a0bf6cd6411669dd3850a1d04b8";
+        url = "https://pypi.python.org/packages/source/p/plone.schemaeditor/plone.schemaeditor-1.3.7.zip";
+        md5 = "94535ff5b8d8d871fbbd9806912c4c00";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.autoform-1.5" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.0.2" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."plone.autoform-1.6" self."plone.z3cform-0.8.0" self.setuptools self."z3c.form-3.1.1" self."zope.component__zcml-3.9.5" self."zope.container-3.11.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -4789,26 +4813,6 @@ in
   };
 
 
-  "ZopeUndo-2.12.0" = self.buildPythonPackage {
-    name = "ZopeUndo-2.12.0";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/Z/ZopeUndo/ZopeUndo-2.12.0.zip";
-        md5 = "2b8da09d1b98d5558f62e12f6e52c401";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZODB undo support for Zope2.
-        '';
-      homepage = "http://pypi.python.org/pypi/ZopeUndo";
-      license = "ZPL 2.1";
-    };
-  };
-
-
   "zope.traversing-3.13.2" = self.buildPythonPackage {
     name = "zope.traversing-3.13.2";
     src = fetchurl {
@@ -4849,11 +4853,11 @@ in
   };
 
 
-  "plonetheme.classic-1.3.2" = self.buildPythonPackage {
-    name = "plonetheme.classic-1.3.2";
+  "plonetheme.classic-1.3.3" = self.buildPythonPackage {
+    name = "plonetheme.classic-1.3.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.2.zip";
-        md5 = "c77d4c34afaf7c02df44d4df72328155";
+        url = "https://pypi.python.org/packages/source/p/plonetheme.classic/plonetheme.classic-1.3.3.zip";
+        md5 = "5bcf588a8998f4a1c5aecb99c3d9ecf4";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -4869,11 +4873,11 @@ in
   };
 
 
-  "plone.scale__storage-1.3.2" = self.buildPythonPackage {
-    name = "plone.scale__storage-1.3.2";
+  "plone.scale__storage-1.3.3" = self.buildPythonPackage {
+    name = "plone.scale__storage-1.3.3";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.2.zip";
-        md5 = "584ccbf515aff9fef363c2cc8abac789";
+        url = "https://pypi.python.org/packages/source/p/plone.scale/plone.scale-1.3.3.zip";
+        md5 = "f2d56ec944e5677a4998b3b9e21534e3";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
@@ -4889,41 +4893,21 @@ in
   };
 
 
-  "zope.browserpage-3.12.2" = self.buildPythonPackage {
-    name = "zope.browserpage-3.12.2";
+  "plone.portlet.static-2.0.2" = self.buildPythonPackage {
+    name = "plone.portlet.static-2.0.2";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.browserpage/zope.browserpage-3.12.2.tar.gz";
-        md5 = "a543ef3cb1b42f7233b3fca23dc9ea60";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.interface-3.6.7" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.traversing-3.13.2" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        ZCML directives for configuring browser views for Zope.
-        '';
-      homepage = "http://pypi.python.org/pypi/zope.browserpage/";
-      license = "ZPL 2.1";
-    };
-  };
-
-
-  "plone.app.imaging-1.0.9" = self.buildPythonPackage {
-    name = "plone.app.imaging-1.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.imaging/plone.app.imaging-1.0.9.zip";
-        md5 = "e680c5540021a70266343b935ac732a7";
+        url = "https://pypi.python.org/packages/source/p/plone.portlet.static/plone.portlet.static-2.0.2.zip";
+        md5 = "ec0dc691b4191a41ff97779b117f9985";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.scale__storage-1.3.2" self.setuptools ];
+    propagatedBuildInputs = [ self."plone.app.form-2.2.4" self."plone.app.portlets-2.4.8" self."plone.i18n-2.0.9" self."plone.portlets-2.2" self.setuptools self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        User-configurable, blob-aware image scaling for Plone.
+        A simple static HTML portlet for Plone.
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.imaging";
+      homepage = "http://pypi.python.org/pypi/plone.portlet.static";
       license = "GPL version 2";
     };
   };
@@ -4969,26 +4953,6 @@ in
   };
 
 
-  "archetypes.querywidget-1.0.9" = self.buildPythonPackage {
-    name = "archetypes.querywidget-1.0.9";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.9.zip";
-        md5 = "67e51c20990bb3eefbc9e8e953d7c9f5";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.6" self."plone.app.querystring-1.0.8" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        UNKNOWN
-        '';
-      homepage = "http://pypi.python.org/pypi/archetypes.querywidget";
-      license = "GPL version 2";
-    };
-  };
-
-
   "Products.PluginRegistry-1.3" = self.buildPythonPackage {
     name = "Products.PluginRegistry-1.3";
     src = fetchurl {
@@ -4997,7 +4961,7 @@ in
     };
     doCheck = false;
     buildInputs = [  ];
-    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Products.GenericSetup-1.7.4" self.setuptools self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -5129,35 +5093,15 @@ in
   };
 
 
-  "plone.subrequest-1.6.7" = self.buildPythonPackage {
-    name = "plone.subrequest-1.6.7";
+  "plone.app.vocabularies-2.1.14" = self.buildPythonPackage {
+    name = "plone.app.vocabularies-2.1.14";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.7.zip";
-        md5 = "cc12f68a22565415b10dbeef0020baa4";
+        url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.14.zip";
+        md5 = "c3ce7028fd0e3f70588167b8d3c002d5";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Subrequests for Zope2
-        '';
-      homepage = "http://pypi.python.org/pypi/plone.subrequest/";
-      license = "GPL version 2";
-    };
-  };
-
-
-  "plone.app.vocabularies-2.1.11" = self.buildPythonPackage {
-    name = "plone.app.vocabularies-2.1.11";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.vocabularies/plone.app.vocabularies-2.1.11.tar.gz";
-        md5 = "08c773a5093780aaa27709a890f1e21f";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self."Products.CMFCore-2.2.7" self.setuptools self."zope.browser-1.3" self."zope.component__zcml-3.9.5" self."zope.formlib-4.0.6" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.schema-4.2.2" self."zope.site-3.9.2" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -5169,22 +5113,22 @@ in
   };
 
 
-  "DocumentTemplate-2.13.2" = self.buildPythonPackage {
-    name = "DocumentTemplate-2.13.2";
+  "archetypes.querywidget-1.0.10" = self.buildPythonPackage {
+    name = "archetypes.querywidget-1.0.10";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/D/DocumentTemplate/DocumentTemplate-2.13.2.zip";
-        md5 = "07bb086c77c1dfe94125ad2efbba94b7";
+        url = "https://pypi.python.org/packages/source/a/archetypes.querywidget/archetypes.querywidget-1.0.10.zip";
+        md5 = "6b65a6ff701ebcb6e9550d27c7e2a855";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self."Acquisition-2.13.8" self."ExtensionClass-2.13.2" self."RestrictedPython-3.6.0" self."zExceptions-2.13.0" self."zope.sequencesort-3.4.0" self."zope.structuredtext-3.5.1" ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    propagatedBuildInputs = [ self."plone.app.jquerytools-1.5.7" self."plone.app.querystring-1.1.1" self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Document Templating Markup Language (DTML)
+        UNKNOWN
         '';
-      homepage = "http://pypi.python.org/pypi/DocumentTemplate";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/archetypes.querywidget";
+      license = "GPL version 2";
     };
   };
 
@@ -5217,7 +5161,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."AccessControl-3.0.8" self.setuptools self."transaction-1.1.1" self."ZODB3-3.10.5" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -5229,42 +5173,42 @@ in
   };
 
 
-  "zope.i18nmessageid-3.5.3" = self.buildPythonPackage {
-    name = "zope.i18nmessageid-3.5.3";
+  "plone.subrequest-1.6.8" = self.buildPythonPackage {
+    name = "plone.subrequest-1.6.8";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-3.5.3.tar.gz";
-        md5 = "cb84bf61c2b7353e3b7578057fbaa264";
+        url = "https://pypi.python.org/packages/source/p/plone.subrequest/plone.subrequest-1.6.8.zip";
+        md5 = "6ea93bc17d56612d41a497cdc5f2960b";
     };
     doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [ self.setuptools ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self."five.globalrequest-1.0" self.setuptools self."zope.globalrequest-1.0" ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Message Identifiers for internationalization
+        Subrequests for Zope2
         '';
-      homepage = "http://pypi.python.org/pypi/zope.i18nmessageid";
-      license = "ZPL 2.1";
+      homepage = "http://pypi.python.org/pypi/plone.subrequest/";
+      license = "GPL version 2";
     };
   };
 
 
-  "plone.app.linkintegrity-1.5.3" = self.buildPythonPackage {
-    name = "plone.app.linkintegrity-1.5.3";
+  "z3c.form-3.1.1" = self.buildPythonPackage {
+    name = "z3c.form-3.1.1";
     src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.3.zip";
-        md5 = "f2eed92f433fe73b4056d3ba48ba8eb0";
+        url = "https://pypi.python.org/packages/source/z/z3c.form/z3c.form-3.1.1.zip";
+        md5 = "0b54d848d6a1be9eab867255e10f5504";
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self.setuptools ];
+    propagatedBuildInputs = [ self.setuptools self."six-1.2.0" self."zope.browser-1.3" self."zope.browserpage-3.12.2" self."zope.browserresource-3.10.3" self."zope.component__zcml-3.9.5" self."zope.configuration-3.7.4" self."zope.contentprovider-3.7.2" self."zope.event-3.5.2" self."zope.i18n__zcml-3.7.4" self."zope.i18nmessageid-3.5.3" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.pagetemplate-3.6.3" self."zope.publisher-3.12.6" self."zope.schema-4.2.2" self."zope.security__untrustedpython-3.7.4" self."zope.site-3.9.2" self."zope.traversing-3.13.2" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
-        Manage link integrity in Plone.
+        An advanced form and widget framework for Zope 3
         '';
-      homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity";
-      license = "GPL version 2";
+      homepage = "https://launchpad.net/z3c.form";
+      license = "ZPL 2.1";
     };
   };
 
@@ -5289,6 +5233,46 @@ in
   };
 
 
+  "WebTest-2.0.15" = self.buildPythonPackage {
+    name = "WebTest-2.0.15";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/W/WebTest/WebTest-2.0.15.zip";
+        md5 = "49314bdba23f4d0bd807facb2a6d3f90";
+    };
+    doCheck = true;
+    buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ];
+    propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ];
+    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
+    meta = {
+      description = ''
+        Helper to test WSGI applications
+        '';
+      homepage = "http://webtest.pythonpaste.org/";
+      license = "MIT";
+    };
+  };
+
+
+  "plone.app.linkintegrity-1.5.4" = self.buildPythonPackage {
+    name = "plone.app.linkintegrity-1.5.4";
+    src = fetchurl {
+        url = "https://pypi.python.org/packages/source/p/plone.app.linkintegrity/plone.app.linkintegrity-1.5.4.zip";
+        md5 = "f82e73603ade6f588bc27f01c5aea404";
+    };
+    doCheck = false;
+    buildInputs = [ pkgs.unzip ];
+    propagatedBuildInputs = [ self.setuptools ];
+    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
+    meta = {
+      description = ''
+        Manage link integrity in Plone.
+        '';
+      homepage = "http://pypi.python.org/pypi/plone.app.linkintegrity";
+      license = "GPL version 2";
+    };
+  };
+
+
   "zope.app.form-4.0.2" = self.buildPythonPackage {
     name = "zope.app.form-4.0.2";
     src = fetchurl {
@@ -5317,7 +5301,7 @@ in
     };
     doCheck = false;
     buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.21" ];
+    propagatedBuildInputs = [ self."Acquisition-2.13.8" self.setuptools self."ZODB3-3.10.5" self."zope.component__zcml-3.9.5" self."zope.event-3.5.2" self."zope.interface-3.6.7" self."zope.lifecycleevent-3.6.2" self."zope.location-3.9.1" self."zope.site-3.9.2" self."zope.testing-3.9.7" self."Zope2-2.13.22" ];
     installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
     meta = {
       description = ''
@@ -5329,68 +5313,5 @@ in
   };
 
 
-  "plone.outputfilters-1.11.1" = self.buildPythonPackage {
-    name = "plone.outputfilters-1.11.1";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/p/plone.outputfilters/plone.outputfilters-1.11.1.zip";
-        md5 = "6b7506f09ad98621f8bb388c55183d6d";
-    };
-    doCheck = false;
-    buildInputs = [ pkgs.unzip ];
-    propagatedBuildInputs = [ self."Products.CMFCore-2.2.7" self."Products.GenericSetup-1.7.4" self."Products.MimetypesRegistry-2.0.5" self."Products.PortalTransforms-2.1.2" self.setuptools ];
-    installCommand = ''easy_install --always-unzip --no-deps --prefix="$out" .'';
-    meta = {
-      description = ''
-        Transformations applied to HTML in Plone text fields as they are rendered
-        '';
-      homepage = "http://github.com/plone/plone.outputfilters";
-      license = "GPL";
-    };
-  };
-
-
-  "xlrd" = self."xlrd-0.9.2";
-
-  "xlrd-0.9.2" = self.buildPythonPackage {
-    name = "xlrd-0.9.2";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-0.9.2.tar.gz";
-        md5 = "91a81ee76233e9f3115acaaa1b251b0e";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
-        '';
-      homepage = "http://www.python-excel.org/";
-      license = "BSD";
-    };
-  };
-
-
-  "suds" = self."suds-0.4";
-
-  "suds-0.4" = self.buildPythonPackage {
-    name = "suds-0.4";
-    src = fetchurl {
-        url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
-        md5 = "b7502de662341ed7275b673e6bd73191";
-    };
-    doCheck = false;
-    buildInputs = [  ];
-    propagatedBuildInputs = [  ];
-    installCommand = ''easy_install --always-unzip --prefix="$out" .'';
-    meta = {
-      description = ''
-        Lightweight SOAP client
-        '';
-      homepage = "https://fedorahosted.org/suds";
-      license = "UNKNOWN";
-    };
-  };
-
 }
 
diff --git a/pkgs/top-level/python-packages.json b/pkgs/top-level/python-packages.json
index b8ddcee3a47..74e092d309a 100644
--- a/pkgs/top-level/python-packages.json
+++ b/pkgs/top-level/python-packages.json
@@ -82,7 +82,7 @@
     }
   },
   { "name": "Plone",
-    "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
+    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
     "doCheck": false,
     "installCommand": "easy_install --always-unzip --no-deps --prefix=\"$out\" .",
     "override": {
@@ -124,11 +124,11 @@
     }
   },
   { "name": "plone.recipe.zope2instance",
-    "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
+    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
     "doCheck": false
   },
   { "name": "RelStorage",
-    "extends": "http://dist.plone.org/release/4.3.2/versions.cfg",
+    "extends": "http://dist.plone.org/release/4.3.3/versions.cfg",
     "doCheck": false
   },
   { "name": "psycopg2",

From 7b0736b7c01958036c8fc58f72f48a34306f64c6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 30 May 2014 15:19:12 -0500
Subject: [PATCH 1929/2033] arcanist: Fix php exec (needed for arc diff)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index add2f8621b0..58957a82752 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, php }:
+{ stdenv, fetchgit, php, makeWrapper }:
 
 let
   libphutil = fetchgit {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "20140530";
 
   src = [ arcanist libphutil ];
-  buildInputs = [ php ];
+  buildInputs = [ php makeWrapper ];
 
   unpackPhase = "true";
   buildPhase = "true";
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     cp -R ${arcanist}  $out/libexec/arcanist
 
     ln -s $out/libexec/arcanist/bin/arc $out/bin
+
+    wrapProgram $out/bin/arc \
+      --prefix PATH : "${php}/bin"
   '';
 
   meta = {

From 61befa04511551e3bdcb8150553e5c87bcd5abe3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 31 May 2014 09:47:10 +0200
Subject: [PATCH 1930/2033] git: Update to 1.9.4

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 283e9ac18ac..f95b5a493a6 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.9.3";
+  version = "1.9.4";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0pyhqwy9g875frf1qyfjj6rz64qhlyvr29n7pljzcy536x9qcczn";
+    sha256 = "1shxa49lsxn81qpfi60wh7rn5ci4zjgljvr0qczdmnqzd8w1zyvb";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ];

From 6f8f3d64ff8bdb50f3816a56f01102cbaba0209b Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 11:04:40 +0000
Subject: [PATCH 1931/2033] icu: fix configure to use ${stdenv.shell}

On darwin, not doing this means the configure script uses a hard-coded
/bin/sh for its echo tests, resulting in ECHO_N and ECHO_C settings in
icu-config which are incorrect for the stdenv.shell which it is actually
uses to run.
---
 pkgs/development/libraries/icu/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index b2f2f7a083f..12628e4c53d 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation {
     echo Source root reset to ''${sourceRoot}
   '';
 
+  preConfigure = ''
+    sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+  '';
+
   configureFlags = "--disable-debug";
 
   enableParallelBuilding = true;

From 9aac793c49f7001153711de5f2b0536f20890489 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 11:06:06 +0000
Subject: [PATCH 1932/2033] harfbuzz: no longer need to guard withGraphite2 on
 darwin

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 9cdd2a275bf..2e596b17af3 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
 , icu, graphite2
 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
-, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it
+, withGraphite2 ? true # it is small and major distros do include it
 }:
 
 # TODO: split non-icu and icu lib into different outputs?

From 6c8f4fd0ef26f2b999b01feec0cf90e88dc92f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 13:10:41 +0200
Subject: [PATCH 1933/2033] libftdi1: new package

This is the 1.x version of libftdi, as opposed to our existing libftdi
0.20 package.

(AVRDUDE is an (optional) dependee of libftdi1.)
---
 pkgs/development/libraries/libftdi/1.x.nix | 42 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/libftdi/1.x.nix

diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
new file mode 100644
index 00000000000..273bdb3136e
--- /dev/null
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, cmake, pkgconfig, libusb1, confuse
+, cppSupport ? true, boost ? null
+, pythonSupport ? true, python ? null, swig ? null
+, docSupport ? true, doxygen ? null
+}:
+
+assert cppSupport -> boost != null;
+assert pythonSupport -> python != null && swig != null;
+assert docSupport -> doxygen != null;
+
+stdenv.mkDerivation rec {
+  name = "libftdi1-1.1";
+  
+  src = fetchurl {
+    url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
+    sha256 = "088yh8pxd6q53ssqndydcw1dkq51cjqyahc03lm6iip22cdazcf0";
+  };
+
+  buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ]
+    ++ optionals cppSupport [ boost ]
+    ++ optionals pythonSupport [ python swig ]
+    ++ optionals docSupport [ doxygen ];
+
+  propagatedBuildInputs = [ libusb1 ];
+
+  postInstall = ''
+    mkdir -p "$out/etc/udev/rules.d/"
+    cp ../packages/99-libftdi.rules "$out/etc/udev/rules.d/"
+    cp -r doc/man "$out/share/"
+  '' + stdenv.lib.optionalString docSupport ''
+    mkdir -p "$out/share/libftdi/doc/"
+    cp -r doc/html "$out/share/libftdi/doc/"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library to talk to FTDI chips using libusb";
+    homepage = http://www.intra2net.com/en/developer/libftdi/;
+    license = with licenses; [ lgpl2 gpl2 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d02161501c3..d3f302f5d22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5085,6 +5085,8 @@ let
 
   libftdi = callPackage ../development/libraries/libftdi { };
 
+  libftdi1 = callPackage ../development/libraries/libftdi/1.x.nix { };
+
   libgcrypt = callPackage ../development/libraries/libgcrypt { };
 
   libgcrypt_1_6 = lowPrio (callPackage ../development/libraries/libgcrypt/1.6.nix { });

From be524e925b73865bc6d2a0c61ae641b6a634e7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 10:01:01 +0200
Subject: [PATCH 1934/2033] avrdude: rewrite expression

* Use stdenv.mkDerivation instead of composableDerivation.
  stdenv.mkDerivation is the current coding standard and is easier to
  read (IMHO).

* Remove the 'parportSupport' flag because it doesn't do anything.
  (Parallel port support is still enabled.)

* Remove unneeded --disable-dependency-tracking flag to ./configure; our
  default builder does that already.

* Fix documentation build. But it is still disabled (by default),
  because texLive is such a big dependency. There is always the man
  page.

* Update 'meta' attributes
---
 .../tools/misc/avrdude/default.nix            | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 89e848df03b..18f2f86ea4a 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,8 +1,11 @@
-{ composableDerivation, fetchurl, yacc, flex, texLive, libusb }:
+{ stdenv, fetchurl, yacc, flex, libusb
+# docSupport is a big dependency, disabled by default
+, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
+}:
 
-let edf = composableDerivation.edf; in
+assert docSupport -> texLive != null && texinfo != null && texi2html != null;
 
-composableDerivation.composableDerivation {} rec {
+stdenv.mkDerivation rec {
   name="avrdude-6.0.1";
 
   src = fetchurl {
@@ -10,22 +13,21 @@ composableDerivation.composableDerivation {} rec {
     sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066";
   };
 
-  configureFlags = [ "--disable-dependency-tracking" ];
+  configureFlags = stdenv.lib.optionalString docSupport "--enable-doc";
 
-  buildInputs = [ yacc flex libusb ];
+  buildInputs = [ yacc flex libusb ]
+    ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
 
-  flags =
-       edf { name = "doc"; enable = { buildInputs = texLive; configureFlags = ["--enable-doc"]; }; }
-    // edf { name = "parport"; };
-
-  cfg = {
-    docSupport = false; # untested
-    parportSupport = true;
-  };
-
-  meta = {
-    license = "GPL-2";
-    description = "AVR Downloader/UploaDEr";
-    homepage = http://savannah.nongnu.org/projects/avrdude;
+  meta = with stdenv.lib; {
+    description = "Command-line tool for programming Atmel AVR microcontrollers";
+    longDescription = ''
+      AVRDUDE (AVR Downloader/UploaDEr) is an utility to
+      download/upload/manipulate the ROM and EEPROM contents of AVR
+      microcontrollers using the in-system programming technique (ISP).
+    '';
+    homepage = http://www.nongnu.org/avrdude/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
   };
 }

From c7c32e1d094db7a65435b7e04794268fdd402074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 13:19:34 +0200
Subject: [PATCH 1935/2033] avrdude: add extra dependencies: libelf, libftdi1,
 readline

They are strictly speaking optional, but they provide useful features...
---
 pkgs/development/tools/misc/avrdude/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 18f2f86ea4a..03e77dfc3c4 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc, flex, libusb
+{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline
 # docSupport is a big dependency, disabled by default
 , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optionalString docSupport "--enable-doc";
 
-  buildInputs = [ yacc flex libusb ]
+  buildInputs = [ yacc flex libusb libelf libftdi1 readline ]
     ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
 
   meta = with stdenv.lib; {

From 3b3d1d075c90701a3cc918097d4f69a9012c1a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 13:28:47 +0200
Subject: [PATCH 1936/2033] avrdude: update 6.0.1 -> 6.1

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

diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix
index 03e77dfc3c4..2026e0ad2c8 100644
--- a/pkgs/development/tools/misc/avrdude/default.nix
+++ b/pkgs/development/tools/misc/avrdude/default.nix
@@ -6,11 +6,11 @@
 assert docSupport -> texLive != null && texinfo != null && texi2html != null;
 
 stdenv.mkDerivation rec {
-  name="avrdude-6.0.1";
+  name = "avrdude-6.1";
 
   src = fetchurl {
     url = "mirror://savannah/avrdude/${name}.tar.gz";
-    sha256 = "0hfy1qkc6a5vpqsp9ahi1fpf9x4s10wq4bpyblc26sx9vxl4d066";
+    sha256 = "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y";
   };
 
   configureFlags = stdenv.lib.optionalString docSupport "--enable-doc";

From 39bd9f8b1bbd9dc7fb2ce085a5fcb6bad16c8c45 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 12:32:29 +0000
Subject: [PATCH 1937/2033] texLive: handle graphite2 properly on darwin

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index f4ea5b7494f..df6461cb82c 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -22,7 +22,7 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${poppler}/lib"
+    export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib"
   '' + ''
     mkdir -p $out
     mkdir -p $out/nix-support
@@ -95,7 +95,7 @@ rec {
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3f302f5d22..228c673251d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10941,7 +10941,7 @@ let
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = !stdenv.isDarwin;
+      withIcu = true; withGraphite2 = true;
     };
   };
 

From 215ce6259681b8696d42d2ff3f6e870d0355d41b Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 30 May 2014 19:13:26 -0500
Subject: [PATCH 1938/2033] btrfsProgs: Update 3.14 -> 3.14.2 (close #2797)

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

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a41b2f28d85..66152f9589b 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }:
+{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.14"; in
+let version = "3.14.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1qjy4bc96nfzkdjp6hwb85aasqs87nkmgi8pl6qa6cpvml3627cq";
+    sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh";
   };
 
-  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo ];
+  buildInputs = [
+    attr acl zlib libuuid e2fsprogs lzo
+    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+  ];
 
   # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";

From b6910c6bf8bb1b0ac596eb4cc5b8094059091ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 14:38:56 +0200
Subject: [PATCH 1939/2033] libserialport: new package

libserialport is a cross-platform shared library for serial port access,
written in C.

It comes from the sigrok project, but has no dependency on sigrok code.

Homepage: http://sigrok.org/
---
 .../libraries/libserialport/default.nix       | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libserialport/default.nix

diff --git a/pkgs/development/libraries/libserialport/default.nix b/pkgs/development/libraries/libserialport/default.nix
new file mode 100644
index 00000000000..c40812beeac
--- /dev/null
+++ b/pkgs/development/libraries/libserialport/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, udev }:
+
+stdenv.mkDerivation rec {
+  name = "libserialport-0.1.0";
+
+  src = fetchurl {
+    url = "http://sigrok.org/download/source/libserialport/${name}.tar.gz";
+    sha256 = "1bqrldwrcsv6jbq3pmqczq27gdkrzpaxwplanqs25f6q9gb5p47c";
+  };
+
+  buildInputs = [ pkgconfig udev ];
+
+  meta = with stdenv.lib; {
+    description = "Cross-platform shared library for serial port access";
+    homepage = http://sigrok.org/;
+    license = licenses.gpl3Plus;
+    # Mac OS X, Windows and Android is also supported (according to upstream).
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 228c673251d..d57a28bd37a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5044,6 +5044,8 @@ let
 
   libsecret = callPackage ../development/libraries/libsecret { };
 
+  libserialport = callPackage ../development/libraries/libserialport { };
+
   libgtop = callPackage ../development/libraries/libgtop {};
 
   liblo = callPackage ../development/libraries/liblo { };

From c10628c665154028f4c4f33a0b008c4495b9deea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 May 2014 22:55:32 +0200
Subject: [PATCH 1940/2033] librevisa: new package

It's an implementation of the VISA standard (for instrument control).

http://www.librevisa.org/
---
 .../libraries/librevisa/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/librevisa/default.nix

diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix
new file mode 100644
index 00000000000..756a53d5ee5
--- /dev/null
+++ b/pkgs/development/libraries/librevisa/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
+
+# TODO: add VXI development files, for VXI-11 (TCPIP) support
+
+stdenv.mkDerivation rec {
+  name = "librevisa-0.0.20130412";
+
+  src = fetchurl {
+    url = "http://www.librevisa.org/download/${name}.tar.gz";
+    sha256 = "0bjzq23s3xzw0l9qx4l8achrx5id8xdd6r52lvdl4a28dxzbcfhq";
+  };
+
+  buildInputs = [ pkgconfig libusb1 ];
+
+  meta = with stdenv.lib; {
+    description = "Implementation of the VISA standard (for instrument control)";
+    longDescription = ''
+      LibreVISA aims to be a compliant implementation of the VISA standard in a
+      free software library.
+
+      We currently support targets connected via USB, exposing the USBTMC
+      interface, and VXI-11 devices.
+    '';
+    homepage = http://www.librevisa.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d57a28bd37a..e1c5feb6c90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5148,6 +5148,8 @@ let
 
   libresample = callPackage ../development/libraries/libresample {};
 
+  librevisa = callPackage ../development/libraries/librevisa { };
+
   libsamplerate = callPackage ../development/libraries/libsamplerate {
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple

From 7329ad6813f1fd35c2e97dbab8b109623f4e5726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 May 2014 22:15:37 +0200
Subject: [PATCH 1941/2033] libsigrok: new package

libsigrok is the core library of the sigrok signal analysis software
suite, which I'm about to package.

http://sigrok.org/
---
 pkgs/development/tools/libsigrok/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/libsigrok/default.nix

diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix
new file mode 100644
index 00000000000..c8905dcbafd
--- /dev/null
+++ b/pkgs/development/tools/libsigrok/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi, check
+, libserialport, librevisa
+}:
+
+stdenv.mkDerivation rec {
+  name = "libsigrok-0.3.0";
+
+  src = fetchurl {
+    url = "http://sigrok.org/download/source/libsigrok/${name}.tar.gz";
+    sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
+  };
+
+  buildInputs = [ pkgconfig libzip glib libusb1 libftdi check libserialport
+    librevisa
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Core library of the sigrok signal analysis software suite";
+    homepage = http://sigrok.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1c5feb6c90..edea20fddfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3814,6 +3814,8 @@ let
   libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; };
   libcxxabi = callPackage ../development/libraries/libc++abi { stdenv = pkgs.clangStdenv; };
 
+  libsigrok = callPackage ../development/tools/libsigrok { };
+
   dejagnu = callPackage ../development/tools/misc/dejagnu { };
 
   dfeet = callPackage ../development/tools/misc/d-feet {

From 647173db26e78dd4b37c675c1c76eea10a64c874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 May 2014 22:28:44 +0200
Subject: [PATCH 1942/2033] libsigrokdecode: new package

libsigrokdecode is a protocol decoding library for the sigrok signal
analysis software suite.

http://sigrok.org/
---
 .../tools/libsigrokdecode/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/libsigrokdecode/default.nix

diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix
new file mode 100644
index 00000000000..87ecd637b4e
--- /dev/null
+++ b/pkgs/development/tools/libsigrokdecode/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
+
+stdenv.mkDerivation rec {
+  name = "libsigrokdecode-0.3.0";
+
+  src = fetchurl {
+    url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz";
+    sha256 = "13s7ss52dqj7fccjgrkx10zkj41ygxn8ml1l0bs1vgczz4fvnkpf";
+  };
+
+  buildInputs = [ pkgconfig glib python3 libsigrok check ];
+
+  meta = with stdenv.lib; {
+    description = "Protocol decoding library for the sigrok signal analysis software suite";
+    homepage = http://sigrok.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edea20fddfc..64bb7471de9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3816,6 +3816,8 @@ let
 
   libsigrok = callPackage ../development/tools/libsigrok { };
 
+  libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
+
   dejagnu = callPackage ../development/tools/misc/dejagnu { };
 
   dfeet = callPackage ../development/tools/misc/d-feet {

From 8a4dc83793fa7b100176937f6ee820197a9bd41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 May 2014 22:30:34 +0200
Subject: [PATCH 1943/2033] sigrok-cli: new package

This is the command-line frontend for the sigrok signal analysis
software suite.

http://sigrok.org/
---
 pkgs/development/tools/sigrok-cli/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/tools/sigrok-cli/default.nix

diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix
new file mode 100644
index 00000000000..b2e6dea09e6
--- /dev/null
+++ b/pkgs/development/tools/sigrok-cli/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
+
+stdenv.mkDerivation rec {
+  name = "sigrok-cli-0.5.0";
+
+  src = fetchurl {
+    url = "http://sigrok.org/download/source/sigrok-cli/${name}.tar.gz";
+    sha256 = "0g3jzspq9iwz2szzxil9ilim1and85qd605f4jbc04sva80hb8vk";
+  };
+
+  buildInputs = [ pkgconfig glib libsigrok libsigrokdecode ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line frontend for the sigrok signal analysis software suite";
+    homepage = http://sigrok.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64bb7471de9..a823ddca2ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4041,6 +4041,8 @@ let
 
   simpleBuildTool = callPackage ../development/tools/build-managers/simple-build-tool { };
 
+  sigrok-cli = callPackage ../development/tools/sigrok-cli { };
+
   slimerjs = callPackage ../development/tools/slimerjs {};
 
   sloccount = callPackage ../development/tools/misc/sloccount { };

From 61b79d2eee72ad6113070f0a49f67c22d183a8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 15:37:27 +0200
Subject: [PATCH 1944/2033] pulseview: new package

PulseView is a Qt-based LA/scope/MSO GUI for sigrok (a signal analysis
software suite).

http://sigrok.org/
---
 .../science/electronics/pulseview/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/pulseview/default.nix

diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix
new file mode 100644
index 00000000000..07724d93254
--- /dev/null
+++ b/pkgs/applications/science/electronics/pulseview/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, cmake, glib, qt4, boost, libsigrok
+, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi
+}:
+
+stdenv.mkDerivation rec {
+  name = "pulseview-0.2.0";
+
+  src = fetchurl {
+    url = "http://sigrok.org/download/source/pulseview/${name}.tar.gz";
+    sha256 = "1pf1dgwd9j586nqmni6gqf3qxrsmawcmi9wzqfzqkjci18xd7dgy";
+  };
+
+  buildInputs = [ pkgconfig cmake glib qt4 boost libsigrok
+    libsigrokdecode libserialport libzip udev libusb1 libftdi
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)";
+    homepage = http://sigrok.org/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a823ddca2ec..25437db8584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9220,6 +9220,8 @@ let
 
   pstree = callPackage ../applications/misc/pstree { };
 
+  pulseview = callPackage ../applications/science/electronics/pulseview { };
+
   puredata = callPackage ../applications/audio/puredata { };
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };

From 0717378c46f53dd6dedcf133483bdffd9186cfbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 18:06:20 +0200
Subject: [PATCH 1945/2033] avr-gcc: set meta.platforms = linux

So that hydra will build it and add it to the binary channel.
---
 pkgs/development/misc/avr-gcc-with-avr-libc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
index 5218f5b7744..1f54d132dcc 100644
--- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
+++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
@@ -78,10 +78,11 @@ stdenv.mkDerivation {
     '';
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
       description = "AVR developement environment including binutils, avr-gcc and avr-libc";
       # I've tried compiling the packages separately.. too much hassle. This just works. Fine.
       license =  ["GPL" "LGPL"]; # see single packages ..
       homepage = []; # dito
+      platforms = platforms.linux;
   };
 }

From 91d40ef2eaf99e51a3d6e01cfa865d87cf57a368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 31 May 2014 16:23:02 +0200
Subject: [PATCH 1946/2033] avrdudess: new package

AVRDUDESS is a GUI for AVRDUDE. In other words, it is a GUI for
programming AVR microcontrollers.
---
 pkgs/applications/misc/avrdudess/default.nix | 42 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/misc/avrdudess/default.nix

diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
new file mode 100644
index 00000000000..64bca952ff5
--- /dev/null
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }:
+
+stdenv.mkDerivation rec {
+  name = "avrdudess-2.2.20140102";
+
+  src = fetchurl {
+    url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip";
+    sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6";
+  };
+
+  buildInputs = [ unzip ];
+
+  phases = [ "buildPhase" ];
+
+  buildPhase = ''
+    mkdir -p "$out/avrdudess"
+    mkdir -p "$out/bin"
+
+    unzip "$src" -d "$out/avrdudess"
+
+    cat >> "$out/bin/avrdudess" << __EOF__
+    #!${stdenv.shell}
+    export LD_LIBRARY_PATH="${gtk}/lib:${mono}/lib"
+    # We need PATH from user env for xdg-open to find its tools, which
+    # typically depend on the currently running desktop environment.
+    export PATH="${avrgcclibc}/bin:${avrdude}/bin:${xdg_utils}/bin:\$PATH"
+
+    # avrdudess must have its resource files in its current working directory
+    cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
+    __EOF__
+
+    chmod a+x "$out/bin/"*
+  '';
+
+  meta = with stdenv.lib; {
+    description = "GUI for AVRDUDE (AVR microcontroller programmer)";
+    homepage = https://github.com/zkemble/AVRDUDESS;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25437db8584..a98045e8f8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7947,6 +7947,8 @@ let
     eigen = eigen2;
   };
 
+  avrdudess = callPackage ../applications/misc/avrdudess { };
+
   avxsynth = callPackage ../applications/video/avxsynth { };
 
   awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {

From 2f0ecbd220cc724fbd853af39df59b19548bc53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 31 May 2014 20:24:34 +0200
Subject: [PATCH 1947/2033] Adding moinmoin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 672033cfa71..6f60f76553b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4115,6 +4115,23 @@ rec {
     };
   });
 
+  moinmoin = let ver="1.9.7"; in buildPythonPackage (rec {
+    name = "moinmoin-${ver}";
+
+    src = fetchurl {
+      url = "http://static.moinmo.in/files/moin-${ver}.tar.gz";
+      sha256 = "f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5";
+    };
+
+    meta = {
+      description = "Advanced, easy to use and extensible WikiEngine";
+
+      homepage = http://moinmo.in/;
+
+      license = "GPLv2+";
+    };
+  });
+
 
   mox = buildPythonPackage rec {
     name = "mox-0.5.3";

From 0369769bd9843c7ddaab1f9ba77732337abfaee2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 19:37:49 +0000
Subject: [PATCH 1948/2033] gcc-4.8: build Objective-C/C++ support on darwin

---
 pkgs/development/compilers/gcc/4.8/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 01f7ea6e3e6..902cba392f8 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -352,6 +354,8 @@ stdenv.mkDerivation ({
         ++ optional langAda      "ada"
         ++ optional langVhdl     "vhdl"
         ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
         ++ optionals crossDarwin [ "objc" "obj-c++" ]
         )
       )
@@ -490,7 +494,7 @@ stdenv.mkDerivation ({
     else null;
 
   passthru =
-    { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; };
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo enableMultilib version; };
 
   inherit enableParallelBuilding;
 

From 2e2f42f21509b72e337b456c4986b8ea08a11e18 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 19:38:05 +0000
Subject: [PATCH 1949/2033] texlive: build bibtex-x and xetex on darwin

We also no longer need to specify that harfbuzz and icu not be used, and
DYLD_LIBRARY_PATH is properly configured to find graphite2.
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index df6461cb82c..f91af9fcad4 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -119,18 +119,11 @@ rec {
     "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" 
     "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ]
     ++ stdenv.lib.optionals stdenv.isDarwin [
-      # Complains about a missing ICU directory
-      "--disable-bibtex-x"
-
       # TODO: We should be able to fix these tests
       "--disable-devnag"
       "--disable-dvisvgm"
       "--disable-xdv2pdf"
       "--disable-xdvipdfmx"
-      "--disable-xetex"
-
-      "--with-system-harfbuzz=no"
-      "--with-system-icu=no"
     ];
 
   phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];

From 0392293f2e7d1ae14c2c72f4f23fcf0921e62c0a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 20:18:46 +0000
Subject: [PATCH 1950/2033] emacs24: no longer need to use clangStdenv on
 darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a98045e8f8e..425e4026683 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8200,12 +8200,6 @@ let
     librsvg = null;
     alsaLib = null;
     imagemagick = null;
-
-    # use clangStdenv on darwin to deal with: unexec: 'my_edata is not in
-    # section __data'
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
   };
 
   emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {

From c0e26205f31e384835d0d57cad6dad5da88865c5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 20:19:02 +0000
Subject: [PATCH 1951/2033] vim: no longer need to use clangStdenv on darwin

---
 pkgs/top-level/all-packages.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 425e4026683..1987d8ff112 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9570,12 +9570,7 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim {
-    # for Objective-C compilation
-    stdenv = if stdenv.isDarwin
-      then clangStdenv
-      else stdenv;
-  };
+  vim = callPackage ../applications/editors/vim { };
 
   vimWrapper = wrapVim vim;
 

From 643d2af2cdde564dfa2908ecaeb7c66fc402ea5e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 20:37:35 +0000
Subject: [PATCH 1952/2033] emacs24: clangStdenv is in fact needed on darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1987d8ff112..594b1addbac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8200,6 +8200,11 @@ let
     librsvg = null;
     alsaLib = null;
     imagemagick = null;
+
+    # resolve unrecognized section __static_data in __DATA segment
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
   };
 
   emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {

From 32c3bcaa802b10f624891c62b590541e81675c0a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 20:38:18 +0000
Subject: [PATCH 1953/2033] emacs24Macport: new expression

This is "Mac port" addition to GNU Emacs 24. This provides a native GUI
support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later already
contain the official GUI support via the NS (Cocoa) port for Mac OS X
10.4 and later. So if it is good enough for you, then you don't need to
try this.
---
 .../applications/editors/emacs-24/macport.nix | 101 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   7 ++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-24/macport.nix

diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix
new file mode 100644
index 00000000000..4c599916d94
--- /dev/null
+++ b/pkgs/applications/editors/emacs-24/macport.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
+}:
+
+stdenv.mkDerivation rec {
+  emacsName = "emacs-24.3";
+  name = "${emacsName}-mac-4.8";
+
+  #builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
+    sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
+  };
+
+  macportSrc = fetchurl {
+    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
+    sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
+  };
+
+  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
+
+  postUnpack = ''
+    mv $emacsName $name
+    tar xzf $macportSrc
+    mv $name $emacsName
+  '';
+
+  preConfigure = ''
+    patch -p0 < patch-mac
+
+    # The search for 'tputs' will fail because it's in ncursesw within the
+    # ncurses package, yet Emacs' configure script only looks in ncurses.
+    # Further, we need to make sure that the -L option occurs before mention
+    # of the library, so that it finds it within the Nix store.
+    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
+    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
+    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
+    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
+
+    configureFlagsArray=(
+      LDFLAGS=-L${ncurses}/lib
+      --with-xml2=yes
+      --with-gnutls=yes
+      --with-mac
+      --enable-mac-app=$out/Applications
+    )
+    makeFlagsArray=(
+      CFLAGS=-O3
+      LDFLAGS="-O3 -L${ncurses}/lib"
+    );
+  '';
+
+  postInstall = ''
+    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+    ;; nixos specific load-path
+    (when (getenv "NIX_PROFILES")
+      (setq load-path
+            (append (reverse
+                     (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                             (split-string (getenv "NIX_PROFILES"))))
+                    load-path)))
+
+    ;; make tramp work for NixOS machines
+    (eval-after-load 'tramp
+      '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
+    EOF
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "GNU Emacs 24, the extensible, customizable text editor";
+    homepage    = http://www.gnu.org/software/emacs/;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jwiegley ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      programming language with extensions to support text editing.
+
+      The features of GNU Emacs include: content-sensitive editing modes,
+      including syntax coloring, for a wide variety of file types including
+      plain text, source code, and HTML; complete built-in documentation,
+      including a tutorial for new users; full Unicode support for nearly all
+      human languages and their scripts; highly customizable, using Emacs
+      Lisp code or a graphical interface; a large number of extensions that
+      add other functionality, including a project planner, mail and news
+      reader, debugger interface, calendar, and more.  Many of these
+      extensions are distributed with GNU Emacs; others are available
+      separately.
+
+      This is "Mac port" addition to GNU Emacs 24. This provides a native
+      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
+      already contain the official GUI support via the NS (Cocoa) port for
+      Mac OS X 10.4 and later. So if it is good enough for you, then you
+      don't need to try this.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 594b1addbac..d25e33bd81f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8211,6 +8211,13 @@ let
     withX = false;
   }));
 
+  emacs24Macport = callPackage ../applications/editors/emacs-24/macport.nix {
+    # resolve unrecognised flag '-fconstant-cfstrings' errors
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
+
   emacsPackages = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 

From 421e8539ecbc0050d3b72e4cb3f91ef12d48a49c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 31 May 2014 21:59:55 +0000
Subject: [PATCH 1954/2033] shelly: build version 0.15.4.1 for GHC 7.4.2

---
 .../libraries/haskell/shelly/0.15.4.1.nix     | 21 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  6 +++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/haskell/shelly/0.15.4.1.nix

diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix
new file mode 100644
index 00000000000..d3ef289042d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix
@@ -0,0 +1,21 @@
+{ cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text
+, time, unixCompat
+}:
+
+cabal.mkDerivation (self: {
+  pname = "shelly";
+  version = "0.15.4.1";
+  sha256 = "12m11s22izz0ny1syb1ykp2hi9n240myf0nhapvn8jx1fgf5iyck";
+  buildDepends = [
+    mtl systemFileio systemFilepath text time unixCompat
+  ];
+  testDepends = [
+    hspec HUnit mtl systemFileio systemFilepath text time unixCompat
+  ];
+  meta = {
+    homepage = "https://github.com/yesodweb/Shelly.hs";
+    description = "shell-like (systems) programming in Haskell";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 614a989bb74..6f8072a382c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1914,7 +1914,11 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   setlocale = callPackage ../development/libraries/haskell/setlocale {};
 
-  shelly = callPackage ../development/libraries/haskell/shelly {};
+  shelly_0_15_4_1 = callPackage ../development/libraries/haskell/shelly/0.15.4.1.nix {};
+  shelly_1_5_3_1 = callPackage ../development/libraries/haskell/shelly {};
+  shelly = if (pkgs.stdenv.lib.versionOlder ghc.version "7.6")
+    then self.shelly_0_15_4_1
+    else self.shelly_1_5_3_1;
 
   simpleReflect = callPackage ../development/libraries/haskell/simple-reflect {};
 

From 2481a71c3c745b4070b89dc37832dc45e9be1382 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 1 Jun 2014 05:15:20 +0000
Subject: [PATCH 1955/2033] Disable use of graphite2 on darwin until #2800 is
 fixed

This applies to harfbuzz, pango and texlive.
---
 pkgs/development/libraries/harfbuzz/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 2e596b17af3..9cdd2a275bf 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
 , icu, graphite2
 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
-, withGraphite2 ? true # it is small and major distros do include it
+, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it
 }:
 
 # TODO: split non-icu and icu lib into different outputs?
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d25e33bd81f..8059acd2234 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10956,7 +10956,7 @@ let
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = true;
+      withIcu = true; withGraphite2 = !stdenv.isDarwin;
     };
   };
 

From e719f64a053d03362957c8ef8087f25a58eb17d4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 1 Jun 2014 05:51:16 +0000
Subject: [PATCH 1956/2033] graphite2: fix #2800 by setting INSTALL_NAME_DIR

---
 pkgs/development/libraries/harfbuzz/default.nix     |  2 +-
 .../development/libraries/silgraphite/graphite2.nix |  2 ++
 pkgs/development/libraries/silgraphite/macosx.patch | 13 +++++++++++++
 pkgs/tools/typesetting/tex/texlive/default.nix      |  4 ++--
 pkgs/top-level/all-packages.nix                     |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/silgraphite/macosx.patch

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 9cdd2a275bf..2e596b17af3 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
 , icu, graphite2
 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
-, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it
+, withGraphite2 ? true # it is small and major distros do include it
 }:
 
 # TODO: split non-icu and icu lib into different outputs?
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index f874804c001..83f64d1eb00 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig freetype cmake ];
 
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
+
   meta = {
     description = "An advanced font engine";
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/development/libraries/silgraphite/macosx.patch b/pkgs/development/libraries/silgraphite/macosx.patch
new file mode 100644
index 00000000000..7929c1967c8
--- /dev/null
+++ b/pkgs/development/libraries/silgraphite/macosx.patch
@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -102,7 +102,8 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+                                             VERSION ${GRAPHITE_VERSION}
+                                             LT_VERSION_CURRENT ${GRAPHITE_API_CURRENT}
+                                             LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
+-                                            LT_VERSION_AGE ${GRAPHITE_API_AGE})
++                                            LT_VERSION_AGE ${GRAPHITE_API_AGE}
++                                            INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ if (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN")
+     set(GRAPHITE_LINK_FLAGS "-fsanitize=address")
+
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index f91af9fcad4..bd3a4362be9 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -22,7 +22,7 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib"
+    export DYLD_LIBRARY_PATH="${poppler}/lib"
   '' + ''
     mkdir -p $out
     mkdir -p $out/nix-support
@@ -95,7 +95,7 @@ rec {
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8059acd2234..d25e33bd81f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10956,7 +10956,7 @@ let
       libXmu libXext xextproto libSM libICE;
     ghostscript = ghostscriptX;
     harfbuzz = harfbuzz.override {
-      withIcu = true; withGraphite2 = !stdenv.isDarwin;
+      withIcu = true; withGraphite2 = true;
     };
   };
 

From 8e72c1ef71aa0e91e7cc4271cd61103aaea67c82 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:36:45 +0100
Subject: [PATCH 1957/2033] vifm: update to 0.7.7

---
 pkgs/applications/misc/vifm/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 4af565d717a..5abf57ae1fc 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -2,17 +2,16 @@
 
 let
   name = "vifm-${version}";
-  version = "0.7.6";
+  version = "0.7.7";
 
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
-    sha256 ="03v50hmgfvrci5fz31zmklmp6ix7qpqnhvm6639wbk3g5mcrh5w6";
+    url = "mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
+    sha256 = "1lflmkd5q7qqi9d44py0y41pcx5bsadkihn3gc0x5cka04f2gh0d";
   };
 
-  #phaseNames = ["doConfigure" "doMakeInstall"];
   buildInputs = [ utillinux ncurses file libX11 ];
 
   meta = {

From 693219f1b771b6b470b1a4a0ce367c562688af6c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:37:08 +0100
Subject: [PATCH 1958/2033] weechatDevel: update to latest (few nice bugfixes)

---
 pkgs/applications/networking/irc/weechat/devel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix
index f8558ef052e..0ad05089c62 100644
--- a/pkgs/applications/networking/irc/weechat/devel.nix
+++ b/pkgs/applications/networking/irc/weechat/devel.nix
@@ -3,14 +3,14 @@
 , pythonPackages, cacert, cmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  rev = "02eed97d977567b0fb16cfeeaeebb863eab1e509";
+  rev = "70d2b0ad8eb7854932d24c007a05b8627f751205";
   version = "1.0-rev${rev}";
   name = "weechat-${version}";
 
   src = fetchgit {
     inherit rev;
     url = "git://github.com/weechat/weechat.git";
-    sha256 = "0nk0p9chvn0h2pzq9793k2dz8h5iplz0zwqzyds55fbmsgzz51g2";
+    sha256 = "1k7kcrq46anq87r14sq3vrhij8acn6id7zxyhn0qnjj2wqgrjp5i";
   };
 
   buildInputs = 

From 9c3d455c0b0b299c3cd3bd2c5c9ce55c3f7646db Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:37:48 +0100
Subject: [PATCH 1959/2033] jsmeter: update to 2.11

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

diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix
index ddb7b63fc6f..2d5e6b66bf0 100644
--- a/pkgs/applications/networking/jmeter/default.nix
+++ b/pkgs/applications/networking/jmeter/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, ant }:
 
 stdenv.mkDerivation rec {
-  name = "jmeter-2.10";
+  name = "jmeter-2.11";
   src = fetchurl {
     url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz";
-    sha256 = "1ygm0h02sllh4mfl5imj46v80wnbs1x7n88gfjm523ixmgsa0fvy";
+    sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944";
   };
 
   installPhase = ''

From db8ba584020998488bf9806a0fa62614b22fbfc0 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:39:55 +0100
Subject: [PATCH 1960/2033] tig: update to 2.0.2

---
 .../version-management/git-and-tools/tig/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index fd9011130e3..6f2fe890cfa 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 }:
 
 stdenv.mkDerivation rec {
-  name = "tig-1.2.1";
+  name = "tig-2.0.2";
 
   src = fetchurl {
     url = "http://jonas.nitro.dk/tig/releases/${name}.tar.gz";
-    sha256 = "0i19lc6dd3vdpkdd8q07xii2c4mcpiwmg55av81jyhx0y82x425p";
+    sha256 = "0gi7iqiij37b0d3izxymxaw5ns2mv1y7qfic0fhl7xj4s2rz075r";
   };
 
   buildInputs = [ ncurses asciidoc xmlto docbook_xsl ];

From df2232ac24fafcba9d343a46da7c98ef1dce832c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:40:14 +0100
Subject: [PATCH 1961/2033] aircrack-ng: update to 1.2-beta3

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

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 1cc91f25660..475d6775cde 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}:
+{ stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2-beta1";
+  name = "aircrack-ng-1.2-beta3";
 
   src = fetchurl {
     url = "http://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "19cfib7sqp2rdm3lc84jrzsa6r8443gkm1ifbmhygsqn6fnkj8zi";
+    sha256 = "13g9xz9djjgfc2xi88vnx7zhgy751hqb3739y7znyihd6q9sw8id";
   };
 
-  buildInputs = [libpcap openssl zlib];
+  buildInputs = [ libpcap openssl zlib libnl pkgconfig ];
 
   patchPhase = ''
     sed -e 's@^prefix.*@prefix = '$out@ -i common.mak

From 33e9c4e35fad536c2ce75ab2e0d991132a9222bc Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:40:37 +0100
Subject: [PATCH 1962/2033] haproxt: update 1.4.25

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

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 42760da5d4a..5a634ffec66 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,12 +1,12 @@
 { stdenv, pkgs, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.24";
+  version = "1.4.25";
   name = "haproxy-${version}";
 
   src = fetchurl {
     url = "http://haproxy.1wt.eu/download/1.4/src/${name}.tar.gz";
-    sha256 = "1vy7jz7l8qdd6ah3y65zarz9x9pf3bs02icxnrckpgh1s3s2h2b8";
+    sha256 = "0qnvj6kbnrrc69nsp2dn5iv2z79adzkcgqssnk30iwvvwg0qwh44";
   };
 
   buildInputs = [ ];

From d3213de455b9794c84adc970e44736af899ec67c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:40:57 +0100
Subject: [PATCH 1963/2033] offlineimap: update to 6.5.6

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

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 02e1f742201..2a100fd2873 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,13 +1,13 @@
 { pkgs, fetchurl, buildPythonPackage, sqlite3 }:
 
 buildPythonPackage rec {
-  version = "6.5.5";
+  version = "6.5.6";
   name = "offlineimap-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz";
-    sha256 = "00k84qagph3xnxss6rkxm61x07ngz8fvffx4z9jyw5baf3cdd32p";
+    sha256 = "1hr8yxb6r8lmdzzly4hafa1l1z9pfx14rsgc8qiy2zxfpg6ijcn2";
   };
 
   doCheck = false;

From 8b9a7c36d122666910125c6bb8b0770412733470 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 14:42:07 +0100
Subject: [PATCH 1964/2033] pythonPackages: updated bunch of packages

- afew -> rev9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47
- alot -> revfa4ddf000dc2ac4933852b210901b649634a5f86
- httplib2 -> 0.9
- jedi-0.8.0 -> final0
- pep8 -> 1.5.7
- pyflakes -> 0.8.1
- subprocess32 -> 3.2.6
- turses -> 0.2.22
- tweepy -> 2.3.0
- urwid -> 1.2.1
---
 pkgs/top-level/python-packages.nix | 58 ++++++++++++------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f60f76553b..b2c3aa320e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -205,13 +205,13 @@ rec {
 
 
   afew = buildPythonPackage rec {
-    rev = "d5d0ddeae0c5758a3f6cf5de77913804d88e906a";
+    rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47";
     name = "afew-1.0_${rev}";
 
     src = fetchurl {
       url = "https://github.com/teythoon/afew/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "0al7hz994sh0yrpixqafr25acglvniq4zsbs9aj89zr7yzq1g1j0";
+      sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf";
     };
 
     buildInputs = [ pkgs.dbacl ];
@@ -313,13 +313,13 @@ rec {
 
 
   alot = buildPythonPackage rec {
-    rev = "fa10bfc2de105da819c8e11e913a44c3c1ac60a4";
+    rev = "fa4ddf000dc2ac4933852b210901b649634a5f86";
     name = "alot-0.3.5_${rev}";
 
     src = fetchurl {
       url = "https://github.com/pazz/alot/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "0zd4jiwxqb7m672xkr5jcqkfpk9jx1kmkllyvjjvswkgjjqdrhax";
+      sha256 = "0h11lqyxg0xbkc9y1xqjvd0kmfm5pdwnmv9chmlsi1614dxn08n0";
     };
 
     # error: invalid command 'test'
@@ -3497,11 +3497,11 @@ rec {
   });
 
   httplib2 = buildPythonPackage rec {
-    name = "httplib2-0.8";
+    name = "httplib2-0.9";
 
     src = fetchurl {
-      url = "http://httplib2.googlecode.com/files/${name}.tar.gz";
-      sha256 = "0gww8axb4j1vysbk9kfsk5vrws9a403gh30dxchmga8hrg1rns5g";
+      url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz";
+      sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir";
     };
 
     meta = {
@@ -3603,11 +3603,11 @@ rec {
   };
 
   jedi = buildPythonPackage (rec {
-    name = "jedi-0.7.0";
+    name = "jedi-0.8.0-final0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz";
-      sha256 = "1afs06k1j6raasdps1fvdqywyk3if1qchdpl4mivnliqzxqd1w01";
+      sha256 = "0jnhwh0b1hy5cssi3n5a4j7z9pgpcckyv5s52ba4jnq5bwgdpbcf";
     };
 
     meta = {
@@ -4920,27 +4920,13 @@ rec {
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    version = "1.4.6";
+    version = "1.5.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      md5 = "a03bb494859e87b42601b61b1b043a0c";
+      md5 = "f6adbdd69365ecca20513c709f9b7c93";
     };
 
-    #======================================================================
-    #FAIL: test_check_simple (testsuite.test_shell.ShellTestCase)
-    #----------------------------------------------------------------------
-    #Traceback (most recent call last):
-    #  File "/tmp/nix-build-python-pep8-1.4.5.drv-0/pep8-1.4.5/testsuite/test_shell.py", line 84, in test_check_simple
-    #    self.assertTrue(config_filename.endswith('tox.ini'))
-    #AssertionError: False is not true
-    #
-    #----------------------------------------------------------------------
-    #Ran 21 tests in 0.711s
-    #
-    #FAILED (failures=1)
-    doCheck = false;
-
     meta = {
       homepage = "http://pep8.readthedocs.org/";
       description = "Python style guide checker";
@@ -5479,11 +5465,11 @@ rec {
   };
 
   pyflakes = buildPythonPackage rec {
-    name = "pyflakes-0.7.3";
+    name = "pyflakes-0.8.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyflakes/${name}.tar.gz";
-      md5 = "ec94ac11cb110e6e72cca23c104b66b1";
+      md5 = "905fe91ad14b912807e8fdc2ac2e2c23";
     };
 
     buildInputs = [ unittest2 ];
@@ -7097,11 +7083,11 @@ rec {
   };
 
   subprocess32 = buildPythonPackage rec {
-    name = "subprocess32-3.2.5rc1";
+    name = "subprocess32-3.2.6";
 
     src = fetchurl {
       url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz";
-      md5 = "f5f46106368be6336b54af95d048fea9";
+      md5 = "754c5ab9f533e764f931136974b618f1";
     };
 
     doCheck = false;
@@ -7578,11 +7564,11 @@ rec {
 
 
   turses = buildPythonPackage (rec {
-    name = "turses-0.2.19";
+    name = "turses-0.2.22";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
-      sha256 = "1g58ahxpaf0wqn6gg5a2n3fkvc3vbx6jpylwqncxnl16qcczmjxn";
+      sha256 = "1dqgvdqly4c4d6819mbkqy4g8r7zch4dkmxicfwck7q8h96wmyx3";
     };
 
     propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
@@ -7601,11 +7587,11 @@ rec {
   });
 
   tweepy = buildPythonPackage (rec {
-    name = "tweepy-2.1";
+    name = "tweepy-2.3.0";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
-      sha256 = "1irzwfva7g1k7db708mlxy2qribd6938zwn5xzjzn6i43j5mjysm";
+      sha256 = "0wcj5g21brcqr1g7m4by4rs72lfiib4scg19qynn2wz1x77jyrzp";
     };
 
     meta = {
@@ -7700,14 +7686,14 @@ rec {
 
 
   urwid = buildPythonPackage (rec {
-    name = "urwid-1.1.1";
+    name = "urwid-1.2.1";
 
     # multiple:  NameError: name 'evl' is not defined
     doCheck = false;
 
     src = fetchurl {
-      url = "http://excess.org/urwid/${name}.tar.gz";
-      md5 = "eca2e0413cf7216b01c84b99e0f2576d";
+      url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz";
+      md5 = "6a05ada11b87e7b026b01fc5150855b0";
     };
 
     meta = {

From eb8a3315109e16e193f7ca07fcd6d05d507a1b06 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sun, 1 Jun 2014 15:01:22 +0100
Subject: [PATCH 1965/2033] couchdb: update to 1.5.1

---
 pkgs/servers/http/couchdb/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 808a86946b0..36d932c1ace 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -3,16 +3,15 @@
 
 stdenv.mkDerivation rec {
   name = "couchdb-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
-  url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz";
-  sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb";
+    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    sha256 = "0isddp29zh72idgwjaswqy887c1fwx5g1lwlbzscwcv6q70xrmfr";
   };
 
-  buildInputs = [
- erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig
- ];
+  buildInputs = [ erlang icu openssl spidermonkey curl help2man sphinx which
+    file pkgconfig ];
 
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb

From 87e9b49443c28fbe62e3b273369a330b7aa193e5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 1 Jun 2014 17:07:46 +0200
Subject: [PATCH 1966/2033] mpd: Support for PulseAudio

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 792aa49f447..9a70a91d73f 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -18,7 +18,9 @@
 , samplerateSupport ? true, libsamplerate
 , mmsSupport ? true, libmms
 , mpg123Support ? true, mpg123
-, aacSupport ? true, faad2 }:
+, aacSupport ? true, faad2
+, pulseaudioSupport ? true, pulseaudio
+}:
 
 let
 
@@ -56,7 +58,8 @@ in stdenv.mkDerivation rec {
     ++ opt mmsSupport libmms
     ++ opt mpg123Support mpg123
     ++ opt aacSupport faad2
-    ++ opt zipSupport zziplib;
+    ++ opt zipSupport zziplib
+    ++ opt zipSupport pulseaudio;
 
   configureFlags =
     [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@@ -80,6 +83,7 @@ in stdenv.mkDerivation rec {
       (mkFlag mmsSupport "mms")
       (mkFlag mpg123Support "mpg123")
       (mkFlag aacSupport "aac")
+      (mkFlag pulseaudioSupport "pulse")
       (mkFlag stdenv.isDarwin "osx")
       "--enable-debugging" ]
     ++ opt stdenv.isLinux

From fd81f49655b9aa181a07668add826052e17adfba Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 1 Jun 2014 17:08:43 +0200
Subject: [PATCH 1967/2033] mpd: update to 0.18.11

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 9a70a91d73f..36e8f022206 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -29,10 +29,10 @@ let
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-0.18.9";
+  name = "mpd-0.18.11";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/stable/${name}.tar.gz";
-    sha256 = "0mgfyrhjlalwngx9j3xxfpfwygh9a31k1ni1isi898bb2x8zsl08";
+    sha256 = "1j3jdwmxfnn4z1vjry2g54vcbrdrgi41nv3bf2i26xkgy5708icw";
   };
 
   buildInputs = [ pkgconfig glib ]

From 05dbaa9a1749083d7e3f9c96a7afb92e9cebad94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 1 Jun 2014 18:29:27 +0200
Subject: [PATCH 1968/2033] IDEA 13.1.2 -> 13.1.3

---
 pkgs/applications/editors/idea/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 6ccd9512978..9296b294940 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -64,27 +64,27 @@ let
 
 in {
 
-  idea_community_1312 = buildIdea rec {
+  idea_community_1313 = buildIdea rec {
     name = "idea-community-${version}";
-    version = "13.1.2";
-    build = "IC-135.690";
+    version = "13.1.3";
+    build = "IC-135.909";
     description = "IntelliJ IDEA 13 Community Edition";
     license = stdenv.lib.licenses.asl20.shortName;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "59fde67bf23e4638edd4b5ada133ac1c61c3132dea936eb7de7ee5ea259cc102";
+      sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51";
     };
   };
 
-  idea_ultimate_1312 = buildIdea rec {
+  idea_ultimate_1313 = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "13.1.2";
-    build = "IU-135.690";
+    version = "13.1.3";
+    build = "IU-135.909";
     description = "IntelliJ IDEA 13 Ultimate Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "ccbaed495e2f099c92d1f747a59d7af9f9d41d75cf10e8a299d11825d78685ad";
+      sha256 = "6d99e49a63a197e19381a85535ab424a7832653db8cceb3bca7d53615ec7a53d";
     };
   };
 

From 6bc20ea278e0739d86903a38838dbdf3ba5d3305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 1 Jun 2014 20:46:33 +0200
Subject: [PATCH 1969/2033] undo #2522 merge except on darwin

It was only meant for darwin originally anyway.
See the PR for discussion.
---
 pkgs/development/libraries/gmp/5.1.x.nix   | 10 +++++++---
 pkgs/development/libraries/ppl/default.nix |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 53d7f458565..cba8d394c2b 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, m4, cxx ? true }:
 
+with { inherit (stdenv.lib) optional; };
+
 stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
 
@@ -14,10 +16,12 @@ stdenv.mkDerivation rec {
     # Build a "fat binary", with routines for several sub-architectures
     # (x86), except on Solaris where some tests crash with "Memory fault".
     # See <http://hydra.nixos.org/build/2760931>, for instance.
-    (stdenv.lib.optional (!stdenv.isSunOS) "--enable-fat")
-    ++ (if cxx then [ "--enable-cxx" "CPPFLAGS=-fexceptions" ]
+    optional (!stdenv.isSunOS) "--enable-fat"
+    ++ (if cxx then [ "--enable-cxx"  ]
                else [ "--disable-cxx" ])
-    ++ (if stdenv.is64bit then [ "--with-pic" ] else []);
+    ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
+    ++ optional stdenv.is64bit "--with-pic"
+    ;
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index 2c22317a6ca..e3b1444b8cb 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl gnum4 ];
   propagatedBuildInputs = [ gmpxx ];
 
-  configureFlags = [ "--disable-watchdog" "CPPFLAGS=-fexceptions" ] ++
+  configureFlags = [ "--disable-watchdog" ] ++
     stdenv.lib.optionals stdenv.isDarwin [
+      "CPPFLAGS=-fexceptions"
       "--disable-ppl_lcdd" "--disable-ppl_lpsol" "--disable-ppl_pips"
     ];
 

From d9fff6b563b21ccba0edde1ec94566996d2e6065 Mon Sep 17 00:00:00 2001
From: Malcolm Matalka <mmatalka@gmail.com>
Date: Sun, 1 Jun 2014 21:39:34 +0200
Subject: [PATCH 1970/2033] Update to leveldb-1.15.0

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

diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 7c990e99c33..64c03798fea 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "leveldb-1.9.0";
+  name = "leveldb-1.15.0";
 
   src = fetchurl {
     url = "https://leveldb.googlecode.com/files/${name}.tar.gz";
-    sha256 = "b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f";
+    sha256 = "10363j8qmlyh971ipb7fmgk9b97bl5267c0xyccrgvpj3rbyri6p";
   };
 
   buildPhase = "make all db_bench";

From 2f43cd3793fff581f7931e8b85bf3c92887f3761 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Jun 2014 20:22:47 +0200
Subject: [PATCH 1971/2033] maude: update full-maude to version 2.6.1e

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

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 23e2bc98ba4..877d6b79e53 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
+{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper, unzip }:
 
 stdenv.mkDerivation rec {
   name = "maude-2.6";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   fullMaude = fetchurl {
-    url = "http://maude.cs.uiuc.edu/download/current/FM2.6/full-maude26.maude";
-    sha256 = "1382hjwwrsdgd5yjn3ph1b5i1bhrhzvqx0v369bmcjkly9k96v6q";
+    url = "http://maude.lcc.uma.es/FullMaude/FM261e/full-maude.maude.zip";
+    sha256 = "0g0chfrzc7923sh17zdy731wpsgnwz7rxci0jqqmrphlshwzqm2h";
   };
 
   buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
     mkdir -p $out/share/maude
-    cp ${fullMaude} $out/share/maude/full-maude.maude
+    ${unzip}/bin/unzip ${fullMaude} -d $out/share/maude
   '';
 
   meta = {

From 0ec25c6f941e7665f4c9d8e8ee4f155411a415d3 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 1 Jun 2014 18:33:58 -0400
Subject: [PATCH 1972/2033] update vim to v7.4.316

---
 .../applications/editors/vim/configurable.nix | 21 +++++++----------
 pkgs/applications/editors/vim/default.nix     |  6 ++---
 .../editors/vim/python_framework.patch        | 23 +++++++++++++++++++
 3 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/applications/editors/vim/python_framework.patch

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index f8e717d6089..9e2abffc451 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -11,7 +11,7 @@ composableDerivation {
                    else stdenv ).mkDerivation;
 } (fix: {
 
-    name = "vim_configurable-7.4.23";
+    name = "vim_configurable-7.4.316";
 
     enableParallelBuilding = true; # test this
 
@@ -21,8 +21,8 @@ composableDerivation {
         # latest release
       args.fetchhg {
             url = "https://vim.googlecode.com/hg/";
-            tag = "v7-4-131";
-            sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb";
+            tag = "v7-4-316";
+            sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
       };
 
       "vim-nox" =
@@ -35,16 +35,13 @@ composableDerivation {
           }.src;
       };
 
+    prePatch = "cd src";
+
     # if darwin support is enabled, we want to make sure we're not building with
     # OS-installed python framework
-    preConfigure
-      = stdenv.lib.optionalString
-        (stdenv.isDarwin && (config.vim.darwin or true)) ''
-          # TODO: we should find a better way of doing this as, if the configure
-          # file changes, we need to change these line numbers
-          sed -i "5641,5644d" src/auto/configure
-          sed -i "5648d" src/auto/configure
-        '';
+    patches = stdenv.lib.optionals 
+      (stdenv.isDarwin && (config.vim.darwin or true))
+      [ ./python_framework.patch ];
 
     configureFlags
       = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ];
@@ -53,8 +50,6 @@ composableDerivation {
       = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau
           libXmu glib libICE ];
 
-    prePatch = "cd src";
-    
     # most interpreters aren't tested yet.. (see python for example how to do it)
     flags = {
         ftNix = {
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 67317490412..357de6249fa 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "vim-${version}";
 
-  version = "7.4.131";
+  version = "7.4.316";
 
   src = fetchhg {
     url = "https://vim.googlecode.com/hg/";
-    tag = "v7-4-131";
-    sha256 = "1akr0i4pykbrkqwrglm0dfn5nwpncb9pgg4h7fl6a8likbr5f3wb";
+    tag = "v7-4-316";
+    sha256 = "0scxx33p1ky0wihk04xqpd6rygp1crm0hx446zbjwbsjj6xxn7sx";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch
new file mode 100644
index 00000000000..b7c7cee6cd9
--- /dev/null
+++ b/pkgs/applications/editors/vim/python_framework.patch
@@ -0,0 +1,23 @@
+diff --git a/src/auto/configure b/src/auto/configure
+index a9755a0..4a0e2a4 100755
+--- a/auto/configure
++++ b/auto/configure
+@@ -5638,10 +5638,6 @@ __:
+ eof
+ 	    	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ 	    rm -f -- "${tmp_mkf}"
+-	    if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+-		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
+-	      vi_cv_path_python_plibs="-framework Python"
+-	    else
+ 	      if test "${vi_cv_var_python_version}" = "1.4"; then
+ 		  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
+ 	      else
+@@ -5649,7 +5645,6 @@ eof
+ 	      fi
+ 	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+ 	      	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+-	    fi
+ 
+ fi
+ 

From 088cb87e8c0c6948b16f847d2454e99a335aa895 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 2 Jun 2014 18:15:44 +0200
Subject: [PATCH 1973/2033] chicken: Bump to 4.9.0.

---
 .../development/compilers/chicken/default.nix | 21 ++++++-------------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index 7effd72be4c..1a4e3377501 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -1,17 +1,7 @@
-{ stdenv, fetchurl, devSnapshot ? false }:
+{ stdenv, fetchurl }:
 
 let
-  stableVersion = "4.8.0.6";
-  devVersion = "4.9.0rc1";
-  version = if devSnapshot then devVersion else stableVersion;
-  srcRelease = fetchurl {
-    url = "http://code.call-cc.org/releases/4.8.0/chicken-${stableVersion}.tar.gz";
-    sha256 = "0an6l09y9pa6r4crkn33w6l4j6nwhvk6fibx2ajv6h0pfl2jqkd5";
-  };
-  srcDev = fetchurl {
-    url = "http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-${devVersion}.tar.gz";
-    sha256 = "168f5ib02hh6cnilsrfg103ijhlg4j0z0fgs7i55kzd4aggy1w42";
-  };
+  version = "4.9.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -22,9 +12,10 @@ in
 stdenv.mkDerivation {
   name = "chicken-${version}";
 
-  src = if devSnapshot
-    then srcDev
-    else srcRelease;
+  src = fetchurl {
+    url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz";
+    sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig";
+  };
 
   buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
   installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d25e33bd81f..3ea34f3dec1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2498,10 +2498,6 @@ let
 
   chicken = callPackage ../development/compilers/chicken { };
 
-  chicken-dev = chicken.override {
-    devSnapshot = true;
-  };
-
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
   clang = wrapClang llvmPackages.clang;

From b899a696590b541aa4b70c4df0809282c6c473be Mon Sep 17 00:00:00 2001
From: letac <stralep@gmail.com>
Date: Mon, 2 Jun 2014 19:42:15 +0200
Subject: [PATCH 1974/2033] Update racket to 6.0.1

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 586c0a0acb9..8432c848d73 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.6";
+  version = "6.0.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
+    url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
+    sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d";
   };
 
   # Various racket executables do run-time searches for these.

From d2f842268387091399daa98f57d6fdf00b1c618c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 2 Jun 2014 18:01:53 +0000
Subject: [PATCH 1975/2033] texlive: enable building xdv2pdf and xdvipdfmx on
 darwin

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index bd3a4362be9..685d51aab0f 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -122,8 +122,6 @@ rec {
       # TODO: We should be able to fix these tests
       "--disable-devnag"
       "--disable-dvisvgm"
-      "--disable-xdv2pdf"
-      "--disable-xdvipdfmx"
     ];
 
   phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ];

From af6c8a33d9673aa7f30a0421a169aec87ae74594 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 2 Jun 2014 22:58:16 +0000
Subject: [PATCH 1976/2033] texlive: add note to clarify why dvisvgm fails to
 work on darwin

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 685d51aab0f..22ce7739a74 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -121,6 +121,14 @@ rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [
       # TODO: We should be able to fix these tests
       "--disable-devnag"
+
+      # jww (2014-06-02): The following fails with:
+      # FAIL: tests/dvisvgm
+      # ===================
+      #
+      # dyld: Library not loaded: libgs.dylib.9.06
+      #   Referenced from: .../Work/texk/dvisvgm/.libs/dvisvgm
+      #   Reason: image not found
       "--disable-dvisvgm"
     ];
 

From 9e55902bdf0a9226388cd45f7471da33e9c47d5f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Tue, 3 Jun 2014 02:11:41 +0300
Subject: [PATCH 1977/2033] pythonPackages.libcloud: update to 0.14.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2c3aa320e9..7eed59664e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3709,16 +3709,17 @@ rec {
 
 
   libcloud = buildPythonPackage (rec {
-    name = "libcloud-0.3.1";
+    name = "libcloud-0.14.1";
 
     src = fetchurl {
-      url = mirror://apache/incubator/libcloud/apache-libcloud-incubating-0.3.1.tar.bz2;
-      sha256 = "11qilrs4sd4c1mkd64ikrjsc2vwrshhc54n5mh4xrark9c7ayp0y";
+      url = https://pypi.python.org/packages/source/a/apache-libcloud/apache-libcloud-0.14.1.tar.bz2;
+      sha256 = "1l6190pjv54c7y8pzr089ij727qv7bqhhaznr2mkvimgr1wzsql5";
     };
 
-    buildInputs = [ zope_interface mock ];
+    buildInputs = [  mock ];
 
-    preConfigure = "cp test/secrets.py-dist test/secrets.py";
+    propagatedBuildInputs = [ pycrypto ];
+    preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py";
 
     # failing tests for 26 and 27
     doCheck = false;

From 191dbc234fc3f9bfa7d265f0e9210c311cd7f6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Jun 2014 10:26:00 +0200
Subject: [PATCH 1978/2033] gnutls: security + maintenance update for both
 branches

Fixes #2813 CVE-2014-3466. No API/ABI changes in the updates.

Tests start to fail for gnutls31, so they get disabled,
but the 3.1 branch is already unused on master.
---
 pkgs/development/libraries/gnutls/3.1.nix | 9 +++++----
 pkgs/development/libraries/gnutls/3.2.nix | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix
index 1046310946a..89306540694 100644
--- a/pkgs/development/libraries/gnutls/3.1.nix
+++ b/pkgs/development/libraries/gnutls/3.1.nix
@@ -4,11 +4,11 @@
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
-  name = "gnutls-3.1.22";
+  name = "gnutls-3.1.25";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz";
-    sha256 = "177kmq4jn67s7mmb249722nwxmbjwjpphmib7bhzfk43z02j3pvh";
+    sha256 = "1i1v8pbaw72k0ps09i3lvc1zr9gn34jpliiijbs8k7axrv2w9n5g";
   };
 
   # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
-  doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
+  doCheck = false;#(!stdenv.isFreeBSD && !stdenv.isDarwin);
 
   meta = {
     description = "The GNU Transport Layer Security Library";
@@ -64,4 +64,5 @@ stdenv.mkDerivation rec {
     license = "LGPLv2.1+";
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-}
\ No newline at end of file
+}
+
diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix
index 45d0270de5a..ca9c003dfe7 100644
--- a/pkgs/development/libraries/gnutls/3.2.nix
+++ b/pkgs/development/libraries/gnutls/3.2.nix
@@ -4,11 +4,11 @@
 assert guileBindings -> guile != null;
 
 stdenv.mkDerivation rec {
-  name = "gnutls-3.2.12.1";
+  name = "gnutls-3.2.15";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz";
-    sha256 = "1787n4iard3ad0p44xbl4aj3r3f5ir3sz0b2s27qpaaia2w4774g";
+    sha256 = "16c5c4k41mxib8i06npks940p9xllgn1wrackfp8712wdvl5zc4q";
   };
 
   patches =

From 36f5ede37afd7e1a12bf83a22ede9769e8d17963 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Jun 2014 11:45:57 +0200
Subject: [PATCH 1979/2033] geeqie: Fix incorrect longDescription formatting

Note that longDescription should not be formatted as:

  longDescription =
    '' Bla bla
       bla bla
    '';

because this will cause the second line to have more preceding
whitespace. It should be:

  longDescription =
    ''
      Bla bla
      bla bla
    '';
---
 pkgs/applications/graphics/geeqie/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index ff1e5052054..44ca66ac5b9 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -35,13 +35,14 @@ stdenv.mkDerivation rec {
     description = "Geeqie, a lightweight GTK+ based image viewer";
 
     longDescription =
-      '' Geeqie is a lightweight GTK+ based image viewer for Unix like
-         operating systems.  It features: EXIF, IPTC and XMP metadata
-         browsing and editing interoperability; easy integration with other
-         software; geeqie works on files and directories, there is no need to
-         import images; fast preview for many raw image formats; tools for
-         image comparison, sorting and managing photo collection.  Geeqie was
-         initially based on GQview.
+      ''
+        Geeqie is a lightweight GTK+ based image viewer for Unix like
+        operating systems.  It features: EXIF, IPTC and XMP metadata
+        browsing and editing interoperability; easy integration with other
+        software; geeqie works on files and directories, there is no need to
+        import images; fast preview for many raw image formats; tools for
+        image comparison, sorting and managing photo collection.  Geeqie was
+        initially based on GQview.
       '';
 
     license = "GPLv2+";

From e9ec238377fac0768cc4590b17f889a481413519 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Tue, 3 Jun 2014 21:14:04 +0800
Subject: [PATCH 1980/2033] Add haskell-aeson-qq

---
 .../libraries/haskell/aeson-qq/default.nix        | 15 +++++++++++++++
 pkgs/top-level/haskell-packages.nix               |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/aeson-qq/default.nix

diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
new file mode 100644
index 00000000000..fb53dd90257
--- /dev/null
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -0,0 +1,15 @@
+{ cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }:
+
+cabal.mkDerivation (self: {
+  pname = "aeson-qq";
+  version = "0.6.1";
+  sha256 = "164nqk1qfb8a9c95yv5hg0zgcjcg49vrra2wi00h325bgpq6wa5n";
+  buildDepends = [ aeson haskellSrcMeta parsec text vector ];
+  testDepends = [ aeson hspec ];
+  meta = {
+    homepage = "http://github.com/zalora/aeson-qq";
+    description = "Json Quasiquatation for Haskell";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 46e8c6a84e4..62df38eea0e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -145,6 +145,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {};
 
+  aesonQq = callPackage ../development/libraries/haskell/aeson-qq {};
+
   alternativeIo = callPackage ../development/libraries/haskell/alternative-io {};
 
   alsaCore = callPackage ../development/libraries/haskell/alsa-core {};

From 2943fe1e7650136212e90b0c8f8813660c04069a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 3 Jun 2014 13:51:37 -0400
Subject: [PATCH 1981/2033] go: bump

---
 pkgs/development/compilers/go/1.2.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index 7b7e16d837d..b519b96415b 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.2.1";
+  name = "go-1.2.2";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.2.1.src.tar.gz;
-    sha1 = "6a4b9991eddd8039438438d6aa25126ab7e07f2f";
+    url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz;
+    sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];

From e87da7761a597d6c2092e5b7331a5389e14ce348 Mon Sep 17 00:00:00 2001
From: Philip Lykke Carlsen <plcplc@gmail.com>
Date: Wed, 21 May 2014 20:45:58 +0200
Subject: [PATCH 1982/2033] subtitleeditor, gstreamermm: new packages

---
 lib/maintainers.nix                           |  1 +
 .../video/subtitleeditor/default.nix          | 45 +++++++++++++++++++
 .../gstreamer/legacy/gstreamermm/default.nix  | 31 +++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 4 files changed, 81 insertions(+)
 create mode 100644 pkgs/applications/video/subtitleeditor/default.nix
 create mode 100644 pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0c5022bb22f..562c88b2d84 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -66,6 +66,7 @@
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
+  plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   qknight = "Joachim Schiele <js@lastlog.de>";
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
new file mode 100644
index 00000000000..c1c11357ca0
--- /dev/null
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, desktop_file_utils, enchant, gnome, gstreamer, gstreamermm,
+  gst_plugins_base, gst_plugins_good, intltool, hicolor_icon_theme,
+  libsigcxx, libxmlxx, makeWrapper, xdg_utils, pkgconfig } :
+
+let
+  ver_maj = "0.41";
+  ver_min = "0";
+in
+
+stdenv.mkDerivation rec {
+  name = "subtitle-editor-${ver_maj}.${ver_min}";
+
+  buildInputs =  [
+    desktop_file_utils enchant gnome.gtk gnome.gtkmm gstreamer gstreamermm
+    gst_plugins_base gst_plugins_good intltool hicolor_icon_theme libsigcxx libxmlxx
+    makeWrapper xdg_utils pkgconfig
+  ];
+
+  src = fetchurl {
+    url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz";
+    md5 = "3c21ccd8296001dcb1a02c62396db1b6";
+  };
+
+  doCheck = true;
+
+  postInstall = ''
+    wrapProgram "$out/bin/subtitleeditor" --prefix \
+      GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"                                                     \
+  '';
+
+
+  meta = {
+    description = "GTK+2 application to edit video subtitles";
+    longDescription = ''
+      Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be
+      used for new subtitles or as a tool to transform, edit, correct and refine
+      existing subtitle. This program also shows sound waves, which makes it easier
+      to synchronise subtitles to voices.
+      '';
+    homepage = http://home.gna.org/subtitleeditor;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = stdenv.lib.maintainers.plcplc;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
new file mode 100644
index 00000000000..1427ec866a9
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, glibmm, gstreamer, gst_plugins_base, libsigcxx, libxmlxx, pkgconfig }:
+
+let
+  ver_maj = "0.10";
+  ver_min = "11";
+in
+stdenv.mkDerivation rec {
+  name = "gstreamermm-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url    = "mirror://gnome/sources/gstreamermm/${ver_maj}/gstreamermm-${ver_maj}.${ver_min}.tar.xz";
+    sha256 = "12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6";
+  };
+ 
+  doCheck = false; # Tests require pulseaudio in /homeless-shelter
+
+  propagatedBuildInputs = [
+    glibmm gstreamer gst_plugins_base libsigcxx libxmlxx
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "C++ bindings for the GStreamer streaming multimedia library";
+    homepage = http://www.gtkmm.org/;
+    license = "LGPLv2+";
+    maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ea34f3dec1..54016f654bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4660,6 +4660,8 @@ let
 
   gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
 
+  gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { };
+
   gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {};
 
   gusb = callPackage ../development/libraries/gusb {
@@ -6060,6 +6062,8 @@ let
 
   strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
 
+  subtitleeditor = callPackage ../applications/video/subtitleeditor { };
+
   suil = callPackage ../development/libraries/audio/suil { };
 
   suitesparse = callPackage ../development/libraries/suitesparse { };

From 26c50cd60f0d744535510e49865f8b3612796397 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Wed, 4 Jun 2014 00:06:14 +0400
Subject: [PATCH 1983/2033] dwb: update

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

diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index b426019efca..40b875c8c57 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -2,12 +2,12 @@
   m4, glib_networking, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation {
-  name = "dwb-2014-05-23";
+  name = "dwb-2014-06-03";
 
   src = fetchgit {
     url = "https://bitbucket.org/portix/dwb.git";
-    rev = "813457c0cb6603d3b7a548fc97a8298a7fac34fa";
-    sha256 = "1fywnf3yp6p84hap40nb9vrz1gswgnhppygmi1gzjzz3bphwf5pr";
+    rev = "d00af56c1e60978060f1b2077f3d49995b98c54f";
+    sha256 = "02bs9nbgk8ghaxywhqd8mii4lik748dssn551m00i1305p6q1cjj";
   };
 
   buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkit gtk3 gnutls json_c m4 ];

From fc235a48a0820edf05d1c7f47eac8af451c0ecfb Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Wed, 4 Jun 2014 16:01:26 +0800
Subject: [PATCH 1984/2033] Update haskell-aeson-qq to version 0.7.0

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

diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix
index fb53dd90257..1da43428f12 100644
--- a/pkgs/development/libraries/haskell/aeson-qq/default.nix
+++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "aeson-qq";
-  version = "0.6.1";
-  sha256 = "164nqk1qfb8a9c95yv5hg0zgcjcg49vrra2wi00h325bgpq6wa5n";
+  version = "0.7.0";
+  sha256 = "1sq34pnwiyf5lngqph4m463ijr185akzbrdi3i40zmqlrymssv3c";
   buildDepends = [ aeson haskellSrcMeta parsec text vector ];
   testDepends = [ aeson hspec ];
   meta = {
     homepage = "http://github.com/zalora/aeson-qq";
-    description = "Json Quasiquatation for Haskell";
+    description = "JSON quasiquoter for Haskell";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
   };

From 12f06b3cc3f57a18cb285fd2274292faa6eb038d Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 10 May 2014 18:37:58 +0200
Subject: [PATCH 1985/2033] fcgiwrap: new package

Simple server for running CGI applications over FastCGI

https://nginx.localdomain.pl/wiki/FcgiWrap
---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/web-servers/fcgiwrap.nix | 49 +++++++++++++++++++
 pkgs/servers/fcgiwrap/default.nix             | 21 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 73 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/fcgiwrap.nix
 create mode 100644 pkgs/servers/fcgiwrap/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c1b55cb5550..7fa705a5ae3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -255,6 +255,7 @@
   ./services/ttys/agetty.nix
   ./services/ttys/kmscon.nix
   ./services/web-servers/apache-httpd/default.nix
+  ./services/web-servers/fcgiwrap.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/lighttpd/cgit.nix
diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix
new file mode 100644
index 00000000000..7e91e7b60ee
--- /dev/null
+++ b/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.fcgiwrap;
+
+in {
+
+  options = {
+    services.fcgiwrap = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI.";
+      };
+
+      preforkProcesses = mkOption {
+        type = types.int;
+        default = 1;
+        description = "Number of processes to prefork.";
+      };
+
+      bindSocket = mkOption {
+        type = types.string;
+        default = "unix:/run/fcgiwrap.sock";
+        description = ''
+          Socket to bind to. Valid socket URLs are:
+            unix:/path/to/socket for Unix sockets
+            tcp:dot.ted.qu.ad:port for IPv4 sockets
+            tcp6:[ipv6_addr]:port for IPv6 sockets
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.fcgiwrap = {
+      after = [ "nss-user-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.fcgiwrap}/sbin/fcgiwrap -c ${builtins.toString cfg.preforkProcesses} -s ${cfg.bindSocket}";
+      };
+    };
+
+  };
+}
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
new file mode 100644
index 00000000000..84deebcb8f5
--- /dev/null
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fcgiwrap-${version}";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "http://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz";
+    sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
+  };
+
+  configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+  buildInputs = [ autoreconfHook systemd fcgi pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = https://nginx.localdomain.pl/wiki/FcgiWrap;
+    description = "Simple server for running CGI applications over FastCGI";
+    maintainers = with maintainers; [ lethalman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ede5259f1ba..5080ca81db2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6602,6 +6602,8 @@ let
 
   elasticmq = callPackage ../servers/elasticmq { };
 
+  fcgiwrap = callPackage ../servers/fcgiwrap { };
+
   felix = callPackage ../servers/felix { };
 
   felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { };

From 77abe5e4641701f1b7213575ba93cca1ac60d309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 3 Jun 2014 14:25:21 +0200
Subject: [PATCH 1986/2033] libav: update 0.8.11 -> .12, 9.12 -> .13, introduce
 10.1

---
 pkgs/development/libraries/libav/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a6b552613cc..b21f530478a 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,8 +26,9 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_9   = libavFun  "9.12"  "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0";
-    libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r";
+    libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr";
+    libav_9   = libavFun   "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g";
+    libav_10  = libavFun  "10.1"  "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5080ca81db2..27dc28348f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4928,9 +4928,9 @@ let
 
   libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { };
 
-  libav = libav_9;
+  libav = libav_10;
   libav_all = callPackage ../development/libraries/libav { };
-  inherit (libav_all) libav_9 libav_0_8;
+  inherit (libav_all) libav_0_8 libav_9 libav_10;
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 

From bc53b9ec4c331d11229007054e39abb9e8160c2e Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 4 Jun 2014 14:28:08 +0200
Subject: [PATCH 1987/2033] opengrok: new package

Source code search and cross reference engine

http://opengrok.github.io/OpenGrok/
---
 .../tools/misc/opengrok/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/misc/opengrok/default.nix

diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
new file mode 100644
index 00000000000..8f77b3d7283
--- /dev/null
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }:
+
+stdenv.mkDerivation rec {
+  name = "opengrok-0.12.1";
+
+  src = fetchurl {
+    url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz";
+    sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    ensureDir $out
+    cp -a * $out/
+    substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname
+    wrapProgram $out/bin/OpenGrok \
+      --prefix PATH : "${ctags}/bin:${git}/bin" \
+      --set JAVA_HOME "${jre}" \
+      --set OPENGROK_TOMCAT_BASE "/var/tomcat"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Source code search and cross reference engine";
+    homepage = http://opengrok.github.io/OpenGrok/;
+    license = licenses.cddl;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27dc28348f5..54ee84c65f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3978,6 +3978,8 @@ let
   omake = callPackage ../development/tools/ocaml/omake { };
   omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
+  opengrok = callPackage ../development/tools/misc/opengrok { };
+
   openocd = callPackage ../development/tools/misc/openocd { };
 
   oprofile = callPackage ../development/tools/profiling/oprofile { };

From 6306d81e8a9524930ce7e8f28021150c8fb97c03 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 4 Jun 2014 09:47:00 -0400
Subject: [PATCH 1988/2033] ncdc: update to 1.19.1 for security fixes

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

diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index 794f6fe4308..5f7ad92f7cc 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
 
-stdenv.mkDerivation rec {
+let
+  version = "1.19.1";
+in
+stdenv.mkDerivation {
   name = "ncdc-${version}";
-  version = "1.19";
 
   src = fetchurl {
-    url = "http://dev.yorhel.nl/download/ncdc-1.19.tar.gz";
-    sha256 = "1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2";
+    url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
+    sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6";
   };
 
   buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
 
   meta = {
-    description = "modern and lightweight direct connect client with a friendly ncurses interface";
+    description = "Modern and lightweight direct connect client with a friendly ncurses interface";
     homepage = http://dev.yorhel.nl/ncdc;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux; # arbitrary

From 638132b64cc6de3bfde9dccc79c4f64292a378dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Jun 2014 16:18:04 +0200
Subject: [PATCH 1989/2033] mailutils: disable tests

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

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 3ac82e51bf8..0453567c449 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
      gnutls mysql guile texinfo gnum4 ]
    ++ stdenv.lib.optional doCheck dejagnu;
 
-  doCheck = true;
+  # Tests fail since gcc 4.8
+  doCheck = false;
 
   meta = {
     description = "GNU Mailutils is a rich and powerful protocol-independent mail framework";
@@ -51,8 +52,5 @@ stdenv.mkDerivation rec {
 
     # Some of the dependencies fail to build on {cyg,dar}win.
     platforms = stdenv.lib.platforms.gnu;
-
-    # Tests fail since gcc 4.8
-    broken = true;
   };
 }

From 73169b3a37e1875a3124f578591ddb33f7413f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Jun 2014 14:11:21 +0200
Subject: [PATCH 1990/2033] python: 2.7.6 -> 2.7.7

---
 .../python/2.7/CVE-2014-1912.patch            | 57 -------------------
 .../interpreters/python/2.7/default.nix       |  8 +--
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch

diff --git a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch b/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch
deleted file mode 100644
index 95399bf7607..00000000000
--- a/pkgs/development/interpreters/python/2.7/CVE-2014-1912.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# Edited from Mercurial patch: deleted the NEWS hunk, since it didn't apply cleanly.
-# It added the following line to NEWS:
-# - Issue #20246: Fix buffer overflow in socket.recvfrom_into.
-
-# HG changeset patch
-# User Benjamin Peterson <benjamin@python.org>
-# Date 1389671978 18000
-# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
-# Parent  2631d33ee7fbd5f0288931ef37872218d511d2e8
-complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest):
- 
-     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
- 
-+    def testRecvFromIntoSmallBuffer(self):
-+        # See issue #20246.
-+        buf = bytearray(8)
-+        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
-+
-+    def _testRecvFromIntoSmallBuffer(self):
-+        with test_support.check_py3k_warnings():
-+            buf = buffer(MSG*2048)
-+        self.serv_conn.send(buf)
-+
- 
- TIPC_STYPE = 2000
- TIPC_LOWER = 200
-diff --git a/Misc/ACKS b/Misc/ACKS
---- a/Misc/ACKS
-+++ b/Misc/ACKS
-@@ -979,6 +979,7 @@ Eric V. Smith
- Christopher Smith
- Gregory P. Smith
- Roy Smith
-+Ryan Smith-Roberts
- Rafal Smotrzyk
- Dirk Soede
- Paul Sokolovsky
-diff --git a/Misc/NEWS b/Misc/NEWS
---- a/Modules/socketmodule.c
-+++ b/Modules/socketmodule.c
-@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
-     if (recvlen == 0) {
-         /* If nbytes was not specified, use the buffer's length */
-         recvlen = buflen;
-+    } else if (recvlen > buflen) {
-+        PyErr_SetString(PyExc_ValueError,
-+                        "nbytes is greater than the length of the buffer");
-+        goto error;
-     }
- 
-     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
-
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index eeadc3c8cc7..fc91e5a4493 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 let
 
   majorVersion = "2.7";
-  version = "${majorVersion}.6";
+  version = "${majorVersion}.7";
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
-    sha256 = "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz";
+    sha256 = "0y6s12rdi89k24p8zarhy9fqmyy459yg0d125c7cac4v136y70r9";
   };
 
   patches =
@@ -28,10 +28,6 @@ let
       # patch python to put zero timestamp into pyc
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
-
-      # See http://bugs.python.org/issue20246
-      # This will be fixed in 2.7.7.
-      ./CVE-2014-1912.patch
     ];
 
   postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) ''

From f0fc148e5ac62026aa330ac3fe865ad494f1b66b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 4 Jun 2014 16:48:40 +0200
Subject: [PATCH 1991/2033] openttd: Bump to 1.4.1.

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

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 7e2b4221d52..09a7761326a 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "0m89pr7m7xg71q1j3869dfrbhv88g90cw9zn0jlpg8crsj4wnnyq";
+    sha256 = "0gkmf2jj1rab81y10dp8cirr90kv9dpr3ww4wb06j8cvgapy7b0z";
   };
 
   buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];

From 3ee3a5d387123d8ed39a04571d593986b0c9cb42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Jun 2014 16:55:35 +0200
Subject: [PATCH 1992/2033] maude: update full-maude to version 2.6.1h

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

diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 877d6b79e53..65badeae1dd 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper, unzip }:
+{ stdenv, fetchurl, flex, bison, ncurses, buddy, tecla, libsigsegv, gmpxx, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "maude-2.6";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   fullMaude = fetchurl {
-    url = "http://maude.lcc.uma.es/FullMaude/FM261e/full-maude.maude.zip";
-    sha256 = "0g0chfrzc7923sh17zdy731wpsgnwz7rxci0jqqmrphlshwzqm2h";
+    url = "https://full-maude.googlecode.com/git/full-maude261h.maude";
+    sha256 = "0xx8bfn6arsa75m5vhp5lmpazgfw230ssq33h9vifswlvzzc81ha";
   };
 
   buildInputs = [flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
     mkdir -p $out/share/maude
-    ${unzip}/bin/unzip ${fullMaude} -d $out/share/maude
+    cp ${fullMaude} -d $out/share/maude/full-maude.maude
   '';
 
   meta = {

From 853f2ca9d589f5bec52df1adb70b642ff45f9a45 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 4 Jun 2014 19:52:34 +0000
Subject: [PATCH 1993/2033] Update shake to 0.13.1

---
 pkgs/development/libraries/haskell/shake/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix
index 58325a1afe0..a2b8cc24e65 100644
--- a/pkgs/development/libraries/haskell/shake/default.nix
+++ b/pkgs/development/libraries/haskell/shake/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shake";
-  version = "0.12";
-  sha256 = "060bvbhk84zagghalg5nh5g17vj8z2kv0qb8vibcq58ahfayj655";
+  version = "0.13.1";
+  sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
     binary deepseq filepath hashable QuickCheck random time
     transformers unorderedContainers utf8String
   ];
+  doCheck = !self.stdenv.isDarwin;
   meta = {
     homepage = "https://github.com/ndmitchell/shake";
     description = "Build system library, like Make, but more accurate dependencies";

From 4eeb0f10fb57203f020502835130fb982bc7af48 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 5 Jun 2014 01:16:50 +0100
Subject: [PATCH 1994/2033] erlangR16: updated to R16B03-1

 - couchdb: using erlangR16 (fails to build with R17)
 - rename erlang attr names to use only major version in attr name
---
 .../interpreters/erlang/{R14B04.nix => R14.nix}     |  0
 .../interpreters/erlang/{R15B03.nix => R15.nix}     |  0
 .../interpreters/erlang/{R16B02.nix => R16.nix}     |  4 ++--
 pkgs/servers/nosql/riak/1.3.1.nix                   |  4 ++--
 pkgs/top-level/all-packages.nix                     | 13 +++++++------
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename pkgs/development/interpreters/erlang/{R14B04.nix => R14.nix} (100%)
 rename pkgs/development/interpreters/erlang/{R15B03.nix => R15.nix} (100%)
 rename pkgs/development/interpreters/erlang/{R16B02.nix => R16.nix} (95%)

diff --git a/pkgs/development/interpreters/erlang/R14B04.nix b/pkgs/development/interpreters/erlang/R14.nix
similarity index 100%
rename from pkgs/development/interpreters/erlang/R14B04.nix
rename to pkgs/development/interpreters/erlang/R14.nix
diff --git a/pkgs/development/interpreters/erlang/R15B03.nix b/pkgs/development/interpreters/erlang/R15.nix
similarity index 100%
rename from pkgs/development/interpreters/erlang/R15B03.nix
rename to pkgs/development/interpreters/erlang/R15.nix
diff --git a/pkgs/development/interpreters/erlang/R16B02.nix b/pkgs/development/interpreters/erlang/R16.nix
similarity index 95%
rename from pkgs/development/interpreters/erlang/R16B02.nix
rename to pkgs/development/interpreters/erlang/R16.nix
index 7dc71ed6546..eaf991ff563 100644
--- a/pkgs/development/interpreters/erlang/R16B02.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "erlang-" + version;
-  version = "R16B02";
+  version = "R16B03-1";
 
   src = fetchurl {
     url = "http://www.erlang.org/download/otp_src_${version}.tar.gz";
-    sha256 = "119gnf3jfd98hpxxqs8vnzrc81myv07y302b99alalqqz0fsvf3a";
+    sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp";
   };
 
   buildInputs =
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix
index ccac6e331fd..96315c52f6b 100644
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ b/pkgs/servers/nosql/riak/1.3.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, erlangR15B03 }:
+{ stdenv, fetchurl, unzip, erlangR15}:
 
 let
   srcs = {
@@ -15,7 +15,7 @@ in
 stdenv.mkDerivation rec {
   name = "riak-1.3.1";
 
-  buildInputs = [unzip erlangR15B03];
+  buildInputs = [unzip erlangR15];
 
   src = srcs.riak;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54ee84c65f8..24d977d5148 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3381,9 +3381,9 @@ let
 
   clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
 
-  erlangR14B04 = callPackage ../development/interpreters/erlang/R14B04.nix { };
-  erlangR15B03 = callPackage ../development/interpreters/erlang/R15B03.nix { };
-  erlangR16B02 = callPackage ../development/interpreters/erlang/R16B02.nix { };
+  erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
+  erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
+  erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
   erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
   erlang = erlangR17;
 
@@ -6568,6 +6568,7 @@ let
     spidermonkey = spidermonkey_185;
     python = python27;
     sphinx = python27Packages.sphinx;
+    erlang = erlangR16;
   };
 
   dico = callPackage ../servers/dico { };
@@ -6599,7 +6600,7 @@ let
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd {
-    erlang = erlangR16B02;
+    erlang = erlangR16;
   };
 
   elasticmq = callPackage ../servers/elasticmq { };
@@ -9684,8 +9685,8 @@ let
   winswitch = callPackage ../tools/X11/winswitch { };
 
   wings = callPackage ../applications/graphics/wings {
-    erlang = erlangR14B04;
-    esdl = esdl.override { erlang = erlangR14B04; };
+    erlang = erlangR14;
+    esdl = esdl.override { erlang = erlangR14; };
   };
 
   wmname = callPackage ../applications/misc/wmname { };

From 3a0b265af9195b01629a6962820f335d2a6fd629 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 4 Jun 2014 22:23:39 -0500
Subject: [PATCH 1995/2033] kernel: 3.14.4 -> 3.14.5 (close #2831)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index e513fa2e3cd..465a04837ec 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.4";
+  version = "3.14.5";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "05yp192pbjng92rpvq3fd4mhjc96iylwf6xb7as5lscwg660m1b5";
+    sha256 = "0x38fyj86hrw7ns14m4kdpscqlj7ig889mxzvwsbhrsk0khllvyn";
   };
 
   features.iwlwifi = true;

From 7553a476f598e0bbf175453cef722b71a57672b2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:36:39 +0200
Subject: [PATCH 1996/2033] simple-build-tool: update to version 0.13.5

---
 .../tools/build-managers/simple-build-tool/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
index 8f01486cfe7..b54f894d8eb 100644
--- a/pkgs/development/tools/build-managers/simple-build-tool/default.nix
+++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.0";
+  version = "0.13.5";
 
   src = fetchurl {
     url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar";
-    sha256 = "04s49v5mw4kwz1rmvbf07kq51i2m0lcv60c9i5y524gjj518pk1w";
+    sha256 = "05zvb3j7xxswpz7fz2nwbl4dwfdf0cyx5xzjis5fyi2dbzmfdrmp";
   };
 
   phases = [ "installPhase" ];
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/sbt
   '';
 
-  meta = { 
+  meta = {
     homepage = http://www.scala-sbt.org/;
     license = stdenv.lib.licenses.bsd3;
     description = "A build tool for Scala, Java and more";
-    maintainers = [ stdenv.lib.maintainers.rickynils ];  
-  };  
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+  };
 }

From 246edc3df2ade0701aabc53e41d6c8c85f51ac24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jun 2014 12:54:37 +0200
Subject: [PATCH 1997/2033] linux: Update to 3.12.21

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 6e94f2432c0..82f31bf4f98 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.20";
+  version = "3.12.21";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "15pjvlqbbyif8s8mcpb7wf20fvbczhfp65mn6fd609j1p79nvqb9";
+    sha256 = "1pr4gr48bgxz28h790b2w41b1fc41xffz3drflsnz5736pisrhg7";
   };
 
   features.iwlwifi = true;

From 1da6a7d4a915e48934fbaa27fe01db1211d00df7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jun 2014 13:04:18 +0200
Subject: [PATCH 1998/2033] Remove illegal meta.src attributes

---
 .../audio/ladspa-plugins/ladspah.nix          | 33 +++++++------------
 .../networking/p2p/ldcpp/default.nix          |  1 -
 pkgs/development/compilers/qi/default.nix     |  1 -
 pkgs/games/construo/default.nix               |  1 -
 pkgs/games/orbit/default.nix                  |  1 -
 pkgs/servers/dict/dictd-db.nix                |  1 -
 pkgs/servers/xmpp/openfire/default.nix        |  1 -
 pkgs/tools/filesystems/relfs/default.nix      |  1 -
 8 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index 30ba34af16c..8c4d8a8c1ed 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -1,28 +1,17 @@
-{ stdenv, fetchurl, builderDefs }:
+{ runCommand, fetchurl }:
+
+let
 
-let 
   src = fetchurl {
     url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
     sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
   };
+
 in
-  let localDefs = builderDefs.passthru.function {
-    buildInputs = [];
-    inherit src;
-  };
-  in with localDefs;
-let
-  copyFile = fullDepEntry ("
-    mkdir -p \$out/include
-    cp ${src} \$out/include/ladspa.h
-  ") [minInit defEnsureDir];
-in
-stdenv.mkDerivation {
-  name = "ladspa.h";
-  builder = writeScript "ladspa.h-builder"
-    (textClosure localDefs [copyFile]);
-  meta = {
-    description = "LADSPA format audio plugins";
-    inherit src;
-  };
-}
+
+runCommand "ladspa.h"
+  { meta.description = "LADSPA format audio plugins"; }
+  ''
+    mkdir -p $out/include
+    cp ${src} $out/include/ladspa.h
+  ''
diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
index 1b601992aa6..6f282b30fa1 100644
--- a/pkgs/applications/networking/p2p/ldcpp/default.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@@ -33,6 +33,5 @@ stdenv.mkDerivation rec {
       [doScons doForceShare doPropagate]);
   meta = {
     description = "Linux DC++ - Direct Connect client";
-    inherit src;
   };
 }
diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix
index ae017255854..ecb022d942a 100644
--- a/pkgs/development/compilers/qi/default.nix
+++ b/pkgs/development/compilers/qi/default.nix
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {
 		description = "Qi - next generation on top of Common Lisp";
-		inherit src;
 	};
 }
diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix
index 4de74bde5a1..57d055ed3d3 100644
--- a/pkgs/games/construo/default.nix
+++ b/pkgs/games/construo/default.nix
@@ -25,6 +25,5 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
 		description = "Construo masses and springs simulation";
-		inherit src;
 	};
 }
diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix
index 9769e6f5d67..de4c84f010c 100644
--- a/pkgs/games/orbit/default.nix
+++ b/pkgs/games/orbit/default.nix
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
 			[ customBuild doForceShare doPropagate]);
 	meta = {
 		description = "Orbit space flight simulator";
-		inherit src;
 	};
 }
 
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index c6c0bc73a08..5f109c58e6e 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
 			[doInstall doForceShare doPropagate]);
 	meta = {
 		description = "${name} dictionary for dictd";
-		inherit src;
 	};
 };
 # Probably a bug in some FreeDict release files, but easier to trivially
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index e5e5273783f..736517b53f1 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -31,6 +31,5 @@ stdenv.mkDerivation rec {
       [ installPhase doForceShare doPropagate]);
   meta = {
     description = "XMPP server in Java";
-    inherit src;
   };
 }
diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix
index 56dad0c1e3d..6d803f72531 100644
--- a/pkgs/tools/filesystems/relfs/default.nix
+++ b/pkgs/tools/filesystems/relfs/default.nix
@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
 		description = "A relational filesystem on top of FUSE";
-		inherit src;
     		maintainers = [stdenv.lib.maintainers.raskin];
 		platforms = stdenv.lib.platforms.linux;
 	};

From 463ed1bb640efcd3b3714a67e94800a6003eb320 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 5 Jun 2014 02:20:36 -0500
Subject: [PATCH 1999/2033] mariadb: 10.0.10 -> 10.0.11

Also, enable the TokuDB plugin, as it now builds (there were some bugs
in the non-GA release that prevented that).

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index a6105c12890..d0f7f5ef3e5 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }:
 
 stdenv.mkDerivation rec {
-  name = "mariadb-10.0.10";
+  name = "mariadb-${version}";
+  version = "10.0.11";
 
   src = fetchurl {
-    url = "https://fossies.org/linux/misc/${name}.tar.gz";
-    md5 = "14ce22b8197d4eae88d237776d47220f";
+    url    = "https://fossies.org/linux/misc/${name}.tar.gz";
+    sha256 = "1p8h06kns30rlbnzw9ddmihs7r3jhp8xlrl4r6h5d107wkcw86v3";
   };
 
   buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ];
 
-  cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITHOUT_TOKUDB=1" "-DINSTALL_SCRIPTDIR=bin" ];
+  cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ];
 
   enableParallelBuilding = true;
 
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "An enhanced, drop-in replacement for MySQL";
     homepage    = https://mariadb.org/;
     license     = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    maintainers = with stdenv.lib.maintainers; [ shlevy thoughtpolice ];
     platforms   = stdenv.lib.platforms.all;
   };
 }

From b43421221ff3ea7069de175845be80075f31d2a8 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 5 Jun 2014 06:06:19 -0500
Subject: [PATCH 2000/2033] kernel/grsec: updates; add mainline package for
 brave souls

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/kernel/linux-3.10.nix   |  4 ++--
 pkgs/os-specific/linux/kernel/linux-3.2.nix    |  4 ++--
 pkgs/os-specific/linux/kernel/linux-3.4.nix    |  4 ++--
 .../os-specific/linux/kernel/linux-testing.nix | 17 +++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix      | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                | 10 ++++++++++
 6 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-testing.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index de8fa4f5413..ac2ba611386 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.40";
+  version = "3.10.41";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0a56hh47a9x8mg1rxlckfnrjcphwz9hraxj2fgran95vb33hsq5a";
+    sha256 = "0rpz2nxay0a4573dnnb8szq3ly3bhjd6wrz5z6iw3kpj19crs0r1";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 1ff3b48676f..d5fd820cac0 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.58";
+  version = "3.2.59";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1mszzixiv4k61m241dl2n5s8rca26l6hc40v23lha814nrahjkn1";
+    sha256 = "0a62nmn90k3g48m8g3y27q6a0qwa3k2s6synss7378kdi4f938i4";
   };
 
   # We don't provide these patches if grsecurity is enabled, because
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 63d0d490402..165baf0a17f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.90";
+  version = "3.4.91";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0kh4y1sbsjm3awplfsd0i59rz7wc1dj23mcs5rwwhc0p7i8w4r75";
+    sha256 = "003l9i14m5ci2232wl68nxbgi0ipkzq00yfgxfp9cmh2sipxy1dk";
   };
 
   kernelPatches = args.kernelPatches ++
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
new file mode 100644
index 00000000000..d58610a38cd
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.15-rc8";
+  extraMeta.branch = "3.15";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
+    sha256 = "";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index a4ebc689b2f..c0cca64967c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -60,24 +60,24 @@ rec {
   };
 
   grsecurity_stable = grsecPatch
-    { kversion  = "3.2.58";
-      revision  = "201405112002";
+    { kversion  = "3.2.59";
+      revision  = "201406042136";
       branch    = "stable";
-      sha256    = "107jbgl1lz6blrk5rxm10jjhbywav9s56bs7zfs3m1618bff7p7v";
+      sha256    = "01frz80n7zl3yyl11d1i517n0rw8ivb46cl0swp3zgjx29adwc8s";
     };
 
   grsecurity_vserver = grsecPatch
-    { kversion  = "3.2.58";
-      revision  = "vs2.3.2.16-201405112004";
+    { kversion  = "3.2.59";
+      revision  = "vs2.3.2.16-201406042138";
       branch    = "vserver";
-      sha256    = "0xi7c1q0qsvdvs9vw3iclfz8ykjf56cc9wds6419z1lcgcaykb9w";
+      sha256    = "1vlmcf2fshxvhsparmvwlbn3gpccc8zjc341sjwsmyc3i8csmysr";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.14.4";
-      revision  = "201405141623";
+    { kversion  = "3.14.5";
+      revision  = "201406021708";
       branch    = "test";
-      sha256    = "0k9f3n1hxxqa2l10mjk7hy7w9p0mmiqv6s6cbiji2hyvakm5s7p4";
+      sha256    = "002sbbcmvg6wa41a1q8vgf3zcjakns72dc885b6jml0v396hb5c6";
     };
 
   grsec_fix_path =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24d977d5148..dc21997dbf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7196,6 +7196,15 @@ let
       ];
   };
 
+  linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   /* grsec configuration
 
      We build several flavors of 'default' grsec kernels. These are
@@ -7339,6 +7348,7 @@ let
   linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
   linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
+  linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
 
   # grsecurity flavors
   # Stable kernels

From 906aa9ccb1cf34cde003634b6eca1ded5bc703d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 5 Jun 2014 13:10:35 +0200
Subject: [PATCH 2001/2033] Make pseudo-filesystems show up as "tmpfs" etc.
 rather than "none" in df

---
 nixos/modules/system/boot/stage-1-init.sh |  8 ++++----
 nixos/modules/system/boot/stage-2-init.sh | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 15586e68e7e..7adb932aba7 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -60,12 +60,12 @@ touch /etc/fstab # to shut up mount
 touch /etc/mtab # to shut up mke2fs
 touch /etc/initrd-release
 mkdir -p /proc
-mount -t proc none /proc
+mount -t proc proc /proc
 mkdir -p /sys
-mount -t sysfs none /sys
-mount -t devtmpfs -o "size=@devSize@" none /dev
+mount -t sysfs sysfs /sys
+mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
 mkdir -p /run
-mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
+mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
 
 # Process the kernel command line.
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index ab414e29eb2..eff2fb583ba 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -36,9 +36,9 @@ mount -n -o remount,rw /
 # stage 1, we need to do that here.
 if [ ! -e /proc/1 ]; then
     mkdir -m 0755 -p /proc
-    mount -n -t proc none /proc
+    mount -n -t proc proc /proc
     mkdir -m 0755 -p /dev
-    mount -t devtmpfs none /dev
+    mount -t devtmpfs devtmpfs /dev
 fi
 
 
@@ -82,9 +82,9 @@ done
 
 # More special file systems, initialise required directories.
 mkdir -m 0755 /dev/shm
-mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" none /dev/shm
+mount -t tmpfs -o "rw,nosuid,nodev,size=@devShmSize@" tmpfs /dev/shm
 mkdir -m 0755 -p /dev/pts
-[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # UML doesn't have USB by default
+[ -e /proc/bus/usb ] && mount -t usbfs usbfs /proc/bus/usb # UML doesn't have USB by default
 mkdir -m 01777 -p /tmp
 mkdir -m 0755 -p /var /var/log /var/lib /var/db
 mkdir -m 0755 -p /nix/var
@@ -114,7 +114,7 @@ rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
 if ! mountpoint -q /run; then
     rm -rf /run
     mkdir -m 0755 -p /run
-    mount -t tmpfs -o "mode=0755,size=@runSize@" none /run
+    mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 fi
 
 # Create a ramfs on /run/keys to hold secrets that shouldn't be
@@ -122,7 +122,7 @@ fi
 if ! mountpoint -q /run/keys; then
     rm -rf /run/keys
     mkdir /run/keys
-    mount -t ramfs none /run/keys
+    mount -t ramfs ramfs /run/keys
     chown 0:96 /run/keys
     chmod 0750 /run/keys
 fi
@@ -153,7 +153,7 @@ fi
 # Create /var/setuid-wrappers as a tmpfs.
 rm -rf /var/setuid-wrappers
 mkdir -m 0755 -p /var/setuid-wrappers
-mount -t tmpfs -o "mode=0755" none /var/setuid-wrappers
+mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
 
 
 # Run the script that performs all configuration activation that does

From 15f092d7a7088ef1fadb059f305685da045fd979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 5 Jun 2014 14:32:11 +0200
Subject: [PATCH 2002/2033] openssl: 1.0.1g -> 1.0.1h

CVE-2014-0224
CVE-2014-0221
CVE-2014-0195
CVE-2014-0198
CVE-2010-5298
CVE-2014-3470
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7217c876bfd..93f7cbe1a1f 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
 , withCryptodev ? false, cryptodevHeaders }:
 
 let
-  name = "openssl-1.0.1g";
+  name = "openssl-1.0.1h";
 
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "0a70qdqccg16nw4bbawa6pjvzn05vfp5wkwg6jl0grch7f683jsk";
+    sha256 = "14yhsgag5as7nhxnw7f0vklwjwa3pmn1i15nmp3f4qxa6sc8l74x";
   };
 
   patches = patchesCross false;

From 1fc21bd6a99197007804f3981a85201149280b3b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 12:58:57 +0200
Subject: [PATCH 2003/2033] emacs-scala-mode: package version 2

---
 .../scala-mode/{default.nix => v1.nix}        |  0
 .../editors/emacs-modes/scala-mode/v2.nix     | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 rename pkgs/applications/editors/emacs-modes/scala-mode/{default.nix => v1.nix} (100%)
 create mode 100644 pkgs/applications/editors/emacs-modes/scala-mode/v2.nix

diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
similarity index 100%
rename from pkgs/applications/editors/emacs-modes/scala-mode/default.nix
rename to pkgs/applications/editors/emacs-modes/scala-mode/v1.nix
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
new file mode 100644
index 00000000000..13d3f4b00d1
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, emacs, unzip }:
+
+stdenv.mkDerivation {
+
+  name = "scala-mode2-2014-06-05";
+
+  src = fetchurl {
+    url = "https://github.com/hvesalai/scala-mode2/archive/af2dc30226c890ff7d49d727450f8006b90781df.zip";
+    sha256 = "1jj08li9lfg5291jzj170wa3cmyf3g2a0j80cy5307l0mdawp9vx";
+  };
+
+  buildInputs = [ unzip emacs ];
+
+  installPhase = ''
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp -v *.el *.elc "$out/share/emacs/site-lisp/"
+  '';
+
+  meta = {
+    homepage = "https://github.com/hvesalai/scala-mode2";
+    description = "An Emacs mode for editing Scala code";
+    license = "permissive";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc21997dbf1..c8f713b3185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8343,7 +8343,8 @@ let
 
     rudel = callPackage ../applications/editors/emacs-modes/rudel { };
 
-    scalaMode = callPackage ../applications/editors/emacs-modes/scala-mode { };
+    scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
+    scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
 
     sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
 

From 80a60810ca7e59360e8babf47c4d967f108c1e46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 5 Jun 2014 13:01:33 +0200
Subject: [PATCH 2004/2033] emacs-sbt-mode: add initial version

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

diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
new file mode 100644
index 00000000000..092026aca88
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, emacs, unzip }:
+
+stdenv.mkDerivation {
+
+  name = "sbt-mode-2014-06-05";
+
+  src = fetchurl {
+    url = "https://github.com/hvesalai/sbt-mode/archive/676f22d9658989de401d299ed0250db9b911574d.zip";
+    sha256 = "0b8qrr3yp48ggl757d3a6bz633mbf4zxqpcwsh47b1ckiwa3nb2h";
+  };
+
+  buildInputs = [ unzip emacs ];
+
+  installPhase = ''
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp -v *.el *.elc "$out/share/emacs/site-lisp/"
+  '';
+
+  meta = {
+    homepage = "https://github.com/hvesalai/scala-mode2";
+    description = "An Emacs mode for editing Scala code";
+    license = "permissive";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8f713b3185..ce0f7593f2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8343,6 +8343,8 @@ let
 
     rudel = callPackage ../applications/editors/emacs-modes/rudel { };
 
+    sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
+
     scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
     scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
 

From b8af23e4b756f50612695bd5db35eb5e54743ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 5 Jun 2014 17:47:39 +0200
Subject: [PATCH 2005/2033] python-pygments: update 1.5 -> 1.6

Bug fixes, some new features and lots of new lexers.

Full changelog:
http://pygments.org/docs/changelog/#version-1-6
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf0eea9c2fb..f3f75ea0f90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5507,11 +5507,11 @@ rec {
   };
 
   pygments = buildPythonPackage rec {
-    name = "Pygments-1.5";
+    name = "Pygments-1.6";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      md5 = "ef997066cc9ee7a47d01fb4f3da0b5ff";
+      md5 = "a18feedf6ffd0b0cc8c8b0fbdb2027b1";
     };
 
     meta = {

From 10b9ce53a3839990eb2ca3a2feb646ed8d4f1a2d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 6 Jun 2014 03:44:28 +0200
Subject: [PATCH 2006/2033] livestreamer: 1.8.0 -> 1.8.2; fix up dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3f75ea0f90..fd63228ca5d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4637,17 +4637,17 @@ rec {
     };
   };
 
-  livestreamer = if isPy34 then null else (buildPythonPackage {
-    #version = "1.8.0";
-    name = "livestreamer-1.8.0";
+  livestreamer = if isPy34 then null else (buildPythonPackage rec {
+    version = "1.8.2";
+    name = "livestreamer-${version}";
 
     src = fetchurl {
-      url = "https://github.com/chrippa/livestreamer/archive/v1.8.0.tar.gz";
-      sha256 = "0fzpznbnhzrqawxdljvyml5251wbr3nifdrvnmh2b8vz356js4l8";
+      url = "https://github.com/chrippa/livestreamer/archive/v${version}.tar.gz";
+      sha256 = "130h97qdb7qx8xg0gz54p5a6cb2zbffi5hsi305xf0ah9nf4rbrc";
     };
 
     buildInputs = [ pkgs.makeWrapper ];
-    propagatedBuildInputs = [ requests ];
+    propagatedBuildInputs = [ requests pkgs.rtmpdump pycrypto ];
     postInstall = ''
       wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
     '';

From 1dae8bd2bfb870e662335f9d992bbbd4e7d18007 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 6 Jun 2014 02:50:54 -0400
Subject: [PATCH 2007/2033] Add holy-project to nixpkgs. Patch is required
 until the next version is pushed to hackage.

---
 .../haskell/holy-project/default.nix          | 30 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/holy-project/default.nix

diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix
new file mode 100644
index 00000000000..4e751d9c003
--- /dev/null
+++ b/pkgs/development/libraries/haskell/holy-project/default.nix
@@ -0,0 +1,30 @@
+{ cabal, aeson, ansiTerminal, Cabal, filepath, hastache
+, httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split
+, syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text
+, time
+, fetchpatch}:
+
+cabal.mkDerivation (self: {
+  pname = "holy-project";
+  version = "0.1.1.0";
+  sha256 = "1dsyhgjcp54199zfazzzwsggxpj2dsbzfb64v6l3jz7qaapxnj9i";
+  isLibrary = true;
+  isExecutable = true;
+  patches = [ (fetchpatch { url = "https://github.com/yogsototh/holy-project/pull/3.patch"; sha256 = "1ndyhfrsvn94zxzyq1w4504gz91yfv33375933qmz3wdfkc3rqf0"; }) ];
+  buildDepends = [
+    aeson ansiTerminal Cabal filepath hastache httpConduit HUnit lens
+    QuickCheck random smallcheck split syb tasty tastyHunit
+    tastyQuickcheck tastySmallcheck text time
+  ];
+  testDepends = [
+    Cabal HUnit QuickCheck smallcheck tasty tastyHunit tastyQuickcheck
+    tastySmallcheck
+  ];
+  meta = {
+    homepage = "http://github.com/yogsototh/holy-project";
+    description = "Start your Haskell project with cabal, git and tests";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.tomberek ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be1571bc902..46e7f279e05 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1174,6 +1174,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   httpTypes = callPackage ../development/libraries/haskell/http-types {};
 
+  holyProject = callPackage ../development/libraries/haskell/holy-project {};
+
   HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {};
   HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {};
   HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {};

From f6d03359b3810dca112e1190eeec7f18a3bab247 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Thu, 5 Jun 2014 18:38:38 +0200
Subject: [PATCH 2008/2033] Only overwrite container-configuration when
 --config is specified.

Fixes #2834.
---
 nixos/modules/virtualisation/nixos-container.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
index 718630fe8b9..5083abd8448 100644
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -31,7 +31,7 @@ EOF
 }
 
 my $ensureUniqueName = 0;
-my $extraConfig = "";
+my $extraConfig;
 
 GetOptions(
     "help" => sub { showHelp() },
@@ -190,7 +190,7 @@ elsif ($action eq "update") {
 
     # FIXME: may want to be more careful about clobbering the existing
     # configuration.nix.
-    writeNixOSConfig $nixosConfigFile if defined $extraConfig;
+    writeNixOSConfig $nixosConfigFile if (defined $extraConfig && $extraConfig ne "");
 
     system("nix-env", "-p", "$profileDir/system",
            "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",

From 77a937beec87c704014e54b0f0164c2593236f7c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 6 Jun 2014 11:57:54 +0200
Subject: [PATCH 2009/2033] elixir: Bump to 1.13.3.

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index c558063be3a..00fe490d494 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils }:
 
 let
-  version = "0.13.2";
+  version = "0.13.3";
 in
 stdenv.mkDerivation {
   name = "elixir-${version}";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "13mflf35lj2vbv32s5n982x7k5k55dsn9mx9rf3vkqgfsy7zx4ds";
+    sha256 = "17nb8qfyjc67g62x10l2gq0z1501xa4wry906br0w2rm8bf4j8rf";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From 94c2661503ca65d149570900e326079c97153808 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 6 Jun 2014 14:03:10 +0200
Subject: [PATCH 2010/2033] tomcat: fix service to be a daemon, and run tomcat
 in script rather than preStart

---
 nixos/modules/services/web-servers/tomcat.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index b5eee8f8be8..1de3d40165e 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -119,6 +119,8 @@ in
         startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
 
+        daemonType = "daemon";
+
         preStart =
           ''
             # Create the base directory
@@ -327,10 +329,12 @@ in
                 done
                 ''
             else ""}
-
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
           '';
 
+        script = ''
+            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${pkgs.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
+        '';
+
         postStop =
           ''
             echo "Stopping tomcat..."

From 57eaced234574a70eefb7b802305c9c7c4da094b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jun 2014 14:08:23 +0200
Subject: [PATCH 2011/2033] spamassassin: download from any Apache mirror

---
 pkgs/servers/mail/spamassassin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 03e579bda20..ea69d036f95 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -16,7 +16,7 @@ buildPerlPackage rec {
   name = "SpamAssassin-3.4.0";
 
   src = fetchurl {
-    url = "http://apache.imsam.info/spamassassin/source/Mail-${name}.tar.bz2";
+    url = "mirror://apache/spamassassin/source/Mail-${name}.tar.bz2";
     sha256 = "0527rv6m5qd41l756fqh9q7sm9m2xfhhy2jchlhbmd39x6x3jfsm";
   };
 

From 82d4f431edf59bd337cbfc8a2e0d7f697f24991f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 6 Jun 2014 15:11:16 +0200
Subject: [PATCH 2012/2033] haskell-th-lift-instances: update 0.1.2 -> 0.1.3

---
 .../libraries/haskell/th-lift-instances/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
index 27eb090443b..32354eabd4a 100644
--- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix
+++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "th-lift-instances";
-  version = "0.1.2";
-  sha256 = "0xfz7jnhqxqxd6ijn6vpd0nay38kj862ylsb71xqi35137g5zl9w";
+  version = "0.1.3";
+  sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx";
   buildDepends = [ text thLift vector ];
   testDepends = [ doctest filepath QuickCheck text vector ];
   meta = {

From 98dfd124561f66029982d3426538cc6d2000a2e4 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 6 Jun 2014 16:06:53 +0300
Subject: [PATCH 2013/2033] php: import apc 3.1.13

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 7ee05031404..8a01151bd77 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -40,4 +40,12 @@ let self = with self; {
       sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd";
     };
   };
+
+  apc = buildPecl rec {
+    name = "apc-3.1.13";
+    src = pkgs.fetchurl {
+      url = "http://pecl.php.net/get/${name}.tgz";
+      sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y";
+    };
+  };
 }; in self

From 1859dbc4a2a7c927375fef34d0176f66ee51e556 Mon Sep 17 00:00:00 2001
From: Vladimir Kirillov <proger@wilab.org.ua>
Date: Fri, 6 Jun 2014 16:40:02 +0300
Subject: [PATCH 2014/2033] sysdig: update to 0.1.83

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 1f9abe97f75..10a1d88f234 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version="0.1.82";
+    version="0.1.83";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256="0yjxsdjbkp5dihg5xhkyl3lg64dl40a0b5cvcai8gz74w2955mnk";
+    sha256="0d4fw6vba78hqy8plhcq8lkdcxy1fizrr5aiszdsap7cvd0gls6r";
   };
   buildInputs = [
     cmake zlib luajit

From cc160a196a5d870e3301d0ed3d6187c048fe82c9 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 5 Jun 2014 15:12:30 +0100
Subject: [PATCH 2015/2033] couchdb service: adding customizable config file
 which is writable by couchdb

---
 nixos/modules/services/databases/couchdb.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 5088c741681..e1fe6be6f6a 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -126,6 +126,16 @@ in {
           Extra configuration. Overrides any other cofiguration.
         '';
       };
+
+      configFile = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb/couchdb.ini";
+        description = ''
+          Custom configuration file. File needs to be readable and writable
+          from couchdb user/group.
+        '';
+      };
+
     };
 
   };
@@ -146,11 +156,13 @@ in {
         mkdir -p `dirname ${cfg.logFile}`;
         mkdir -p ${cfg.databaseDir};
         mkdir -p ${cfg.viewIndexDir};
+        touch ${cfg.configFile}
 
         if [ "$(id -u)" = 0 ]; then
-          chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
+          chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
           chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
           chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
+          chown ${cfg.user}:${cfg.group} ${cfg.configFile}
         fi
         '';
 
@@ -158,7 +170,7 @@ in {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig}";
+        ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}";
       };
     };
 

From 17368bdf8ed8eaa84941e4c79721f3d0e862f118 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 6 Jun 2014 23:01:04 -0500
Subject: [PATCH 2016/2033] arcanist: update

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 58957a82752..9cc8e7c7f6b 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,8 +3,8 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/facebook/libphutil.git";
-    rev    = "c4cb6d99c4a5903079350f85fcc71895c0a0ea14";
-    sha256 = "a7293aac4fdcfbaead09ee3e6ffb54c5d100b07905b4006194067411061ff994";
+    rev    = "7e75bf271c669b61eb6e6e2ea312a36e64b80a4a";
+    sha256 = "ffb7ee8141b925889e9bbc945d2f38f12d1489148b9c9b7eaeadd7524d254a78";
   };
   arcanist = fetchgit {
     url    = "git://github.com/facebook/arcanist.git";
@@ -14,7 +14,7 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20140530";
+  version = "20140606";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper ];

From 8c0b63162b203c7903b5e8d7a428d62dc09fa80a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 6 Jun 2014 23:09:47 -0500
Subject: [PATCH 2017/2033] compcert: 2.2 -> 2.3pl2

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/compcert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index c4af878ba76..f5e66b8ac10 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.2";
+  version = "2.3pl2";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "0zhqx9mixlsycckl6wq6yrd795byj1jz7m4njcgfv29cx33j1nrk";
+    sha256 = "1cq4my646ll1mszs5mbzwk4vp8l8qnsc96fpcv2pl35aw5i6jqm8";
   };
 
   buildInputs = [ coq ocaml ];

From 80f3e943b1a94461e1abbcf9bad4766aedbb95a5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 6 Jun 2014 23:14:54 -0500
Subject: [PATCH 2018/2033] dd-agent: 4.2.1 -> 4.3.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/tools/networking/dd-agent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 1674d01af8f..8ff45e733fb 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -2,14 +2,14 @@
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.1";
+  version = "4.3.1";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner = "DataDog";
     repo = "dd-agent";
     rev = version;
-    sha256 = "06f9nkvnpfzs2nw75cac2y9wnp2bay4sg94zz0wjm8886rigjjjm";
+    sha256 = "0z6b1s30fyd9ldahizrjwcxx7c7dd74xsqy19j3qykrb25j9cvmn";
   };
 
   buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];

From 36e6eda5fc21e655b172a3c8a445930bafb64e73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Jun 2014 12:28:54 +0200
Subject: [PATCH 2019/2033] r-modules: set meta.hydraPlatforms for all R
 packages

---
 pkgs/development/r-modules/cran-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 52bde801992..2c48adc558b 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -49,6 +49,7 @@ let
     };
     propagatedBuildInputs = depends;
     meta.homepage = "http://cran.r-project.org/web/packages/${name}/";
+    meta.hydraPlatforms = R.meta.hydraPlatforms;
   };
 
 in

From 4dd5496bd427f29cffc295ad00ba47476cba303c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 7 Jun 2014 07:11:50 -0500
Subject: [PATCH 2020/2033] arcanist: build xhpast for 'arc liberate'

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/misc/arcanist/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 9cc8e7c7f6b..02fe572edab 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, php, makeWrapper }:
+{ stdenv, fetchgit, php, flex, makeWrapper }:
 
 let
   libphutil = fetchgit {
@@ -17,17 +17,23 @@ stdenv.mkDerivation rec {
   version = "20140606";
 
   src = [ arcanist libphutil ];
-  buildInputs = [ php makeWrapper ];
+  buildInputs = [ php makeWrapper flex ];
 
   unpackPhase = "true";
-  buildPhase = "true";
+  buildPhase = ''
+    ORIG=`pwd`
+    chmod +w -R ${libphutil}
+    cd ${libphutil}/support/xhpast
+    ls
+    make clean all install
+    cd $ORIG
+  '';
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp -R ${libphutil} $out/libexec/libphutil
     cp -R ${arcanist}  $out/libexec/arcanist
 
     ln -s $out/libexec/arcanist/bin/arc $out/bin
-
     wrapProgram $out/bin/arc \
       --prefix PATH : "${php}/bin"
   '';

From 91b2021782a0b956163db9b051758a12d1d632ae Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 7 Jun 2014 14:51:50 +0200
Subject: [PATCH 2021/2033] feh: Set the default theme explicitly to 'feh'

feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
---
 pkgs/applications/graphics/feh/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 47a52817549..b05946b4f82 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin"
+    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" \
+                               --add-flags '--theme=feh'
   '';
 
   meta = {

From b40ce8a1f1a2170a53772a26e77044f377fdc06a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 7 Jun 2014 14:45:45 +0200
Subject: [PATCH 2022/2033] Update feh from 2.11 to 2.12.

The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
---
 pkgs/applications/graphics/feh/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index b05946b4f82..d23f42fdbf9 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng, giblib
+{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng
 , libXinerama, curl }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.11";
+  name = "feh-2.12";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1y41ixsp5nhvb29hhiyh8g1g28lc0kki619skgxcv5iisc93dk4x";
+    sha256 = "0ckhidmsms2l5jycp0qf71jzmb3bpbhjq3bcgfpvfvszah7pmq30";
   };
 
-  buildInputs = [makeWrapper x11 imlib2 giblib libjpeg libpng libXinerama curl ];
+  buildInputs = [makeWrapper x11 imlib2 libjpeg libpng libXinerama curl];
 
   preBuild = ''
     makeFlags="PREFIX=$out"

From 393923a8697e7ce7da0cd434a1025102fb9aa47c Mon Sep 17 00:00:00 2001
From: Jussi Maki <jussi.maki@gmail.com>
Date: Fri, 30 May 2014 14:29:31 +0200
Subject: [PATCH 2023/2033] graphite-web: Fix webapp content path

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fd63228ca5d..bb8e426fc45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8919,7 +8919,7 @@ rec {
 
     preConfigure = ''
       substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo'
-      substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')"
+      substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')"
       cp webapp/graphite/manage.py bin/manage-graphite.py
       substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings'
     '';

From 72cd8ce56c49086d350b2059de5392b4c8a7186e Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 6 Jun 2014 17:45:22 -0400
Subject: [PATCH 2024/2033] add MacVim

---
 pkgs/applications/editors/vim/macvim.nix   |  92 ++++++++++++
 pkgs/applications/editors/vim/macvim.patch | 159 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 3 files changed, 253 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/macvim.nix
 create mode 100644 pkgs/applications/editors/vim/macvim.patch

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
new file mode 100644
index 00000000000..25a8e5fe9fa
--- /dev/null
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -0,0 +1,92 @@
+{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext,
+  pkgconfig, cscope, python, ruby, tcl, perl, luajit
+}:
+
+let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation;
+in mkDerivation rec {
+  name = "macvim-${version}";
+
+  version = "7.4-73";
+
+  src = fetchFromGitHub {
+    owner = "b4winckler";
+    repo = "macvim";
+    rev = "snapshot-73";
+    sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    gettext ncurses pkgconfig luajit ruby tcl perl python
+  ];
+
+  patches = [ ./macvim.patch ];
+
+  postPatch = ''
+    substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out"
+
+    # Don't create custom icons.
+    substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' ""
+    substituteInPlace src/MacVim/icons/make_icons.py --replace "dont_create = False" "dont_create = True"
+
+    # Full path to xcodebuild
+    substituteInPlace src/Makefile --replace "xcodebuild" "/usr/bin/xcodebuild"
+  '';
+
+  configureFlags = [
+      #"--enable-cscope" # TODO: cscope doesn't build on Darwin yet
+      "--enable-fail-if-missing"
+      "--with-features=huge"
+      "--enable-gui=macvim"
+      "--enable-multibyte"
+      "--enable-nls"
+      "--enable-luainterp=dynamic"
+      "--enable-pythoninterp=dynamic"
+      "--enable-perlinterp=dynamic"
+      "--enable-rubyinterp=dynamic"
+      "--enable-tclinterp=yes"
+      "--with-luajit"
+      "--with-lua-prefix=${luajit}"
+      "--with-ruby-command=${ruby}/bin/ruby"
+      "--with-tclsh=${tcl}/bin/tclsh"
+      "--with-tlib=ncurses"
+      "--with-compiledby=Nix"
+  ];
+
+  preConfigure = ''
+    DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer
+    configureFlagsArray+=(
+      "--with-developer-dir=$DEV_DIR"
+    )
+  '';
+
+  postInstall = ''
+    cp -r src/MacVim/build/Release/MacVim.app $out
+
+    rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view}
+
+    cp src/MacVim/mvim $out/bin
+    cp src/vimtutor $out/bin
+
+    for prog in "vimdiff" "vi" "vim" "ex" "rvim" "rview" "view"; do
+      ln -s $out/bin/mvim $out/bin/$prog
+    done
+
+    # Fix rpaths
+    exe="$out/MacVim.app/Contents/MacOS/Vim"
+    libperl=$(dirname $(find ${perl} -name "libperl.dylib"))
+    install_name_tool -add_rpath ${luajit}/lib $exe
+    install_name_tool -add_rpath ${tcl}/lib $exe
+    install_name_tool -add_rpath ${python}/lib $exe
+    install_name_tool -add_rpath $libperl $exe
+    install_name_tool -add_rpath ${ruby}/lib $exe
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Vim - the text editor - for Mac OS X";
+    homepage    = https://github.com/b4winckler/macvim;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms   = platforms.darwin;
+  };
+}
diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch
new file mode 100644
index 00000000000..c721bbe149a
--- /dev/null
+++ b/pkgs/applications/editors/vim/macvim.patch
@@ -0,0 +1,159 @@
+diff --git a/src/vimtutor b/src/vimtutor
+index 70d9ec7..b565a1a 100755
+--- a/src/vimtutor
++++ b/src/vimtutor
+@@ -16,7 +16,7 @@ seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
+ if test "$1" = "-g"; then 
+   # Try to use the GUI version of Vim if possible, it will fall back
+   # on Vim if Gvim is not installed.
+-  seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
++  seq="mvim gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
+   shift
+ fi
+ 
+
+diff --git a/src/auto/configure b/src/auto/configure
+index bc9f074..9b9125e 100755
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -2252,7 +2252,7 @@ rm -f conftest.val
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_compute_int
+-cat >auto/config.log <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+@@ -2262,7 +2262,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
+   $ $0 $@
+ 
+ _ACEOF
+-exec 5>>auto/config.log
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -5377,10 +5377,7 @@ $as_echo "no" >&6; }
+   fi
+ 
+   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+-    if test "x$MACOSX" = "xyes"; then
+-      MZSCHEME_LIBS="-framework Racket"
+-      MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+-    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
++    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
+       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
+       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
+     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libracket3m.a"; then
+@@ -5716,23 +5713,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
+   fi
+ 
+   if test "x$MACOSX" = "xyes"; then
+-        dir=/System/Library/Perl
+-    darwindir=$dir/darwin
+-    if test -d $darwindir; then
+-      PERL=/usr/bin/perl
+-    else
+-            dir=/System/Library/Perl/5.8.1
+-      darwindir=$dir/darwin-thread-multi-2level
+-      if test -d $darwindir; then
+-	PERL=/usr/bin/perl
+-      fi
+-    fi
+-    if test -n "$PERL"; then
+-      PERL_DIR="$dir"
+-      PERL_CFLAGS="-DFEAT_PERL -I$darwindir/CORE"
+-      PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a"
+-      PERL_LIBS="-L$darwindir/CORE -lperl"
+-    fi
+                 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
+     PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
+   fi
+@@ -5926,10 +5906,6 @@ __:
+ eof
+ 	    	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
+ 	    rm -f -- "${tmp_mkf}"
+-	    if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
+-		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
+-	      vi_cv_path_python_plibs="-framework Python"
+-	    else
+ 	      if test "${vi_cv_var_python_version}" = "1.4"; then
+ 		  vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
+ 	      else
+@@ -5937,7 +5913,6 @@ eof
+ 	      fi
+ 	      vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
+ 	      	      vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
+-	    fi
+ 
+ fi
+ 
+@@ -6004,13 +5979,6 @@ rm -f core conftest.err conftest.$ac_objext \
+ $as_echo "no" >&6; }
+ 	fi
+ 
+-                                if test -n "$MACSDK"; then
+-          PYTHON_CFLAGS=
+-          PYTHON_LIBS=-framework Python
+-          PYTHON_CONFDIR=
+-          PYTHON_GETPATH_CFLAGS=
+-        fi
+-
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5
+ $as_echo_n "checking if compile and link flags for Python are sane... " >&6; }
+ 	cflags_save=$CFLAGS
+@@ -6853,11 +6821,7 @@ $as_echo "$tclver - OK" >&6; };
+ 
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
+ $as_echo_n "checking for location of Tcl include... " >&6; }
+-      if test "x$MACOSX" != "xyes"; then
+ 	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
+-      else
+-		tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
+-      fi
+       TCL_INC=
+       for try in $tclinc; do
+ 	if test -f "$try/tcl.h"; then
+@@ -6875,12 +6839,8 @@ $as_echo "<not found>" >&6; }
+       if test -z "$SKIP_TCL"; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
+ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
+-	if test "x$MACOSX" != "xyes"; then
+ 	  tclcnf=`echo $tclinc | sed s/include/lib/g`
+ 	  tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
+-	else
+-	  	  tclcnf="/System/Library/Frameworks/Tcl.framework"
+-	fi
+ 	for try in $tclcnf; do
+ 	  if test -f $try/tclConfig.sh; then
+ 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
+@@ -7050,10 +7010,6 @@ $as_echo "$rubyhdrdir" >&6; }
+ 	if test -f "$rubylibdir/$librubya"; then
+ 	  librubyarg="$librubyarg"
+ 	  RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
+-        elif test -d "/System/Library/Frameworks/Ruby.framework"; then
+-                        RUBY_LIBS="-framework Ruby"
+-                        RUBY_CFLAGS="-DRUBY_VERSION=$rubyversion"
+-            librubyarg=
+ 	fi
+ 
+ 	if test "X$librubyarg" != "X"; then
+@@ -14061,7 +14017,7 @@ fi
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-exec 5>>auto/config.log
++exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+@@ -14653,7 +14609,7 @@ if test "$no_create" != yes; then
+     ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
+   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+-  exec 5>>auto/config.log
++  exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || as_fn_exit 1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ede5259f1ba..ad3eefec859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9586,6 +9586,8 @@ let
 
   vim = callPackage ../applications/editors/vim { };
 
+  macvim = callPackage ../applications/editors/vim/macvim.nix { };
+
   vimWrapper = wrapVim vim;
 
   vimHugeX = vim_configurable;

From 0fcd4f98ffe100bd604cb3a2feba3b484c7b6352 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 12:15:54 +0000
Subject: [PATCH 2025/2033] haskell-fuzzcheck: new expression

---
 .../libraries/haskell/fuzzcheck/default.nix   | 19 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/fuzzcheck/default.nix

diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix
new file mode 100644
index 00000000000..a1da7f8ebbf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fuzzcheck/default.nix
@@ -0,0 +1,19 @@
+{ cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl
+, QuickCheck, random, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "fuzzcheck";
+  version = "0.1.1";
+  sha256 = "0qfr4f0b50l368b45yzwhqd4g2y1kvfrfj4hr84cdxcwdrwn9mpc";
+  buildDepends = [
+    liftedBase monadControl QuickCheck random transformers
+  ];
+  testDepends = [ hspec hspecExpectations HUnit QuickCheck ];
+  meta = {
+    homepage = "https://github.com/fpco/fuzzcheck";
+    description = "A simple checker for stress testing monadic code";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b10da90afce..a6688f3ee91 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -800,6 +800,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   freetype2 = callPackage ../development/libraries/haskell/freetype2 {};
 
+  fuzzcheck = callPackage ../development/libraries/haskell/fuzzcheck {};
+
   gamma = callPackage ../development/libraries/haskell/gamma {};
 
   geniplate = callPackage ../development/libraries/haskell/geniplate {};

From 10d1fd04576b212814eb66fb94689aaad0bc9dd4 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 12:16:20 +0000
Subject: [PATCH 2026/2033] crafty: simplify expression

---
 pkgs/games/crafty/default.nix   | 7 ++++---
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix
index 65cdd14539b..e0eb49b53cb 100644
--- a/pkgs/games/crafty/default.nix
+++ b/pkgs/games/crafty/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, unzip, fullVariant }:
+{ stdenv, fetchurl, unzip, fullVariant ? false }:
 
 stdenv.mkDerivation rec {
-  name = "crafty-23.4";
+  name = "crafty-${version}";
+  version = "23.4";
   
   src = fetchurl {
-    url = http://www.craftychess.com/crafty-23.4.zip;
+    url = "http://www.craftychess.com/crafty-${version}.zip";
     sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5285ccf73e..e785945815d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9952,7 +9952,7 @@ let
 
   crack_attack = callPackage ../games/crack-attack { };
 
-  crafty = callPackage ../games/crafty { fullVariant = false; };
+  crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
   crrcsim = callPackage ../games/crrcsim {};

From b896b498272694bef766ce6d4ec30295f680cb81 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 12:16:31 +0000
Subject: [PATCH 2027/2033] libdrm: allow to build on any unix

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index c895f141850..69d09fe9fae 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Library for accessing the kernel's Direct Rendering Manager";
     license = "bsd";
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From e5e9171578e15d76bff4c1fb29d931633b79e85a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 12:16:41 +0000
Subject: [PATCH 2028/2033] hoogle-local: minor changes for consistency

---
 pkgs/development/libraries/haskell/hoogle/local.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix
index 337cd4c8154..9f56d028c59 100644
--- a/pkgs/development/libraries/haskell/hoogle/local.nix
+++ b/pkgs/development/libraries/haskell/hoogle/local.nix
@@ -38,13 +38,13 @@ cabal.mkDerivation (self: rec {
   sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc";
   isLibrary = true;
   isExecutable = true;
-  buildInputs = [ self.ghc Cabal parallel perl wget rehoo ]
-    ++ self.extraBuildInputs ++ packages;
+  buildInputs = [self.ghc Cabal] ++ self.extraBuildInputs
+    ++ [ parallel perl wget rehoo ] ++ packages;
   buildDepends = [
       aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit
       deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random
       resourcet safe shake tagsoup text time transformers uniplate vector
-      vectorAlgorithms wai warp parallel perl wget rehoo
+      vectorAlgorithms wai warp
     ];
   testDepends = [ filepath ];
   testTarget = "--test-option=--no-net";
@@ -112,6 +112,6 @@ cabal.mkDerivation (self: rec {
     description = "Haskell API Search";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
+    maintainers = [ self.stdenv.lib.maintainers.jwiegley ];
   };
 })

From c06613a3af177777b68dfebe74cd019b48e4dcb8 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 20:18:27 +0000
Subject: [PATCH 2029/2033] macvim: move the .app bundle to $out/Applications

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

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 25a8e5fe9fa..52567d5d31b 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -24,7 +24,7 @@ in mkDerivation rec {
   patches = [ ./macvim.patch ];
 
   postPatch = ''
-    substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out"
+    substituteInPlace src/MacVim/mvim --replace "# VIM_APP_DIR=/Applications" "VIM_APP_DIR=$out/Applications"
 
     # Don't create custom icons.
     substituteInPlace src/MacVim/icons/Makefile --replace '$(MAKE) -C makeicns' ""
@@ -62,7 +62,7 @@ in mkDerivation rec {
   '';
 
   postInstall = ''
-    cp -r src/MacVim/build/Release/MacVim.app $out
+    cp -r src/MacVim/build/Release/MacVim.app $out/Applications
 
     rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view}
 
@@ -74,7 +74,7 @@ in mkDerivation rec {
     done
 
     # Fix rpaths
-    exe="$out/MacVim.app/Contents/MacOS/Vim"
+    exe="$out/Applications/MacVim.app/Contents/MacOS/Vim"
     libperl=$(dirname $(find ${perl} -name "libperl.dylib"))
     install_name_tool -add_rpath ${luajit}/lib $exe
     install_name_tool -add_rpath ${tcl}/lib $exe

From 6a3a9589e2fa15a4a3064a7cd923f6c1cb5e7cd3 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 20:22:58 +0000
Subject: [PATCH 2030/2033] macvim: add missing call to ensureDir

---
 pkgs/applications/editors/vim/macvim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 52567d5d31b..e48cb2590f9 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -62,6 +62,7 @@ in mkDerivation rec {
   '';
 
   postInstall = ''
+    ensureDir $out/Applications
     cp -r src/MacVim/build/Release/MacVim.app $out/Applications
 
     rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view}

From 6c3cc8bb9553f92697957da644908bd73fe556c8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 7 Jun 2014 22:28:56 +0200
Subject: [PATCH 2031/2033] PPSSPP: add platforms

---
 pkgs/misc/emulators/ppsspp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index db5e42e37ea..975de0f5270 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -29,5 +29,6 @@ in stdenv.mkDerivation {
     description = "A PSP emulator, the Qt4 version.";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.fuuzetsu ];
+    platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin;
   };
 }
\ No newline at end of file

From 34495b67ce252fd4b6d0a2584cba832242c2c0e9 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 7 Jun 2014 16:38:41 -0500
Subject: [PATCH 2032/2033] haskell-data-checked: new expression

---
 .../libraries/haskell/data-checked/default.nix     | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/data-checked/default.nix

diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix
new file mode 100644
index 00000000000..429f9da92bf
--- /dev/null
+++ b/pkgs/development/libraries/haskell/data-checked/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "data-checked";
+  version = "0.3";
+  sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/mvv/data-checked";
+    description = "Type-indexed runtime-checked properties";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a6688f3ee91..fd35dfb215f 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -564,6 +564,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   dateCache = callPackage ../development/libraries/haskell/date-cache {};
 
+  dataChecked = callPackage ../development/libraries/haskell/data-checked {};
+
   datetime = callPackage ../development/libraries/haskell/datetime {};
 
   DAV = callPackage ../development/libraries/haskell/DAV {};

From 476a3d818fba2d50c169af5ab4775be2b7e64c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 7 Jun 2014 23:40:58 +0200
Subject: [PATCH 2033/2033] nixos/graphite-service: fix filename typo

It's "aggregation" with two 'g's.

Fixes this:
carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring.
---
 nixos/modules/services/monitoring/graphite.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index d543d15b34e..3a5b13d6d40 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -12,7 +12,7 @@ let
     name = "graphite-config";
     paths = lists.filter (el: el != null) [
       (writeTextOrNull "carbon.conf" cfg.carbon.config)
-      (writeTextOrNull "storage-agregation.conf" cfg.carbon.storageAggregation)
+      (writeTextOrNull "storage-aggregation.conf" cfg.carbon.storageAggregation)
       (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas)
       (writeTextOrNull "blacklist.conf" cfg.carbon.blacklist)
       (writeTextOrNull "whitelist.conf" cfg.carbon.whitelist)